diff --git a/packages/arquillian-unit-tests/pom.xml b/packages/arquillian-unit-tests/pom.xml
deleted file mode 100644
index aac1ed0..0000000
--- a/packages/arquillian-unit-tests/pom.xml
+++ /dev/null
@@ -1,412 +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.onap.so</groupId>
-    <artifactId>packages</artifactId>
-    <version>1.2.0-SNAPSHOT</version>
-  </parent>
-
-  <groupId>org.onap.so.packages</groupId>
-  <name>Arquillian Unit Testing on MSO</name>
-  <artifactId>arquillian-unit-tests</artifactId>
-
-  <packaging>jar</packaging>
-
-  <profiles>
-    <profile>
-      <id>default-tests</id>
-      <activation>
-        <activeByDefault>true</activeByDefault>
-      </activation>
-      <properties>
-        <it-suite-to-execute>**/IntegrationTestsSuite.java</it-suite-to-execute>
-        <container-to-start>jboss-as</container-to-start>
-        <mso.project.version>${project.version}</mso.project.version>
-      </properties>
-    </profile>
-
-  </profiles>
-
-
-  <dependencyManagement>
-    <dependencies>
-      <dependency>
-        <groupId>org.jboss.arquillian</groupId>
-        <artifactId>arquillian-bom</artifactId>
-        <version>1.1.13.Final</version>
-        <scope>import</scope>
-        <type>pom</type>
-      </dependency>
-
-      <dependency>
-        <groupId>org.jboss.spec</groupId>
-        <artifactId>jboss-javaee-6.0</artifactId>
-        <version>3.0.2.Final</version>
-        <type>pom</type>
-        <scope>import</scope>
-
-      </dependency>
-
-    </dependencies>
-
-
-  </dependencyManagement>
-
-
-  <dependencies>
-    <!-- For testing -->
-    <dependency>
-      <groupId>org.jboss.marshalling</groupId>
-      <artifactId>jboss-marshalling</artifactId>
-      <version>1.3.16.GA</version>
-      <scope>test</scope>
-    </dependency>
-
-    <dependency>
-      <groupId>org.jboss.arquillian.junit</groupId>
-      <artifactId>arquillian-junit-container</artifactId>
-      <scope>test</scope>
-
-    </dependency>
-
-    <dependency>
-      <groupId>org.wildfly.arquillian</groupId>
-      <artifactId>wildfly-arquillian-container-remote</artifactId>
-      <version>1.1.0.Final</version>
-      <scope>test</scope>
-    </dependency>
-
-    <dependency>
-      <groupId>org.jboss.remoting</groupId>
-      <artifactId>jboss-remoting</artifactId>
-      <version>4.0.9.Final</version>
-      <scope>test</scope>
-    </dependency>
-
-    <dependency>
-      <groupId>org.jboss.logging</groupId>
-      <artifactId>jboss-logging</artifactId>
-      <version>3.2.1.Final</version>
-      <scope>test</scope>
-    </dependency>
-
-    <dependency>
-      <groupId>org.jboss.arquillian.protocol</groupId>
-      <artifactId>arquillian-protocol-servlet</artifactId>
-      <scope>test</scope>
-    </dependency>
-
-    <dependency>
-      <groupId>org.jboss.shrinkwrap.resolver</groupId>
-      <artifactId>shrinkwrap-resolver-impl-maven</artifactId>
-      <version>2.2.6</version>
-      <scope>test</scope>
-    </dependency>
-
-    <!-- FOR DOCKER CONTROLLED BY ARQUILLIAN -->
-    <dependency>
-      <groupId>org.arquillian.cube</groupId>
-      <artifactId>arquillian-cube-docker</artifactId>
-      <version>1.9.0</version>
-      <scope>test</scope>
-    </dependency>
-
-    <!-- For testing -->
-
-    <!-- FOR JBOSS CODE -->
-    <dependency>
-      <groupId>org.hibernate</groupId>
-      <artifactId>hibernate-core</artifactId>
-      <version>4.2.7.SP1</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.hibernate</groupId>
-      <artifactId>hibernate-entitymanager</artifactId>
-      <version>4.2.7.SP1</version>
-      <scope>test</scope>
-    </dependency>
-
-    <dependency>
-      <groupId>javax.validation</groupId>
-      <artifactId>validation-api</artifactId>
-      <version>1.0.0.GA</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.jboss.as</groupId>
-      <artifactId>jboss-as-ejb3</artifactId>
-      <version>7.2.0.Final</version>
-      <scope>test</scope>
-    </dependency>
-
-
-    <dependency>
-      <groupId>com.smartbear.soapui</groupId>
-      <artifactId>soapui</artifactId>
-      <version>5.1.0</version>
-      <type>jar</type>
-      <scope>test</scope>
-      <exclusions>
-        <exclusion>
-          <groupId>thoughtworks</groupId>
-          <artifactId>xstream</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>gnu.cajo</groupId>
-          <artifactId>cajo</artifactId>
-        </exclusion>
-      </exclusions>
-    </dependency>
-
-    <dependency>
-      <groupId>commons-codec</groupId>
-      <artifactId>commons-codec</artifactId>
-      <version>1.4</version>
-      <type>jar</type>
-      <scope>test</scope>
-    </dependency>
-
-    <dependency>
-      <groupId>org.seleniumhq.selenium</groupId>
-      <artifactId>selenium-java</artifactId>
-      <version>2.45.0</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.seleniumhq.selenium</groupId>
-      <artifactId>selenium-firefox-driver</artifactId>
-      <version>2.45.0</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.seleniumhq.selenium</groupId>
-      <artifactId>selenium-server</artifactId>
-      <version>2.45.0</version>
-      <scope>test</scope>
-    </dependency>
-
-    <dependency>
-      <groupId>org.apache.httpcomponents</groupId>
-      <artifactId>httpclient</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.httpcomponents</groupId>
-      <artifactId>httpcore</artifactId>
-    </dependency>
-
-    <dependency>
-      <groupId>org.onap.so</groupId>
-      <artifactId>asdc-controller</artifactId>
-      <version>${project.version}</version>
-      <scope>test</scope>
-      <classifier>classes</classifier>
-    </dependency>
-
-    <dependency>
-      <groupId>org.onap.sdc.sdc-distribution-client</groupId>
-      <artifactId>sdc-distribution-client</artifactId>
-      <version>1.3.0</version>
-      <scope>test</scope>
-    </dependency>
-
-    <dependency>
-      <groupId>org.onap.so</groupId>
-      <artifactId>mso-catalog-db</artifactId>
-      <version>${project.version}</version>
-      <scope>test</scope>
-    </dependency>
-    <!-- FOR JMETER -->
-    <dependency>
-      <groupId>org.apache.jmeter</groupId>
-      <artifactId>ApacheJMeter_core</artifactId>
-      <version>2.13</version>
-
-      <scope>test</scope>
-      <exclusions>
-        <exclusion>
-          <artifactId>commons-math3</artifactId>
-          <groupId>commons-math3</groupId>
-        </exclusion>
-        <exclusion>
-          <artifactId>commons-pool2</artifactId>
-          <groupId>commons-pool2</groupId>
-        </exclusion>
-      </exclusions>
-    </dependency>
-
-    <dependency>
-      <groupId>org.apache.jmeter</groupId>
-      <artifactId>ApacheJMeter_http</artifactId>
-      <version>2.13</version>
-
-      <scope>test</scope>
-      <exclusions>
-        <exclusion>
-          <artifactId>commons-math3</artifactId>
-          <groupId>commons-math3</groupId>
-        </exclusion>
-        <exclusion>
-          <artifactId>commons-pool2</artifactId>
-          <groupId>commons-pool2</groupId>
-        </exclusion>
-      </exclusions>
-    </dependency>
-
-    <dependency>
-      <groupId>org.apache.jmeter</groupId>
-      <artifactId>ApacheJMeter_jdbc</artifactId>
-      <version>2.13</version>
-
-      <scope>test</scope>
-      <exclusions>
-        <exclusion>
-          <artifactId>commons-math3</artifactId>
-          <groupId>commons-math3</groupId>
-        </exclusion>
-        <exclusion>
-          <artifactId>commons-pool2</artifactId>
-          <groupId>commons-pool2</groupId>
-        </exclusion>
-      </exclusions>
-    </dependency>
-
-    <!-- END FOR JMETER -->
-  </dependencies>
-
-  <build>
-    <finalName>arquillian-tests</finalName>
-    <plugins>
-      <plugin>
-        <groupId>org.codehaus.groovy.maven</groupId>
-        <artifactId>gmaven-plugin</artifactId>
-        <version>1.0</version>
-        <executions>
-          <execution>
-            <phase>generate-resources</phase>
-            <goals>
-              <goal>execute</goal>
-            </goals>
-            <configuration>
-			          <source>
-			            if ( project.properties['docker.host'] != null ) {
-			          		project.properties['docker.host.truncated']=project.properties['docker.host'].replaceFirst("^(http://|https://)","");
-			          		int indexPort = project.properties['docker.host.truncated'].indexOf(":");
-			          		project.properties['docker.host.truncated']=project.properties['docker.host.truncated'].substring(0,indexPort);
-			          		println 'docker.host.truncated:'+ project.properties['docker.host.truncated'];
-			          	} else {
-			          		project.properties['docker.host.truncated']="127.0.0.1";
-			          		project.properties['docker.host']="unix:///var/run/docker.sock"
-			          	}
-
-			          	if ( project.properties['mso.project.version'].endsWith("-SNAPSHOT") ) {
-			          		project.properties['mso.version']="latest";
-			          	} else {
-			          		project.properties['mso.version']=project.properties['mso.project.version'];
-			          	}
-			          </source>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-
-
-      <!-- <plugin>
-        <groupId>org.codehaus.mojo</groupId>
-        <artifactId>wagon-maven-plugin</artifactId>
-        <version>1.0</version>
-        <executions>
-          <execution>
-            <id>download-mariadb-connector</id>
-            <phase>pre-integration-test</phase>
-            <goals>
-              <goal>download-single</goal>
-            </goals>
-            <configuration>
-              <url>http://central.maven.org/</url>
-              <fromFile>maven2/org/mariadb/jdbc/mariadb-java-client/1.5.4/mariadb-java-client-1.5.4.jar</fromFile>
-              <toDir>${project.build.directory}/mariadb-connector</toDir>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin> -->
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-failsafe-plugin</artifactId>
-        <version>2.16</version>
-
-        <executions>
-          <execution>
-            <goals>
-              <goal>integration-test</goal>
-              <goal>verify</goal>
-            </goals>
-            <configuration>
-              <skipAfterFailureCount>1</skipAfterFailureCount>
-            </configuration>
-          </execution>
-        </executions>
-
-        <configuration>
-          <systemPropertyVariables>
-            <arquillian.launch>${container-to-start}</arquillian.launch>
-            <target.folder>${project.build.directory}</target.folder>
-            <docker.url>${docker.host}</docker.url>
-            <docker.hostname>${docker.host.truncated}</docker.hostname>
-            <images.version>${mso.version}</images.version>
-          </systemPropertyVariables>
-          <reportsDirectory>${project.build.directory}/surefire-reports</reportsDirectory>
-          <testFailureIgnore>true</testFailureIgnore>
-          <includes>
-            <include>${it-suite-to-execute}</include>
-          </includes>
-        </configuration>
-      </plugin>
-
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-surefire-plugin</artifactId>
-
-        <configuration>
-          <skipTests>true</skipTests>
-        </configuration>
-      </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.-->
-    		<!-- Added to ensure that eclipse doesn't complain about executing gmaven during the generate-resources phase of the build. -->
-    		<plugin>
-    			<groupId>org.eclipse.m2e</groupId>
-    			<artifactId>lifecycle-mapping</artifactId>
-    			<version>1.0.0</version>
-    			<configuration>
-    				<lifecycleMappingMetadata>
-    					<pluginExecutions>
-    						<pluginExecution>
-    							<pluginExecutionFilter>
-    								<groupId>
-    									org.codehaus.groovy.maven
-    								</groupId>
-    								<artifactId>
-    									gmaven-plugin
-    								</artifactId>
-    								<versionRange>[1.0,)</versionRange>
-    								<goals>
-    									<goal>execute</goal>
-    								</goals>
-    							</pluginExecutionFilter>
-    							<action>
-    								<ignore></ignore>
-    							</action>
-    						</pluginExecution>
-    					</pluginExecutions>
-    				</lifecycleMappingMetadata>
-    			</configuration>
-    		</plugin>
-    	</plugins>
-    </pluginManagement>
-  </build>
-
-</project>
diff --git a/packages/arquillian-unit-tests/src/test/java/org/openecomp/mso/filesearching/LogFileSearching.java b/packages/arquillian-unit-tests/src/test/java/org/openecomp/mso/filesearching/LogFileSearching.java
deleted file mode 100644
index fba28ac..0000000
--- a/packages/arquillian-unit-tests/src/test/java/org/openecomp/mso/filesearching/LogFileSearching.java
+++ /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=========================================================
- */
-
-package org.openecomp.mso.filesearching;
-
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.FileOutputStream;
-import java.io.FileWriter;
-import java.io.IOException;
-import java.io.PrintWriter;
-import java.io.UnsupportedEncodingException;
-import java.util.NoSuchElementException;
-import java.util.Scanner;
-
-public class LogFileSearching {
-	
-	private static PrintWriter writer;
-	
-	public static void initFile(String filePath) {
-		if (writer == null) {
-			try {
-				// This is to reopen an existing file
-				writer = new PrintWriter(new FileOutputStream(filePath,true));
-			} catch ( IOException e) {
-				System.out.println("Exception caught when trying to open the file /tmp/mso-log-checker.log to dump the result");
-				e.printStackTrace();
-			}
-		}
-	}
-	
-	public static void closeFile() {
-		if (writer != null) {
-			writer.close();
-			writer = null;
-		}
-	}
-	
-	
-	public static boolean searchInFile(final String needle, final File file) throws FileNotFoundException {
-		Scanner logScanner = new Scanner(file);
-		try {
-			writer.println("Searching pattern " + needle + " in " + file.getAbsolutePath());
-			//System.out.println("Searching pattern " + needle + " in " + file.getAbsolutePath());
-
-			String filedata = logScanner.useDelimiter("\\Z").next();
-
-			int occurrences = 0;
-			int index = 0;
-
-			while (index < filedata.length() && (index = filedata.indexOf(needle, index)) >= 0) {
-				occurrences++;
-				
-				int separatorIndex = filedata.indexOf(System.getProperty("line.separator"), index);
-				if (separatorIndex >=0){
-					writer.println("FOUND:"	+ filedata.substring(index, separatorIndex));
-					//System.out.println("FOUND:"
-						//	+ filedata.substring(index, separatorIndex));
-				} else {
-					writer.println("FOUND:"	+ filedata.substring(index, filedata.length()-1));
-					//System.out.println("FOUND:"
-						//	+ filedata.substring(index, filedata.length()-1));
-				}
-				index += needle.length();
-			}
-			writer.println("TOTAL:" + occurrences + " FOUND");
-			//System.out.println("TOTAL:" + occurrences + " FOUND");
-			if (occurrences > 0) {
-
-				return true;
-			} else {
-
-				return false;
-			}
-		} catch (NoSuchElementException e) {
-			writer.println("TOTAL:0 FOUND");
-			//System.out.println("TOTAL:0 FOUND");
-			return false;
-		} finally {
-			logScanner.close();
-		}
-	}
-
-	public static boolean searchInDirectory(final String needle, final File directory) throws FileNotFoundException {
-
-		boolean res = false;
-		String[] dirFiles = directory.list();
-
-		if (dirFiles != null) {
-
-			for (String dir : dirFiles) {
-				res = res || searchInDirectory(needle, new File(directory.getAbsolutePath() + "/" + dir));
-			}
-
-		} else {
-			return LogFileSearching.searchInFile(needle, directory);
-		}
-		return res;
-	}
-	
-	public static boolean searchInDirectoryForCommonIssues(final String[] needles, final File directory) throws FileNotFoundException {
-		String[] defaultPatternsToUse = {"ClassNotFound","NullPointer","RuntimeException","IllegalStateException","FATAL"};
-		
-		if (needles != null && needles.length>0) {
-			defaultPatternsToUse=needles;
-		}
-		
-		boolean returnValue=false;
-		for (String needle:defaultPatternsToUse) {
-			returnValue |= LogFileSearching.searchInDirectory(needle,directory);
-		}
-				
-		return returnValue;
-	}
-}
diff --git a/packages/arquillian-unit-tests/src/test/java/org/openecomp/mso/global_tests/ArquillianPackagerForITCases.java b/packages/arquillian-unit-tests/src/test/java/org/openecomp/mso/global_tests/ArquillianPackagerForITCases.java
deleted file mode 100644
index 200e1d2..0000000
--- a/packages/arquillian-unit-tests/src/test/java/org/openecomp/mso/global_tests/ArquillianPackagerForITCases.java
+++ /dev/null
@@ -1,77 +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.global_tests;
-
-import java.io.File;
-import java.io.IOException;
-import java.nio.file.DirectoryStream;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.nio.file.Paths;
-import java.util.Iterator;
-
-import org.jboss.shrinkwrap.api.Archive;
-import org.jboss.shrinkwrap.api.ShrinkWrap;
-import org.jboss.shrinkwrap.api.spec.EnterpriseArchive;
-import org.jboss.shrinkwrap.api.spec.JavaArchive;
-import org.jboss.shrinkwrap.api.spec.WebArchive;
-
-public class ArquillianPackagerForITCases {
-
-	public static Archive<?> createPackageFromExistingOne(String path, String globPattern, String newPackageName) {
-		Path dir = Paths.get(path);
-
-		try (DirectoryStream<Path> stream = Files.newDirectoryStream(dir, globPattern)) {
-			Iterator<Path> it = stream.iterator();
-			if (it.hasNext()) {
-
-				if (newPackageName.endsWith(".war")) {
-					File archive = it.next().toFile();
-					WebArchive webArchive = ShrinkWrap.create(WebArchive.class, newPackageName);
-					webArchive.merge((ShrinkWrap.createFromZipFile(WebArchive.class, archive)));
-					return webArchive;
-				} else if (newPackageName.endsWith(".jar")) {
-					File archive = it.next().toFile();
-					JavaArchive javaArchive = ShrinkWrap.create(JavaArchive.class, newPackageName);
-					javaArchive.merge((ShrinkWrap.createFromZipFile(JavaArchive.class, archive)));
-					return javaArchive;
-				} else if (newPackageName.endsWith(".ear")) {
-					File archive = it.next().toFile();
-					EnterpriseArchive earArchive = ShrinkWrap.create(EnterpriseArchive.class, newPackageName);
-					earArchive.merge((ShrinkWrap.createFromZipFile(EnterpriseArchive.class, archive)));
-					return earArchive;
-				} else {
-					return null;
-				}
-
-			} else {
-				return null;
-			}
-
-		} catch (IOException e) {
-			e.printStackTrace();
-			return null;
-		}
-
-	}
-	
-	
-}
diff --git a/packages/arquillian-unit-tests/src/test/java/org/openecomp/mso/global_tests/IntegrationTestsSuite.java b/packages/arquillian-unit-tests/src/test/java/org/openecomp/mso/global_tests/IntegrationTestsSuite.java
deleted file mode 100644
index 24f6627..0000000
--- a/packages/arquillian-unit-tests/src/test/java/org/openecomp/mso/global_tests/IntegrationTestsSuite.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.global_tests;
-
-import org.junit.runner.RunWith;
-import org.junit.runners.Suite;
-import org.junit.runners.Suite.SuiteClasses;
-
-//import org.openecomp.mso.global_tests.appc.AppCAdapterITCase;
-import org.openecomp.mso.global_tests.asdc.ASDCITCase;
-import org.openecomp.mso.global_tests.logging.LogsCheckerITCase;
-import org.openecomp.mso.global_tests.soapui.SoapUiITCase;
-
-
-@RunWith(Suite.class)
-@SuiteClasses({
-
-//	MSOUiITCase.class,
-//	AppCAdapterITCase.class,
-//	SoapUiITCase.class,
-//	ASDCITCase.class,
-//	LogsCheckerITCase.class
-
-})
-public class IntegrationTestsSuite {
-
-}
diff --git a/packages/arquillian-unit-tests/src/test/java/org/openecomp/mso/global_tests/asdc/ASDCITCase.java b/packages/arquillian-unit-tests/src/test/java/org/openecomp/mso/global_tests/asdc/ASDCITCase.java
deleted file mode 100644
index 17dc67d..0000000
--- a/packages/arquillian-unit-tests/src/test/java/org/openecomp/mso/global_tests/asdc/ASDCITCase.java
+++ /dev/null
@@ -1,518 +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.global_tests.asdc;
-
-import static org.junit.Assert.*;
-
-import java.io.File;
-import java.io.IOException;
-import java.lang.reflect.Method;
-import java.net.URISyntaxException;
-import java.security.NoSuchAlgorithmException;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.LinkedList;
-
-import org.jboss.arquillian.container.test.api.Deployment;
-import org.jboss.arquillian.container.test.api.OperateOnDeployment;
-import org.jboss.arquillian.container.test.api.Testable;
-import org.jboss.arquillian.junit.Arquillian;
-import org.jboss.shrinkwrap.api.Archive;
-import org.jboss.shrinkwrap.api.ShrinkWrap;
-import org.jboss.shrinkwrap.api.spec.JavaArchive;
-import org.jboss.shrinkwrap.api.spec.WebArchive;
-import org.jboss.shrinkwrap.resolver.api.maven.Maven;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.BeforeClass;
-import org.junit.AfterClass;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
-import org.onap.sdc.api.consumer.IDistributionStatusMessage;
-import org.onap.sdc.api.notification.IArtifactInfo;
-import org.onap.sdc.api.notification.IResourceInstance;
-import org.openecomp.mso.asdc.installer.VfModuleMetaData;
-import org.openecomp.mso.asdc.installer.IVfModuleData;
-import org.onap.sdc.utils.DistributionStatusEnum;
-import org.openecomp.mso.asdc.client.ASDCConfiguration;
-import org.openecomp.mso.asdc.client.ASDCController;
-import org.openecomp.mso.asdc.client.exceptions.ASDCControllerException;
-import org.openecomp.mso.asdc.client.exceptions.ASDCParametersException;
-import org.openecomp.mso.asdc.client.exceptions.ArtifactInstallerException;
-import org.openecomp.mso.db.catalog.CatalogDatabase;
-import org.openecomp.mso.db.catalog.beans.HeatEnvironment;
-import org.openecomp.mso.db.catalog.beans.HeatFiles;
-import org.openecomp.mso.db.catalog.beans.HeatTemplate;
-import org.openecomp.mso.db.catalog.beans.Service;
-import org.openecomp.mso.db.catalog.beans.VfModule;
-import org.openecomp.mso.db.catalog.beans.VnfResource;
-import org.openecomp.mso.global_tests.ArquillianPackagerForITCases;
-import org.openecomp.mso.global_tests.asdc.notif_emulator.DistributionClientEmulator;
-import org.openecomp.mso.global_tests.asdc.notif_emulator.JsonNotificationData;
-
-@RunWith(Arquillian.class)
-public class ASDCITCase {
-
-	/**
-	 * Add the resources in the right folder of a jar
-	 * @param jar The jarArchive
-	 * @param dir The main dir containing things that must be added
-	 * @throws Exception In case of issues with the files
-	 */
-	private static void addFiles(JavaArchive jar, File dir,String destFolder) throws Exception  {
-
-		if (!dir.isDirectory()) {
-			throw new Exception("not a directory");
-		}
-		for (File f : dir.listFiles()) {
-
-
-			if (f.isFile()) {
-				jar.addAsResource(f, destFolder + "/" + f.getName());
-			} else {
-
-				addFiles(jar, f, destFolder+"/"+f.getName());
-			}
-		}
-	}
-
-	@Deployment(name="asdc-controller",testable=true)
-	public static Archive<?> createAsdcControllerWarDeployment () throws Exception {
-		System.out.println("Deploying ASDC Controller WAR with additional resources on default server");
-
-		WebArchive warArchive = (WebArchive)ArquillianPackagerForITCases.createPackageFromExistingOne("../../asdc-controller/target/", "asdc-controller*.war", "asdc-controller.war");
-
-		// Add the current test class
-		JavaArchive testclasses = ShrinkWrap.create (JavaArchive.class, "testClasses.jar");
-
-		testclasses.addPackage("org.openecomp.mso.global_tests.asdc.notif_emulator");
-
-		addFiles(testclasses,new File(Thread.currentThread().getContextClassLoader().getResource("resource-examples/asdc").getFile()),"resource-examples/asdc");
-
-		System.out.println(testclasses.toString(true));
-		warArchive.addAsLibraries(testclasses);
-
-
-
-		// BE CAREFUL a settings.xml file must be located in ${home.user}/.m2/settings.xml
-		warArchive.addAsLibraries(Maven.resolver()
-				.resolve("org.mockito:mockito-all:1.10.19")
-				.withoutTransitivity ()
-				.asFile ());
-
-		//warArchive.addPackage("org.openecomp.mso.global_tests.asdc.notif_emulator");
-		//addFiles(warArchive,new File(ASDCITCase.class.getClassLoader().getResource("resource-examples").getPath()),"resource-examples");
-
-		// Take one war randomly to make arquilian happy
-		Testable.archiveToTest(warArchive);
-
-
-		System.out.println(warArchive.toString(true));
-
-		return warArchive;
-	}
-
-	@BeforeClass
-	public static final void waitBeforeStart() throws InterruptedException,
-			IOException,
-			URISyntaxException,
-			NoSuchAlgorithmException {
-		System.out.println("Executing " + ASDCITCase.class.getName());
-	}
-
-	@AfterClass
-	public static final void waitAfterStart() throws InterruptedException,
-			IOException,
-			URISyntaxException,
-			NoSuchAlgorithmException {
-		System.out.println("Waiting 60000ms " + ASDCITCase.class.getName());
-		Thread.sleep(60000);
-	}
-
-	/**
-	 * Be careful when using that notification fake structure, the UUID of notif artifacts MUST be different.
-	 * There is a static Map behind the scene.
-	 */
-	private JsonNotificationData notifDataWithoutModuleInfo;
-	private DistributionClientEmulator distribClientWithoutModuleInfo;
-
-	private JsonNotificationData notifDataV1, notifDataV2, notifDataV3, notifDataV4, notifDataV5,notifDataDNS,notifDataVFW;
-	private DistributionClientEmulator distribClientV1, distribClientV2, distribClientV3, distribClientV4, distribClientV5, distribClientV1ForSameNotif, distribClientDNS,distribClientVFW;
-
-
-	@Before
-	public final void beforeEachTest() throws IOException {
-
-		distribClientV1= new DistributionClientEmulator("/resource-examples/asdc/simpleNotif-V1");
-		distribClientV1ForSameNotif= new DistributionClientEmulator("/resource-examples/asdc/simpleNotif-V1");
-		notifDataV1 = JsonNotificationData.instantiateNotifFromJsonFile("/resource-examples/asdc/simpleNotif-V1");
-
-		// This is a duplicate in version 2 of the version 1
-		distribClientV2= new DistributionClientEmulator("/resource-examples/asdc/simpleNotif-V2");
-		notifDataV2 = JsonNotificationData.instantiateNotifFromJsonFile("/resource-examples/asdc/simpleNotif-V2");
-
-		distribClientV3= new DistributionClientEmulator("/resource-examples/asdc/simpleNotif-V3");
-		notifDataV3 = JsonNotificationData.instantiateNotifFromJsonFile("/resource-examples/asdc/simpleNotif-V3");
-
-		// This is a duplicate in version 4 of the version 3
-		distribClientV4= new DistributionClientEmulator("/resource-examples/asdc/simpleNotif-V4");
-		notifDataV4 = JsonNotificationData.instantiateNotifFromJsonFile("/resource-examples/asdc/simpleNotif-V4");
-
-		// This notification is to test the deployment of volume with nested + an artifact not used (should send notification with DEPLOY_ERROR
-		distribClientV5= new DistributionClientEmulator("/resource-examples/asdc/simpleNotif-V5");
-		notifDataV5 = JsonNotificationData.instantiateNotifFromJsonFile("/resource-examples/asdc/simpleNotif-V5");
-
-
-		distribClientWithoutModuleInfo= new DistributionClientEmulator("/resource-examples/asdc/notif-without-modules-metadata");
-		notifDataWithoutModuleInfo = JsonNotificationData.instantiateNotifFromJsonFile("/resource-examples/asdc/notif-without-modules-metadata");
-
-
-		distribClientDNS= new DistributionClientEmulator("/resource-examples/asdc/demo-dns-V1");
-		notifDataDNS = JsonNotificationData.instantiateNotifFromJsonFile("/resource-examples/asdc/demo-dns-V1");
-
-
-		distribClientVFW= new DistributionClientEmulator("/resource-examples/asdc/demo-vfw-V1");
-		notifDataVFW = JsonNotificationData.instantiateNotifFromJsonFile("/resource-examples/asdc/demo-vfw-V1");
-
-
-	}
-
-	@Test
-	@OperateOnDeployment("asdc-controller")
-	public void testNotifWithoutModuleInfo () throws NoSuchAlgorithmException,
-			IOException,
-			URISyntaxException,
-			ArtifactInstallerException, ASDCControllerException, ASDCParametersException {
-
-
-
-		ASDCController asdcController = new ASDCController("asdc-controller1", distribClientWithoutModuleInfo);
-		asdcController.initASDC();
-		asdcController.treatNotification(notifDataWithoutModuleInfo);
-
-		assertTrue(distribClientWithoutModuleInfo.getDistributionMessageReceived().size() > 0);
-
-		int badDeployment=0;
-		for (IDistributionStatusMessage message:distribClientWithoutModuleInfo.getDistributionMessageReceived()) {
-			System.out.println("Message received, URL:"+message.getArtifactURL()+", Value:"+message.getStatus().name());
-			if(message.getStatus().equals(DistributionStatusEnum.DEPLOY_ERROR)) {
-				badDeployment++;
-			}
-		}
-		assertTrue(badDeployment == 3);
-
-		// Check if something has been recorder in DB, as it should not
-		CatalogDatabase catalogDB = CatalogDatabase.getInstance();
-
-		HeatTemplate heatTemplate = catalogDB.getHeatTemplate("Whot-nimbus-oam_v1.0.yaml", "1.0", "resourceName-1");
-		assertNull(heatTemplate);
-	}
-
-	private void validateVnfResource(JsonNotificationData inputNotification, List<IVfModuleData> moduleList) {
-
-		CatalogDatabase catalogDB = CatalogDatabase.getInstance();
-
-
-		for (IResourceInstance resource:inputNotification.getResources()) {
-			VnfResource vnfResourceDB = catalogDB.getVnfResource(inputNotification.getServiceName()+"/"+resource.getResourceInstanceName(), inputNotification.getServiceVersion());
-			assertNotNull(vnfResourceDB);
-
-			//assertTrue(vnfResourceDB.getAsdcUuid().equals(resource.getResourceUUID()));
-			assertTrue(vnfResourceDB.getDescription().equals(inputNotification.getServiceDescription()));
-			assertTrue(vnfResourceDB.getModelInvariantUuid().equals(resource.getResourceInvariantUUID()));
-			assertTrue(vnfResourceDB.getModelVersion().equals(resource.getResourceVersion()));
-			assertTrue(vnfResourceDB.getOrchestrationMode().equals("HEAT"));
-			assertTrue(vnfResourceDB.getVersion().equals(inputNotification.getServiceVersion()));
-			//assertTrue(vnfResourceDB.getVnfType().equals(inputNotification.getServiceName()+"/"+resource.getResourceInstanceName()));
-			//assertTrue(vnfResourceDB.getModelCustomizationName().equals(resource.getResourceInstanceName()));
-			assertTrue(vnfResourceDB.getModelName().equals(resource.getResourceName()));
-			//assertTrue(vnfResourceDB.getServiceModelInvariantUUID().equals(inputNotification.getServiceInvariantUUID()));
-
-			for (IVfModuleData module:moduleList) {
-
-				VfModule vfModuleDB = catalogDB.getVfModuleModelName(module.getVfModuleModelName(),inputNotification.getServiceVersion());
-				assertNotNull(vfModuleDB);
-				assertTrue(module.getVfModuleModelName().equals(vfModuleDB.getModelName()));
-
-			//	assertTrue((inputNotification.getServiceName()+"/"+resource.getResourceInstanceName()+"::"+vfModuleDB.getModelName()).equals(vfModuleDB.getType()));
-			//	assertTrue(vnfResourceDB.getId()!=0);
-				//assertNotNull(vfModuleDB.getVnfResourceId());
-
-			//	assertTrue(vnfResourceDB.getId()==vfModuleDB.getVnfResourceId().intValue());
-
-				for (String artifactUUID:module.getArtifacts()) {
-					IArtifactInfo artifact = null;
-					for (IArtifactInfo artifactTemp:resource.getArtifacts()) {
-						if (artifactTemp.getArtifactUUID().equals(artifactUUID)) {
-							artifact = artifactTemp;
-							break;
-						}
-					}
-					assertNotNull(artifact);
-
-					switch (artifact.getArtifactType()) {
-						case ASDCConfiguration.HEAT:
-							HeatTemplate heatTemplateDB= catalogDB.getHeatTemplate(vfModuleDB.getHeatTemplateArtifactUUId());
-							assertNotNull(heatTemplateDB);
-							//assertTrue(heatTemplateDB.getAsdcResourceName().equals(resource.getResourceName()));
-							assertTrue(heatTemplateDB.getAsdcUuid().equals(artifact.getArtifactUUID()));
-							assertTrue(heatTemplateDB.getDescription().equals(artifact.getArtifactDescription()));
-							assertTrue(heatTemplateDB.getTemplateBody() != null && !heatTemplateDB.getTemplateBody().isEmpty());
-							assertTrue(heatTemplateDB.getParameters().size()>0);
-
-							assertTrue(heatTemplateDB.getTemplateName().equals(artifact.getArtifactName()));
-
-							if (artifact.getArtifactTimeout() != null) {
-								assertTrue(heatTemplateDB.getTimeoutMinutes()== artifact.getArtifactTimeout().intValue());
-							} else {
-								assertTrue(heatTemplateDB.getTimeoutMinutes()== 240);
-							}
-							assertTrue(heatTemplateDB.getVersion().equals(artifact.getArtifactVersion()));
-
-							assertFalse(heatTemplateDB.getTemplateBody().contains("file:///"));
-							break;
-						case ASDCConfiguration.HEAT_ENV:
-
-							HeatEnvironment heatEnvironmentDB = catalogDB.getHeatEnvironment(artifact.getArtifactName(), artifact.getArtifactVersion(), inputNotification.getServiceName()+"/"+resource.getResourceInstanceName());
-
-							assertNotNull(heatEnvironmentDB);
-//							assertTrue((vfModuleDB.getVolEnvironmentId() != null && vfModuleDB.getVolEnvironmentId().intValue() == heatEnvironmentDB.getId())
-//									|| (vfModuleDB.getEnvironmentId() != null && vfModuleDB.getEnvironmentId() == heatEnvironmentDB.getId()));
-//
-//							assertTrue(heatEnvironmentDB.getAsdcResourceName().equals(inputNotification.getServiceName()+"/"+resource.getResourceInstanceName()));
-//
-//							assertTrue(heatEnvironmentDB.getAsdcUuid().equals(artifact.getArtifactUUID()));
-							assertTrue(heatEnvironmentDB.getDescription().equals(artifact.getArtifactDescription()));
-							assertTrue(heatEnvironmentDB.getVersion().equals(artifact.getArtifactVersion()));
-							assertTrue(heatEnvironmentDB.getName().equals(artifact.getArtifactName()));
-							assertTrue(heatEnvironmentDB.getEnvironment() != null);
-							assertFalse(heatEnvironmentDB.getEnvironment().contains("file:///"));
-
-							break;
-						case ASDCConfiguration.HEAT_NESTED:
-							Map<String,Object> listNestedDBMainHeat=new HashMap<String,Object>();
-							Map<String,Object> listNestedDBVolHeat=new HashMap<String,Object>();
-
-							if (vfModuleDB.getHeatTemplateArtifactUUId() != null) {
-								listNestedDBMainHeat = catalogDB.getNestedTemplates(vfModuleDB.getHeatTemplateArtifactUUId());
-							}
-							if (vfModuleDB.getVolHeatTemplateArtifactUUId() != null) {
-								listNestedDBVolHeat = catalogDB.getNestedTemplates(vfModuleDB.getVolHeatTemplateArtifactUUId());
-							}
-
-							assertTrue(listNestedDBMainHeat.size() > 0 || listNestedDBVolHeat.size() > 0);
-
-
-							assertTrue(listNestedDBMainHeat.get(artifact.getArtifactName()) != null
-									|| listNestedDBVolHeat.get(artifact.getArtifactName()) != null);
-
-							HeatTemplate rightNestedTemplateDB = catalogDB.getHeatTemplate(artifact.getArtifactName(), artifact.getArtifactVersion(), resource.getResourceName());
-							assertNotNull(rightNestedTemplateDB);
-							//assertTrue(catalogDB.getNestedHeatTemplate(vfModuleDB.getTemplateId(), rightNestedTemplateDB.getId()) != null || catalogDB.getNestedHeatTemplate(vfModuleDB.getVolTemplateId(), rightNestedTemplateDB.getId()) != null);
-
-							//assertTrue(rightNestedTemplateDB.getAsdcResourceName().equals(resource.getResourceName()));
-							assertTrue(rightNestedTemplateDB.getAsdcUuid().equals(artifact.getArtifactUUID()));
-							assertTrue(rightNestedTemplateDB.getDescription().equals(artifact.getArtifactDescription()));
-							assertTrue(rightNestedTemplateDB.getTemplateBody() != null && !rightNestedTemplateDB.getTemplateBody().isEmpty());
-							assertTrue(rightNestedTemplateDB.getTemplateName().equals(artifact.getArtifactName()));
-
-							if (artifact.getArtifactTimeout() != null) {
-								assertTrue(rightNestedTemplateDB.getTimeoutMinutes()== artifact.getArtifactTimeout().intValue());
-							} else {
-								assertTrue(rightNestedTemplateDB.getTimeoutMinutes()== 240);
-							}
-							assertTrue(rightNestedTemplateDB.getVersion().equals(artifact.getArtifactVersion()));
-							assertFalse(rightNestedTemplateDB.getTemplateBody().contains("file:///"));
-
-							break;
-						case ASDCConfiguration.HEAT_VOL:
-							HeatTemplate heatTemplateVolDB = catalogDB.getHeatTemplate(vfModuleDB.getVolHeatTemplateArtifactUUId());
-							assertNotNull(heatTemplateVolDB);
-
-							//assertTrue(heatTemplateVolDB.getAsdcResourceName().equals(resource.getResourceName()));
-							assertTrue(heatTemplateVolDB.getAsdcUuid().equals(artifact.getArtifactUUID()));
-							assertTrue(heatTemplateVolDB.getDescription().equals(artifact.getArtifactDescription()));
-							assertTrue(heatTemplateVolDB.getTemplateBody() != null && !heatTemplateVolDB.getTemplateBody().isEmpty());
-							assertTrue(heatTemplateVolDB.getTemplateName().equals(artifact.getArtifactName()));
-
-							if (artifact.getArtifactTimeout() != null) {
-								assertTrue(heatTemplateVolDB.getTimeoutMinutes()== artifact.getArtifactTimeout().intValue());
-							} else {
-								assertTrue(heatTemplateVolDB.getTimeoutMinutes()== 240);
-							}
-							assertTrue(heatTemplateVolDB.getVersion().equals(artifact.getArtifactVersion()));
-							assertFalse(heatTemplateVolDB.getTemplateBody().contains("file:///"));
-
-							break;
-						case ASDCConfiguration.HEAT_ARTIFACT:
-							Map<String,HeatFiles> heatFilesDB= catalogDB.getHeatFilesForVfModule(vfModuleDB.getModelUUID());
-							assertTrue(heatFilesDB.size()>0);
-							HeatFiles rightHeatFilesDB=heatFilesDB.get( artifact.getArtifactName());
-							assertNotNull(rightHeatFilesDB);
-
-							//assertTrue(rightHeatFilesDB.getAsdcResourceName().equals(resource.getResourceName()));
-							assertTrue(rightHeatFilesDB.getAsdcUuid().equals(artifact.getArtifactUUID()));
-							assertTrue(rightHeatFilesDB.getDescription().equals(artifact.getArtifactDescription()));
-							assertTrue(rightHeatFilesDB.getFileBody() != null && !rightHeatFilesDB.getFileBody().isEmpty());
-							assertTrue(rightHeatFilesDB.getFileName().equals( artifact.getArtifactName()));
-							assertTrue(rightHeatFilesDB.getVersion().equals(artifact.getArtifactVersion()));
-
-							break;
-						default:
-							break;
-
-					}
-				}
-
-			}
-
-		}
-
-		Service service = catalogDB.getServiceByModelUUID(inputNotification.getServiceUUID());
-		assertNotNull(service);
-		assertTrue(service.getCreated() !=null && service.getCreated().getTime()>0);
-		assertTrue(service.getDescription().equals(inputNotification.getServiceDescription()));
-		assertTrue(service.getModelInvariantUUID().equals(inputNotification.getServiceInvariantUUID()));
-		assertTrue(service.getModelName().equals(inputNotification.getServiceName()));
-		assertTrue(service.getModelUUID().equals(inputNotification.getServiceUUID()));
-		assertTrue(service.getVersion().equals(inputNotification.getServiceVersion()));
-
-	}
-
-	@Test
-	@OperateOnDeployment("asdc-controller")
-	public void testNotifsDeployment () throws NoSuchAlgorithmException,
-			IOException,
-			URISyntaxException,
-			ArtifactInstallerException, ASDCControllerException, ASDCParametersException {
-
-
-
-		ASDCController asdcControllerV1 = new ASDCController("asdc-controller1", distribClientV1);
-		asdcControllerV1.initASDC();
-		asdcControllerV1.treatNotification(notifDataV1);
-
-		assertTrue(distribClientV1.getDistributionMessageReceived().size() > 0);
-		for (IDistributionStatusMessage message:distribClientV1.getDistributionMessageReceived()) {
-			System.out.println("Message received, URL:"+message.getArtifactURL()+", Value:"+message.getStatus().name());
-			assertTrue(message.getStatus().equals(DistributionStatusEnum.DEPLOY_OK) || message.getStatus().equals(DistributionStatusEnum.DOWNLOAD_OK));
-		}
-
-		this.validateVnfResource(notifDataV1,distribClientV1.getListVFModuleMetaData());
-
-
-
-		// Try again to load the same notif
-		ASDCController asdcControllerNewNotif = new ASDCController("asdc-controller1", distribClientV1ForSameNotif);
-		asdcControllerNewNotif.initASDC();
-		asdcControllerNewNotif.treatNotification(notifDataV1);
-
-		for (IDistributionStatusMessage message:distribClientV1ForSameNotif.getDistributionMessageReceived()) {
-			System.out.println("Message received, URL:"+message.getArtifactURL()+", Value:"+message.getStatus().name());
-			assertTrue(message.getStatus().equals(DistributionStatusEnum.ALREADY_DEPLOYED) || message.getStatus().equals(DistributionStatusEnum.ALREADY_DOWNLOADED));
-		}
-
-
-		// Try again to load same notif but in V2
-		ASDCController asdcControllerV2 = new ASDCController("asdc-controller1", distribClientV2);
-		asdcControllerV2.initASDC();
-		asdcControllerV2.treatNotification(notifDataV2);
-
-		for (IDistributionStatusMessage message:distribClientV2.getDistributionMessageReceived()) {
-			System.out.println("Message received, URL:"+message.getArtifactURL()+", Value:"+message.getStatus().name());
-			assertTrue(message.getStatus().equals(DistributionStatusEnum.DEPLOY_OK) || message.getStatus().equals(DistributionStatusEnum.DOWNLOAD_OK));
-		}
-
-		this.validateVnfResource(notifDataV2,distribClientV2.getListVFModuleMetaData());
-
-
-		// Try again to load same notif + Script + Volume artifacts and in service V3
-		ASDCController asdcControllerV3 = new ASDCController("asdc-controller1", distribClientV3);
-		asdcControllerV3.initASDC();
-		asdcControllerV3.treatNotification(notifDataV3);
-
-		for (IDistributionStatusMessage message:distribClientV3.getDistributionMessageReceived()) {
-			System.out.println("Message received, URL:"+message.getArtifactURL()+", Value:"+message.getStatus().name());
-			assertTrue(message.getStatus().equals(DistributionStatusEnum.DEPLOY_OK) || message.getStatus().equals(DistributionStatusEnum.DOWNLOAD_OK));
-		}
-
-		this.validateVnfResource(notifDataV3,distribClientV3.getListVFModuleMetaData());
-
-		// Try again to load same notif + Script + Volume artifacts and in service V4
-		ASDCController asdcControllerV4 = new ASDCController("asdc-controller1", distribClientV4);
-		asdcControllerV4.initASDC();
-		asdcControllerV4.treatNotification(notifDataV4);
-
-		for (IDistributionStatusMessage message:distribClientV4.getDistributionMessageReceived()) {
-			System.out.println("Message received, URL:"+message.getArtifactURL()+", Value:"+message.getStatus().name());
-			assertTrue(message.getStatus().equals(DistributionStatusEnum.DEPLOY_OK) || message.getStatus().equals(DistributionStatusEnum.DOWNLOAD_OK));
-		}
-
-		this.validateVnfResource(notifDataV4,distribClientV4.getListVFModuleMetaData());
-
-
-		// Try again with service V5 (Nested template attached to Volume + HEat artifact not used by module),
-		//this should force the notification DEPLOY_ERROR to be sent for this artifact
-		ASDCController asdcControllerV5 = new ASDCController("asdc-controller1", distribClientV5);
-		asdcControllerV5.initASDC();
-		asdcControllerV5.treatNotification(notifDataV5);
-
-		for (IDistributionStatusMessage message:distribClientV5.getDistributionMessageReceived()) {
-			System.out.println("Message received, URL:"+message.getArtifactURL()+", Value:"+message.getStatus().name());
-			if ("cloud-nimbus.sh".equals(message.getArtifactURL())) {
-				assertTrue(message.getStatus().equals(DistributionStatusEnum.DEPLOY_ERROR) || message.getStatus().equals(DistributionStatusEnum.DOWNLOAD_OK));
-			} else {
-				assertTrue(message.getStatus().equals(DistributionStatusEnum.DEPLOY_OK) || message.getStatus().equals(DistributionStatusEnum.DOWNLOAD_OK));
-			}
-		}
-
-		this.validateVnfResource(notifDataV5,distribClientV5.getListVFModuleMetaData());
-
-
-		// Try again with demo DNS
-		ASDCController asdcControllerDNS = new ASDCController("asdc-controller1", distribClientDNS);
-		asdcControllerDNS.initASDC();
-		asdcControllerDNS.treatNotification(notifDataDNS);
-
-		for (IDistributionStatusMessage message:distribClientDNS.getDistributionMessageReceived()) {
-			System.out.println("Message received, URL:"+message.getArtifactURL()+", Value:"+message.getStatus().name());
-				assertTrue(message.getStatus().equals(DistributionStatusEnum.DEPLOY_OK) || message.getStatus().equals(DistributionStatusEnum.DOWNLOAD_OK));
-		}
-
-		this.validateVnfResource(notifDataDNS,distribClientDNS.getListVFModuleMetaData());
-
-		// Try again with demo VFW
-		ASDCController asdcControllerVFW = new ASDCController("asdc-controller1", distribClientVFW);
-		asdcControllerVFW.initASDC();
-		asdcControllerVFW.treatNotification(notifDataVFW);
-
-		for (IDistributionStatusMessage message : distribClientVFW.getDistributionMessageReceived()) {
-			System.out.println("Message received, URL:" + message.getArtifactURL() + ", Value:" + message.getStatus().name());
-			assertTrue(message.getStatus().equals(DistributionStatusEnum.DEPLOY_OK)
-						|| message.getStatus().equals(DistributionStatusEnum.DOWNLOAD_OK));
-		}
-
-		this.validateVnfResource(notifDataVFW, distribClientVFW.getListVFModuleMetaData());
-
-	}
-}
diff --git a/packages/arquillian-unit-tests/src/test/java/org/openecomp/mso/global_tests/asdc/notif_emulator/DistributionClientEmulator.java b/packages/arquillian-unit-tests/src/test/java/org/openecomp/mso/global_tests/asdc/notif_emulator/DistributionClientEmulator.java
deleted file mode 100644
index b7c506d..0000000
--- a/packages/arquillian-unit-tests/src/test/java/org/openecomp/mso/global_tests/asdc/notif_emulator/DistributionClientEmulator.java
+++ /dev/null
@@ -1,200 +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.global_tests.asdc.notif_emulator;
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.LinkedList;
-import java.util.List;
-
-import org.apache.commons.io.IOUtils;
-import org.openecomp.mso.asdc.installer.IVfModuleData;
-import org.onap.sdc.api.IDistributionClient;
-import org.onap.sdc.api.consumer.IComponentDoneStatusMessage;
-import org.onap.sdc.api.consumer.IConfiguration;
-import org.onap.sdc.api.consumer.IDistributionStatusMessage;
-import org.onap.sdc.api.consumer.IFinalDistrStatusMessage;
-import org.onap.sdc.api.consumer.INotificationCallback;
-import org.onap.sdc.api.consumer.IStatusCallback;
-import org.onap.sdc.api.notification.IArtifactInfo;
-import org.onap.sdc.api.notification.IVfModuleMetadata;
-import org.onap.sdc.api.results.IDistributionClientDownloadResult;
-import org.onap.sdc.api.results.IDistributionClientResult;
-import org.onap.sdc.impl.DistributionClientDownloadResultImpl;
-import org.onap.sdc.impl.DistributionClientResultImpl;
-import org.onap.sdc.utils.DistributionActionResultEnum;
-
-public class DistributionClientEmulator implements IDistributionClient {
-
-	private String resourcePath;
-
-	private List<IVfModuleData> listVFModuleMetaData;
-
-	private List<IDistributionStatusMessage> distributionMessageReceived = new LinkedList<>();
-
-	public DistributionClientEmulator(String notifFolderInResource) {
-
-		resourcePath = notifFolderInResource;
-	}
-
-	public List<IDistributionStatusMessage> getDistributionMessageReceived() {
-		return distributionMessageReceived;
-	}
-	
-	@Override
-	public List<IVfModuleMetadata> decodeVfModuleArtifact(byte[] arg0) {
-		return null;
-	}
-
-	/* @Override
-	public List<IVfModuleData> decodeVfModuleArtifact(byte[] arg0) {
-		try {
-			listVFModuleMetaData = new ObjectMapper().readValue(arg0, new TypeReference<List<JsonVfModuleMetaData>>(){});
-			return listVFModuleMetaData;
-
-		} catch (JsonParseException e) {
-			e.printStackTrace();
-		} catch (JsonMappingException e) {
-			e.printStackTrace();
-		} catch (IOException e) {
-			e.printStackTrace();
-		}
-		return null;
-	} */
-
-	public List<IVfModuleData> getListVFModuleMetaData() {
-		return listVFModuleMetaData;
-	}
-
-    @Override
-	public IDistributionClientDownloadResult download (IArtifactInfo arg0) {
-
-		
-		//String filename = resourcePath+"/artifacts/"+arg0.getArtifactURL();
-		String filename = arg0.getArtifactURL();
-		System.out.println("Emulating the download from resources files:"+filename);
-		
-		InputStream inputStream = null;
-		
-		if(arg0.getArtifactName().equals("service_Rg516VmmscSrvc_csar.csar")){
-			try{
-				inputStream = new FileInputStream(System.getProperty("java.io.tmpdir") + File.separator + "service_Rg516VmmscSrvc_csar.csar");
-			}catch(Exception e){
-				System.out.println("Error " + e.getMessage());
-			}
-		}else{
-		
-			inputStream = Thread.currentThread().getContextClassLoader().getResourceAsStream(resourcePath + filename);
-		}
-
-		if (inputStream == null) {
-			System.out.println("InputStream is NULL for:"+filename);
-		}
-		try {
-			return new DistributionClientDownloadResultImpl(DistributionActionResultEnum.SUCCESS, DistributionActionResultEnum.SUCCESS.name(),arg0.getArtifactName(),IOUtils.toByteArray(inputStream));
-		} catch (IOException e) {
-			
-			e.printStackTrace();
-			}
-				return null;
-		}
-
-	@Override
-	public IConfiguration getConfiguration() {
-		return null;
-	}
-
-	@Override
-	public IDistributionClientResult init(IConfiguration arg0, INotificationCallback arg1) {
-		return new DistributionClientResultImpl(DistributionActionResultEnum.SUCCESS,DistributionActionResultEnum.SUCCESS.name());
-	}
-
-	@Override
-	public IDistributionClientResult init(IConfiguration arg0, INotificationCallback arg1, IStatusCallback arg2) {
-		return new DistributionClientResultImpl(DistributionActionResultEnum.SUCCESS,DistributionActionResultEnum.SUCCESS.name());
-	}
-
-	@Override
-	public IDistributionClientResult sendDeploymentStatus(IDistributionStatusMessage arg0) {
-		this.distributionMessageReceived.add(arg0);
-		return new DistributionClientResultImpl(DistributionActionResultEnum.SUCCESS,DistributionActionResultEnum.SUCCESS.name());
-	}
-
-	@Override
-	public IDistributionClientResult sendDeploymentStatus(IDistributionStatusMessage arg0, String arg1) {
-		this.distributionMessageReceived.add(arg0);
-		return new DistributionClientResultImpl(DistributionActionResultEnum.SUCCESS,DistributionActionResultEnum.SUCCESS.name());
-	}
-
-	@Override
-	public IDistributionClientResult sendDownloadStatus(IDistributionStatusMessage arg0) {
-		this.distributionMessageReceived.add(arg0);
-		return new DistributionClientResultImpl(DistributionActionResultEnum.SUCCESS,DistributionActionResultEnum.SUCCESS.name());
-	}
-
-	@Override
-	public IDistributionClientResult sendDownloadStatus(IDistributionStatusMessage arg0, String arg1) {
-		this.distributionMessageReceived.add(arg0);
-		return new DistributionClientResultImpl(DistributionActionResultEnum.SUCCESS,DistributionActionResultEnum.SUCCESS.name());
-	}
-
-	@Override
-	public IDistributionClientResult start() {
-		return new DistributionClientResultImpl(DistributionActionResultEnum.SUCCESS,DistributionActionResultEnum.SUCCESS.name());
-	}
-
-	@Override
-	public IDistributionClientResult stop() {
-		return new DistributionClientResultImpl(DistributionActionResultEnum.SUCCESS,DistributionActionResultEnum.SUCCESS.name());
-
-	}
-
-	@Override
-	public IDistributionClientResult updateConfiguration(IConfiguration arg0) {
-		return new DistributionClientResultImpl(DistributionActionResultEnum.SUCCESS,DistributionActionResultEnum.SUCCESS.name());
-	}
-
-	@Override
-	public IDistributionClientResult sendComponentDoneStatus(IComponentDoneStatusMessage arg0) {
-		// TODO Auto-generated method stub
-		return null;
-	}
-
-	@Override
-	public IDistributionClientResult sendComponentDoneStatus(IComponentDoneStatusMessage arg0, String arg1) {
-		// TODO Auto-generated method stub
-		return null;
-	}
-
-	@Override
-	public IDistributionClientResult sendFinalDistrStatus(IFinalDistrStatusMessage arg0) {
-		// TODO Auto-generated method stub
-		return null;
-	}
-
-	@Override
-	public IDistributionClientResult sendFinalDistrStatus(IFinalDistrStatusMessage arg0, String arg1) {
-		// TODO Auto-generated method stub
-		return null;
-	}
-}
diff --git a/packages/arquillian-unit-tests/src/test/java/org/openecomp/mso/global_tests/asdc/notif_emulator/JsonArtifactInfo.java b/packages/arquillian-unit-tests/src/test/java/org/openecomp/mso/global_tests/asdc/notif_emulator/JsonArtifactInfo.java
deleted file mode 100644
index da8988d..0000000
--- a/packages/arquillian-unit-tests/src/test/java/org/openecomp/mso/global_tests/asdc/notif_emulator/JsonArtifactInfo.java
+++ /dev/null
@@ -1,122 +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.global_tests.asdc.notif_emulator;
-import java.util.HashMap;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
-
-import org.onap.sdc.api.notification.IArtifactInfo;
-
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-
-public class JsonArtifactInfo implements IArtifactInfo {
-
-	@JsonIgnore
-	private Map<String,IArtifactInfo> artifactsMapByUUID = new HashMap<>();
-	
-	@JsonIgnore
-	private Map<String,Object> attributesMap = new HashMap<>();
-	
-	public JsonArtifactInfo() {
-		
-	}
-	
-	public synchronized void addArtifactToUUIDMap (List<JsonArtifactInfo> artifactList) {
-		for (JsonArtifactInfo artifact:artifactList) {
-			artifactsMapByUUID.put(artifact.getArtifactUUID(), artifact);	
-		}
-		
-	}
-	
-	@SuppressWarnings("unused")
-	@JsonAnySetter
-	public final void setAttribute(String attrName, Object attrValue) {
-		if ((null != attrName) && (!attrName.isEmpty()) && (null != attrValue) && (null != attrValue.toString())) {
-			this.attributesMap.put(attrName,attrValue);
-		}
-	}
-	
-	
-	
-	public Map<String, IArtifactInfo> getArtifactsMapByUUID() {
-		return artifactsMapByUUID;
-	}
-
-	@Override
-	public String getArtifactChecksum() {
-		return (String)attributesMap.get("artifactCheckSum");
-	}
-
-	@Override
-	public String getArtifactDescription() {
-		return (String)attributesMap.get("artifactDescription");
-	}
-
-	@Override
-	public String getArtifactName() {
-		return (String)attributesMap.get("artifactName");
-	}
-
-	@Override
-	public Integer getArtifactTimeout() {
-		return (Integer)attributesMap.get("artifactTimeout");
-	}
-
-	@Override
-	public String getArtifactType() {
-		return (String)attributesMap.get("artifactType");
-	}
-
-	@Override
-	public String getArtifactURL() {
-		return (String)attributesMap.get("artifactURL");
-	}
-
-	@Override
-	public String getArtifactUUID() {
-		return (String)attributesMap.get("artifactUUID");
-	}
-
-	@Override
-	public String getArtifactVersion() {
-		return (String)attributesMap.get("artifactVersion");
-	}
-
-	@Override
-	public IArtifactInfo getGeneratedArtifact () {
-		return artifactsMapByUUID.get(attributesMap.get("generatedArtifact"));
-	}
-
-	@Override
-	public List<IArtifactInfo> getRelatedArtifacts() {
-		List<IArtifactInfo> listArtifacts = new LinkedList<>();
-		List<String> uuidList = (List<String>)attributesMap.get("relatedArtifact");
-		if (uuidList != null) {
-			for(String uuid:uuidList) {
-				listArtifacts.add(artifactsMapByUUID.get(uuid));
-			}
-		}
-		return listArtifacts;
-	}
-
-}
diff --git a/packages/arquillian-unit-tests/src/test/java/org/openecomp/mso/global_tests/asdc/notif_emulator/JsonArtifactInfoDeserializer.java b/packages/arquillian-unit-tests/src/test/java/org/openecomp/mso/global_tests/asdc/notif_emulator/JsonArtifactInfoDeserializer.java
deleted file mode 100644
index 901c1fc..0000000
--- a/packages/arquillian-unit-tests/src/test/java/org/openecomp/mso/global_tests/asdc/notif_emulator/JsonArtifactInfoDeserializer.java
+++ /dev/null
@@ -1,50 +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.global_tests.asdc.notif_emulator;
-
-import java.io.IOException;
-import java.util.List;
-
-import com.fasterxml.jackson.core.JsonParser;
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.core.type.TypeReference;
-import com.fasterxml.jackson.databind.DeserializationContext;
-import com.fasterxml.jackson.databind.JsonDeserializer;
-import com.fasterxml.jackson.databind.ObjectMapper;
-
-
-
-public class JsonArtifactInfoDeserializer extends JsonDeserializer<List<JsonArtifactInfo>>{
-
-	@Override
-	public List<JsonArtifactInfo> deserialize(JsonParser jp, DeserializationContext ctxt)
-			throws IOException, JsonProcessingException {
-		List<JsonArtifactInfo> jsonArtifactInfoList =  new ObjectMapper().readValue(jp, new TypeReference<List<JsonArtifactInfo>>(){}); 
-
-		// For each artifact add the list of artifact retrieved 
-		// This could be used later to index by UUID
-		for (JsonArtifactInfo artifactInfo:jsonArtifactInfoList) {
-			artifactInfo.addArtifactToUUIDMap(jsonArtifactInfoList);
-		}
-		return jsonArtifactInfoList;
-	}
-
-}
diff --git a/packages/arquillian-unit-tests/src/test/java/org/openecomp/mso/global_tests/asdc/notif_emulator/JsonNotificationData.java b/packages/arquillian-unit-tests/src/test/java/org/openecomp/mso/global_tests/asdc/notif_emulator/JsonNotificationData.java
deleted file mode 100644
index 06ecfda..0000000
--- a/packages/arquillian-unit-tests/src/test/java/org/openecomp/mso/global_tests/asdc/notif_emulator/JsonNotificationData.java
+++ /dev/null
@@ -1,137 +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.global_tests.asdc.notif_emulator;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.jboss.shrinkwrap.api.exporter.FileExistsException;
-import org.onap.sdc.api.notification.IArtifactInfo;
-import org.onap.sdc.api.notification.INotificationData;
-import org.onap.sdc.api.notification.IResourceInstance;
-
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-
-
-public class JsonNotificationData implements INotificationData {
-
-	@JsonIgnore
-	private Map<String,Object> attributesMap = new HashMap<>();
-	
-	@JsonProperty("serviceArtifacts")
-	@JsonDeserialize(using=JsonArtifactInfoDeserializer.class)
-	private List<IArtifactInfo> serviceArtifacts;
-	
-	@JsonProperty("resources")
-	@JsonDeserialize(using=JsonResourceInfoDeserializer.class)
-	private List<IResourceInstance> resourcesList;
-	
-	public JsonNotificationData() {
-		
-	}
-		
-	/**
-	 * Method instantiate a INotificationData implementation from a JSON file.
-	 * 
-	 * @param notifFilePath The file path in String
-	 * @return A JsonNotificationData instance
-	 * @throws IOException in case of the file is not readable or not accessible 
-	 */
-	public static JsonNotificationData instantiateNotifFromJsonFile(String notifFilePath) throws IOException {
-		
-		InputStream is = Thread.currentThread().getContextClassLoader().getResourceAsStream(notifFilePath+"/notif-structure.json");
-		
-		if (is == null) {
-			throw new FileExistsException("Resource Path does not exist: "+notifFilePath);
-		}
-		ObjectMapper mapper = new ObjectMapper();
-		return mapper.readValue(is, JsonNotificationData.class);
-	}
-	
-	@SuppressWarnings("unused")
-	@JsonAnySetter
-	public final void setAttribute(String attrName, Object attrValue) {
-		if ((null != attrName) && (!attrName.isEmpty()) && (null != attrValue) && (null != attrValue.toString())) {
-			this.attributesMap.put(attrName,attrValue);
-		}
-	}
-
-	@Override
-	public IArtifactInfo getArtifactMetadataByUUID(String arg0) {
-		return null;
-	}
-
-	@Override
-	public String getDistributionID() {
-		return (String)this.attributesMap.get("distributionID");
-	}
-
-	@Override
-	public List<IResourceInstance> getResources() {
-		return resourcesList;
-	}
-
-	@Override
-	public List<IArtifactInfo> getServiceArtifacts() {
-		return this.serviceArtifacts;
-	}
-
-	@Override
-	public String getServiceDescription() {
-		return (String)this.attributesMap.get("serviceDescription");
-	}
-
-	@Override
-	public String getServiceInvariantUUID() {
-		return (String)this.attributesMap.get("serviceInvariantUUID");
-	}
-
-	@Override
-	public String getServiceName() {
-		return (String)this.attributesMap.get("serviceName");
-	}
-
-	@Override
-	public String getServiceUUID() {
-		return (String)this.attributesMap.get("serviceUUID");
-	}
-
-	@Override
-	public String getServiceVersion() {
-		return (String)this.attributesMap.get("serviceVersion");
-	}
-
-	@Override
-	public String getWorkloadContext() {
-		return (String)this.attributesMap.get("workloadContext");
-	}
-
-	@Override
-	public void setWorkloadContext(String arg0) {
-	}
-}
diff --git a/packages/arquillian-unit-tests/src/test/java/org/openecomp/mso/global_tests/asdc/notif_emulator/JsonResourceInfo.java b/packages/arquillian-unit-tests/src/test/java/org/openecomp/mso/global_tests/asdc/notif_emulator/JsonResourceInfo.java
deleted file mode 100644
index 0bb15f5..0000000
--- a/packages/arquillian-unit-tests/src/test/java/org/openecomp/mso/global_tests/asdc/notif_emulator/JsonResourceInfo.java
+++ /dev/null
@@ -1,105 +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.global_tests.asdc.notif_emulator;
-
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.onap.sdc.api.notification.IArtifactInfo;
-import org.onap.sdc.api.notification.IResourceInstance;
-
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-
-public class JsonResourceInfo implements IResourceInstance {
-
-	@JsonIgnore
-	private Map<String,Object> attributesMap = new HashMap<>();
-
-	@JsonProperty("artifacts")
-	@JsonDeserialize(using=JsonArtifactInfoDeserializer.class)
-	private List<IArtifactInfo> artifacts;
-
-	public JsonResourceInfo() {
-
-	}
-
-	@Override
-	public List<IArtifactInfo> getArtifacts() {
-		return artifacts;
-	}
-
-	@Override
-	public String getResourceInstanceName() {
-		return (String)attributesMap.get("resourceInstanceName");
-	}
-
-	@Override
-	public String getResourceInvariantUUID() {
-		return (String)attributesMap.get("resourceInvariantUUID");
-	}
-
-	@Override
-	public String getResourceName() {
-		return (String)attributesMap.get("resourceName");
-	}
-
-	@Override
-	public String getResourceType() {
-		return (String)attributesMap.get("resourceType");
-	}
-
-	@Override
-	public String getResourceUUID() {
-		return (String)attributesMap.get("resourceUUID");
-	}
-
-	@Override
-	public String getResourceVersion() {
-		return (String)attributesMap.get("resourceVersion");
-	}
-
-	@Override
-	public String getResourceCustomizationUUID() {
-		return (String)attributesMap.get("resourceCustomizationUUID");
-	}
-
-	@Override
-	public String getSubcategory() {
-		return (String)attributesMap.get("subCategory");
-	}
-
-	@Override
-	public String getCategory() {
-		return (String)attributesMap.get("category");
-	}
-
-	@SuppressWarnings("unused")
-	@JsonAnySetter
-	public final void setAttribute(String attrName, Object attrValue) {
-		if ((null != attrName) && (!attrName.isEmpty()) && (null != attrValue) && (null != attrValue.toString())) {
-			this.attributesMap.put(attrName,attrValue);
-		}
-	}
-}
diff --git a/packages/arquillian-unit-tests/src/test/java/org/openecomp/mso/global_tests/asdc/notif_emulator/JsonResourceInfoDeserializer.java b/packages/arquillian-unit-tests/src/test/java/org/openecomp/mso/global_tests/asdc/notif_emulator/JsonResourceInfoDeserializer.java
deleted file mode 100644
index e3db9de..0000000
--- a/packages/arquillian-unit-tests/src/test/java/org/openecomp/mso/global_tests/asdc/notif_emulator/JsonResourceInfoDeserializer.java
+++ /dev/null
@@ -1,43 +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.global_tests.asdc.notif_emulator;
-
-import java.io.IOException;
-import java.util.List;
-
-import com.fasterxml.jackson.core.JsonParser;
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.core.type.TypeReference;
-import com.fasterxml.jackson.databind.DeserializationContext;
-import com.fasterxml.jackson.databind.JsonDeserializer;
-import com.fasterxml.jackson.databind.ObjectMapper;
-
-public class JsonResourceInfoDeserializer extends JsonDeserializer<List<JsonResourceInfo>>{
-
-	@Override
-	public List<JsonResourceInfo> deserialize(JsonParser jp, DeserializationContext ctxt)
-			throws IOException, JsonProcessingException {
-		List<JsonResourceInfo> jsonResourceInfoList =  new ObjectMapper().readValue(jp, new TypeReference<List<JsonResourceInfo>>(){}); 
-		
-		return jsonResourceInfoList;
-	}
-
-}
diff --git a/packages/arquillian-unit-tests/src/test/java/org/openecomp/mso/global_tests/asdc/notif_emulator/JsonVfModuleMetaData.java b/packages/arquillian-unit-tests/src/test/java/org/openecomp/mso/global_tests/asdc/notif_emulator/JsonVfModuleMetaData.java
deleted file mode 100644
index 2393246..0000000
--- a/packages/arquillian-unit-tests/src/test/java/org/openecomp/mso/global_tests/asdc/notif_emulator/JsonVfModuleMetaData.java
+++ /dev/null
@@ -1,84 +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.global_tests.asdc.notif_emulator;
-
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.onap.sdc.api.notification.IVfModuleMetadata;
-
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-public class JsonVfModuleMetaData implements IVfModuleMetadata {
-
-	@JsonProperty("artifacts")
-	private List<String> artifacts;
-	
-	@JsonIgnore
-	private Map<String,Object> attributesMap = new HashMap<>();
-	
-	@Override
-	public List<String> getArtifacts() {
-		return artifacts;
-	}
-
-	@Override
-	public String getVfModuleModelDescription() {
-		return (String)attributesMap.get("vfModuleModelDescription");
-	}
-
-	@Override
-	public String getVfModuleModelInvariantUUID() {
-		return (String)attributesMap.get("vfModuleModelInvariantUUID");
-	}
-
-	@Override
-	public String getVfModuleModelName() {
-		return (String)attributesMap.get("vfModuleModelName");
-	}
-
-	@Override
-	public String getVfModuleModelUUID() {
-		return (String)attributesMap.get("vfModuleModelUUID");
-	}
-
-	@Override
-	public String getVfModuleModelVersion() {
-		return (String)attributesMap.get("vfModuleModelVersion");
-	}
-
-	@Override
-	public boolean isBase() {
-		return (boolean)attributesMap.get("isBase");
-	}
-	
-	@SuppressWarnings("unused")
-	@JsonAnySetter
-	public final void setAttribute(String attrName, Object attrValue) {
-		if ((null != attrName) && (!attrName.isEmpty()) && (null != attrValue) && (null != attrValue.toString())) {
-			this.attributesMap.put(attrName,attrValue);
-		}
-	}
-
-}
diff --git a/packages/arquillian-unit-tests/src/test/java/org/openecomp/mso/global_tests/jmeter/JMeterITCase.java b/packages/arquillian-unit-tests/src/test/java/org/openecomp/mso/global_tests/jmeter/JMeterITCase.java
deleted file mode 100644
index 0bf9eac..0000000
--- a/packages/arquillian-unit-tests/src/test/java/org/openecomp/mso/global_tests/jmeter/JMeterITCase.java
+++ /dev/null
@@ -1,166 +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.global_tests.jmeter;
-
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.lang.reflect.Method;
-import java.nio.file.Files;
-import java.nio.file.Paths;
-import java.nio.file.StandardCopyOption;
-
-import org.apache.jmeter.engine.StandardJMeterEngine;
-import org.apache.jmeter.save.SaveService;
-import org.apache.jmeter.util.JMeterUtils;
-import org.apache.jorphan.collections.HashTree;
-import org.jboss.arquillian.container.test.api.Deployment;
-import org.jboss.arquillian.container.test.api.RunAsClient;
-import org.jboss.arquillian.container.test.api.Testable;
-import org.jboss.arquillian.junit.Arquillian;
-import org.jboss.shrinkwrap.api.Archive;
-import org.jboss.shrinkwrap.api.ShrinkWrap;
-import org.jboss.shrinkwrap.api.spec.JavaArchive;
-import org.jboss.shrinkwrap.api.spec.WebArchive;
-import org.jboss.shrinkwrap.resolver.api.maven.Maven;
-import org.junit.After;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
-import org.openecomp.mso.global_tests.ArquillianPackagerForITCases;
-
-@RunWith(Arquillian.class)
-public class JMeterITCase {
-	
-	@Deployment(name="mso-api-handler-infra",testable=false)
-	public static Archive<?> createMsoApiHandlerInfraWarDeployment () {
-		System.out.println("Deploying ApiHandler Infra WAR on default server");
-		return ArquillianPackagerForITCases.createPackageFromExistingOne("../../mso-api-handlers/mso-api-handler-infra/target/", "mso-api-handler-infra*.war", "mso-api-handler-infra.war");
-	}
-	
-	@Deployment(name="mso-vnf-adapter",testable=false)
-	public static Archive<?> createMsoVnfAdapterWarDeployment () {
-		System.out.println("Deploying VNF Adapter WAR on default server");
-		return ArquillianPackagerForITCases.createPackageFromExistingOne("../../adapters/mso-vnf-adapter/target/", "mso-vnf-adapter*.war", "mso-vnf-adapter.war");
-	}
-	
-	@Deployment(name="mso-tenant-adapter",testable=false)
-	public static Archive<?> createMsoTenantAdapterWarDeployment () {
-		System.out.println("Deploying Tenant Adapter WAR on default server");
-		return ArquillianPackagerForITCases.createPackageFromExistingOne("../../adapters/mso-tenant-adapter/target/", "mso-tenant-adapter*.war", "mso-tenant-adapter.war");
-	}
-	
-	@Deployment(name="mso-sdnc-adapter",testable=false)
-	public static Archive<?> createMsoSdncAdapterWarDeployment () {
-		System.out.println("Deploying SDNC Adapter WAR on default server");
-		return ArquillianPackagerForITCases.createPackageFromExistingOne("../../adapters/mso-sdnc-adapter/target/", "mso-sdnc-adapter*.war", "mso-sdnc-adapter.war");
-	}
-	
-	@Deployment(name="mso-network-adapter",testable=false)
-	public static Archive<?> createMsoNetworkAdapterWarDeployment () {
-		System.out.println("Deploying Network Adapter WAR on default server");
-		return ArquillianPackagerForITCases.createPackageFromExistingOne("../../adapters/mso-network-adapter/target/", "mso-network-adapter*.war", "mso-network-adapter.war");
-	}
-	
-	@Deployment(name="mso-requests-db-adapter",testable=false)
-	public static Archive<?> createMsoRequestsDbAdapterWarDeployment () {
-		System.out.println("Deploying Requests DB Adapter WAR on default server");
-		return ArquillianPackagerForITCases.createPackageFromExistingOne("../../adapters/mso-requests-db-adapter/target/", "mso-requests-db-adapter*.war", "mso-requests-db-adapter.war");
-	}
-	
-	@Deployment(name="asdc-controller",testable=true)
-	public static Archive<?> createAsdcControllerWarDeployment () {
-		System.out.println("Deploying ASDC Controller WAR with additional resources on default server");
-		
-		WebArchive warArchive = (WebArchive)ArquillianPackagerForITCases.createPackageFromExistingOne("../../asdc-controller/target/", "asdc-controller*.war", "asdc-controller.war");
-		
-		// Add the current test class
-        JavaArchive testclasses = ShrinkWrap.create (JavaArchive.class, "testClasses.jar");
-		testclasses.addClasses(JMeterITCase.class);
-				
-		warArchive.addAsLibraries(testclasses);
-				
-		// BE CAREFUL a settings.xml file must be located in ${home.user}/.m2/settings.xml
-		warArchive.addAsLibraries(Maven.resolver()
-				.resolve("org.mockito:mockito-all:1.10.19")
-                                        .withoutTransitivity ()
-                                        .asFile ());
-
-		// Take one war randomly to make arquilian happy
-
-		Testable.archiveToTest(warArchive);
-
-		
-		return warArchive;
-	}
-	
-  
-    @BeforeClass
-    public static void waitBeforeStart () throws InterruptedException {
-        System.out.println ("Executing " + JMeterITCase.class.getName ());
- 
-    }
-
-    @Test
-	@RunAsClient()
-	public void testJMeter() throws IOException  {
-		  // JMeter Engine
-        StandardJMeterEngine jmeter = new StandardJMeterEngine();
-
-
-        // Initialize Properties, logging, locale, etc.
-        JMeterUtils.loadJMeterProperties("/tmp/apache-jmeter-2.13/bin/jmeter.properties");
-        JMeterUtils.setJMeterHome("/tmp/apache-jmeter-2.13");
-        JMeterUtils.initLogging();// you can comment this line out to see extra log messages of i.e. DEBUG level
-        JMeterUtils.initLocale();
-        
-        // Initialize JMeter SaveService
-        SaveService.loadProperties();
-
-        // Load existing .jmx Test Plan
-    
-        FileInputStream in = new FileInputStream("./src/test/resources/JMeter/MSO-Perf.jmx");
-        HashTree testPlanTree = SaveService.loadTree(in);
-        testPlanTree.getTree("test variables");
-        in.close();
-
-        // Run JMeter Test
-        jmeter.configure(testPlanTree);
-        jmeter.run();
-	}
-
-    @AfterClass
-    public static void afterArquillianTest() {
-    	try {
-			Files.move (Paths.get ("./jmeter.log"),
-					Paths.get ("./target/surefire-reports/jmeter.log"),
-					StandardCopyOption.REPLACE_EXISTING);
-			
-		/*	Files.move (Paths.get ("./mso-perf.jtl"),
-					Paths.get ("./target/surefire-reports/mso-perf.log"),
-					StandardCopyOption.REPLACE_EXISTING);*/
-
-		} catch (IOException e) {
-			e.printStackTrace();
-		}
-    }
-}
diff --git a/packages/arquillian-unit-tests/src/test/java/org/openecomp/mso/global_tests/logging/LogsCheckerITCase.java b/packages/arquillian-unit-tests/src/test/java/org/openecomp/mso/global_tests/logging/LogsCheckerITCase.java
deleted file mode 100644
index bae9af5..0000000
--- a/packages/arquillian-unit-tests/src/test/java/org/openecomp/mso/global_tests/logging/LogsCheckerITCase.java
+++ /dev/null
@@ -1,108 +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.global_tests.logging;
-
-import static org.junit.Assert.*;
-
-import java.io.File;
-import java.io.IOException;
-
-
-import org.jboss.arquillian.container.test.api.Deployment;
-import org.jboss.arquillian.container.test.api.OperateOnDeployment;
-import org.jboss.arquillian.container.test.api.RunAsClient;
-import org.jboss.arquillian.container.test.api.Testable;
-import org.jboss.arquillian.junit.Arquillian;
-import org.jboss.shrinkwrap.api.Archive;
-import org.jboss.shrinkwrap.api.ShrinkWrap;
-import org.jboss.shrinkwrap.api.spec.JavaArchive;
-import org.jboss.shrinkwrap.api.spec.WebArchive;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.BeforeClass;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
-import org.openecomp.mso.filesearching.LogFileSearching;
-import org.openecomp.mso.global_tests.ArquillianPackagerForITCases;
-
-@RunWith(Arquillian.class)
-public class LogsCheckerITCase {
-
-  
-    @BeforeClass
-    public static void waitBeforeStart () throws InterruptedException {
-        System.out.println ("Executing " + LogsCheckerITCase.class.getName ());
-      
-    }
-        
-	@Deployment(name="log-check",testable=true)
-	public static Archive<?> createAsdcControllerWarDeployment () throws Exception {
-		// Any war could be used here, we just take that one randomly
-		// Be careful some WAR does not work when being injected in JBOSS, probably due to Servlet conflict 
-		System.out.println("Deploying ASDC Controller WAR for log checker");
-		WebArchive warArchive =  (WebArchive)ArquillianPackagerForITCases.createPackageFromExistingOne("../../asdc-controller/target/", "asdc-controller*.war", "asdc-controller.war");
-		
-		JavaArchive testclasses = ShrinkWrap.create (JavaArchive.class, "testClasses.jar");
-		
-		testclasses.addPackage("org.openecomp.mso.filesearching");
-	
-		warArchive.addAsLibraries(testclasses);
-		
-		Testable.archiveToTest(warArchive);
-		return warArchive;
-	}
-    
-	@Before
-	public void beforeEachTest() {
-		LogFileSearching.initFile("/tmp/mso-log-checker.log");
-	}
-	
-	@After
-	public void afterEachTest() {
-		LogFileSearching.closeFile();
-	}
-	
-    @Test
-	@OperateOnDeployment("log-check")
-	public void testJbossServerLog() throws IOException  {
-    	
-    	File serverLogs = new File("/opt/jboss/standalone/log");
-    	//File serverLogs = new File("/tmp/jbosslogs/server.log");
-    	
-    	assertFalse(LogFileSearching.searchInDirectoryForCommonIssues(null, serverLogs));
-    	
-    }
-    
-    @Test
-    @OperateOnDeployment("log-check")
-	public void testMSOLog() throws IOException  {
-    	//File serverLogs = new File("/opt/app/mso/jboss-eap-6.2/standalone/log/server.log");
-    	File msoLogs = new File("/var/log/ecomp/MSO");
-   	
-    	assertFalse(LogFileSearching.searchInDirectoryForCommonIssues(null, msoLogs));
-    	
-    }
-    
-    
-  
-    
-}
diff --git a/packages/arquillian-unit-tests/src/test/java/org/openecomp/mso/global_tests/soapui/SoapUiITCase.java b/packages/arquillian-unit-tests/src/test/java/org/openecomp/mso/global_tests/soapui/SoapUiITCase.java
deleted file mode 100644
index 868de8d..0000000
--- a/packages/arquillian-unit-tests/src/test/java/org/openecomp/mso/global_tests/soapui/SoapUiITCase.java
+++ /dev/null
@@ -1,348 +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.global_tests.soapui;
-
-import static org.junit.Assert.*;
-
-import java.io.File;
-import java.io.IOException;
-import java.lang.reflect.Method;
-import java.nio.file.Files;
-import java.nio.file.Paths;
-import java.nio.file.StandardCopyOption;
-import java.util.Map;
-
-import org.jboss.arquillian.container.test.api.Deployment;
-import org.jboss.arquillian.container.test.api.RunAsClient;
-import org.jboss.arquillian.junit.Arquillian;
-import org.jboss.shrinkwrap.api.Archive;
-import org.jboss.shrinkwrap.api.ShrinkWrap;
-import org.jboss.shrinkwrap.api.spec.WebArchive;
-import org.junit.After;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.FixMethodOrder;
-import org.junit.runners.MethodSorters;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
-import org.openecomp.mso.global_tests.ArquillianPackagerForITCases;
-import com.eviware.soapui.impl.wsdl.teststeps.WsdlTestStepResult;
-import com.eviware.soapui.model.testsuite.TestAssertion;
-import com.eviware.soapui.model.testsuite.TestStepResult.TestStepStatus;
-import com.eviware.soapui.tools.SoapUITestCaseRunner;
-
-@RunWith(Arquillian.class)
-@FixMethodOrder(MethodSorters.NAME_ASCENDING)
-public class SoapUiITCase {
-
-	private static String jbossHost=System.getProperty("docker.hostname");
-	private static String jbossPort="18080";
-	
-	@Deployment(name="mso-api-handler-infra",testable=false)
-	public static Archive<?> createMsoApiHandlerInfraWarDeployment () {
-		System.out.println("Deploying ApiHandler Infra WAR on default server");
-		return ArquillianPackagerForITCases.createPackageFromExistingOne("../../mso-api-handlers/mso-api-handler-infra/target/", "mso-api-handler-infra*.war", "mso-api-handler-infra.war");
-	}
-	
-	@Deployment(name="mso-vnf-adapter",testable=false)
-	public static Archive<?> createMsoVnfAdapterWarDeployment () {
-		System.out.println("Deploying VNF Adapter WAR on default server");
-		return ArquillianPackagerForITCases.createPackageFromExistingOne("../../adapters/mso-vnf-adapter/target/", "mso-vnf-adapter*.war", "mso-vnf-adapter.war");
-	}
-	
-	@Deployment(name="mso-tenant-adapter",testable=false)
-	public static Archive<?> createMsoTenantAdapterWarDeployment () {
-		System.out.println("Deploying Tenant Adapter WAR on default server");
-		return ArquillianPackagerForITCases.createPackageFromExistingOne("../../adapters/mso-tenant-adapter/target/", "mso-tenant-adapter*.war", "mso-tenant-adapter.war");
-	}
-	
-	@Deployment(name="mso-sdnc-adapter",testable=false)
-	public static Archive<?> createMsoSdncAdapterWarDeployment () {
-		System.out.println("Deploying SDNC Adapter WAR on default server");
-		return ArquillianPackagerForITCases.createPackageFromExistingOne("../../adapters/mso-sdnc-adapter/target/", "mso-sdnc-adapter*.war", "mso-sdnc-adapter.war");
-	}
-	
-	@Deployment(name="mso-network-adapter",testable=false)
-	public static Archive<?> createMsoNetworkAdapterWarDeployment () {
-		System.out.println("Deploying Network Adapter WAR on default server");
-		return ArquillianPackagerForITCases.createPackageFromExistingOne("../../adapters/mso-network-adapter/target/", "mso-network-adapter*.war", "mso-network-adapter.war");
-	}
-	
-	@Deployment(name="mso-requests-db-adapter",testable=false)
-	public static Archive<?> createMsoRequestsDbAdapterWarDeployment () {
-		System.out.println("Deploying Requests DB Adapter WAR on default server");
-		return ArquillianPackagerForITCases.createPackageFromExistingOne("../../adapters/mso-requests-db-adapter/target/", "mso-requests-db-adapter*.war", "mso-requests-db-adapter.war");
-	}
-	
-	@Deployment(name="asdc-controller",testable=true)
-	public static Archive<?> createAsdcControllerWarDeployment () {
-		System.out.println("Deploying ASDC Controller WAR with additional resources on default server");
-		
-		WebArchive warArchive = (WebArchive)ArquillianPackagerForITCases.createPackageFromExistingOne("../../asdc-controller/target/", "asdc-controller*.war", "asdc-controller.war");
-		
-		// Take one war randomly to make arquilian happy
-
-			
-		return warArchive;
-	}
-	
-        @Deployment(name = "infrastructure-bpmn", testable = false)
-        public static Archive<?> createInfraBPMNDeployment() {
-            System.out.println("Deploying Infrastructure BPMN WAR on default server");
-            return ArquillianPackagerForITCases.createPackageFromExistingOne("../../bpmn/MSOInfrastructureBPMN/target/",
-                    "MSOInfrastructureBPMN*.war", "MSOInfrastructureBPMN.war");
-        }
-/*
-    @Deployment(name = "SoapUIMocks", testable = false)
-    public static Archive <?> createSoapUIMocksWarDeployment () {
-
-        File file = new File ("src/test/resources/SoapUIMocks.war");
-
-        WebArchive archive = ShrinkWrap.create (WebArchive.class, "SoapUIMocks.war");
-
-        archive.merge ((ShrinkWrap.createFromZipFile (WebArchive.class, file)));
-
-        return archive;
-    }*/
-
-    @BeforeClass
-    public static void waitBeforeStart () throws InterruptedException {
-    	Thread.currentThread().sleep(10000);
-        System.out.println ("Executing " + SoapUiITCase.class.getName ());
-       
-    }
-
-    @Test
-    @RunAsClient
-    public void test01Healthcheck () {
-        SoapUITestCaseRunner runner = new SoapUITestCaseRunner ();
-        runner.setSettingsFile("./src/test/resources/SoapUI/soapui-settings.xml");
-        runner.setJUnitReport(true);
-        runner.setProjectFile ("./src/test/resources/SoapUI/Healthcheck-soapui-project.xml");
-        runner.setOutputFolder ("./target/surefire-reports");
-        String[] properties = new String[7];
-        properties[0] = "apihhost="+jbossHost+":"+jbossPort;
-        properties[1] = "jrahost="+jbossHost+":"+jbossPort;
-        properties[2] = "userlogin=sitecontrol";
-        properties[3] = "userpassword=Domain2.0!";
-        properties[4] = "bpmnhost="+jbossHost+":"+jbossPort;
-        properties[5] = "sitename=mso-docker";
-        properties[6] = "enableBpmn=false";
-        runner.setProjectProperties (properties);
-
-        try {
-            runner.setTestSuite ("Healthcheck TestSuite");
-            runner.run ();
-            Map<TestAssertion,WsdlTestStepResult> mapResult= runner.getAssertionResults();
-            for(Map.Entry<TestAssertion,WsdlTestStepResult> entry : mapResult.entrySet()) {
-                assertTrue(entry.getValue().getStatus().equals(TestStepStatus.OK));
-            }
-            assertTrue (runner.getFailedTests ().size () == 0);
-
-        } catch (Exception e) {
-            e.printStackTrace ();
-            fail("Failure in SOAPUI Healthcheck");
-        }
-    }
-
-    @Test
-    @RunAsClient
-    public void test02ApiHandlerInfra () {
-        SoapUITestCaseRunner runner = new SoapUITestCaseRunner ();
-        runner.setSettingsFile("./src/test/resources/SoapUI/soapui-settings.xml");
-        runner.setJUnitReport(true);
-        runner.setProjectFile ("./src/test/resources/SoapUI/Local-API-Handler-soapui-project.xml");
-        runner.setOutputFolder ("./target/surefire-reports");
-        String[] properties = new String[3];
-        properties[0] = "host="+jbossHost+":"+jbossPort;
-        properties[1] = "user-infraportal=InfraPortalClient";
-        properties[2] = "password-infraportal=password1$";
-
-        runner.setProjectProperties (properties);
-
-        try {
-            runner.setTestSuite ("simple_tests_endpoints");
-            runner.run ();
-            Map<TestAssertion,WsdlTestStepResult> mapResult= runner.getAssertionResults();
-            for(Map.Entry<TestAssertion,WsdlTestStepResult> entry : mapResult.entrySet()) {
-                assertTrue(entry.getValue().getStatus().equals(TestStepStatus.OK));
-            }
-            assertTrue (runner.getFailedTests ().size () == 0);
-
-        } catch (Exception e) {
-            e.printStackTrace ();
-            fail("Failure in SOAPUI ApiHandler Infra");
-        }
-    }
-
-    @Test
-    @RunAsClient
-    public void test03StartNetworkAdapter () {
-    	SoapUITestCaseRunner runner = new SoapUITestCaseRunner ();
-        runner.setSettingsFile("./src/test/resources/SoapUI/soapui-settings.xml");
-        runner.setJUnitReport(true);
-    	runner.setProjectFile ("./src/test/resources/SoapUI/MSONetworkAdapter-soapui-project.xml");
-    	runner.setOutputFolder ("./target/surefire-reports");
-    	String[] properties = new String[1];
-    	properties[0] = "host="+jbossHost+":"+jbossPort;
-    	runner.setProjectProperties (properties);
-
-
-    	try {
-    		runner.setTestSuite ("MsoNetworkAdapter TestSuite");
-    		runner.run ();
-
-    		Map<TestAssertion,WsdlTestStepResult> mapResult= runner.getAssertionResults();
-    		for(Map.Entry<TestAssertion,WsdlTestStepResult> entry : mapResult.entrySet()) {
-    			assertTrue(entry.getValue().getStatus().equals(TestStepStatus.OK));
-    		}
-    		assertTrue (runner.getFailedTests ().size () == 0);
-
-    	} catch (Exception e) {
-            e.printStackTrace ();
-    		fail("Failure in SOAPUI NetworkAdapter");
-    	}
-    }
-
-
-    @Test
-    @RunAsClient
-    public void test04StartVnfAdapter () {
-        SoapUITestCaseRunner runner = new SoapUITestCaseRunner ();
-        runner.setSettingsFile("./src/test/resources/SoapUI/soapui-settings.xml");
-        runner.setJUnitReport(true);
-        runner.setProjectFile ("./src/test/resources/SoapUI/MSOVnfAdapter-soapui-project.xml");
-        runner.setOutputFolder ("./target/surefire-reports");
-        String[] properties = new String[1];
-        properties[0] = "host="+jbossHost+":"+jbossPort;
-        runner.setProjectProperties (properties);
-
-        try {
-            runner.setTestSuite ("MsoVnfAdapter TestSuite");
-            runner.run ();
-
-            Map<TestAssertion,WsdlTestStepResult> mapResult= runner.getAssertionResults();
-            for(Map.Entry<TestAssertion,WsdlTestStepResult> entry : mapResult.entrySet()) {
-                assertTrue(entry.getValue().getStatus().equals(TestStepStatus.OK));
-            }
-            assertTrue (runner.getFailedTests ().size () == 0);
-
-        } catch (Exception e) {
-            e.printStackTrace ();
-            fail("Failure in SOAPUI VnfAdapter");
-        }
-    }
-
-
-    @Test
-    @RunAsClient
-    public void test05StartTenantAdapter () {
-        SoapUITestCaseRunner runner = new SoapUITestCaseRunner ();
-        runner.setSettingsFile("./src/test/resources/SoapUI/soapui-settings.xml");
-        runner.setJUnitReport(true);
-        runner.setProjectFile ("./src/test/resources/SoapUI/MSOTenantAdapter-soapui-project.xml");
-        runner.setOutputFolder ("./target/surefire-reports");
-        String[] properties = new String[3];
-        properties[0] = "host="+jbossHost+":"+jbossPort;
-        properties[1] = "user-bpel=BPELClient";
-        properties[2] = "password-bpel=password1$";
-        runner.setProjectProperties (properties);
-
-        try {
-            runner.setTestSuite ("MsoTenantAdapter TestSuite");
-            runner.run ();
-
-            Map<TestAssertion,WsdlTestStepResult> mapResult= runner.getAssertionResults();
-            for(Map.Entry<TestAssertion,WsdlTestStepResult> entry : mapResult.entrySet()) {
-                assertTrue(entry.getValue().getStatus().equals(TestStepStatus.OK));
-            }
-            assertTrue (runner.getFailedTests ().size () == 0);
-
-        } catch (Exception e) {
-            e.printStackTrace ();
-            fail("Failure in SOAPUI TenantAdapter");
-        }
-    }
-
-
-    @Test
-    @RunAsClient
-    public void test06StartRequestDBAdapter () {
-        SoapUITestCaseRunner runner = new SoapUITestCaseRunner ();
-        runner.setSettingsFile("./src/test/resources/SoapUI/soapui-settings.xml");
-        runner.setJUnitReport(true);
-        runner.setProjectFile ("./src/test/resources/SoapUI/MsoRequestDB-soapui-project.xml");
-        runner.setOutputFolder ("./target/surefire-reports");
-        String[] properties = new String[3];
-        properties[0] = "host="+jbossHost+":"+jbossPort;
-        properties[1] = "user-infraportal=InfraPortalClient";
-        properties[2] = "password-infraportal=password1$";
-        runner.setProjectProperties (properties);
-
-
-        try {
-            runner.setTestSuite ("MsoRequestsDbAdapterImplPortBinding TestSuite");
-            runner.run ();
-
-            Map<TestAssertion,WsdlTestStepResult> mapResult= runner.getAssertionResults();
-            for(Map.Entry<TestAssertion,WsdlTestStepResult> entry : mapResult.entrySet()) {
-                assertTrue(entry.getValue().getStatus().equals(TestStepStatus.OK));
-            }
-            assertTrue (runner.getFailedTests ().size () == 0);
-
-        } catch (Exception e) {
-            e.printStackTrace ();
-        	fail("Failure in SOAPUI RequestDB adapter");
-        }
-    }
-
-    @Test
-    @RunAsClient
-    public void test07MsoConfigEndpoints () {
-        SoapUITestCaseRunner runner = new SoapUITestCaseRunner ();
-		runner.setSettingsFile("./src/test/resources/SoapUI/soapui-settings.xml");
-		runner.setJUnitReport(true);
-        runner.setProjectFile ("./src/test/resources/SoapUI/MSOConfig-soapui-project.xml");
-        runner.setOutputFolder ("./target/surefire-reports");
-        String[] properties = new String[3];
-        properties[0] = "host="+jbossHost+":"+jbossPort;
-        properties[1] = "user-infraportal=InfraPortalClient";
-        properties[2] = "password-infraportal=password1$";
-        runner.setProjectProperties (properties);
-
-
-        try {
-            runner.setTestSuite ("test_config_endpoints TestSuite");
-            runner.run ();
-
-            Map<TestAssertion,WsdlTestStepResult> mapResult= runner.getAssertionResults();
-            for(Map.Entry<TestAssertion,WsdlTestStepResult> entry : mapResult.entrySet()) {
-                assertTrue(entry.getValue().getStatus().equals(TestStepStatus.OK));
-            }
-            assertTrue (runner.getFailedTests ().size () == 0);
-
-        } catch (Exception e) {
-            e.printStackTrace ();
-        	fail("Failure in SOAPUI MSOConfig Endpoints");
-        }
-    }
-}
diff --git a/packages/arquillian-unit-tests/src/test/resources/JMeter/MSO-Perf.jmx b/packages/arquillian-unit-tests/src/test/resources/JMeter/MSO-Perf.jmx
deleted file mode 100644
index 5f93258..0000000
--- a/packages/arquillian-unit-tests/src/test/resources/JMeter/MSO-Perf.jmx
+++ /dev/null
@@ -1,866 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<jmeterTestPlan version="1.2" properties="2.8" jmeter="2.13 r1665067">
-  <hashTree>
-    <TestPlan guiclass="TestPlanGui" testclass="TestPlan" testname="Test Plan" enabled="true">
-      <stringProp name="TestPlan.comments"></stringProp>
-      <boolProp name="TestPlan.functional_mode">false</boolProp>
-      <boolProp name="TestPlan.serialize_threadgroups">false</boolProp>
-      <elementProp name="TestPlan.user_defined_variables" elementType="Arguments" guiclass="ArgumentsPanel" testclass="Arguments" testname="User Defined Variables" enabled="true">
-        <collectionProp name="Arguments.arguments"/>
-      </elementProp>
-      <stringProp name="TestPlan.user_define_classpath"></stringProp>
-    </TestPlan>
-    <hashTree>
-      <Arguments guiclass="ArgumentsPanel" testclass="Arguments" testname="Test variables" enabled="true">
-        <collectionProp name="Arguments.arguments">
-          <elementProp name="MSO_HOST" elementType="Argument">
-            <stringProp name="Argument.name">MSO_HOST</stringProp>
-            <stringProp name="Argument.value">localhost</stringProp>
-            <stringProp name="Argument.desc">The host/ip where to send the MSO queries</stringProp>
-            <stringProp name="Argument.metadata">=</stringProp>
-          </elementProp>
-          <elementProp name="MSO_PORT" elementType="Argument">
-            <stringProp name="Argument.name">MSO_PORT</stringProp>
-            <stringProp name="Argument.value">18080</stringProp>
-            <stringProp name="Argument.desc">The port where to send the mso queries</stringProp>
-            <stringProp name="Argument.metadata">=</stringProp>
-          </elementProp>
-          <elementProp name="USER_CSI" elementType="Argument">
-            <stringProp name="Argument.name">USER_CSI</stringProp>
-            <stringProp name="Argument.value">CSIClient</stringProp>
-            <stringProp name="Argument.desc">The csi queriy user to use</stringProp>
-            <stringProp name="Argument.metadata">=</stringProp>
-          </elementProp>
-          <elementProp name="PASSWORD_CSI" elementType="Argument">
-            <stringProp name="Argument.name">PASSWORD_CSI</stringProp>
-            <stringProp name="Argument.value">password1$</stringProp>
-            <stringProp name="Argument.desc">The csi query password to use</stringProp>
-            <stringProp name="Argument.metadata">=</stringProp>
-          </elementProp>
-          <elementProp name="USER_GUI" elementType="Argument">
-            <stringProp name="Argument.name">USER_GUI</stringProp>
-            <stringProp name="Argument.value">GUIClient</stringProp>
-            <stringProp name="Argument.desc">The gui queriy user to use</stringProp>
-            <stringProp name="Argument.metadata">=</stringProp>
-          </elementProp>
-          <elementProp name="PASSWORD_GUI" elementType="Argument">
-            <stringProp name="Argument.name">PASSWORD_GUI</stringProp>
-            <stringProp name="Argument.value">password1$</stringProp>
-            <stringProp name="Argument.desc">The gui query password to use</stringProp>
-            <stringProp name="Argument.metadata">=</stringProp>
-          </elementProp>
-        </collectionProp>
-      </Arguments>
-      <hashTree/>
-      <AuthManager guiclass="AuthPanel" testclass="AuthManager" testname="HTTP Authorization Manager" enabled="true">
-        <collectionProp name="AuthManager.auth_list">
-          <elementProp name="" elementType="Authorization">
-            <stringProp name="Authorization.url">http://${MSO_HOST}:${MSO_PORT}/ecomp/mso/v1/services/</stringProp>
-            <stringProp name="Authorization.username">${USER_CSI}</stringProp>
-            <stringProp name="Authorization.password">${PASSWORD_CSI}</stringProp>
-            <stringProp name="Authorization.domain"></stringProp>
-            <stringProp name="Authorization.realm"></stringProp>
-          </elementProp>
-          <elementProp name="" elementType="Authorization">
-            <stringProp name="Authorization.url">http://${MSO_HOST}:${MSO_PORT}/ecomp/mso/v2/services/features/</stringProp>
-            <stringProp name="Authorization.username">${USER_GUI}</stringProp>
-            <stringProp name="Authorization.password">${PASSWORD_GUI}</stringProp>
-            <stringProp name="Authorization.domain"></stringProp>
-            <stringProp name="Authorization.realm"></stringProp>
-          </elementProp>
-          <elementProp name="" elementType="Authorization">
-            <stringProp name="Authorization.url">http://${MSO_HOST}:${MSO_PORT}/ecomp/mso/v1/requests/services/</stringProp>
-            <stringProp name="Authorization.username">${USER_GUI}</stringProp>
-            <stringProp name="Authorization.password">${PASSWORD_GUI}</stringProp>
-            <stringProp name="Authorization.domain"></stringProp>
-            <stringProp name="Authorization.realm"></stringProp>
-          </elementProp>
-          <elementProp name="" elementType="Authorization">
-            <stringProp name="Authorization.url">http://${MSO_HOST}:${MSO_PORT}/ecomp/mso/v1/requests/services/features</stringProp>
-            <stringProp name="Authorization.username">${USER_GUI}</stringProp>
-            <stringProp name="Authorization.password">${PASSWORD_GUI}</stringProp>
-            <stringProp name="Authorization.domain"></stringProp>
-            <stringProp name="Authorization.realm"></stringProp>
-          </elementProp>
-          <elementProp name="" elementType="Authorization">
-            <stringProp name="Authorization.url">http://${MSO_HOST}:${MSO_PORT}/ecomp/mso/v1/requests/</stringProp>
-            <stringProp name="Authorization.username">${USER_GUI}</stringProp>
-            <stringProp name="Authorization.password">${PASSWORD_GUI}</stringProp>
-            <stringProp name="Authorization.domain"></stringProp>
-            <stringProp name="Authorization.realm"></stringProp>
-          </elementProp>
-        </collectionProp>
-      </AuthManager>
-      <hashTree/>
-      <ThreadGroup guiclass="ThreadGroupGui" testclass="ThreadGroup" testname="ApiHandler Thread Group" enabled="true">
-        <stringProp name="ThreadGroup.on_sample_error">continue</stringProp>
-        <elementProp name="ThreadGroup.main_controller" elementType="LoopController" guiclass="LoopControlPanel" testclass="LoopController" testname="Loop Controller" enabled="true">
-          <boolProp name="LoopController.continue_forever">false</boolProp>
-          <stringProp name="LoopController.loops">1000</stringProp>
-        </elementProp>
-        <stringProp name="ThreadGroup.num_threads">1</stringProp>
-        <stringProp name="ThreadGroup.ramp_time">60</stringProp>
-        <longProp name="ThreadGroup.start_time">1448375429000</longProp>
-        <longProp name="ThreadGroup.end_time">1448375429000</longProp>
-        <boolProp name="ThreadGroup.scheduler">false</boolProp>
-        <stringProp name="ThreadGroup.duration"></stringProp>
-        <stringProp name="ThreadGroup.delay"></stringProp>
-      </ThreadGroup>
-      <hashTree>
-        <CounterConfig guiclass="CounterConfigGui" testclass="CounterConfig" testname="request-id increment" enabled="true">
-          <stringProp name="CounterConfig.start">0</stringProp>
-          <stringProp name="CounterConfig.end"></stringProp>
-          <stringProp name="CounterConfig.incr">1</stringProp>
-          <stringProp name="CounterConfig.name">REQUEST_ID</stringProp>
-          <stringProp name="CounterConfig.format"></stringProp>
-          <boolProp name="CounterConfig.per_user">false</boolProp>
-        </CounterConfig>
-        <hashTree/>
-        <CounterConfig guiclass="CounterConfigGui" testclass="CounterConfig" testname="service-id increment" enabled="true">
-          <stringProp name="CounterConfig.start">0</stringProp>
-          <stringProp name="CounterConfig.end"></stringProp>
-          <stringProp name="CounterConfig.incr">1</stringProp>
-          <stringProp name="CounterConfig.name">SERVICE_ID</stringProp>
-          <stringProp name="CounterConfig.format"></stringProp>
-          <boolProp name="CounterConfig.per_user">false</boolProp>
-        </CounterConfig>
-        <hashTree/>
-        <CounterConfig guiclass="CounterConfigGui" testclass="CounterConfig" testname="feature-id increment" enabled="true">
-          <stringProp name="CounterConfig.start">0</stringProp>
-          <stringProp name="CounterConfig.end"></stringProp>
-          <stringProp name="CounterConfig.incr">1</stringProp>
-          <stringProp name="CounterConfig.name">FEATURE_ID</stringProp>
-          <stringProp name="CounterConfig.format"></stringProp>
-          <boolProp name="CounterConfig.per_user">false</boolProp>
-        </CounterConfig>
-        <hashTree/>
-        <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="REST POST Service Request" enabled="true">
-          <boolProp name="HTTPSampler.postBodyRaw">true</boolProp>
-          <elementProp name="HTTPsampler.Arguments" elementType="Arguments">
-            <collectionProp name="Arguments.arguments">
-              <elementProp name="" elementType="HTTPArgument">
-                <boolProp name="HTTPArgument.always_encode">false</boolProp>
-                <stringProp name="Argument.value">&lt;service-request xmlns=&quot;http://org.openecomp/mso/request/layer3serviceactivate/schema/v1&quot; xmlns:msolayer3=&quot;http://org.openecomp/mso/request/layer3/schema/v1&quot; xmlns:msoservtypes=&quot;http://org.openecomp/mso/request/types/v1&quot;&gt;&#xd;
-&lt;msoservtypes:request-information&gt;&#xd;
-&lt;msoservtypes:request-id&gt;test${REQUEST_ID}-service&lt;/msoservtypes:request-id&gt;&#xd;
-&lt;msoservtypes:request-action&gt;Layer3ServiceActivateRequest&lt;/msoservtypes:request-action&gt;&#xd;
-&lt;msoservtypes:source&gt;OMX&lt;/msoservtypes:source&gt;&#xd;
-&lt;msoservtypes:notification-url&gt;https://localhost:22443/Services/com/cingular/csi/sdn/SendManagedNetworkStatusNotification.jws&lt;/msoservtypes:notification-url&gt;&#xd;
-&lt;msoservtypes:order-number&gt;5051560&lt;/msoservtypes:order-number&gt;&#xd;
-&lt;msoservtypes:order-version&gt;1&lt;/msoservtypes:order-version&gt;&#xd;
-&lt;/msoservtypes:request-information&gt;&#xd;
-&lt;msoservtypes:service-information&gt;&#xd;
-&lt;msoservtypes:service-type&gt;SDN-ETHERNET-INTERNET&lt;/msoservtypes:service-type&gt;&#xd;
-&lt;msoservtypes:service-instance-id&gt;serv-id${SERVICE_ID}&lt;/msoservtypes:service-instance-id&gt;&#xd;
-&lt;msoservtypes:subscriber-name&gt;ST E2E Test50565_13000050565&lt;/msoservtypes:subscriber-name&gt;&#xd;
-&lt;/msoservtypes:service-information&gt;&#xd;
-&lt;service-parameters&gt;&#xd;
-&lt;msolayer3:l2-homing-information&gt;&#xd;
-&lt;msolayer3:evc-name&gt;AS/VLXM/003717//SW&lt;/msolayer3:evc-name&gt;&#xd;
-&lt;msolayer3:topology&gt;MultiPoint&lt;/msolayer3:topology&gt;&#xd;
-&lt;msolayer3:preferred-aic-clli&gt;MTSNJA4LCP1&lt;/msolayer3:preferred-aic-clli&gt;&#xd;
-&lt;/msolayer3:l2-homing-information&gt;&#xd;
-&lt;msolayer3:internet-service-information&gt;&#xd;
-&lt;msolayer3:internet-evc-access-information&gt;&#xd;
-&lt;msolayer3:internet-evc-speed-value&gt;8&lt;/msolayer3:internet-evc-speed-value&gt;&#xd;
-&lt;msolayer3:internet-evc-speed-units&gt;Mbps&lt;/msolayer3:internet-evc-speed-units&gt;&#xd;
-&lt;msolayer3:ip-version&gt;ds&lt;/msolayer3:ip-version&gt;&#xd;
-&lt;/msolayer3:internet-evc-access-information&gt;&#xd;
-&lt;msolayer3:vr-lan&gt;&#xd;
-&lt;msolayer3:routing-protocol&gt;none&lt;/msolayer3:routing-protocol&gt;&#xd;
-&lt;msolayer3:vr-lan-interface&gt;&#xd;
-&lt;msolayer3:vr-designation&gt;primary&lt;/msolayer3:vr-designation&gt;&#xd;
-&lt;msolayer3:v4-vr-lan-prefix&gt;10.172.125.0&lt;/msolayer3:v4-vr-lan-prefix&gt;&#xd;
-&lt;msolayer3:v4-vr-lan-prefix-length&gt;28&lt;/msolayer3:v4-vr-lan-prefix-length&gt;&#xd;
-&lt;msolayer3:v6-vr-lan-prefix&gt;2001:112a:86c6:0045:1007:8a5d:0412:9179&lt;/msolayer3:v6-vr-lan-prefix&gt;&#xd;
-&lt;msolayer3:v6-vr-lan-prefix-length&gt;64&lt;/msolayer3:v6-vr-lan-prefix-length&gt;&#xd;
-&lt;msolayer3:v4-public-lan-prefixes&gt;&#xd;
-&lt;msolayer3:t-provided-v4-lan-public-prefixes&gt;&#xd;
-&lt;msolayer3:request-index&gt;1&lt;/msolayer3:request-index&gt;&#xd;
-&lt;msolayer3:v4-lan-public-prefix&gt;18.181.120.12&lt;/msolayer3:v4-lan-public-prefix&gt;&#xd;
-&lt;msolayer3:v4-lan-public-prefix-length&gt;28&lt;/msolayer3:v4-lan-public-prefix-length&gt;&#xd;
-&lt;/msolayer3:t-provided-v4-lan-public-prefixes&gt;&#xd;
-&lt;/msolayer3:v4-public-lan-prefixes&gt;&#xd;
-&lt;msolayer3:v6-public-lan-prefixes&gt;&#xd;
-&lt;msolayer3:t-provided-v6-lan-public-prefixes&gt;&#xd;
-&lt;msolayer3:request-index&gt;1&lt;/msolayer3:request-index&gt;&#xd;
-&lt;msolayer3:v6-lan-public-prefix&gt;2022:0cf7:87a6:0048:1008:8a4c:0373:1048&lt;/msolayer3:v6-lan-public-prefix&gt;&#xd;
-&lt;msolayer3:v6-lan-public-prefix-length&gt;64&lt;/msolayer3:v6-lan-public-prefix-length&gt;&#xd;
-&lt;/msolayer3:t-provided-v6-lan-public-prefixes&gt;&#xd;
-&lt;/msolayer3:v6-public-lan-prefixes&gt;&#xd;
-&#xd;
-&lt;msolayer3:dhcp&gt;&#xd;
-&lt;msolayer3:v4-dhcp-server-enabled&gt;Y&lt;/msolayer3:v4-dhcp-server-enabled&gt;&#xd;
-&lt;msolayer3:v6-dhcp-server-enabled&gt;Y&lt;/msolayer3:v6-dhcp-server-enabled&gt;&#xd;
-&lt;msolayer3:use-v4-default-pool&gt;N&lt;/msolayer3:use-v4-default-pool&gt;&#xd;
-&lt;msolayer3:use-v6-default-pool&gt;N&lt;/msolayer3:use-v6-default-pool&gt;&#xd;
-&lt;/msolayer3:dhcp&gt;&#xd;
-&lt;msolayer3:pat&gt;&#xd;
-&lt;msolayer3:v4-pat-enabled&gt;Y&lt;/msolayer3:v4-pat-enabled&gt;&#xd;
-&lt;msolayer3:use-v4-default-pool&gt;N&lt;/msolayer3:use-v4-default-pool&gt;&#xd;
-&lt;/msolayer3:pat&gt;&#xd;
-&lt;msolayer3:firewall-lite&gt;&#xd;
-&lt;msolayer3:stateful-firewall-lite-v4-enabled&gt;Y&lt;/msolayer3:stateful-firewall-lite-v4-enabled&gt;&#xd;
-&lt;msolayer3:stateful-firewall-lite-v6-enabled&gt;Y&lt;/msolayer3:stateful-firewall-lite-v6-enabled&gt;&#xd;
-&lt;/msolayer3:firewall-lite&gt;&#xd;
-&lt;/msolayer3:vr-lan-interface&gt;&#xd;
-&lt;/msolayer3:vr-lan&gt;&#xd;
-&lt;/msolayer3:internet-service-information&gt;&#xd;
-&lt;/service-parameters&gt;&#xd;
-&lt;/service-request&gt;</stringProp>
-                <stringProp name="Argument.metadata">=</stringProp>
-              </elementProp>
-            </collectionProp>
-          </elementProp>
-          <stringProp name="HTTPSampler.domain">${MSO_HOST}</stringProp>
-          <stringProp name="HTTPSampler.port">${MSO_PORT}</stringProp>
-          <stringProp name="HTTPSampler.connect_timeout">10000</stringProp>
-          <stringProp name="HTTPSampler.response_timeout">30000</stringProp>
-          <stringProp name="HTTPSampler.protocol"></stringProp>
-          <stringProp name="HTTPSampler.contentEncoding">UTF-8</stringProp>
-          <stringProp name="HTTPSampler.path">/ecomp/mso/v1/services/</stringProp>
-          <stringProp name="HTTPSampler.method">POST</stringProp>
-          <boolProp name="HTTPSampler.follow_redirects">false</boolProp>
-          <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-          <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-          <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-          <stringProp name="HTTPSampler.implementation">HttpClient4</stringProp>
-          <boolProp name="HTTPSampler.monitor">false</boolProp>
-          <stringProp name="HTTPSampler.embedded_url_re"></stringProp>
-        </HTTPSamplerProxy>
-        <hashTree>
-          <BeanShellPostProcessor guiclass="TestBeanGUI" testclass="BeanShellPostProcessor" testname="BeanShell PostProcessor" enabled="true">
-            <stringProp name="filename"></stringProp>
-            <stringProp name="parameters"></stringProp>
-            <boolProp name="resetInterpreter">false</boolProp>
-            <stringProp name="script">if (prev.getResponseCode().equals(&quot;500&quot;) == true) { 
-    prev.setResponseOK();  
-
-    /* the same is 
-    prev.setSuccessful(true);
-    prev.setResponseCodeOK();
-    prev.setResponseMessageOK();
-    */
-}</stringProp>
-          </BeanShellPostProcessor>
-          <hashTree/>
-        </hashTree>
-        <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="REST POST Feature Request" enabled="true">
-          <boolProp name="HTTPSampler.postBodyRaw">true</boolProp>
-          <elementProp name="HTTPsampler.Arguments" elementType="Arguments">
-            <collectionProp name="Arguments.arguments">
-              <elementProp name="" elementType="HTTPArgument">
-                <boolProp name="HTTPArgument.always_encode">false</boolProp>
-                <stringProp name="Argument.value">&lt;feature-request&#xd;
-	xmlns=&quot;http://org.openecomp/mso/request/layer3serviceactivate/schema/v1&quot;&#xd;
-	xmlns:xsi=&quot;http://www.w3.org/2001/XMLSchema-instance&quot; xmlns:msolayer3=&quot;http://org.openecomp/mso/request/layer3/schema/v1&quot;&#xd;
-	xmlns:msoservtypes=&quot;http://org.openecomp/mso/request/types/v1&quot;&gt;&#xd;
-	&lt;msoservtypes:request-information&gt;&#xd;
-		&lt;msoservtypes:request-id&gt;test${REQUEST_ID}-feature&lt;/msoservtypes:request-id&gt;&#xd;
-		&lt;msoservtypes:request-action&gt;ChangeFeatureActivateRequest&lt;/msoservtypes:request-action&gt;&#xd;
-		&lt;msoservtypes:source&gt;OMX&lt;/msoservtypes:source&gt;&#xd;
-		&lt;msoservtypes:notification-url&gt;https://localhost:22443/Services/com/cingular/csi/sdn/SendManagedNetworkStatusNotification.jws&lt;/msoservtypes:notification-url&gt;&#xd;
-		&lt;msoservtypes:order-number&gt;5051560&lt;/msoservtypes:order-number&gt;&#xd;
-		&lt;msoservtypes:order-version&gt;1&lt;/msoservtypes:order-version&gt;&#xd;
-	&lt;/msoservtypes:request-information&gt;&#xd;
-	&lt;msoservtypes:service-information&gt;&#xd;
-		&lt;msoservtypes:service-type&gt;SDN-ETHERNET-INTERNET&lt;/msoservtypes:service-type&gt;&#xd;
-		&lt;msoservtypes:service-instance-id&gt;serv-id${SERVICE_ID}&lt;/msoservtypes:service-instance-id&gt;&#xd;
-		&lt;msoservtypes:subscriber-name&gt;ST E2E Test50565_13000050565&lt;/msoservtypes:subscriber-name&gt;&#xd;
-	&lt;/msoservtypes:service-information&gt;&#xd;
-	&lt;msoservtypes:feature-information&gt;&#xd;
-		&lt;msoservtypes:feature-type&gt;FIREWALL-LITE&lt;/msoservtypes:feature-type&gt;&#xd;
-		&lt;msoservtypes:feature-instance-id&gt;feature-id${FEATURE_ID}&lt;/msoservtypes:feature-instance-id&gt;&#xd;
-		&lt;msoservtypes:feature-yang-model&gt;ST E2E Test50565_13000050565&lt;/msoservtypes:feature-yang-model&gt;&#xd;
-	&lt;/msoservtypes:feature-information&gt;&#xd;
-	&lt;/feature-request&gt;&#xd;
-</stringProp>
-                <stringProp name="Argument.metadata">=</stringProp>
-              </elementProp>
-            </collectionProp>
-          </elementProp>
-          <stringProp name="HTTPSampler.domain">${MSO_HOST}</stringProp>
-          <stringProp name="HTTPSampler.port">${MSO_PORT}</stringProp>
-          <stringProp name="HTTPSampler.connect_timeout">10000</stringProp>
-          <stringProp name="HTTPSampler.response_timeout">30000</stringProp>
-          <stringProp name="HTTPSampler.protocol"></stringProp>
-          <stringProp name="HTTPSampler.contentEncoding">UTF-8</stringProp>
-          <stringProp name="HTTPSampler.path">/ecomp/mso/v2/services/features/</stringProp>
-          <stringProp name="HTTPSampler.method">POST</stringProp>
-          <boolProp name="HTTPSampler.follow_redirects">false</boolProp>
-          <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-          <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-          <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-          <stringProp name="HTTPSampler.implementation">HttpClient4</stringProp>
-          <boolProp name="HTTPSampler.monitor">false</boolProp>
-          <stringProp name="HTTPSampler.embedded_url_re"></stringProp>
-        </HTTPSamplerProxy>
-        <hashTree>
-          <BeanShellPostProcessor guiclass="TestBeanGUI" testclass="BeanShellPostProcessor" testname="BeanShell PostProcessor" enabled="true">
-            <stringProp name="filename"></stringProp>
-            <stringProp name="parameters"></stringProp>
-            <boolProp name="resetInterpreter">false</boolProp>
-            <stringProp name="script">if (prev.getResponseCode().equals(&quot;500&quot;) == true) { 
-    prev.setResponseOK();  
-
-    /* the same is 
-    prev.setSuccessful(true);
-    prev.setResponseCodeOK();
-    prev.setResponseMessageOK();
-    */
-}</stringProp>
-          </BeanShellPostProcessor>
-          <hashTree/>
-        </hashTree>
-        <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="REST GET Service Request on RequestID" enabled="true">
-          <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" testname="User Defined Variables" enabled="true">
-            <collectionProp name="Arguments.arguments"/>
-          </elementProp>
-          <stringProp name="HTTPSampler.domain">${MSO_HOST}</stringProp>
-          <stringProp name="HTTPSampler.port">${MSO_PORT}</stringProp>
-          <stringProp name="HTTPSampler.connect_timeout">10000</stringProp>
-          <stringProp name="HTTPSampler.response_timeout">30000</stringProp>
-          <stringProp name="HTTPSampler.protocol"></stringProp>
-          <stringProp name="HTTPSampler.contentEncoding">UTF-8</stringProp>
-          <stringProp name="HTTPSampler.path">/ecomp/mso/v1/requests/test${REQUEST_ID}-service</stringProp>
-          <stringProp name="HTTPSampler.method">GET</stringProp>
-          <boolProp name="HTTPSampler.follow_redirects">false</boolProp>
-          <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-          <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-          <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-          <stringProp name="HTTPSampler.implementation">HttpClient4</stringProp>
-          <boolProp name="HTTPSampler.monitor">false</boolProp>
-          <stringProp name="HTTPSampler.embedded_url_re"></stringProp>
-        </HTTPSamplerProxy>
-        <hashTree/>
-        <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="REST GET Feature Request on RequestID" enabled="true">
-          <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" testname="User Defined Variables" enabled="true">
-            <collectionProp name="Arguments.arguments"/>
-          </elementProp>
-          <stringProp name="HTTPSampler.domain">${MSO_HOST}</stringProp>
-          <stringProp name="HTTPSampler.port">${MSO_PORT}</stringProp>
-          <stringProp name="HTTPSampler.connect_timeout">10000</stringProp>
-          <stringProp name="HTTPSampler.response_timeout">30000</stringProp>
-          <stringProp name="HTTPSampler.protocol"></stringProp>
-          <stringProp name="HTTPSampler.contentEncoding">UTF-8</stringProp>
-          <stringProp name="HTTPSampler.path">/ecomp/mso/v1/requests/test${REQUEST_ID}-feature</stringProp>
-          <stringProp name="HTTPSampler.method">GET</stringProp>
-          <boolProp name="HTTPSampler.follow_redirects">false</boolProp>
-          <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-          <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-          <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-          <stringProp name="HTTPSampler.implementation">HttpClient4</stringProp>
-          <boolProp name="HTTPSampler.monitor">false</boolProp>
-          <stringProp name="HTTPSampler.embedded_url_re"></stringProp>
-        </HTTPSamplerProxy>
-        <hashTree/>
-        <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="REST GET Feature Request on ServiceID" enabled="true">
-          <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" testname="User Defined Variables" enabled="true">
-            <collectionProp name="Arguments.arguments"/>
-          </elementProp>
-          <stringProp name="HTTPSampler.domain">${MSO_HOST}</stringProp>
-          <stringProp name="HTTPSampler.port">${MSO_PORT}</stringProp>
-          <stringProp name="HTTPSampler.connect_timeout">10000</stringProp>
-          <stringProp name="HTTPSampler.response_timeout">30000</stringProp>
-          <stringProp name="HTTPSampler.protocol"></stringProp>
-          <stringProp name="HTTPSampler.contentEncoding">UTF-8</stringProp>
-          <stringProp name="HTTPSampler.path">/ecomp/mso/v1/requests/services/serv-id${SERVICE_ID}</stringProp>
-          <stringProp name="HTTPSampler.method">GET</stringProp>
-          <boolProp name="HTTPSampler.follow_redirects">false</boolProp>
-          <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-          <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-          <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-          <stringProp name="HTTPSampler.implementation">HttpClient4</stringProp>
-          <boolProp name="HTTPSampler.monitor">false</boolProp>
-          <stringProp name="HTTPSampler.embedded_url_re"></stringProp>
-        </HTTPSamplerProxy>
-        <hashTree/>
-        <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="REST GET Feature Request on FeatureID" enabled="true">
-          <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" testname="User Defined Variables" enabled="true">
-            <collectionProp name="Arguments.arguments"/>
-          </elementProp>
-          <stringProp name="HTTPSampler.domain">${MSO_HOST}</stringProp>
-          <stringProp name="HTTPSampler.port">${MSO_PORT}</stringProp>
-          <stringProp name="HTTPSampler.connect_timeout">10000</stringProp>
-          <stringProp name="HTTPSampler.response_timeout">30000</stringProp>
-          <stringProp name="HTTPSampler.protocol"></stringProp>
-          <stringProp name="HTTPSampler.contentEncoding">UTF-8</stringProp>
-          <stringProp name="HTTPSampler.path">/ecomp/mso/v1/requests/services/features/feature-id${FEATURE_ID}</stringProp>
-          <stringProp name="HTTPSampler.method">GET</stringProp>
-          <boolProp name="HTTPSampler.follow_redirects">false</boolProp>
-          <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-          <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-          <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-          <stringProp name="HTTPSampler.implementation">HttpClient4</stringProp>
-          <boolProp name="HTTPSampler.monitor">false</boolProp>
-          <stringProp name="HTTPSampler.embedded_url_re"></stringProp>
-        </HTTPSamplerProxy>
-        <hashTree/>
-        <ResultCollector guiclass="ViewResultsFullVisualizer" testclass="ResultCollector" testname="View Results Tree" enabled="false">
-          <boolProp name="ResultCollector.error_logging">false</boolProp>
-          <objProp>
-            <name>saveConfig</name>
-            <value class="SampleSaveConfiguration">
-              <time>true</time>
-              <latency>true</latency>
-              <timestamp>true</timestamp>
-              <success>true</success>
-              <label>true</label>
-              <code>true</code>
-              <message>true</message>
-              <threadName>true</threadName>
-              <dataType>true</dataType>
-              <encoding>false</encoding>
-              <assertions>true</assertions>
-              <subresults>true</subresults>
-              <responseData>false</responseData>
-              <samplerData>false</samplerData>
-              <xml>false</xml>
-              <fieldNames>false</fieldNames>
-              <responseHeaders>false</responseHeaders>
-              <requestHeaders>false</requestHeaders>
-              <responseDataOnError>false</responseDataOnError>
-              <saveAssertionResultsFailureMessage>false</saveAssertionResultsFailureMessage>
-              <assertionsResultsToSave>0</assertionsResultsToSave>
-              <bytes>true</bytes>
-              <threadCounts>true</threadCounts>
-            </value>
-          </objProp>
-          <stringProp name="filename"></stringProp>
-          <boolProp name="ResultCollector.success_only_logging">true</boolProp>
-        </ResultCollector>
-        <hashTree/>
-        <ResultCollector guiclass="StatGraphVisualizer" testclass="ResultCollector" testname="Aggregate Graph" enabled="true">
-          <boolProp name="ResultCollector.error_logging">false</boolProp>
-          <objProp>
-            <name>saveConfig</name>
-            <value class="SampleSaveConfiguration">
-              <time>true</time>
-              <latency>true</latency>
-              <timestamp>true</timestamp>
-              <success>true</success>
-              <label>true</label>
-              <code>true</code>
-              <message>true</message>
-              <threadName>true</threadName>
-              <dataType>true</dataType>
-              <encoding>false</encoding>
-              <assertions>true</assertions>
-              <subresults>true</subresults>
-              <responseData>false</responseData>
-              <samplerData>false</samplerData>
-              <xml>true</xml>
-              <fieldNames>false</fieldNames>
-              <responseHeaders>false</responseHeaders>
-              <requestHeaders>false</requestHeaders>
-              <responseDataOnError>false</responseDataOnError>
-              <saveAssertionResultsFailureMessage>false</saveAssertionResultsFailureMessage>
-              <assertionsResultsToSave>0</assertionsResultsToSave>
-              <bytes>true</bytes>
-              <threadCounts>true</threadCounts>
-            </value>
-          </objProp>
-          <stringProp name="filename">/tmp/mso-perf.jtl</stringProp>
-          <boolProp name="ResultCollector.success_only_logging">true</boolProp>
-        </ResultCollector>
-        <hashTree/>
-      </hashTree>
-      <ThreadGroup guiclass="ThreadGroupGui" testclass="ThreadGroup" testname="ApiHandler Homing Thread Group" enabled="false">
-        <stringProp name="ThreadGroup.on_sample_error">continue</stringProp>
-        <elementProp name="ThreadGroup.main_controller" elementType="LoopController" guiclass="LoopControlPanel" testclass="LoopController" testname="Loop Controller" enabled="true">
-          <boolProp name="LoopController.continue_forever">false</boolProp>
-          <stringProp name="LoopController.loops">1</stringProp>
-        </elementProp>
-        <stringProp name="ThreadGroup.num_threads">1</stringProp>
-        <stringProp name="ThreadGroup.ramp_time">60</stringProp>
-        <longProp name="ThreadGroup.start_time">1448375429000</longProp>
-        <longProp name="ThreadGroup.end_time">1448375429000</longProp>
-        <boolProp name="ThreadGroup.scheduler">false</boolProp>
-        <stringProp name="ThreadGroup.duration"></stringProp>
-        <stringProp name="ThreadGroup.delay"></stringProp>
-      </ThreadGroup>
-      <hashTree>
-        <CounterConfig guiclass="CounterConfigGui" testclass="CounterConfig" testname="service-id increment" enabled="true">
-          <stringProp name="CounterConfig.start">0</stringProp>
-          <stringProp name="CounterConfig.end"></stringProp>
-          <stringProp name="CounterConfig.incr">1</stringProp>
-          <stringProp name="CounterConfig.name">SERVICE_ID</stringProp>
-          <stringProp name="CounterConfig.format"></stringProp>
-          <boolProp name="CounterConfig.per_user">false</boolProp>
-        </CounterConfig>
-        <hashTree/>
-        <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="REST Service Request" enabled="true">
-          <boolProp name="HTTPSampler.postBodyRaw">true</boolProp>
-          <elementProp name="HTTPsampler.Arguments" elementType="Arguments">
-            <collectionProp name="Arguments.arguments">
-              <elementProp name="" elementType="HTTPArgument">
-                <boolProp name="HTTPArgument.always_encode">false</boolProp>
-                <stringProp name="Argument.value">&lt;service-request xmlns=&quot;http://org.openecomp/mso/request/layer3serviceactivate/schema/v1&quot; xmlns:msolayer3=&quot;http://org.openecomp/mso/request/layer3/schema/v1&quot; xmlns:msoservtypes=&quot;http://org.openecomp/mso/request/types/v1&quot;&gt;&#xd;
-&lt;msoservtypes:request-information&gt;&#xd;
-&lt;msoservtypes:request-id&gt;test${SERVICE_ID}-service&lt;/msoservtypes:request-id&gt;&#xd;
-&lt;msoservtypes:request-action&gt;Layer3ServiceActivateRequest&lt;/msoservtypes:request-action&gt;&#xd;
-&lt;msoservtypes:source&gt;OMX&lt;/msoservtypes:source&gt;&#xd;
-&lt;msoservtypes:notification-url&gt;https://localhost:22443/Services/com/cingular/csi/sdn/SendManagedNetworkStatusNotification.jws&lt;/msoservtypes:notification-url&gt;&#xd;
-&lt;msoservtypes:order-number&gt;5051560&lt;/msoservtypes:order-number&gt;&#xd;
-&lt;msoservtypes:order-version&gt;1&lt;/msoservtypes:order-version&gt;&#xd;
-&lt;/msoservtypes:request-information&gt;&#xd;
-&lt;msoservtypes:service-information&gt;&#xd;
-&lt;msoservtypes:service-type&gt;SDN-ETHERNET-INTERNET&lt;/msoservtypes:service-type&gt;&#xd;
-&lt;msoservtypes:service-instance-id&gt;serv-id0&lt;/msoservtypes:service-instance-id&gt;&#xd;
-&lt;msoservtypes:subscriber-name&gt;ST E2E Test50565_13000050565&lt;/msoservtypes:subscriber-name&gt;&#xd;
-&lt;/msoservtypes:service-information&gt;&#xd;
-&lt;service-parameters&gt;&#xd;
-&lt;msolayer3:l2-homing-information&gt;&#xd;
-&lt;msolayer3:evc-name&gt;AS/VLXM/003717//SW&lt;/msolayer3:evc-name&gt;&#xd;
-&lt;msolayer3:topology&gt;MultiPoint&lt;/msolayer3:topology&gt;&#xd;
-&lt;msolayer3:preferred-aic-clli&gt;MTSNJA4LCP1&lt;/msolayer3:preferred-aic-clli&gt;&#xd;
-&lt;/msolayer3:l2-homing-information&gt;&#xd;
-&lt;msolayer3:internet-service-information&gt;&#xd;
-&lt;msolayer3:internet-evc-access-information&gt;&#xd;
-&lt;msolayer3:internet-evc-speed-value&gt;8&lt;/msolayer3:internet-evc-speed-value&gt;&#xd;
-&lt;msolayer3:internet-evc-speed-units&gt;Mbps&lt;/msolayer3:internet-evc-speed-units&gt;&#xd;
-&lt;msolayer3:ip-version&gt;ds&lt;/msolayer3:ip-version&gt;&#xd;
-&lt;/msolayer3:internet-evc-access-information&gt;&#xd;
-&lt;msolayer3:vr-lan&gt;&#xd;
-&lt;msolayer3:routing-protocol&gt;none&lt;/msolayer3:routing-protocol&gt;&#xd;
-&lt;msolayer3:vr-lan-interface&gt;&#xd;
-&lt;msolayer3:vr-designation&gt;primary&lt;/msolayer3:vr-designation&gt;&#xd;
-&lt;msolayer3:v4-vr-lan-prefix&gt;10.172.125.0&lt;/msolayer3:v4-vr-lan-prefix&gt;&#xd;
-&lt;msolayer3:v4-vr-lan-prefix-length&gt;28&lt;/msolayer3:v4-vr-lan-prefix-length&gt;&#xd;
-&lt;msolayer3:v6-vr-lan-prefix&gt;2001:112a:86c6:0045:1007:8a5d:0412:9179&lt;/msolayer3:v6-vr-lan-prefix&gt;&#xd;
-&lt;msolayer3:v6-vr-lan-prefix-length&gt;64&lt;/msolayer3:v6-vr-lan-prefix-length&gt;&#xd;
-&lt;msolayer3:v4-public-lan-prefixes&gt;&#xd;
-&lt;msolayer3:t-provided-v4-lan-public-prefixes&gt;&#xd;
-&lt;msolayer3:request-index&gt;1&lt;/msolayer3:request-index&gt;&#xd;
-&lt;msolayer3:v4-lan-public-prefix&gt;18.181.120.12&lt;/msolayer3:v4-lan-public-prefix&gt;&#xd;
-&lt;msolayer3:v4-lan-public-prefix-length&gt;28&lt;/msolayer3:v4-lan-public-prefix-length&gt;&#xd;
-&lt;/msolayer3:t-provided-v4-lan-public-prefixes&gt;&#xd;
-&lt;/msolayer3:v4-public-lan-prefixes&gt;&#xd;
-&lt;msolayer3:v6-public-lan-prefixes&gt;&#xd;
-&lt;msolayer3:t-provided-v6-lan-public-prefixes&gt;&#xd;
-&lt;msolayer3:request-index&gt;1&lt;/msolayer3:request-index&gt;&#xd;
-&lt;msolayer3:v6-lan-public-prefix&gt;2022:0cf7:87a6:0048:1008:8a4c:0373:1048&lt;/msolayer3:v6-lan-public-prefix&gt;&#xd;
-&lt;msolayer3:v6-lan-public-prefix-length&gt;64&lt;/msolayer3:v6-lan-public-prefix-length&gt;&#xd;
-&lt;/msolayer3:t-provided-v6-lan-public-prefixes&gt;&#xd;
-&lt;/msolayer3:v6-public-lan-prefixes&gt;&#xd;
-&#xd;
-&lt;msolayer3:dhcp&gt;&#xd;
-&lt;msolayer3:v4-dhcp-server-enabled&gt;Y&lt;/msolayer3:v4-dhcp-server-enabled&gt;&#xd;
-&lt;msolayer3:v6-dhcp-server-enabled&gt;Y&lt;/msolayer3:v6-dhcp-server-enabled&gt;&#xd;
-&lt;msolayer3:use-v4-default-pool&gt;N&lt;/msolayer3:use-v4-default-pool&gt;&#xd;
-&lt;msolayer3:use-v6-default-pool&gt;N&lt;/msolayer3:use-v6-default-pool&gt;&#xd;
-&lt;/msolayer3:dhcp&gt;&#xd;
-&lt;msolayer3:pat&gt;&#xd;
-&lt;msolayer3:v4-pat-enabled&gt;Y&lt;/msolayer3:v4-pat-enabled&gt;&#xd;
-&lt;msolayer3:use-v4-default-pool&gt;N&lt;/msolayer3:use-v4-default-pool&gt;&#xd;
-&lt;/msolayer3:pat&gt;&#xd;
-&lt;msolayer3:firewall-lite&gt;&#xd;
-&lt;msolayer3:stateful-firewall-lite-v4-enabled&gt;Y&lt;/msolayer3:stateful-firewall-lite-v4-enabled&gt;&#xd;
-&lt;msolayer3:stateful-firewall-lite-v6-enabled&gt;Y&lt;/msolayer3:stateful-firewall-lite-v6-enabled&gt;&#xd;
-&lt;/msolayer3:firewall-lite&gt;&#xd;
-&lt;/msolayer3:vr-lan-interface&gt;&#xd;
-&lt;/msolayer3:vr-lan&gt;&#xd;
-&lt;/msolayer3:internet-service-information&gt;&#xd;
-&lt;/service-parameters&gt;&#xd;
-&lt;/service-request&gt;</stringProp>
-                <stringProp name="Argument.metadata">=</stringProp>
-              </elementProp>
-            </collectionProp>
-          </elementProp>
-          <stringProp name="HTTPSampler.domain">${MSO_HOST}</stringProp>
-          <stringProp name="HTTPSampler.port">${MSO_PORT}</stringProp>
-          <stringProp name="HTTPSampler.connect_timeout">10000</stringProp>
-          <stringProp name="HTTPSampler.response_timeout">30000</stringProp>
-          <stringProp name="HTTPSampler.protocol"></stringProp>
-          <stringProp name="HTTPSampler.contentEncoding">UTF-8</stringProp>
-          <stringProp name="HTTPSampler.path">/ecomp/mso/v1/services/</stringProp>
-          <stringProp name="HTTPSampler.method">POST</stringProp>
-          <boolProp name="HTTPSampler.follow_redirects">false</boolProp>
-          <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-          <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-          <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-          <stringProp name="HTTPSampler.implementation">HttpClient4</stringProp>
-          <boolProp name="HTTPSampler.monitor">false</boolProp>
-          <stringProp name="HTTPSampler.embedded_url_re"></stringProp>
-        </HTTPSamplerProxy>
-        <hashTree/>
-        <ResultCollector guiclass="ViewResultsFullVisualizer" testclass="ResultCollector" testname="View Results Tree" enabled="true">
-          <boolProp name="ResultCollector.error_logging">true</boolProp>
-          <objProp>
-            <name>saveConfig</name>
-            <value class="SampleSaveConfiguration">
-              <time>true</time>
-              <latency>true</latency>
-              <timestamp>true</timestamp>
-              <success>true</success>
-              <label>true</label>
-              <code>true</code>
-              <message>true</message>
-              <threadName>true</threadName>
-              <dataType>true</dataType>
-              <encoding>false</encoding>
-              <assertions>true</assertions>
-              <subresults>true</subresults>
-              <responseData>false</responseData>
-              <samplerData>false</samplerData>
-              <xml>false</xml>
-              <fieldNames>false</fieldNames>
-              <responseHeaders>false</responseHeaders>
-              <requestHeaders>false</requestHeaders>
-              <responseDataOnError>false</responseDataOnError>
-              <saveAssertionResultsFailureMessage>false</saveAssertionResultsFailureMessage>
-              <assertionsResultsToSave>0</assertionsResultsToSave>
-              <bytes>true</bytes>
-              <threadCounts>true</threadCounts>
-            </value>
-          </objProp>
-          <stringProp name="filename"></stringProp>
-        </ResultCollector>
-        <hashTree/>
-        <ResultCollector guiclass="StatGraphVisualizer" testclass="ResultCollector" testname="Aggregate Graph" enabled="true">
-          <boolProp name="ResultCollector.error_logging">false</boolProp>
-          <objProp>
-            <name>saveConfig</name>
-            <value class="SampleSaveConfiguration">
-              <time>true</time>
-              <latency>true</latency>
-              <timestamp>true</timestamp>
-              <success>true</success>
-              <label>true</label>
-              <code>true</code>
-              <message>true</message>
-              <threadName>true</threadName>
-              <dataType>true</dataType>
-              <encoding>false</encoding>
-              <assertions>true</assertions>
-              <subresults>true</subresults>
-              <responseData>false</responseData>
-              <samplerData>false</samplerData>
-              <xml>false</xml>
-              <fieldNames>false</fieldNames>
-              <responseHeaders>false</responseHeaders>
-              <requestHeaders>false</requestHeaders>
-              <responseDataOnError>false</responseDataOnError>
-              <saveAssertionResultsFailureMessage>false</saveAssertionResultsFailureMessage>
-              <assertionsResultsToSave>0</assertionsResultsToSave>
-              <bytes>true</bytes>
-              <threadCounts>true</threadCounts>
-            </value>
-          </objProp>
-          <stringProp name="filename"></stringProp>
-        </ResultCollector>
-        <hashTree/>
-        <JDBCSampler guiclass="TestBeanGUI" testclass="JDBCSampler" testname="JDBC Request" enabled="true">
-          <stringProp name="dataSource"></stringProp>
-          <stringProp name="query"></stringProp>
-          <stringProp name="queryArguments"></stringProp>
-          <stringProp name="queryArgumentsTypes"></stringProp>
-          <stringProp name="queryTimeout"></stringProp>
-          <stringProp name="queryType">Select Statement</stringProp>
-          <stringProp name="resultSetHandler">Store as String</stringProp>
-          <stringProp name="resultVariable"></stringProp>
-          <stringProp name="variableNames"></stringProp>
-        </JDBCSampler>
-        <hashTree/>
-      </hashTree>
-      <ThreadGroup guiclass="ThreadGroupGui" testclass="ThreadGroup" testname="ApiHandler Infra Thread Group" enabled="false">
-        <stringProp name="ThreadGroup.on_sample_error">continue</stringProp>
-        <elementProp name="ThreadGroup.main_controller" elementType="LoopController" guiclass="LoopControlPanel" testclass="LoopController" testname="Loop Controller" enabled="true">
-          <boolProp name="LoopController.continue_forever">false</boolProp>
-          <stringProp name="LoopController.loops">1</stringProp>
-        </elementProp>
-        <stringProp name="ThreadGroup.num_threads">1</stringProp>
-        <stringProp name="ThreadGroup.ramp_time">60</stringProp>
-        <longProp name="ThreadGroup.start_time">1448375429000</longProp>
-        <longProp name="ThreadGroup.end_time">1448375429000</longProp>
-        <boolProp name="ThreadGroup.scheduler">false</boolProp>
-        <stringProp name="ThreadGroup.duration"></stringProp>
-        <stringProp name="ThreadGroup.delay"></stringProp>
-      </ThreadGroup>
-      <hashTree>
-        <CounterConfig guiclass="CounterConfigGui" testclass="CounterConfig" testname="service-id increment" enabled="true">
-          <stringProp name="CounterConfig.start">0</stringProp>
-          <stringProp name="CounterConfig.end"></stringProp>
-          <stringProp name="CounterConfig.incr">1</stringProp>
-          <stringProp name="CounterConfig.name">SERVICE_ID</stringProp>
-          <stringProp name="CounterConfig.format"></stringProp>
-          <boolProp name="CounterConfig.per_user">false</boolProp>
-        </CounterConfig>
-        <hashTree/>
-        <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="REST Service Request" enabled="true">
-          <boolProp name="HTTPSampler.postBodyRaw">true</boolProp>
-          <elementProp name="HTTPsampler.Arguments" elementType="Arguments">
-            <collectionProp name="Arguments.arguments">
-              <elementProp name="" elementType="HTTPArgument">
-                <boolProp name="HTTPArgument.always_encode">false</boolProp>
-                <stringProp name="Argument.value">&lt;service-request xmlns=&quot;http://org.openecomp/mso/request/layer3serviceactivate/schema/v1&quot; xmlns:msolayer3=&quot;http://org.openecomp/mso/request/layer3/schema/v1&quot; xmlns:msoservtypes=&quot;http://org.openecomp/mso/request/types/v1&quot;&gt;&#xd;
-&lt;msoservtypes:request-information&gt;&#xd;
-&lt;msoservtypes:request-id&gt;test${SERVICE_ID}-service&lt;/msoservtypes:request-id&gt;&#xd;
-&lt;msoservtypes:request-action&gt;Layer3ServiceActivateRequest&lt;/msoservtypes:request-action&gt;&#xd;
-&lt;msoservtypes:source&gt;OMX&lt;/msoservtypes:source&gt;&#xd;
-&lt;msoservtypes:notification-url&gt;https://localhost:22443/Services/com/cingular/csi/sdn/SendManagedNetworkStatusNotification.jws&lt;/msoservtypes:notification-url&gt;&#xd;
-&lt;msoservtypes:order-number&gt;5051560&lt;/msoservtypes:order-number&gt;&#xd;
-&lt;msoservtypes:order-version&gt;1&lt;/msoservtypes:order-version&gt;&#xd;
-&lt;/msoservtypes:request-information&gt;&#xd;
-&lt;msoservtypes:service-information&gt;&#xd;
-&lt;msoservtypes:service-type&gt;SDN-ETHERNET-INTERNET&lt;/msoservtypes:service-type&gt;&#xd;
-&lt;msoservtypes:service-instance-id&gt;serv-id0&lt;/msoservtypes:service-instance-id&gt;&#xd;
-&lt;msoservtypes:subscriber-name&gt;ST E2E Test50565_13000050565&lt;/msoservtypes:subscriber-name&gt;&#xd;
-&lt;/msoservtypes:service-information&gt;&#xd;
-&lt;service-parameters&gt;&#xd;
-&lt;msolayer3:l2-homing-information&gt;&#xd;
-&lt;msolayer3:evc-name&gt;AS/VLXM/003717//SW&lt;/msolayer3:evc-name&gt;&#xd;
-&lt;msolayer3:topology&gt;MultiPoint&lt;/msolayer3:topology&gt;&#xd;
-&lt;msolayer3:preferred-aic-clli&gt;MTSNJA4LCP1&lt;/msolayer3:preferred-aic-clli&gt;&#xd;
-&lt;/msolayer3:l2-homing-information&gt;&#xd;
-&lt;msolayer3:internet-service-information&gt;&#xd;
-&lt;msolayer3:internet-evc-access-information&gt;&#xd;
-&lt;msolayer3:internet-evc-speed-value&gt;8&lt;/msolayer3:internet-evc-speed-value&gt;&#xd;
-&lt;msolayer3:internet-evc-speed-units&gt;Mbps&lt;/msolayer3:internet-evc-speed-units&gt;&#xd;
-&lt;msolayer3:ip-version&gt;ds&lt;/msolayer3:ip-version&gt;&#xd;
-&lt;/msolayer3:internet-evc-access-information&gt;&#xd;
-&lt;msolayer3:vr-lan&gt;&#xd;
-&lt;msolayer3:routing-protocol&gt;none&lt;/msolayer3:routing-protocol&gt;&#xd;
-&lt;msolayer3:vr-lan-interface&gt;&#xd;
-&lt;msolayer3:vr-designation&gt;primary&lt;/msolayer3:vr-designation&gt;&#xd;
-&lt;msolayer3:v4-vr-lan-prefix&gt;10.172.125.0&lt;/msolayer3:v4-vr-lan-prefix&gt;&#xd;
-&lt;msolayer3:v4-vr-lan-prefix-length&gt;28&lt;/msolayer3:v4-vr-lan-prefix-length&gt;&#xd;
-&lt;msolayer3:v6-vr-lan-prefix&gt;2001:112a:86c6:0045:1007:8a5d:0412:9179&lt;/msolayer3:v6-vr-lan-prefix&gt;&#xd;
-&lt;msolayer3:v6-vr-lan-prefix-length&gt;64&lt;/msolayer3:v6-vr-lan-prefix-length&gt;&#xd;
-&lt;msolayer3:v4-public-lan-prefixes&gt;&#xd;
-&lt;msolayer3:t-provided-v4-lan-public-prefixes&gt;&#xd;
-&lt;msolayer3:request-index&gt;1&lt;/msolayer3:request-index&gt;&#xd;
-&lt;msolayer3:v4-lan-public-prefix&gt;18.181.120.12&lt;/msolayer3:v4-lan-public-prefix&gt;&#xd;
-&lt;msolayer3:v4-lan-public-prefix-length&gt;28&lt;/msolayer3:v4-lan-public-prefix-length&gt;&#xd;
-&lt;/msolayer3:t-provided-v4-lan-public-prefixes&gt;&#xd;
-&lt;/msolayer3:v4-public-lan-prefixes&gt;&#xd;
-&lt;msolayer3:v6-public-lan-prefixes&gt;&#xd;
-&lt;msolayer3:t-provided-v6-lan-public-prefixes&gt;&#xd;
-&lt;msolayer3:request-index&gt;1&lt;/msolayer3:request-index&gt;&#xd;
-&lt;msolayer3:v6-lan-public-prefix&gt;2022:0cf7:87a6:0048:1008:8a4c:0373:1048&lt;/msolayer3:v6-lan-public-prefix&gt;&#xd;
-&lt;msolayer3:v6-lan-public-prefix-length&gt;64&lt;/msolayer3:v6-lan-public-prefix-length&gt;&#xd;
-&lt;/msolayer3:t-provided-v6-lan-public-prefixes&gt;&#xd;
-&lt;/msolayer3:v6-public-lan-prefixes&gt;&#xd;
-&#xd;
-&lt;msolayer3:dhcp&gt;&#xd;
-&lt;msolayer3:v4-dhcp-server-enabled&gt;Y&lt;/msolayer3:v4-dhcp-server-enabled&gt;&#xd;
-&lt;msolayer3:v6-dhcp-server-enabled&gt;Y&lt;/msolayer3:v6-dhcp-server-enabled&gt;&#xd;
-&lt;msolayer3:use-v4-default-pool&gt;N&lt;/msolayer3:use-v4-default-pool&gt;&#xd;
-&lt;msolayer3:use-v6-default-pool&gt;N&lt;/msolayer3:use-v6-default-pool&gt;&#xd;
-&lt;/msolayer3:dhcp&gt;&#xd;
-&lt;msolayer3:pat&gt;&#xd;
-&lt;msolayer3:v4-pat-enabled&gt;Y&lt;/msolayer3:v4-pat-enabled&gt;&#xd;
-&lt;msolayer3:use-v4-default-pool&gt;N&lt;/msolayer3:use-v4-default-pool&gt;&#xd;
-&lt;/msolayer3:pat&gt;&#xd;
-&lt;msolayer3:firewall-lite&gt;&#xd;
-&lt;msolayer3:stateful-firewall-lite-v4-enabled&gt;Y&lt;/msolayer3:stateful-firewall-lite-v4-enabled&gt;&#xd;
-&lt;msolayer3:stateful-firewall-lite-v6-enabled&gt;Y&lt;/msolayer3:stateful-firewall-lite-v6-enabled&gt;&#xd;
-&lt;/msolayer3:firewall-lite&gt;&#xd;
-&lt;/msolayer3:vr-lan-interface&gt;&#xd;
-&lt;/msolayer3:vr-lan&gt;&#xd;
-&lt;/msolayer3:internet-service-information&gt;&#xd;
-&lt;/service-parameters&gt;&#xd;
-&lt;/service-request&gt;</stringProp>
-                <stringProp name="Argument.metadata">=</stringProp>
-              </elementProp>
-            </collectionProp>
-          </elementProp>
-          <stringProp name="HTTPSampler.domain">${MSO_HOST}</stringProp>
-          <stringProp name="HTTPSampler.port">${MSO_PORT}</stringProp>
-          <stringProp name="HTTPSampler.connect_timeout">10000</stringProp>
-          <stringProp name="HTTPSampler.response_timeout">30000</stringProp>
-          <stringProp name="HTTPSampler.protocol"></stringProp>
-          <stringProp name="HTTPSampler.contentEncoding">UTF-8</stringProp>
-          <stringProp name="HTTPSampler.path">/ecomp/mso/v1/services/</stringProp>
-          <stringProp name="HTTPSampler.method">POST</stringProp>
-          <boolProp name="HTTPSampler.follow_redirects">false</boolProp>
-          <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-          <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-          <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-          <stringProp name="HTTPSampler.implementation">HttpClient4</stringProp>
-          <boolProp name="HTTPSampler.monitor">false</boolProp>
-          <stringProp name="HTTPSampler.embedded_url_re"></stringProp>
-        </HTTPSamplerProxy>
-        <hashTree/>
-        <ResultCollector guiclass="ViewResultsFullVisualizer" testclass="ResultCollector" testname="View Results Tree" enabled="true">
-          <boolProp name="ResultCollector.error_logging">true</boolProp>
-          <objProp>
-            <name>saveConfig</name>
-            <value class="SampleSaveConfiguration">
-              <time>true</time>
-              <latency>true</latency>
-              <timestamp>true</timestamp>
-              <success>true</success>
-              <label>true</label>
-              <code>true</code>
-              <message>true</message>
-              <threadName>true</threadName>
-              <dataType>true</dataType>
-              <encoding>false</encoding>
-              <assertions>true</assertions>
-              <subresults>true</subresults>
-              <responseData>false</responseData>
-              <samplerData>false</samplerData>
-              <xml>false</xml>
-              <fieldNames>false</fieldNames>
-              <responseHeaders>false</responseHeaders>
-              <requestHeaders>false</requestHeaders>
-              <responseDataOnError>false</responseDataOnError>
-              <saveAssertionResultsFailureMessage>false</saveAssertionResultsFailureMessage>
-              <assertionsResultsToSave>0</assertionsResultsToSave>
-              <bytes>true</bytes>
-              <threadCounts>true</threadCounts>
-            </value>
-          </objProp>
-          <stringProp name="filename"></stringProp>
-        </ResultCollector>
-        <hashTree/>
-        <ResultCollector guiclass="StatGraphVisualizer" testclass="ResultCollector" testname="Aggregate Graph" enabled="true">
-          <boolProp name="ResultCollector.error_logging">false</boolProp>
-          <objProp>
-            <name>saveConfig</name>
-            <value class="SampleSaveConfiguration">
-              <time>true</time>
-              <latency>true</latency>
-              <timestamp>true</timestamp>
-              <success>true</success>
-              <label>true</label>
-              <code>true</code>
-              <message>true</message>
-              <threadName>true</threadName>
-              <dataType>true</dataType>
-              <encoding>false</encoding>
-              <assertions>true</assertions>
-              <subresults>true</subresults>
-              <responseData>false</responseData>
-              <samplerData>false</samplerData>
-              <xml>false</xml>
-              <fieldNames>false</fieldNames>
-              <responseHeaders>false</responseHeaders>
-              <requestHeaders>false</requestHeaders>
-              <responseDataOnError>false</responseDataOnError>
-              <saveAssertionResultsFailureMessage>false</saveAssertionResultsFailureMessage>
-              <assertionsResultsToSave>0</assertionsResultsToSave>
-              <bytes>true</bytes>
-              <threadCounts>true</threadCounts>
-            </value>
-          </objProp>
-          <stringProp name="filename"></stringProp>
-        </ResultCollector>
-        <hashTree/>
-        <JDBCSampler guiclass="TestBeanGUI" testclass="JDBCSampler" testname="JDBC Request" enabled="true">
-          <stringProp name="dataSource"></stringProp>
-          <stringProp name="query"></stringProp>
-          <stringProp name="queryArguments"></stringProp>
-          <stringProp name="queryArgumentsTypes"></stringProp>
-          <stringProp name="queryTimeout"></stringProp>
-          <stringProp name="queryType">Select Statement</stringProp>
-          <stringProp name="resultSetHandler">Store as String</stringProp>
-          <stringProp name="resultVariable"></stringProp>
-          <stringProp name="variableNames"></stringProp>
-        </JDBCSampler>
-        <hashTree/>
-      </hashTree>
-    </hashTree>
-  </hashTree>
-</jmeterTestPlan>
diff --git a/packages/arquillian-unit-tests/src/test/resources/SoapUI/Healthcheck-soapui-project.xml b/packages/arquillian-unit-tests/src/test/resources/SoapUI/Healthcheck-soapui-project.xml
deleted file mode 100644
index 6215d0c..0000000
--- a/packages/arquillian-unit-tests/src/test/resources/SoapUI/Healthcheck-soapui-project.xml
+++ /dev/null
@@ -1,115 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<con:soapui-project id="5e41efd3-b2b2-4507-a41a-02227bd51b8a" activeEnvironment="Default" name="HealthCheck" resourceRoot="" soapui-version="5.2.1" abortOnError="false" runType="SEQUENTIAL" xmlns:con="http://eviware.com/soapui/config"><con:settings/><con:interface xsi:type="con:RestService" id="c7309861-55a2-458f-9408-6ddee8ed79a7" wadlVersion="http://wadl.dev.java.net/2009/02" name="SetStatus" type="rest" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"><con:settings/><con:definitionCache type="TEXT" rootPart=""/><con:endpoints><con:endpoint>http://localhost:8080</con:endpoint></con:endpoints><con:resource name="SetStatus false infra" path="/ecomp/mso/infra/setStatus/{siteName}" id="d03a4e5b-b5a2-4215-a37d-d5852a03e2e8"><con:settings/><con:parameters><con:parameter><con:name>enable</con:name><con:value>true</con:value><con:style>QUERY</con:style><con:default>true</con:default><con:path xsi:nil="true"/><con:description xsi:nil="true"/></con:parameter><con:parameter><con:name>siteName</con:name><con:value>${#Project#sitename}</con:value><con:style>TEMPLATE</con:style><con:default>${#Project#sitename}</con:default></con:parameter></con:parameters><con:method name="SetStatus false Infra" id="5d87cc87-ef01-44e7-8e6f-e177e088a6fe" method="POST"><con:settings/><con:parameters/><con:representation type="FAULT"><con:mediaType>text/html;charset=utf-8</con:mediaType><con:status>405 401 404</con:status><con:params/><con:element>html</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType>text/plain</con:mediaType><con:status>200</con:status><con:params/><con:element>data</con:element></con:representation><con:representation type="REQUEST"><con:mediaType>application/json</con:mediaType><con:params/></con:representation><con:representation type="FAULT"><con:mediaType>text/plain</con:mediaType><con:status>500</con:status><con:params/><con:element>data</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType>text/html</con:mediaType><con:status>200</con:status><con:params/><con:element>html</con:element></con:representation><con:request name="Request 1" id="e0314e05-9a73-4402-a404-3a1b0aa78232" mediaType="application/json" postQueryString="false"><con:settings><con:setting id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers">&lt;xml-fragment/></con:setting></con:settings><con:endpoint>http://${#Project#apihhost}</con:endpoint><con:request/><con:originalUri>http://localhost/ecomp/mso/infra/setStatus</con:originalUri><con:credentials><con:username>${#Project#userlogin}</con:username><con:password>${#Project#userpassword}</con:password><con:authType>No Authorization</con:authType></con:credentials><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:parameters><entry key="enable" value="false" xmlns="http://eviware.com/soapui/config"/></con:parameters><con:parameterOrder><con:entry>enable</con:entry><con:entry>siteName</con:entry></con:parameterOrder></con:request></con:method></con:resource><con:resource name="SetStatus true infra" path="/ecomp/mso/infra/setStatus/{siteName}" id="d03a4e5b-b5a2-4215-a37d-d5852a03e2e8"><con:settings/><con:parameters><con:parameter><con:name>enable</con:name><con:value>true</con:value><con:style>QUERY</con:style><con:default>true</con:default><con:path xsi:nil="true"/><con:description xsi:nil="true"/></con:parameter><con:parameter><con:name>siteName</con:name><con:value>${#Project#sitename}</con:value><con:style>TEMPLATE</con:style><con:default>${#Project#sitename}</con:default></con:parameter></con:parameters><con:method name="SetStatus true infra" id="5d87cc87-ef01-44e7-8e6f-e177e088a6fe" method="POST"><con:settings/><con:parameters/><con:representation type="FAULT"><con:mediaType>text/html;charset=utf-8</con:mediaType><con:status>405 401</con:status><con:params/><con:element>html</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType>text/plain</con:mediaType><con:status>200</con:status><con:params/><con:element>data</con:element></con:representation><con:representation type="REQUEST"><con:mediaType>application/json</con:mediaType><con:params/></con:representation><con:representation type="FAULT"><con:mediaType>text/plain</con:mediaType><con:status>500</con:status><con:params/><con:element>data</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType xsi:nil="true"/><con:status>0</con:status><con:params/><con:element>data</con:element></con:representation><con:request name="Request 1" id="e0314e05-9a73-4402-a404-3a1b0aa78232" mediaType="application/json" postQueryString="false"><con:settings><con:setting id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers">&lt;xml-fragment/></con:setting></con:settings><con:endpoint>http://${#Project#apihhost}</con:endpoint><con:request/><con:originalUri>http://localhost/ecomp/mso/infra/setStatus</con:originalUri><con:credentials><con:username>${#Project#userlogin}</con:username><con:password>${#Project#userpassword}</con:password><con:authType>No Authorization</con:authType></con:credentials><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:parameters/><con:parameterOrder><con:entry>enable</con:entry><con:entry>siteName</con:entry></con:parameterOrder></con:request></con:method></con:resource><con:resource name="SetStatus false apih asdc" path="/asdc/setStatus/{siteName}" id="d03a4e5b-b5a2-4215-a37d-d5852a03e2e8"><con:settings/><con:parameters><con:parameter><con:name>enable</con:name><con:value>true</con:value><con:style>QUERY</con:style><con:default>true</con:default><con:path xsi:nil="true"/><con:description xsi:nil="true"/></con:parameter><con:parameter><con:name>siteName</con:name><con:value>${#Project#sitename}</con:value><con:style>TEMPLATE</con:style><con:default>${#Project#sitename}</con:default></con:parameter></con:parameters><con:method name="SetStatus false apih asdc" id="5d87cc87-ef01-44e7-8e6f-e177e088a6fe" method="POST"><con:settings/><con:parameters/><con:representation type="FAULT"><con:mediaType>text/html;charset=utf-8</con:mediaType><con:status>405 401 403</con:status><con:params/><con:element>html</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType>text/plain</con:mediaType><con:status>200</con:status><con:params/><con:element>data</con:element></con:representation><con:representation type="REQUEST"><con:mediaType>application/json</con:mediaType><con:params/></con:representation><con:representation type="RESPONSE"><con:mediaType xsi:nil="true"/><con:status>0</con:status><con:params/><con:element>data</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType xsi:nil="true"/><con:status>0</con:status><con:params/><con:element>data</con:element></con:representation><con:request name="Request 1" id="e0314e05-9a73-4402-a404-3a1b0aa78232" mediaType="application/json" postQueryString="false"><con:settings><con:setting id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers">&lt;xml-fragment/></con:setting></con:settings><con:endpoint>http://${#Project#apihhost}</con:endpoint><con:request/><con:originalUri>http://localhost/ecomp/mso/infra/setStatus</con:originalUri><con:credentials><con:username>${#Project#userlogin}</con:username><con:password>${#Project#userpassword}</con:password><con:domain/><con:selectedAuthProfile>Basic</con:selectedAuthProfile><con:addedBasicAuthenticationTypes>Basic</con:addedBasicAuthenticationTypes><con:authType>Global HTTP Settings</con:authType></con:credentials><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:parameters><entry key="enable" value="false" xmlns="http://eviware.com/soapui/config"/></con:parameters><con:parameterOrder><con:entry>enable</con:entry><con:entry>siteName</con:entry></con:parameterOrder></con:request></con:method></con:resource><con:resource name="SetStatus true apih asdc" path="/asdc/setStatus/{siteName}" id="d03a4e5b-b5a2-4215-a37d-d5852a03e2e8"><con:settings/><con:parameters><con:parameter><con:name>enable</con:name><con:value>true</con:value><con:style>QUERY</con:style><con:default>true</con:default><con:path xsi:nil="true"/><con:description xsi:nil="true"/></con:parameter><con:parameter><con:name>siteName</con:name><con:value>${#Project#sitename}</con:value><con:style>TEMPLATE</con:style><con:default>${#Project#sitename}</con:default></con:parameter></con:parameters><con:method name="SetStatus true apih asdc" id="5d87cc87-ef01-44e7-8e6f-e177e088a6fe" method="POST"><con:settings/><con:parameters/><con:representation type="FAULT"><con:mediaType>text/html;charset=utf-8</con:mediaType><con:status>405 401 403</con:status><con:params/><con:element>html</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType>text/plain</con:mediaType><con:status>200</con:status><con:params/><con:element>data</con:element></con:representation><con:representation type="REQUEST"><con:mediaType>application/json</con:mediaType><con:params/></con:representation><con:representation type="RESPONSE"><con:mediaType xsi:nil="true"/><con:status>0</con:status><con:params/><con:element>data</con:element></con:representation><con:representation type="FAULT"><con:mediaType>text/plain</con:mediaType><con:status>500</con:status><con:params/><con:element>data</con:element></con:representation><con:request name="Request 1" id="e0314e05-9a73-4402-a404-3a1b0aa78232" mediaType="application/json" postQueryString="false"><con:settings><con:setting id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers">&lt;xml-fragment/></con:setting></con:settings><con:endpoint>http://${#Project#apihhost}</con:endpoint><con:request/><con:originalUri>http://localhost/ecomp/mso/infra/setStatus</con:originalUri><con:credentials><con:username>${#Project#userlogin}</con:username><con:password>${#Project#userpassword}</con:password><con:selectedAuthProfile>Basic</con:selectedAuthProfile><con:addedBasicAuthenticationTypes>Basic</con:addedBasicAuthenticationTypes><con:authType>Global HTTP Settings</con:authType></con:credentials><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:parameters/><con:parameterOrder><con:entry>enable</con:entry><con:entry>siteName</con:entry></con:parameterOrder></con:request></con:method></con:resource><con:resource name="SetStatus false networks" path="/networks/rest/setStatus/{siteName}" id="d03a4e5b-b5a2-4215-a37d-d5852a03e2e8"><con:settings/><con:parameters><con:parameter><con:name>enable</con:name><con:value>true</con:value><con:style>QUERY</con:style><con:default>true</con:default><con:path xsi:nil="true"/><con:description xsi:nil="true"/></con:parameter><con:parameter><con:name>siteName</con:name><con:value>${#Project#sitename}</con:value><con:style>TEMPLATE</con:style><con:default>${#Project#sitename}</con:default></con:parameter></con:parameters><con:method name="SetStatus false networks" id="5d87cc87-ef01-44e7-8e6f-e177e088a6fe" method="POST"><con:settings/><con:parameters/><con:representation type="FAULT"><con:mediaType>text/html;charset=utf-8</con:mediaType><con:status>405 404 401</con:status><con:params/><con:element>html</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType>text/plain</con:mediaType><con:status>200</con:status><con:params/><con:element>data</con:element></con:representation><con:representation type="REQUEST"><con:mediaType>application/json</con:mediaType><con:params/></con:representation><con:request name="Request 1" id="e0314e05-9a73-4402-a404-3a1b0aa78232" mediaType="application/json" postQueryString="false"><con:settings><con:setting id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers">&lt;xml-fragment/></con:setting></con:settings><con:endpoint>http://${#Project#jrahost}</con:endpoint><con:request/><con:originalUri>http://localhost/ecomp/mso/infra/setStatus</con:originalUri><con:credentials><con:username>${#Project#userlogin}</con:username><con:password>${#Project#userpassword}</con:password><con:selectedAuthProfile>Basic</con:selectedAuthProfile><con:addedBasicAuthenticationTypes>Basic</con:addedBasicAuthenticationTypes><con:authType>Global HTTP Settings</con:authType></con:credentials><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:parameters><entry key="enable" value="false" xmlns="http://eviware.com/soapui/config"/></con:parameters><con:parameterOrder><con:entry>enable</con:entry><con:entry>siteName</con:entry></con:parameterOrder></con:request></con:method></con:resource><con:resource name="SetStatus true networks" path="/networks/rest/setStatus/{siteName}" id="d03a4e5b-b5a2-4215-a37d-d5852a03e2e8"><con:settings/><con:parameters><con:parameter><con:name>enable</con:name><con:value>true</con:value><con:style>QUERY</con:style><con:default>true</con:default><con:path xsi:nil="true"/><con:description xsi:nil="true"/></con:parameter><con:parameter><con:name>siteName</con:name><con:value>${#Project#sitename}</con:value><con:style>TEMPLATE</con:style><con:default>${#Project#sitename}</con:default></con:parameter></con:parameters><con:method name="SetStatus true networks" id="5d87cc87-ef01-44e7-8e6f-e177e088a6fe" method="POST"><con:settings/><con:parameters/><con:representation type="FAULT"><con:mediaType>text/html;charset=utf-8</con:mediaType><con:status>405 404</con:status><con:params/><con:element>html</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType>text/plain</con:mediaType><con:status>200</con:status><con:params/><con:element>data</con:element></con:representation><con:representation type="REQUEST"><con:mediaType>application/json</con:mediaType><con:params/></con:representation><con:request name="Request 1" id="e0314e05-9a73-4402-a404-3a1b0aa78232" mediaType="application/json" postQueryString="false"><con:settings><con:setting id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers">&lt;xml-fragment/></con:setting></con:settings><con:endpoint>http://${#Project#jrahost}</con:endpoint><con:request/><con:originalUri>http://localhost/ecomp/mso/infra/setStatus</con:originalUri><con:credentials><con:username>${#Project#userlogin}</con:username><con:password>${#Project#userpassword}</con:password><con:selectedAuthProfile>Basic</con:selectedAuthProfile><con:addedBasicAuthenticationTypes>Basic</con:addedBasicAuthenticationTypes><con:authType>Global HTTP Settings</con:authType></con:credentials><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:parameters/><con:parameterOrder><con:entry>enable</con:entry><con:entry>siteName</con:entry></con:parameterOrder></con:request></con:method></con:resource><con:resource name="SetStatus false vnfs" path="/vnfs/rest/setStatus/{siteName}" id="d03a4e5b-b5a2-4215-a37d-d5852a03e2e8"><con:settings/><con:parameters><con:parameter><con:name>enable</con:name><con:value>true</con:value><con:style>QUERY</con:style><con:default>true</con:default><con:path xsi:nil="true"/><con:description xsi:nil="true"/></con:parameter><con:parameter><con:name>siteName</con:name><con:value>${#Project#sitename}</con:value><con:style>TEMPLATE</con:style><con:default>${#Project#sitename}</con:default></con:parameter></con:parameters><con:method name="SetStatus false vnfs" id="5d87cc87-ef01-44e7-8e6f-e177e088a6fe" method="POST"><con:settings/><con:parameters/><con:representation type="FAULT"><con:mediaType>text/html;charset=utf-8</con:mediaType><con:status>405 404 401</con:status><con:params/><con:element>html</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType>text/plain</con:mediaType><con:status>200</con:status><con:params/><con:element>data</con:element></con:representation><con:representation type="REQUEST"><con:mediaType>application/json</con:mediaType><con:params/></con:representation><con:request name="Request 1" id="e0314e05-9a73-4402-a404-3a1b0aa78232" mediaType="application/json" postQueryString="false"><con:settings><con:setting id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers">&lt;xml-fragment/></con:setting></con:settings><con:endpoint>http://${#Project#jrahost}</con:endpoint><con:request/><con:originalUri>http://localhost/ecomp/mso/infra/setStatus</con:originalUri><con:credentials><con:username>${#Project#userlogin}</con:username><con:password>${#Project#userpassword}</con:password><con:selectedAuthProfile>Basic</con:selectedAuthProfile><con:addedBasicAuthenticationTypes>Basic</con:addedBasicAuthenticationTypes><con:authType>Global HTTP Settings</con:authType></con:credentials><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:parameters><entry key="enable" value="false" xmlns="http://eviware.com/soapui/config"/></con:parameters><con:parameterOrder><con:entry>enable</con:entry><con:entry>siteName</con:entry></con:parameterOrder></con:request></con:method></con:resource><con:resource name="SetStatus true vnfs" path="/vnfs/rest/setStatus/{siteName}" id="d03a4e5b-b5a2-4215-a37d-d5852a03e2e8"><con:settings/><con:parameters><con:parameter><con:name>enable</con:name><con:value>true</con:value><con:style>QUERY</con:style><con:default>true</con:default><con:path xsi:nil="true"/><con:description xsi:nil="true"/></con:parameter><con:parameter><con:name>siteName</con:name><con:value>${#Project#sitename}</con:value><con:style>TEMPLATE</con:style><con:default>${#Project#sitename}</con:default></con:parameter></con:parameters><con:method name="SetStatus true vnfs" id="5d87cc87-ef01-44e7-8e6f-e177e088a6fe" method="POST"><con:settings/><con:parameters/><con:representation type="FAULT"><con:mediaType>text/html;charset=utf-8</con:mediaType><con:status>405 404 401</con:status><con:params/><con:element>html</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType>text/plain</con:mediaType><con:status>200</con:status><con:params/><con:element>data</con:element></con:representation><con:representation type="REQUEST"><con:mediaType>application/json</con:mediaType><con:params/></con:representation><con:request name="Request 1" id="e0314e05-9a73-4402-a404-3a1b0aa78232" mediaType="application/json" postQueryString="false"><con:settings><con:setting id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers">&lt;xml-fragment/></con:setting></con:settings><con:endpoint>http://${#Project#jrahost}</con:endpoint><con:request/><con:originalUri>http://localhost/ecomp/mso/infra/setStatus</con:originalUri><con:credentials><con:username>${#Project#userlogin}</con:username><con:password>${#Project#userpassword}</con:password><con:domain/><con:selectedAuthProfile>Basic</con:selectedAuthProfile><con:addedBasicAuthenticationTypes>Basic</con:addedBasicAuthenticationTypes><con:authType>Global HTTP Settings</con:authType></con:credentials><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:parameters/><con:parameterOrder><con:entry>enable</con:entry><con:entry>siteName</con:entry></con:parameterOrder></con:request></con:method></con:resource><con:resource name="SetStatus false tenants" path="/tenants/rest/setStatus/{siteName}" id="d03a4e5b-b5a2-4215-a37d-d5852a03e2e8"><con:settings/><con:parameters><con:parameter><con:name>enable</con:name><con:value>true</con:value><con:style>QUERY</con:style><con:default>true</con:default><con:path xsi:nil="true"/><con:description xsi:nil="true"/></con:parameter><con:parameter><con:name>siteName</con:name><con:value>${#Project#sitename}</con:value><con:style>TEMPLATE</con:style><con:default>${#Project#sitename}</con:default></con:parameter></con:parameters><con:method name="SetStatus false tenants" id="5d87cc87-ef01-44e7-8e6f-e177e088a6fe" method="POST"><con:settings/><con:parameters/><con:representation type="FAULT"><con:mediaType>text/html;charset=utf-8</con:mediaType><con:status>405 404 401</con:status><con:params/><con:element>html</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType>text/plain</con:mediaType><con:status>200</con:status><con:params/><con:element>data</con:element></con:representation><con:representation type="REQUEST"><con:mediaType>application/json</con:mediaType><con:params/></con:representation><con:request name="Request 1" id="e0314e05-9a73-4402-a404-3a1b0aa78232" mediaType="application/json" postQueryString="false"><con:settings><con:setting id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers">&lt;xml-fragment/></con:setting></con:settings><con:endpoint>http://${#Project#jrahost}</con:endpoint><con:request/><con:originalUri>http://localhost/ecomp/mso/infra/setStatus</con:originalUri><con:credentials><con:username>${#Project#userlogin}</con:username><con:password>${#Project#userpassword}</con:password><con:selectedAuthProfile>Basic</con:selectedAuthProfile><con:addedBasicAuthenticationTypes>Basic</con:addedBasicAuthenticationTypes><con:authType>Global HTTP Settings</con:authType></con:credentials><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:parameters><entry key="enable" value="false" xmlns="http://eviware.com/soapui/config"/></con:parameters><con:parameterOrder><con:entry>enable</con:entry><con:entry>siteName</con:entry></con:parameterOrder></con:request></con:method></con:resource><con:resource name="SetStatus true tenants" path="/tenants/rest/setStatus/{siteName}" id="d03a4e5b-b5a2-4215-a37d-d5852a03e2e8"><con:settings/><con:parameters><con:parameter><con:name>enable</con:name><con:value>true</con:value><con:style>QUERY</con:style><con:default>true</con:default><con:path xsi:nil="true"/><con:description xsi:nil="true"/></con:parameter><con:parameter><con:name>siteName</con:name><con:value>${#Project#sitename}</con:value><con:style>TEMPLATE</con:style><con:default>${#Project#sitename}</con:default></con:parameter></con:parameters><con:method name="SetStatus true tenants" id="5d87cc87-ef01-44e7-8e6f-e177e088a6fe" method="POST"><con:settings/><con:parameters/><con:representation type="FAULT"><con:mediaType>text/html;charset=utf-8</con:mediaType><con:status>405 404</con:status><con:params/><con:element>html</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType>text/plain</con:mediaType><con:status>200</con:status><con:params/><con:element>data</con:element></con:representation><con:representation type="REQUEST"><con:mediaType>application/json</con:mediaType><con:params/></con:representation><con:request name="Request 1" id="e0314e05-9a73-4402-a404-3a1b0aa78232" mediaType="application/json" postQueryString="false"><con:settings><con:setting id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers">&lt;xml-fragment/></con:setting></con:settings><con:endpoint>http://${#Project#jrahost}</con:endpoint><con:request/><con:originalUri>http://localhost/ecomp/mso/infra/setStatus</con:originalUri><con:credentials><con:username>${#Project#userlogin}</con:username><con:password>${#Project#userpassword}</con:password><con:selectedAuthProfile>Basic</con:selectedAuthProfile><con:addedBasicAuthenticationTypes>Basic</con:addedBasicAuthenticationTypes><con:authType>Global HTTP Settings</con:authType></con:credentials><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:parameters/><con:parameterOrder><con:entry>enable</con:entry><con:entry>siteName</con:entry></con:parameterOrder></con:request></con:method></con:resource><con:resource name="SetStatus false JRA" path="/adapters/rest/setStatus/{siteName}" id="d03a4e5b-b5a2-4215-a37d-d5852a03e2e8"><con:settings/><con:parameters><con:parameter><con:name>enable</con:name><con:value>true</con:value><con:style>QUERY</con:style><con:default>true</con:default><con:path xsi:nil="true"/><con:description xsi:nil="true"/></con:parameter><con:parameter><con:name>siteName</con:name><con:value>${#Project#sitename}</con:value><con:style>TEMPLATE</con:style><con:default>${#Project#sitename}</con:default></con:parameter></con:parameters><con:method name="SetStatus false JRA" id="5d87cc87-ef01-44e7-8e6f-e177e088a6fe" method="POST"><con:settings/><con:parameters/><con:representation type="FAULT"><con:mediaType>text/html;charset=utf-8</con:mediaType><con:status>405 404</con:status><con:params/><con:element>html</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType>text/plain</con:mediaType><con:status>200</con:status><con:params/><con:element>data</con:element></con:representation><con:representation type="REQUEST"><con:mediaType>application/json</con:mediaType><con:params/></con:representation><con:request name="Request 1" id="e0314e05-9a73-4402-a404-3a1b0aa78232" mediaType="application/json" postQueryString="false"><con:settings><con:setting id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers">&lt;xml-fragment/></con:setting></con:settings><con:endpoint>http://${#Project#jrahost}</con:endpoint><con:request/><con:originalUri>http://localhost/ecomp/mso/infra/setStatus</con:originalUri><con:credentials><con:username>${#Project#userlogin}</con:username><con:password>${#Project#userpassword}</con:password><con:selectedAuthProfile>Basic</con:selectedAuthProfile><con:addedBasicAuthenticationTypes>Basic</con:addedBasicAuthenticationTypes><con:authType>Global HTTP Settings</con:authType></con:credentials><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:parameters><entry key="enable" value="false" xmlns="http://eviware.com/soapui/config"/></con:parameters><con:parameterOrder><con:entry>enable</con:entry><con:entry>siteName</con:entry></con:parameterOrder></con:request></con:method></con:resource><con:resource name="SetStatus true JRA" path="/adapters/rest/setStatus/{siteName}" id="d03a4e5b-b5a2-4215-a37d-d5852a03e2e8"><con:settings/><con:parameters><con:parameter><con:name>enable</con:name><con:value>true</con:value><con:style>QUERY</con:style><con:default>true</con:default><con:path xsi:nil="true"/><con:description xsi:nil="true"/></con:parameter><con:parameter><con:name>siteName</con:name><con:value>${#Project#sitename}</con:value><con:style>TEMPLATE</con:style><con:default>${#Project#sitename}</con:default></con:parameter></con:parameters><con:method name="SetStatus true JRA" id="5d87cc87-ef01-44e7-8e6f-e177e088a6fe" method="POST"><con:settings/><con:parameters/><con:representation type="FAULT"><con:mediaType>text/html;charset=utf-8</con:mediaType><con:status>405 404 403</con:status><con:params/><con:element>html</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType>text/plain</con:mediaType><con:status>200</con:status><con:params/><con:element>data</con:element></con:representation><con:representation type="REQUEST"><con:mediaType>application/json</con:mediaType><con:params/></con:representation><con:representation type="FAULT"><con:mediaType>text/plain</con:mediaType><con:status>500</con:status><con:params/><con:element>data</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType xsi:nil="true"/><con:status>0</con:status><con:params/><con:element>data</con:element></con:representation><con:request name="Request 1" id="e0314e05-9a73-4402-a404-3a1b0aa78232" mediaType="application/json" postQueryString="false"><con:settings><con:setting id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers">&lt;xml-fragment/></con:setting></con:settings><con:endpoint>http://${#Project#jrahost}</con:endpoint><con:request/><con:originalUri>http://localhost/ecomp/mso/infra/setStatus</con:originalUri><con:credentials><con:username>${#Project#userlogin}</con:username><con:password>${#Project#userpassword}</con:password><con:selectedAuthProfile>Basic</con:selectedAuthProfile><con:addedBasicAuthenticationTypes>Basic</con:addedBasicAuthenticationTypes><con:authType>Global HTTP Settings</con:authType></con:credentials><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:parameters/><con:parameterOrder><con:entry>enable</con:entry><con:entry>siteName</con:entry></con:parameterOrder></con:request></con:method></con:resource></con:interface><con:interface xsi:type="con:RestService" id="f1eae1f1-1a12-43a3-84ea-b966442eafb0" wadlVersion="http://wadl.dev.java.net/2009/02" name="GlobalHealthcheck" type="rest" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"><con:settings/><con:definitionCache type="TEXT" rootPart=""/><con:endpoints><con:endpoint>http://localhost:8080</con:endpoint></con:endpoints><con:resource name="Infra" path="/ecomp/mso/infra/globalhealthcheck" id="85e05d47-4f09-4925-ab77-63f8a1665c27"><con:settings/><con:parameters><con:parameter><con:name>enableBpmn</con:name><con:value/><con:style>QUERY</con:style><con:default/><con:description xsi:nil="true"/></con:parameter></con:parameters><con:method name="GlobalHC Infra" id="1b6937c7-9d88-43c6-99b6-9dca4e891d5c" method="GET"><con:settings/><con:parameters/><con:representation type="RESPONSE"><con:mediaType xsi:nil="true"/><con:status>0</con:status><con:params/><con:element>data</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType>text/html</con:mediaType><con:status>200</con:status><con:params/><con:element>html</con:element></con:representation><con:representation type="FAULT"><con:mediaType>text/html</con:mediaType><con:status>503</con:status><con:params/><con:element>html</con:element></con:representation><con:request name="Request 1" id="42ea1c51-a0ca-445e-8f98-4af039a2b59c" mediaType="application/json"><con:settings><con:setting id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers">&lt;xml-fragment/></con:setting></con:settings><con:endpoint>http://${#Project#apihhost}</con:endpoint><con:request/><con:originalUri>http://localhost/ecomp/mso/infra/globalhealthcheck</con:originalUri><con:credentials><con:authType>No Authorization</con:authType></con:credentials><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:parameters><entry key="enableBpmn" value="${#Project#enableBpmn}" xmlns="http://eviware.com/soapui/config"/></con:parameters><con:parameterOrder><con:entry>enableBpmn</con:entry></con:parameterOrder></con:request></con:method></con:resource><con:resource name="JRA adapters" path="/adapters/rest/globalhealthcheck" id="cba118a2-5d68-47ab-9440-51920466fff0"><con:settings/><con:parameters><con:parameter><con:name>enableBpmn</con:name><con:value/><con:style>QUERY</con:style><con:default/><con:description xsi:nil="true"/></con:parameter></con:parameters><con:method name="GlobalHC adapters" id="52ffdb3c-6f8a-43b0-8a52-a2b603e3d9c5" method="GET"><con:settings/><con:parameters/><con:representation type="RESPONSE"><con:mediaType xsi:nil="true"/><con:status>0</con:status><con:params/><con:element>data</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType xsi:nil="true"/><con:status>0</con:status><con:params/><con:element>data</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType xsi:nil="true"/><con:status>0</con:status><con:params/><con:element>data</con:element></con:representation><con:representation type="FAULT"><con:mediaType>text/html</con:mediaType><con:status>503</con:status><con:params/><con:element>html</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType>text/html</con:mediaType><con:status>200</con:status><con:params/><con:element>html</con:element></con:representation><con:request name="Request 1" id="b1109ecf-fd73-4a30-8c98-ac50a10e9cb7" mediaType="application/json"><con:settings><con:setting id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers">&lt;xml-fragment/></con:setting></con:settings><con:endpoint>http://${#Project#jrahost}</con:endpoint><con:request/><con:originalUri>http://localhost/adapters/rest/globalhealthcheck</con:originalUri><con:credentials><con:authType>No Authorization</con:authType></con:credentials><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:parameters><entry key="enableBpmn" value="${#Project#enableBpmn}" xmlns="http://eviware.com/soapui/config"/></con:parameters><con:parameterOrder><con:entry>enableBpmn</con:entry></con:parameterOrder></con:request></con:method></con:resource></con:interface><con:interface xsi:type="con:RestService" id="4609f980-4202-4e50-b09f-abec5534dfa3" wadlVersion="http://wadl.dev.java.net/2009/02" name="SubModulesHealthcheck" type="rest" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"><con:settings/><con:definitionCache type="TEXT" rootPart=""/><con:endpoints><con:endpoint>http://${#Project#jrahost}</con:endpoint></con:endpoints><con:resource name="JRA networks" path="/networks/rest/healthcheck" id="61b35716-b06e-47ba-9567-7757980f1b5a"><con:settings/><con:parameters/><con:method name="LocalHC networks" id="48acb940-91ac-4b32-b32b-8808b552e059" method="GET"><con:settings/><con:parameters/><con:representation type="RESPONSE"><con:mediaType>text/html</con:mediaType><con:status>200</con:status><con:params/><con:element>html</con:element></con:representation><con:representation type="FAULT"><con:mediaType>text/html</con:mediaType><con:status>503</con:status><con:params/><con:element>html</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType xsi:nil="true"/><con:status>0</con:status><con:params/><con:element>data</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType xsi:nil="true"/><con:status>0</con:status><con:params/><con:element>data</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType xsi:nil="true"/><con:status>0</con:status><con:params/><con:element>data</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType xsi:nil="true"/><con:status>0</con:status><con:params/><con:element>data</con:element></con:representation><con:representation type="FAULT"><con:mediaType>text/html;charset=utf-8</con:mediaType><con:status>500</con:status><con:params/><con:element>html</con:element></con:representation><con:request name="Request 1" id="a8aa066b-ad81-40bc-9976-de44fe3dcc0a" mediaType="application/json"><con:settings><con:setting id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers">&lt;xml-fragment/></con:setting></con:settings><con:endpoint>http://${#Project#jrahost}</con:endpoint><con:request/><con:originalUri>http://localhost/networks/admin/healthcheck</con:originalUri><con:credentials><con:authType>No Authorization</con:authType></con:credentials><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:parameters/></con:request></con:method></con:resource><con:resource name="JRA adapters" path="/adapters/rest/healthcheck" id="fa70036c-7280-43c5-a26d-8e2d42584ee1"><con:settings/><con:parameters/><con:method name="LocalHC adapters" id="7587d026-ebda-4c13-80df-b5a26f322164" method="GET"><con:settings/><con:parameters/><con:representation type="RESPONSE"><con:mediaType>text/html</con:mediaType><con:status>200</con:status><con:params/><con:element>html</con:element></con:representation><con:representation type="FAULT"><con:mediaType>text/html</con:mediaType><con:status>503</con:status><con:params/><con:element>html</con:element></con:representation><con:request name="Request 1" id="ea2c9416-63eb-4219-83fd-db0593bf63e3" mediaType="application/json"><con:settings><con:setting id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers">&lt;xml-fragment/></con:setting><con:setting id="com.eviware.soapui.impl.wsdl.WsdlRequest@bind_address"/><con:setting id="com.eviware.soapui.impl.support.AbstractHttpRequest@follow-redirects">true</con:setting></con:settings><con:endpoint>http://${#Project#jrahost}</con:endpoint><con:request/><con:originalUri>http://localhost/adapters/rest/healthcheck</con:originalUri><con:credentials><con:authType>No Authorization</con:authType></con:credentials><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:parameters/></con:request></con:method></con:resource><con:resource name="JRA vnfs" path="/vnfs/rest/healthcheck" id="ee547629-e2ac-4932-b582-9586c6a3f464"><con:settings/><con:parameters/><con:method name="LocalHC vnfs" id="285c0bac-3c68-4f07-b231-5bba3217b60a" method="GET"><con:settings/><con:parameters/><con:representation type="RESPONSE"><con:mediaType>text/html</con:mediaType><con:status>200</con:status><con:params/><con:element>html</con:element></con:representation><con:representation type="FAULT"><con:mediaType>text/html</con:mediaType><con:status>503</con:status><con:params/><con:element>html</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType xsi:nil="true"/><con:status>0</con:status><con:params/><con:element>data</con:element></con:representation><con:representation type="FAULT"><con:mediaType>text/html;charset=utf-8</con:mediaType><con:status>500 404</con:status><con:params/><con:element>html</con:element></con:representation><con:request name="Request 1" id="f2effc08-5569-4e5b-a2e8-fa3bebc958b9" mediaType="application/json"><con:settings><con:setting id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers">&lt;xml-fragment/></con:setting></con:settings><con:endpoint>http://${#Project#jrahost}</con:endpoint><con:request/><con:originalUri>http://localhost/vnfs/rest/healthcheck</con:originalUri><con:credentials><con:authType>No Authorization</con:authType></con:credentials><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:parameters/></con:request></con:method></con:resource><con:resource name="JRA tenants" path="/tenants/rest/healthcheck" id="796ada77-fce3-493d-b003-10d4c1ecc498"><con:settings/><con:parameters/><con:method name="LocalHC tenants" id="2f9ae7ac-c18d-48eb-a43c-8624d9475b7f" method="GET"><con:settings/><con:parameters/><con:representation type="RESPONSE"><con:mediaType xsi:nil="true"/><con:status>0</con:status><con:params/><con:element>data</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType xsi:nil="true"/><con:status>0</con:status><con:params/><con:element>data</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType>text/html</con:mediaType><con:status>200</con:status><con:params/><con:element>html</con:element></con:representation><con:representation type="FAULT"><con:mediaType>text/html</con:mediaType><con:status>503</con:status><con:params/><con:element>html</con:element></con:representation><con:request name="Request 1" id="432c2172-deba-4173-a0af-0b6fccfd60dc" mediaType="application/json"><con:settings><con:setting id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers">&lt;xml-fragment/></con:setting></con:settings><con:endpoint>http://${#Project#jrahost}</con:endpoint><con:request/><con:originalUri>http://localhost/tenants/admin/healthcheck</con:originalUri><con:credentials><con:authType>No Authorization</con:authType></con:credentials><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:parameters/></con:request></con:method></con:resource><con:resource name="APIH Infra" path="/ecomp/mso/infra/healthcheck" id="29001acb-f40a-4ed3-af96-0415649eeacf"><con:settings/><con:parameters/><con:method name="LocalHC infra" id="6d7685fa-354e-44c6-b512-0e802673d341" method="GET"><con:settings/><con:parameters/><con:representation type="RESPONSE"><con:mediaType>text/html</con:mediaType><con:status>200</con:status><con:params/><con:element>html</con:element></con:representation><con:representation type="FAULT"><con:mediaType>text/html</con:mediaType><con:status>503</con:status><con:params/><con:element>html</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType xsi:nil="true"/><con:status>0</con:status><con:params/><con:element>data</con:element></con:representation><con:representation type="FAULT"><con:mediaType>text/html;charset=utf-8</con:mediaType><con:status>404</con:status><con:params/><con:element>html</con:element></con:representation><con:request name="Request 1" id="287d8590-e1da-49e5-afef-5f7191a55925" mediaType="application/json"><con:settings><con:setting id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers">&lt;xml-fragment/></con:setting></con:settings><con:endpoint>http://${#Project#apihhost}</con:endpoint><con:request/><con:originalUri>http://localhost/ecomp/mso/infra/healthcheck</con:originalUri><con:credentials><con:authType>No Authorization</con:authType></con:credentials><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:parameters/></con:request></con:method></con:resource><con:resource name="APIH asdc" path="/asdc/healthcheck" id="b79d1f28-0b27-4897-90a5-b17032d533da"><con:settings/><con:parameters/><con:method name="LocalHC asdc" id="f251569b-3e62-44c0-80c2-b806a0b2cda1" method="GET"><con:settings/><con:parameters/><con:representation type="RESPONSE"><con:mediaType>text/html</con:mediaType><con:status>200</con:status><con:params/><con:element>html</con:element></con:representation><con:representation type="FAULT"><con:mediaType>text/html</con:mediaType><con:status>503</con:status><con:params/><con:element>html</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType xsi:nil="true"/><con:status>0</con:status><con:params/><con:element>data</con:element></con:representation><con:request name="Request 1" id="b0d9d540-073e-4d1d-ac19-32566206d0c6" mediaType="application/json"><con:settings><con:setting id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers">&lt;xml-fragment/></con:setting></con:settings><con:endpoint>http://${#Project#apihhost}</con:endpoint><con:request/><con:originalUri>http://localhost/asdc/healthcheck</con:originalUri><con:credentials><con:authType>No Authorization</con:authType></con:credentials><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:parameters/></con:request></con:method></con:resource><con:resource name="Camunadalocal" path="/mso/healthcheck" id="6740d63f-f8ba-40d8-8397-c8d9135d241a"><con:settings/><con:parameters/><con:method name="CamundaLocal" id="a3ae9bf4-e129-4c12-a1ac-0f2fab31d509" method="GET"><con:description>not used in Arquilian as not same repo</con:description><con:settings/><con:parameters/><con:representation type="REQUEST"><con:mediaType>application/json</con:mediaType><con:params/></con:representation><con:representation type="FAULT"><con:mediaType>application/json</con:mediaType><con:status>500 503</con:status><con:params/><con:element xmlns:heal="localhost/mso/async/services/HealthCheck">heal:Fault</con:element></con:representation><con:representation type="FAULT"><con:mediaType>text/html;charset=utf-8</con:mediaType><con:status>400 404 405</con:status><con:params/><con:element>html</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType>application/json</con:mediaType><con:status>200</con:status><con:params/><con:element xmlns:heal="localhost/mso/async/services/HealthCheck">heal:Response</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType xsi:nil="true"/><con:status>0</con:status><con:params/><con:element>data</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType xsi:nil="true"/><con:status>0</con:status><con:params/><con:element>data</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType xsi:nil="true"/><con:status>0</con:status><con:params/><con:element>data</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType>text/html</con:mediaType><con:status>200</con:status><con:params/><con:element>html</con:element></con:representation><con:representation type="FAULT"><con:mediaType>text/html</con:mediaType><con:status>404</con:status><con:params/><con:element>html</con:element></con:representation><con:request name="Request 1" id="b85f87ca-6c69-46be-aa1d-cd9f0b1ce48d" mediaType="application/json" postQueryString="false"><con:settings><con:setting id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers">&lt;xml-fragment/></con:setting></con:settings><con:endpoint>http://${#Project#bpmnhost}</con:endpoint><con:request>{"variables":{}}</con:request><con:originalUri>localhost/mso/async/services/HealthCheck</con:originalUri><con:credentials><con:authType>No Authorization</con:authType></con:credentials><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:parameters/></con:request></con:method></con:resource><con:resource name="APIH dbadapters" path="/dbadapters/healthcheck" id="c9adf66c-dbfa-4f87-ba07-be9799ed3ef7"><con:settings/><con:parameters/><con:method name="LocalHC apih dbadapters" id="602a2bad-4bac-4bdc-b64a-c6b0250997e7" method="GET"><con:settings/><con:parameters/><con:representation type="RESPONSE"><con:mediaType>text/html</con:mediaType><con:status>200</con:status><con:params/><con:element>html</con:element></con:representation><con:representation type="FAULT"><con:mediaType>text/html</con:mediaType><con:status>503</con:status><con:params/><con:element>html</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType xsi:nil="true"/><con:status>0</con:status><con:params/><con:element>data</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType xsi:nil="true"/><con:status>0</con:status><con:params/><con:element>data</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType xsi:nil="true"/><con:status>0</con:status><con:params/><con:element>data</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType xsi:nil="true"/><con:status>0</con:status><con:params/><con:element>data</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType xsi:nil="true"/><con:status>200</con:status><con:params/><con:element>data</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType xsi:nil="true"/><con:status>200</con:status><con:params/><con:element>data</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType xsi:nil="true"/><con:status>200</con:status><con:params/><con:element>data</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType xsi:nil="true"/><con:status>200</con:status><con:params/><con:element>data</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType xsi:nil="true"/><con:status>0</con:status><con:params/><con:element>data</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType xsi:nil="true"/><con:status>0</con:status><con:params/><con:element>data</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType xsi:nil="true"/><con:status>0</con:status><con:params/><con:element>data</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType xsi:nil="true"/><con:status>0</con:status><con:params/><con:element>data</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType xsi:nil="true"/><con:status>0</con:status><con:params/><con:element>data</con:element></con:representation><con:request name="Request 1" id="91778949-a8b8-4211-be98-5dcb477512a8" mediaType="application/json"><con:settings><con:setting id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers">&lt;xml-fragment/></con:setting></con:settings><con:endpoint>http://${#Project#apihhost}</con:endpoint><con:request/><con:originalUri>http://localhost/ecomp/mso/healthcheck</con:originalUri><con:credentials><con:authType>No Authorization</con:authType></con:credentials><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:parameters/></con:request></con:method></con:resource><con:resource name="Camunadalocal variables2" path="/mso/async/services/HealthCheck" id="6740d63f-f8ba-40d8-8397-c8d9135d241a"><con:settings/><con:parameters/><con:method name="CamundaLocal2" id="a3ae9bf4-e129-4c12-a1ac-0f2fab31d509" method="POST"><con:description>not used in Arquilian as not same repo</con:description><con:settings/><con:parameters/><con:representation type="REQUEST"><con:mediaType>application/json</con:mediaType><con:params/></con:representation><con:representation type="FAULT"><con:mediaType>application/json</con:mediaType><con:status>500 503</con:status><con:params/><con:element xmlns:heal="localhost/mso/async/services/HealthCheck">heal:Fault</con:element></con:representation><con:representation type="FAULT"><con:mediaType>text/html;charset=utf-8</con:mediaType><con:status>400 404</con:status><con:params/><con:element>html</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType>application/json</con:mediaType><con:status>200</con:status><con:params/><con:element xmlns:heal="localhost/mso/async/services/HealthCheck">heal:Response</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType xsi:nil="true"/><con:status>0</con:status><con:params/><con:element>data</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType xsi:nil="true"/><con:status>0</con:status><con:params/><con:element>data</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType xsi:nil="true"/><con:status>0</con:status><con:params/><con:element>data</con:element></con:representation><con:request name="Request 1" id="b85f87ca-6c69-46be-aa1d-cd9f0b1ce48d" mediaType="application/json" postQueryString="false"><con:settings><con:setting id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers">&lt;xml-fragment/></con:setting></con:settings><con:endpoint>http://${#Project#bpmnhost}</con:endpoint><con:request>{"variables":{"requestId":{"value":"test","type":"String"}}}</con:request><con:originalUri>localhost/mso/async/services/HealthCheck</con:originalUri><con:credentials><con:authType>No Authorization</con:authType></con:credentials><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:parameters/></con:request></con:method></con:resource><con:resource name="Camundalocal2" path="/mso/common/healthcheck" id="5300f433-6b32-447a-b0de-1d26353167d8"><con:settings/><con:parameters/><con:method name="Method 1" id="6fc76777-eeee-4126-bfd1-9da0eb5b7921" method="GET"><con:settings/><con:parameters/><con:representation type="RESPONSE"><con:mediaType>text/html</con:mediaType><con:status>200</con:status><con:params/><con:element>html</con:element></con:representation><con:request name="Request 1" id="02e386ce-803e-4d34-b2fd-a694a2cb2fc2" mediaType="application/json"><con:settings/><con:endpoint>http://${#Project#jrahost}</con:endpoint><con:request/><con:credentials><con:authType>No Authorization</con:authType></con:credentials><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:parameters/></con:request></con:method></con:resource></con:interface><con:interface xsi:type="con:RestService" id="bc7ec14b-913e-4b98-bdd2-772f5a98e77d" wadlVersion="http://wadl.dev.java.net/2009/02" name="GetStatus" type="rest" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"><con:settings/><con:definitionCache type="TEXT" rootPart=""/><con:endpoints><con:endpoint>http://192.168.126.130:8080</con:endpoint></con:endpoints><con:resource name="GetStatus DB Adapter" path="/dbadapters/RequestsDbAdapter" id="911c26b8-4b1d-49e3-b969-02de4c62bd3f"><con:settings/><con:parameters/><con:method name="GetStatus RequestsDbAdapter" id="4748011f-fcc6-4920-b1f2-1956b8cafa34" method="POST"><con:settings/><con:parameters/><con:representation type="RESPONSE"><con:mediaType>text/xml;charset=ISO-8859-1</con:mediaType><con:status>200</con:status><con:params/><con:element xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/">soapenv:Envelope</con:element></con:representation><con:representation type="REQUEST"><con:mediaType>application/xml</con:mediaType><con:params/><con:element xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/">soapenv:Envelope</con:element></con:representation><con:representation type="FAULT"><con:mediaType>text/xml;charset=ISO-8859-1</con:mediaType><con:status>500</con:status><con:params/><con:element xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/">soapenv:Envelope</con:element></con:representation><con:representation type="FAULT"><con:mediaType>text/html;charset=utf-8</con:mediaType><con:status>404</con:status><con:params/><con:element>html</con:element></con:representation><con:request name="Request 1" id="8fbeebe9-cdf0-4715-837c-16ae3cfdd5fb" mediaType="application/xml" postQueryString="false"><con:settings><con:setting id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers">&lt;xml-fragment/></con:setting></con:settings><con:endpoint>http://${#Project#apihhost}</con:endpoint><con:request><![CDATA[<soapenv:Envelope xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/" xmlns:req="http://org.openecomp.mso/requestsdb">
-<soapenv:Header/>
-<soapenv:Body>
-<req:getSiteStatus>
-<siteName>${#Project#sitename}</siteName>
-</req:getSiteStatus>
-</soapenv:Body>
-</soapenv:Envelope>]]></con:request><con:originalUri>http://localhost/dbadapters/RequestsDbAdapter</con:originalUri><con:credentials><con:authType>No Authorization</con:authType></con:credentials><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:parameters/></con:request></con:method></con:resource></con:interface><con:interface xsi:type="con:RestService" id="045c84cd-4ad1-4f49-a187-7b4448b5cf97" wadlVersion="http://wadl.dev.java.net/2009/02" name="NodeHealthCheck" type="rest" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"><con:settings/><con:definitionCache type="TEXT" rootPart=""/><con:endpoints><con:endpoint>http://localhost:8080</con:endpoint></con:endpoints><con:resource name="NodehealthcheckJRA" path="/adapters/rest/nodehealthcheck" id="eb7dc74a-2b7f-4d1e-88f3-15987452e24d"><con:settings/><con:parameters/><con:method name="NodehealthcheckJRA" id="67871396-2679-4871-bbe4-2e2b63ed4180" method="GET"><con:settings/><con:parameters/><con:representation type="RESPONSE"><con:mediaType>text/html</con:mediaType><con:status>200</con:status><con:params/><con:element>html</con:element></con:representation><con:request name="Request 1" id="00db386c-942d-4286-853f-01e279f6c2cb" mediaType="application/json"><con:settings><con:setting id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers">&lt;xml-fragment/></con:setting></con:settings><con:endpoint>http://${#Project#jrahost}</con:endpoint><con:request/><con:originalUri>http://localhost/adapters/rest/nodehealthcheck</con:originalUri><con:credentials><con:authType>No Authorization</con:authType></con:credentials><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:parameters/></con:request></con:method></con:resource><con:resource name="NodehealthcheckAPIH-Infra" path="/ecomp/mso/infra/nodehealthcheck" id="eb7dc74a-2b7f-4d1e-88f3-15987452e24d"><con:settings/><con:parameters/><con:method name="NodehealthcheckAPIH-Infra" id="67871396-2679-4871-bbe4-2e2b63ed4180" method="GET"><con:settings/><con:parameters/><con:representation type="RESPONSE"><con:mediaType>text/html</con:mediaType><con:status>200</con:status><con:params/><con:element>html</con:element></con:representation><con:representation type="FAULT"><con:mediaType>text/html;charset=utf-8</con:mediaType><con:status>401</con:status><con:params/><con:element>html</con:element></con:representation><con:representation type="FAULT"><con:mediaType>text/html</con:mediaType><con:status>503</con:status><con:params/><con:element>html</con:element></con:representation><con:request name="Request 1" id="00db386c-942d-4286-853f-01e279f6c2cb" mediaType="application/json"><con:settings><con:setting id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers">&lt;xml-fragment/></con:setting></con:settings><con:endpoint>http://${#Project#apihhost}</con:endpoint><con:request/><con:originalUri>http://localhost/adapters/rest/nodehealthcheck</con:originalUri><con:credentials><con:authType>No Authorization</con:authType></con:credentials><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:parameters/></con:request></con:method></con:resource><con:resource name="NodehealthcheckBPMN" path="/mso/nodehealthcheck" id="30a0b380-93d5-4611-896a-1afe2150434a"><con:settings/><con:parameters/><con:method name="Method 1" id="e8a46161-d0f0-4afa-ac17-705694845302" method="GET"><con:settings/><con:parameters/><con:representation type="RESPONSE"><con:mediaType xsi:nil="true"/><con:status>0</con:status><con:params/><con:element>data</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType>text/html</con:mediaType><con:status>200</con:status><con:params/><con:element>html</con:element></con:representation><con:request name="Request 1" id="2259e1c1-003d-485f-b424-925d1ee65f01" mediaType="application/json"><con:settings/><con:endpoint>http://localhost:8080</con:endpoint><con:request/><con:credentials><con:authType>No Authorization</con:authType></con:credentials><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:parameters/></con:request></con:method></con:resource></con:interface><con:interface xsi:type="con:RestService" id="0da04960-3bf4-4066-9ec2-d35d2d3c8c4d" wadlVersion="http://wadl.dev.java.net/2009/02" name="Logging" type="rest" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"><con:settings/><con:definitionCache type="TEXT" rootPart=""/><con:endpoints/><con:resource name="NetworkAdapter" path="/networks/rest/logging/debug" id="957cb67e-9f74-40ef-bbc6-bfee1ef3c1d7"><con:settings/><con:parameters><con:parameter><con:name>enable</con:name><con:value/><con:style>QUERY</con:style><con:default/><con:description xsi:nil="true"/></con:parameter></con:parameters><con:method name="Debug 1" id="41e16995-0c45-4156-91b3-5fec12bb5aa8" method="GET"><con:settings/><con:parameters/><con:request name="Request 1" id="8d1e6e96-d9d6-4166-bd74-ac7e9266db16" mediaType="application/json"><con:settings/><con:endpoint>http://${#Project#jrahost}</con:endpoint><con:request/><con:credentials><con:authType>No Authorization</con:authType></con:credentials><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:parameters><entry key="enable" value="true" xmlns="http://eviware.com/soapui/config"/></con:parameters><con:parameterOrder><con:entry>enable</con:entry></con:parameterOrder></con:request></con:method></con:resource><con:resource name="TenantAdapter" path="/tenants/rest/logging/debug" id="957cb67e-9f74-40ef-bbc6-bfee1ef3c1d7"><con:settings/><con:parameters><con:parameter><con:name>enable</con:name><con:value/><con:style>QUERY</con:style><con:default/><con:description xsi:nil="true"/></con:parameter></con:parameters><con:method name="Debug 1" id="41e16995-0c45-4156-91b3-5fec12bb5aa8" method="GET"><con:settings/><con:parameters/><con:representation type="RESPONSE"><con:mediaType>text/plain</con:mediaType><con:status>200</con:status><con:params/><con:element>data</con:element></con:representation><con:request name="Request 1" id="8d1e6e96-d9d6-4166-bd74-ac7e9266db16" mediaType="application/json"><con:settings/><con:endpoint>http://${#Project#jrahost}</con:endpoint><con:request/><con:credentials><con:authType>No Authorization</con:authType></con:credentials><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:parameters><entry key="enable" value="true" xmlns="http://eviware.com/soapui/config"/></con:parameters><con:parameterOrder><con:entry>enable</con:entry></con:parameterOrder></con:request></con:method></con:resource><con:resource name="VNFAdapter" path="/vnfs/rest/logging/debug" id="957cb67e-9f74-40ef-bbc6-bfee1ef3c1d7"><con:settings/><con:parameters><con:parameter><con:name>enable</con:name><con:value/><con:style>QUERY</con:style><con:default/><con:description xsi:nil="true"/></con:parameter></con:parameters><con:method name="Debug 1" id="41e16995-0c45-4156-91b3-5fec12bb5aa8" method="GET"><con:settings/><con:parameters/><con:request name="Request 1" id="8d1e6e96-d9d6-4166-bd74-ac7e9266db16" mediaType="application/json"><con:settings/><con:endpoint>http://${#Project#jrahost}</con:endpoint><con:request/><con:credentials><con:authType>No Authorization</con:authType></con:credentials><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:parameters><entry key="enable" value="true" xmlns="http://eviware.com/soapui/config"/></con:parameters><con:parameterOrder><con:entry>enable</con:entry></con:parameterOrder></con:request></con:method></con:resource><con:resource name="SDNCAdapter" path="/adapters/rest/logging/debug" id="957cb67e-9f74-40ef-bbc6-bfee1ef3c1d7"><con:settings/><con:parameters><con:parameter><con:name>enable</con:name><con:value/><con:style>QUERY</con:style><con:default/><con:description xsi:nil="true"/></con:parameter></con:parameters><con:method name="Debug 1" id="41e16995-0c45-4156-91b3-5fec12bb5aa8" method="GET"><con:settings/><con:parameters/><con:request name="Request 1" id="8d1e6e96-d9d6-4166-bd74-ac7e9266db16" mediaType="application/json"><con:settings/><con:endpoint>http://${#Project#jrahost}</con:endpoint><con:request/><con:credentials><con:authType>No Authorization</con:authType></con:credentials><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:parameters><entry key="enable" value="true" xmlns="http://eviware.com/soapui/config"/></con:parameters><con:parameterOrder><con:entry>enable</con:entry></con:parameterOrder></con:request></con:method></con:resource><con:resource name="APIH Infra" path="/ecomp/mso/infra/logging/debug" id="957cb67e-9f74-40ef-bbc6-bfee1ef3c1d7"><con:settings/><con:parameters><con:parameter><con:name>enable</con:name><con:value/><con:style>QUERY</con:style><con:default/><con:description xsi:nil="true"/></con:parameter></con:parameters><con:method name="Debug 1" id="41e16995-0c45-4156-91b3-5fec12bb5aa8" method="GET"><con:settings/><con:parameters/><con:request name="Request 1" id="8d1e6e96-d9d6-4166-bd74-ac7e9266db16" mediaType="application/json"><con:settings/><con:endpoint>http://${#Project#apihhost}</con:endpoint><con:request/><con:credentials><con:authType>No Authorization</con:authType></con:credentials><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:parameters><entry key="enable" value="true" xmlns="http://eviware.com/soapui/config"/></con:parameters><con:parameterOrder><con:entry>enable</con:entry></con:parameterOrder></con:request></con:method></con:resource><con:resource name="ASDC" path="/asdc/logging/debug" id="957cb67e-9f74-40ef-bbc6-bfee1ef3c1d7"><con:settings/><con:parameters><con:parameter><con:name>enable</con:name><con:value/><con:style>QUERY</con:style><con:default/><con:description xsi:nil="true"/></con:parameter></con:parameters><con:method name="Debug 1" id="41e16995-0c45-4156-91b3-5fec12bb5aa8" method="GET"><con:settings/><con:parameters/><con:request name="Request 1" id="8d1e6e96-d9d6-4166-bd74-ac7e9266db16" mediaType="application/json"><con:settings/><con:endpoint>http://${#Project#apihhost}</con:endpoint><con:request/><con:credentials><con:authType>No Authorization</con:authType></con:credentials><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:parameters><entry key="enable" value="true" xmlns="http://eviware.com/soapui/config"/></con:parameters><con:parameterOrder><con:entry>enable</con:entry></con:parameterOrder></con:request></con:method></con:resource><con:resource name="RequestDBAdapter" path="/dbadapters/logging/debug" id="957cb67e-9f74-40ef-bbc6-bfee1ef3c1d7"><con:settings/><con:parameters><con:parameter><con:name>enable</con:name><con:value/><con:style>QUERY</con:style><con:default/><con:description xsi:nil="true"/></con:parameter></con:parameters><con:method name="Debug 1" id="41e16995-0c45-4156-91b3-5fec12bb5aa8" method="GET"><con:settings/><con:parameters/><con:request name="Request 1" id="8d1e6e96-d9d6-4166-bd74-ac7e9266db16" mediaType="application/json"><con:settings/><con:endpoint>http://${#Project#apihhost}</con:endpoint><con:request/><con:credentials><con:authType>No Authorization</con:authType></con:credentials><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:parameters><entry key="enable" value="true" xmlns="http://eviware.com/soapui/config"/></con:parameters><con:parameterOrder><con:entry>enable</con:entry></con:parameterOrder></con:request></con:method></con:resource><con:resource name="BPMN" path="/mso/logging/debug" id="957cb67e-9f74-40ef-bbc6-bfee1ef3c1d7"><con:settings/><con:parameters><con:parameter><con:name>enable</con:name><con:value/><con:style>QUERY</con:style><con:default/><con:description xsi:nil="true"/></con:parameter></con:parameters><con:method name="Debug 1" id="41e16995-0c45-4156-91b3-5fec12bb5aa8" method="GET"><con:settings/><con:parameters/><con:request name="Request 1" id="8d1e6e96-d9d6-4166-bd74-ac7e9266db16" mediaType="application/json"><con:settings><con:setting id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers">&lt;xml-fragment/></con:setting></con:settings><con:endpoint>http://${#Project#bpmnhost}</con:endpoint><con:request/><con:credentials><con:authType>No Authorization</con:authType></con:credentials><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:parameters><entry key="enable" value="true" xmlns="http://eviware.com/soapui/config"/></con:parameters><con:parameterOrder><con:entry>enable</con:entry></con:parameterOrder></con:request></con:method></con:resource></con:interface><con:testSuite id="bcee4cc9-9c4e-4eeb-a520-9a3c73458e1f" name="Healthcheck TestSuite"><con:settings/><con:runType>SEQUENTIAL</con:runType><con:testCase id="9b4e70e4-1cd1-4152-89e9-18e8a0225108" failOnError="true" failTestCaseOnErrors="true" keepSession="false" maxResults="0" name="TestCaseHC" searchProperties="true"><con:settings/><con:testStep type="restrequest" name="Enable RequestDBAdapter debug logs" id="e83f44c7-1cd6-4c9f-9afd-fb91faf7cf41"><con:settings/><con:config service="Logging" resourcePath="/dbadapters/logging/debug" methodName="Debug 1" xsi:type="con:RestRequestStep" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"><con:restRequest name="Enable RequestDBAdapter debug logs" id="8d1e6e96-d9d6-4166-bd74-ac7e9266db16" mediaType="application/json"><con:settings><con:setting id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers">&lt;xml-fragment/></con:setting></con:settings><con:endpoint>http://${#Project#apihhost}</con:endpoint><con:request/><con:originalUri>http://localhost/dbadapters/logging/debug</con:originalUri><con:assertion type="Valid HTTP Status Codes" id="2e5b9577-aa74-43c7-9440-eb00314d091c" name="Valid HTTP Status Codes"><con:configuration><codes>200</codes></con:configuration></con:assertion><con:credentials><con:username>${#Project#msoclient}</con:username><con:password>${#Project#msoclientpassword}</con:password><con:selectedAuthProfile>Basic</con:selectedAuthProfile><con:addedBasicAuthenticationTypes>Basic</con:addedBasicAuthenticationTypes><con:authType>Global HTTP Settings</con:authType></con:credentials><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:parameters><entry key="enable" value="true" xmlns="http://eviware.com/soapui/config"/></con:parameters><con:parameterOrder><con:entry>enable</con:entry></con:parameterOrder></con:restRequest></con:config></con:testStep><con:testStep type="restrequest" name="Enable ASDC debug logs" id="d938876a-34c6-4de9-89dc-55a63e710c18"><con:settings/><con:config service="Logging" resourcePath="/asdc/logging/debug" methodName="Debug 1" xsi:type="con:RestRequestStep" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"><con:restRequest name="Enable ASDC debug logs" id="8d1e6e96-d9d6-4166-bd74-ac7e9266db16" mediaType="application/json"><con:settings><con:setting id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers">&lt;xml-fragment/></con:setting></con:settings><con:endpoint>http://${#Project#apihhost}</con:endpoint><con:request/><con:originalUri>http://localhost/asdc/logging/debug</con:originalUri><con:assertion type="Valid HTTP Status Codes" id="62995dde-fa57-409d-8480-befef3f6ff70" name="Valid HTTP Status Codes"><con:configuration><codes>200</codes></con:configuration></con:assertion><con:credentials><con:username>${#Project#msoclient}</con:username><con:password>${#Project#msoclientpassword}</con:password><con:selectedAuthProfile>Basic</con:selectedAuthProfile><con:addedBasicAuthenticationTypes>Basic</con:addedBasicAuthenticationTypes><con:authType>Global HTTP Settings</con:authType></con:credentials><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:parameters><entry key="enable" value="true" xmlns="http://eviware.com/soapui/config"/></con:parameters><con:parameterOrder><con:entry>enable</con:entry></con:parameterOrder></con:restRequest></con:config></con:testStep><con:testStep type="restrequest" name="Enable NetworkAdapter debug logs" id="64f3deb6-2675-4eb8-8600-9ed2be76acc3"><con:settings/><con:config service="Logging" methodName="Debug 1" resourcePath="/networks/rest/logging/debug" xsi:type="con:RestRequestStep" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"><con:restRequest name="Enable NetworkAdapter debug logs" id="ba42db46-5a97-48d1-a88c-bab5a11313ae" mediaType="application/json"><con:settings><con:setting id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers">&lt;xml-fragment/></con:setting></con:settings><con:encoding>UTF-8</con:encoding><con:endpoint>http://${#Project#jrahost}</con:endpoint><con:request/><con:originalUri>http://localhost/networks/rest/logging/debug</con:originalUri><con:assertion type="Valid HTTP Status Codes" id="1f209f2c-b621-4168-bca4-cbe4b5da4c7e" name="Valid HTTP Status Codes"><con:configuration><codes>200</codes></con:configuration></con:assertion><con:credentials><con:username>${#Project#msoclient}</con:username><con:password>${#Project#msoclientpassword}</con:password><con:selectedAuthProfile>Basic</con:selectedAuthProfile><con:addedBasicAuthenticationTypes>Basic</con:addedBasicAuthenticationTypes><con:authType>Global HTTP Settings</con:authType></con:credentials><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:parameters><entry key="enable" value="true" xmlns="http://eviware.com/soapui/config"/></con:parameters></con:restRequest></con:config></con:testStep><con:testStep type="restrequest" name="Enable TenantAdapter debug logs" id="a0ec3eda-28c1-43c1-9737-70a1b355874c"><con:settings/><con:config service="Logging" methodName="Debug 1" resourcePath="/tenants/rest/logging/debug" xsi:type="con:RestRequestStep" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"><con:restRequest name="Enable TenantAdapter debug logs" id="a97a886d-002c-4431-bf33-c7ab1d31e881" mediaType="application/json"><con:settings><con:setting id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers">&lt;xml-fragment/></con:setting></con:settings><con:encoding>UTF-8</con:encoding><con:endpoint>http://${#Project#jrahost}</con:endpoint><con:request/><con:originalUri>http://localhost/tenantss/rest/logging/debug</con:originalUri><con:assertion type="Valid HTTP Status Codes" id="d984f832-9790-496a-911e-57e3d1780969" name="Valid HTTP Status Codes"><con:configuration><codes>200</codes></con:configuration></con:assertion><con:credentials><con:username>${#Project#msoclient}</con:username><con:password>${#Project#msoclientpassword}</con:password><con:selectedAuthProfile>Basic</con:selectedAuthProfile><con:addedBasicAuthenticationTypes>Basic</con:addedBasicAuthenticationTypes><con:authType>Global HTTP Settings</con:authType></con:credentials><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:parameters><entry key="enable" value="true" xmlns="http://eviware.com/soapui/config"/></con:parameters></con:restRequest></con:config></con:testStep><con:testStep type="restrequest" name="Enable VNF Adapter debug logs" id="6153b51b-165a-4406-ab7e-e1f32ede7d75"><con:settings/><con:config service="Logging" resourcePath="/vnfs/rest/logging/debug" methodName="Debug 1" xsi:type="con:RestRequestStep" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"><con:restRequest name="Enable VNF Adapter debug logs" id="8d1e6e96-d9d6-4166-bd74-ac7e9266db16" mediaType="application/json"><con:settings><con:setting id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers">&lt;xml-fragment/></con:setting></con:settings><con:endpoint>http://${#Project#jrahost}</con:endpoint><con:request/><con:originalUri>http://localhost/vnfs/rest/logging/debug</con:originalUri><con:assertion type="Valid HTTP Status Codes" id="bdd35643-b216-4200-8f07-45fc8b0ad304" name="Valid HTTP Status Codes"><con:configuration><codes>200</codes></con:configuration></con:assertion><con:credentials><con:username>${#Project#msoclient}</con:username><con:password>${#Project#msoclientpassword}</con:password><con:selectedAuthProfile>Basic</con:selectedAuthProfile><con:addedBasicAuthenticationTypes>Basic</con:addedBasicAuthenticationTypes><con:authType>Global HTTP Settings</con:authType></con:credentials><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:parameters><entry key="enable" value="true" xmlns="http://eviware.com/soapui/config"/></con:parameters><con:parameterOrder><con:entry>enable</con:entry></con:parameterOrder></con:restRequest></con:config></con:testStep><con:testStep type="restrequest" name="Enable SDNC Adapter debug logs" id="69f77bce-b9e1-4462-b7e3-0a8620eafddc"><con:settings/><con:config service="Logging" resourcePath="/adapters/rest/logging/debug" methodName="Debug 1" xsi:type="con:RestRequestStep" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"><con:restRequest name="Enable SDNC Adapter debug logs" id="8d1e6e96-d9d6-4166-bd74-ac7e9266db16" mediaType="application/json"><con:settings><con:setting id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers">&lt;xml-fragment/></con:setting></con:settings><con:endpoint>http://${#Project#jrahost}</con:endpoint><con:request/><con:originalUri>http://localhost/adapters/rest/logging/debug</con:originalUri><con:assertion type="Valid HTTP Status Codes" id="f4db96ec-603d-4c1c-897f-2a76e2948637" name="Valid HTTP Status Codes"><con:configuration><codes>200
-</codes></con:configuration></con:assertion><con:credentials><con:username>${#Project#msoclient}</con:username><con:password>${#Project#msoclientpassword}</con:password><con:selectedAuthProfile>Basic</con:selectedAuthProfile><con:addedBasicAuthenticationTypes>Basic</con:addedBasicAuthenticationTypes><con:authType>Global HTTP Settings</con:authType></con:credentials><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:parameters><entry key="enable" value="true" xmlns="http://eviware.com/soapui/config"/></con:parameters><con:parameterOrder><con:entry>enable</con:entry></con:parameterOrder></con:restRequest></con:config></con:testStep><con:testStep type="restrequest" name="Enable APIH Infra debug logs" id="99d0ad17-f116-4506-82ab-7f8a60924fb6"><con:settings/><con:config service="Logging" resourcePath="/ecomp/mso/infra/logging/debug" methodName="Debug 1" xsi:type="con:RestRequestStep" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"><con:restRequest name="Enable APIH Infra debug logs" id="8d1e6e96-d9d6-4166-bd74-ac7e9266db16" mediaType="application/json"><con:settings><con:setting id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers">&lt;xml-fragment/></con:setting></con:settings><con:endpoint>http://${#Project#apihhost}</con:endpoint><con:request/><con:originalUri>http://localhost/ecomp/mso/infra/logging/debug</con:originalUri><con:assertion type="Valid HTTP Status Codes" id="df4e7c2f-384d-47d3-a772-309d8a7d6dd5" name="Valid HTTP Status Codes"><con:configuration><codes>200</codes></con:configuration></con:assertion><con:credentials><con:username>${#Project#msoclient}</con:username><con:password>${#Project#msoclientpassword}</con:password><con:selectedAuthProfile>Basic</con:selectedAuthProfile><con:addedBasicAuthenticationTypes>Basic</con:addedBasicAuthenticationTypes><con:authType>Global HTTP Settings</con:authType></con:credentials><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:parameters><entry key="enable" value="true" xmlns="http://eviware.com/soapui/config"/></con:parameters><con:parameterOrder><con:entry>enable</con:entry></con:parameterOrder></con:restRequest></con:config></con:testStep><con:testStep type="restrequest" name="Enable BPMN debug logs" id="57b545f9-8eb8-45f4-8c91-8b8ce8866e62"><con:settings/><con:config service="Logging" resourcePath="/mso/logging/debug" methodName="Debug 1" xsi:type="con:RestRequestStep" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"><con:restRequest name="Enable BPMN debug logs" id="8d1e6e96-d9d6-4166-bd74-ac7e9266db16" mediaType="application/json"><con:settings><con:setting id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers">&lt;xml-fragment/></con:setting></con:settings><con:endpoint>http://${#Project#apihhost}</con:endpoint><con:request/><con:originalUri>http://localhost/ecomp/mso/infra/logging/debug</con:originalUri><con:assertion type="Valid HTTP Status Codes" id="df4e7c2f-384d-47d3-a772-309d8a7d6dd5" name="Valid HTTP Status Codes"><con:configuration><codes>200</codes></con:configuration></con:assertion><con:credentials><con:username>${#Project#msoclient}</con:username><con:password>${#Project#msoclientpassword}</con:password><con:selectedAuthProfile>Basic</con:selectedAuthProfile><con:addedBasicAuthenticationTypes>Basic</con:addedBasicAuthenticationTypes><con:authType>Global HTTP Settings</con:authType></con:credentials><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:parameters><entry key="enable" value="true" xmlns="http://eviware.com/soapui/config"/></con:parameters><con:parameterOrder><con:entry>enable</con:entry></con:parameterOrder></con:restRequest></con:config></con:testStep><con:testStep type="restrequest" name="GetStatus RequestsDbAdapter - Request 1" id="b3161fab-24b4-442d-b662-49bdc46f697b"><con:settings/><con:config service="GetStatus" resourcePath="/dbadapters/RequestsDbAdapter" methodName="GetStatus RequestsDbAdapter" xsi:type="con:RestRequestStep" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"><con:restRequest name="GetStatus RequestsDbAdapter - Request 1" id="8fbeebe9-cdf0-4715-837c-16ae3cfdd5fb" mediaType="application/xml" postQueryString="false"><con:settings><con:setting id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers">&lt;xml-fragment/></con:setting></con:settings><con:endpoint>http://${#Project#apihhost}</con:endpoint><con:request><![CDATA[<soapenv:Envelope xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/" xmlns:req="http://org.openecomp.mso/requestsdb">
-<soapenv:Header/>
-<soapenv:Body>
-<req:getSiteStatus>
-<siteName>${#Project#sitename}</siteName>
-</req:getSiteStatus>
-</soapenv:Body>
-</soapenv:Envelope>]]></con:request><con:originalUri>http://localhost/dbadapters/RequestsDbAdapter</con:originalUri><con:assertion type="Simple Contains" id="0d4baeb9-cf0f-41f5-b47e-a84420d09a01" name="Contains"><con:configuration><token>&lt;return>true&lt;/return></token><ignoreCase>false</ignoreCase><useRegEx>false</useRegEx></con:configuration></con:assertion><con:credentials><con:username>${#Project#dbadapteruser}</con:username><con:password>${#Project#dbadapterpassword}</con:password><con:selectedAuthProfile>Basic</con:selectedAuthProfile><con:addedBasicAuthenticationTypes>Basic</con:addedBasicAuthenticationTypes><con:authType>Global HTTP Settings</con:authType></con:credentials><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:parameters/></con:restRequest></con:config></con:testStep><con:testStep type="restrequest" name="NodehealthcheckAPIH - Request 1" id="b536c25a-81e6-40b6-9f15-77f1d8979538"><con:settings/><con:config service="NodeHealthCheck" resourcePath="/ecomp/mso/infra/nodehealthcheck" methodName="NodehealthcheckAPIH-Infra" xsi:type="con:RestRequestStep" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"><con:restRequest name="NodehealthcheckAPIH - Request 1" id="00db386c-942d-4286-853f-01e279f6c2cb" mediaType="application/json"><con:settings><con:setting id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers">&lt;xml-fragment/></con:setting></con:settings><con:endpoint>http://${#Project#apihhost}</con:endpoint><con:request/><con:originalUri>http://localhost/adapters/rest/nodehealthcheck</con:originalUri><con:assertion type="Valid HTTP Status Codes" id="df9f7231-157f-48c5-ab1d-bf24b90dfe40" name="Valid HTTP Status Codes"><con:configuration><codes>200</codes></con:configuration></con:assertion><con:credentials><con:authType>No Authorization</con:authType></con:credentials><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:parameters/></con:restRequest></con:config></con:testStep><con:testStep type="restrequest" name="NodehealthcheckJRA - Request 1" id="58782f61-2494-431c-9a66-19929df6c8a7"><con:settings/><con:config service="NodeHealthCheck" resourcePath="/adapters/rest/nodehealthcheck" methodName="NodehealthcheckJRA" xsi:type="con:RestRequestStep" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"><con:restRequest name="NodehealthcheckJRA - Request 1" id="00db386c-942d-4286-853f-01e279f6c2cb" mediaType="application/json"><con:settings><con:setting id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers">&lt;xml-fragment/></con:setting></con:settings><con:endpoint>http://${#Project#jrahost}</con:endpoint><con:request/><con:originalUri>http://localhost/adapters/rest/nodehealthcheck</con:originalUri><con:assertion type="Valid HTTP Status Codes" id="9cc69173-94f7-4ee2-914e-85ff403e4144" name="Valid HTTP Status Codes"><con:configuration><codes>200</codes></con:configuration></con:assertion><con:credentials><con:authType>No Authorization</con:authType></con:credentials><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:parameters/></con:restRequest></con:config></con:testStep><con:testStep type="restrequest" name="NodehealthcheckBPMN - Request 1" id="ff5e22cb-665c-4e37-a455-3e3531197905"><con:settings/><con:config service="NodeHealthCheck" methodName="Method 1" resourcePath="/mso/nodehealthcheck" xsi:type="con:RestRequestStep" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"><con:restRequest name="NodehealthcheckBPMN - Request 1" id="74687d1e-347f-4ab6-9c9e-79536c74b1b2" mediaType="application/json"><con:settings><con:setting id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers">&lt;xml-fragment/></con:setting></con:settings><con:encoding>UTF-8</con:encoding><con:endpoint>http://${#Project#jrahost}</con:endpoint><con:request/><con:originalUri>http://http//$%7B</con:originalUri><con:assertion type="Valid HTTP Status Codes" id="450b4c13-6149-4a89-baa6-8e8c8ee2e094" name="Valid HTTP Status Codes"><con:configuration><codes>200</codes></con:configuration></con:assertion><con:credentials><con:authType>No Authorization</con:authType></con:credentials><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:parameters/></con:restRequest></con:config></con:testStep><con:testStep type="restrequest" name="GlobalHC Infra - Request 1" id="49f125c8-758c-4f5f-af02-d4ddb39090d5"><con:settings/><con:config service="GlobalHealthcheck" resourcePath="/ecomp/mso/infra/globalhealthcheck" methodName="GlobalHC Infra" xsi:type="con:RestRequestStep" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"><con:restRequest name="GlobalHC Infra - Request 1" id="42ea1c51-a0ca-445e-8f98-4af039a2b59c" mediaType="application/json"><con:settings><con:setting id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers">&lt;xml-fragment/></con:setting></con:settings><con:endpoint>http://${#Project#apihhost}</con:endpoint><con:request/><con:originalUri>http://localhost/ecomp/mso/infra/globalhealthcheck</con:originalUri><con:assertion type="Valid HTTP Status Codes" id="9c163024-dc62-4627-8380-6857c84de260" name="Valid HTTP Status Codes"><con:configuration><codes>200</codes></con:configuration></con:assertion><con:credentials><con:authType>No Authorization</con:authType></con:credentials><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:parameters><entry key="enableBpmn" value="${#Project#enableBpmn}" xmlns="http://eviware.com/soapui/config"/></con:parameters><con:parameterOrder><con:entry>enableBpmn</con:entry></con:parameterOrder></con:restRequest></con:config></con:testStep><con:testStep type="restrequest" name="LocalHC networks - Request 1" id="17db751c-68f9-46be-bc56-fdc929568f51"><con:settings/><con:config service="SubModulesHealthcheck" resourcePath="/networks/rest/healthcheck" methodName="LocalHC networks" xsi:type="con:RestRequestStep" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"><con:restRequest name="LocalHC networks - Request 1" id="a8aa066b-ad81-40bc-9976-de44fe3dcc0a" mediaType="application/json"><con:settings><con:setting id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers">&lt;xml-fragment/></con:setting></con:settings><con:endpoint>http://${#Project#jrahost}</con:endpoint><con:request/><con:originalUri>http://localhost/networks/admin/healthcheck</con:originalUri><con:assertion type="Valid HTTP Status Codes" id="004632bc-91d6-4bd5-a523-39cdeb006fec" name="Valid HTTP Status Codes"><con:configuration><codes>200</codes></con:configuration></con:assertion><con:credentials><con:authType>No Authorization</con:authType></con:credentials><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:parameters/></con:restRequest></con:config></con:testStep><con:testStep type="restrequest" name="LocalHC apih dbadapters - Request 1" id="cb2b26e7-5802-4036-bd4d-449b94d832be"><con:settings/><con:config service="SubModulesHealthcheck" resourcePath="/dbadapters/healthcheck" methodName="LocalHC apih dbadapters" xsi:type="con:RestRequestStep" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"><con:restRequest name="LocalHC apih dbadapters - Request 1" id="91778949-a8b8-4211-be98-5dcb477512a8" mediaType="application/json"><con:settings><con:setting id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers">&lt;xml-fragment/></con:setting></con:settings><con:endpoint>http://${#Project#apihhost}</con:endpoint><con:request/><con:originalUri>http://localhost/ecomp/mso/healthcheck</con:originalUri><con:assertion type="Valid HTTP Status Codes" id="37cc03ab-e15c-4c50-9d67-29774d027248" name="Valid HTTP Status Codes"><con:configuration><codes>200</codes></con:configuration></con:assertion><con:credentials><con:authType>No Authorization</con:authType></con:credentials><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:parameters/></con:restRequest></con:config></con:testStep><con:testStep type="restrequest" name="CamundaLocal - Request 1" id="a021ebe2-405e-4ee6-9716-4fafabdfa733"><con:settings/><con:config service="SubModulesHealthcheck" resourcePath="/mso/healthcheck" methodName="CamundaLocal" xsi:type="con:RestRequestStep" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"><con:restRequest name="CamundaLocal - Request 1" id="b85f87ca-6c69-46be-aa1d-cd9f0b1ce48d" mediaType="application/json" postQueryString="false"><con:settings><con:setting id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers">&lt;xml-fragment/></con:setting></con:settings><con:endpoint>http://${#Project#bpmnhost}</con:endpoint><con:request>{"variables":{}}</con:request><con:originalUri>localhost/mso/async/services/HealthCheck</con:originalUri><con:assertion type="Valid HTTP Status Codes" id="ed318ece-b0c3-49ab-bc98-6ce1435de0e2" name="Valid HTTP Status Codes"><con:configuration><codes>200</codes></con:configuration></con:assertion><con:credentials><con:authType>No Authorization</con:authType></con:credentials><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:parameters/></con:restRequest></con:config></con:testStep><con:testStep type="restrequest" name="CamundaLocal - Request 2" id="0390c102-b1f2-4067-865d-8a881053e080"><con:settings/><con:config service="SubModulesHealthcheck" methodName="Method 1" resourcePath="/mso/common/healthcheck" xsi:type="con:RestRequestStep" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"><con:restRequest name="CamundaLocal - Request 2" id="c67a3eb2-ce46-4649-95cd-1cb8a7a508a5" mediaType="application/json"><con:settings><con:setting id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers">&lt;xml-fragment/></con:setting></con:settings><con:encoding>UTF-8</con:encoding><con:endpoint>http://${#Project#jrahost}</con:endpoint><con:request/><con:originalUri>http://localhost/mso/common/healthcheck</con:originalUri><con:assertion type="Valid HTTP Status Codes" id="8a34333a-7423-4fdf-a485-70462795a7ef" name="Valid HTTP Status Codes"><con:configuration><codes>200</codes></con:configuration></con:assertion><con:credentials><con:authType>No Authorization</con:authType></con:credentials><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:parameters/></con:restRequest></con:config></con:testStep><con:testStep type="restrequest" name="SetStatus true JRA - Request 1" id="42d46836-ff78-4ee3-8c78-4713870c812e"><con:settings/><con:config service="SetStatus" resourcePath="/adapters/rest/setStatus/{siteName}" methodName="SetStatus true JRA" xsi:type="con:RestRequestStep" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"><con:restRequest name="SetStatus true JRA - Request 1" id="e0314e05-9a73-4402-a404-3a1b0aa78232" mediaType="application/json" postQueryString="false"><con:settings><con:setting id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers">&lt;xml-fragment/></con:setting></con:settings><con:endpoint>http://${#Project#jrahost}</con:endpoint><con:request/><con:originalUri>http://localhost/ecomp/mso/infra/setStatus</con:originalUri><con:assertion type="Valid HTTP Status Codes" id="4e92dbf7-3fcb-40cd-81ae-c5f520db9ff8" name="Valid HTTP Status Codes"><con:configuration><codes>200</codes></con:configuration></con:assertion><con:credentials><con:username>${#Project#userlogin}</con:username><con:password>${#Project#userpassword}</con:password><con:selectedAuthProfile>Basic</con:selectedAuthProfile><con:addedBasicAuthenticationTypes>Basic</con:addedBasicAuthenticationTypes><con:authType>Global HTTP Settings</con:authType></con:credentials><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:parameters/><con:parameterOrder><con:entry>enable</con:entry><con:entry>siteName</con:entry></con:parameterOrder></con:restRequest></con:config></con:testStep><con:testStep type="restrequest" name="GetStatus RequestsDbAdapter - Request 1 1" id="3001990b-8953-4249-a25c-685de18b3898"><con:settings/><con:config service="GetStatus" resourcePath="/dbadapters/RequestsDbAdapter" methodName="GetStatus RequestsDbAdapter" xsi:type="con:RestRequestStep" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"><con:restRequest name="GetStatus RequestsDbAdapter - Request 1 1" id="8fbeebe9-cdf0-4715-837c-16ae3cfdd5fb" mediaType="application/xml" postQueryString="false"><con:settings><con:setting id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers">&lt;xml-fragment/></con:setting></con:settings><con:endpoint>http://${#Project#apihhost}</con:endpoint><con:request><![CDATA[<soapenv:Envelope xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/" xmlns:req="http://org.openecomp.mso/requestsdb">
-<soapenv:Header/>
-<soapenv:Body>
-<req:getSiteStatus>
-<siteName>${#Project#sitename}</siteName>
-</req:getSiteStatus>
-</soapenv:Body>
-</soapenv:Envelope>]]></con:request><con:originalUri>http://localhost/dbadapters/RequestsDbAdapter</con:originalUri><con:assertion type="Simple Contains" id="220970f3-fe8e-4115-8f6d-2beb0fc8e577" name="Contains"><con:configuration><token>&lt;return>true&lt;/return></token><ignoreCase>false</ignoreCase><useRegEx>false</useRegEx></con:configuration></con:assertion><con:credentials><con:username>${#Project#dbadapteruser}</con:username><con:password>${#Project#dbadapterpassword}</con:password><con:selectedAuthProfile>Basic</con:selectedAuthProfile><con:addedBasicAuthenticationTypes>Basic</con:addedBasicAuthenticationTypes><con:authType>Global HTTP Settings</con:authType></con:credentials><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:parameters/></con:restRequest></con:config></con:testStep><con:testStep type="restrequest" name="NodehealthcheckJRA - Request 1 1" id="0776c1af-9663-4edb-b243-e0f3ed23682c"><con:settings/><con:config service="NodeHealthCheck" resourcePath="/adapters/rest/nodehealthcheck" methodName="NodehealthcheckJRA" xsi:type="con:RestRequestStep" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"><con:restRequest name="NodehealthcheckJRA - Request 1 1" id="00db386c-942d-4286-853f-01e279f6c2cb" mediaType="application/json"><con:settings><con:setting id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers">&lt;xml-fragment/></con:setting></con:settings><con:endpoint>http://${#Project#jrahost}</con:endpoint><con:request/><con:originalUri>http://localhost/adapters/rest/nodehealthcheck</con:originalUri><con:assertion type="Valid HTTP Status Codes" id="8225165c-dcfe-48da-b040-91c872df0a70" name="Valid HTTP Status Codes"><con:configuration><codes>200</codes></con:configuration></con:assertion><con:credentials><con:authType>No Authorization</con:authType></con:credentials><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:parameters/></con:restRequest></con:config></con:testStep><con:testStep type="restrequest" name="GlobalHC Infra - Request 1 1" id="5e825e5f-1d69-4d3d-a761-6fe7d2678d1e"><con:settings/><con:config service="GlobalHealthcheck" resourcePath="/ecomp/mso/infra/globalhealthcheck" methodName="GlobalHC Infra" xsi:type="con:RestRequestStep" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"><con:restRequest name="GlobalHC Infra - Request 1 1" id="42ea1c51-a0ca-445e-8f98-4af039a2b59c" mediaType="application/json"><con:settings><con:setting id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers">&lt;xml-fragment/></con:setting></con:settings><con:endpoint>http://${#Project#apihhost}</con:endpoint><con:request/><con:originalUri>http://localhost/ecomp/mso/infra/globalhealthcheck</con:originalUri><con:assertion type="Valid HTTP Status Codes" id="262448a9-3374-4369-b42f-95335161b8e4" name="Valid HTTP Status Codes"><con:configuration><codes>200</codes></con:configuration></con:assertion><con:credentials><con:authType>No Authorization</con:authType></con:credentials><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:parameters><entry key="enableBpmn" value="${#Project#enableBpmn}" xmlns="http://eviware.com/soapui/config"/></con:parameters><con:parameterOrder><con:entry>enableBpmn</con:entry></con:parameterOrder></con:restRequest></con:config></con:testStep><con:testStep type="restrequest" name="GlobalHC adapters - Request 1" id="6c5741f9-68cd-438d-9272-5076a0054f27"><con:settings/><con:config service="GlobalHealthcheck" resourcePath="/adapters/rest/globalhealthcheck" methodName="GlobalHC adapters" xsi:type="con:RestRequestStep" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"><con:restRequest name="GlobalHC adapters - Request 1" id="b1109ecf-fd73-4a30-8c98-ac50a10e9cb7" mediaType="application/json"><con:settings><con:setting id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers">&lt;xml-fragment/></con:setting></con:settings><con:endpoint>http://${#Project#jrahost}</con:endpoint><con:request/><con:originalUri>http://localhost/adapters/rest/globalhealthcheck</con:originalUri><con:assertion type="Valid HTTP Status Codes" id="da1b8948-fde9-4e24-b2d8-129cf8bef62f" name="Valid HTTP Status Codes"><con:configuration><codes>200</codes></con:configuration></con:assertion><con:credentials><con:authType>No Authorization</con:authType></con:credentials><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:parameters><entry key="enableBpmn" value="${#Project#enableBpmn}" xmlns="http://eviware.com/soapui/config"/></con:parameters><con:parameterOrder><con:entry>enableBpmn</con:entry></con:parameterOrder></con:restRequest></con:config></con:testStep><con:testStep type="restrequest" name="LocalHC networks - Request 1 1" id="ee7826a8-efce-4212-b96f-7c7902fd86d3"><con:settings/><con:config service="SubModulesHealthcheck" resourcePath="/networks/rest/healthcheck" methodName="LocalHC networks" xsi:type="con:RestRequestStep" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"><con:restRequest name="LocalHC networks - Request 1 1" id="a8aa066b-ad81-40bc-9976-de44fe3dcc0a" mediaType="application/json"><con:settings><con:setting id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers">&lt;xml-fragment/></con:setting></con:settings><con:endpoint>http://${#Project#jrahost}</con:endpoint><con:request/><con:originalUri>http://localhost/networks/admin/healthcheck</con:originalUri><con:assertion type="Valid HTTP Status Codes" id="bf703c98-99ce-4389-91f2-fc703d4bd654" name="Valid HTTP Status Codes"><con:configuration><codes>200</codes></con:configuration></con:assertion><con:credentials><con:authType>No Authorization</con:authType></con:credentials><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:parameters/></con:restRequest></con:config></con:testStep><con:testStep type="restrequest" name="LocalHC adapters - Request 1" id="c1b02370-f2c8-4029-91df-31d9c5ef73eb"><con:settings/><con:config service="SubModulesHealthcheck" resourcePath="/adapters/rest/healthcheck" methodName="LocalHC adapters" xsi:type="con:RestRequestStep" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"><con:restRequest name="LocalHC adapters - Request 1" id="ea2c9416-63eb-4219-83fd-db0593bf63e3" mediaType="application/json"><con:settings><con:setting id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers">&lt;xml-fragment/></con:setting></con:settings><con:endpoint>http://${#Project#jrahost}</con:endpoint><con:request/><con:originalUri>http://localhost/adapters/rest/healthcheck</con:originalUri><con:assertion type="Valid HTTP Status Codes" id="2369cd0c-fec8-479d-aec0-d76f67ff5f5a" name="Valid HTTP Status Codes"><con:configuration><codes>200</codes></con:configuration></con:assertion><con:credentials><con:authType>No Authorization</con:authType></con:credentials><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:parameters/></con:restRequest></con:config></con:testStep><con:testStep type="restrequest" name="LocalHC vnfs - Request 1" id="3db90ee0-ae36-45b8-97c9-9c9bccaa8ebf"><con:settings/><con:config service="SubModulesHealthcheck" resourcePath="/vnfs/rest/healthcheck" methodName="LocalHC vnfs" xsi:type="con:RestRequestStep" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"><con:restRequest name="LocalHC vnfs - Request 1" id="f2effc08-5569-4e5b-a2e8-fa3bebc958b9" mediaType="application/json"><con:settings><con:setting id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers">&lt;xml-fragment/></con:setting></con:settings><con:endpoint>http://${#Project#jrahost}</con:endpoint><con:request/><con:originalUri>http://localhost/vnfs/admin/healthcheck</con:originalUri><con:assertion type="Valid HTTP Status Codes" id="21263d81-b74a-4b27-a15e-7c0f3276b66a" name="Valid HTTP Status Codes"><con:configuration><codes>200</codes></con:configuration></con:assertion><con:credentials><con:authType>No Authorization</con:authType></con:credentials><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:parameters/></con:restRequest></con:config></con:testStep><con:testStep type="restrequest" name="LocalHC tenants - Request 1" id="e72cfa6f-88cc-4ce0-94b7-36c9ee990411"><con:settings/><con:config service="SubModulesHealthcheck" resourcePath="/tenants/rest/healthcheck" methodName="LocalHC tenants" xsi:type="con:RestRequestStep" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"><con:restRequest name="LocalHC tenants - Request 1" id="432c2172-deba-4173-a0af-0b6fccfd60dc" mediaType="application/json"><con:settings><con:setting id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers">&lt;xml-fragment/></con:setting></con:settings><con:endpoint>http://${#Project#jrahost}</con:endpoint><con:request/><con:originalUri>http://localhost/tenants/admin/healthcheck</con:originalUri><con:assertion type="Valid HTTP Status Codes" id="52b2ef4a-efc7-4ccb-93e1-320f03b6a05e" name="Valid HTTP Status Codes"><con:configuration><codes>200</codes></con:configuration></con:assertion><con:credentials><con:authType>No Authorization</con:authType></con:credentials><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:parameters/></con:restRequest></con:config></con:testStep><con:testStep type="restrequest" name="LocalHC infra - Request 1" id="7d789ad8-d3c1-4835-bac1-570fa2291fb9"><con:settings/><con:config service="SubModulesHealthcheck" resourcePath="/ecomp/mso/infra/healthcheck" methodName="LocalHC infra" xsi:type="con:RestRequestStep" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"><con:restRequest name="LocalHC infra - Request 1" id="287d8590-e1da-49e5-afef-5f7191a55925" mediaType="application/json"><con:settings><con:setting id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers">&lt;xml-fragment/></con:setting></con:settings><con:endpoint>http://${#Project#apihhost}</con:endpoint><con:request/><con:originalUri>http://localhost/ecomp/mso/infra/healthcheck</con:originalUri><con:assertion type="Valid HTTP Status Codes" id="c79591a0-8f1e-4d1f-8fd0-ea8ddcb7aca3" name="Valid HTTP Status Codes"><con:configuration><codes>200</codes></con:configuration></con:assertion><con:credentials><con:authType>No Authorization</con:authType></con:credentials><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:parameters/></con:restRequest></con:config></con:testStep><con:testStep type="restrequest" name="LocalHC asdc - Request 1" id="4e594435-b0f0-47ca-80a0-432e29c1e475"><con:settings/><con:config service="SubModulesHealthcheck" resourcePath="/asdc/healthcheck" methodName="LocalHC asdc" xsi:type="con:RestRequestStep" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"><con:restRequest name="LocalHC asdc - Request 1" id="b0d9d540-073e-4d1d-ac19-32566206d0c6" mediaType="application/json"><con:settings><con:setting id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers">&lt;xml-fragment/></con:setting></con:settings><con:endpoint>http://${#Project#apihhost}</con:endpoint><con:request/><con:originalUri>http://localhost/asdc/healthcheck</con:originalUri><con:assertion type="Valid HTTP Status Codes" id="82db3c9b-b2d7-46dc-834b-17bec15e11bb" name="Valid HTTP Status Codes"><con:configuration><codes>200</codes></con:configuration></con:assertion><con:credentials><con:authType>No Authorization</con:authType></con:credentials><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:parameters/></con:restRequest></con:config></con:testStep><con:testStep type="restrequest" name="SetStatus false Infra - Request 1" id="78f2d9fe-f2e4-4f29-a8f4-80db05b4b75a"><con:settings/><con:config service="SetStatus" resourcePath="/ecomp/mso/infra/setStatus/{siteName}" methodName="SetStatus false Infra" xsi:type="con:RestRequestStep" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"><con:restRequest name="SetStatus false Infra - Request 1" id="e0314e05-9a73-4402-a404-3a1b0aa78232" mediaType="application/json" postQueryString="false"><con:settings><con:setting id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers">&lt;xml-fragment/></con:setting></con:settings><con:endpoint>http://${#Project#apihhost}</con:endpoint><con:request/><con:originalUri>http://localhost/ecomp/mso/infra/setStatus</con:originalUri><con:assertion type="Valid HTTP Status Codes" id="4238a0f7-e280-47ef-b3cc-07915e61f7cd" name="Valid HTTP Status Codes"><con:configuration><codes>200</codes></con:configuration></con:assertion><con:credentials><con:username>${#Project#userlogin}</con:username><con:password>${#Project#userpassword}</con:password><con:authType>No Authorization</con:authType></con:credentials><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:parameters><entry key="enable" value="false" xmlns="http://eviware.com/soapui/config"/></con:parameters><con:parameterOrder><con:entry>enable</con:entry><con:entry>siteName</con:entry></con:parameterOrder></con:restRequest></con:config></con:testStep><con:testStep type="restrequest" name="NodehealthcheckAPIH - Request 1 1" id="99fa4bb9-99ee-459b-a987-63a1696a7fa8"><con:settings/><con:config service="NodeHealthCheck" resourcePath="/ecomp/mso/infra/nodehealthcheck" methodName="NodehealthcheckAPIH-Infra" xsi:type="con:RestRequestStep" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"><con:restRequest name="NodehealthcheckAPIH - Request 1 1" id="00db386c-942d-4286-853f-01e279f6c2cb" mediaType="application/json"><con:settings><con:setting id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers">&lt;xml-fragment/></con:setting></con:settings><con:endpoint>http://${#Project#apihhost}</con:endpoint><con:request/><con:originalUri>http://localhost/adapters/rest/nodehealthcheck</con:originalUri><con:assertion type="Valid HTTP Status Codes" id="9d876f54-e867-4521-b534-de42f20c1ea4" name="Valid HTTP Status Codes"><con:configuration><codes>503</codes></con:configuration></con:assertion><con:credentials><con:authType>No Authorization</con:authType></con:credentials><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:parameters/></con:restRequest></con:config></con:testStep><con:testStep type="restrequest" name="NodehealthcheckJRA - Request 1 2" id="934d5932-dc4c-4a32-86a1-99dc64404d9c"><con:settings/><con:config service="NodeHealthCheck" resourcePath="/adapters/rest/nodehealthcheck" methodName="NodehealthcheckJRA" xsi:type="con:RestRequestStep" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"><con:restRequest name="NodehealthcheckJRA - Request 1 2" id="00db386c-942d-4286-853f-01e279f6c2cb" mediaType="application/json"><con:settings><con:setting id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers">&lt;xml-fragment/></con:setting></con:settings><con:endpoint>http://${#Project#jrahost}</con:endpoint><con:request/><con:originalUri>http://localhost/adapters/rest/nodehealthcheck</con:originalUri><con:assertion type="Valid HTTP Status Codes" id="d928f732-703f-4f42-a22b-f1745fc3e78f" name="Valid HTTP Status Codes"><con:configuration><codes>503</codes></con:configuration></con:assertion><con:credentials><con:authType>No Authorization</con:authType></con:credentials><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:parameters/></con:restRequest></con:config></con:testStep><con:testStep type="restrequest" name="NodehealthcheckBPMN - Request 1 2" id="59231f8c-697b-4c24-9da6-d3ec830da93a"><con:settings/><con:config service="NodeHealthCheck" methodName="Method 1" resourcePath="/mso/nodehealthcheck" xsi:type="con:RestRequestStep" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"><con:restRequest name="NodehealthcheckBPMN - Request 1 2" id="74687d1e-347f-4ab6-9c9e-79536c74b1b2" mediaType="application/json"><con:settings><con:setting id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers">&lt;xml-fragment/></con:setting></con:settings><con:encoding>UTF-8</con:encoding><con:endpoint>http://${#Project#jrahost}</con:endpoint><con:request/><con:originalUri>http://http//$%7B</con:originalUri><con:assertion type="Valid HTTP Status Codes" id="450b4c13-6149-4a89-baa6-8e8c8ee2e094" name="Valid HTTP Status Codes"><con:configuration><codes>503</codes></con:configuration></con:assertion><con:credentials><con:authType>No Authorization</con:authType></con:credentials><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:parameters/></con:restRequest></con:config></con:testStep><con:testStep type="restrequest" name="GetStatus RequestsDbAdapter - Request 1 2" id="329a88cc-6f24-415e-97ac-6166ae875945"><con:settings/><con:config service="GetStatus" resourcePath="/dbadapters/RequestsDbAdapter" methodName="GetStatus RequestsDbAdapter" xsi:type="con:RestRequestStep" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"><con:restRequest name="GetStatus RequestsDbAdapter - Request 1 2" id="8fbeebe9-cdf0-4715-837c-16ae3cfdd5fb" mediaType="application/xml" postQueryString="false"><con:settings><con:setting id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers">&lt;xml-fragment/></con:setting></con:settings><con:endpoint>http://${#Project#apihhost}</con:endpoint><con:request><![CDATA[<soapenv:Envelope xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/" xmlns:req="http://org.openecomp.mso/requestsdb">
-<soapenv:Header/>
-<soapenv:Body>
-<req:getSiteStatus>
-<siteName>${#Project#sitename}</siteName>
-</req:getSiteStatus>
-</soapenv:Body>
-</soapenv:Envelope>]]></con:request><con:originalUri>http://localhost/dbadapters/RequestsDbAdapter</con:originalUri><con:assertion type="Simple Contains" id="552caecc-0fca-49f6-810a-1890c3c0e16a" name="Contains"><con:configuration><token>&lt;return>false&lt;/return></token><ignoreCase>false</ignoreCase><useRegEx>false</useRegEx></con:configuration></con:assertion><con:credentials><con:username>${#Project#dbadapteruser}</con:username><con:password>${#Project#dbadapterpassword}</con:password><con:selectedAuthProfile>Basic</con:selectedAuthProfile><con:addedBasicAuthenticationTypes>Basic</con:addedBasicAuthenticationTypes><con:authType>Global HTTP Settings</con:authType></con:credentials><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:parameters/></con:restRequest></con:config></con:testStep><con:testStep type="restrequest" name="GlobalHC Infra - Request 1 2" id="0705c3fd-483e-42c4-b5dd-ded9b9725b6a"><con:settings/><con:config service="GlobalHealthcheck" resourcePath="/ecomp/mso/infra/globalhealthcheck" methodName="GlobalHC Infra" xsi:type="con:RestRequestStep" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"><con:restRequest name="GlobalHC Infra - Request 1 2" id="42ea1c51-a0ca-445e-8f98-4af039a2b59c" mediaType="application/json"><con:settings><con:setting id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers">&lt;xml-fragment/></con:setting></con:settings><con:endpoint>http://${#Project#apihhost}</con:endpoint><con:request/><con:originalUri>http://localhost/ecomp/mso/infra/globalhealthcheck</con:originalUri><con:assertion type="Valid HTTP Status Codes" id="319c062a-1168-4fdc-8e43-77c7c3d0cdf3" name="Valid HTTP Status Codes"><con:configuration><codes>503</codes></con:configuration></con:assertion><con:credentials><con:authType>No Authorization</con:authType></con:credentials><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:parameters><entry key="enableBpmn" value="${#Project#enableBpmn}" xmlns="http://eviware.com/soapui/config"/></con:parameters><con:parameterOrder><con:entry/></con:parameterOrder></con:restRequest></con:config></con:testStep><con:testStep type="restrequest" name="LocalHC apih dbadapters - Request 1 1" id="f814d54b-ab10-4b66-b84d-02f0e4df4230"><con:settings/><con:config service="SubModulesHealthcheck" resourcePath="/dbadapters/healthcheck" methodName="LocalHC apih dbadapters" xsi:type="con:RestRequestStep" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"><con:restRequest name="LocalHC apih dbadapters - Request 1 1" id="91778949-a8b8-4211-be98-5dcb477512a8" mediaType="application/json"><con:settings><con:setting id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers">&lt;xml-fragment/></con:setting></con:settings><con:endpoint>http://${#Project#apihhost}</con:endpoint><con:request/><con:originalUri>http://localhost/ecomp/mso/healthcheck</con:originalUri><con:assertion type="Valid HTTP Status Codes" id="a61f1c79-187b-4b24-80fc-73332cdcad2e" name="Valid HTTP Status Codes"><con:configuration><codes>503</codes></con:configuration></con:assertion><con:credentials><con:authType>No Authorization</con:authType></con:credentials><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:parameters/></con:restRequest></con:config></con:testStep><con:testStep type="restrequest" name="GlobalHC adapters - Request 1 1" id="e773c770-2aa6-491a-bf6f-df6782707c68"><con:settings/><con:config service="GlobalHealthcheck" resourcePath="/adapters/rest/globalhealthcheck" methodName="GlobalHC adapters" xsi:type="con:RestRequestStep" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"><con:restRequest name="GlobalHC adapters - Request 1 1" id="b1109ecf-fd73-4a30-8c98-ac50a10e9cb7" mediaType="application/json"><con:settings><con:setting id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers">&lt;xml-fragment/></con:setting></con:settings><con:endpoint>http://${#Project#jrahost}</con:endpoint><con:request/><con:originalUri>http://localhost/adapters/rest/globalhealthcheck</con:originalUri><con:assertion type="Valid HTTP Status Codes" id="5a8fffda-700a-4dec-96ce-e977ee5edbb1" name="Valid HTTP Status Codes"><con:configuration><codes>503</codes></con:configuration></con:assertion><con:credentials><con:authType>No Authorization</con:authType></con:credentials><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:parameters><entry key="enableBpmn" value="${#Project#enableBpmn}" xmlns="http://eviware.com/soapui/config"/></con:parameters><con:parameterOrder><con:entry>enableBpmn</con:entry></con:parameterOrder></con:restRequest></con:config></con:testStep><con:testStep type="restrequest" name="SetStatus true infra - Request 1" id="ca250eea-61a9-42fb-a98c-2095f2be4fb5"><con:settings/><con:config service="SetStatus" resourcePath="/ecomp/mso/infra/setStatus/{siteName}" methodName="SetStatus true infra" xsi:type="con:RestRequestStep" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"><con:restRequest name="SetStatus true infra - Request 1" id="e0314e05-9a73-4402-a404-3a1b0aa78232" mediaType="application/json" postQueryString="false"><con:settings><con:setting id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers">&lt;xml-fragment/></con:setting></con:settings><con:endpoint>http://${#Project#apihhost}</con:endpoint><con:request/><con:originalUri>http://localhost/ecomp/mso/infra/setStatus</con:originalUri><con:assertion type="Valid HTTP Status Codes" id="019fd239-2a59-4ebe-afdb-44c0ba06a22d" name="Valid HTTP Status Codes"><con:configuration><codes>200</codes></con:configuration></con:assertion><con:credentials><con:username>${#Project#userlogin}</con:username><con:password>${#Project#userpassword}</con:password><con:authType>No Authorization</con:authType></con:credentials><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:parameters/><con:parameterOrder><con:entry>enable</con:entry><con:entry>siteName</con:entry></con:parameterOrder></con:restRequest></con:config></con:testStep><con:testStep type="restrequest" name="GetStatus RequestsDbAdapter - Request 1 3" id="351479f0-668d-4b29-81b5-6ab3658484e9"><con:settings/><con:config service="GetStatus" resourcePath="/dbadapters/RequestsDbAdapter" methodName="GetStatus RequestsDbAdapter" xsi:type="con:RestRequestStep" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"><con:restRequest name="GetStatus RequestsDbAdapter - Request 1 3" id="8fbeebe9-cdf0-4715-837c-16ae3cfdd5fb" mediaType="application/xml" postQueryString="false"><con:settings><con:setting id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers">&lt;xml-fragment/></con:setting></con:settings><con:endpoint>http://${#Project#apihhost}</con:endpoint><con:request><![CDATA[<soapenv:Envelope xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/" xmlns:req="http://org.openecomp.mso/requestsdb">
-<soapenv:Header/>
-<soapenv:Body>
-<req:getSiteStatus>
-<siteName>${#Project#sitename}</siteName>
-</req:getSiteStatus>
-</soapenv:Body>
-</soapenv:Envelope>]]></con:request><con:originalUri>http://localhost/dbadapters/RequestsDbAdapter</con:originalUri><con:assertion type="Simple Contains" id="cd0e6ff7-a773-46d8-8e40-1026874935dd" name="Contains"><con:configuration><token>&lt;return>true&lt;/return></token><ignoreCase>false</ignoreCase><useRegEx>false</useRegEx></con:configuration></con:assertion><con:credentials><con:username>${#Project#dbadapteruser}</con:username><con:password>${#Project#dbadapterpassword}</con:password><con:selectedAuthProfile>Basic</con:selectedAuthProfile><con:addedBasicAuthenticationTypes>Basic</con:addedBasicAuthenticationTypes><con:authType>Global HTTP Settings</con:authType></con:credentials><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:parameters/></con:restRequest></con:config></con:testStep><con:testStep type="restrequest" name="SetStatus false apih asdc - Request 1" id="8babbc98-be64-49a2-b4e8-30d082b743b4"><con:settings/><con:config service="SetStatus" resourcePath="/asdc/setStatus/{siteName}" methodName="SetStatus false apih asdc" xsi:type="con:RestRequestStep" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"><con:restRequest name="SetStatus false apih asdc - Request 1" id="e0314e05-9a73-4402-a404-3a1b0aa78232" mediaType="application/json" postQueryString="false"><con:settings><con:setting id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers">&lt;xml-fragment/></con:setting></con:settings><con:endpoint>http://${#Project#apihhost}</con:endpoint><con:request/><con:originalUri>http://localhost/ecomp/mso/infra/setStatus</con:originalUri><con:assertion type="Valid HTTP Status Codes" id="33372076-e44a-41a4-87b3-53224902ea3d" name="Valid HTTP Status Codes"><con:configuration><codes>200</codes></con:configuration></con:assertion><con:credentials><con:username>${#Project#userlogin}</con:username><con:password>${#Project#userpassword}</con:password><con:domain/><con:selectedAuthProfile>Basic</con:selectedAuthProfile><con:addedBasicAuthenticationTypes>Basic</con:addedBasicAuthenticationTypes><con:authType>Global HTTP Settings</con:authType></con:credentials><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:parameters><entry key="enable" value="false" xmlns="http://eviware.com/soapui/config"/></con:parameters><con:parameterOrder><con:entry>enable</con:entry><con:entry>siteName</con:entry></con:parameterOrder></con:restRequest></con:config></con:testStep><con:testStep type="restrequest" name="CamundaLocal - Request 1 1" id="73cf1af0-457b-4f48-a6d5-21e524790cc8"><con:settings/><con:config service="SubModulesHealthcheck" resourcePath="/mso/healthcheck" methodName="CamundaLocal" xsi:type="con:RestRequestStep" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"><con:restRequest name="CamundaLocal - Request 1 1" id="b85f87ca-6c69-46be-aa1d-cd9f0b1ce48d" mediaType="application/json" postQueryString="false"><con:settings><con:setting id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers">&lt;xml-fragment/></con:setting></con:settings><con:endpoint>http://${#Project#bpmnhost}</con:endpoint><con:request>{"variables":{}}</con:request><con:originalUri>localhost/mso/async/services/HealthCheck</con:originalUri><con:assertion type="Valid HTTP Status Codes" id="7519aa65-5db5-4a7e-9fe0-a5f8f779d07e" name="Valid HTTP Status Codes"><con:configuration><codes>503</codes></con:configuration></con:assertion><con:credentials><con:authType>No Authorization</con:authType></con:credentials><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:parameters/></con:restRequest></con:config></con:testStep><con:testStep type="restrequest" name="GetStatus RequestsDbAdapter - Request 1 8" id="a517f8ab-c6c9-40ae-b526-d0d23997fa84"><con:settings/><con:config service="GetStatus" resourcePath="/dbadapters/RequestsDbAdapter" methodName="GetStatus RequestsDbAdapter" xsi:type="con:RestRequestStep" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"><con:restRequest name="GetStatus RequestsDbAdapter - Request 1 8" id="8fbeebe9-cdf0-4715-837c-16ae3cfdd5fb" mediaType="application/xml" postQueryString="false"><con:settings><con:setting id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers">&lt;xml-fragment/></con:setting></con:settings><con:endpoint>http://${#Project#apihhost}</con:endpoint><con:request><![CDATA[<soapenv:Envelope xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/" xmlns:req="http://org.openecomp.mso/requestsdb">
-<soapenv:Header/>
-<soapenv:Body>
-<req:getSiteStatus>
-<siteName>${#Project#sitename}</siteName>
-</req:getSiteStatus>
-</soapenv:Body>
-</soapenv:Envelope>]]></con:request><con:originalUri>http://localhost/dbadapters/RequestsDbAdapter</con:originalUri><con:assertion type="Simple Contains" id="33d90e7c-a609-4d69-a645-5ba0c22e8a4a" name="Contains"><con:configuration><token>&lt;return>false&lt;/return></token><ignoreCase>false</ignoreCase><useRegEx>false</useRegEx></con:configuration></con:assertion><con:credentials><con:username>${#Project#dbadapteruser}</con:username><con:password>${#Project#dbadapterpassword}</con:password><con:selectedAuthProfile>Basic</con:selectedAuthProfile><con:addedBasicAuthenticationTypes>Basic</con:addedBasicAuthenticationTypes><con:authType>Global HTTP Settings</con:authType></con:credentials><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:parameters/></con:restRequest></con:config></con:testStep><con:testStep type="restrequest" name="SetStatus true apih asdc - Request 1" id="196ef5fc-79b7-4255-b09c-3469c92d647a"><con:settings/><con:config service="SetStatus" resourcePath="/asdc/setStatus/{siteName}" methodName="SetStatus true apih asdc" xsi:type="con:RestRequestStep" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"><con:restRequest name="SetStatus true apih asdc - Request 1" id="e0314e05-9a73-4402-a404-3a1b0aa78232" mediaType="application/json" postQueryString="false"><con:settings><con:setting id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers">&lt;xml-fragment/></con:setting></con:settings><con:endpoint>http://${#Project#apihhost}</con:endpoint><con:request/><con:originalUri>http://localhost/ecomp/mso/infra/setStatus</con:originalUri><con:assertion type="Valid HTTP Status Codes" id="02be4928-a27d-4781-8db5-1accc422290a" name="Valid HTTP Status Codes"><con:configuration><codes>200</codes></con:configuration></con:assertion><con:credentials><con:username>${#Project#userlogin}</con:username><con:password>${#Project#userpassword}</con:password><con:selectedAuthProfile>Basic</con:selectedAuthProfile><con:addedBasicAuthenticationTypes>Basic</con:addedBasicAuthenticationTypes><con:authType>Global HTTP Settings</con:authType></con:credentials><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:parameters/><con:parameterOrder><con:entry>enable</con:entry><con:entry>siteName</con:entry></con:parameterOrder></con:restRequest></con:config></con:testStep><con:testStep type="restrequest" name="GetStatus RequestsDbAdapter - Request 1 9" id="e60e2b76-a0cf-4add-9910-86a93ab0b8ec"><con:settings/><con:config service="GetStatus" resourcePath="/dbadapters/RequestsDbAdapter" methodName="GetStatus RequestsDbAdapter" xsi:type="con:RestRequestStep" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"><con:restRequest name="GetStatus RequestsDbAdapter - Request 1 9" id="8fbeebe9-cdf0-4715-837c-16ae3cfdd5fb" mediaType="application/xml" postQueryString="false"><con:settings><con:setting id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers">&lt;xml-fragment/></con:setting></con:settings><con:endpoint>http://${#Project#apihhost}</con:endpoint><con:request><![CDATA[<soapenv:Envelope xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/" xmlns:req="http://org.openecomp.mso/requestsdb">
-<soapenv:Header/>
-<soapenv:Body>
-<req:getSiteStatus>
-<siteName>${#Project#sitename}</siteName>
-</req:getSiteStatus>
-</soapenv:Body>
-</soapenv:Envelope>]]></con:request><con:originalUri>http://localhost/dbadapters/RequestsDbAdapter</con:originalUri><con:assertion type="Simple Contains" id="8c76c441-fb97-4109-86a9-9ac17b42fd39" name="Contains"><con:configuration><token>&lt;return>true&lt;/return></token><ignoreCase>false</ignoreCase><useRegEx>false</useRegEx></con:configuration></con:assertion><con:credentials><con:username>${#Project#dbadapteruser}</con:username><con:password>${#Project#dbadapterpassword}</con:password><con:selectedAuthProfile>Basic</con:selectedAuthProfile><con:addedBasicAuthenticationTypes>Basic</con:addedBasicAuthenticationTypes><con:authType>Global HTTP Settings</con:authType></con:credentials><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:parameters/></con:restRequest></con:config></con:testStep><con:testStep type="restrequest" name="SetStatus false networks - Request 1" id="0952d95c-ba75-4ecc-9e18-71a8fb01b090"><con:settings/><con:config service="SetStatus" resourcePath="/networks/rest/setStatus/{siteName}" methodName="SetStatus false networks" xsi:type="con:RestRequestStep" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"><con:restRequest name="SetStatus false networks - Request 1" id="e0314e05-9a73-4402-a404-3a1b0aa78232" mediaType="application/json" postQueryString="false"><con:settings><con:setting id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers">&lt;xml-fragment/></con:setting></con:settings><con:endpoint>http://${#Project#jrahost}</con:endpoint><con:request/><con:originalUri>http://localhost/ecomp/mso/infra/setStatus</con:originalUri><con:assertion type="Valid HTTP Status Codes" id="71569172-14b1-44e9-af03-8745e03554c3" name="Valid HTTP Status Codes"><con:configuration><codes>200</codes></con:configuration></con:assertion><con:credentials><con:username>${#Project#userlogin}</con:username><con:password>${#Project#userpassword}</con:password><con:selectedAuthProfile>Basic</con:selectedAuthProfile><con:addedBasicAuthenticationTypes>Basic</con:addedBasicAuthenticationTypes><con:authType>Global HTTP Settings</con:authType></con:credentials><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:parameters><entry key="enable" value="false" xmlns="http://eviware.com/soapui/config"/></con:parameters><con:parameterOrder><con:entry>enable</con:entry><con:entry>siteName</con:entry></con:parameterOrder></con:restRequest></con:config></con:testStep><con:testStep type="restrequest" name="GetStatus RequestsDbAdapter - Request 1 10" id="c296e206-9d9c-4301-9980-b171bc27ecc4"><con:settings/><con:config service="GetStatus" resourcePath="/dbadapters/RequestsDbAdapter" methodName="GetStatus RequestsDbAdapter" xsi:type="con:RestRequestStep" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"><con:restRequest name="GetStatus RequestsDbAdapter - Request 1 10" id="8fbeebe9-cdf0-4715-837c-16ae3cfdd5fb" mediaType="application/xml" postQueryString="false"><con:settings><con:setting id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers">&lt;xml-fragment/></con:setting></con:settings><con:endpoint>http://${#Project#apihhost}</con:endpoint><con:request><![CDATA[<soapenv:Envelope xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/" xmlns:req="http://org.openecomp.mso/requestsdb">
-<soapenv:Header/>
-<soapenv:Body>
-<req:getSiteStatus>
-<siteName>${#Project#sitename}</siteName>
-</req:getSiteStatus>
-</soapenv:Body>
-</soapenv:Envelope>]]></con:request><con:originalUri>http://localhost/dbadapters/RequestsDbAdapter</con:originalUri><con:assertion type="Simple Contains" id="3e915988-b69e-40b1-b6ae-53984761b768" name="Contains"><con:configuration><token>&lt;return>false&lt;/return></token><ignoreCase>false</ignoreCase><useRegEx>false</useRegEx></con:configuration></con:assertion><con:credentials><con:username>${#Project#dbadapteruser}</con:username><con:password>${#Project#dbadapterpassword}</con:password><con:selectedAuthProfile>Basic</con:selectedAuthProfile><con:addedBasicAuthenticationTypes>Basic</con:addedBasicAuthenticationTypes><con:authType>Global HTTP Settings</con:authType></con:credentials><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:parameters/></con:restRequest></con:config></con:testStep><con:testStep type="restrequest" name="SetStatus true networks - Request 1" id="86979a42-f16c-4f01-ae8e-3788b3ec10ec"><con:settings/><con:config service="SetStatus" resourcePath="/networks/rest/setStatus/{siteName}" methodName="SetStatus true networks" xsi:type="con:RestRequestStep" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"><con:restRequest name="SetStatus true networks - Request 1" id="e0314e05-9a73-4402-a404-3a1b0aa78232" mediaType="application/json" postQueryString="false"><con:settings><con:setting id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers">&lt;xml-fragment/></con:setting></con:settings><con:endpoint>http://${#Project#jrahost}</con:endpoint><con:request/><con:originalUri>http://localhost/ecomp/mso/infra/setStatus</con:originalUri><con:assertion type="Valid HTTP Status Codes" id="d185f2eb-7574-4dba-aed5-5a562790b1c8" name="Valid HTTP Status Codes"><con:configuration><codes>200</codes></con:configuration></con:assertion><con:credentials><con:username>${#Project#userlogin}</con:username><con:password>${#Project#userpassword}</con:password><con:selectedAuthProfile>Basic</con:selectedAuthProfile><con:addedBasicAuthenticationTypes>Basic</con:addedBasicAuthenticationTypes><con:authType>Global HTTP Settings</con:authType></con:credentials><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:parameters/><con:parameterOrder><con:entry>enable</con:entry><con:entry>siteName</con:entry></con:parameterOrder></con:restRequest></con:config></con:testStep><con:testStep type="restrequest" name="GetStatus RequestsDbAdapter - Request 1 11" id="1e0213f2-3674-436b-b887-b68ead2388d6"><con:settings/><con:config service="GetStatus" resourcePath="/dbadapters/RequestsDbAdapter" methodName="GetStatus RequestsDbAdapter" xsi:type="con:RestRequestStep" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"><con:restRequest name="GetStatus RequestsDbAdapter - Request 1 11" id="8fbeebe9-cdf0-4715-837c-16ae3cfdd5fb" mediaType="application/xml" postQueryString="false"><con:settings><con:setting id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers">&lt;xml-fragment/></con:setting></con:settings><con:endpoint>http://${#Project#apihhost}</con:endpoint><con:request><![CDATA[<soapenv:Envelope xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/" xmlns:req="http://org.openecomp.mso/requestsdb">
-<soapenv:Header/>
-<soapenv:Body>
-<req:getSiteStatus>
-<siteName>${#Project#sitename}</siteName>
-</req:getSiteStatus>
-</soapenv:Body>
-</soapenv:Envelope>]]></con:request><con:originalUri>http://localhost/dbadapters/RequestsDbAdapter</con:originalUri><con:assertion type="Simple Contains" id="65c09a35-6869-413d-ab78-f1a62e3e2fe7" name="Contains"><con:configuration><token>&lt;return>true&lt;/return></token><ignoreCase>false</ignoreCase><useRegEx>false</useRegEx></con:configuration></con:assertion><con:credentials><con:username>${#Project#dbadapteruser}</con:username><con:password>${#Project#dbadapterpassword}</con:password><con:selectedAuthProfile>Basic</con:selectedAuthProfile><con:addedBasicAuthenticationTypes>Basic</con:addedBasicAuthenticationTypes><con:authType>Global HTTP Settings</con:authType></con:credentials><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:parameters/></con:restRequest></con:config></con:testStep><con:testStep type="restrequest" name="SetStatus false vnfs - Request 1" id="ef176490-0593-4519-8008-72ed4b73089b"><con:settings/><con:config service="SetStatus" resourcePath="/vnfs/rest/setStatus/{siteName}" methodName="SetStatus false vnfs" xsi:type="con:RestRequestStep" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"><con:restRequest name="SetStatus false vnfs - Request 1" id="e0314e05-9a73-4402-a404-3a1b0aa78232" mediaType="application/json" postQueryString="false"><con:settings><con:setting id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers">&lt;xml-fragment/></con:setting></con:settings><con:endpoint>http://${#Project#jrahost}</con:endpoint><con:request/><con:originalUri>http://localhost/ecomp/mso/infra/setStatus</con:originalUri><con:assertion type="Valid HTTP Status Codes" id="99ff417e-f1d4-4bb2-a237-b8e12a49f88d" name="Valid HTTP Status Codes"><con:configuration><codes>200</codes></con:configuration></con:assertion><con:credentials><con:username>${#Project#userlogin}</con:username><con:password>${#Project#userpassword}</con:password><con:selectedAuthProfile>Basic</con:selectedAuthProfile><con:addedBasicAuthenticationTypes>Basic</con:addedBasicAuthenticationTypes><con:authType>Global HTTP Settings</con:authType></con:credentials><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:parameters><entry key="enable" value="false" xmlns="http://eviware.com/soapui/config"/></con:parameters><con:parameterOrder><con:entry>enable</con:entry><con:entry>siteName</con:entry></con:parameterOrder></con:restRequest></con:config></con:testStep><con:testStep type="restrequest" name="GetStatus RequestsDbAdapter - Request 1 12" id="ad2f5c9a-d0b4-4e8d-82c1-6a05dde1d7bf"><con:settings/><con:config service="GetStatus" resourcePath="/dbadapters/RequestsDbAdapter" methodName="GetStatus RequestsDbAdapter" xsi:type="con:RestRequestStep" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"><con:restRequest name="GetStatus RequestsDbAdapter - Request 1 12" id="8fbeebe9-cdf0-4715-837c-16ae3cfdd5fb" mediaType="application/xml" postQueryString="false"><con:settings><con:setting id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers">&lt;xml-fragment/></con:setting></con:settings><con:endpoint>http://${#Project#apihhost}</con:endpoint><con:request><![CDATA[<soapenv:Envelope xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/" xmlns:req="http://org.openecomp.mso/requestsdb">
-<soapenv:Header/>
-<soapenv:Body>
-<req:getSiteStatus>
-<siteName>${#Project#sitename}</siteName>
-</req:getSiteStatus>
-</soapenv:Body>
-</soapenv:Envelope>]]></con:request><con:originalUri>http://localhost/dbadapters/RequestsDbAdapter</con:originalUri><con:assertion type="Simple Contains" id="cc19cbb5-e3ef-40bb-ba96-778fcfeab6ff" name="Contains"><con:configuration><token>&lt;return>false&lt;/return></token><ignoreCase>false</ignoreCase><useRegEx>false</useRegEx></con:configuration></con:assertion><con:credentials><con:username>${#Project#dbadapteruser}</con:username><con:password>${#Project#dbadapterpassword}</con:password><con:selectedAuthProfile>Basic</con:selectedAuthProfile><con:addedBasicAuthenticationTypes>Basic</con:addedBasicAuthenticationTypes><con:authType>Global HTTP Settings</con:authType></con:credentials><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:parameters/></con:restRequest></con:config></con:testStep><con:testStep type="restrequest" name="SetStatus true vnfs - Request 1" id="609b6dcc-b423-496c-a653-e8a1018ca22a"><con:settings/><con:config service="SetStatus" resourcePath="/vnfs/rest/setStatus/{siteName}" methodName="SetStatus true vnfs" xsi:type="con:RestRequestStep" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"><con:restRequest name="SetStatus true vnfs - Request 1" id="e0314e05-9a73-4402-a404-3a1b0aa78232" mediaType="application/json" postQueryString="false"><con:settings><con:setting id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers">&lt;xml-fragment/></con:setting></con:settings><con:endpoint>http://${#Project#jrahost}</con:endpoint><con:request/><con:originalUri>http://localhost/ecomp/mso/infra/setStatus</con:originalUri><con:assertion type="Valid HTTP Status Codes" id="b2f5e2a0-4db0-479c-b235-26da2112e0c0" name="Valid HTTP Status Codes"><con:configuration><codes>200</codes></con:configuration></con:assertion><con:credentials><con:username>${#Project#userlogin}</con:username><con:password>${#Project#userpassword}</con:password><con:domain/><con:selectedAuthProfile>Basic</con:selectedAuthProfile><con:addedBasicAuthenticationTypes>Basic</con:addedBasicAuthenticationTypes><con:authType>Global HTTP Settings</con:authType></con:credentials><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:parameters/><con:parameterOrder><con:entry>enable</con:entry><con:entry>siteName</con:entry></con:parameterOrder></con:restRequest></con:config></con:testStep><con:testStep type="restrequest" name="GetStatus RequestsDbAdapter - Request 1 13" id="602fd957-8f06-48f0-87fe-9f23fc3b4ada"><con:settings/><con:config service="GetStatus" resourcePath="/dbadapters/RequestsDbAdapter" methodName="GetStatus RequestsDbAdapter" xsi:type="con:RestRequestStep" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"><con:restRequest name="GetStatus RequestsDbAdapter - Request 1 13" id="8fbeebe9-cdf0-4715-837c-16ae3cfdd5fb" mediaType="application/xml" postQueryString="false"><con:settings><con:setting id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers">&lt;xml-fragment/></con:setting></con:settings><con:endpoint>http://${#Project#apihhost}</con:endpoint><con:request><![CDATA[<soapenv:Envelope xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/" xmlns:req="http://org.openecomp.mso/requestsdb">
-<soapenv:Header/>
-<soapenv:Body>
-<req:getSiteStatus>
-<siteName>${#Project#sitename}</siteName>
-</req:getSiteStatus>
-</soapenv:Body>
-</soapenv:Envelope>]]></con:request><con:originalUri>http://localhost/dbadapters/RequestsDbAdapter</con:originalUri><con:assertion type="Simple Contains" id="12de6cbc-56c0-4761-aef5-e626ea947b18" name="Contains"><con:configuration><token>&lt;return>true&lt;/return></token><ignoreCase>false</ignoreCase><useRegEx>false</useRegEx></con:configuration></con:assertion><con:credentials><con:username>${#Project#dbadapteruser}</con:username><con:password>${#Project#dbadapterpassword}</con:password><con:selectedAuthProfile>Basic</con:selectedAuthProfile><con:addedBasicAuthenticationTypes>Basic</con:addedBasicAuthenticationTypes><con:authType>Global HTTP Settings</con:authType></con:credentials><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:parameters/></con:restRequest></con:config></con:testStep><con:testStep type="restrequest" name="SetStatus false tenants - Request 1" id="c8446182-a6f3-4266-bb5f-3cb850d24701"><con:settings/><con:config service="SetStatus" resourcePath="/tenants/rest/setStatus/{siteName}" methodName="SetStatus false tenants" xsi:type="con:RestRequestStep" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"><con:restRequest name="SetStatus false tenants - Request 1" id="e0314e05-9a73-4402-a404-3a1b0aa78232" mediaType="application/json" postQueryString="false"><con:settings><con:setting id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers">&lt;xml-fragment/></con:setting></con:settings><con:endpoint>http://${#Project#jrahost}</con:endpoint><con:request/><con:originalUri>http://localhost/ecomp/mso/infra/setStatus</con:originalUri><con:assertion type="Valid HTTP Status Codes" id="3c08903b-5d7c-40a6-94eb-b93b9f044ee5" name="Valid HTTP Status Codes"><con:configuration><codes>200</codes></con:configuration></con:assertion><con:credentials><con:username>${#Project#userlogin}</con:username><con:password>${#Project#userpassword}</con:password><con:selectedAuthProfile>Basic</con:selectedAuthProfile><con:addedBasicAuthenticationTypes>Basic</con:addedBasicAuthenticationTypes><con:authType>Global HTTP Settings</con:authType></con:credentials><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:parameters><entry key="enable" value="false" xmlns="http://eviware.com/soapui/config"/></con:parameters><con:parameterOrder><con:entry>enable</con:entry><con:entry>siteName</con:entry></con:parameterOrder></con:restRequest></con:config></con:testStep><con:testStep type="restrequest" name="GetStatus RequestsDbAdapter - Request 1 14" id="3fa1624e-aed7-4cc9-9691-d3b4f7ccc7ef"><con:settings/><con:config service="GetStatus" resourcePath="/dbadapters/RequestsDbAdapter" methodName="GetStatus RequestsDbAdapter" xsi:type="con:RestRequestStep" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"><con:restRequest name="GetStatus RequestsDbAdapter - Request 1 14" id="8fbeebe9-cdf0-4715-837c-16ae3cfdd5fb" mediaType="application/xml" postQueryString="false"><con:settings><con:setting id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers">&lt;xml-fragment/></con:setting></con:settings><con:endpoint>http://${#Project#apihhost}</con:endpoint><con:request><![CDATA[<soapenv:Envelope xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/" xmlns:req="http://org.openecomp.mso/requestsdb">
-<soapenv:Header/>
-<soapenv:Body>
-<req:getSiteStatus>
-<siteName>${#Project#sitename}</siteName>
-</req:getSiteStatus>
-</soapenv:Body>
-</soapenv:Envelope>]]></con:request><con:originalUri>http://localhost/dbadapters/RequestsDbAdapter</con:originalUri><con:assertion type="Simple Contains" id="07d6eb5b-ad84-469b-8e91-1fe49af16708" name="Contains"><con:configuration><token>&lt;return>false&lt;/return></token><ignoreCase>false</ignoreCase><useRegEx>false</useRegEx></con:configuration></con:assertion><con:credentials><con:username>${#Project#dbadapteruser}</con:username><con:password>${#Project#dbadapterpassword}</con:password><con:selectedAuthProfile>Basic</con:selectedAuthProfile><con:addedBasicAuthenticationTypes>Basic</con:addedBasicAuthenticationTypes><con:authType>Global HTTP Settings</con:authType></con:credentials><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:parameters/></con:restRequest></con:config></con:testStep><con:testStep type="restrequest" name="SetStatus true tenants - Request 1" id="f243bb07-7d05-447e-88ce-4aa86b68dbf0"><con:settings/><con:config service="SetStatus" resourcePath="/tenants/rest/setStatus/{siteName}" methodName="SetStatus true tenants" xsi:type="con:RestRequestStep" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"><con:restRequest name="SetStatus true tenants - Request 1" id="e0314e05-9a73-4402-a404-3a1b0aa78232" mediaType="application/json" postQueryString="false"><con:settings><con:setting id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers">&lt;xml-fragment/></con:setting></con:settings><con:endpoint>http://${#Project#jrahost}</con:endpoint><con:request/><con:originalUri>http://localhost/ecomp/mso/infra/setStatus</con:originalUri><con:assertion type="Valid HTTP Status Codes" id="f4c7e794-2670-4b2a-b20c-a2d980f5c054" name="Valid HTTP Status Codes"><con:configuration><codes>200</codes></con:configuration></con:assertion><con:credentials><con:username>${#Project#userlogin}</con:username><con:password>${#Project#userpassword}</con:password><con:selectedAuthProfile>Basic</con:selectedAuthProfile><con:addedBasicAuthenticationTypes>Basic</con:addedBasicAuthenticationTypes><con:authType>Global HTTP Settings</con:authType></con:credentials><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:parameters/><con:parameterOrder><con:entry>enable</con:entry><con:entry>siteName</con:entry></con:parameterOrder></con:restRequest></con:config></con:testStep><con:testStep type="restrequest" name="GetStatus RequestsDbAdapter - Request 1 15" id="b0d8a064-b7ee-4415-8802-229afa7cd4d5"><con:settings/><con:config service="GetStatus" resourcePath="/dbadapters/RequestsDbAdapter" methodName="GetStatus RequestsDbAdapter" xsi:type="con:RestRequestStep" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"><con:restRequest name="GetStatus RequestsDbAdapter - Request 1 15" id="8fbeebe9-cdf0-4715-837c-16ae3cfdd5fb" mediaType="application/xml" postQueryString="false"><con:settings><con:setting id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers">&lt;xml-fragment/></con:setting></con:settings><con:endpoint>http://${#Project#apihhost}</con:endpoint><con:request><![CDATA[<soapenv:Envelope xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/" xmlns:req="http://org.openecomp.mso/requestsdb">
-<soapenv:Header/>
-<soapenv:Body>
-<req:getSiteStatus>
-<siteName>${#Project#sitename}</siteName>
-</req:getSiteStatus>
-</soapenv:Body>
-</soapenv:Envelope>]]></con:request><con:originalUri>http://localhost/dbadapters/RequestsDbAdapter</con:originalUri><con:assertion type="Simple Contains" id="e7e43f20-9fba-4895-83e3-380564e264fc" name="Contains"><con:configuration><token>&lt;return>true&lt;/return></token><ignoreCase>false</ignoreCase><useRegEx>false</useRegEx></con:configuration></con:assertion><con:credentials><con:username>${#Project#dbadapteruser}</con:username><con:password>${#Project#dbadapterpassword}</con:password><con:selectedAuthProfile>Basic</con:selectedAuthProfile><con:addedBasicAuthenticationTypes>Basic</con:addedBasicAuthenticationTypes><con:authType>Global HTTP Settings</con:authType></con:credentials><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:parameters/></con:restRequest></con:config></con:testStep><con:testStep type="restrequest" name="SetStatus true JRA - Request 1 1" id="3c1d6822-e3d2-4344-9e02-2068adda61be"><con:settings/><con:config service="SetStatus" resourcePath="/adapters/rest/setStatus/{siteName}" methodName="SetStatus true JRA" xsi:type="con:RestRequestStep" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"><con:restRequest name="SetStatus true JRA - Request 1 1" id="e0314e05-9a73-4402-a404-3a1b0aa78232" mediaType="application/json" postQueryString="false"><con:settings><con:setting id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers">&lt;xml-fragment/></con:setting></con:settings><con:endpoint>http://${#Project#jrahost}</con:endpoint><con:request/><con:originalUri>http://localhost/ecomp/mso/infra/setStatus</con:originalUri><con:assertion type="Valid HTTP Status Codes" id="ee7665ce-a4db-4154-b045-b02310f7a402" name="Valid HTTP Status Codes"><con:configuration><codes>200</codes></con:configuration></con:assertion><con:credentials><con:username>${#Project#userlogin}</con:username><con:password>${#Project#userpassword}</con:password><con:selectedAuthProfile>Basic</con:selectedAuthProfile><con:addedBasicAuthenticationTypes>Basic</con:addedBasicAuthenticationTypes><con:authType>Global HTTP Settings</con:authType></con:credentials><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:parameters/><con:parameterOrder><con:entry>enable</con:entry><con:entry>siteName</con:entry></con:parameterOrder></con:restRequest></con:config></con:testStep><con:testStep type="restrequest" name="GetStatus RequestsDbAdapter - Request 1 16" id="f62a8ace-62c2-4cd9-ac93-70c585362446"><con:settings/><con:config service="GetStatus" resourcePath="/dbadapters/RequestsDbAdapter" methodName="GetStatus RequestsDbAdapter" xsi:type="con:RestRequestStep" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"><con:restRequest name="GetStatus RequestsDbAdapter - Request 1 16" id="8fbeebe9-cdf0-4715-837c-16ae3cfdd5fb" mediaType="application/xml" postQueryString="false"><con:settings><con:setting id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers">&lt;xml-fragment/></con:setting></con:settings><con:endpoint>http://${#Project#apihhost}</con:endpoint><con:request><![CDATA[<soapenv:Envelope xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/" xmlns:req="http://org.openecomp.mso/requestsdb">
-<soapenv:Header/>
-<soapenv:Body>
-<req:getSiteStatus>
-<siteName>${#Project#sitename}</siteName>
-</req:getSiteStatus>
-</soapenv:Body>
-</soapenv:Envelope>]]></con:request><con:originalUri>http://localhost/dbadapters/RequestsDbAdapter</con:originalUri><con:assertion type="Simple Contains" id="ee0a2a02-9193-4fca-9a1d-4b6ce3a3f254" name="Contains"><con:configuration><token>&lt;return>true&lt;/return></token><ignoreCase>false</ignoreCase><useRegEx>false</useRegEx></con:configuration></con:assertion><con:credentials><con:username>${#Project#dbadapteruser}</con:username><con:password>${#Project#dbadapterpassword}</con:password><con:selectedAuthProfile>Basic</con:selectedAuthProfile><con:addedBasicAuthenticationTypes>Basic</con:addedBasicAuthenticationTypes><con:authType>Global HTTP Settings</con:authType></con:credentials><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:parameters/></con:restRequest></con:config></con:testStep><con:testStep type="restrequest" name="SetStatus false JRA - Request 1" id="c6e48787-d7e0-46fb-ad23-f69bb192e718"><con:settings/><con:config service="SetStatus" resourcePath="/adapters/rest/setStatus/{siteName}" methodName="SetStatus false JRA" xsi:type="con:RestRequestStep" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"><con:restRequest name="SetStatus false JRA - Request 1" id="e0314e05-9a73-4402-a404-3a1b0aa78232" mediaType="application/json" postQueryString="false"><con:settings><con:setting id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers">&lt;xml-fragment/></con:setting></con:settings><con:endpoint>http://${#Project#jrahost}</con:endpoint><con:request/><con:originalUri>http://localhost/ecomp/mso/infra/setStatus</con:originalUri><con:assertion type="Valid HTTP Status Codes" id="75732629-9334-40fb-aff4-f81306e9a166" name="Valid HTTP Status Codes"><con:configuration><codes>200</codes></con:configuration></con:assertion><con:credentials><con:username>${#Project#userlogin}</con:username><con:password>${#Project#userpassword}</con:password><con:domain/><con:selectedAuthProfile>Basic</con:selectedAuthProfile><con:addedBasicAuthenticationTypes>Basic</con:addedBasicAuthenticationTypes><con:authType>Global HTTP Settings</con:authType></con:credentials><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:parameters><entry key="enable" value="false" xmlns="http://eviware.com/soapui/config"/></con:parameters><con:parameterOrder><con:entry>enable</con:entry><con:entry>siteName</con:entry></con:parameterOrder></con:restRequest></con:config></con:testStep><con:testStep type="restrequest" name="GetStatus RequestsDbAdapter - Request 1 17" id="fc2ff543-7fea-4e07-bd6c-f97d24767fa8"><con:settings/><con:config service="GetStatus" resourcePath="/dbadapters/RequestsDbAdapter" methodName="GetStatus RequestsDbAdapter" xsi:type="con:RestRequestStep" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"><con:restRequest name="GetStatus RequestsDbAdapter - Request 1 17" id="8fbeebe9-cdf0-4715-837c-16ae3cfdd5fb" mediaType="application/xml" postQueryString="false"><con:settings><con:setting id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers">&lt;xml-fragment/></con:setting></con:settings><con:endpoint>http://${#Project#apihhost}</con:endpoint><con:request><![CDATA[<soapenv:Envelope xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/" xmlns:req="http://org.openecomp.mso/requestsdb">
-<soapenv:Header/>
-<soapenv:Body>
-<req:getSiteStatus>
-<siteName>${#Project#sitename}</siteName>
-</req:getSiteStatus>
-</soapenv:Body>
-</soapenv:Envelope>]]></con:request><con:originalUri>http://localhost/dbadapters/RequestsDbAdapter</con:originalUri><con:assertion type="Simple Contains" id="38b23e5b-1596-40ca-8c43-91cb529c613d" name="Contains"><con:configuration><token>&lt;return>false&lt;/return></token><ignoreCase>false</ignoreCase><useRegEx>false</useRegEx></con:configuration></con:assertion><con:credentials><con:username>${#Project#dbadapteruser}</con:username><con:password>${#Project#dbadapterpassword}</con:password><con:selectedAuthProfile>Basic</con:selectedAuthProfile><con:addedBasicAuthenticationTypes>Basic</con:addedBasicAuthenticationTypes><con:authType>Global HTTP Settings</con:authType></con:credentials><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:parameters/></con:restRequest></con:config></con:testStep><con:testStep type="restrequest" name="GlobalHC adapters - Request 1 2" id="b5282e27-4b4f-4587-9df7-bc6275f4ddee"><con:settings/><con:config service="GlobalHealthcheck" resourcePath="/adapters/rest/globalhealthcheck" methodName="GlobalHC adapters" xsi:type="con:RestRequestStep" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"><con:restRequest name="GlobalHC adapters - Request 1 2" id="b1109ecf-fd73-4a30-8c98-ac50a10e9cb7" mediaType="application/json"><con:settings/><con:endpoint>http://${#Project#jrahost}</con:endpoint><con:request/><con:originalUri>http://localhost/adapters/rest/globalhealthcheck</con:originalUri><con:assertion type="Valid HTTP Status Codes" id="2487096b-aba4-48d3-8d25-6a29883fabaf" name="Valid HTTP Status Codes"><con:configuration><codes>503</codes></con:configuration></con:assertion><con:credentials><con:authType>No Authorization</con:authType></con:credentials><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:parameters><entry key="enableBpmn" value="${#Project#enableBpmn}" xmlns="http://eviware.com/soapui/config"/></con:parameters><con:parameterOrder><con:entry>enableBpmn</con:entry></con:parameterOrder></con:restRequest></con:config></con:testStep><con:testStep type="restrequest" name="LocalHC networks - Request 1 2" id="c33458af-0d58-4e02-906d-cf643ce0687c"><con:settings/><con:config service="SubModulesHealthcheck" resourcePath="/networks/rest/healthcheck" methodName="LocalHC networks" xsi:type="con:RestRequestStep" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"><con:restRequest name="LocalHC networks - Request 1 2" id="a8aa066b-ad81-40bc-9976-de44fe3dcc0a" mediaType="application/json"><con:settings/><con:endpoint>http://${#Project#jrahost}</con:endpoint><con:request/><con:originalUri>http://localhost/networks/admin/healthcheck</con:originalUri><con:assertion type="Valid HTTP Status Codes" id="9ce5ce7e-167f-402f-9cfd-6772ca3a473a" name="Valid HTTP Status Codes"><con:configuration><codes>503</codes></con:configuration></con:assertion><con:credentials><con:authType>No Authorization</con:authType></con:credentials><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:parameters/></con:restRequest></con:config></con:testStep><con:testStep type="restrequest" name="LocalHC adapters - Request 1 1" id="cf556704-c4d7-4df5-a73e-28c861ab842b"><con:settings/><con:config service="SubModulesHealthcheck" resourcePath="/adapters/rest/healthcheck" methodName="LocalHC adapters" xsi:type="con:RestRequestStep" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"><con:restRequest name="LocalHC adapters - Request 1 1" id="ea2c9416-63eb-4219-83fd-db0593bf63e3" mediaType="application/json"><con:settings><con:setting id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers">&lt;xml-fragment/></con:setting></con:settings><con:endpoint>http://${#Project#jrahost}</con:endpoint><con:request/><con:originalUri>http://localhost/adapters/rest/healthcheck</con:originalUri><con:assertion type="Valid HTTP Status Codes" id="55a8802a-c4c7-4b00-9c34-544b6f2c2e4f" name="Valid HTTP Status Codes"><con:configuration><codes>503</codes></con:configuration></con:assertion><con:credentials><con:authType>No Authorization</con:authType></con:credentials><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:parameters/></con:restRequest></con:config></con:testStep><con:testStep type="restrequest" name="LocalHC vnfs - Request 1 1" id="cb8e0324-4f2d-4dd2-bf30-4194894e4a86"><con:settings/><con:config service="SubModulesHealthcheck" resourcePath="/vnfs/rest/healthcheck" methodName="LocalHC vnfs" xsi:type="con:RestRequestStep" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"><con:restRequest name="LocalHC vnfs - Request 1 1" id="f2effc08-5569-4e5b-a2e8-fa3bebc958b9" mediaType="application/json"><con:settings><con:setting id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers">&lt;xml-fragment/></con:setting></con:settings><con:endpoint>http://${#Project#jrahost}</con:endpoint><con:request/><con:originalUri>http://localhost/vnfs/admin/healthcheck</con:originalUri><con:assertion type="Valid HTTP Status Codes" id="96fa9c64-d4cb-4906-933b-f36c3c31eab1" name="Valid HTTP Status Codes"><con:configuration><codes>503</codes></con:configuration></con:assertion><con:credentials><con:authType>No Authorization</con:authType></con:credentials><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:parameters/></con:restRequest></con:config></con:testStep><con:testStep type="restrequest" name="LocalHC tenants - Request 1 1" id="03ffbb1f-5959-427a-acad-5169b5bf26bf"><con:settings/><con:config service="SubModulesHealthcheck" resourcePath="/tenants/rest/healthcheck" methodName="LocalHC tenants" xsi:type="con:RestRequestStep" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"><con:restRequest name="LocalHC tenants - Request 1 1" id="432c2172-deba-4173-a0af-0b6fccfd60dc" mediaType="application/json"><con:settings><con:setting id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers">&lt;xml-fragment/></con:setting></con:settings><con:endpoint>http://${#Project#jrahost}</con:endpoint><con:request/><con:originalUri>http://localhost/tenants/admin/healthcheck</con:originalUri><con:assertion type="Valid HTTP Status Codes" id="8ed6f872-3caa-498e-8fd1-242454f55f71" name="Valid HTTP Status Codes"><con:configuration><codes>503</codes></con:configuration></con:assertion><con:credentials><con:authType>No Authorization</con:authType></con:credentials><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:parameters/></con:restRequest></con:config></con:testStep><con:testStep type="restrequest" name="LocalHC infra - Request 1 1" id="3fe1e622-d664-4d08-86a9-6df423b53d18"><con:settings/><con:config service="SubModulesHealthcheck" resourcePath="/ecomp/mso/infra/healthcheck" methodName="LocalHC infra" xsi:type="con:RestRequestStep" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"><con:restRequest name="LocalHC infra - Request 1 1" id="287d8590-e1da-49e5-afef-5f7191a55925" mediaType="application/json"><con:settings><con:setting id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers">&lt;xml-fragment/></con:setting></con:settings><con:endpoint>http://${#Project#apihhost}</con:endpoint><con:request/><con:originalUri>http://localhost/ecomp/mso/infra/healthcheck</con:originalUri><con:assertion type="Valid HTTP Status Codes" id="7b18d303-ecb6-4723-9f6d-f0711ad48a80" name="Valid HTTP Status Codes"><con:configuration><codes>503</codes></con:configuration></con:assertion><con:credentials><con:authType>No Authorization</con:authType></con:credentials><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:parameters/></con:restRequest></con:config></con:testStep><con:testStep type="restrequest" name="LocalHC asdc - Request 1 1" id="4d170588-4d18-4661-81db-f8a5d1174e75"><con:settings/><con:config service="SubModulesHealthcheck" resourcePath="/asdc/healthcheck" methodName="LocalHC asdc" xsi:type="con:RestRequestStep" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"><con:restRequest name="LocalHC asdc - Request 1 1" id="b0d9d540-073e-4d1d-ac19-32566206d0c6" mediaType="application/json"><con:settings><con:setting id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers">&lt;xml-fragment/></con:setting></con:settings><con:endpoint>http://${#Project#apihhost}</con:endpoint><con:request/><con:originalUri>http://localhost/asdc/healthcheck</con:originalUri><con:assertion type="Valid HTTP Status Codes" id="463074c6-e0f5-44e8-958d-b9dbd58be95c" name="Valid HTTP Status Codes"><con:configuration><codes>503</codes></con:configuration></con:assertion><con:credentials><con:authType>No Authorization</con:authType></con:credentials><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:parameters/></con:restRequest></con:config></con:testStep><con:testStep type="restrequest" name="SetStatus true networks - Request 1 1" id="90dae7f6-d5a8-41aa-8aa6-a1715e1aec5d"><con:settings/><con:config service="SetStatus" resourcePath="/networks/rest/setStatus/{siteName}" methodName="SetStatus true networks" xsi:type="con:RestRequestStep" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"><con:restRequest name="SetStatus true networks - Request 1 1" id="e0314e05-9a73-4402-a404-3a1b0aa78232" mediaType="application/json" postQueryString="false"><con:settings><con:setting id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers">&lt;xml-fragment/></con:setting></con:settings><con:endpoint>http://${#Project#jrahost}</con:endpoint><con:request/><con:originalUri>http://localhost/ecomp/mso/infra/setStatus</con:originalUri><con:assertion type="Valid HTTP Status Codes" id="94f233a7-37c8-40b9-8d57-53c6e50e2c3b" name="Valid HTTP Status Codes"><con:configuration><codes>200</codes></con:configuration></con:assertion><con:credentials><con:username>${#Project#userlogin}</con:username><con:password>${#Project#userpassword}</con:password><con:selectedAuthProfile>Basic</con:selectedAuthProfile><con:addedBasicAuthenticationTypes>Basic</con:addedBasicAuthenticationTypes><con:authType>Global HTTP Settings</con:authType></con:credentials><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:parameters/><con:parameterOrder><con:entry>enable</con:entry><con:entry>siteName</con:entry></con:parameterOrder></con:restRequest></con:config></con:testStep><con:testStep type="restrequest" name="GetStatus RequestsDbAdapter - Request 1 18" id="f5131443-ad0d-4c22-bac0-1be3107bd44b"><con:settings/><con:config service="GetStatus" resourcePath="/dbadapters/RequestsDbAdapter" methodName="GetStatus RequestsDbAdapter" xsi:type="con:RestRequestStep" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"><con:restRequest name="GetStatus RequestsDbAdapter - Request 1 18" id="8fbeebe9-cdf0-4715-837c-16ae3cfdd5fb" mediaType="application/xml" postQueryString="false"><con:settings><con:setting id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers">&lt;xml-fragment/></con:setting></con:settings><con:endpoint>http://${#Project#apihhost}</con:endpoint><con:request><![CDATA[<soapenv:Envelope xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/" xmlns:req="http://org.openecomp.mso/requestsdb">
-<soapenv:Header/>
-<soapenv:Body>
-<req:getSiteStatus>
-<siteName>${#Project#sitename}</siteName>
-</req:getSiteStatus>
-</soapenv:Body>
-</soapenv:Envelope>]]></con:request><con:originalUri>http://localhost/dbadapters/RequestsDbAdapter</con:originalUri><con:assertion type="Simple Contains" id="98f1d604-1865-45ac-ae71-3d94000738f3" name="Contains"><con:configuration><token>&lt;return>true&lt;/return></token><ignoreCase>false</ignoreCase><useRegEx>false</useRegEx></con:configuration></con:assertion><con:credentials><con:username>${#Project#dbadapteruser}</con:username><con:password>${#Project#dbadapterpassword}</con:password><con:selectedAuthProfile>Basic</con:selectedAuthProfile><con:addedBasicAuthenticationTypes>Basic</con:addedBasicAuthenticationTypes><con:authType>Global HTTP Settings</con:authType></con:credentials><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:parameters/></con:restRequest></con:config></con:testStep><con:testStep type="restrequest" name="NodehealthcheckAPIH - Request 1 2" id="afd352c1-685b-4bd3-be41-72ba3f3e2885"><con:settings/><con:config service="NodeHealthCheck" resourcePath="/ecomp/mso/infra/nodehealthcheck" methodName="NodehealthcheckAPIH-Infra" xsi:type="con:RestRequestStep" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"><con:restRequest name="NodehealthcheckAPIH - Request 1 2" id="00db386c-942d-4286-853f-01e279f6c2cb" mediaType="application/json"><con:settings><con:setting id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers">&lt;xml-fragment/></con:setting></con:settings><con:endpoint>http://${#Project#apihhost}</con:endpoint><con:request/><con:originalUri>http://localhost/adapters/rest/nodehealthcheck</con:originalUri><con:assertion type="Valid HTTP Status Codes" id="222b1461-2b33-4951-9c5d-87a850dc1971" name="Valid HTTP Status Codes"><con:configuration><codes>200</codes></con:configuration></con:assertion><con:credentials><con:authType>No Authorization</con:authType></con:credentials><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:parameters/></con:restRequest></con:config></con:testStep><con:testStep type="restrequest" name="GlobalHC adapters - Request 1 3" id="0e877ae9-1d63-486c-8530-fc99e5416ac6"><con:settings/><con:config service="GlobalHealthcheck" resourcePath="/adapters/rest/globalhealthcheck" methodName="GlobalHC adapters" xsi:type="con:RestRequestStep" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"><con:restRequest name="GlobalHC adapters - Request 1 3" id="b1109ecf-fd73-4a30-8c98-ac50a10e9cb7" mediaType="application/json"><con:settings><con:setting id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers">&lt;xml-fragment/></con:setting></con:settings><con:endpoint>http://${#Project#jrahost}</con:endpoint><con:request/><con:originalUri>http://localhost/adapters/rest/globalhealthcheck</con:originalUri><con:assertion type="Valid HTTP Status Codes" id="96e389cc-3e30-4ec0-b9bd-5eda145f6bbb" name="Valid HTTP Status Codes"><con:configuration><codes>200</codes></con:configuration></con:assertion><con:credentials><con:authType>No Authorization</con:authType></con:credentials><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:parameters><entry key="enableBpmn" value="${#Project#enableBpmn}" xmlns="http://eviware.com/soapui/config"/></con:parameters><con:parameterOrder><con:entry>enableBpmn</con:entry></con:parameterOrder></con:restRequest></con:config></con:testStep><con:testStep type="restrequest" name="LocalHC tenants - Request 1 2" id="c87beffd-7f8b-408d-9275-5876f5eb5dd4"><con:settings/><con:config service="SubModulesHealthcheck" resourcePath="/tenants/rest/healthcheck" methodName="LocalHC tenants" xsi:type="con:RestRequestStep" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"><con:restRequest name="LocalHC tenants - Request 1 2" id="432c2172-deba-4173-a0af-0b6fccfd60dc" mediaType="application/json"><con:settings/><con:endpoint>http://${#Project#jrahost}</con:endpoint><con:request/><con:originalUri>http://localhost/tenants/admin/healthcheck</con:originalUri><con:assertion type="Valid HTTP Status Codes" id="99a55011-59f5-4693-9b9f-5c0400172b8e" name="Valid HTTP Status Codes"><con:configuration><codes>200</codes></con:configuration></con:assertion><con:credentials><con:authType>No Authorization</con:authType></con:credentials><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:parameters/></con:restRequest></con:config></con:testStep><con:testStep type="restrequest" name="LocalHC asdc - Request 1 2" id="5ea8229f-7cb6-4660-8b84-b9930822934a"><con:settings/><con:config service="SubModulesHealthcheck" resourcePath="/asdc/healthcheck" methodName="LocalHC asdc" xsi:type="con:RestRequestStep" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"><con:restRequest name="LocalHC asdc - Request 1 2" id="b0d9d540-073e-4d1d-ac19-32566206d0c6" mediaType="application/json"><con:settings><con:setting id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers">&lt;xml-fragment/></con:setting></con:settings><con:endpoint>http://${#Project#apihhost}</con:endpoint><con:request/><con:originalUri>http://localhost/asdc/healthcheck</con:originalUri><con:assertion type="Valid HTTP Status Codes" id="eb5af8a7-1730-4b42-a604-10172a4a10ac" name="Valid HTTP Status Codes"><con:configuration><codes>200</codes></con:configuration></con:assertion><con:credentials><con:authType>No Authorization</con:authType></con:credentials><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:parameters/></con:restRequest></con:config></con:testStep><con:properties/></con:testCase><con:properties/></con:testSuite><con:properties><con:property><con:name>apihhost</con:name><con:value>localhost:8080</con:value></con:property><con:property><con:name>jrahost</con:name><con:value>localhost:8080</con:value></con:property><con:property><con:name>userlogin</con:name><con:value>sitecontrol</con:value></con:property><con:property><con:name>userpassword</con:name><con:value>Domain2.0!</con:value></con:property><con:property><con:name>bpmnhost</con:name><con:value>localhost:8080</con:value></con:property><con:property><con:name>sitename</con:name><con:value>mso-docker</con:value></con:property><con:property><con:name>enableBpmn</con:name><con:value/></con:property><con:property><con:name>dbadapteruser</con:name><con:value>BPELClient</con:value></con:property><con:property><con:name>dbadapterpassword</con:name><con:value>password1$</con:value></con:property><con:property><con:name>msoclient</con:name><con:value>MSOClient</con:value></con:property><con:property><con:name>msoclientpassword</con:name><con:value>password1$</con:value></con:property></con:properties><con:wssContainer/><con:oAuth2ProfileContainer/><con:oAuth1ProfileContainer/><con:sensitiveInformation/></con:soapui-project>
\ No newline at end of file
diff --git a/packages/arquillian-unit-tests/src/test/resources/SoapUI/Local-API-Handler-soapui-project.xml b/packages/arquillian-unit-tests/src/test/resources/SoapUI/Local-API-Handler-soapui-project.xml
deleted file mode 100755
index 76fc567..0000000
--- a/packages/arquillian-unit-tests/src/test/resources/SoapUI/Local-API-Handler-soapui-project.xml
+++ /dev/null
@@ -1,2097 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<con:soapui-project name="Local API Handler" soapui-version="5.2.1" abortOnError="false" runType="SEQUENTIAL" activeEnvironment="Default" resourceRoot="" id="9a646d8d-db03-4dfa-95cd-648d7f44b915" xmlns:con="http://eviware.com/soapui/config"><con:settings/><con:interface xsi:type="con:RestService" wadlVersion="http://wadl.dev.java.net/2009/02" name="Services" type="rest" basePath="" id="317bf83a-7f7b-4729-ba1a-e2899ca168c1" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"><con:settings/><con:definitionCache type="TEXT" rootPart=""/><con:endpoints><con:endpoint>http://localhost:8080</con:endpoint></con:endpoints><con:resource name="services" path="/ecomp/mso/v1/services/" id="83ed19f1-4c4b-4520-973a-27fde7888c87"><con:settings/><con:parameters/><con:method name="POST Service" method="POST" id="27eca141-4504-4a00-9d34-1594d0d6faa5"><con:settings/><con:parameters/><con:representation type="REQUEST"><con:mediaType>application/xml</con:mediaType><con:params/><con:element xmlns:v1="http://org.openecomp/mso/request/layer3serviceactivate/schema/v1">v1:service-request</con:element></con:representation><con:representation type="FAULT"><con:mediaType>text/html</con:mediaType><con:status>500</con:status><con:params/><con:element>html</con:element></con:representation><con:representation type="FAULT"><con:mediaType>application/xml</con:mediaType><con:status>500 400 503 404 502 409</con:status><con:params/><con:element xmlns:v1="http://org.openecomp/mso/request/schema/v1">v1:service-response</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType>application/xml</con:mediaType><con:status>202</con:status><con:params/><con:element xmlns:v1="http://org.openecomp/mso/request/schema/v1">v1:service-response</con:element></con:representation><con:representation type="FAULT"><con:mediaType>text/html;charset=utf-8</con:mediaType><con:status>401 404 403 405 500</con:status><con:params/><con:element>html</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType xsi:nil="true"/><con:status>0</con:status><con:params/><con:element>data</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType xsi:nil="true"/><con:status>0</con:status><con:params/><con:element>data</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType xsi:nil="true"/><con:status>0</con:status><con:params/><con:element>data</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType xsi:nil="true"/><con:status>0</con:status><con:params/><con:element>data</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType xsi:nil="true"/><con:status>0</con:status><con:params/><con:element>data</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType xsi:nil="true"/><con:status>0</con:status><con:params/><con:element>data</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType xsi:nil="true"/><con:status>0</con:status><con:params/><con:element>data</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType xsi:nil="true"/><con:status>0</con:status><con:params/><con:element>data</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType xsi:nil="true"/><con:status>0</con:status><con:params/><con:element>data</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType xsi:nil="true"/><con:status>0</con:status><con:params/><con:element>data</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType xsi:nil="true"/><con:status>0</con:status><con:params/><con:element>data</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType xsi:nil="true"/><con:status>0</con:status><con:params/><con:element>data</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType xsi:nil="true"/><con:status>0</con:status><con:params/><con:element>data</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType xsi:nil="true"/><con:status>0</con:status><con:params/><con:element>data</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType xsi:nil="true"/><con:status>0</con:status><con:params/><con:element>data</con:element></con:representation><con:request name="Request 1" mediaType="application/xml" postQueryString="false" id="011b8f2c-0ace-4a38-9048-90c8d0617e44"><con:settings><con:setting id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers">&lt;xml-fragment/></con:setting></con:settings><con:encoding/><con:endpoint>http://${#Project#host}</con:endpoint><con:request><![CDATA[<service-request xmlns="http://org.openecomp/mso/request/layer3serviceactivate/schema/v1" xmlns:msolayer3="http://org.openecomp/mso/request/layer3/schema/v1" xmlns:msoservtypes="http://org.openecomp/mso/request/types/v1">
-<msoservtypes:request-information>
-<msoservtypes:request-id>155415ab-b4a7-4382-b4c6-d17d950565</msoservtypes:request-id>
-<msoservtypes:request-action>Layer3ServiceActivateRequest</msoservtypes:request-action>
-<msoservtypes:source>OMX</msoservtypes:source>
-<msoservtypes:notification-url>https://localhost:22443/Services/com/cingular/csi/sdn/SendManagedNetworkStatusNotification.jws</msoservtypes:notification-url>
-<msoservtypes:order-number>5051560</msoservtypes:order-number>
-<msoservtypes:order-version>1</msoservtypes:order-version>
-</msoservtypes:request-information>
-<msoservtypes:service-information>
-<msoservtypes:service-type>SDN-ETHERNET-INTERNET</msoservtypes:service-type>
-<msoservtypes:service-instance-id>HI/VLXM/003717//SW_INTERNET</msoservtypes:service-instance-id>
-<msoservtypes:subscriber-name>ST E2E Test50565_13000050565</msoservtypes:subscriber-name>
-</msoservtypes:service-information>
-<service-parameters>
-<msolayer3:l2-homing-information>
-<msolayer3:evc-name>AS/VLXM/003717//SW</msolayer3:evc-name>
-<msolayer3:topology>MultiPoint</msolayer3:topology>
-<msolayer3:preferred-aic-clli>MTSNJA4LCP1</msolayer3:preferred-aic-clli>
-</msolayer3:l2-homing-information>
-<msolayer3:internet-service-information>
-<msolayer3:internet-evc-access-information>
-<msolayer3:internet-evc-speed-value>8</msolayer3:internet-evc-speed-value>
-<msolayer3:internet-evc-speed-units>Mbps</msolayer3:internet-evc-speed-units>
-<msolayer3:ip-version>ds</msolayer3:ip-version>
-</msolayer3:internet-evc-access-information>
-<msolayer3:vr-lan>
-<msolayer3:routing-protocol>none</msolayer3:routing-protocol>
-<msolayer3:vr-lan-interface>
-<msolayer3:vr-designation>primary</msolayer3:vr-designation>
-<msolayer3:v4-vr-lan-prefix>10.172.125.0</msolayer3:v4-vr-lan-prefix>
-<msolayer3:v4-vr-lan-prefix-length>28</msolayer3:v4-vr-lan-prefix-length>
-<msolayer3:v6-vr-lan-prefix>2001:112a:86c6:0045:1007:8a5d:0412:9179</msolayer3:v6-vr-lan-prefix>
-<msolayer3:v6-vr-lan-prefix-length>64</msolayer3:v6-vr-lan-prefix-length>
-<msolayer3:v4-public-lan-prefixes>
-<msolayer3:t-provided-v4-lan-public-prefixes>
-<msolayer3:request-index>1</msolayer3:request-index>
-<msolayer3:v4-lan-public-prefix>18.181.120.12</msolayer3:v4-lan-public-prefix>
-<msolayer3:v4-lan-public-prefix-length>28</msolayer3:v4-lan-public-prefix-length>
-</msolayer3:t-provided-v4-lan-public-prefixes>
-</msolayer3:v4-public-lan-prefixes>
-<msolayer3:v6-public-lan-prefixes>
-<msolayer3:t-provided-v6-lan-public-prefixes>
-<msolayer3:request-index>1</msolayer3:request-index>
-<msolayer3:v6-lan-public-prefix>2022:0cf7:87a6:0048:1008:8a4c:0373:1048</msolayer3:v6-lan-public-prefix>
-<msolayer3:v6-lan-public-prefix-length>64</msolayer3:v6-lan-public-prefix-length>
-</msolayer3:t-provided-v6-lan-public-prefixes>
-</msolayer3:v6-public-lan-prefixes>
-
-<msolayer3:dhcp>
-<msolayer3:v4-dhcp-server-enabled>Y</msolayer3:v4-dhcp-server-enabled>
-<msolayer3:v6-dhcp-server-enabled>Y</msolayer3:v6-dhcp-server-enabled>
-<msolayer3:use-v4-default-pool>N</msolayer3:use-v4-default-pool>
-<msolayer3:use-v6-default-pool>N</msolayer3:use-v6-default-pool>
-</msolayer3:dhcp>
-<msolayer3:pat>
-<msolayer3:v4-pat-enabled>Y</msolayer3:v4-pat-enabled>
-<msolayer3:use-v4-default-pool>N</msolayer3:use-v4-default-pool>
-</msolayer3:pat>
-<msolayer3:firewall-lite>
-<msolayer3:stateful-firewall-lite-v4-enabled>Y</msolayer3:stateful-firewall-lite-v4-enabled>
-<msolayer3:stateful-firewall-lite-v6-enabled>Y</msolayer3:stateful-firewall-lite-v6-enabled>
-</msolayer3:firewall-lite>
-</msolayer3:vr-lan-interface>
-</msolayer3:vr-lan>
-</msolayer3:internet-service-information>
-</service-parameters>
-</service-request>]]></con:request><con:originalUri>http://localhost/ecomp/mso/v1/services</con:originalUri><con:credentials><con:username>${#Project#user-csi}</con:username><con:password>${#Project#password-csi}</con:password><con:selectedAuthProfile>Basic</con:selectedAuthProfile><con:addedBasicAuthenticationTypes>Basic</con:addedBasicAuthenticationTypes><con:authType>Global HTTP Settings</con:authType></con:credentials><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:parameters/><con:parameterOrder/></con:request><con:request name="Request2" mediaType="application/xml" postQueryString="false" id="1a4403a4-0617-42aa-9220-17e276429fec"><con:settings><con:setting id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers">&lt;xml-fragment/></con:setting></con:settings><con:endpoint>http://${#Project#host}</con:endpoint><con:request><![CDATA[<tns:service-request xmlns:p="urn:ietf:params:xml:ns:yang:ietf-inet-types"
-xmlns:tns="http://org.openecomp/mso/request/changelayer3activate/schema/v1"
-xmlns:tns1="http://org.openecomp/mso/request/types/v1"
-xmlns:msolayer3="http://org.openecomp/mso/request/layer3/schema/v1"
-xmlns:tns3="http://org.openecomp/mso/layer3/simple/types/v1"
-xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
->
-  <tns1:request-information>
-    <tns1:request-id>ChgActsm519-501</tns1:request-id>
-    <tns1:request-action>ChangeLayer3ServiceActivateRequest</tns1:request-action>
-    <tns1:source>OMX</tns1:source>
-        <tns1:notification-url>https://localhost:22443/Services/com/cingular/csi/sdn/SendManagedNetworkStatusNot
-ification.jws</tns1:notification-url>
-    <tns1:order-number>051815-1005</tns1:order-number>
-    <tns1:order-version>2</tns1:order-version>
-  </tns1:request-information>
-  <tns1:service-information>
-    <tns1:service-type>SDN-ETHERNET-INTERNET</tns1:service-type>
-    <tns1:service-instance-id>TL/VLXM/003717//SW_INTERNET</tns1:service-instance-id>
-    <tns1:subscriber-name>Gamma Gamma E2E Test_051815_50</tns1:subscriber-name>
-  </tns1:service-information>
- <tns:service-parameters>
-            <msolayer3:internet-service-information>
-            <msolayer3:internet-evc-access-information>
-            <msolayer3:internet-evc-speed-value>20</msolayer3:internet-evc-speed-value>
-            <msolayer3:internet-evc-speed-units>Mbps</msolayer3:internet-evc-speed-units>
-            <msolayer3:ip-version>ds</msolayer3:ip-version>
-            </msolayer3:internet-evc-access-information>
-            <msolayer3:vr-lan>
-            <msolayer3:routing-protocol>none</msolayer3:routing-protocol>
-            <msolayer3:vr-lan-interface>
-               <msolayer3:vr-designation>primary</msolayer3:vr-designation>
-               <msolayer3:v4-vr-lan-prefix>10.192.70.254</msolayer3:v4-vr-lan-prefix>
-               <msolayer3:v4-vr-lan-prefix-length>24</msolayer3:v4-vr-lan-prefix-length>
-               <msolayer3:v6-vr-lan-prefix>2620:0:10d0:0:ffff:ffff:ffff:fffe</msolayer3:v6-vr-lan-prefix>
-               <msolayer3:v6-vr-lan-prefix-length>64</msolayer3:v6-vr-lan-prefix-length>
-               <msolayer3:v4-vce-loopback-address>12.189.96.168</msolayer3:v4-vce-loopback-address>
-               <msolayer3:v6-vce-wan-address>2001:1890:12e3:2cb::</msolayer3:v6-vce-wan-address>
-               <msolayer3:v4-public-lan-prefixes>
-                  <msolayer3:t-provided-v4-lan-public-prefixes>
-                     <msolayer3:request-index>1</msolayer3:request-index>
-                     <msolayer3:v4-next-hop-address>10.192.70.252</msolayer3:v4-next-hop-address>
-                     <msolayer3:v4-lan-public-prefix>223.233.247.1</msolayer3:v4-lan-public-prefix>
-                     <msolayer3:v4-lan-public-prefix-length>32</msolayer3:v4-lan-public-prefix-length>
-                  </msolayer3:t-provided-v4-lan-public-prefixes>
-               </msolayer3:v4-public-lan-prefixes>
-               <msolayer3:v6-public-lan-prefixes>
-                  <msolayer3:t-provided-v6-lan-public-prefixes>
-                     <msolayer3:request-index>1</msolayer3:request-index>
-                     <msolayer3:v6-next-hop-address>2620:0:10d0:0:ffff:ffff:ffff:fffc</msolayer3:v6-next-hop-address>
-                     <msolayer3:v6-lan-public-prefix>2057:0eb4:85a5:0047:1002:8a8e:0371:7331</msolayer3:v6-lan-public-prefix>
-                     <msolayer3:v6-lan-public-prefix-length>48</msolayer3:v6-lan-public-prefix-length>
-                  </msolayer3:t-provided-v6-lan-public-prefixes>
-               </msolayer3:v6-public-lan-prefixes>
-
-    <msolayer3:dhcp>
-                  <msolayer3:v4-dhcp-server-enabled>Y</msolayer3:v4-dhcp-server-enabled>
-                  <msolayer3:v6-dhcp-server-enabled>Y</msolayer3:v6-dhcp-server-enabled>
-                  <msolayer3:use-v4-default-pool>Y</msolayer3:use-v4-default-pool>
-                  <msolayer3:v4-dhcp-default-pool-prefix>10.192.70.254</msolayer3:v4-dhcp-default-pool-prefix>
-                  <msolayer3:v4-dhcp-default-pool-prefix-length>24</msolayer3:v4-dhcp-default-pool-prefix-length>
-                  <msolayer3:excluded-v4-dhcp-addresses-from-default-pool>
-                     <msolayer3:excluded-v4-address>10.192.70.252</msolayer3:excluded-v4-address>
-                  </msolayer3:excluded-v4-dhcp-addresses-from-default-pool>
-
-                  <msolayer3:use-v6-default-pool>Y</msolayer3:use-v6-default-pool>
-                  <msolayer3:v6-dhcp-default-pool-prefix>2620:0:10d0:0:ffff:ffff:ffff:fffe</msolayer3:v6-dhcp-default-pool-prefix>
-                  <msolayer3:v6-dhcp-default-pool-prefix-length>64</msolayer3:v6-dhcp-default-pool-prefix-length>
-                  <msolayer3:excluded-v6-dhcp-addresses-from-default-pool>
-                     <msolayer3:excluded-v6-address>2620:0:10d0:0:ffff:ffff:ffff:fffd</msolayer3:excluded-v6-address>
-                  </msolayer3:excluded-v6-dhcp-addresses-from-default-pool>
-
-               </msolayer3:dhcp>
-               <msolayer3:pat>
-                  <msolayer3:v4-pat-enabled>Y</msolayer3:v4-pat-enabled>
-                  <msolayer3:use-v4-default-pool>N</msolayer3:use-v4-default-pool>
-               </msolayer3:pat>
-               <msolayer3:firewall-lite>
-                  <msolayer3:stateful-firewall-lite-v4-enabled>Y</msolayer3:stateful-firewall-lite-v4-enabled>
-                  <msolayer3:stateful-firewall-lite-v6-enabled>Y</msolayer3:stateful-firewall-lite-v6-enabled>
-               </msolayer3:firewall-lite>
-               <msolayer3:static-routes>
-                  <msolayer3:v4-static-routes>
-                     <msolayer3:v4-static-route-prefix>223.233.247.1</msolayer3:v4-static-route-prefix>
-                     <msolayer3:v4-static-route-prefix-length>32</msolayer3:v4-static-route-prefix-length>
-                     <msolayer3:v4-next-hop-address>10.192.70.252</msolayer3:v4-next-hop-address>
-                  </msolayer3:v4-static-routes>
-                  <msolayer3:v4-static-routes>
-                     <msolayer3:v4-static-route-prefix>223.234.242.1</msolayer3:v4-static-route-prefix>
-                     <msolayer3:v4-static-route-prefix-length>32</msolayer3:v4-static-route-prefix-length>
-                     <msolayer3:v4-next-hop-address>10.192.70.253</msolayer3:v4-next-hop-address>
-                  </msolayer3:v4-static-routes>
-   			 	<msolayer3:v6-static-routes>
-                     <msolayer3:v6-static-route-prefix>2057:0eb4:85a5:0047:1002:8a8e:0371:7331</msolayer3:v6-static-route-prefix>
-                     <msolayer3:v6-static-route-prefix-length>48</msolayer3:v6-static-route-prefix-length>
-                     <msolayer3:v6-next-hop-address>2620:0:10d0:0:ffff:ffff:ffff:fffc</msolayer3:v6-next-hop-address>
-                  </msolayer3:v6-static-routes>
-                  <msolayer3:v6-static-routes>
-                     <msolayer3:v6-static-route-prefix>2057:0eb4:85a5:0047:1002:8a8e:0371:7332</msolayer3:v6-static-route-prefix>
-                     <msolayer3:v6-static-route-prefix-length>48</msolayer3:v6-static-route-prefix-length>
-                     <msolayer3:v6-next-hop-address>2620:0:10d0:0:ffff:ffff:ffff:fffd</msolayer3:v6-next-hop-address>
-                  </msolayer3:v6-static-routes>
-               </msolayer3:static-routes>
-          </msolayer3:vr-lan-interface>
-          </msolayer3:vr-lan>
-        </msolayer3:internet-service-information>
-  </tns:service-parameters>
-</tns:service-request>
-  ]]></con:request><con:originalUri>http://localhost/ecomp/mso/v1/services/</con:originalUri><con:credentials><con:username>${#Project#user-csi}</con:username><con:password>${#Project#password-csi}</con:password><con:selectedAuthProfile>Basic</con:selectedAuthProfile><con:addedBasicAuthenticationTypes>Basic</con:addedBasicAuthenticationTypes><con:authType>Global HTTP Settings</con:authType></con:credentials><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:parameters/><con:parameterOrder/></con:request></con:method></con:resource><con:resource name="Feature Service" path="/ecomp/mso/v1/services/features" id="817c7afa-f1b9-449e-8968-90251d5f98c6"><con:settings/><con:parameters/><con:method name="POST Feature" method="POST" id="990bf5c3-02c6-4109-ab1e-4ef7f89b11a1"><con:settings/><con:parameters/><con:representation type="REQUEST"><con:mediaType>application/xml</con:mediaType><con:params/><con:element xmlns:v1="http://org.openecomp/mso/request/layer3serviceactivate/schema/v1">v1:service-request</con:element></con:representation><con:representation type="FAULT"><con:mediaType>text/html</con:mediaType><con:status>500</con:status><con:params/><con:element>html</con:element></con:representation><con:representation type="FAULT"><con:mediaType>application/xml</con:mediaType><con:status>500 400 503 404 502</con:status><con:params/><con:element xmlns:v1="http://org.openecomp/mso/request/schema/v1">v1:service-response</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType>application/xml</con:mediaType><con:status>202</con:status><con:params/><con:element xmlns:v1="http://org.openecomp/mso/request/schema/v1">v1:service-response</con:element></con:representation><con:representation type="FAULT"><con:mediaType>text/html;charset=utf-8</con:mediaType><con:status>401 404 403 405 500</con:status><con:params/><con:element>html</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType xsi:nil="true"/><con:status>0</con:status><con:params/><con:element>data</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType xsi:nil="true"/><con:status>0</con:status><con:params/><con:element>data</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType xsi:nil="true"/><con:status>0</con:status><con:params/><con:element>data</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType xsi:nil="true"/><con:status>0</con:status><con:params/><con:element>data</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType xsi:nil="true"/><con:status>0</con:status><con:params/><con:element>data</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType xsi:nil="true"/><con:status>0</con:status><con:params/><con:element>data</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType xsi:nil="true"/><con:status>0</con:status><con:params/><con:element>data</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType xsi:nil="true"/><con:status>0</con:status><con:params/><con:element>data</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType xsi:nil="true"/><con:status>0</con:status><con:params/><con:element>data</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType xsi:nil="true"/><con:status>0</con:status><con:params/><con:element>data</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType xsi:nil="true"/><con:status>0</con:status><con:params/><con:element>data</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType xsi:nil="true"/><con:status>0</con:status><con:params/><con:element>data</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType xsi:nil="true"/><con:status>0</con:status><con:params/><con:element>data</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType xsi:nil="true"/><con:status>0</con:status><con:params/><con:element>data</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType xsi:nil="true"/><con:status>0</con:status><con:params/><con:element>data</con:element></con:representation><con:request name="RequestFeature" mediaType="application/xml" postQueryString="false" id="c6600614-046c-4ea0-ae5a-656a872de958"><con:settings><con:setting id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers">&lt;xml-fragment/></con:setting></con:settings><con:endpoint>http://${#Project#host}</con:endpoint><con:request><![CDATA[<feature-request
-	xmlns="http://org.openecomp/mso/request/layer3serviceactivate/schema/v1"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:msolayer3="http://org.openecomp/mso/request/layer3/schema/v1"
-	xmlns:msoservtypes="http://org.openecomp/mso/request/types/v1">
-	<msoservtypes:request-information>
-		<msoservtypes:request-id>155415ab-b4a7-4382-b4c6-d17d950565</msoservtypes:request-id>
-		<msoservtypes:request-action>FeatureChangeActivateRequest</msoservtypes:request-action>
-		<msoservtypes:source>OMX</msoservtypes:source>
-		<msoservtypes:notification-url>https://localhost:22443/Services/com/cingular/csi/sdn/SendManagedNetworkStatusNotification.jws</msoservtypes:notification-url>
-		<msoservtypes:order-number>5051560</msoservtypes:order-number>
-		<msoservtypes:order-version>1</msoservtypes:order-version>
-	</msoservtypes:request-information>
-	<msoservtypes:service-information>
-		<msoservtypes:service-type>SDN-ETHERNET-INTERNET</msoservtypes:service-type>
-		<msoservtypes:service-instance-id>HI/VLXM/003717//SW_INTERNET</msoservtypes:service-instance-id>
-		<msoservtypes:subscriber-name>ST E2E Test50565_13000050565</msoservtypes:subscriber-name>
-	</msoservtypes:service-information>
-	<msoservtypes:feature-information>
-		<msoservtypes:feature-type>FIREWALL-LITE</msoservtypes:feature-type>
-		<msoservtypes:feature-instance-id>HI/VLXM/003717//SW_INTERNET</msoservtypes:feature-instance-id>
-		<msoservtypes:feature-yang-model>ST E2E Test50565_13000050565</msoservtypes:feature-yang-model>
-	</msoservtypes:feature-information>
-	</feature-request>
-]]></con:request><con:originalUri>http://localhost/ecomp/mso/v1/services/feature</con:originalUri><con:credentials><con:username>${#Project#user-gui}</con:username><con:password>${#Project#password-gui}</con:password><con:selectedAuthProfile>Basic</con:selectedAuthProfile><con:addedBasicAuthenticationTypes>Basic</con:addedBasicAuthenticationTypes><con:authType>Global HTTP Settings</con:authType></con:credentials><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:parameters/><con:parameterOrder/></con:request><con:request name="RequestFeature-2" mediaType="application/xml" postQueryString="false" id="1586dc4e-547f-42fb-aac4-55c64b0d4d88"><con:settings><con:setting id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers">&lt;xml-fragment/></con:setting></con:settings><con:endpoint>http://${#Project#host}</con:endpoint><con:request><![CDATA[<tns:feature-request xmlns:p="urn:ietf:params:xml:ns:yang:ietf-inet-types"
-xmlns:tns="http://org.openecomp/mso/request/schema/v1"
-xmlns:tns1="http://org.openecomp/mso/request/types/v1"
-xmlns:tns2="http://org.openecomp/mso/request/layer3/schema/v1"
-xmlns:tns3="http://org.openecomp/mso/layer3/simple/types/v1"
-xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
->
-  <tns1:request-information>
-    <tns1:request-id>requestid12392</tns1:request-id>
-    <tns1:request-action>ChangeFeatureActivateRequest</tns1:request-action>
-    <tns1:source>OMX</tns1:source>
-    <tns1:notification-url>http://localhost:9096/CSINotify</tns1:notification-url>
-    <tns1:order-number>123123</tns1:order-number>
-    <tns1:order-version>1</tns1:order-version>
-  </tns1:request-information>
-  <tns1:service-information>
-    <tns1:service-type>SDN-ETHERNET-INTERNET</tns1:service-type>
-    <tns1:service-instance-id>AS/VLXM/000212//SB_INTERNET</tns1:service-instance-id>
-    <tns1:subscriber-name>StevesPizzaPlace15</tns1:subscriber-name>
-  </tns1:service-information>
-  <tns1:feature-information>
-    <tns1:feature-type>FIREWALL-LITE</tns1:feature-type>
-    <tns1:feature-instance-id>i chi</tns1:feature-instance-id>
-    <tns1:feature-yang-model>http://com/att/svc/mis/firewall-lite-gui</tns1:feature-yang-model>
-    <tns1:feature-yang-model-version>2015-05-15</tns1:feature-yang-model-version>
-</tns1:feature-information>
-  <tns:feature-parameters>
-     <firewall-lite>
-       <firewall-name>test</firewall-name>
-       <stateful-firewall-enabled>Y</stateful-firewall-enabled>
-     </firewall-lite>
-  </tns:feature-parameters>
-</tns:feature-request>
-]]></con:request><con:originalUri>http://localhost/ecomp/mso/v1/services/feature</con:originalUri><con:credentials><con:username>${#Project#user-gui}</con:username><con:password>${#Project#password-gui}</con:password><con:selectedAuthProfile>Basic</con:selectedAuthProfile><con:addedBasicAuthenticationTypes>Basic</con:addedBasicAuthenticationTypes><con:authType>Global HTTP Settings</con:authType></con:credentials><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:parameters/><con:parameterOrder/></con:request></con:method></con:resource><con:resource name="GET Request" path="/ecomp/mso/v1/requests/{request-id}" id="d4dec612-0244-48f4-8073-6b4619e18c48"><con:settings/><con:parameters><con:parameter><con:name>request-id</con:name><con:value/><con:style>TEMPLATE</con:style><con:default/><con:description xsi:nil="true"/></con:parameter></con:parameters><con:method name="Method 1" method="GET" id="a2b4a71d-1459-4e03-9d66-82d67a8c4b3e"><con:settings/><con:parameters/><con:representation type="REQUEST"><con:mediaType>application/xml</con:mediaType><con:params/><con:element xmlns:v1="http://org.openecomp/mso/request/layer3serviceactivate/schema/v1">v1:service-request</con:element></con:representation><con:representation type="FAULT"><con:mediaType>text/html</con:mediaType><con:status>500</con:status><con:params/><con:element>html</con:element></con:representation><con:representation type="FAULT"><con:mediaType>application/xml</con:mediaType><con:status>500 400 503 404</con:status><con:params/><con:element xmlns:v1="http://org.openecomp/mso/request/schema/v1">v1:service-response</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType>application/xml</con:mediaType><con:status>202</con:status><con:params/><con:element xmlns:v1="http://org.openecomp/mso/request/schema/v1">v1:service-response</con:element></con:representation><con:representation type="FAULT"><con:mediaType>text/html;charset=utf-8</con:mediaType><con:status>401 404 403 405 500</con:status><con:params/><con:element>html</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType xsi:nil="true"/><con:status>0</con:status><con:params/><con:element>data</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType xsi:nil="true"/><con:status>0</con:status><con:params/><con:element>data</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType xsi:nil="true"/><con:status>0</con:status><con:params/><con:element>data</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType xsi:nil="true"/><con:status>0</con:status><con:params/><con:element>data</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType xsi:nil="true"/><con:status>0</con:status><con:params/><con:element>data</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType xsi:nil="true"/><con:status>0</con:status><con:params/><con:element>data</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType xsi:nil="true"/><con:status>0</con:status><con:params/><con:element>data</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType xsi:nil="true"/><con:status>0</con:status><con:params/><con:element>data</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType xsi:nil="true"/><con:status>0</con:status><con:params/><con:element>data</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType xsi:nil="true"/><con:status>0</con:status><con:params/><con:element>data</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType xsi:nil="true"/><con:status>0</con:status><con:params/><con:element>data</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType xsi:nil="true"/><con:status>0</con:status><con:params/><con:element>data</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType xsi:nil="true"/><con:status>0</con:status><con:params/><con:element>data</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType xsi:nil="true"/><con:status>0</con:status><con:params/><con:element>data</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType xsi:nil="true"/><con:status>0</con:status><con:params/><con:element>data</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType>*/*</con:mediaType><con:status>200</con:status><con:params/><con:element xmlns:v1="http://org.openecomp/mso/request/query/schema/v1">v1:query-response</con:element></con:representation><con:request name="GetService" mediaType="application/xml" postQueryString="false" id="8c35e9ad-fe6b-43da-bff1-ff469739b2f9"><con:settings><con:setting id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers">&lt;xml-fragment/></con:setting></con:settings><con:endpoint>http://${#Project#host}</con:endpoint><con:request><![CDATA[<feature-request
-	xmlns="http://org.openecomp/mso/request/layer3serviceactivate/schema/v1"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:msolayer3="http://org.openecomp/mso/request/layer3/schema/v1"
-	xmlns:msoservtypes="http://org.openecomp/mso/request/types/v1">
-	<msoservtypes:request-information>
-		<msoservtypes:request-id>155415ab-b4a7-4382-b4c6-d17d950565</msoservtypes:request-id>
-		<msoservtypes:request-action>FeatureChangeActivateRequest</msoservtypes:request-action>
-		<msoservtypes:source>OMX</msoservtypes:source>
-		<msoservtypes:notification-url>https://localhost:22443/Services/com/cingular/csi/sdn/SendManagedNetworkStatusNotification.jws</msoservtypes:notification-url>
-		<msoservtypes:order-number>5051560</msoservtypes:order-number>
-		<msoservtypes:order-version>1</msoservtypes:order-version>
-	</msoservtypes:request-information>
-	<msoservtypes:service-information>
-		<msoservtypes:service-type>SDN-ETHERNET-INTERNET</msoservtypes:service-type>
-		<msoservtypes:service-instance-id>HI/VLXM/003717//SW_INTERNET</msoservtypes:service-instance-id>
-		<msoservtypes:subscriber-name>ST E2E Test50565_13000050565</msoservtypes:subscriber-name>
-	</msoservtypes:service-information>
-	<msoservtypes:feature-information>
-		<msoservtypes:feature-type>FIREWALL-LITE</msoservtypes:feature-type>
-		<msoservtypes:feature-instance-id>HI/VLXM/003717//SW_INTERNET</msoservtypes:feature-instance-id>
-		<msoservtypes:feature-yang-model>ST E2E Test50565_13000050565</msoservtypes:feature-yang-model>
-	</msoservtypes:feature-information>
-	</feature-request>
-]]></con:request><con:originalUri>http://localhost/ecomp/mso/v1/services/feature</con:originalUri><con:credentials><con:username>${#Project#user-csi}</con:username><con:password>${#Project#password-csi}</con:password><con:selectedAuthProfile>Basic</con:selectedAuthProfile><con:addedBasicAuthenticationTypes>Basic</con:addedBasicAuthenticationTypes><con:authType>Global HTTP Settings</con:authType></con:credentials><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:parameters><entry key="request-id" value="test0-service" xmlns="http://eviware.com/soapui/config"/></con:parameters><con:parameterOrder><con:entry>request-id</con:entry></con:parameterOrder></con:request></con:method></con:resource><con:resource name="Get Service Feature" path="/ecomp/mso/v1/requests/services/features/{feature-instance-id}" id="ef0bfc27-8830-44f4-9217-380d0e4f4466"><con:settings/><con:parameters><con:parameter><con:name>feature-instance-id</con:name><con:value/><con:style>TEMPLATE</con:style><con:default/><con:description xsi:nil="true"/></con:parameter></con:parameters><con:method name="Method 1" method="GET" id="e988b56d-5b63-4026-9e97-6a83a320659a"><con:settings/><con:parameters/><con:representation type="REQUEST"><con:mediaType>application/xml</con:mediaType><con:params/><con:element xmlns:v1="http://org.openecomp/mso/request/layer3serviceactivate/schema/v1">v1:service-request</con:element></con:representation><con:representation type="FAULT"><con:mediaType>text/html</con:mediaType><con:status>500</con:status><con:params/><con:element>html</con:element></con:representation><con:representation type="FAULT"><con:mediaType>application/xml</con:mediaType><con:status>500 400 503 404</con:status><con:params/><con:element xmlns:v1="http://org.openecomp/mso/request/schema/v1">v1:service-response</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType>application/xml</con:mediaType><con:status>202</con:status><con:params/><con:element xmlns:v1="http://org.openecomp/mso/request/schema/v1">v1:service-response</con:element></con:representation><con:representation type="FAULT"><con:mediaType>text/html;charset=utf-8</con:mediaType><con:status>401 404 403 405 500</con:status><con:params/><con:element>html</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType xsi:nil="true"/><con:status>0</con:status><con:params/><con:element>data</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType xsi:nil="true"/><con:status>0</con:status><con:params/><con:element>data</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType xsi:nil="true"/><con:status>0</con:status><con:params/><con:element>data</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType xsi:nil="true"/><con:status>0</con:status><con:params/><con:element>data</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType xsi:nil="true"/><con:status>0</con:status><con:params/><con:element>data</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType xsi:nil="true"/><con:status>0</con:status><con:params/><con:element>data</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType xsi:nil="true"/><con:status>0</con:status><con:params/><con:element>data</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType xsi:nil="true"/><con:status>0</con:status><con:params/><con:element>data</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType xsi:nil="true"/><con:status>0</con:status><con:params/><con:element>data</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType xsi:nil="true"/><con:status>0</con:status><con:params/><con:element>data</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType xsi:nil="true"/><con:status>0</con:status><con:params/><con:element>data</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType xsi:nil="true"/><con:status>0</con:status><con:params/><con:element>data</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType xsi:nil="true"/><con:status>0</con:status><con:params/><con:element>data</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType xsi:nil="true"/><con:status>0</con:status><con:params/><con:element>data</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType xsi:nil="true"/><con:status>0</con:status><con:params/><con:element>data</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType>*/*</con:mediaType><con:status>200</con:status><con:params/><con:element xmlns:v1="http://org.openecomp/mso/request/query/schema/v1">v1:query-responses</con:element></con:representation><con:request name="GetService" mediaType="application/xml" postQueryString="false" id="9041770a-bc89-4b13-99f5-31a1290df564"><con:settings><con:setting id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers">&lt;xml-fragment/></con:setting></con:settings><con:endpoint>http://${#Project#host}</con:endpoint><con:request><![CDATA[<feature-request
-	xmlns="http://org.openecomp/mso/request/layer3serviceactivate/schema/v1"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:msolayer3="http://org.openecomp/mso/request/layer3/schema/v1"
-	xmlns:msoservtypes="http://org.openecomp/mso/request/types/v1">
-	<msoservtypes:request-information>
-		<msoservtypes:request-id>155415ab-b4a7-4382-b4c6-d17d950565</msoservtypes:request-id>
-		<msoservtypes:request-action>FeatureChangeActivateRequest</msoservtypes:request-action>
-		<msoservtypes:source>OMX</msoservtypes:source>
-		<msoservtypes:notification-url>https://localhost:22443/Services/com/cingular/csi/sdn/SendManagedNetworkStatusNotification.jws</msoservtypes:notification-url>
-		<msoservtypes:order-number>5051560</msoservtypes:order-number>
-		<msoservtypes:order-version>1</msoservtypes:order-version>
-	</msoservtypes:request-information>
-	<msoservtypes:service-information>
-		<msoservtypes:service-type>SDN-ETHERNET-INTERNET</msoservtypes:service-type>
-		<msoservtypes:service-instance-id>HI/VLXM/003717//SW_INTERNET</msoservtypes:service-instance-id>
-		<msoservtypes:subscriber-name>ST E2E Test50565_13000050565</msoservtypes:subscriber-name>
-	</msoservtypes:service-information>
-	<msoservtypes:feature-information>
-		<msoservtypes:feature-type>FIREWALL-LITE</msoservtypes:feature-type>
-		<msoservtypes:feature-instance-id>HI/VLXM/003717//SW_INTERNET</msoservtypes:feature-instance-id>
-		<msoservtypes:feature-yang-model>ST E2E Test50565_13000050565</msoservtypes:feature-yang-model>
-	</msoservtypes:feature-information>
-	</feature-request>
-]]></con:request><con:originalUri>http://localhost/ecomp/mso/v1/services/feature</con:originalUri><con:credentials><con:username>${#Project#user-gui}</con:username><con:password>${#Project#password-gui}</con:password><con:selectedAuthProfile>Basic</con:selectedAuthProfile><con:addedBasicAuthenticationTypes>Basic</con:addedBasicAuthenticationTypes><con:authType>Global HTTP Settings</con:authType></con:credentials><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:parameters><entry key="feature-instance-id" value="test0-instance" xmlns="http://eviware.com/soapui/config"/></con:parameters><con:parameterOrder><con:entry>feature-instance-id</con:entry></con:parameterOrder></con:request></con:method></con:resource><con:resource name="Get Service" path="/ecomp/mso/v1/requests/services/{service-instance-id}" id="1130f0e1-9df8-48a6-befb-1caf3223b100"><con:settings/><con:parameters><con:parameter><con:name>service-instance-id</con:name><con:value/><con:style>TEMPLATE</con:style><con:default/><con:description xsi:nil="true"/></con:parameter></con:parameters><con:method name="Method 1" method="GET" id="fac3f2cd-7653-48e3-87cd-30c66ab98344"><con:settings/><con:parameters/><con:representation type="REQUEST"><con:mediaType>application/xml</con:mediaType><con:params/><con:element xmlns:v1="http://org.openecomp/mso/request/layer3serviceactivate/schema/v1">v1:service-request</con:element></con:representation><con:representation type="FAULT"><con:mediaType>text/html</con:mediaType><con:status>500</con:status><con:params/><con:element>html</con:element></con:representation><con:representation type="FAULT"><con:mediaType>application/xml</con:mediaType><con:status>500 400 503 404</con:status><con:params/><con:element xmlns:v1="http://org.openecomp/mso/request/schema/v1">v1:service-response</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType>application/xml</con:mediaType><con:status>202</con:status><con:params/><con:element xmlns:v1="http://org.openecomp/mso/request/schema/v1">v1:service-response</con:element></con:representation><con:representation type="FAULT"><con:mediaType>text/html;charset=utf-8</con:mediaType><con:status>401 404 403 405 500</con:status><con:params/><con:element>html</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType xsi:nil="true"/><con:status>0</con:status><con:params/><con:element>data</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType xsi:nil="true"/><con:status>0</con:status><con:params/><con:element>data</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType xsi:nil="true"/><con:status>0</con:status><con:params/><con:element>data</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType xsi:nil="true"/><con:status>0</con:status><con:params/><con:element>data</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType xsi:nil="true"/><con:status>0</con:status><con:params/><con:element>data</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType xsi:nil="true"/><con:status>0</con:status><con:params/><con:element>data</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType xsi:nil="true"/><con:status>0</con:status><con:params/><con:element>data</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType xsi:nil="true"/><con:status>0</con:status><con:params/><con:element>data</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType xsi:nil="true"/><con:status>0</con:status><con:params/><con:element>data</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType xsi:nil="true"/><con:status>0</con:status><con:params/><con:element>data</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType xsi:nil="true"/><con:status>0</con:status><con:params/><con:element>data</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType xsi:nil="true"/><con:status>0</con:status><con:params/><con:element>data</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType xsi:nil="true"/><con:status>0</con:status><con:params/><con:element>data</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType xsi:nil="true"/><con:status>0</con:status><con:params/><con:element>data</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType xsi:nil="true"/><con:status>0</con:status><con:params/><con:element>data</con:element></con:representation><con:representation type="FAULT"><con:mediaType xsi:nil="true"/><con:status>400</con:status><con:params/><con:element>data</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType>*/*</con:mediaType><con:status>200</con:status><con:params/><con:element xmlns:v1="http://org.openecomp/mso/request/query/schema/v1">v1:query-responses</con:element></con:representation><con:request name="GetService" mediaType="application/xml" postQueryString="false" id="9ab8980e-a36c-4239-b918-266a30284073"><con:settings><con:setting id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers">&lt;xml-fragment/></con:setting></con:settings><con:endpoint>http://${#Project#host}</con:endpoint><con:request><![CDATA[<feature-request
-	xmlns="http://org.openecomp/mso/request/layer3serviceactivate/schema/v1"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:msolayer3="http://org.openecomp/mso/request/layer3/schema/v1"
-	xmlns:msoservtypes="http://org.openecomp/mso/request/types/v1">
-	<msoservtypes:request-information>
-		<msoservtypes:request-id>155415ab-b4a7-4382-b4c6-d17d950565</msoservtypes:request-id>
-		<msoservtypes:request-action>FeatureChangeActivateRequest</msoservtypes:request-action>
-		<msoservtypes:source>OMX</msoservtypes:source>
-		<msoservtypes:notification-url>https://localhost:22443/Services/com/cingular/csi/sdn/SendManagedNetworkStatusNotification.jws</msoservtypes:notification-url>
-		<msoservtypes:order-number>5051560</msoservtypes:order-number>
-		<msoservtypes:order-version>1</msoservtypes:order-version>
-	</msoservtypes:request-information>
-	<msoservtypes:service-information>
-		<msoservtypes:service-type>SDN-ETHERNET-INTERNET</msoservtypes:service-type>
-		<msoservtypes:service-instance-id>HI/VLXM/003717//SW_INTERNET</msoservtypes:service-instance-id>
-		<msoservtypes:subscriber-name>ST E2E Test50565_13000050565</msoservtypes:subscriber-name>
-	</msoservtypes:service-information>
-	<msoservtypes:feature-information>
-		<msoservtypes:feature-type>FIREWALL-LITE</msoservtypes:feature-type>
-		<msoservtypes:feature-instance-id>HI/VLXM/003717//SW_INTERNET</msoservtypes:feature-instance-id>
-		<msoservtypes:feature-yang-model>ST E2E Test50565_13000050565</msoservtypes:feature-yang-model>
-	</msoservtypes:feature-information>
-	</feature-request>
-]]></con:request><con:originalUri>http://localhost/ecomp/mso/v1/services/feature</con:originalUri><con:credentials><con:username>${#Project#user-csi}</con:username><con:password>${#Project#password-csi}</con:password><con:selectedAuthProfile>Basic</con:selectedAuthProfile><con:addedBasicAuthenticationTypes>Basic</con:addedBasicAuthenticationTypes><con:authType>Global HTTP Settings</con:authType></con:credentials><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:parameters><entry key="service-instance-id" value="test0-service" xmlns="http://eviware.com/soapui/config"/></con:parameters><con:parameterOrder><con:entry>service-instance-id</con:entry></con:parameterOrder></con:request></con:method></con:resource><con:resource name="Get in query param" path="/ecomp/mso/v1/requests/" id="0cf27a25-6461-406f-894f-af4a178871c8"><con:settings/><con:parameters><con:parameter><con:name>service-instance-id</con:name><con:value/><con:style>QUERY</con:style><con:default/><con:description xsi:nil="true"/></con:parameter><con:parameter><con:name>feature-instance-id</con:name><con:value/><con:style>QUERY</con:style><con:default/><con:description xsi:nil="true"/></con:parameter></con:parameters><con:method name="Method 1" method="GET" id="fb03d5e2-dc2f-46c0-93c5-315ee0eaafd6"><con:settings/><con:parameters/><con:representation type="REQUEST"><con:mediaType>application/xml</con:mediaType><con:params/><con:element xmlns:v1="http://org.openecomp/mso/request/layer3serviceactivate/schema/v1">v1:service-request</con:element></con:representation><con:representation type="FAULT"><con:mediaType>text/html</con:mediaType><con:status>500</con:status><con:params/><con:element>html</con:element></con:representation><con:representation type="FAULT"><con:mediaType>application/xml</con:mediaType><con:status>500 400 503 404</con:status><con:params/><con:element xmlns:v1="http://org.openecomp/mso/request/schema/v1">v1:service-response</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType>application/xml</con:mediaType><con:status>202</con:status><con:params/><con:element xmlns:v1="http://org.openecomp/mso/request/schema/v1">v1:service-response</con:element></con:representation><con:representation type="FAULT"><con:mediaType>text/html;charset=utf-8</con:mediaType><con:status>401 404 403 405 500</con:status><con:params/><con:element>html</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType xsi:nil="true"/><con:status>0</con:status><con:params/><con:element>data</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType xsi:nil="true"/><con:status>0</con:status><con:params/><con:element>data</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType xsi:nil="true"/><con:status>0</con:status><con:params/><con:element>data</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType xsi:nil="true"/><con:status>0</con:status><con:params/><con:element>data</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType xsi:nil="true"/><con:status>0</con:status><con:params/><con:element>data</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType xsi:nil="true"/><con:status>0</con:status><con:params/><con:element>data</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType xsi:nil="true"/><con:status>0</con:status><con:params/><con:element>data</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType xsi:nil="true"/><con:status>0</con:status><con:params/><con:element>data</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType xsi:nil="true"/><con:status>0</con:status><con:params/><con:element>data</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType xsi:nil="true"/><con:status>0</con:status><con:params/><con:element>data</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType xsi:nil="true"/><con:status>0</con:status><con:params/><con:element>data</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType xsi:nil="true"/><con:status>0</con:status><con:params/><con:element>data</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType xsi:nil="true"/><con:status>0</con:status><con:params/><con:element>data</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType xsi:nil="true"/><con:status>0</con:status><con:params/><con:element>data</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType xsi:nil="true"/><con:status>0</con:status><con:params/><con:element>data</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType>*/*</con:mediaType><con:status>200</con:status><con:params/><con:element xmlns:v1="http://org.openecomp/mso/request/query/schema/v1">v1:query-responses</con:element></con:representation><con:request name="GetService" mediaType="application/xml" postQueryString="false" id="61989357-bca6-4779-b019-789068ed4e27"><con:settings><con:setting id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers">&lt;xml-fragment/></con:setting></con:settings><con:endpoint>http://${#Project#host}</con:endpoint><con:request><![CDATA[<feature-request
-	xmlns="http://org.openecomp/mso/request/layer3serviceactivate/schema/v1"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:msolayer3="http://org.openecomp/mso/request/layer3/schema/v1"
-	xmlns:msoservtypes="http://org.openecomp/mso/request/types/v1">
-	<msoservtypes:request-information>
-		<msoservtypes:request-id>155415ab-b4a7-4382-b4c6-d17d950565</msoservtypes:request-id>
-		<msoservtypes:request-action>FeatureChangeActivateRequest</msoservtypes:request-action>
-		<msoservtypes:source>OMX</msoservtypes:source>
-		<msoservtypes:notification-url>https://localhost:22443/Services/com/cingular/csi/sdn/SendManagedNetworkStatusNotification.jws</msoservtypes:notification-url>
-		<msoservtypes:order-number>5051560</msoservtypes:order-number>
-		<msoservtypes:order-version>1</msoservtypes:order-version>
-	</msoservtypes:request-information>
-	<msoservtypes:service-information>
-		<msoservtypes:service-type>SDN-ETHERNET-INTERNET</msoservtypes:service-type>
-		<msoservtypes:service-instance-id>HI/VLXM/003717//SW_INTERNET</msoservtypes:service-instance-id>
-		<msoservtypes:subscriber-name>ST E2E Test50565_13000050565</msoservtypes:subscriber-name>
-	</msoservtypes:service-information>
-	<msoservtypes:feature-information>
-		<msoservtypes:feature-type>FIREWALL-LITE</msoservtypes:feature-type>
-		<msoservtypes:feature-instance-id>HI/VLXM/003717//SW_INTERNET</msoservtypes:feature-instance-id>
-		<msoservtypes:feature-yang-model>ST E2E Test50565_13000050565</msoservtypes:feature-yang-model>
-	</msoservtypes:feature-information>
-	</feature-request>
-]]></con:request><con:originalUri>http://localhost/ecomp/mso/v1/services/feature</con:originalUri><con:credentials><con:username>${#Project#user-gui}</con:username><con:password>${#Project#password-gui}</con:password><con:selectedAuthProfile>Basic</con:selectedAuthProfile><con:addedBasicAuthenticationTypes>Basic</con:addedBasicAuthenticationTypes><con:authType>Global HTTP Settings</con:authType></con:credentials><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:parameters><entry key="service-instance-id" value="test0-service" xmlns="http://eviware.com/soapui/config"/></con:parameters><con:parameterOrder><con:entry>service-instance-id</con:entry><con:entry>feature-instance-id</con:entry></con:parameterOrder></con:request></con:method></con:resource><con:resource name="Homing Service" path="/ecomp/mso/homing/v1/getAicNodes" id="f0c2e5a6-4987-48db-9d53-bfa448c752dd"><con:settings/><con:parameters/><con:method name="POST Service" method="POST" id="cf2c9f23-c884-4d52-9513-b112c24e261f"><con:settings/><con:parameters/><con:representation type="REQUEST"><con:mediaType>application/xml</con:mediaType><con:params/><con:element xmlns:v1="http://org.openecomp/mso/request/layer3serviceactivate/schema/v1">v1:service-request</con:element></con:representation><con:representation type="FAULT"><con:mediaType>text/html</con:mediaType><con:status>500</con:status><con:params/><con:element>html</con:element></con:representation><con:representation type="FAULT"><con:mediaType>application/xml</con:mediaType><con:status>500 400 503 404 502</con:status><con:params/><con:element xmlns:v1="http://org.openecomp/mso/request/schema/v1">v1:service-response</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType>application/xml</con:mediaType><con:status>202</con:status><con:params/><con:element xmlns:v1="http://org.openecomp/mso/request/schema/v1">v1:service-response</con:element></con:representation><con:representation type="FAULT"><con:mediaType>text/html;charset=utf-8</con:mediaType><con:status>401 404 403 405 500</con:status><con:params/><con:element>html</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType xsi:nil="true"/><con:status>0</con:status><con:params/><con:element>data</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType xsi:nil="true"/><con:status>0</con:status><con:params/><con:element>data</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType xsi:nil="true"/><con:status>0</con:status><con:params/><con:element>data</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType xsi:nil="true"/><con:status>0</con:status><con:params/><con:element>data</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType xsi:nil="true"/><con:status>0</con:status><con:params/><con:element>data</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType xsi:nil="true"/><con:status>0</con:status><con:params/><con:element>data</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType xsi:nil="true"/><con:status>0</con:status><con:params/><con:element>data</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType xsi:nil="true"/><con:status>0</con:status><con:params/><con:element>data</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType xsi:nil="true"/><con:status>0</con:status><con:params/><con:element>data</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType xsi:nil="true"/><con:status>0</con:status><con:params/><con:element>data</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType xsi:nil="true"/><con:status>0</con:status><con:params/><con:element>data</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType xsi:nil="true"/><con:status>0</con:status><con:params/><con:element>data</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType xsi:nil="true"/><con:status>0</con:status><con:params/><con:element>data</con:element></con:representation><con:request name="Request 1" mediaType="application/xml" postQueryString="false" id="cabe086f-c452-40ae-a9b6-16c5cd411b97"><con:settings><con:setting id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers">&lt;xml-fragment/></con:setting></con:settings><con:endpoint>http://${#Project#host}</con:endpoint><con:request><![CDATA[<?xml version="1.0" encoding="UTF-8"?>
-<tns:homing-request xmlns:tns="http://org.openecomp/mso/request/aicnodes/schema/v1" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://org.openecomp/mso/request/aicnodes/schema/v1 GetAicNodes.xsd ">
-  <tns:request-information>
-    <tns:request-id>tns:request-id</tns:request-id>
-    <tns:request-action>GetAicNodesRequest</tns:request-action>
-    <tns:source>tns:source</tns:source>
-    <tns:list-length>0</tns:list-length>
-  </tns:request-information>
-  <tns:homing-request-information>
-    <tns:service-type>SDN-ETHERNET-INTERNET</tns:service-type>
-    <tns:global-customer-id>tns:global-customer-id</tns:global-customer-id>
-    <tns:customer-location>
-      <tns:lata>0</tns:lata>
-      <tns:latitude>0.0</tns:latitude>
-      <tns:longitude>0.0</tns:longitude>
-    </tns:customer-location>
-  </tns:homing-request-information>
-  <tns:homing-other-information>
-    <tns:bandwidth-value>0</tns:bandwidth-value>
-    <tns:bandwidth-units>Mbps</tns:bandwidth-units>
-  </tns:homing-other-information>
-</tns:homing-request>]]></con:request><con:originalUri>http://localhost/ecomp/mso/v1/services</con:originalUri><con:credentials><con:username>${#Project#user-csi}</con:username><con:password>${#Project#password-csi}</con:password><con:selectedAuthProfile>Basic</con:selectedAuthProfile><con:addedBasicAuthenticationTypes>Basic</con:addedBasicAuthenticationTypes><con:authType>Global HTTP Settings</con:authType></con:credentials><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:parameters/><con:parameterOrder/></con:request></con:method></con:resource><con:resource name="POST Infra Service" path="/ecomp/mso/infra/v3/vnf-request" id="fb089255-2194-46e1-b406-345e2fad35f2"><con:settings/><con:parameters/><con:method name="POST VNF Request" method="POST" id="8b60dd49-212e-4db7-a548-f1c093e9844a"><con:settings/><con:parameters/><con:representation type="REQUEST"><con:mediaType>application/xml</con:mediaType><con:params/><con:element xmlns:v1="http://org.openecomp/mso/request/layer3serviceactivate/schema/v1">v1:service-request</con:element></con:representation><con:representation type="FAULT"><con:mediaType>text/html</con:mediaType><con:status>500</con:status><con:params/><con:element>html</con:element></con:representation><con:representation type="FAULT"><con:mediaType>application/xml</con:mediaType><con:status>500 400 503 404 502 409</con:status><con:params/><con:element xmlns:v1="http://org.openecomp/mso/request/schema/v1">v1:service-response</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType>application/xml</con:mediaType><con:status>202</con:status><con:params/><con:element xmlns:v1="http://org.openecomp/mso/request/schema/v1">v1:service-response</con:element></con:representation><con:representation type="FAULT"><con:mediaType>text/html;charset=utf-8</con:mediaType><con:status>401 404 403 405 500</con:status><con:params/><con:element>html</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType xsi:nil="true"/><con:status>0</con:status><con:params/><con:element>data</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType xsi:nil="true"/><con:status>0</con:status><con:params/><con:element>data</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType xsi:nil="true"/><con:status>0</con:status><con:params/><con:element>data</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType xsi:nil="true"/><con:status>0</con:status><con:params/><con:element>data</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType xsi:nil="true"/><con:status>0</con:status><con:params/><con:element>data</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType xsi:nil="true"/><con:status>0</con:status><con:params/><con:element>data</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType xsi:nil="true"/><con:status>0</con:status><con:params/><con:element>data</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType xsi:nil="true"/><con:status>0</con:status><con:params/><con:element>data</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType xsi:nil="true"/><con:status>0</con:status><con:params/><con:element>data</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType xsi:nil="true"/><con:status>0</con:status><con:params/><con:element>data</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType xsi:nil="true"/><con:status>0</con:status><con:params/><con:element>data</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType xsi:nil="true"/><con:status>0</con:status><con:params/><con:element>data</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType xsi:nil="true"/><con:status>0</con:status><con:params/><con:element>data</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType xsi:nil="true"/><con:status>0</con:status><con:params/><con:element>data</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType xsi:nil="true"/><con:status>0</con:status><con:params/><con:element>data</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType xsi:nil="true"/><con:status>0</con:status><con:params/><con:element>data</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType xsi:nil="true"/><con:status>0</con:status><con:params/><con:element>data</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType xsi:nil="true"/><con:status>0</con:status><con:params/><con:element>data</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType xsi:nil="true"/><con:status>0</con:status><con:params/><con:element>data</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType xsi:nil="true"/><con:status>0</con:status><con:params/><con:element>data</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType xsi:nil="true"/><con:status>0</con:status><con:params/><con:element>data</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType xsi:nil="true"/><con:status>0</con:status><con:params/><con:element>data</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType xsi:nil="true"/><con:status>0</con:status><con:params/><con:element>data</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType xsi:nil="true"/><con:status>0</con:status><con:params/><con:element>data</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType xsi:nil="true"/><con:status>0</con:status><con:params/><con:element>data</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType xsi:nil="true"/><con:status>0</con:status><con:params/><con:element>data</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType xsi:nil="true"/><con:status>0</con:status><con:params/><con:element>data</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType xsi:nil="true"/><con:status>0</con:status><con:params/><con:element>data</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType xsi:nil="true"/><con:status>0</con:status><con:params/><con:element>data</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType xsi:nil="true"/><con:status>0</con:status><con:params/><con:element>data</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType xsi:nil="true"/><con:status>0</con:status><con:params/><con:element>data</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType xsi:nil="true"/><con:status>0</con:status><con:params/><con:element>data</con:element></con:representation><con:request name="Request 1" mediaType="application/xml" postQueryString="false" id="18e2e366-aaf0-4df2-92a3-7a919e1c2fe8"><con:settings><con:setting id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers">&lt;xml-fragment/></con:setting></con:settings><con:endpoint>http://${#Project#host}</con:endpoint><con:request><![CDATA[<aetgt:vnf-request xmlns:aetgt="http://org.openecomp/mso/infra/vnf-request/v1"
-                   xmlns="http://org.openecomp/mso/infra/vnf-request/v1"
-                   xmlns:rest="http://schemas.activebpel.org/REST/2007/12/01/aeREST.xsd">
-    <request-info>
-        <request-id>3d878a8e-51fa-44aa-8cb5-a56ae9352252</request-id>
-        <action>CREATE</action>
-        <source>PORTAL</source>
-    </request-info>
-    <vnf-inputs>
-        <vnf-name>yjvnfvmsc</vnf-name>
-        <vnf-type>VPE</vnf-type>
-        <service-type>SDN-ETHERNET-INTERNET</service-type>
-        <aic-node-clli>AUSTXAALCP1</aic-node-clli>
-        <tenant-id>276b95b6d2b04e2e830c976eb70c9405</tenant-id>
-    </vnf-inputs>
-    <vnf-params xmlns:tns="http://org.openecomp/mso/infra/vnf-request/v1"/>
-</aetgt:vnf-request>
-]]></con:request><con:originalUri>http://localhost/ecomp/mso/v1/services</con:originalUri><con:credentials><con:username>${#Project#user-csi}</con:username><con:password>${#Project#password-csi}</con:password><con:selectedAuthProfile>Basic</con:selectedAuthProfile><con:addedBasicAuthenticationTypes>Basic</con:addedBasicAuthenticationTypes><con:authType>Global HTTP Settings</con:authType></con:credentials><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:parameters/><con:parameterOrder/></con:request></con:method><con:method name="GET VNF-Request" id="98b74741-c644-4c92-9dab-ec42a7dbdf83" method="GET"><con:settings/><con:parameters><con:parameter><con:name>vnf-type</con:name><con:value/><con:style>QUERY</con:style><con:default/><con:description xsi:nil="true"/></con:parameter><con:parameter><con:name>service-type</con:name><con:value/><con:style>QUERY</con:style><con:default/><con:description xsi:nil="true"/></con:parameter><con:parameter><con:name>aic-node-clli</con:name><con:value/><con:style>QUERY</con:style><con:default/><con:description xsi:nil="true"/></con:parameter><con:parameter><con:name>tenant-id</con:name><con:value/><con:style>QUERY</con:style><con:default/><con:description xsi:nil="true"/></con:parameter><con:parameter><con:name>volume-group-id</con:name><con:value/><con:style>QUERY</con:style><con:default/><con:description xsi:nil="true"/></con:parameter><con:parameter><con:name>volume-group-name</con:name><con:value/><con:style>QUERY</con:style><con:default/><con:description xsi:nil="true"/></con:parameter></con:parameters><con:representation type="RESPONSE"><con:mediaType>*/*</con:mediaType><con:status>200</con:status><con:params/><con:element xmlns:v1="http://org.openecomp/mso/infra/vnf-request/v1">v1:vnf-requests</con:element></con:representation><con:representation type="FAULT"><con:mediaType>text/html;charset=utf-8</con:mediaType><con:status>405</con:status><con:params/><con:element>html</con:element></con:representation><con:request name="Request 1" id="50221050-4e8a-46e3-95ab-471b796fdb07" mediaType="application/json"><con:settings/><con:endpoint>http://localhost:8080</con:endpoint><con:request/><con:credentials><con:authType>No Authorization</con:authType></con:credentials><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:parameters/><con:parameterOrder><con:entry>vnf-type</con:entry><con:entry>service-type</con:entry><con:entry>aic-node-clli</con:entry><con:entry>tenant-id</con:entry><con:entry>volume-group-id</con:entry><con:entry>volume-group-name</con:entry></con:parameterOrder></con:request></con:method></con:resource><con:resource name="vnf-types" path="/ecomp/mso/infra/v1/vnf-types" id="1185ee32-2213-45f5-ade4-d6e1ac56da94"><con:settings/><con:parameters><con:parameter><con:name>vnf-role</con:name><con:value/><con:style>QUERY</con:style><con:default/><con:description xsi:nil="true"/></con:parameter></con:parameters><con:method name="Method 1" id="6061ff5b-9b9b-4351-8279-97f947f581b1" method="GET"><con:settings/><con:parameters/><con:representation type="FAULT"><con:mediaType>text/html;charset=utf-8</con:mediaType><con:status>401 403 404 500</con:status><con:params/><con:element>html</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType>*/*</con:mediaType><con:status>200</con:status><con:params/><con:element xmlns:v1="http://org.openecomp/mso/infra/vnf-request/v1">v1:vnf-types</con:element></con:representation><con:request name="Request 1" id="2cec4861-6675-43b2-82ef-a732613ad46b" mediaType="application/json"><con:settings><con:setting id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers">&lt;xml-fragment/></con:setting></con:settings><con:endpoint>http://${#Project#host}</con:endpoint><con:request/><con:originalUri>http://localhost/ecomp/mso/infra/V1/vnf-types</con:originalUri><con:credentials><con:username>${#Project#user-infraportal}</con:username><con:password>${#Project#password-infraportal}</con:password><con:selectedAuthProfile>Basic</con:selectedAuthProfile><con:addedBasicAuthenticationTypes>Basic</con:addedBasicAuthenticationTypes><con:authType>Global HTTP Settings</con:authType></con:credentials><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:parameters><entry key="vnf-role" value="test" xmlns="http://eviware.com/soapui/config"/></con:parameters><con:parameterOrder><con:entry>vnf-role</con:entry></con:parameterOrder></con:request></con:method></con:resource><con:resource name="Get Infra Network Request" path="/ecomp/mso/infra/v3/network-request" id="1185ee32-2213-45f5-ade4-d6e1ac56da94"><con:settings/><con:parameters/><con:method name="Method 1" id="6061ff5b-9b9b-4351-8279-97f947f581b1" method="GET"><con:settings/><con:parameters><con:parameter><con:name>network-type</con:name><con:value/><con:style>QUERY</con:style><con:default/><con:description xsi:nil="true"/></con:parameter><con:parameter><con:name>tenant-id</con:name><con:value/><con:style>QUERY</con:style><con:default/><con:description xsi:nil="true"/></con:parameter><con:parameter><con:name>service-type</con:name><con:value/><con:style>QUERY</con:style><con:default/><con:description xsi:nil="true"/></con:parameter><con:parameter><con:name>aic-node-clli</con:name><con:value/><con:style>QUERY</con:style><con:default/><con:description xsi:nil="true"/></con:parameter></con:parameters><con:representation type="FAULT"><con:mediaType>text/html;charset=utf-8</con:mediaType><con:status>401 403 404 500</con:status><con:params/><con:element>html</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType>*/*</con:mediaType><con:status>200</con:status><con:params/><con:element xmlns:v1="http://org.openecomp/mso/infra/vnf-request/v1">v1:vnf-types</con:element></con:representation><con:request name="Get with params" id="2cec4861-6675-43b2-82ef-a732613ad46b" mediaType="application/json"><con:settings><con:setting id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers">&lt;xml-fragment/></con:setting></con:settings><con:endpoint>http://${#Project#host}</con:endpoint><con:request/><con:originalUri>http://localhost/ecomp/mso/infra/V1/vnf-types</con:originalUri><con:credentials><con:username>${#Project#user-infraportal}</con:username><con:password>${#Project#password-infraportal}</con:password><con:selectedAuthProfile>Basic</con:selectedAuthProfile><con:addedBasicAuthenticationTypes>Basic</con:addedBasicAuthenticationTypes><con:authType>Global HTTP Settings</con:authType></con:credentials><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:parameters/><con:parameterOrder><con:entry>network-type</con:entry><con:entry>tenant-id</con:entry><con:entry>service-type</con:entry><con:entry>aic-node-clli</con:entry></con:parameterOrder></con:request></con:method><con:method name="POST Request" id="33786292-e4fc-4aeb-9526-265fe19a41c6" method="POST"><con:settings/><con:parameters/><con:representation type="FAULT"><con:mediaType>application/xml</con:mediaType><con:status>400 500 409</con:status><con:params/><con:element xmlns:v1="http://org.openecomp/mso/infra/network-request/v1">v1:network-request</con:element></con:representation><con:representation type="REQUEST"><con:mediaType>application/json</con:mediaType><con:params/></con:representation><con:representation type="RESPONSE"><con:mediaType xsi:nil="true"/><con:status>0</con:status><con:params/><con:element>data</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType xsi:nil="true"/><con:status>0</con:status><con:params/><con:element>data</con:element></con:representation><con:representation type="REQUEST"><con:mediaType>application/xml</con:mediaType><con:params/><con:element xmlns:v1="http://org.openecomp/mso/infra/vnf-request/v1">v1:network-request</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType>application/xml</con:mediaType><con:status>202</con:status><con:params/><con:element xmlns:v1="http://org.openecomp/mso/infra/network-request/v1">v1:network-request</con:element></con:representation><con:request name="Request 1" id="712ec3ee-609f-4b36-9f3a-75dfc1333714" mediaType="application/json" postQueryString="false"><con:settings><con:setting id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers">&lt;xml-fragment/></con:setting></con:settings><con:endpoint>http://localhost:8080</con:endpoint><con:request><![CDATA[ <vnfreq:request-info>
-            <vnfreq:action>CREATE</vnfreq:action>
-            <vnfreq:status-message>init-status-string</vnfreq:status-message>
-            <vnfreq:progress>1</vnfreq:progress>
-            <vnfreq:start-time>100</vnfreq:start-time>
-            <vnfreq:end-time>999</vnfreq:end-time>
-            <vnfreq:source>PORTAL</vnfreq:source>
-          </vnfreq:request-info>
-          <vnfreq:network-inputs>
-                <vnfreq:network-id>84fb3c78-7d4a-4297-9892-c4519fcc0552</vnfreq:network-id>
-                <vnfreq:network-name>Cricket_OCS_protected_net_0</vnfreq:network-name>
-                <vnfreq:network-type>vlan</vnfreq:network-type>
-                <vnfreq:service-type>0</vnfreq:service-type>
-                <vnfreq:aic-node-clli>RDM2WAGPLCP</vnfreq:aic-node-clli>
-                <vnfreq:tenant-id>ccd3946adf8e46ccb516fbb0a35db9e2</vnfreq:tenant-id>
-                <vnfreq:prov-status>str1234</vnfreq:prov-status>
-          </vnfreq:network-inputs>
-          <vnfreq:network-params>
-                <param name="shared">0</param>
-          </vnfreq:network-params>
-          <vnfreq:network-outputs>
-                <vnfreq:network-id></vnfreq:network-id>
-                <vnfreq:network-name>0</vnfreq:network-name>
-          </vnfreq:network-outputs>
-        </vnf-request>
-]]></con:request><con:credentials><con:authType>No Authorization</con:authType></con:credentials><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:parameters/><con:parameterOrder/></con:request></con:method></con:resource><con:resource name="network-types" path="/ecomp/mso/infra/v1/network-types" id="1185ee32-2213-45f5-ade4-d6e1ac56da94"><con:settings/><con:parameters/><con:method name="Method 1" id="6061ff5b-9b9b-4351-8279-97f947f581b1" method="GET"><con:settings/><con:parameters/><con:representation type="FAULT"><con:mediaType>text/html;charset=utf-8</con:mediaType><con:status>401 403 404 500</con:status><con:params/><con:element>html</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType>*/*</con:mediaType><con:status>200</con:status><con:params/><con:element xmlns:v1="http://org.openecomp/mso/infra/vnf-request/v1">v1:vnf-types</con:element></con:representation><con:request name="Request 1" id="2cec4861-6675-43b2-82ef-a732613ad46b" mediaType="application/json"><con:settings><con:setting id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers">&lt;xml-fragment/></con:setting></con:settings><con:endpoint>http://${#Project#host}</con:endpoint><con:request/><con:originalUri>http://.21.125.49/ecomp/mso/infra/V1/vnf-types</con:originalUri><con:credentials><con:username>${#Project#user-infraportal}</con:username><con:password>${#Project#password-infraportal}</con:password><con:selectedAuthProfile>Basic</con:selectedAuthProfile><con:addedBasicAuthenticationTypes>Basic</con:addedBasicAuthenticationTypes><con:authType>Global HTTP Settings</con:authType></con:credentials><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:parameters/><con:parameterOrder/></con:request></con:method></con:resource><con:resource name="Get Infra Network RequestID" path="/ecomp/mso/infra/v1/network-request/{request-id}" id="1185ee32-2213-45f5-ade4-d6e1ac56da94"><con:settings/><con:parameters><con:parameter><con:name>request-id</con:name><con:value/><con:style>TEMPLATE</con:style><con:default/></con:parameter></con:parameters><con:method name="Method 2" id="7ede6b49-9556-4c5b-91bf-1e057edc3dbb" method="GET"><con:settings/><con:parameters/><con:representation type="RESPONSE"><con:mediaType>*/*</con:mediaType><con:status>200</con:status><con:params/><con:element xmlns:v1="http://org.openecomp/mso/infra/network-request/v1">v1:network-request</con:element></con:representation><con:request name="Get request-id" id="b2ee42d4-3290-4194-954b-5599ad728a8f" mediaType="application/json"><con:settings><con:setting id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers">&lt;xml-fragment/></con:setting></con:settings><con:endpoint>http://localhost:8080</con:endpoint><con:request/><con:credentials><con:authType>No Authorization</con:authType></con:credentials><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:parameters/><con:parameterOrder/></con:request></con:method></con:resource><con:resource name="GET VNF Request RequestId" path="/ecomp/mso/infra/v1/vnf-request/{request-id}" id="fb089255-2194-46e1-b406-345e2fad35f2"><con:settings/><con:parameters><con:parameter><con:name>request-id</con:name><con:value/><con:style>TEMPLATE</con:style><con:default/></con:parameter></con:parameters><con:method name="GET VNF-Request on RequestID" id="98b74741-c644-4c92-9dab-ec42a7dbdf83" method="GET"><con:settings/><con:parameters/><con:representation type="RESPONSE"><con:mediaType>*/*</con:mediaType><con:status>200</con:status><con:params/><con:element xmlns:v1="http://org.openecomp/mso/infra/vnf-request/v1">v1:vnf-request</con:element></con:representation><con:representation type="FAULT"><con:mediaType>text/html;charset=utf-8</con:mediaType><con:status>404 400</con:status><con:params/><con:element>html</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType>application/octet-stream</con:mediaType><con:status>200</con:status><con:params/><con:element xmlns:v1="http://org.openecomp/mso/infra/vnf-request/v1">v1:vnf-request</con:element></con:representation><con:request name="Request 1" id="50221050-4e8a-46e3-95ab-471b796fdb07" mediaType="application/json"><con:settings/><con:endpoint>http://localhost:8080</con:endpoint><con:request/><con:credentials><con:authType>No Authorization</con:authType></con:credentials><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:parameters/><con:parameterOrder/></con:request></con:method></con:resource><con:resource name="POST Infra volume request" path="/ecomp/mso/infra/v2/volume-request" id="1185ee32-2213-45f5-ade4-d6e1ac56da94"><con:settings/><con:parameters><con:parameter><con:name>tenantId</con:name><con:style>QUERY</con:style></con:parameter><con:parameter><con:name>vnf-type</con:name><con:style>QUERY</con:style></con:parameter></con:parameters><con:method name="Method 2" id="7ede6b49-9556-4c5b-91bf-1e057edc3dbb" method="POST"><con:settings/><con:parameters/><con:representation type="RESPONSE"><con:mediaType>*/*</con:mediaType><con:status>200</con:status><con:params/><con:element xmlns:v1="http://org.openecomp/mso/infra/network-request/v1">v1:network-request</con:element></con:representation><con:representation type="REQUEST"><con:mediaType>application/json</con:mediaType><con:params/><con:element xmlns:v1="http://org.openecomp/mso/infra/volume-request/v1">v1:volume-request</con:element></con:representation><con:representation type="FAULT"><con:mediaType>text/html;charset=utf-8</con:mediaType><con:status>401 403</con:status><con:params/><con:element>html</con:element></con:representation><con:representation type="REQUEST"><con:mediaType>application/xml</con:mediaType><con:params/><con:element xmlns:v1="http://org.openecomp/mso/infra/volume-request/v1">v1:volume-request</con:element></con:representation><con:representation type="FAULT"><con:mediaType>application/xml</con:mediaType><con:status>400 501</con:status><con:params/><con:element xmlns:v1="http://org.openecomp/mso/infra/volume-request/v1">v1:volume-request</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType>application/xml</con:mediaType><con:status>202</con:status><con:params/><con:element xmlns:v1="http://org.openecomp/mso/infra/volume-request/v1">v1:volume-request</con:element></con:representation><con:request name="POST volume Request" id="b2ee42d4-3290-4194-954b-5599ad728a8f" mediaType="application/json" postQueryString="false"><con:settings><con:setting id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers">&lt;xml-fragment/></con:setting></con:settings><con:endpoint>http://localhost:8080</con:endpoint><con:request><![CDATA[<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<volume-request xmlns="http://org.openecomp/mso/infra/volume-request/v1">
-    <request-info>
-        <request-id>cfbca420-14d5-4e68-ad84-b56715c946f4</request-id>
-        <action>DELETE_VF_MODULE_VOL</action>
-        <source>PORTAL</source>
-    </request-info>
-    <volume-inputs>
-        <vnf-type>Nimbus_LU2_PXTC_Svc/PXTC_v5 1</vnf-type>
-        <vf-module-model-name>PXTC_v5::module-1</vf-module-model-name>
-        <backout-on-failure>true</backout-on-failure>
-        <service-id>a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb</service-id>
-        <aic-cloud-region>rdm3</aic-cloud-region>
-        <tenant-id>eecd15e8e7ee46c3bbc2096f0924f4c4</tenant-id>
-        <volume-group-id>da9e0bdf-7d88-4111-bcad-8b72e3a5e601</volume-group-id>
-    </volume-inputs>
-</volume-request>
-]]></con:request><con:credentials><con:username>${#Project#user-csi}</con:username><con:password>${#Project#user-csi}</con:password><con:selectedAuthProfile>Basic</con:selectedAuthProfile><con:addedBasicAuthenticationTypes>Basic</con:addedBasicAuthenticationTypes><con:authType>Global HTTP Settings</con:authType></con:credentials><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:parameters/><con:parameterOrder/></con:request></con:method><con:method name="Getinfo" id="bbad9a54-6630-4679-b6ef-2298202784ac" method="GET"><con:settings/><con:parameters/><con:representation type="FAULT"><con:mediaType>text/html;charset=utf-8</con:mediaType><con:status>404 405</con:status><con:params/><con:element>html</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType>*/*</con:mediaType><con:status>200</con:status><con:params/><con:element xmlns:v1="http://org.openecomp/mso/infra/volume-request/v1">v1:volume-requests</con:element></con:representation><con:request name="Request 1" id="706b2d9c-7802-4160-9fa2-31537f0131fb" mediaType="application/json"><con:settings/><con:endpoint>http://localhost:8080</con:endpoint><con:request/><con:credentials><con:authType>No Authorization</con:authType></con:credentials><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:parameters/><con:parameterOrder><con:entry>tenantId</con:entry><con:entry>vnf-type</con:entry></con:parameterOrder></con:request></con:method></con:resource><con:resource name="VID Create Service" path="/ecomp/mso/infra/serviceInstances/v2" id="bd95b87e-b8ce-488e-9d51-373e0ea1ea91"><con:settings/><con:parameters/><con:method name="create service" id="2fa93fd7-2c2f-481b-981a-9e47d2d2e7ac" method="POST"><con:settings/><con:parameters/><con:representation type="REQUEST"><con:mediaType>application/json</con:mediaType><con:params/></con:representation><con:representation type="FAULT"><con:mediaType>application/json</con:mediaType><con:status>400 409 500</con:status><con:params/><con:element xmlns:v2="http://localhost/ecomp/mso/infra/serviceInstances/v2">v2:Fault</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType>application/json</con:mediaType><con:status>202</con:status><con:params/><con:element xmlns:v2="http://localhost/ecomp/mso/infra/serviceInstances/v2">v2:Response</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType xsi:nil="true"/><con:status>0</con:status><con:params/><con:element>data</con:element></con:representation><con:representation type="FAULT"><con:mediaType>text/html;charset=UTF-8</con:mediaType><con:status>401</con:status><con:params/><con:element>html</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType xsi:nil="true"/><con:status>0</con:status><con:params/><con:element>data</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType xsi:nil="true"/><con:status>0</con:status><con:params/><con:element>data</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType xsi:nil="true"/><con:status>0</con:status><con:params/><con:element>data</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType xsi:nil="true"/><con:status>0</con:status><con:params/><con:element>data</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType xsi:nil="true"/><con:status>0</con:status><con:params/><con:element>data</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType xsi:nil="true"/><con:status>0</con:status><con:params/><con:element>data</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType xsi:nil="true"/><con:status>0</con:status><con:params/><con:element>data</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType xsi:nil="true"/><con:status>0</con:status><con:params/><con:element>data</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType xsi:nil="true"/><con:status>0</con:status><con:params/><con:element>data</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType xsi:nil="true"/><con:status>0</con:status><con:params/><con:element>data</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType xsi:nil="true"/><con:status>0</con:status><con:params/><con:element>data</con:element></con:representation><con:request name="Request 1" id="8ca9d822-808a-4955-a4e6-5f56ff813fec" mediaType="application/json" postQueryString="false"><con:settings><con:setting id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers">&lt;xml-fragment/></con:setting></con:settings><con:endpoint>http://${#Project#host}</con:endpoint><con:request>{
-    "requestDetails": {
-    "modelInfo": {
-    "modelType": "service",
-    "modelInvariantId": "ff3514e3-5a33-55df-13ab-12abad84e7ff",
-    "modelNameVersionId": "fe6985cd-ea33-3346-ac12-ab121484a3fe",
-    "modelName": "dns-service",
-    "modelVersion": "1.0"
-    },
-    "subscriberInfo": {
-    "globalSubscriberId": "subscriber-1",
-    "subscriberName": "testSubscriber"
-    },
-    "requestInfo": {
-    "instanceName": "DNS_TEST",
-    "source": "VID",
-    "suppressRollback": true
-    },
-    "requestParameters": {
-    "subscriptionServiceType": "MOG",
-    "userParams": [
-    {
-    "name": "someUserParam",
-    "value": "someValue"
-    }
-    ]
-    }
-    }
-    }</con:request><con:originalUri>http://localhost/ecomp/mso/infra/serviceInstances/v2</con:originalUri><con:credentials><con:username>${#Project#user-infraportal}</con:username><con:password>${#Project#password-infraportal}</con:password><con:selectedAuthProfile>Basic</con:selectedAuthProfile><con:addedBasicAuthenticationTypes>Basic</con:addedBasicAuthenticationTypes><con:authType>Global HTTP Settings</con:authType></con:credentials><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:parameters/></con:request></con:method></con:resource><con:resource name="VID Create VFModule" path="/ecomp/mso/infra/serviceInstances/v2/{serviceInstanceId}/vnfs/{vnfInstanceId}/vfModules" id="c1e495bf-9379-48ac-b144-28d7b4be3f4f"><con:settings/><con:parameters><con:parameter><con:name>serviceInstanceId</con:name><con:value/><con:style>TEMPLATE</con:style><con:default/><con:description xsi:nil="true"/></con:parameter><con:parameter><con:name>vnfInstanceId</con:name><con:value/><con:style>TEMPLATE</con:style><con:default/><con:description xsi:nil="true"/></con:parameter></con:parameters><con:method name="create module" id="8d2e021a-3f7c-47a9-adce-c9d3ecb8a282" method="POST"><con:settings/><con:parameters/><con:representation type="REQUEST"><con:mediaType>application/json</con:mediaType><con:params/></con:representation><con:representation type="FAULT"><con:mediaType>text/html;charset=UTF-8</con:mediaType><con:status>401</con:status><con:params/><con:element>html</con:element></con:representation><con:representation type="FAULT"><con:mediaType>application/json</con:mediaType><con:status>400 404 409</con:status><con:params/><con:element xmlns:vfm="http://localhost/ecomp/mso/infra/serviceInstances/v2/3713d5de-942f-41c4-a1b7-08245bc640cc/vnfs/132677e7-8ed2-4a51-9758-9eff2c608d90/vfModules">vfm:Fault</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType>application/json</con:mediaType><con:status>202</con:status><con:params/><con:element xmlns:vfm="http://localhost/ecomp/mso/infra/serviceInstances/v2/3713d5de-942f-41c4-a1b7-08245bc640cc/vnfs/132677e7-8ed2-4a51-9758-9eff2c608d90/vfModules">vfm:Response</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType xsi:nil="true"/><con:status>0</con:status><con:params/><con:element>data</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType xsi:nil="true"/><con:status>0</con:status><con:params/><con:element>data</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType xsi:nil="true"/><con:status>0</con:status><con:params/><con:element>data</con:element></con:representation><con:request name="Request 1" id="f089d62a-371a-4596-81c8-0fd7febdefe1" mediaType="application/json" postQueryString="false"><con:settings><con:setting id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers">&lt;xml-fragment/></con:setting></con:settings><con:endpoint>http://${#Project#host}</con:endpoint><con:request>{ "requestDetails": {
-    "modelInfo": {
-    "modelType": "vfModule",
-    "modelInvariantId": "585822c7-4027-4f84-ba50-e9248606f132",
-    "modelNameVersionId": "fe6478e5-ea33-3346-ac12-ab121484a3fe",
-    "modelName": "VF_RI1_DNS::module-1",
-    "modelVersion": "1.0"
-    },
-    "cloudConfiguration": {
-    "lcpCloudRegionId": "MT",
-    "tenantId": "88a6ca3ee0394ade9403f075db23167e"
-    },
-    "requestInfo": {
-    "instanceName": "VF_RI1_DNS-base-module-1",
-    "source": "VID",
-    "suppressRollback": true
-    },
-    "relatedInstanceList": [
-    {
-    "relatedInstance": {
-    "instanceId": "9f3e7072-4cf2-4536-addb-7eed2fef8f39",
-    "modelInfo": {
-    "modelType": "service",
-    "modelInvariantId": "585822c8-4027-4f84-ba50-e9248606f111",
-    "modelNameVersionId": "1e34774e-715e-4fd6-bd09-7b654622f35i",
-    "modelName": "dns-service",
-    "modelVersion": "1.0"
-    }
-    }
-    }
-
-    ],
-
-
-    "requestParameters": {
-    "userParams": []
-    }
-    }
-    }
-</con:request><con:credentials><con:username>${#Project#user-infraportal}</con:username><con:password>${#Project#user-infraportal}</con:password><con:selectedAuthProfile>Basic</con:selectedAuthProfile><con:addedBasicAuthenticationTypes>Basic</con:addedBasicAuthenticationTypes><con:authType>Global HTTP Settings</con:authType></con:credentials><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:parameters/><con:parameterOrder><con:entry>serviceInstanceId</con:entry><con:entry>vnfInstanceId</con:entry></con:parameterOrder></con:request></con:method></con:resource><con:resource name="VID Create VNF" path="/ecomp/mso/infra/serviceInstances/v2/{serviceInstanceId}/vnfs/" id="cb557811-fc17-45f7-af9b-ea0b2277fb71"><con:settings/><con:parameters><con:parameter><con:name>serviceInstanceId</con:name><con:value>serviceInstanceId</con:value><con:style>TEMPLATE</con:style><con:default>serviceInstanceId</con:default></con:parameter></con:parameters><con:method name="create vnf" id="e6ca32c7-f781-43b9-96e2-acc4fb9573ef" method="POST"><con:settings/><con:parameters/><con:representation type="FAULT"><con:mediaType>application/json</con:mediaType><con:status>502 400 404</con:status><con:params/><con:element xmlns:vnfs="http://localhost/ecomp/mso/infra/serviceInstances/v2/3713d5de-942f-41c4-a1b7-08245bc640cc/vnfs/">vnfs:Fault</con:element></con:representation><con:representation type="REQUEST"><con:mediaType>application/json</con:mediaType><con:params/></con:representation><con:representation type="RESPONSE"><con:mediaType>application/json</con:mediaType><con:status>202</con:status><con:params/><con:element xmlns:vnfs="http://localhost/ecomp/mso/infra/serviceInstances/v2/3713d5de-942f-41c4-a1b7-08245bc640cc/vnfs/">vnfs:Response</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType xsi:nil="true"/><con:status>0</con:status><con:params/><con:element>data</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType xsi:nil="true"/><con:status>0</con:status><con:params/><con:element>data</con:element></con:representation><con:request name="Request 1" id="7f7c8648-43aa-4e16-add0-337b0fa084b4" mediaType="application/json" postQueryString="false"><con:settings><con:setting id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers">&lt;xml-fragment/></con:setting></con:settings><con:endpoint>http://${#Project#host}</con:endpoint><con:request>{
-    "requestDetails": {
-    "modelInfo": {
-    "modelType": "vnf",
-    "modelInvariantId": "ff5256d1-5a33-55df-13ab-12abad84e7ff",
-    "modelNameVersionId": "fe6478e4-ea33-3346-ac12-ab121484a3fe",
-    "modelName": "vSAMP12",
-    "modelVersion": "1.0",
-    "modelCustomizationName": "vSAMP12 1"
-    },
-    "cloudConfiguration": {
-    "lcpCloudRegionId": "mdt1",
-    "tenantId": "88a6ca3ee0394ade9403f075db23167e"
-    },
-    "requestInfo": {
-    "instanceName": "MSOTEST103a",
-    "productFamilyId": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb",
-    "source": "VID",
-    "suppressRollback": false
-    },
-    "relatedInstanceList": [
-    {
-    "relatedInstance": {
-    "instanceId": "${serviceInstanceId}",
-    "modelInfo": {
-    "modelType": "service",
-    "modelInvariantId": "ff3514e3-5a33-55df-13ab-12abad84e7ff",
-    "modelNameVersionId": "fe6985cd-ea33-3346-ac12-ab121484a3fe",
-    "modelName": "{parent service model name}",
-    "modelVersion": "1.0"
-    }
-    }
-    }
-    ],
-    "requestParameters": {
-    }
-    }
-    }
-</con:request><con:credentials><con:username>${#Project#user-infraportal}</con:username><con:password>${#Project#password-infraportal}</con:password><con:selectedAuthProfile>Basic</con:selectedAuthProfile><con:addedBasicAuthenticationTypes>Basic</con:addedBasicAuthenticationTypes><con:authType>Global HTTP Settings</con:authType></con:credentials><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:parameters/></con:request></con:method></con:resource><con:resource name="VID Delete Service" path="/ecomp/mso/infra/serviceInstances/v2/{serviceInstanceId}" id="bd95b87e-b8ce-488e-9d51-373e0ea1ea91"><con:settings/><con:parameters><con:parameter><con:name>serviceInstanceId</con:name><con:value/><con:style>TEMPLATE</con:style><con:default/></con:parameter></con:parameters><con:method name="delete service" id="2fa93fd7-2c2f-481b-981a-9e47d2d2e7ac" method="DELETE"><con:settings/><con:parameters/><con:representation type="REQUEST"><con:mediaType>application/json</con:mediaType><con:params/></con:representation><con:representation type="FAULT"><con:mediaType>application/json</con:mediaType><con:status>400 404</con:status><con:params/><con:element xmlns:v2="http://localhost/ecomp/mso/infra/serviceInstances/v2">v2:Fault</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType>application/json</con:mediaType><con:status>202</con:status><con:params/><con:element xmlns:v2="http://localhost/ecomp/mso/infra/serviceInstances/v2">v2:Response</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType xsi:nil="true"/><con:status>0</con:status><con:params/><con:element>data</con:element></con:representation><con:representation type="FAULT"><con:mediaType>text/html;charset=UTF-8</con:mediaType><con:status>401</con:status><con:params/><con:element>html</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType xsi:nil="true"/><con:status>0</con:status><con:params/><con:element>data</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType xsi:nil="true"/><con:status>0</con:status><con:params/><con:element>data</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType xsi:nil="true"/><con:status>0</con:status><con:params/><con:element>data</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType xsi:nil="true"/><con:status>0</con:status><con:params/><con:element>data</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType xsi:nil="true"/><con:status>0</con:status><con:params/><con:element>data</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType xsi:nil="true"/><con:status>0</con:status><con:params/><con:element>data</con:element></con:representation><con:request name="Request 1" id="8ca9d822-808a-4955-a4e6-5f56ff813fec" mediaType="application/json" postQueryString="false"><con:settings><con:setting id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers">&lt;xml-fragment/></con:setting></con:settings><con:endpoint>http://${#Project#host}</con:endpoint><con:request>{
-    "requestDetails": {
-    "modelInfo": {
-    "modelType": "service",
-    "modelInvariantId": "ff3514e3-5a33-55df-13ab-12abad84e7ff",
-    "modelNameVersionId": "fe6985cd-ea33-3346-ac12-ab121484a3fe",
-    "modelName": "dns-service",
-    "modelVersion": "1.0"
-    },
-    "subscriberInfo": {
-    "globalSubscriberId": "subscriber-1",
-    "subscriberName": "testSubscriber"
-    },
-    "requestInfo": {
-    "instanceName": "DNS_TEST",
-    "source": "VID",
-    "suppressRollback": true
-    },
-    "requestParameters": {
-    "subscriptionServiceType": "MOG",
-    "userParams": [
-    {
-    "name": "someUserParam",
-    "value": "someValue"
-    }
-    ]
-    }
-    }
-    }</con:request><con:originalUri>http://localhost/ecomp/mso/infra/serviceInstances/v2</con:originalUri><con:credentials><con:username>${#Project#user-infraportal}</con:username><con:password>${#Project#password-infraportal}</con:password><con:selectedAuthProfile>Basic</con:selectedAuthProfile><con:addedBasicAuthenticationTypes>Basic</con:addedBasicAuthenticationTypes><con:authType>Global HTTP Settings</con:authType></con:credentials><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:parameters><entry key="serviceInstanceId" value="" xmlns="http://eviware.com/soapui/config"/></con:parameters><con:parameterOrder><con:entry>serviceInstanceId</con:entry></con:parameterOrder></con:request></con:method></con:resource><con:resource name="VID Delete VFModule" path="/ecomp/mso/infra/serviceInstances/v2/{serviceInstanceId}/vnfs/{vnfInstanceId}/vfModules/{vfModuleInstanceId}" id="c1e495bf-9379-48ac-b144-28d7b4be3f4f"><con:settings/><con:parameters><con:parameter><con:name>serviceInstanceId</con:name><con:value/><con:style>TEMPLATE</con:style><con:default/><con:description xsi:nil="true"/></con:parameter><con:parameter><con:name>vnfInstanceId</con:name><con:value/><con:style>TEMPLATE</con:style><con:default/><con:description xsi:nil="true"/></con:parameter><con:parameter><con:name>vfModuleInstanceId</con:name><con:style>TEMPLATE</con:style></con:parameter></con:parameters><con:method name="delete module" id="8d2e021a-3f7c-47a9-adce-c9d3ecb8a282" method="DELETE"><con:settings/><con:parameters/><con:representation type="REQUEST"><con:mediaType>application/json</con:mediaType><con:params/></con:representation><con:representation type="FAULT"><con:mediaType>text/html;charset=UTF-8</con:mediaType><con:status>401</con:status><con:params/><con:element>html</con:element></con:representation><con:representation type="FAULT"><con:mediaType>application/json</con:mediaType><con:status>400 404 409</con:status><con:params/><con:element xmlns:vfm="http://localhost/ecomp/mso/infra/serviceInstances/v2/3713d5de-942f-41c4-a1b7-08245bc640cc/vnfs/132677e7-8ed2-4a51-9758-9eff2c608d90/vfModules">vfm:Fault</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType>application/json</con:mediaType><con:status>202</con:status><con:params/><con:element xmlns:vfm="http://localhost/ecomp/mso/infra/serviceInstances/v2/3713d5de-942f-41c4-a1b7-08245bc640cc/vnfs/132677e7-8ed2-4a51-9758-9eff2c608d90/vfModules">vfm:Response</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType xsi:nil="true"/><con:status>0</con:status><con:params/><con:element>data</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType xsi:nil="true"/><con:status>0</con:status><con:params/><con:element>data</con:element></con:representation><con:representation type="FAULT"><con:mediaType xsi:nil="true"/><con:status>404</con:status><con:params/><con:element>data</con:element></con:representation><con:request name="Request 1" id="f089d62a-371a-4596-81c8-0fd7febdefe1" mediaType="application/json" postQueryString="false"><con:settings><con:setting id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers">&lt;xml-fragment/></con:setting></con:settings><con:endpoint>http://${#Project#host}</con:endpoint><con:request>{ "requestDetails": {
-    "modelInfo": {
-    "modelType": "vfModule",
-    "modelInvariantId": "585822c7-4027-4f84-ba50-e9248606f132",
-    "modelNameVersionId": "fe6478e5-ea33-3346-ac12-ab121484a3fe",
-    "modelName": "VF_RI1_DNS::module-1",
-    "modelVersion": "1.0"
-    },
-    "cloudConfiguration": {
-    "lcpCloudRegionId": "MT",
-    "tenantId": "88a6ca3ee0394ade9403f075db23167e"
-    },
-    "requestInfo": {
-    "instanceName": "VF_RI1_DNS-base-module-1",
-    "source": "VID",
-    "suppressRollback": true
-    },
-    "relatedInstanceList": [
-    {
-    "relatedInstance": {
-    "instanceId": "9f3e7072-4cf2-4536-addb-7eed2fef8f39",
-    "modelInfo": {
-    "modelType": "service",
-    "modelInvariantId": "585822c8-4027-4f84-ba50-e9248606f111",
-    "modelNameVersionId": "1e34774e-715e-4fd6-bd09-7b654622f35i",
-    "modelName": "dns-service",
-    "modelVersion": "1.0"
-    }
-    }
-    }
-
-    ],
-
-
-    "requestParameters": {
-    "userParams": []
-    }
-    }
-    }
-</con:request><con:credentials><con:username>${#Project#user-infraportal}</con:username><con:password>${#Project#user-infraportal}</con:password><con:selectedAuthProfile>Basic</con:selectedAuthProfile><con:addedBasicAuthenticationTypes>Basic</con:addedBasicAuthenticationTypes><con:authType>Global HTTP Settings</con:authType></con:credentials><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:parameters/><con:parameterOrder><con:entry>serviceInstanceId</con:entry><con:entry>vnfInstanceId</con:entry><con:entry>vfModuleInstanceId</con:entry></con:parameterOrder></con:request></con:method></con:resource><con:resource name="VID Update VFModule" path="/ecomp/mso/infra/serviceInstances/v2/{serviceInstanceId}/vnfs/{vnfInstanceId}/vfModules/{vfModuleInstanceId}" id="c1e495bf-9379-48ac-b144-28d7b4be3f4f"><con:settings/><con:parameters><con:parameter><con:name>serviceInstanceId</con:name><con:value/><con:style>TEMPLATE</con:style><con:default/><con:description xsi:nil="true"/></con:parameter><con:parameter><con:name>vnfInstanceId</con:name><con:value/><con:style>TEMPLATE</con:style><con:default/><con:description xsi:nil="true"/></con:parameter><con:parameter><con:name>vfModuleInstanceId</con:name><con:style>TEMPLATE</con:style></con:parameter></con:parameters><con:method name="update module" id="8d2e021a-3f7c-47a9-adce-c9d3ecb8a282" method="PUT"><con:settings/><con:parameters/><con:representation type="REQUEST"><con:mediaType>application/json</con:mediaType><con:params/></con:representation><con:representation type="FAULT"><con:mediaType>text/html;charset=UTF-8</con:mediaType><con:status>401</con:status><con:params/><con:element>html</con:element></con:representation><con:representation type="FAULT"><con:mediaType>application/json</con:mediaType><con:status>400 404 409</con:status><con:params/><con:element xmlns:vfm="http://localhost/ecomp/mso/infra/serviceInstances/v2/3713d5de-942f-41c4-a1b7-08245bc640cc/vnfs/132677e7-8ed2-4a51-9758-9eff2c608d90/vfModules">vfm:Fault</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType>application/json</con:mediaType><con:status>202</con:status><con:params/><con:element xmlns:vfm="http://localhost/ecomp/mso/infra/serviceInstances/v2/3713d5de-942f-41c4-a1b7-08245bc640cc/vnfs/132677e7-8ed2-4a51-9758-9eff2c608d90/vfModules">vfm:Response</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType xsi:nil="true"/><con:status>0</con:status><con:params/><con:element>data</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType xsi:nil="true"/><con:status>0</con:status><con:params/><con:element>data</con:element></con:representation><con:representation type="FAULT"><con:mediaType xsi:nil="true"/><con:status>404</con:status><con:params/><con:element>data</con:element></con:representation><con:request name="Request 1" id="f089d62a-371a-4596-81c8-0fd7febdefe1" mediaType="application/json" postQueryString="false"><con:settings><con:setting id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers">&lt;xml-fragment/></con:setting></con:settings><con:endpoint>http://${#Project#host}</con:endpoint><con:request>{ "requestDetails": {
-    "modelInfo": {
-    "modelType": "vfModule",
-    "modelInvariantId": "585822c7-4027-4f84-ba50-e9248606f132",
-    "modelNameVersionId": "fe6478e5-ea33-3346-ac12-ab121484a3fe",
-    "modelName": "VF_RI1_DNS::module-1",
-    "modelVersion": "1.0"
-    },
-    "cloudConfiguration": {
-    "lcpCloudRegionId": "MT",
-    "tenantId": "88a6ca3ee0394ade9403f075db23167e"
-    },
-    "requestInfo": {
-    "instanceName": "VF_RI1_DNS-base-module-1",
-    "source": "VID",
-    "suppressRollback": true
-    },
-    "relatedInstanceList": [
-    {
-    "relatedInstance": {
-    "instanceId": "9f3e7072-4cf2-4536-addb-7eed2fef8f39",
-    "modelInfo": {
-    "modelType": "service",
-    "modelInvariantId": "585822c8-4027-4f84-ba50-e9248606f111",
-    "modelNameVersionId": "1e34774e-715e-4fd6-bd09-7b654622f35i",
-    "modelName": "dns-service",
-    "modelVersion": "1.0"
-    }
-    }
-    }
-
-    ],
-
-
-    "requestParameters": {
-    "userParams": []
-    }
-    }
-    }
-</con:request><con:credentials><con:username>${#Project#user-infraportal}</con:username><con:password>${#Project#user-infraportal}</con:password><con:selectedAuthProfile>Basic</con:selectedAuthProfile><con:addedBasicAuthenticationTypes>Basic</con:addedBasicAuthenticationTypes><con:authType>Global HTTP Settings</con:authType></con:credentials><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:parameters/><con:parameterOrder><con:entry>serviceInstanceId</con:entry><con:entry>vnfInstanceId</con:entry><con:entry>vfModuleInstanceId</con:entry></con:parameterOrder></con:request></con:method></con:resource><con:resource name="VID Delete VNF" path="/ecomp/mso/infra/serviceInstances/v2/{serviceInstanceId}/vnfs/{vnfInstanceId}" id="cb557811-fc17-45f7-af9b-ea0b2277fb71"><con:settings/><con:parameters><con:parameter><con:name>serviceInstanceId</con:name><con:value>serviceInstanceId</con:value><con:style>TEMPLATE</con:style><con:default>serviceInstanceId</con:default></con:parameter><con:parameter><con:name>vnfInstanceId</con:name><con:value/><con:style>TEMPLATE</con:style><con:default/></con:parameter></con:parameters><con:method name="delete vnf" id="e6ca32c7-f781-43b9-96e2-acc4fb9573ef" method="DELETE"><con:settings/><con:parameters/><con:representation type="FAULT"><con:mediaType>application/json</con:mediaType><con:status>502 400 409</con:status><con:params/><con:element xmlns:vnfs="http://localhost/ecomp/mso/infra/serviceInstances/v2/3713d5de-942f-41c4-a1b7-08245bc640cc/vnfs/">vnfs:Fault</con:element></con:representation><con:representation type="REQUEST"><con:mediaType>application/json</con:mediaType><con:params/></con:representation><con:representation type="RESPONSE"><con:mediaType>application/json</con:mediaType><con:status>202</con:status><con:params/><con:element xmlns:vnfs="http://localhost/ecomp/mso/infra/serviceInstances/v2/3713d5de-942f-41c4-a1b7-08245bc640cc/vnfs/">vnfs:Response</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType xsi:nil="true"/><con:status>0</con:status><con:params/><con:element>data</con:element></con:representation><con:request name="Request 1" id="7f7c8648-43aa-4e16-add0-337b0fa084b4" mediaType="application/json" postQueryString="false"><con:settings><con:setting id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers">&lt;xml-fragment/></con:setting></con:settings><con:endpoint>http://${#Project#host}</con:endpoint><con:request>{
-    "requestDetails": {
-    "modelInfo": {
-    "modelType": "vnf",
-    "modelInvariantId": "ff5256d1-5a33-55df-13ab-12abad84e7ff",
-    "modelNameVersionId": "fe6478e4-ea33-3346-ac12-ab121484a3fe",
-    "modelName": "vSAMP12",
-    "modelVersion": "1.0",
-    "modelCustomizationName": "vSAMP12 1"
-    },
-    "cloudConfiguration": {
-    "lcpCloudRegionId": "mdt1",
-    "tenantId": "88a6ca3ee0394ade9403f075db23167e"
-    },
-    "requestInfo": {
-    "instanceName": "MSOTEST103a",
-    "productFamilyId": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb",
-    "source": "VID",
-    "suppressRollback": false
-    },
-    "relatedInstanceList": [
-    {
-    "relatedInstance": {
-    "instanceId": "${serviceInstanceId}",
-    "modelInfo": {
-    "modelType": "service",
-    "modelInvariantId": "ff3514e3-5a33-55df-13ab-12abad84e7ff",
-    "modelNameVersionId": "fe6985cd-ea33-3346-ac12-ab121484a3fe",
-    "modelName": "{parent service model name}",
-    "modelVersion": "1.0"
-    }
-    }
-    }
-    ],
-    "requestParameters": {
-    }
-    }
-    }
-</con:request><con:credentials><con:username>${#Project#user-infraportal}</con:username><con:password>${#Project#password-infraportal}</con:password><con:selectedAuthProfile>Basic</con:selectedAuthProfile><con:addedBasicAuthenticationTypes>Basic</con:addedBasicAuthenticationTypes><con:authType>Global HTTP Settings</con:authType></con:credentials><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:parameters><entry key="vnfInstanceId" value="" xmlns="http://eviware.com/soapui/config"/></con:parameters><con:parameterOrder><con:entry>serviceInstanceId</con:entry><con:entry>vnfInstanceId</con:entry></con:parameterOrder></con:request></con:method></con:resource><con:resource name="VID Create VolumeGroups" path="/ecomp/mso/infra/serviceInstances/v2/{serviceInstanceId}/vnfs/{vnfInstanceId}/volumeGroups" id="c1e495bf-9379-48ac-b144-28d7b4be3f4f"><con:settings/><con:parameters><con:parameter><con:name>serviceInstanceId</con:name><con:value/><con:style>TEMPLATE</con:style><con:default/><con:description xsi:nil="true"/></con:parameter><con:parameter><con:name>vnfInstanceId</con:name><con:value/><con:style>TEMPLATE</con:style><con:default/><con:description xsi:nil="true"/></con:parameter></con:parameters><con:method name="create volumeGroups" id="8d2e021a-3f7c-47a9-adce-c9d3ecb8a282" method="POST"><con:settings/><con:parameters/><con:representation type="REQUEST"><con:mediaType>application/json</con:mediaType><con:params/></con:representation><con:representation type="FAULT"><con:mediaType>text/html;charset=UTF-8</con:mediaType><con:status>401</con:status><con:params/><con:element>html</con:element></con:representation><con:representation type="FAULT"><con:mediaType>application/json</con:mediaType><con:status>400 404 409 501</con:status><con:params/><con:element xmlns:vfm="http://localhost/ecomp/mso/infra/serviceInstances/v2/3713d5de-942f-41c4-a1b7-08245bc640cc/vnfs/132677e7-8ed2-4a51-9758-9eff2c608d90/vfModules">vfm:Fault</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType>application/json</con:mediaType><con:status>202</con:status><con:params/><con:element xmlns:vfm="http://localhost/ecomp/mso/infra/serviceInstances/v2/3713d5de-942f-41c4-a1b7-08245bc640cc/vnfs/132677e7-8ed2-4a51-9758-9eff2c608d90/vfModules">vfm:Response</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType xsi:nil="true"/><con:status>0</con:status><con:params/><con:element>data</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType xsi:nil="true"/><con:status>0</con:status><con:params/><con:element>data</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType xsi:nil="true"/><con:status>0</con:status><con:params/><con:element>data</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType xsi:nil="true"/><con:status>0</con:status><con:params/><con:element>data</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType xsi:nil="true"/><con:status>0</con:status><con:params/><con:element>data</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType xsi:nil="true"/><con:status>0</con:status><con:params/><con:element>data</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType xsi:nil="true"/><con:status>0</con:status><con:params/><con:element>data</con:element></con:representation><con:request name="Request 1" id="f089d62a-371a-4596-81c8-0fd7febdefe1" mediaType="application/json" postQueryString="false"><con:settings><con:setting id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers">&lt;xml-fragment/></con:setting></con:settings><con:endpoint>http://${#Project#host}</con:endpoint><con:request>{ "requestDetails": {
-    "modelInfo": {
-    "modelType": "vfModule",
-    "modelInvariantId": "585822c7-4027-4f84-ba50-e9248606f132",
-    "modelNameVersionId": "fe6478e5-ea33-3346-ac12-ab121484a3fe",
-    "modelName": "VF_RI1_DNS::module-1",
-    "modelVersion": "1.0"
-    },
-    "cloudConfiguration": {
-    "lcpCloudRegionId": "MT",
-    "tenantId": "88a6ca3ee0394ade9403f075db23167e"
-    },
-    "requestInfo": {
-    "instanceName": "VF_RI1_DNS-base-module-1",
-    "source": "VID",
-    "suppressRollback": true
-    },
-    "relatedInstanceList": [
-    {
-    "relatedInstance": {
-    "instanceId": "9f3e7072-4cf2-4536-addb-7eed2fef8f39",
-    "modelInfo": {
-    "modelType": "service",
-    "modelInvariantId": "585822c8-4027-4f84-ba50-e9248606f111",
-    "modelNameVersionId": "1e34774e-715e-4fd6-bd09-7b654622f35i",
-    "modelName": "dns-service",
-    "modelVersion": "1.0"
-    }
-    }
-    }
-
-    ],
-
-
-    "requestParameters": {
-    "userParams": []
-    }
-    }
-    }
-</con:request><con:credentials><con:username>${#Project#user-infraportal}</con:username><con:password>${#Project#user-infraportal}</con:password><con:selectedAuthProfile>Basic</con:selectedAuthProfile><con:addedBasicAuthenticationTypes>Basic</con:addedBasicAuthenticationTypes><con:authType>Global HTTP Settings</con:authType></con:credentials><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:parameters/><con:parameterOrder><con:entry>serviceInstanceId</con:entry><con:entry>vnfInstanceId</con:entry></con:parameterOrder></con:request></con:method></con:resource><con:resource name="VID Update VolumeGroups" path="/ecomp/mso/infra/serviceInstances/v2/{serviceInstanceId}/vnfs/{vnfInstanceId}/volumeGroups/{volumeGroupInstanceId}" id="c1e495bf-9379-48ac-b144-28d7b4be3f4f"><con:settings/><con:parameters><con:parameter><con:name>serviceInstanceId</con:name><con:value/><con:style>TEMPLATE</con:style><con:default/><con:description xsi:nil="true"/></con:parameter><con:parameter><con:name>vnfInstanceId</con:name><con:value/><con:style>TEMPLATE</con:style><con:default/><con:description xsi:nil="true"/></con:parameter><con:parameter><con:name>volumeGroupInstanceId</con:name><con:style>TEMPLATE</con:style></con:parameter></con:parameters><con:method name="update volumeGroups" id="8d2e021a-3f7c-47a9-adce-c9d3ecb8a282" method="PUT"><con:settings/><con:parameters/><con:representation type="REQUEST"><con:mediaType>application/json</con:mediaType><con:params/></con:representation><con:representation type="FAULT"><con:mediaType>text/html;charset=UTF-8</con:mediaType><con:status>401</con:status><con:params/><con:element>html</con:element></con:representation><con:representation type="FAULT"><con:mediaType>application/json</con:mediaType><con:status>400 404 409</con:status><con:params/><con:element xmlns:vfm="http://localhost/ecomp/mso/infra/serviceInstances/v2/3713d5de-942f-41c4-a1b7-08245bc640cc/vnfs/132677e7-8ed2-4a51-9758-9eff2c608d90/vfModules">vfm:Fault</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType>application/json</con:mediaType><con:status>202</con:status><con:params/><con:element xmlns:vfm="http://localhost/ecomp/mso/infra/serviceInstances/v2/3713d5de-942f-41c4-a1b7-08245bc640cc/vnfs/132677e7-8ed2-4a51-9758-9eff2c608d90/vfModules">vfm:Response</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType xsi:nil="true"/><con:status>0</con:status><con:params/><con:element>data</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType xsi:nil="true"/><con:status>0</con:status><con:params/><con:element>data</con:element></con:representation><con:representation type="FAULT"><con:mediaType xsi:nil="true"/><con:status>404</con:status><con:params/><con:element>data</con:element></con:representation><con:representation type="FAULT"><con:mediaType xsi:nil="true"/><con:status>405</con:status><con:params/><con:element>data</con:element></con:representation><con:representation type="FAULT"><con:mediaType xsi:nil="true"/><con:status>405</con:status><con:params/><con:element>data</con:element></con:representation><con:representation type="FAULT"><con:mediaType xsi:nil="true"/><con:status>405</con:status><con:params/><con:element>data</con:element></con:representation><con:representation type="FAULT"><con:mediaType xsi:nil="true"/><con:status>405</con:status><con:params/><con:element>data</con:element></con:representation><con:request name="Request 1" id="f089d62a-371a-4596-81c8-0fd7febdefe1" mediaType="application/json" postQueryString="false"><con:settings><con:setting id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers">&lt;xml-fragment/></con:setting></con:settings><con:endpoint>http://${#Project#host}</con:endpoint><con:request>{ "requestDetails": {
-    "modelInfo": {
-    "modelType": "vfModule",
-    "modelInvariantId": "585822c7-4027-4f84-ba50-e9248606f132",
-    "modelNameVersionId": "fe6478e5-ea33-3346-ac12-ab121484a3fe",
-    "modelName": "VF_RI1_DNS::module-1",
-    "modelVersion": "1.0"
-    },
-    "cloudConfiguration": {
-    "lcpCloudRegionId": "MT",
-    "tenantId": "88a6ca3ee0394ade9403f075db23167e"
-    },
-    "requestInfo": {
-    "instanceName": "VF_RI1_DNS-base-module-1",
-    "source": "VID",
-    "suppressRollback": true
-    },
-    "relatedInstanceList": [
-    {
-    "relatedInstance": {
-    "instanceId": "9f3e7072-4cf2-4536-addb-7eed2fef8f39",
-    "modelInfo": {
-    "modelType": "service",
-    "modelInvariantId": "585822c8-4027-4f84-ba50-e9248606f111",
-    "modelNameVersionId": "1e34774e-715e-4fd6-bd09-7b654622f35i",
-    "modelName": "dns-service",
-    "modelVersion": "1.0"
-    }
-    }
-    }
-
-    ],
-
-
-    "requestParameters": {
-    "userParams": []
-    }
-    }
-    }
-</con:request><con:credentials><con:username>${#Project#user-infraportal}</con:username><con:password>${#Project#user-infraportal}</con:password><con:selectedAuthProfile>Basic</con:selectedAuthProfile><con:addedBasicAuthenticationTypes>Basic</con:addedBasicAuthenticationTypes><con:authType>Global HTTP Settings</con:authType></con:credentials><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:parameters/><con:parameterOrder><con:entry>serviceInstanceId</con:entry><con:entry>vnfInstanceId</con:entry><con:entry>volumeGroupInstanceId</con:entry></con:parameterOrder></con:request></con:method></con:resource><con:resource name="VID Delete VolumeGroups" path="/ecomp/mso/infra/serviceInstances/v2/{serviceInstanceId}/vnfs/{vnfInstanceId}/volumeGroups/{volumeGroupInstanceId}" id="c1e495bf-9379-48ac-b144-28d7b4be3f4f"><con:settings/><con:parameters><con:parameter><con:name>serviceInstanceId</con:name><con:value/><con:style>TEMPLATE</con:style><con:default/><con:description xsi:nil="true"/></con:parameter><con:parameter><con:name>vnfInstanceId</con:name><con:value/><con:style>TEMPLATE</con:style><con:default/><con:description xsi:nil="true"/></con:parameter><con:parameter><con:name>volumeGroupInstanceId</con:name><con:style>TEMPLATE</con:style></con:parameter></con:parameters><con:method name="delete volumeGroups" id="8d2e021a-3f7c-47a9-adce-c9d3ecb8a282" method="DELETE"><con:settings/><con:parameters/><con:representation type="REQUEST"><con:mediaType>application/json</con:mediaType><con:params/></con:representation><con:representation type="FAULT"><con:mediaType>text/html;charset=UTF-8</con:mediaType><con:status>401</con:status><con:params/><con:element>html</con:element></con:representation><con:representation type="FAULT"><con:mediaType>application/json</con:mediaType><con:status>400 404 409</con:status><con:params/><con:element xmlns:vfm="http://localhost/ecomp/mso/infra/serviceInstances/v2/3713d5de-942f-41c4-a1b7-08245bc640cc/vnfs/132677e7-8ed2-4a51-9758-9eff2c608d90/vfModules">vfm:Fault</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType>application/json</con:mediaType><con:status>202</con:status><con:params/><con:element xmlns:vfm="http://localhost/ecomp/mso/infra/serviceInstances/v2/3713d5de-942f-41c4-a1b7-08245bc640cc/vnfs/132677e7-8ed2-4a51-9758-9eff2c608d90/vfModules">vfm:Response</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType xsi:nil="true"/><con:status>0</con:status><con:params/><con:element>data</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType xsi:nil="true"/><con:status>0</con:status><con:params/><con:element>data</con:element></con:representation><con:representation type="FAULT"><con:mediaType xsi:nil="true"/><con:status>404</con:status><con:params/><con:element>data</con:element></con:representation><con:request name="Request 1" id="f089d62a-371a-4596-81c8-0fd7febdefe1" mediaType="application/json" postQueryString="false"><con:settings><con:setting id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers">&lt;xml-fragment/></con:setting></con:settings><con:endpoint>http://${#Project#host}</con:endpoint><con:request>{ "requestDetails": {
-    "modelInfo": {
-    "modelType": "vfModule",
-    "modelInvariantId": "585822c7-4027-4f84-ba50-e9248606f132",
-    "modelNameVersionId": "fe6478e5-ea33-3346-ac12-ab121484a3fe",
-    "modelName": "VF_RI1_DNS::module-1",
-    "modelVersion": "1.0"
-    },
-    "cloudConfiguration": {
-    "lcpCloudRegionId": "MT",
-    "tenantId": "88a6ca3ee0394ade9403f075db23167e"
-    },
-    "requestInfo": {
-    "instanceName": "VF_RI1_DNS-base-module-1",
-    "source": "VID",
-    "suppressRollback": true
-    },
-    "relatedInstanceList": [
-    {
-    "relatedInstance": {
-    "instanceId": "9f3e7072-4cf2-4536-addb-7eed2fef8f39",
-    "modelInfo": {
-    "modelType": "service",
-    "modelInvariantId": "585822c8-4027-4f84-ba50-e9248606f111",
-    "modelNameVersionId": "1e34774e-715e-4fd6-bd09-7b654622f35i",
-    "modelName": "dns-service",
-    "modelVersion": "1.0"
-    }
-    }
-    }
-
-    ],
-
-
-    "requestParameters": {
-    "userParams": []
-    }
-    }
-    }
-</con:request><con:credentials><con:username>${#Project#user-infraportal}</con:username><con:password>${#Project#user-infraportal}</con:password><con:selectedAuthProfile>Basic</con:selectedAuthProfile><con:addedBasicAuthenticationTypes>Basic</con:addedBasicAuthenticationTypes><con:authType>Global HTTP Settings</con:authType></con:credentials><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:parameters/><con:parameterOrder><con:entry>serviceInstanceId</con:entry><con:entry>vnfInstanceId</con:entry><con:entry>volumeGroupInstanceId</con:entry></con:parameterOrder></con:request></con:method></con:resource><con:resource name="VID Create Networks" path="/ecomp/mso/infra/serviceInstances/v2/{serviceInstanceId}/networks" id="cb557811-fc17-45f7-af9b-ea0b2277fb71"><con:settings/><con:parameters><con:parameter><con:name>serviceInstanceId</con:name><con:value>serviceInstanceId</con:value><con:style>TEMPLATE</con:style><con:default>serviceInstanceId</con:default></con:parameter></con:parameters><con:method name="create networks" id="e6ca32c7-f781-43b9-96e2-acc4fb9573ef" method="POST"><con:settings/><con:parameters/><con:representation type="FAULT"><con:mediaType>application/json</con:mediaType><con:status>502 400 404</con:status><con:params/><con:element xmlns:vnfs="http://localhost/ecomp/mso/infra/serviceInstances/v2/3713d5de-942f-41c4-a1b7-08245bc640cc/vnfs/">vnfs:Fault</con:element></con:representation><con:representation type="REQUEST"><con:mediaType>application/json</con:mediaType><con:params/></con:representation><con:representation type="RESPONSE"><con:mediaType>application/json</con:mediaType><con:status>202</con:status><con:params/><con:element xmlns:vnfs="http://localhostecomp/mso/infra/serviceInstances/v2/3713d5de-942f-41c4-a1b7-08245bc640cc/vnfs/">vnfs:Response</con:element></con:representation><con:representation type="FAULT"><con:mediaType>text/html;charset=UTF-8</con:mediaType><con:status>401</con:status><con:params/><con:element>html</con:element></con:representation><con:representation type="FAULT"><con:mediaType xsi:nil="true"/><con:status>415</con:status><con:params/><con:element>data</con:element></con:representation><con:representation type="REQUEST"><con:mediaType>application/xml</con:mediaType><con:params/><con:element xmlns:v1="http://org.openecomp/mso/infra/vnf-request/v1">v1:network-request</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType xsi:nil="true"/><con:status>0</con:status><con:params/><con:element>data</con:element></con:representation><con:request name="Request 1" id="7f7c8648-43aa-4e16-add0-337b0fa084b4" mediaType="application/json" postQueryString="false"><con:settings><con:setting id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers">&lt;xml-fragment/></con:setting></con:settings><con:endpoint>http://${#Project#host}</con:endpoint><con:request>{
-    "requestDetails": {
-    "modelInfo": {
-    "modelType": "vnf",
-    "modelInvariantId": "ff5256d1-5a33-55df-13ab-12abad84e7ff",
-    "modelNameVersionId": "fe6478e4-ea33-3346-ac12-ab121484a3fe",
-    "modelName": "vSAMP12",
-    "modelVersion": "1.0",
-    "modelCustomizationName": "vSAMP12 1"
-    },
-    "cloudConfiguration": {
-    "lcpCloudRegionId": "mdt1",
-    "tenantId": "88a6ca3ee0394ade9403f075db23167e"
-    },
-    "requestInfo": {
-    "instanceName": "MSOTEST103a",
-    "productFamilyId": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb",
-    "source": "VID",
-    "suppressRollback": false
-    },
-    "relatedInstanceList": [
-    {
-    "relatedInstance": {
-    "instanceId": "${serviceInstanceId}",
-    "modelInfo": {
-    "modelType": "service",
-    "modelInvariantId": "ff3514e3-5a33-55df-13ab-12abad84e7ff",
-    "modelNameVersionId": "fe6985cd-ea33-3346-ac12-ab121484a3fe",
-    "modelName": "{parent service model name}",
-    "modelVersion": "1.0"
-    }
-    }
-    }
-    ],
-    "requestParameters": {
-    }
-    }
-    }
-</con:request><con:credentials><con:username>${#Project#user-infraportal}</con:username><con:password>${#Project#password-infraportal}</con:password><con:selectedAuthProfile>Basic</con:selectedAuthProfile><con:addedBasicAuthenticationTypes>Basic</con:addedBasicAuthenticationTypes><con:authType>Global HTTP Settings</con:authType></con:credentials><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:parameters/></con:request></con:method></con:resource><con:resource name="VID Delete Networks" path="/ecomp/mso/infra/serviceInstances/v2/{serviceInstanceId}/networks/{networkInstanceId}" id="cb557811-fc17-45f7-af9b-ea0b2277fb71"><con:settings/><con:parameters><con:parameter><con:name>serviceInstanceId</con:name><con:value>serviceInstanceId</con:value><con:style>TEMPLATE</con:style><con:default>serviceInstanceId</con:default></con:parameter><con:parameter><con:name>networkInstanceId</con:name><con:style>TEMPLATE</con:style></con:parameter></con:parameters><con:method name="delete networks" id="e6ca32c7-f781-43b9-96e2-acc4fb9573ef" method="DELETE"><con:settings/><con:parameters/><con:representation type="FAULT"><con:mediaType>application/json</con:mediaType><con:status>502 400</con:status><con:params/><con:element xmlns:vnfs="http://localhost/ecomp/mso/infra/serviceInstances/v2/3713d5de-942f-41c4-a1b7-08245bc640cc/vnfs/">vnfs:Fault</con:element></con:representation><con:representation type="REQUEST"><con:mediaType>application/json</con:mediaType><con:params/></con:representation><con:representation type="RESPONSE"><con:mediaType>application/json</con:mediaType><con:status>202</con:status><con:params/><con:element xmlns:vnfs="http://localhost/ecomp/mso/infra/serviceInstances/v2/3713d5de-942f-41c4-a1b7-08245bc640cc/vnfs/">vnfs:Response</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType xsi:nil="true"/><con:status>0</con:status><con:params/><con:element>data</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType xsi:nil="true"/><con:status>0</con:status><con:params/><con:element>data</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType xsi:nil="true"/><con:status>0</con:status><con:params/><con:element>data</con:element></con:representation><con:request name="Request 1" id="7f7c8648-43aa-4e16-add0-337b0fa084b4" mediaType="application/json" postQueryString="false"><con:settings><con:setting id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers">&lt;xml-fragment/></con:setting></con:settings><con:endpoint>http://${#Project#host}</con:endpoint><con:request>{
-    "requestDetails": {
-    "modelInfo": {
-    "modelType": "vnf",
-    "modelInvariantId": "ff5256d1-5a33-55df-13ab-12abad84e7ff",
-    "modelNameVersionId": "fe6478e4-ea33-3346-ac12-ab121484a3fe",
-    "modelName": "vSAMP12",
-    "modelVersion": "1.0",
-    "modelCustomizationName": "vSAMP12 1"
-    },
-    "cloudConfiguration": {
-    "lcpCloudRegionId": "mdt1",
-    "tenantId": "88a6ca3ee0394ade9403f075db23167e"
-    },
-    "requestInfo": {
-    "instanceName": "MSOTEST103a",
-    "productFamilyId": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb",
-    "source": "VID",
-    "suppressRollback": false
-    },
-    "relatedInstanceList": [
-    {
-    "relatedInstance": {
-    "instanceId": "${serviceInstanceId}",
-    "modelInfo": {
-    "modelType": "service",
-    "modelInvariantId": "ff3514e3-5a33-55df-13ab-12abad84e7ff",
-    "modelNameVersionId": "fe6985cd-ea33-3346-ac12-ab121484a3fe",
-    "modelName": "{parent service model name}",
-    "modelVersion": "1.0"
-    }
-    }
-    }
-    ],
-    "requestParameters": {
-    }
-    }
-    }
-</con:request><con:credentials><con:username>${#Project#user-infraportal}</con:username><con:password>${#Project#password-infraportal}</con:password><con:selectedAuthProfile>Basic</con:selectedAuthProfile><con:addedBasicAuthenticationTypes>Basic</con:addedBasicAuthenticationTypes><con:authType>Global HTTP Settings</con:authType></con:credentials><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:parameters/><con:parameterOrder><con:entry>serviceInstanceId</con:entry><con:entry>networkInstanceId</con:entry></con:parameterOrder></con:request></con:method></con:resource><con:resource name="VID Update Networks" path="/ecomp/mso/infra/serviceInstances/v2/{serviceInstanceId}/networks/{networkInstanceId}" id="cb557811-fc17-45f7-af9b-ea0b2277fb71"><con:settings/><con:parameters><con:parameter><con:name>serviceInstanceId</con:name><con:value>serviceInstanceId</con:value><con:style>TEMPLATE</con:style><con:default>serviceInstanceId</con:default></con:parameter><con:parameter><con:name>networkInstanceId</con:name><con:style>TEMPLATE</con:style></con:parameter></con:parameters><con:method name="update networks" id="e6ca32c7-f781-43b9-96e2-acc4fb9573ef" method="PUT"><con:settings/><con:parameters/><con:representation type="FAULT"><con:mediaType>application/json</con:mediaType><con:status>502 400</con:status><con:params/><con:element xmlns:vnfs="http://localhost/ecomp/mso/infra/serviceInstances/v2/3713d5de-942f-41c4-a1b7-08245bc640cc/vnfs/">vnfs:Fault</con:element></con:representation><con:representation type="REQUEST"><con:mediaType>application/json</con:mediaType><con:params/></con:representation><con:representation type="RESPONSE"><con:mediaType>application/json</con:mediaType><con:status>202</con:status><con:params/><con:element xmlns:vnfs="http://localhost/ecomp/mso/infra/serviceInstances/v2/3713d5de-942f-41c4-a1b7-08245bc640cc/vnfs/">vnfs:Response</con:element></con:representation><con:representation type="FAULT"><con:mediaType xsi:nil="true"/><con:status>405</con:status><con:params/><con:element>data</con:element></con:representation><con:request name="Request 1" id="7f7c8648-43aa-4e16-add0-337b0fa084b4" mediaType="application/json" postQueryString="false"><con:settings><con:setting id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers">&lt;xml-fragment/></con:setting></con:settings><con:endpoint>http://${#Project#host}</con:endpoint><con:request>{
-    "requestDetails": {
-    "modelInfo": {
-    "modelType": "vnf",
-    "modelInvariantId": "ff5256d1-5a33-55df-13ab-12abad84e7ff",
-    "modelNameVersionId": "fe6478e4-ea33-3346-ac12-ab121484a3fe",
-    "modelName": "vSAMP12",
-    "modelVersion": "1.0",
-    "modelCustomizationName": "vSAMP12 1"
-    },
-    "cloudConfiguration": {
-    "lcpCloudRegionId": "mdt1",
-    "tenantId": "88a6ca3ee0394ade9403f075db23167e"
-    },
-    "requestInfo": {
-    "instanceName": "MSOTEST103a",
-    "productFamilyId": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb",
-    "source": "VID",
-    "suppressRollback": false
-    },
-    "relatedInstanceList": [
-    {
-    "relatedInstance": {
-    "instanceId": "${serviceInstanceId}",
-    "modelInfo": {
-    "modelType": "service",
-    "modelInvariantId": "ff3514e3-5a33-55df-13ab-12abad84e7ff",
-    "modelNameVersionId": "fe6985cd-ea33-3346-ac12-ab121484a3fe",
-    "modelName": "{parent service model name}",
-    "modelVersion": "1.0"
-    }
-    }
-    }
-    ],
-    "requestParameters": {
-    }
-    }
-    }
-</con:request><con:credentials><con:username>${#Project#user-infraportal}</con:username><con:password>${#Project#password-infraportal}</con:password><con:selectedAuthProfile>Basic</con:selectedAuthProfile><con:addedBasicAuthenticationTypes>Basic</con:addedBasicAuthenticationTypes><con:authType>Global HTTP Settings</con:authType></con:credentials><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:parameters/><con:parameterOrder><con:entry>serviceInstanceId</con:entry><con:entry>networkInstanceId</con:entry></con:parameterOrder></con:request></con:method></con:resource><con:resource name="VID Orchestration Request" path="/ecomp/mso/infra/orchestrationRequests/v2" id="b3b7938f-41d8-4337-a1d1-7f13c112c9a3"><con:settings/><con:parameters/><con:resource name="Get request by requestId" path="{requestId}" id="7078b723-67d4-4a48-b0e6-256bba95a855"><con:settings/><con:parameters><con:parameter><con:name>requestId</con:name><con:value>requestId</con:value><con:style>TEMPLATE</con:style><con:default>requestId</con:default></con:parameter></con:parameters><con:method name="Method 1" id="24462197-3246-44a3-859f-43ccbd8510cb" method="GET"><con:settings/><con:parameters/><con:representation type="FAULT"><con:mediaType>text/html;charset=UTF-8</con:mediaType><con:status>401</con:status><con:params/><con:element>html</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType>application/json</con:mediaType><con:status>200</con:status><con:params/><con:element xmlns:d28="http://localhost/ecomp/mso/infra/orchestrationRequests/v2/7d28d657-cdad-44eb-b048-7b0bc68b795a">d28:Response</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType xsi:nil="true"/><con:status>204</con:status><con:params/><con:element>data</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType xsi:nil="true"/><con:status>204</con:status><con:params/><con:element>data</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType xsi:nil="true"/><con:status>204</con:status><con:params/><con:element>data</con:element></con:representation><con:request name="Request 1" id="057d5170-1452-4db5-9b39-c3f81de9ccc0" mediaType="application/json"><con:settings/><con:endpoint>http://localhost:8080</con:endpoint><con:request/><con:credentials><con:authType>No Authorization</con:authType></con:credentials><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:parameters/></con:request></con:method></con:resource><con:method name="Get requests by filter criteria" id="2f208786-de6e-45bf-b91f-3af3f772e260" method="GET"><con:settings/><con:parameters><con:parameter><con:name>filter</con:name><con:style>QUERY</con:style></con:parameter></con:parameters><con:representation type="RESPONSE"><con:mediaType xsi:nil="true"/><con:status>0</con:status><con:params/><con:element>data</con:element></con:representation><con:representation type="FAULT"><con:mediaType>text/html</con:mediaType><con:status>404</con:status><con:params/><con:element>html</con:element></con:representation><con:representation type="FAULT"><con:mediaType>text/html;charset=UTF-8</con:mediaType><con:status>401</con:status><con:params/><con:element>html</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType>application/json</con:mediaType><con:status>200</con:status><con:params/><con:element xmlns:v2="http://localhost/orchestrationRequests/v2">v2:Response</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType xsi:nil="true"/><con:status>0</con:status><con:params/><con:element>data</con:element></con:representation><con:request name="Request 1" id="1d4cea76-241d-4a5d-80c6-d44ac3448e94" mediaType="application/json"><con:settings><con:setting id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers">&lt;xml-fragment/></con:setting></con:settings><con:endpoint>http://localhost:8080</con:endpoint><con:request/><con:originalUri>http://localhost/orchestrationRequests/v2</con:originalUri><con:credentials><con:authType>No Authorization</con:authType></con:credentials><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:parameters/><con:parameterOrder><con:entry>filter</con:entry></con:parameterOrder></con:request></con:method></con:resource></con:interface><con:interface xsi:type="con:WsdlInterface" id="e92b2191-0b1f-4bf0-a2a1-b9488fb99004" wsaVersion="NONE" name="MsoRequestsDbAdapterImplPortBinding" type="wsdl" bindingName="{http://org.openecomp.mso/requestsdb}MsoRequestsDbAdapterImplPortBinding" soapVersion="1_1" anonymous="optional" definition="/RequestsDbAdapter.wsdl" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"><con:settings/><con:definitionCache type="TEXT" rootPart="file:/RequestsDbAdapter.wsdl"><con:part><con:url>file:/RequestsDbAdapter.wsdl</con:url><con:content><![CDATA[<!--Generated by JAX-WS RI at http://jax-ws.dev.java.net. RI's version is JAX-WS RI 2.2.7-b01  svn-revision#13316.-->
-<definitions targetNamespace="http://org.openecomp.mso/requestsdb" name="RequestsDbAdapter" xmlns="http://schemas.xmlsoap.org/wsdl/" xmlns:wsp="http://www.w3.org/ns/ws-policy" xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd" xmlns:wsp1_2="http://schemas.xmlsoap.org/ws/2004/09/policy" xmlns:tns="http://org.openecomp.mso/requestsdb" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:wsam="http://www.w3.org/2007/05/addressing/metadata">
-  <types>
-    <xs:schema version="1.0" targetNamespace="http://org.openecomp.mso/requestsdb" xmlns:xs="http://www.w3.org/2001/XMLSchema">
-      <xs:element name="MsoRequestsDbException" nillable="true" type="tns:msoRequestsDbExceptionBean"/>
-      <xs:element name="getInfraRequest" type="tns:getInfraRequest"/>
-      <xs:element name="getInfraRequestResponse" type="tns:getInfraRequestResponse"/>
-      <xs:element name="getSiteStatus" type="tns:getSiteStatus"/>
-      <xs:element name="getSiteStatusResponse" type="tns:getSiteStatusResponse"/>
-      <xs:element name="updateInfraRequest" type="tns:updateInfraRequest"/>
-      <xs:element name="updateInfraRequestResponse" type="tns:updateInfraRequestResponse"/>
-      <xs:complexType name="updateInfraRequest">
-        <xs:sequence>
-          <xs:element name="requestId" type="xs:string"/>
-          <xs:element name="lastModifiedBy" type="xs:string"/>
-          <xs:element name="statusMessage" type="xs:string" minOccurs="0"/>
-          <xs:element name="responseBody" type="xs:string" minOccurs="0"/>
-          <xs:element name="requestStatus" type="tns:request-status-type" minOccurs="0"/>
-          <xs:element name="progress" type="xs:string" minOccurs="0"/>
-          <xs:element name="vnfOutputs" type="xs:string" minOccurs="0"/>
-          <xs:element name="serviceInstanceId" type="xs:string" minOccurs="0"/>
-          <xs:element name="networkId" type="xs:string" minOccurs="0"/>
-          <xs:element name="vnfId" type="xs:string" minOccurs="0"/>
-          <xs:element name="vfModuleId" type="xs:string" minOccurs="0"/>
-          <xs:element name="volumeGroupId" type="xs:string" minOccurs="0"/>
-        </xs:sequence>
-      </xs:complexType>
-      <xs:complexType name="updateInfraRequestResponse">
-        <xs:sequence/>
-      </xs:complexType>
-      <xs:complexType name="msoRequestsDbExceptionBean">
-        <xs:sequence>
-          <xs:element name="message" type="xs:string" minOccurs="0"/>
-        </xs:sequence>
-      </xs:complexType>
-      <xs:complexType name="getInfraRequest">
-        <xs:sequence>
-          <xs:element name="requestId" type="xs:string"/>
-        </xs:sequence>
-      </xs:complexType>
-      <xs:complexType name="getInfraRequestResponse">
-        <xs:sequence>
-          <xs:element name="return" type="tns:infraActiveRequests" minOccurs="0"/>
-        </xs:sequence>
-      </xs:complexType>
-      <xs:complexType name="infraActiveRequests">
-        <xs:complexContent>
-          <xs:extension base="tns:infraRequests">
-            <xs:sequence/>
-          </xs:extension>
-        </xs:complexContent>
-      </xs:complexType>
-      <xs:complexType name="infraRequests">
-        <xs:sequence>
-          <xs:element name="aaiServiceId" type="xs:string" minOccurs="0"/>
-          <xs:element name="action" type="xs:string" minOccurs="0"/>
-          <xs:element name="aicCloudRegion" type="xs:string" minOccurs="0"/>
-          <xs:element name="aicNodeClli" type="xs:string" minOccurs="0"/>
-          <xs:element name="callBackUrl" type="xs:string" minOccurs="0"/>
-          <xs:element name="clientRequestId" type="xs:string" minOccurs="0"/>
-          <xs:element name="correlator" type="xs:string" minOccurs="0"/>
-          <xs:element name="endTime" type="xs:long" minOccurs="0"/>
-          <xs:element name="lastModifiedBy" type="xs:string" minOccurs="0"/>
-          <xs:element name="modifyTime" type="xs:long" minOccurs="0"/>
-          <xs:element name="networkId" type="xs:string" minOccurs="0"/>
-          <xs:element name="networkName" type="xs:string" minOccurs="0"/>
-          <xs:element name="networkType" type="xs:string" minOccurs="0"/>
-          <xs:element name="progress" type="xs:long" minOccurs="0"/>
-          <xs:element name="provStatus" type="xs:string" minOccurs="0"/>
-          <xs:element name="requestAction" type="xs:string" minOccurs="0"/>
-          <xs:element name="requestBody" type="xs:string" minOccurs="0"/>
-          <xs:element name="requestId" type="xs:string" minOccurs="0"/>
-          <xs:element name="requestScope" type="xs:string" minOccurs="0"/>
-          <xs:element name="requestStatus" type="xs:string" minOccurs="0"/>
-          <xs:element name="requestType" type="xs:string" minOccurs="0"/>
-          <xs:element name="responseBody" type="xs:string" minOccurs="0"/>
-          <xs:element name="serviceInstanceId" type="xs:string" minOccurs="0"/>
-          <xs:element name="serviceInstanceName" type="xs:string" minOccurs="0"/>
-          <xs:element name="serviceType" type="xs:string" minOccurs="0"/>
-          <xs:element name="source" type="xs:string" minOccurs="0"/>
-          <xs:element name="startTime" type="xs:long" minOccurs="0"/>
-          <xs:element name="statusMessage" type="xs:string" minOccurs="0"/>
-          <xs:element name="tenantId" type="xs:string" minOccurs="0"/>
-          <xs:element name="vfModuleId" type="xs:string" minOccurs="0"/>
-          <xs:element name="vfModuleModelName" type="xs:string" minOccurs="0"/>
-          <xs:element name="vfModuleName" type="xs:string" minOccurs="0"/>
-          <xs:element name="vnfId" type="xs:string" minOccurs="0"/>
-          <xs:element name="vnfName" type="xs:string" minOccurs="0"/>
-          <xs:element name="vnfOutputs" type="xs:string" minOccurs="0"/>
-          <xs:element name="vnfParams" type="xs:string" minOccurs="0"/>
-          <xs:element name="vnfType" type="xs:string" minOccurs="0"/>
-          <xs:element name="volumeGroupId" type="xs:string" minOccurs="0"/>
-          <xs:element name="volumeGroupName" type="xs:string" minOccurs="0"/>
-        </xs:sequence>
-      </xs:complexType>
-      <xs:complexType name="getSiteStatus">
-        <xs:sequence>
-          <xs:element name="siteName" type="xs:string"/>
-        </xs:sequence>
-      </xs:complexType>
-      <xs:complexType name="getSiteStatusResponse">
-        <xs:sequence>
-          <xs:element name="return" type="xs:boolean"/>
-        </xs:sequence>
-      </xs:complexType>
-      <xs:simpleType name="request-status-type">
-        <xs:restriction base="xs:string">
-          <xs:enumeration value="COMPLETE"/>
-          <xs:enumeration value="FAILED"/>
-          <xs:enumeration value="IN_PROGRESS"/>
-        </xs:restriction>
-      </xs:simpleType>
-    </xs:schema>
-  </types>
-  <message name="updateInfraRequest">
-    <part name="parameters" element="tns:updateInfraRequest"/>
-  </message>
-  <message name="updateInfraRequestResponse">
-    <part name="parameters" element="tns:updateInfraRequestResponse"/>
-  </message>
-  <message name="MsoRequestsDbException">
-    <part name="fault" element="tns:MsoRequestsDbException"/>
-  </message>
-  <message name="getInfraRequest">
-    <part name="parameters" element="tns:getInfraRequest"/>
-  </message>
-  <message name="getInfraRequestResponse">
-    <part name="parameters" element="tns:getInfraRequestResponse"/>
-  </message>
-  <message name="getSiteStatus">
-    <part name="parameters" element="tns:getSiteStatus"/>
-  </message>
-  <message name="getSiteStatusResponse">
-    <part name="parameters" element="tns:getSiteStatusResponse"/>
-  </message>
-  <portType name="RequestsDbAdapter">
-    <operation name="updateInfraRequest">
-      <input wsam:Action="http://org.openecomp.mso/requestsdb/RequestsDbAdapter/updateInfraRequestRequest" message="tns:updateInfraRequest"/>
-      <output wsam:Action="http://org.openecomp.mso/requestsdb/RequestsDbAdapter/updateInfraRequestResponse" message="tns:updateInfraRequestResponse"/>
-      <fault message="tns:MsoRequestsDbException" name="MsoRequestsDbException" wsam:Action="http://org.openecomp.mso/requestsdb/RequestsDbAdapter/updateInfraRequest/Fault/MsoRequestsDbException"/>
-    </operation>
-    <operation name="getInfraRequest">
-      <input wsam:Action="http://org.openecomp.mso/requestsdb/RequestsDbAdapter/getInfraRequestRequest" message="tns:getInfraRequest"/>
-      <output wsam:Action="http://org.openecomp.mso/requestsdb/RequestsDbAdapter/getInfraRequestResponse" message="tns:getInfraRequestResponse"/>
-      <fault message="tns:MsoRequestsDbException" name="MsoRequestsDbException" wsam:Action="http://org.openecomp.mso/requestsdb/RequestsDbAdapter/getInfraRequest/Fault/MsoRequestsDbException"/>
-    </operation>
-    <operation name="getSiteStatus">
-      <input wsam:Action="http://org.openecomp.mso/requestsdb/RequestsDbAdapter/getSiteStatusRequest" message="tns:getSiteStatus"/>
-      <output wsam:Action="http://org.openecomp.mso/requestsdb/RequestsDbAdapter/getSiteStatusResponse" message="tns:getSiteStatusResponse"/>
-    </operation>
-  </portType>
-  <binding name="MsoRequestsDbAdapterImplPortBinding" type="tns:RequestsDbAdapter">
-    <soap:binding transport="http://schemas.xmlsoap.org/soap/http" style="document"/>
-    <operation name="updateInfraRequest">
-      <soap:operation soapAction=""/>
-      <input>
-        <soap:body use="literal"/>
-      </input>
-      <output>
-        <soap:body use="literal"/>
-      </output>
-      <fault name="MsoRequestsDbException">
-        <soap:fault name="MsoRequestsDbException" use="literal"/>
-      </fault>
-    </operation>
-    <operation name="getInfraRequest">
-      <soap:operation soapAction=""/>
-      <input>
-        <soap:body use="literal"/>
-      </input>
-      <output>
-        <soap:body use="literal"/>
-      </output>
-      <fault name="MsoRequestsDbException">
-        <soap:fault name="MsoRequestsDbException" use="literal"/>
-      </fault>
-    </operation>
-    <operation name="getSiteStatus">
-      <soap:operation soapAction=""/>
-      <input>
-        <soap:body use="literal"/>
-      </input>
-      <output>
-        <soap:body use="literal"/>
-      </output>
-    </operation>
-  </binding>
-  <service name="RequestsDbAdapter">
-    <port name="MsoRequestsDbAdapterImplPort" binding="tns:MsoRequestsDbAdapterImplPortBinding">
-      <soap:address location="REPLACE_WITH_ACTUAL_URL"/>
-    </port>
-  </service>
-</definitions>]]></con:content><con:type>http://schemas.xmlsoap.org/wsdl/</con:type></con:part></con:definitionCache><con:endpoints><con:endpoint>REPLACE_WITH_ACTUAL_URL</con:endpoint></con:endpoints><con:operation id="8757d9dc-5650-4d15-a4e6-82a191685a73" isOneWay="false" action="" name="getInfraRequest" bindingOperationName="getInfraRequest" type="Request-Response" inputName="" receivesAttachments="false" sendsAttachments="false" anonymous="optional"><con:settings/><con:call id="a5f79f9f-895c-434d-94ae-c7810b480675" name="Request 1"><con:settings/><con:encoding>UTF-8</con:encoding><con:endpoint>REPLACE_WITH_ACTUAL_URL</con:endpoint><con:request><![CDATA[<soapenv:Envelope xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/" xmlns:req="http://org.openecomp.mso/requestsdb">\r
-   <soapenv:Header/>\r
-   <soapenv:Body>\r
-      <req:getInfraRequest>\r
-         <requestId>?</requestId>\r
-      </req:getInfraRequest>\r
-   </soapenv:Body>\r
-</soapenv:Envelope>]]></con:request><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:wsaConfig mustUnderstand="NONE" version="200508" action="http://org.openecomp.mso/requestsdb/RequestsDbAdapter/getInfraRequestRequest"/></con:call></con:operation><con:operation id="31bd1e1a-4620-4172-bd3e-ea16f07d6aec" isOneWay="false" action="" name="updateInfraRequest" bindingOperationName="updateInfraRequest" type="Request-Response" inputName="" receivesAttachments="false" sendsAttachments="false" anonymous="optional"><con:settings/><con:call id="25c9ba84-704b-4bd5-8ef8-8f0b50ae7ec2" name="Request 1"><con:settings/><con:encoding>UTF-8</con:encoding><con:endpoint>REPLACE_WITH_ACTUAL_URL</con:endpoint><con:request><![CDATA[<soapenv:Envelope xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/" xmlns:req="http://org.openecomp.mso/requestsdb">\r
-   <soapenv:Header/>\r
-   <soapenv:Body>\r
-      <req:updateInfraRequest>\r
-         <requestId>?</requestId>\r
-         <lastModifiedBy>?</lastModifiedBy>\r
-         <!--Optional:-->\r
-         <statusMessage>?</statusMessage>\r
-         <!--Optional:-->\r
-         <responseBody>?</responseBody>\r
-         <!--Optional:-->\r
-         <requestStatus>?</requestStatus>\r
-         <!--Optional:-->\r
-         <progress>?</progress>\r
-         <!--Optional:-->\r
-         <vnfOutputs>?</vnfOutputs>\r
-      </req:updateInfraRequest>\r
-   </soapenv:Body>\r
-</soapenv:Envelope>]]></con:request><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:wsaConfig mustUnderstand="NONE" version="200508" action="http://org.openecomp.mso/requestsdb/RequestsDbAdapter/updateInfraRequestRequest"/></con:call></con:operation><con:operation id="5c6b26c5-1eef-4f30-82a1-88b437d7dcd9" isOneWay="false" action="" name="getSiteStatus" bindingOperationName="getSiteStatus" type="Request-Response" inputName="" receivesAttachments="false" sendsAttachments="false" anonymous="optional"><con:settings/><con:call id="f3a28bd2-1fe1-4351-b07c-0f2d58e93472" name="Request 1"><con:settings/><con:encoding>UTF-8</con:encoding><con:endpoint>REPLACE_WITH_ACTUAL_URL</con:endpoint><con:request><![CDATA[<soapenv:Envelope xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/" xmlns:req="http://org.openecomp.mso/requestsdb">
-   <soapenv:Header/>
-   <soapenv:Body>
-      <req:getSiteStatus>
-         <siteName>?</siteName>
-      </req:getSiteStatus>
-   </soapenv:Body>
-</soapenv:Envelope>]]></con:request><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:wsaConfig mustUnderstand="NONE" version="200508" action="http://org.openecomp.mso/requestsdb/RequestsDbAdapter/getSiteStatusRequest"/></con:call></con:operation></con:interface><con:testSuite name="simple_tests_endpoints" id="580326d7-451f-4771-8ac3-4f3607322cfd"><con:settings/><con:runType>SEQUENTIAL</con:runType><con:testCase failOnError="true" failTestCaseOnErrors="true" keepSession="false" maxResults="0" name="API-Handler Infra" searchProperties="true" id="c89486a1-bb89-47fd-80e4-f02c099406a7" timeout="0" wsrmEnabled="false" wsrmVersion="1.0" wsrmAckTo="" amfAuthorisation="false" amfEndpoint="" amfLogin="" amfPassword="" disabled="true"><con:settings/><con:testStep type="restrequest" name="POST VNF request - Bad Operation type" id="2f6be053-b9d9-491e-bbf1-5e8eb6f3e6e5"><con:settings/><con:config service="Services" resourcePath="/ecomp/mso/infra/v3/vnf-request" methodName="POST VNF Request" xsi:type="con:RestRequestStep" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"><con:restRequest name="POST VNF request - Bad Operation type" mediaType="application/xml" postQueryString="false" id="3b7e6477-e002-43f0-9350-ea126ad08aaf"><con:settings><con:setting id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers">&lt;xml-fragment/></con:setting></con:settings><con:endpoint>http://${#Project#host}</con:endpoint><con:request><![CDATA[<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<vnf-request xmlns="http://org.openecomp/mso/infra/vnf-request/v1">
-    <request-info>
-        <request-id>3d878a8e-51fa-44aa-8cb5-a56ae9352262</request-id>
-        <action>CREATE_VF_MODUL</action>
-        <source>PORTAL</source>
-    </request-info>
-    <vnf-inputs>
-    	         <vnf-id>f7949288-876d-47c2-9a8c-aed107e7e016</vnf-id>
-        <vf-module-id>a9f67f55-7424-43e2-b000-f97663194976</vf-module-id>
-        <vnf-name>zrdm3ssdr02</vnf-name>
-        <vf-module-name>zrdm3ssdr02_mod_1</vf-module-name>
-        <vnf-type>Nimbus_LU2_SSDnoLM_Svc/SSDR_wo_LM_v10 2</vnf-type>
-        <vf-module-model-name>SSDR_wo_LM_v10::module-0</vf-module-model-name>
-        <service-id>a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb</service-id>
-        <service-instance-id>a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb</service-instance-id>
-        <service-id>a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb</service-id>
-        <aic-cloud-region>rdm3</aic-cloud-region>
-        <tenant-id>eecd15e8e7ee46c3bbc2096f0924f4c4</tenant-id>
-    </vnf-inputs>
-</vnf-request>
-]]></con:request><con:originalUri>http://localhost/ecomp/mso/v1/services</con:originalUri><con:assertion type="Valid HTTP Status Codes" name="Valid HTTP Status Codes 404" id="ddd48b7b-605e-461a-a80d-bd105db133ca"><con:configuration><codes>400
-
-</codes></con:configuration></con:assertion><con:assertion type="Simple Contains" name="Contains Status FAILED" id="8175eda8-425c-4d1d-9dd2-267c8150f241"><con:configuration><token>No valid action</token><ignoreCase>false</ignoreCase><useRegEx>false</useRegEx></con:configuration></con:assertion><con:credentials><con:username>${#Project#user-infraportal}</con:username><con:password>${#Project#password-infraportal}</con:password><con:selectedAuthProfile>Basic</con:selectedAuthProfile><con:addedBasicAuthenticationTypes>Basic</con:addedBasicAuthenticationTypes><con:authType>Global HTTP Settings</con:authType></con:credentials><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:parameters/><con:parameterOrder/></con:restRequest></con:config></con:testStep><con:testStep type="restrequest" name="POST VNF request" id="1e52593b-ee1d-499d-a95e-7f1f7235b904"><con:settings/><con:config service="Services" resourcePath="/ecomp/mso/infra/v3/vnf-request" methodName="POST VNF Request" xsi:type="con:RestRequestStep" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"><con:restRequest name="POST VNF request" mediaType="application/xml" postQueryString="false" id="6d727ada-da68-4a94-8f33-f82953731cd5"><con:settings><con:setting id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers">&lt;xml-fragment/></con:setting></con:settings><con:endpoint>http://${#Project#host}</con:endpoint><con:request><![CDATA[<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<vnf-request xmlns="http://org.openecomp/mso/infra/vnf-request/v1">
-    <request-info>
-        <request-id>3d878a8e-51fa-44aa-8cb5-a56ae9352262</request-id>
-        <action>CREATE_VF_MODULE</action>
-        <source>PORTAL</source>
-    </request-info>
-    <vnf-inputs>
-    	   <vnf-id>f7949288-876d-47c2-9a8c-aed107e7e016</vnf-id>
-        <vf-module-id>a9f67f55-7424-43e2-b000-f97663194976</vf-module-id>
-        <vnf-name>zrdm3ssdr02</vnf-name>
-        <vf-module-name>zrdm3ssdr02_mod_1</vf-module-name>
-        <vnf-type>Nimbus_LU2_SSDnoLM_Svc/SSDR_wo_LM_v10 2</vnf-type>
-        <vf-module-model-name>SSDR_wo_LM_v10::module-0</vf-module-model-name>
-        <service-id>a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb</service-id>
-        <service-instance-id>a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb</service-instance-id>
-        <service-id>a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb</service-id>
-        <aic-cloud-region>rdm3</aic-cloud-region>
-        <tenant-id>eecd15e8e7ee46c3bbc2096f0924f4c4</tenant-id>
-    </vnf-inputs>
-</vnf-request>
-]]></con:request><con:originalUri>http://localhost/ecomp/mso/v1/services</con:originalUri><con:assertion type="Valid HTTP Status Codes" name="Valid HTTP Status Codes" id="19038271-9229-4ae5-a743-24d0b2790cae"><con:configuration><codes>202
-</codes></con:configuration></con:assertion><con:assertion type="Simple Contains" name="Contains Status FAILED" id="dfef30b8-13ab-486f-97b8-8f9eed1c9ac1"><con:configuration><token> &lt;request-status>IN_PROGRESS&lt;/request-status></token><ignoreCase>false</ignoreCase><useRegEx>false</useRegEx></con:configuration></con:assertion><con:assertion type="Simple Contains" id="a2ada473-6532-4a17-a5ca-067edaa35bc1" name="Contains Vnf-name"><con:configuration><token>&lt;vnf-name>zrdm3ssdr02&lt;/vnf-name></token><ignoreCase>false</ignoreCase><useRegEx>false</useRegEx></con:configuration></con:assertion><con:credentials><con:username>${#Project#user-infraportal}</con:username><con:password>${#Project#password-infraportal}</con:password><con:selectedAuthProfile>Basic</con:selectedAuthProfile><con:addedBasicAuthenticationTypes>Basic</con:addedBasicAuthenticationTypes><con:authType>Global HTTP Settings</con:authType></con:credentials><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:parameters/><con:parameterOrder/></con:restRequest></con:config></con:testStep><con:testStep type="transfer" name="RequestID Property Transfer" id="de18c687-eef5-4dbf-8f32-25d3e7e139e3"><con:settings/><con:config xsi:type="con:PropertyTransfersStep" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"><con:transfers setNullOnMissingSource="true" transferTextContent="true" failOnError="true" ignoreEmpty="false" transferToAll="false" entitize="false" transferChildNodes="false"><con:name>request-id</con:name><con:sourceType>Response</con:sourceType><con:sourceStep>POST VNF request</con:sourceStep><con:sourcePath>//*:request-id</con:sourcePath><con:targetType>request-id</con:targetType><con:targetStep>GET VNF Request by requestID</con:targetStep><con:upgraded>true</con:upgraded></con:transfers></con:config></con:testStep><con:testStep type="restrequest" name="POST VNF request - Duplicated" id="69dbd824-7fd0-4d51-ad97-aedd3144dd79"><con:settings/><con:config service="Services" resourcePath="/ecomp/mso/infra/v3/vnf-request" methodName="POST VNF Request" xsi:type="con:RestRequestStep" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"><con:restRequest name="POST VNF request - Duplicated" mediaType="application/xml" postQueryString="false" id="cd5b21f7-2aad-416c-af90-fe2825b52eef"><con:settings><con:setting id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers">&lt;xml-fragment/></con:setting></con:settings><con:endpoint>http://${#Project#host}</con:endpoint><con:request><![CDATA[<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<vnf-request xmlns="http://org.openecomp/mso/infra/vnf-request/v1">
-    <request-info>
-        <request-id>3d878a8e-51fa-44aa-8cb5-a56ae9352262</request-id>
-        <action>CREATE_VF_MODULE</action>
-        <source>PORTAL</source>
-    </request-info>
-    <vnf-inputs>
-    	   <vnf-id>f7949288-876d-47c2-9a8c-aed107e7e016</vnf-id>
-        <vf-module-id>a9f67f55-7424-43e2-b000-f97663194976</vf-module-id>
-        <vnf-name>zrdm3ssdr02</vnf-name>
-        <vf-module-name>zrdm3ssdr02_mod_1</vf-module-name>
-        <vnf-type>Nimbus_LU2_SSDnoLM_Svc/SSDR_wo_LM_v10 2</vnf-type>
-        <vf-module-model-name>SSDR_wo_LM_v10::module-0</vf-module-model-name>
-        <service-id>a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb</service-id>
-        <service-instance-id>a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb</service-instance-id>
-        <service-id>a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb</service-id>
-        <aic-cloud-region>rdm3</aic-cloud-region>
-        <tenant-id>eecd15e8e7ee46c3bbc2096f0924f4c4</tenant-id>
-    </vnf-inputs>
-</vnf-request>
-]]></con:request><con:originalUri>http://localhost/ecomp/mso/v1/services</con:originalUri><con:assertion type="Valid HTTP Status Codes" name="Valid HTTP Status Codes 404" id="5a64a648-ebe2-4ff2-ba2c-f8ea495cfce4"><con:configuration><codes>409
-</codes></con:configuration></con:assertion><con:assertion type="Simple Contains" name="Contains status FAILED" id="9af594a7-04c3-42b5-bf3b-63bf83feaabb"><con:configuration><token>&lt;request-status>FAILED&lt;/request-status></token><ignoreCase>false</ignoreCase><useRegEx>false</useRegEx></con:configuration></con:assertion><con:assertion type="Simple Contains" name="Contains vnf-type not found" id="cd1b9d06-5e29-4f36-b021-ab2da2c806c0"><con:configuration><token>vnf-id (f7949288-876d-47c2-9a8c-aed107e7e016) is locked</token><ignoreCase>false</ignoreCase><useRegEx>false</useRegEx></con:configuration></con:assertion><con:credentials><con:username>${#Project#user-infraportal}</con:username><con:password>${#Project#password-infraportal}</con:password><con:selectedAuthProfile>Basic</con:selectedAuthProfile><con:addedBasicAuthenticationTypes>Basic</con:addedBasicAuthenticationTypes><con:authType>Global HTTP Settings</con:authType></con:credentials><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:parameters/><con:parameterOrder/></con:restRequest></con:config></con:testStep><con:testStep type="restrequest" name="POST VNF request - vf-module-name not there" id="d71f1516-a666-49b7-86e9-3d6a636eb711"><con:settings/><con:config service="Services" resourcePath="/ecomp/mso/infra/v3/vnf-request" methodName="POST VNF Request" xsi:type="con:RestRequestStep" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"><con:restRequest name="POST VNF request - vf-module-name not there" mediaType="application/xml" postQueryString="false" id="420544d1-9f22-4985-b950-0ac6aeb8704d"><con:settings><con:setting id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers">&lt;xml-fragment/></con:setting></con:settings><con:endpoint>http://${#Project#host}</con:endpoint><con:request><![CDATA[<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<vnf-request xmlns="http://org.openecomp/mso/infra/vnf-request/v1">
-    <request-info>
-        <request-id>3d878a8e-51fa-44aa-8cb5-a56ae9352263</request-id>
-        <action>CREATE_VF_MODULE</action>
-        <source>PORTAL</source>
-    </request-info>
-    <vnf-inputs>
-
-        <vnf-name>zrdm3ssdr02</vnf-name>
-        <vnf-type>Nimbus_LU2_SSDnoLM_Svc/SSDR_wo_LM_v10 2</vnf-type>
-        <vf-module-model-name>SSDR_wo_LM_v10::module-0</vf-module-model-name>
-        <service-id>a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb</service-id>
-        <service-instance-id>a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb</service-instance-id>
-
-        <aic-cloud-region>rdm3</aic-cloud-region>
-        <tenant-id>eecd15e8e7ee46c3bbc2096f0924f4c4</tenant-id>
-    </vnf-inputs>
-</vnf-request>
-]]></con:request><con:originalUri>http://localhost/ecomp/mso/v1/services</con:originalUri><con:assertion type="Valid HTTP Status Codes" name="Valid HTTP Status Codes 400" id="5deb0c9a-3c9f-4dd4-b9f7-3c09a63691dc"><con:configuration><codes>400
-</codes></con:configuration></con:assertion><con:assertion type="Simple Contains" name="Contains status FAILED" id="349536b5-b5d7-40f4-b556-a2c2704c2969"><con:configuration><token>&lt;request-status>FAILED&lt;/request-status></token><ignoreCase>false</ignoreCase><useRegEx>false</useRegEx></con:configuration></con:assertion><con:assertion type="Simple Contains" id="0a0adadc-1871-498f-a1d4-ceb0b81ff5e4" name="Contains validation failed"><con:configuration><token>&lt;status-message>Service request FAILED schema validation.</token><ignoreCase>false</ignoreCase><useRegEx>false</useRegEx></con:configuration></con:assertion><con:assertion type="Simple Contains" id="804da7da-09ae-4361-8ba7-857065cbd0b8" name="Contains"><con:configuration><token>No valid vf-module-name is</token><ignoreCase>false</ignoreCase><useRegEx>false</useRegEx></con:configuration></con:assertion><con:credentials><con:username>${#Project#user-infraportal}</con:username><con:password>${#Project#password-infraportal}</con:password><con:selectedAuthProfile>Basic</con:selectedAuthProfile><con:addedBasicAuthenticationTypes>Basic</con:addedBasicAuthenticationTypes><con:authType>Global HTTP Settings</con:authType></con:credentials><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:parameters/><con:parameterOrder/></con:restRequest></con:config></con:testStep><con:testStep type="restrequest" name="POST DELETE VNF request" id="8e6a8f21-46e3-49e4-aab8-040110a0dca4"><con:settings/><con:config service="Services" resourcePath="/ecomp/mso/infra/v3/vnf-request" methodName="POST VNF Request" xsi:type="con:RestRequestStep" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"><con:restRequest name="POST DELETE VNF request" mediaType="application/xml" postQueryString="false" id="7abc7153-bc0b-422b-ba7c-d78559911539"><con:settings><con:setting id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers">&lt;xml-fragment/></con:setting></con:settings><con:endpoint>http://${#Project#host}</con:endpoint><con:request><![CDATA[<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<vnf-request xmlns="http://org.openecomp/mso/infra/vnf-request/v1">
-    <request-info>
-        <request-id>3d878a8e-51fa-44aa-8cb5-a56ae9352263</request-id>
-        <action>DELETE_VF_MODULE</action>
-        <source>PORTAL</source>
-    </request-info>
-    <vnf-inputs>
-        <vnf-id>f7949288-876d-47c2-9a8c-aed107e7e016</vnf-id>
-        <vnf-name>zrdm3ssdr02</vnf-name>
-        <vf-module-name>zrdm3ssdr02_mod_1</vf-module-name>
-        <vnf-type>Nimbus_LU2_SSDnoLM_Svc/SSDR_wo_LM_v10 2</vnf-type>
-        <vf-module-model-name>SSDR_wo_LM_v10::module-0</vf-module-model-name>
-        <service-id>a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb</service-id>
-        <service-instance-id>a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb</service-instance-id>
-        <vf-module-id>a9f67f55-7424-43e2-b000-f97663194976</vf-module-id>
-        <aic-cloud-region>rdm3</aic-cloud-region>
-        <tenant-id>eecd15e8e7ee46c3bbc2096f0924f4c4</tenant-id>
-    </vnf-inputs>
-</vnf-request>
-]]></con:request><con:originalUri>http://localhost/ecomp/mso/v1/services</con:originalUri><con:assertion type="Valid HTTP Status Codes" name="Valid HTTP Status Codes 500" id="96d06fb6-9b19-4e8d-b683-e53933387ef1"><con:configuration><codes>202</codes></con:configuration></con:assertion><con:assertion type="Simple Contains" name="Contains status FAILED" id="88bce2e8-9fa3-412c-8bda-2d499316f7e7"><con:configuration><token>&lt;request-status>IN_PROGRESS&lt;/request-status></token><ignoreCase>false</ignoreCase><useRegEx>false</useRegEx></con:configuration></con:assertion><con:assertion type="Simple Contains" id="8189de04-9702-4728-a6ce-fb5c0b52890c" name="Contains vnf-name"><con:configuration><token>&lt;vnf-name>zrdm3ssdr02&lt;/vnf-name></token><ignoreCase>false</ignoreCase><useRegEx>false</useRegEx></con:configuration></con:assertion><con:credentials><con:username>${#Project#user-infraportal}</con:username><con:password>${#Project#password-infraportal}</con:password><con:selectedAuthProfile>Basic</con:selectedAuthProfile><con:addedBasicAuthenticationTypes>Basic</con:addedBasicAuthenticationTypes><con:authType>Global HTTP Settings</con:authType></con:credentials><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:parameters/><con:parameterOrder/></con:restRequest></con:config></con:testStep><con:testStep type="restrequest" name="GET VNF Request by requestID" id="5eef4656-368c-4f30-8959-f6deb3464f8a"><con:settings/><con:config service="Services" resourcePath="/ecomp/mso/infra/v1/vnf-request/{request-id}" methodName="GET VNF-Request on RequestID" xsi:type="con:RestRequestStep" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"><con:restRequest name="GET VNF Request by requestID" id="50221050-4e8a-46e3-95ab-471b796fdb07" mediaType="application/json"><con:settings><con:setting id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers">&lt;xml-fragment/></con:setting></con:settings><con:endpoint>http://${#Project#host}</con:endpoint><con:request/><con:originalUri>http://localhost/ecomp/mso/infra/v1/vnf-request/01bef4ef-fa1b-4fd4-b46d-12ada0d4d7e1</con:originalUri><con:assertion type="Simple Contains" id="8a421cd3-9266-4bda-bd86-b525f6b51e42" name="Contains status FAILED"><con:configuration><token>  &lt;request-status>IN_PROGRESS&lt;/request-status></token><ignoreCase>false</ignoreCase><useRegEx>false</useRegEx></con:configuration></con:assertion><con:assertion type="Valid HTTP Status Codes" id="2d5f6711-2821-4378-af92-df7a4a5a4a94" name="Contain HTTP 200"><con:configuration><codes>200</codes></con:configuration></con:assertion><con:credentials><con:username>${#Project#user-infraportal}</con:username><con:password>${#Project#password-infraportal}</con:password><con:selectedAuthProfile>Basic</con:selectedAuthProfile><con:addedBasicAuthenticationTypes>Basic</con:addedBasicAuthenticationTypes><con:authType>Global HTTP Settings</con:authType></con:credentials><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:parameters>
-    <con:entry key="tenantId" value="276b95b6d2b04e2e830c976eb70c9405"/>
-    <con:entry key="request-id" value="aa28531d-b01e-4af8-a00a-7866a7cf0a20"/>
-</con:parameters><con:parameterOrder><con:entry>vnf-type</con:entry><con:entry>service-type</con:entry><con:entry>aic-node-clli</con:entry><con:entry>tenantId</con:entry></con:parameterOrder></con:restRequest></con:config></con:testStep><con:testStep type="restrequest" name="GET VNF type without params" id="38720eda-db36-4211-b016-56fda64432a2"><con:settings/><con:config service="Services" resourcePath="/ecomp/mso/infra/v1/vnf-types" methodName="Method 1" xsi:type="con:RestRequestStep" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"><con:restRequest name="GET VNF type without params" id="2cec4861-6675-43b2-82ef-a732613ad46b" mediaType="application/json"><con:settings><con:setting id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers">&lt;xml-fragment/></con:setting></con:settings><con:endpoint>http://${#Project#host}</con:endpoint><con:request/><con:originalUri>http://localhost/ecomp/mso/infra/V1/vnf-types</con:originalUri><con:assertion type="Valid HTTP Status Codes" id="ea718918-02d8-449b-b121-bb457f97af9e" name="Contains HTTP 200"><con:configuration><codes>200
-</codes></con:configuration></con:assertion><con:assertion type="Simple Contains" id="7e273fa1-4feb-4f37-91b8-aefafa35710a" name="Contains XML Header"><con:configuration><token>&lt;vnf-types xmlns="http://org.openecomp/mso/infra/vnf-request/v1"/></token><ignoreCase>false</ignoreCase><useRegEx>false</useRegEx></con:configuration></con:assertion><con:credentials><con:username>${#Project#user-infraportal}</con:username><con:password>${#Project#password-infraportal}</con:password><con:selectedAuthProfile>Basic</con:selectedAuthProfile><con:addedBasicAuthenticationTypes>Basic</con:addedBasicAuthenticationTypes><con:authType>Global HTTP Settings</con:authType></con:credentials><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:parameters/><con:parameterOrder><con:entry>vnf-role</con:entry></con:parameterOrder></con:restRequest></con:config></con:testStep><con:testStep type="restrequest" name="POST Network Request CREATE" id="07d8a090-8366-474c-943e-1e31c5afae23"><con:settings/><con:config service="Services" resourcePath="/ecomp/mso/infra/v3/network-request" methodName="POST Request" xsi:type="con:RestRequestStep" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"><con:restRequest name="POST Network Request CREATE" id="712ec3ee-609f-4b36-9f3a-75dfc1333714" mediaType="application/xml" postQueryString="false"><con:settings><con:setting id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers">&lt;xml-fragment/></con:setting></con:settings><con:endpoint>http://${#Project#host}</con:endpoint><con:request><![CDATA[<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<network-request xmlns="http://org.openecomp/mso/infra/network-request/v1">
-	<request-info>
-		<request-id>f9d87288-b726-4b23-a207-8eb845a7b8d9</request-id>
-		<action>CREATE</action>
-		<source>PORTAL</source>
-	</request-info>
-	<network-inputs>
-		<network-name>Mobisupport-25193-T-Willows2_cor_pcrf_sy_net_1</network-name>
-		<network-type>CONTRAIL30_BASIC</network-type>
-		<service-instance-id>868d854d-b145-4929-b476-f0f9dc01d0ab</service-instance-id>
-		<backout-on-failure>true</backout-on-failure>
-		<service-id>a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb</service-id>
-		<aic-cloud-region>rdm3</aic-cloud-region>
-		<tenant-id>e5225256ffcc4e22928a432f2bcee195</tenant-id>
-	</network-inputs>
-</network-request>
-]]></con:request><con:originalUri>http://localhost/ecomp/mso/infra/v1/network-request</con:originalUri><con:assertion type="Simple Contains" id="0ffaae8e-6fdd-46ca-af73-2c3361a855de" name="FAILED"><con:configuration><token>IN_PROGRESS</token><ignoreCase>false</ignoreCase><useRegEx>false</useRegEx></con:configuration></con:assertion><con:assertion type="Valid HTTP Status Codes" id="e8b9b7c8-909b-4cb5-b995-d744f8a1553f" name="Contains HTTP 404,500"><con:configuration><codes>202
-</codes></con:configuration></con:assertion><con:assertion type="Simple Contains" id="d5f2d559-2b0e-4283-8c24-f268aa9a5968" name="Contains network name"><con:configuration><token>&lt;network-name>Mobisupport-25193-T-Willows2_cor_pcrf_sy_net_1&lt;/network-name></token><ignoreCase>false</ignoreCase><useRegEx>false</useRegEx></con:configuration></con:assertion><con:credentials><con:username>${#Project#user-infraportal}</con:username><con:password>${#Project#password-infraportal}</con:password><con:selectedAuthProfile>Basic</con:selectedAuthProfile><con:addedBasicAuthenticationTypes>Basic</con:addedBasicAuthenticationTypes><con:authType>Global HTTP Settings</con:authType></con:credentials><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:parameters/><con:parameterOrder/></con:restRequest></con:config></con:testStep><con:testStep type="restrequest" name="POST Network Request CREATE - duplicate" id="03273950-53b3-4f16-b384-0c887ba57b53"><con:settings/><con:config service="Services" resourcePath="/ecomp/mso/infra/v3/network-request" methodName="POST Request" xsi:type="con:RestRequestStep" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"><con:restRequest name="POST Network Request CREATE - duplicate" id="712ec3ee-609f-4b36-9f3a-75dfc1333714" mediaType="application/xml" postQueryString="false"><con:settings><con:setting id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers">&lt;xml-fragment/></con:setting></con:settings><con:endpoint>http://${#Project#host}</con:endpoint><con:request><![CDATA[<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<network-request xmlns="http://org.openecomp/mso/infra/network-request/v1">
-	<request-info>
-		<request-id>f9d87288-b726-4b23-a207-8eb845a7b8d9</request-id>
-		<action>CREATE</action>
-		<source>PORTAL</source>
-	</request-info>
-	<network-inputs>
-		<network-name>Mobisupport-25193-T-Willows2_cor_pcrf_sy_net_1</network-name>
-		<network-type>CONTRAIL30_BASIC</network-type>
-		<service-instance-id>868d854d-b145-4929-b476-f0f9dc01d0ab</service-instance-id>
-		<backout-on-failure>true</backout-on-failure>
-		<service-id>a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb</service-id>
-		<aic-cloud-region>rdm3</aic-cloud-region>
-		<tenant-id>e5225256ffcc4e22928a432f2bcee195</tenant-id>
-	</network-inputs>
-</network-request>
-]]></con:request><con:originalUri>http://localhost/ecomp/mso/infra/v1/network-request</con:originalUri><con:assertion type="Simple Contains" id="0ffaae8e-6fdd-46ca-af73-2c3361a855de" name="FAILED"><con:configuration><token>IN_PROGRESS</token><ignoreCase>false</ignoreCase><useRegEx>false</useRegEx></con:configuration></con:assertion><con:assertion type="Valid HTTP Status Codes" id="e8b9b7c8-909b-4cb5-b995-d744f8a1553f" name="Contains HTTP 404,500"><con:configuration><codes>409</codes></con:configuration></con:assertion><con:assertion type="Simple Contains" id="d5f2d559-2b0e-4283-8c24-f268aa9a5968" name="Contains network name"><con:configuration><token>&lt;network-name>Mobisupport-25193-T-Willows2_cor_pcrf_sy_net_1&lt;/network-name></token><ignoreCase>false</ignoreCase><useRegEx>false</useRegEx></con:configuration></con:assertion><con:assertion type="Simple Contains" id="288d5084-4871-4ba1-89e1-c7166dc81e93" name="Contains"><con:configuration><token>is locked</token><ignoreCase>false</ignoreCase><useRegEx>false</useRegEx></con:configuration></con:assertion><con:credentials><con:username>${#Project#user-infraportal}</con:username><con:password>${#Project#password-infraportal}</con:password><con:selectedAuthProfile>Basic</con:selectedAuthProfile><con:addedBasicAuthenticationTypes>Basic</con:addedBasicAuthenticationTypes><con:authType>Global HTTP Settings</con:authType></con:credentials><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:parameters/><con:parameterOrder/></con:restRequest></con:config></con:testStep><con:testStep type="transfer" name="Network RequestID Property Transfer" id="52b0a921-6b93-4308-b081-68534a706601"><con:settings/><con:config xsi:type="con:PropertyTransfersStep" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"><con:transfers setNullOnMissingSource="true" transferTextContent="true" failOnError="true" ignoreEmpty="false" transferToAll="false" entitize="false" transferChildNodes="false"><con:name>request-id</con:name><con:sourceType>Response</con:sourceType><con:sourceStep>POST Network Request CREATE</con:sourceStep><con:sourcePath>//*:request-id</con:sourcePath><con:targetType>request-id</con:targetType><con:targetStep>GET NEtwork Request by request ID</con:targetStep><con:upgraded>true</con:upgraded></con:transfers></con:config></con:testStep><con:testStep type="restrequest" name="GET NEtwork Request by tenant" id="dfb85365-6e91-4f03-a729-95f3af8ded0f"><con:settings/><con:config service="Services" resourcePath="/ecomp/mso/infra/v3/network-request" methodName="Method 1" xsi:type="con:RestRequestStep" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"><con:restRequest name="GET NEtwork Request by tenant" id="2cec4861-6675-43b2-82ef-a732613ad46b" mediaType="application/json"><con:settings><con:setting id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers">&lt;xml-fragment/></con:setting></con:settings><con:endpoint>http://${#Project#host}</con:endpoint><con:request/><con:originalUri>http://localhost/ecomp/mso/infra/V1/vnf-types</con:originalUri><con:assertion type="Simple Contains" id="ec232741-fb15-47ce-9c65-3f280557c6a1" name="Contains TenantId"><con:configuration><token>e5225256ffcc4e22928a432f2bcee195</token><ignoreCase>false</ignoreCase><useRegEx>false</useRegEx></con:configuration></con:assertion><con:assertion type="Valid HTTP Status Codes" id="9db3d729-a3a7-4244-84b8-5ccad5112b44" name="Contains HTTP 200"><con:configuration><codes>200
-</codes></con:configuration></con:assertion><con:credentials><con:username>${#Project#user-infraportal}</con:username><con:password>${#Project#password-infraportal}</con:password><con:selectedAuthProfile>Basic</con:selectedAuthProfile><con:addedBasicAuthenticationTypes>Basic</con:addedBasicAuthenticationTypes><con:authType>Global HTTP Settings</con:authType></con:credentials><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:parameters><entry key="tenant-id" value="e5225256ffcc4e22928a432f2bcee195" xmlns="http://eviware.com/soapui/config"/></con:parameters><con:parameterOrder><con:entry>network-type</con:entry><con:entry>tenant-id</con:entry><con:entry>service-type</con:entry><con:entry>aic-node-clli</con:entry></con:parameterOrder></con:restRequest></con:config></con:testStep><con:testStep type="restrequest" name="GET NEtwork Request by request ID" id="3dd308e9-e017-4578-8c4b-8b76089a6f12"><con:settings/><con:config service="Services" resourcePath="/ecomp/mso/infra/v1/network-request/{request-id}" methodName="Method 2" xsi:type="con:RestRequestStep" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"><con:restRequest name="GET NEtwork Request by request ID" id="2cec4861-6675-43b2-82ef-a732613ad46b" mediaType="application/json"><con:settings><con:setting id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers">&lt;xml-fragment/></con:setting></con:settings><con:endpoint>http://${#Project#host}</con:endpoint><con:request/><con:originalUri>http://localhost/ecomp/mso/infra/V1/vnf-types</con:originalUri><con:assertion type="Simple Contains" id="ec232741-fb15-47ce-9c65-3f280557c6a1" name="Contains RequestID"><con:configuration><token>Mobisupport-25193-T-Willows2_cor_pcrf_sy_net_1</token><ignoreCase>false</ignoreCase><useRegEx>false</useRegEx></con:configuration></con:assertion><con:assertion type="Valid HTTP Status Codes" id="9db3d729-a3a7-4244-84b8-5ccad5112b44" name="Contains HTTP 200"><con:configuration><codes>200
-</codes></con:configuration></con:assertion><con:credentials><con:username>${#Project#user-infraportal}</con:username><con:password>${#Project#password-infraportal}</con:password><con:selectedAuthProfile>Basic</con:selectedAuthProfile><con:addedBasicAuthenticationTypes>Basic</con:addedBasicAuthenticationTypes><con:authType>Global HTTP Settings</con:authType></con:credentials><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:parameters>
-    <con:entry key="tenantId" value="ccd3946adf8e46ccb516fbb0a35db9e2"/>
-    <con:entry key="request-id" value="6e4b6ce1-4c90-4d1b-aba7-7f148bbcfeb5"/>
-</con:parameters><con:parameterOrder><con:entry>network-type</con:entry><con:entry>tenantId</con:entry><con:entry>service-type</con:entry><con:entry>aic-node-clli</con:entry></con:parameterOrder></con:restRequest></con:config></con:testStep><con:testStep type="restrequest" name="Get Network Types" id="b612f151-c8c5-4bc4-89b9-211b88d458ad"><con:settings/><con:config service="Services" resourcePath="/ecomp/mso/infra/v1/network-types" methodName="Method 1" xsi:type="con:RestRequestStep" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"><con:restRequest name="Get Network Types" id="2cec4861-6675-43b2-82ef-a732613ad46b" mediaType="application/json"><con:settings><con:setting id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers">&lt;xml-fragment/></con:setting></con:settings><con:endpoint>http://${#Project#host}</con:endpoint><con:request/><con:originalUri>http://localhost/ecomp/mso/infra/V1/vnf-types</con:originalUri><con:assertion type="Valid HTTP Status Codes" id="347865b8-b8d8-4d84-9ae9-b45725a094b0" name="Contain HTTP 200"><con:configuration><codes>200</codes></con:configuration></con:assertion><con:assertion type="Simple Contains" id="d6e3ef64-f089-451c-a670-60cc8b2406f0" name="Contains vlan"><con:configuration><token>vlan</token><ignoreCase>false</ignoreCase><useRegEx>false</useRegEx></con:configuration></con:assertion><con:assertion type="Simple Contains" id="3b20159c-94ab-4040-887c-11cb8149dc3b" name="Contains  Description"><con:configuration><token> &lt;description>Cool network&lt;/description>
-</token><ignoreCase>false</ignoreCase><useRegEx>false</useRegEx></con:configuration></con:assertion><con:credentials><con:username>${#Project#user-infraportal}</con:username><con:password>${#Project#password-infraportal}</con:password><con:selectedAuthProfile>Basic</con:selectedAuthProfile><con:addedBasicAuthenticationTypes>Basic</con:addedBasicAuthenticationTypes><con:authType>Global HTTP Settings</con:authType></con:credentials><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:parameters/><con:parameterOrder/></con:restRequest></con:config></con:testStep><con:testStep type="restrequest" name="POST Volume request" id="3a64e190-b5fc-483e-9a25-0a6f2ce333db"><con:settings/><con:config service="Services" resourcePath="/ecomp/mso/infra/v2/volume-request" methodName="Method 2" xsi:type="con:RestRequestStep" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"><con:restRequest name="POST Volume request" id="b2ee42d4-3290-4194-954b-5599ad728a8f" mediaType="application/xml" postQueryString="false"><con:settings><con:setting id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers">&lt;xml-fragment/></con:setting></con:settings><con:endpoint>http://${#Project#host}</con:endpoint><con:request><![CDATA[<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<volume-request xmlns="http://org.openecomp/mso/infra/volume-request/v1">
-    <request-info>
-        <request-id>cfbca420-14d5-4e68-ad84-b56715c946f4</request-id>
-        <action>CREATE_VF_MODULE_VOL</action>
-        <source>PORTAL</source>
-    </request-info>
-    <volume-inputs>
-    	   <vnf-id>test</vnf-id>
-        <vnf-type>Nimbus_LU2_PXTC_Svc/PXTC_v5 1</vnf-type>
-        <vf-module-model-name>PXTC_v5::module-1</vf-module-model-name>
-        <backout-on-failure>true</backout-on-failure>
-        <service-id>a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb</service-id>
-        <service-instance-id>test</service-instance-id>
-        <aic-cloud-region>rdm3</aic-cloud-region>
-        <tenant-id>eecd15e8e7ee46c3bbc2096f0924f4c4</tenant-id>
-        <volume-group-id>da9e0bdf-7d88-4111-bcad-8b72e3a5e601</volume-group-id>
-        <volume-group-name>test</volume-group-name>
-    </volume-inputs>
-</volume-request>
-]]></con:request><con:originalUri>http://localhost/ecomp/mso/infra/v3/volume-request</con:originalUri><con:assertion type="Valid HTTP Status Codes" id="4b4088c5-0c35-4234-a473-82ee5a7c47a3" name="Valid HTTP Status Codes"><con:configuration><codes>202
-</codes></con:configuration></con:assertion><con:assertion type="Simple Contains" id="e4ba3d2e-554a-4ee5-b3b0-065e18405937" name="Contains"><con:configuration><token>&lt;request-status>IN_PROGRESS&lt;/request-status></token><ignoreCase>false</ignoreCase><useRegEx>false</useRegEx></con:configuration></con:assertion><con:credentials><con:username>${#Project#user-infraportal}</con:username><con:password>${#Project#password-infraportal}</con:password><con:selectedAuthProfile>Basic</con:selectedAuthProfile><con:addedBasicAuthenticationTypes>Basic</con:addedBasicAuthenticationTypes><con:authType>Global HTTP Settings</con:authType></con:credentials><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:parameters/><con:parameterOrder/></con:restRequest></con:config></con:testStep><con:testStep type="restrequest" name="Get volume-request" id="07b3941f-5c08-40ff-8520-e05e3c07cc21"><con:settings/><con:config service="Services" resourcePath="/ecomp/mso/infra/v2/volume-request" methodName="Getinfo" xsi:type="con:RestRequestStep" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"><con:restRequest name="Get volume-request" id="706b2d9c-7802-4160-9fa2-31537f0131fb" mediaType="application/json"><con:settings><con:setting id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers">&lt;xml-fragment/></con:setting></con:settings><con:endpoint>http://${#Project#host}</con:endpoint><con:request/><con:originalUri>http://localhost/ecomp/mso/infra/v3/volume-request</con:originalUri><con:assertion type="Simple Contains" id="738527b7-addd-47e7-8c7a-1f16172ea857" name="Contains"><con:configuration><token>&lt;tenant-id>eecd15e8e7ee46c3bbc2096f0924f4c4&lt;/tenant-id></token><ignoreCase>false</ignoreCase><useRegEx>false</useRegEx></con:configuration></con:assertion><con:assertion type="Valid HTTP Status Codes" id="2eb7e819-df02-47d6-8539-e96cba65ba0b" name="Valid HTTP Status Codes"><con:configuration><codes>200
-
-</codes></con:configuration></con:assertion><con:credentials><con:username>${#Project#user-infraportal}</con:username><con:password>${#Project#password-infraportal}</con:password><con:selectedAuthProfile>Basic</con:selectedAuthProfile><con:addedBasicAuthenticationTypes>Basic</con:addedBasicAuthenticationTypes><con:authType>Global HTTP Settings</con:authType></con:credentials><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:parameters><entry key="tenantId" value="eecd15e8e7ee46c3bbc2096f0924f4c4" xmlns="http://eviware.com/soapui/config"/></con:parameters><con:parameterOrder><con:entry>tenantId</con:entry><con:entry>vnf-type</con:entry></con:parameterOrder></con:restRequest></con:config></con:testStep><con:properties/></con:testCase><con:testCase id="d7893aa1-9051-431f-a694-29d4ea4b7206" failOnError="true" failTestCaseOnErrors="true" keepSession="false" maxResults="0" name="API-Handler Infra VID" searchProperties="true"><con:settings/><con:testStep type="restrequest" name="Create Service" id="59c33a49-05c1-4abc-9f95-2085e141dd3e"><con:settings/><con:config service="Services" resourcePath="/ecomp/mso/infra/serviceInstances/v2" methodName="create service" xsi:type="con:RestRequestStep" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"><con:restRequest name="Create Service" id="8ca9d822-808a-4955-a4e6-5f56ff813fec" mediaType="application/json" postQueryString="false"><con:settings><con:setting id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers">&lt;xml-fragment/></con:setting></con:settings><con:endpoint>http://${#Project#host}</con:endpoint><con:request>{
-    "requestDetails": {
-    "modelInfo": {
-    "modelType": "service",
-    "modelInvariantId": "ff3514e3-5a33-55df-13ab-12abad84e7ff",
-    "modelNameVersionId": "fe6985cd-ea33-3346-ac12-ab121484a3fe",
-    "modelName": "dns-servicetest",
-    "modelVersion": "1.0"
-    },
-    "subscriberInfo": {
-    "globalSubscriberId": "subscriber-1",
-    "subscriberName": "testSubscriber"
-    },
-    "requestInfo": {
-    "instanceName": "DNS_TEST",
-    "source": "VID",
-    "suppressRollback": true
-    },
-    "requestParameters": {
-    "subscriptionServiceType": "MOG",
-    "userParams": [
-    {
-    "name": "someUserParam",
-    "value": "someValue"
-    }
-    ]
-    }
-    }
-    }</con:request><con:originalUri>http://localhost/ecomp/mso/infra/serviceInstances/v2</con:originalUri><con:assertion type="Valid HTTP Status Codes" id="12d5c872-b42a-4fdf-aee1-4a5b805ed255" name="Valid HTTP Status Codes"><con:configuration><codes>202
-</codes></con:configuration></con:assertion><con:credentials><con:username>${#Project#user-infraportal}</con:username><con:password>${#Project#password-infraportal}</con:password><con:selectedAuthProfile>Basic</con:selectedAuthProfile><con:addedBasicAuthenticationTypes>Basic</con:addedBasicAuthenticationTypes><con:authType>Global HTTP Settings</con:authType></con:credentials><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:parameters/></con:restRequest></con:config></con:testStep><con:testStep type="transfer" name="Create Service Property Transfer" id="13d39d15-73ea-468e-ad84-f31782d71b1d"><con:settings/><con:config xsi:type="con:PropertyTransfersStep" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"><con:transfers setNullOnMissingSource="true" transferTextContent="true" failOnError="true" ignoreEmpty="false" transferToAll="false" entitize="false" transferChildNodes="false"><con:name>transfer-to-create-vnf-request</con:name><con:sourceType>Response</con:sourceType><con:sourceStep>Create Service</con:sourceStep><con:sourcePath>$.requestReferences.instanceId</con:sourcePath><con:targetType>Request</con:targetType><con:targetStep>Create VNF</con:targetStep><con:targetPath>$.requestDetails.relatedInstanceList[0].relatedInstance.instanceId</con:targetPath><con:type>JSONPATH</con:type><con:targetTransferType>JSONPATH</con:targetTransferType><con:upgraded>true</con:upgraded></con:transfers><con:transfers setNullOnMissingSource="true" transferTextContent="true" failOnError="true" ignoreEmpty="false" transferToAll="false" entitize="false" transferChildNodes="false"><con:name>transfer-to-create-vfmodule-request</con:name><con:sourceType>Response</con:sourceType><con:sourceStep>Create Service</con:sourceStep><con:sourcePath>$.requestReferences.instanceId</con:sourcePath><con:targetType>Request</con:targetType><con:targetStep>Create VFModule</con:targetStep><con:targetPath>$.requestDetails.relatedInstanceList[0].relatedInstance.instanceId</con:targetPath><con:type>JSONPATH</con:type><con:targetTransferType>JSONPATH</con:targetTransferType><con:upgraded>true</con:upgraded></con:transfers><con:transfers setNullOnMissingSource="true" transferTextContent="true" failOnError="true" ignoreEmpty="false" transferToAll="false" entitize="false" transferChildNodes="false"><con:name>transfer-to-create-volumegroups-request</con:name><con:sourceType>Response</con:sourceType><con:sourceStep>Create Service</con:sourceStep><con:sourcePath>$.requestReferences.instanceId</con:sourcePath><con:targetType>Request</con:targetType><con:targetStep>Create VolumeGroups</con:targetStep><con:targetPath>$.requestDetails.relatedInstanceList[0].relatedInstance.instanceId</con:targetPath><con:type>JSONPATH</con:type><con:targetTransferType>JSONPATH</con:targetTransferType><con:upgraded>true</con:upgraded></con:transfers><con:transfers setNullOnMissingSource="true" transferTextContent="true" failOnError="true" disabled="false" entitize="false" ignoreEmpty="false" transferChildNodes="false" transferToAll="false" useXQuery="false"><con:name>set-testcase-serviceInstanceId-property</con:name><con:sourceType>Response</con:sourceType><con:sourceStep>Create Service</con:sourceStep><con:sourcePath>$.requestReferences.instanceId</con:sourcePath><con:targetType>serviceInstanceId</con:targetType><con:targetStep>#TestCase#</con:targetStep><con:targetPath/><con:type>JSONPATH</con:type><con:targetTransferType>XPATH</con:targetTransferType><con:upgraded>true</con:upgraded></con:transfers><con:transfers setNullOnMissingSource="true" transferTextContent="true" failOnError="true" ignoreEmpty="false" transferToAll="false" entitize="false" transferChildNodes="false"><con:name>transfer-to-create-network-request</con:name><con:sourceType>Response</con:sourceType><con:sourceStep>Create Service</con:sourceStep><con:sourcePath>$.requestReferences.instanceId</con:sourcePath><con:targetType>Request</con:targetType><con:targetStep>Create Networks</con:targetStep><con:targetPath>$.requestDetails.relatedInstanceList[0].relatedInstance.instanceId</con:targetPath><con:type>JSONPATH</con:type><con:targetTransferType>JSONPATH</con:targetTransferType><con:upgraded>true</con:upgraded></con:transfers><con:transfers setNullOnMissingSource="true" transferTextContent="true" failOnError="true" ignoreEmpty="false" transferToAll="false" entitize="false" transferChildNodes="false"><con:name>transfer-to-update-vfmodule-request</con:name><con:sourceType>Response</con:sourceType><con:sourceStep>Create Service</con:sourceStep><con:sourcePath>$.requestReferences.instanceId</con:sourcePath><con:targetType>Request</con:targetType><con:targetStep>Update VFModule</con:targetStep><con:targetPath>$.requestDetails.relatedInstanceList[0].relatedInstance.instanceId</con:targetPath><con:type>JSONPATH</con:type><con:targetTransferType>JSONPATH</con:targetTransferType><con:upgraded>true</con:upgraded></con:transfers><con:transfers setNullOnMissingSource="true" transferTextContent="true" failOnError="true" ignoreEmpty="false" transferToAll="false" entitize="false" transferChildNodes="false"><con:name>transfer-to-update-volumeGroups-request</con:name><con:sourceType>Response</con:sourceType><con:sourceStep>Create Service</con:sourceStep><con:sourcePath>$.requestReferences.instanceId</con:sourcePath><con:targetType>Request</con:targetType><con:targetStep>Update VolumeGroups</con:targetStep><con:targetPath>$.requestDetails.relatedInstanceList[0].relatedInstance.instanceId</con:targetPath><con:type>JSONPATH</con:type><con:targetTransferType>JSONPATH</con:targetTransferType><con:upgraded>true</con:upgraded></con:transfers><con:transfers setNullOnMissingSource="true" transferTextContent="true" failOnError="true" ignoreEmpty="false" transferToAll="false" entitize="false" transferChildNodes="false"><con:name>transfer-to-update-network-request</con:name><con:sourceType>Response</con:sourceType><con:sourceStep>Create Service</con:sourceStep><con:sourcePath>$.requestReferences.instanceId</con:sourcePath><con:targetType>Request</con:targetType><con:targetStep>Updaate Networks</con:targetStep><con:targetPath>$.requestDetails.relatedInstanceList[0].relatedInstance.instanceId</con:targetPath><con:type>JSONPATH</con:type><con:targetTransferType>JSONPATH</con:targetTransferType><con:upgraded>true</con:upgraded></con:transfers><con:transfers setNullOnMissingSource="true" transferTextContent="true" failOnError="true" ignoreEmpty="false" transferToAll="false" entitize="false" transferChildNodes="false"><con:name>set-testcase-requestId-property</con:name><con:sourceType>Response</con:sourceType><con:sourceStep>Create Service</con:sourceStep><con:sourcePath>$.requestReferences.requestId</con:sourcePath><con:targetType>requestId</con:targetType><con:targetStep>#TestCase#</con:targetStep><con:type>JSONPATH</con:type><con:upgraded>true</con:upgraded></con:transfers></con:config></con:testStep><con:testStep type="request" id="e3699a49-a621-42ae-baf4-e90b626dd8fa" name="Update createService Request Status"><con:settings/><con:config xsi:type="con:RequestStep" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"><con:interface>MsoRequestsDbAdapterImplPortBinding</con:interface><con:operation>updateInfraRequest</con:operation><con:request name="Update createService Request Status" outgoingWss="" incomingWss="" timeout="" sslKeystore="" useWsAddressing="false" useWsReliableMessaging="false" wssPasswordType="" id="3345e90e-035c-470b-a4e4-41765ccb8b27"><con:settings><con:setting id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers">&lt;xml-fragment/></con:setting></con:settings><con:encoding>UTF-8</con:encoding><con:endpoint>http://${#Project#host}/dbadapters/RequestsDbAdapter</con:endpoint><con:request><![CDATA[<soapenv:Envelope xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/" xmlns:req="http://org.openecomp.mso/requestsdb">
-   <soapenv:Header/>
-   <soapenv:Body>
-      <req:updateInfraRequest>
-         <requestId>${#TestCase#requestId}</requestId>
-         <lastModifiedBy>Arq</lastModifiedBy>
-         <requestStatus>COMPLETE</requestStatus>
-         <serviceInstanceId>${#TestCase#serviceInstanceId}</serviceInstanceId>
-      </req:updateInfraRequest>
-   </soapenv:Body>
-</soapenv:Envelope>]]></con:request><con:assertion type="Valid HTTP Status Codes" id="5e83a766-cff3-473e-8a6b-7a19fec9bc03" name="Valid HTTP Status Codes"><con:configuration><codes>200</codes></con:configuration></con:assertion><con:credentials><con:username>${#Project#dbadapteruser}</con:username><con:password>${#Project#dbadapterpassword}</con:password><con:selectedAuthProfile>Basic</con:selectedAuthProfile><con:addedBasicAuthenticationTypes>Basic</con:addedBasicAuthenticationTypes><con:authType>Global HTTP Settings</con:authType></con:credentials><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:wsaConfig mustUnderstand="NONE" version="200508" action="http://org.openecomp.mso/requestsdb/RequestsDbAdapter/updateInfraRequestRequest"/><con:wsrmConfig version="1.2"/></con:request></con:config></con:testStep><con:testStep type="restrequest" name="Get request by requestId" id="811c65af-f2e5-4612-b370-4d49649c76db"><con:settings/><con:config service="Services" methodName="Method 1" resourcePath="/ecomp/mso/infra/orchestrationRequests/v2/{requestId}" xsi:type="con:RestRequestStep" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"><con:restRequest name="Get request by requestId" id="15b782f7-177b-42b3-9561-60d0462c2243" mediaType="application/json"><con:settings><con:setting id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers">&lt;xml-fragment/></con:setting></con:settings><con:encoding>UTF-8</con:encoding><con:endpoint>http://${#Project#host}</con:endpoint><con:request/><con:originalUri>http://localhost/ecomp/mso/infra/orchestrationRequests/v2/7d28d657-cdad-44eb-b048-7b0bc68b795a</con:originalUri><con:assertion type="Valid HTTP Status Codes" id="fd8b9cb7-2314-413c-b359-c875c5eb7580" name="Valid HTTP Status Codes"><con:configuration><codes>200</codes></con:configuration></con:assertion><con:assertion type="Simple Contains" id="c833a119-2672-4031-809c-a888b4cee98e" name="Contains"><con:configuration><token>"requestScope":"service","requestType":"createInstance","requestDetails":{"modelInfo":{"modelCustomizationName":null,"modelInvariantId":"ff3514e3-5a33-55df-13ab-12abad84e7ff","modelType":"service","modelNameVersionId":"fe6985cd-ea33-3346-ac12-ab121484a3fe","modelName":"dns-servicetest","modelVersion":"1.0","modelCustomizationUuid":null,"modelVersionId":null,"modelCustomizationId":null},"requestInfo":{"billingAccountNumber":null,"callbackUrl":null,"correlator":null,"orderNumber":null,"productFamilyId":null,"orderVersion":null,"source":"VID","instanceName":"DNS_TEST","suppressRollback":true,"requestorId":null},"relatedInstanceList":null,"subscriberInfo":{"globalSubscriberId":"subscriber-1","subscriberName":"testSubscriber"},"cloudConfiguration":null,"requestParameters":{"subscriptionServiceType":"MOG","userParams":[{"name":"someUserParam","value":"someValue"}],"aLaCarte":false,"autoBuildVfModules":false,"cascadeDelete":false</token><ignoreCase>false</ignoreCase><useRegEx>false</useRegEx></con:configuration></con:assertion><con:assertion type="Simple Contains" id="5dc3b70b-2ea1-4787-9782-6df5a2990b29" name="Contains 1"><con:configuration><token>"serviceInstanceName":"DNS_TEST","vnfInstanceId":null,"vnfInstanceName":null,"vfModuleInstanceId":null,"vfModuleInstanceName":null,"volumeGroupInstanceId":null,"volumeGroupInstanceName":null,"networkInstanceId":null,"networkInstanceName":null,"requestorId":null},"requestStatus":{"requestState":</token><ignoreCase>false</ignoreCase><useRegEx>false</useRegEx></con:configuration></con:assertion><con:credentials><con:username>${#Project#user-infraportal}</con:username><con:password>${#Project#password-infraportal}</con:password><con:selectedAuthProfile>Basic</con:selectedAuthProfile><con:addedBasicAuthenticationTypes>Basic</con:addedBasicAuthenticationTypes><con:authType>Global HTTP Settings</con:authType></con:credentials><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:parameters><entry key="requestId" value="${#TestCase#requestId}" xmlns="http://eviware.com/soapui/config"/></con:parameters></con:restRequest></con:config></con:testStep><con:testStep type="restrequest" name="Get request by non-exist requestId" id="37deb674-64ac-42bf-be9e-3f0c8441ac90"><con:settings/><con:config service="Services" methodName="Method 1" resourcePath="/ecomp/mso/infra/orchestrationRequests/v2/{requestId}" xsi:type="con:RestRequestStep" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"><con:restRequest name="Get request by non-exist requestId" id="15b782f7-177b-42b3-9561-60d0462c2243" mediaType="application/json"><con:settings><con:setting id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers">&lt;xml-fragment/></con:setting></con:settings><con:encoding>UTF-8</con:encoding><con:endpoint>http://${#Project#host}</con:endpoint><con:request/><con:originalUri>http://localhost/ecomp/mso/infra/orchestrationRequests/v2/7d28d657-cdad-44eb-b048-7b0bc68b795a</con:originalUri><con:assertion type="Valid HTTP Status Codes" id="fd8b9cb7-2314-413c-b359-c875c5eb7580" name="Valid HTTP Status Codes"><con:configuration><codes>204</codes></con:configuration></con:assertion><con:credentials><con:username>${#Project#user-infraportal}</con:username><con:password>${#Project#password-infraportal}</con:password><con:selectedAuthProfile>Basic</con:selectedAuthProfile><con:addedBasicAuthenticationTypes>Basic</con:addedBasicAuthenticationTypes><con:authType>Global HTTP Settings</con:authType></con:credentials><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:parameters><entry key="requestId" value="wrongId" xmlns="http://eviware.com/soapui/config"/></con:parameters></con:restRequest></con:config></con:testStep><con:testStep type="restrequest" name="Create VNF" id="20ce506e-b716-401f-8789-decdf46c7d33"><con:settings/><con:config service="Services" resourcePath="/ecomp/mso/infra/serviceInstances/v2/{serviceInstanceId}/vnfs/" methodName="create vnf" xsi:type="con:RestRequestStep" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"><con:restRequest name="Create VNF" id="7f7c8648-43aa-4e16-add0-337b0fa084b4" mediaType="application/json" postQueryString="false"><con:settings><con:setting id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers">&lt;xml-fragment/></con:setting></con:settings><con:endpoint>http://${#Project#host}</con:endpoint><con:request>{"requestDetails": {
-    "cloudConfiguration":    {
-    "tenantId": "88a6ca3ee0394ade9403f075db23167e",
-    "lcpCloudRegionId": "mdt1"
-    },
-    "modelInfo":    {
-    "modelNameVersionId": "fe6478e4-ea33-3346-ac12-ab121484a3fe",
-    "modelName": "DNSResource",
-    "modelType": "vnf",
-    "modelVersion": "1.0",
-    "modelCustomizationName": "DNSResource-1",
-    "modelInvariantId": "585822c7-4027-4f84-ba50-e9248606f112"
-    },
-    "relatedInstanceList": [{"relatedInstance":    {
-    "modelInfo":       {
-    "modelNameVersionId": "fe6985cd-ea33-3346-ac12-ab121484a3fe",
-    "modelName": "dns-servicetest",
-    "modelType": "service",
-    "modelVersion": "1.0",
-    "modelInvariantId": "ff3514e3-5a33-55df-13ab-12abad84e7ff"
-    },
-    "instanceId": "a82d6977-6493-484f-ae8c-1b2f442e0d82"
-    }}],
-    "requestInfo":    {
-    "productFamilyId": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb",
-    "suppressRollback": false,
-    "source": "VID",
-    "instanceName": "DNSTEST1"
-    },
-    "requestParameters": {}
-    }}</con:request><con:originalUri>http://localhost/ecomp/mso/infra/serviceInstances/v2/3713d5de-942f-41c4-a1b7-08245bc640cc/vnfs/</con:originalUri><con:assertion type="Valid HTTP Status Codes" id="478ef19d-e1a1-458b-9c60-fab49033c4fc" name="Valid HTTP Status Codes"><con:configuration><codes>202</codes></con:configuration></con:assertion><con:credentials><con:username>${#Project#user-infraportal}</con:username><con:password>${#Project#password-infraportal}</con:password><con:selectedAuthProfile>Basic</con:selectedAuthProfile><con:addedBasicAuthenticationTypes>Basic</con:addedBasicAuthenticationTypes><con:authType>Global HTTP Settings</con:authType></con:credentials><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:parameters><entry key="serviceInstanceId" value="${#TestCase#serviceInstanceId}" xmlns="http://eviware.com/soapui/config"/></con:parameters></con:restRequest></con:config></con:testStep><con:testStep type="restrequest" name="Get requests by filter criteria" id="6598304b-03ca-446f-ac54-cb476676c498"><con:settings/><con:config service="Services" methodName="Get requests by filter criteria" resourcePath="/ecomp/mso/infra/orchestrationRequests/v2" xsi:type="con:RestRequestStep" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"><con:restRequest name="Get requests by filter criteria" id="d741dc21-377b-4591-9acb-fd1d04274840" mediaType="application/json"><con:settings><con:setting id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers">&lt;xml-fragment/></con:setting></con:settings><con:encoding>UTF-8</con:encoding><con:endpoint>http://${#Project#host}</con:endpoint><con:request/><con:originalUri>http://localhost/orchestrationRequests/v2</con:originalUri><con:assertion type="Valid HTTP Status Codes" id="a2f402c5-f144-473b-a4f3-862e4319b621" name="Valid HTTP Status Codes"><con:configuration><codes>200</codes></con:configuration></con:assertion><con:assertion type="Simple Contains" id="38ac45b8-bda3-4330-bc3c-029d8243d953" name="ServiceRequest1"><con:configuration><token>"requestScope":"service","requestType":"createInstance","requestDetails":{"modelInfo":{"modelCustomizationName":null,"modelInvariantId":"ff3514e3-5a33-55df-13ab-12abad84e7ff","modelType":"service","modelNameVersionId":"fe6985cd-ea33-3346-ac12-ab121484a3fe","modelName":"dns-servicetest","modelVersion":"1.0","modelCustomizationUuid":null,"modelVersionId":null,"modelCustomizationId":null},"requestInfo":{"billingAccountNumber":null,"callbackUrl":null,"correlator":null,"orderNumber":null,"productFamilyId":null,"orderVersion":null,"source":"VID","instanceName":"DNS_TEST","suppressRollback":true,"requestorId":null},"relatedInstanceList":null,"subscriberInfo":{"globalSubscriberId":"subscriber-1","subscriberName":"testSubscriber"},"cloudConfiguration":null,"requestParameters":{"subscriptionServiceType":"MOG","userParams":[{"name":"someUserParam","value":"someValue"}],"aLaCarte":false,"autoBuildVfModules":false,"cascadeDelete":false,</token><ignoreCase>false</ignoreCase><useRegEx>false</useRegEx></con:configuration></con:assertion><con:assertion type="Simple Contains" id="464082d8-8d8e-49cb-9084-f29c8efec857" name="ServiceRequest2"><con:configuration><token>"serviceInstanceName":"DNS_TEST","vnfInstanceId":null,"vnfInstanceName":null,"vfModuleInstanceId":null,"vfModuleInstanceName":null,"volumeGroupInstanceId":null,"volumeGroupInstanceName":null,"networkInstanceId":null,"networkInstanceName":null,"requestorId":null},"requestStatus":{"requestState":"</token><ignoreCase>false</ignoreCase><useRegEx>false</useRegEx></con:configuration></con:assertion><con:assertion type="JsonPath Count" id="bca82018-42f3-479f-a6db-e4dd2d3d1628" name="No. of requests"><con:configuration><path>$.requestList</path><content>2</content><allowWildcards>false</allowWildcards><ignoreNamspaceDifferences>false</ignoreNamspaceDifferences><ignoreComments>false</ignoreComments></con:configuration></con:assertion><con:assertion type="Simple Contains" id="893c17d5-8d91-4693-8e36-979d820bed03" name="VnfRequest1"><con:configuration><token>"requestScope":"vnf","requestType":"createInstance","requestDetails":{"modelInfo":{"modelCustomizationName":"DNSResource-1","modelInvariantId":"585822c7-4027-4f84-ba50-e9248606f112","modelType":"vnf","modelNameVersionId":"fe6478e4-ea33-3346-ac12-ab121484a3fe","modelName":"DNSResource","modelVersion":"1.0","modelCustomizationUuid":null,"modelVersionId":null,"modelCustomizationId":null},"requestInfo":{"billingAccountNumber":null,"callbackUrl":null,"correlator":null,"orderNumber":null,"productFamilyId":"a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb","orderVersion":null,"source":"VID","instanceName":"DNSTEST1","suppressRollback":false,"requestorId":null},"relatedInstanceList":[{"relatedInstance":{"instanceName":null,"instanceId":"</token><ignoreCase>false</ignoreCase><useRegEx>false</useRegEx></con:configuration></con:assertion><con:assertion type="Simple Contains" id="d6d4bfbb-a9b6-47bf-bd6c-c46147735689" name="VnfRequest2"><con:configuration><token>"modelInfo":{"modelCustomizationName":null,"modelInvariantId":"ff3514e3-5a33-55df-13ab-12abad84e7ff","modelType":"service","modelNameVersionId":"fe6985cd-ea33-3346-ac12-ab121484a3fe","modelName":"dns-servicetest","modelVersion":"1.0","modelCustomizationUuid":null,"modelVersionId":null,"modelCustomizationId":null}}}],"subscriberInfo":null,"cloudConfiguration":{"aicNodeClli":null,"tenantId":"88a6ca3ee0394ade9403f075db23167e","lcpCloudRegionId":"mdt1"},"requestParameters":{"subscriptionServiceType":null,"userParams":[],"aLaCarte":false,"autoBuildVfModules":false,"cascadeDelete":false,</token><ignoreCase>false</ignoreCase><useRegEx>false</useRegEx></con:configuration></con:assertion><con:assertion type="Simple Contains" id="836ce80d-4b9c-432c-9bc4-b14a549c8afe" name="VnfRequest3"><con:configuration><token>"serviceInstanceName":null,"vnfInstanceId":null,"vnfInstanceName":"DNSTEST1","vfModuleInstanceId":null,"vfModuleInstanceName":null,"volumeGroupInstanceId":null,"volumeGroupInstanceName":null,"networkInstanceId":null,"networkInstanceName":null,"requestorId":null},"requestStatus":{"requestState":</token><ignoreCase>false</ignoreCase><useRegEx>false</useRegEx></con:configuration></con:assertion><con:credentials><con:username>${#Project#user-infraportal}</con:username><con:password>${#Project#password-infraportal}</con:password><con:selectedAuthProfile>Basic</con:selectedAuthProfile><con:addedBasicAuthenticationTypes>Basic</con:addedBasicAuthenticationTypes><con:authType>Global HTTP Settings</con:authType></con:credentials><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:parameters><entry key="filter" value="serviceInstanceId:EQUALS:${#TestCase#serviceInstanceId}" xmlns="http://eviware.com/soapui/config"/></con:parameters><con:parameterOrder><con:entry>filter</con:entry></con:parameterOrder></con:restRequest></con:config></con:testStep><con:testStep type="transfer" name="Create VNF Property Transfer" id="418d759d-acb8-4723-b8b3-e09f32e26bd7"><con:settings/><con:config xsi:type="con:PropertyTransfersStep" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"><con:transfers setNullOnMissingSource="true" transferTextContent="true" failOnError="true" ignoreEmpty="false" transferToAll="false" entitize="false" transferChildNodes="false"><con:name>transfer-to-create-vfmodule-request</con:name><con:sourceType>Response</con:sourceType><con:sourceStep>Create VNF</con:sourceStep><con:sourcePath>$.requestReferences.instanceId</con:sourcePath><con:targetType>Request</con:targetType><con:targetStep>Create VFModule</con:targetStep><con:targetPath>$.requestDetails.relatedInstanceList[1].relatedInstance.instanceId</con:targetPath><con:type>JSONPATH</con:type><con:targetTransferType>JSONPATH</con:targetTransferType><con:upgraded>true</con:upgraded></con:transfers><con:transfers setNullOnMissingSource="true" transferTextContent="true" failOnError="true" ignoreEmpty="false" transferToAll="false" entitize="false" transferChildNodes="false"><con:name>set-testcase-requestId-property</con:name><con:sourceType>Response</con:sourceType><con:sourceStep>Create VNF</con:sourceStep><con:sourcePath>$.requestReferences.requestId</con:sourcePath><con:targetType>requestId</con:targetType><con:targetStep>#TestCase#</con:targetStep><con:targetPath/><con:type>JSONPATH</con:type><con:targetTransferType>XPATH</con:targetTransferType><con:upgraded>true</con:upgraded></con:transfers><con:transfers setNullOnMissingSource="true" transferTextContent="true" failOnError="true" ignoreEmpty="false" transferToAll="false" entitize="false" transferChildNodes="false"><con:name>set-testcase-vnfInstanceId-property</con:name><con:sourceType>Response</con:sourceType><con:sourceStep>Create VNF</con:sourceStep><con:sourcePath>$.requestReferences.instanceId</con:sourcePath><con:targetType>vnfInstanceId</con:targetType><con:targetStep>#TestCase#</con:targetStep><con:targetPath/><con:type>JSONPATH</con:type><con:targetTransferType>XPATH</con:targetTransferType><con:upgraded>true</con:upgraded></con:transfers><con:transfers setNullOnMissingSource="true" transferTextContent="true" failOnError="true" ignoreEmpty="false" transferToAll="false" entitize="false" transferChildNodes="false"><con:name>transfer-to-create-volumegroups-request</con:name><con:sourceType>Response</con:sourceType><con:sourceStep>Create VNF</con:sourceStep><con:sourcePath>$.requestReferences.instanceId</con:sourcePath><con:targetType>Request</con:targetType><con:targetStep>Create VolumeGroups</con:targetStep><con:targetPath>$.requestDetails.relatedInstanceList[1].relatedInstance.instanceId</con:targetPath><con:type>JSONPATH</con:type><con:targetTransferType>JSONPATH</con:targetTransferType><con:upgraded>true</con:upgraded></con:transfers><con:transfers setNullOnMissingSource="true" transferTextContent="true" failOnError="true" ignoreEmpty="false" transferToAll="false" entitize="false" transferChildNodes="false"><con:name>transfer-to-update-volumegroups-request</con:name><con:sourceType>Response</con:sourceType><con:sourceStep>Create VNF</con:sourceStep><con:sourcePath>$.requestReferences.instanceId</con:sourcePath><con:targetType>Request</con:targetType><con:targetStep>Update VolumeGroups</con:targetStep><con:targetPath>$.requestDetails.relatedInstanceList[1].relatedInstance.instanceId</con:targetPath><con:type>JSONPATH</con:type><con:targetTransferType>JSONPATH</con:targetTransferType><con:upgraded>true</con:upgraded></con:transfers><con:transfers setNullOnMissingSource="true" transferTextContent="true" failOnError="true" disabled="false" entitize="false" ignoreEmpty="false" transferChildNodes="false" transferToAll="false" useXQuery="false"><con:name>transfer-to-update-vfmodule-request</con:name><con:sourceType>Response</con:sourceType><con:sourceStep>Create VNF</con:sourceStep><con:sourcePath>$.requestReferences.instanceId</con:sourcePath><con:targetType>Request</con:targetType><con:targetStep>Update VFModule</con:targetStep><con:targetPath>$.requestDetails.relatedInstanceList[1].relatedInstance.instanceId</con:targetPath><con:type>JSONPATH</con:type><con:targetTransferType>JSONPATH</con:targetTransferType><con:upgraded>true</con:upgraded></con:transfers></con:config></con:testStep><con:testStep type="request" id="1713afe9-f2fb-463d-b419-3a263ab55a83" name="Update createVNF Request Status"><con:settings/><con:config xsi:type="con:RequestStep" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"><con:interface>MsoRequestsDbAdapterImplPortBinding</con:interface><con:operation>updateInfraRequest</con:operation><con:request name="Update createVNF Request Status" outgoingWss="" incomingWss="" timeout="" sslKeystore="" useWsAddressing="false" useWsReliableMessaging="false" wssPasswordType="" id="3345e90e-035c-470b-a4e4-41765ccb8b27"><con:settings><con:setting id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers">&lt;xml-fragment/></con:setting></con:settings><con:encoding>UTF-8</con:encoding><con:endpoint>http://${#Project#host}/dbadapters/RequestsDbAdapter</con:endpoint><con:request><![CDATA[<soapenv:Envelope xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/" xmlns:req="http://org.openecomp.mso/requestsdb">
-   <soapenv:Header/>
-   <soapenv:Body>
-      <req:updateInfraRequest>
-         <requestId>${#TestCase#requestId}</requestId>
-         <lastModifiedBy>Arq</lastModifiedBy>
-         <requestStatus>COMPLETE</requestStatus>
-         <serviceInstanceId>${#TestCase#serviceInstanceId}</serviceInstanceId>
-      </req:updateInfraRequest>
-   </soapenv:Body>
-</soapenv:Envelope>]]></con:request><con:assertion type="Valid HTTP Status Codes" id="5e83a766-cff3-473e-8a6b-7a19fec9bc03" name="Valid HTTP Status Codes"><con:configuration><codes>200</codes></con:configuration></con:assertion><con:credentials><con:username>${#Project#dbadapteruser}</con:username><con:password>${#Project#dbadapterpassword}</con:password><con:selectedAuthProfile>Basic</con:selectedAuthProfile><con:addedBasicAuthenticationTypes>Basic</con:addedBasicAuthenticationTypes><con:authType>Global HTTP Settings</con:authType></con:credentials><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:wsaConfig mustUnderstand="NONE" version="200508" action="http://org.openecomp.mso/requestsdb/RequestsDbAdapter/updateInfraRequestRequest"/><con:wsrmConfig version="1.2"/></con:request></con:config></con:testStep><con:testStep type="restrequest" name="Create VFModule" id="e69b06b4-0260-45df-ba24-bd2d19f70c34"><con:settings/><con:config service="Services" resourcePath="/ecomp/mso/infra/serviceInstances/v2/{serviceInstanceId}/vnfs/{vnfInstanceId}/vfModules" methodName="create module" xsi:type="con:RestRequestStep" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"><con:restRequest name="Create VFModule" id="f089d62a-371a-4596-81c8-0fd7febdefe1" mediaType="application/json" postQueryString="false"><con:settings><con:setting id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers">&lt;xml-fragment/></con:setting></con:settings><con:endpoint>http://${#Project#host}</con:endpoint><con:request>{"requestDetails": {
-    "cloudConfiguration":    {
-    "tenantId": "88a6ca3ee0394ade9403f075db23167e",
-    "lcpCloudRegionId": "MT"
-    },
-    "modelInfo":    {
-    "modelNameVersionId": "fe6478e5-ea33-3346-ac12-ab121484a3fe",
-    "modelName": "VF_DNS::module-1",
-    "modelType": "vfModule",
-    "modelVersion": "1.0",
-    "modelInvariantId": "585822c7-4027-4f84-ba50-e9248606f132"
-    },
-    "relatedInstanceList":    [
-    {"relatedInstance":       {
-    "modelInfo":          {
-    "modelNameVersionId": "1e34774e-715e-4fd6-bd09-7b654622f35i",
-    "modelName": "dns-servicetest",
-    "modelType": "service",
-    "modelVersion": "1.0",
-    "modelInvariantId": "585822c8-4027-4f84-ba50-e9248606f111"
-    },
-    "instanceId": "a82d6977-6493-484f-ae8c-1b2f442e0d82"
-    }},
-    {"relatedInstance":       {
-    "modelInfo":          {
-    "modelNameVersionId": "fe6478e4-ea33-3346-ac12-ab121484a3fe",
-    "modelName": "DNSResource",
-    "modelType": "vnf",
-    "modelVersion": "1.0",
-    "modelCustomizationName": "DNSResource-1",
-    "modelInvariantId": "585822c7-4027-4f84-ba50-e9248606f112"
-    },
-    "instanceId": "f90f877a-3c08-43f1-b1eb-e0bd282c0b81"
-    }}
-    ],
-    "requestInfo":    {
-    "suppressRollback": true,
-    "source": "VID",
-    "instanceName": "VF_DNS-base-module-1"
-    },
-    "requestParameters": {"userParams": []}
-    }}</con:request><con:originalUri>http://localhost/ecomp/mso/infra/serviceInstances/v2/3713d5de-942f-41c4-a1b7-08245bc640cc/vnfs/132677e7-8ed2-4a51-9758-9eff2c608d90/vfModules</con:originalUri><con:assertion type="Valid HTTP Status Codes" id="61f913c1-b7ca-49e0-9bb3-81f37632a438" name="Valid HTTP Status Codes"><con:configuration><codes>202</codes></con:configuration></con:assertion><con:credentials><con:username>${#Project#user-infraportal}</con:username><con:password>${#Project#password-infraportal}</con:password><con:selectedAuthProfile>Basic</con:selectedAuthProfile><con:addedBasicAuthenticationTypes>Basic</con:addedBasicAuthenticationTypes><con:authType>Global HTTP Settings</con:authType></con:credentials><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:parameters>
-    <con:entry key="serviceInstanceId" value="${#TestCase#serviceInstanceId}"/>
-    <con:entry key="vnfInstanceId" value="${#TestCase#vnfInstanceId}"/>
-</con:parameters><con:parameterOrder><con:entry>serviceInstanceId</con:entry><con:entry>vnfInstanceId</con:entry></con:parameterOrder></con:restRequest></con:config></con:testStep><con:testStep type="transfer" name="Create vfModule Property Transfer" id="46f6f3a8-cda2-479b-977e-e606a3ba8bd5"><con:settings/><con:config xsi:type="con:PropertyTransfersStep" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"><con:transfers setNullOnMissingSource="true" transferTextContent="true" failOnError="true" disabled="false" entitize="false" ignoreEmpty="false" transferChildNodes="false" transferToAll="false" useXQuery="false"><con:name>set-testcase-vfModuleInstanceId-property</con:name><con:sourceType>Response</con:sourceType><con:sourceStep>Create VFModule</con:sourceStep><con:sourcePath>$.requestReferences.instanceId</con:sourcePath><con:targetType>vfModuleInstanceId</con:targetType><con:targetStep>#TestCase#</con:targetStep><con:targetPath xsi:nil="true"/><con:type>JSONPATH</con:type><con:targetTransferType>XPATH</con:targetTransferType><con:upgraded>true</con:upgraded></con:transfers><con:transfers setNullOnMissingSource="true" transferTextContent="true" failOnError="true" ignoreEmpty="false" transferToAll="false" entitize="false" transferChildNodes="false"><con:name>set-testcase-requestId-property</con:name><con:sourceType>Response</con:sourceType><con:sourceStep>Create VFModule</con:sourceStep><con:sourcePath>$.requestReferences.requestId</con:sourcePath><con:targetType>requestId</con:targetType><con:targetStep>#TestCase#</con:targetStep><con:type>JSONPATH</con:type><con:upgraded>true</con:upgraded></con:transfers></con:config></con:testStep><con:testStep type="request" id="194a5dd0-9d2f-4b96-9df4-49fd89c80eb1" name="Update createVFModule Request Status"><con:settings/><con:config xsi:type="con:RequestStep" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"><con:interface>MsoRequestsDbAdapterImplPortBinding</con:interface><con:operation>updateInfraRequest</con:operation><con:request name="Update createVFModule Request Status" outgoingWss="" incomingWss="" timeout="" sslKeystore="" useWsAddressing="false" useWsReliableMessaging="false" wssPasswordType="" id="3345e90e-035c-470b-a4e4-41765ccb8b27"><con:settings><con:setting id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers">&lt;xml-fragment/></con:setting></con:settings><con:encoding>UTF-8</con:encoding><con:endpoint>http://${#Project#host}/dbadapters/RequestsDbAdapter</con:endpoint><con:request><![CDATA[<soapenv:Envelope xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/" xmlns:req="http://org.openecomp.mso/requestsdb">
-   <soapenv:Header/>
-   <soapenv:Body>
-      <req:updateInfraRequest>
-         <requestId>${#TestCase#requestId}</requestId>
-         <lastModifiedBy>Arq</lastModifiedBy>
-         <requestStatus>COMPLETE</requestStatus>
-         <serviceInstanceId>${#TestCase#serviceInstanceId}</serviceInstanceId>
-      </req:updateInfraRequest>
-   </soapenv:Body>
-</soapenv:Envelope>]]></con:request><con:assertion type="Valid HTTP Status Codes" id="5e83a766-cff3-473e-8a6b-7a19fec9bc03" name="Valid HTTP Status Codes"><con:configuration><codes>200</codes></con:configuration></con:assertion><con:credentials><con:username>${#Project#dbadapteruser}</con:username><con:password>${#Project#dbadapterpassword}</con:password><con:selectedAuthProfile>Basic</con:selectedAuthProfile><con:addedBasicAuthenticationTypes>Basic</con:addedBasicAuthenticationTypes><con:authType>Global HTTP Settings</con:authType></con:credentials><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:wsaConfig mustUnderstand="NONE" version="200508" action="http://org.openecomp.mso/requestsdb/RequestsDbAdapter/updateInfraRequestRequest"/><con:wsrmConfig version="1.2"/></con:request></con:config></con:testStep><con:testStep type="restrequest" name="Update VFModule" id="2639ceeb-a126-420c-99a5-d04fb1bf6e50"><con:settings/><con:config service="Services" methodName="update module" resourcePath="/ecomp/mso/infra/serviceInstances/v2/{serviceInstanceId}/vnfs/{vnfInstanceId}/vfModules/{vfModuleInstanceId}" xsi:type="con:RestRequestStep" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"><con:restRequest name="Update VFModule" id="7d1717bf-6b38-478e-ba34-405fa35ec7e6" mediaType="application/json" postQueryString="false"><con:settings><con:setting id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers">&lt;xml-fragment/></con:setting></con:settings><con:encoding>UTF-8</con:encoding><con:endpoint>http://${#Project#host}</con:endpoint><con:request>{"requestDetails": {
-    "modelInfo":    {
-    "modelNameVersionId": "fe6478e5-ea33-3346-ac12-ab121484a3fe",
-    "modelName": "VF_DNS::module-1",
-    "modelType": "vfModule",
-    "modelVersion": "1.0",
-    "modelInvariantId": "585822c7-4027-4f84-ba50-e9248606f132"
-    },
-    "cloudConfiguration":    {
-    "tenantId": "88a6ca3ee0394ade9403f075db23167e",
-    "lcpCloudRegionId": "MT"
-    },
-    "relatedInstanceList":    [
-    {"relatedInstance":       {
-    "modelInfo":          {
-    "modelNameVersionId": "1e34774e-715e-4fd6-bd09-7b654622f35i",
-    "modelName": "dns-servicetest",
-    "modelType": "service",
-    "modelVersion": "1.0",
-    "modelInvariantId": "585822c8-4027-4f84-ba50-e9248606f111"
-    },
-    "instanceId": "a82d6977-6493-484f-ae8c-1b2f442e0d82"
-    }},
-    {"relatedInstance":       {
-    "modelInfo":          {
-    "modelNameVersionId": "fe6478e4-ea33-3346-ac12-ab121484a3fe",
-    "modelName": "DNSResource",
-    "modelType": "vnf",
-    "modelVersion": "1.0",
-    "modelCustomizationName": "DNSResource-1",
-    "modelInvariantId": "585822c7-4027-4f84-ba50-e9248606f112"
-    },
-    "instanceId": "f90f877a-3c08-43f1-b1eb-e0bd282c0b81"
-    }}
-    ],
-    "requestInfo":    {
-    "source": "VID",
-    "suppressRollback": true,
-    "instanceName": "VF_DNS-base-module-1"
-    },
-    "requestParameters": {"userParams": []}
-    }}</con:request><con:originalUri>http://localhost/ecomp/mso/infra/serviceInstances/v2//vnfs//vfModules/</con:originalUri><con:assertion type="Valid HTTP Status Codes" id="8b90c4fa-db9e-410e-b863-1711a7a45921" name="Valid HTTP Status Codes"><con:configuration><codes>202</codes></con:configuration></con:assertion><con:credentials><con:authType>No Authorization</con:authType></con:credentials><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:parameters>
-    <con:entry key="vfModuleInstanceId" value="${#TestCase#vfModuleInstanceId}"/>
-    <con:entry key="serviceInstanceId" value="${#TestCase#serviceInstanceId}"/>
-    <con:entry key="vnfInstanceId" value="${#TestCase#vnfInstanceId}"/>
-</con:parameters></con:restRequest></con:config></con:testStep><con:testStep type="transfer" name="Update vfModule Property Transfer" id="e1ab850f-1310-4ee0-adc7-7240d92af39e"><con:settings/><con:config xsi:type="con:PropertyTransfersStep" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"><con:transfers setNullOnMissingSource="true" transferTextContent="true" failOnError="true" ignoreEmpty="false" transferToAll="false" entitize="false" transferChildNodes="false"><con:name>set-testcase-requestId-property</con:name><con:sourceType>Response</con:sourceType><con:sourceStep>Update VFModule</con:sourceStep><con:sourcePath>$.requestReferences.requestId</con:sourcePath><con:targetType>requestId</con:targetType><con:targetStep>#TestCase#</con:targetStep><con:type>JSONPATH</con:type><con:upgraded>true</con:upgraded></con:transfers></con:config></con:testStep><con:testStep type="request" id="38d92c66-a9af-404f-aee7-9f9d0ff1a74c" name="Update updateVfModule Request Status"><con:settings/><con:config xsi:type="con:RequestStep" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"><con:interface>MsoRequestsDbAdapterImplPortBinding</con:interface><con:operation>updateInfraRequest</con:operation><con:request name="Update updateVfModule Request Status" outgoingWss="" incomingWss="" timeout="" sslKeystore="" useWsAddressing="false" useWsReliableMessaging="false" wssPasswordType="" id="3345e90e-035c-470b-a4e4-41765ccb8b27"><con:settings><con:setting id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers">&lt;xml-fragment/></con:setting></con:settings><con:encoding>UTF-8</con:encoding><con:endpoint>http://${#Project#host}/dbadapters/RequestsDbAdapter</con:endpoint><con:request><![CDATA[<soapenv:Envelope xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/" xmlns:req="http://org.openecomp.mso/requestsdb">
-   <soapenv:Header/>
-   <soapenv:Body>
-      <req:updateInfraRequest>
-         <requestId>${#TestCase#requestId}</requestId>
-         <lastModifiedBy>Arq</lastModifiedBy>
-         <requestStatus>COMPLETE</requestStatus>
-         <serviceInstanceId>${#TestCase#serviceInstanceId}</serviceInstanceId>
-      </req:updateInfraRequest>
-   </soapenv:Body>
-</soapenv:Envelope>]]></con:request><con:assertion type="Valid HTTP Status Codes" id="5e83a766-cff3-473e-8a6b-7a19fec9bc03" name="Valid HTTP Status Codes"><con:configuration><codes>200</codes></con:configuration></con:assertion><con:credentials><con:username>${#Project#dbadapteruser}</con:username><con:password>${#Project#dbadapterpassword}</con:password><con:selectedAuthProfile>Basic</con:selectedAuthProfile><con:addedBasicAuthenticationTypes>Basic</con:addedBasicAuthenticationTypes><con:authType>Global HTTP Settings</con:authType></con:credentials><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:wsaConfig mustUnderstand="NONE" version="200508" action="http://org.openecomp.mso/requestsdb/RequestsDbAdapter/updateInfraRequestRequest"/><con:wsrmConfig version="1.2"/></con:request></con:config></con:testStep><con:testStep type="restrequest" name="Delete VFModule" id="a1618a7e-bdf7-45df-bf0f-27af2728f44a"><con:settings/><con:config service="Services" methodName="delete module" resourcePath="/ecomp/mso/infra/serviceInstances/v2/{serviceInstanceId}/vnfs/{vnfInstanceId}/vfModules/{vfModuleInstanceId}" xsi:type="con:RestRequestStep" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"><con:restRequest name="Delete VFModule" id="5ca872a8-1c43-4c40-b68d-52ce3dba6ab1" mediaType="application/json" postQueryString="false"><con:settings><con:setting id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers">&lt;xml-fragment/></con:setting></con:settings><con:encoding>UTF-8</con:encoding><con:endpoint>http://${#Project#host}</con:endpoint><con:request>{"requestDetails": {
-    "modelInfo":{
-    "modelCustomizationName":"ebad642f-a0e6-49bd-90a5 1",
-    "modelNameVersionId": "fe6478e5-ea33-3346-ac12-ab121484a3fe",
-    "modelName": "VF_DNS::module-1",
-    "modelType": "vfModule",
-    "modelVersion": "1.0",
-    "modelInvariantId": "585822c7-4027-4f84-ba50-e9248606f132"
-    },
-    "requestInfo":{
-    "source":"VID"
-    },
-    "cloudConfiguration":{
-    "tenantId": "88a6ca3ee0394ade9403f075db23167e",
-    "lcpCloudRegionId": "MT"
-    }
-    }}
-</con:request><con:originalUri>http://localhost/ecomp/mso/infra/serviceInstances/v2//vnfs//vfModules/</con:originalUri><con:assertion type="Valid HTTP Status Codes" id="98e18a91-749f-4b11-b6c6-c41c759c1a18" name="Valid HTTP Status Codes"><con:configuration><codes>202</codes></con:configuration></con:assertion><con:credentials><con:authType>No Authorization</con:authType></con:credentials><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:parameters>
-    <con:entry key="serviceInstanceId" value="${#TestCase#serviceInstanceId}"/>
-    <con:entry key="vfModuleInstanceId" value="${#TestCase#vfModuleInstanceId}"/>
-    <con:entry key="vnfInstanceId" value="${#TestCase#vnfInstanceId}"/>
-</con:parameters></con:restRequest></con:config></con:testStep><con:testStep type="transfer" name="Delete vfModule Property Transfer" id="3e23a7fa-ad2e-432b-8fc2-0b6df87f4a57"><con:settings/><con:config xsi:type="con:PropertyTransfersStep" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"><con:transfers setNullOnMissingSource="true" transferTextContent="true" failOnError="true" ignoreEmpty="false" transferToAll="false" entitize="false" transferChildNodes="false"><con:name>set-testcase-requestId-property</con:name><con:sourceType>Response</con:sourceType><con:sourceStep>Delete VFModule</con:sourceStep><con:sourcePath>$.requestReferences.requestId</con:sourcePath><con:targetType>requestId</con:targetType><con:targetStep>#TestCase#</con:targetStep><con:type>JSONPATH</con:type><con:upgraded>true</con:upgraded></con:transfers></con:config></con:testStep><con:testStep type="request" id="c4427ab0-8f99-45cd-9a3b-1ff6f11d343e" name="Update deleteVfModule Request Status"><con:settings/><con:config xsi:type="con:RequestStep" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"><con:interface>MsoRequestsDbAdapterImplPortBinding</con:interface><con:operation>updateInfraRequest</con:operation><con:request name="Update deleteVfModule Request Status" outgoingWss="" incomingWss="" timeout="" sslKeystore="" useWsAddressing="false" useWsReliableMessaging="false" wssPasswordType="" id="3345e90e-035c-470b-a4e4-41765ccb8b27"><con:settings><con:setting id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers">&lt;xml-fragment/></con:setting></con:settings><con:encoding>UTF-8</con:encoding><con:endpoint>http://${#Project#host}/dbadapters/RequestsDbAdapter</con:endpoint><con:request><![CDATA[<soapenv:Envelope xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/" xmlns:req="http://org.openecomp.mso/requestsdb">
-   <soapenv:Header/>
-   <soapenv:Body>
-      <req:updateInfraRequest>
-         <requestId>${#TestCase#requestId}</requestId>
-         <lastModifiedBy>Arq</lastModifiedBy>
-         <requestStatus>COMPLETE</requestStatus>
-         <serviceInstanceId>${#TestCase#serviceInstanceId}</serviceInstanceId>
-      </req:updateInfraRequest>
-   </soapenv:Body>
-</soapenv:Envelope>]]></con:request><con:assertion type="Valid HTTP Status Codes" id="5e83a766-cff3-473e-8a6b-7a19fec9bc03" name="Valid HTTP Status Codes"><con:configuration><codes>200</codes></con:configuration></con:assertion><con:credentials><con:username>${#Project#dbadapteruser}</con:username><con:password>${#Project#dbadapterpassword}</con:password><con:selectedAuthProfile>Basic</con:selectedAuthProfile><con:addedBasicAuthenticationTypes>Basic</con:addedBasicAuthenticationTypes><con:authType>Global HTTP Settings</con:authType></con:credentials><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:wsaConfig mustUnderstand="NONE" version="200508" action="http://org.openecomp.mso/requestsdb/RequestsDbAdapter/updateInfraRequestRequest"/><con:wsrmConfig version="1.2"/></con:request></con:config></con:testStep><con:testStep type="restrequest" name="Delete VNF" id="fed5f959-7d1c-43ff-a9f1-5d65fca3ecd2"><con:settings/><con:config service="Services" methodName="delete vnf" resourcePath="/ecomp/mso/infra/serviceInstances/v2/{serviceInstanceId}/vnfs/{vnfInstanceId}" xsi:type="con:RestRequestStep" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"><con:restRequest name="Delete VNF" id="1edcd783-0add-437d-b81c-f7ff3585b8de" mediaType="application/json" postQueryString="false"><con:settings><con:setting id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers">&lt;xml-fragment/></con:setting></con:settings><con:encoding>UTF-8</con:encoding><con:endpoint>http://${#Project#host}</con:endpoint><con:request>{"requestDetails": {
-    "modelInfo":{
-    "modelNameVersionId": "fe6478e4-ea33-3346-ac12-ab121484a3fe",
-    "modelName": "DNSResource",
-    "modelType": "vnf",
-    "modelVersion": "1.0",
-    "modelCustomizationName": "DNSResource-1",
-    "modelInvariantId": "585822c7-4027-4f84-ba50-e9248606f112"
-    },
-    "requestInfo":{
-    "source":"VID"
-    },
-    "cloudConfiguration":{
-    "tenantId": "88a6ca3ee0394ade9403f075db23167e",
-    "lcpCloudRegionId": "mdt1"
-    }
-    }}
-</con:request><con:originalUri>http://localhost/ecomp/mso/infra/serviceInstances/v2/1abf1f1f-513c-4e9a-8294-a0932339a788/vnfs/65833f1d-d2ec-42ef-a316-c44be958acf7</con:originalUri><con:assertion type="Valid HTTP Status Codes" id="609f475a-0773-4368-9f63-61c6f6ec6633" name="Valid HTTP Status Codes"><con:configuration><codes>202</codes></con:configuration></con:assertion><con:credentials><con:authType>No Authorization</con:authType></con:credentials><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:parameters>
-    <con:entry key="serviceInstanceId" value="${#TestCase#serviceInstanceId}"/>
-    <con:entry key="vnfInstanceId" value="${#TestCase#vnfInstanceId}"/>
-</con:parameters></con:restRequest></con:config></con:testStep><con:testStep type="transfer" name="DeleteVNF Property Transfer" id="ab316f65-2d87-4a5f-8062-65ab35d27bb9"><con:settings/><con:config xsi:type="con:PropertyTransfersStep" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"><con:transfers setNullOnMissingSource="true" transferTextContent="true" failOnError="true" ignoreEmpty="false" transferToAll="false" entitize="false" transferChildNodes="false"><con:name>set-testcase-requestId-property</con:name><con:sourceType>Response</con:sourceType><con:sourceStep>Delete VNF</con:sourceStep><con:sourcePath>$.requestReferences.requestId</con:sourcePath><con:targetType>requestId</con:targetType><con:targetStep>#TestCase#</con:targetStep><con:type>JSONPATH</con:type><con:upgraded>true</con:upgraded></con:transfers></con:config></con:testStep><con:testStep type="request" id="6e2b77c2-f9dc-45cb-b3f8-d94364ec3eaa" name="Update deleteVNF Request Status"><con:settings/><con:config xsi:type="con:RequestStep" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"><con:interface>MsoRequestsDbAdapterImplPortBinding</con:interface><con:operation>updateInfraRequest</con:operation><con:request name="Update deleteVNF Request Status" outgoingWss="" incomingWss="" timeout="" sslKeystore="" useWsAddressing="false" useWsReliableMessaging="false" wssPasswordType="" id="3345e90e-035c-470b-a4e4-41765ccb8b27"><con:settings><con:setting id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers">&lt;xml-fragment/></con:setting></con:settings><con:encoding>UTF-8</con:encoding><con:endpoint>http://${#Project#host}/dbadapters/RequestsDbAdapter</con:endpoint><con:request><![CDATA[<soapenv:Envelope xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/" xmlns:req="http://org.openecomp.mso/requestsdb">
-   <soapenv:Header/>
-   <soapenv:Body>
-      <req:updateInfraRequest>
-         <requestId>${#TestCase#requestId}</requestId>
-         <lastModifiedBy>Arq</lastModifiedBy>
-         <requestStatus>COMPLETE</requestStatus>
-         <serviceInstanceId>${#TestCase#serviceInstanceId}</serviceInstanceId>
-      </req:updateInfraRequest>
-   </soapenv:Body>
-</soapenv:Envelope>]]></con:request><con:assertion type="Valid HTTP Status Codes" id="5e83a766-cff3-473e-8a6b-7a19fec9bc03" name="Valid HTTP Status Codes"><con:configuration><codes>200</codes></con:configuration></con:assertion><con:credentials><con:username>${#Project#dbadapteruser}</con:username><con:password>${#Project#dbadapterpassword}</con:password><con:selectedAuthProfile>Basic</con:selectedAuthProfile><con:addedBasicAuthenticationTypes>Basic</con:addedBasicAuthenticationTypes><con:authType>Global HTTP Settings</con:authType></con:credentials><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:wsaConfig mustUnderstand="NONE" version="200508" action="http://org.openecomp.mso/requestsdb/RequestsDbAdapter/updateInfraRequestRequest"/><con:wsrmConfig version="1.2"/></con:request></con:config></con:testStep><con:testStep type="restrequest" name="Delete Service" id="a1aa7433-0d5d-4097-b061-519036d7f3b7"><con:settings/><con:config service="Services" methodName="delete service" resourcePath="/ecomp/mso/infra/serviceInstances/v2/{serviceInstanceId}" xsi:type="con:RestRequestStep" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"><con:restRequest name="Delete Service" id="10d269d2-486e-4342-aad7-3fa9c13a94ae" mediaType="application/json" postQueryString="false"><con:settings><con:setting id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers">&lt;xml-fragment/></con:setting></con:settings><con:encoding>UTF-8</con:encoding><con:endpoint>http://${#Project#host}</con:endpoint><con:request>{"requestDetails": {
-    "modelInfo":{
-    "modelCustomizationName":"",
-    "modelType":"service",
-    "modelInvariantId": "ff3514e3-5a33-55df-13ab-12abad84e7ff",
-    "modelNameVersionId": "fe6985cd-ea33-3346-ac12-ab121484a3fe",
-    "modelName": "dns-servicetest",
-    "modelVersion": "1.0"
-    },
-    "requestInfo":{
-    "source":"VID"
-    }
-    }}
-</con:request><con:originalUri>http://localhost/ecomp/mso/infra/serviceInstances/v2/1abf1f1f-513c-4e9a-8294-a0932339a788</con:originalUri><con:assertion type="Valid HTTP Status Codes" id="400fe1e5-a131-4993-b4af-39f52257e1c5" name="Valid HTTP Status Codes"><con:configuration><codes>202</codes></con:configuration></con:assertion><con:credentials><con:authType>No Authorization</con:authType></con:credentials><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:parameters><entry key="serviceInstanceId" value="${#TestCase#serviceInstanceId}" xmlns="http://eviware.com/soapui/config"/></con:parameters></con:restRequest></con:config></con:testStep><con:testStep type="restrequest" name="Create VolumeGroups" id="177e8823-cfc3-4f30-a759-8c1b3153ef0c"><con:settings/><con:config service="Services" resourcePath="/ecomp/mso/infra/serviceInstances/v2/{serviceInstanceId}/vnfs/{vnfInstanceId}/volumeGroups" methodName="create volumeGroups" xsi:type="con:RestRequestStep" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"><con:restRequest name="Create VolumeGroups" id="f089d62a-371a-4596-81c8-0fd7febdefe1" mediaType="application/json" postQueryString="false"><con:settings><con:setting id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers">&lt;xml-fragment/></con:setting></con:settings><con:endpoint>http://${#Project#host}</con:endpoint><con:request>{"requestDetails": {
-    "cloudConfiguration":    {
-    "tenantId": "88a6ca3ee0394ade9403f075db23167e",
-    "lcpCloudRegionId": "MT"
-    },
-    "modelInfo":    {
-    "modelName": "Mog111..mog_psm..module-1",
-    "modelType": "volumeGroup",
-    "modelVersion": "1.0",
-    "modelInvariantId": "0e0c206d-c414-4c84-a39f-442611ed1b46"
-    },
-    "relatedInstanceList":    [
-    {"relatedInstance":       {
-    "modelInfo":          {
-    "modelNameVersionId": "1e34774e-715e-4fd6-bd09-7b654622f35i",
-    "modelName": "dns-servicetest",
-    "modelType": "service",
-    "modelVersion": "1.0",
-    "modelInvariantId": "585822c8-4027-4f84-ba50-e9248606f111"
-    },
-    "instanceId": "a82d6977-6493-484f-ae8c-1b2f442e0d82"
-    }},
-    {"relatedInstance":       {
-    "modelInfo":          {
-    "modelNameVersionId": "fe6478e4-ea33-3346-ac12-ab121484a3fe",
-    "modelName": "DNSResource",
-    "modelType": "vnf",
-    "modelVersion": "1.0",
-    "modelCustomizationName": "DNSResource-1",
-    "modelInvariantId": "585822c7-4027-4f84-ba50-e9248606f112"
-    },
-    "instanceId": "f90f877a-3c08-43f1-b1eb-e0bd282c0b81"
-    }}
-    ],
-    "requestInfo":    {
-    "suppressRollback": false,
-    "source": "VID",
-    "instanceName": "zrdm3amogx02_psm02_vol"
-    },
-    "requestParameters": {"userParams": []}
-    }}</con:request><con:originalUri>http://localhost/ecomp/mso/infra/serviceInstances/v2//vnfs//volumeGroups</con:originalUri><con:assertion type="Valid HTTP Status Codes" id="f1429f47-6750-4191-956a-d0a21a88335e" name="Valid HTTP Status Codes"><con:configuration><codes>202</codes></con:configuration></con:assertion><con:credentials><con:username>${#Project#user-infraportal}</con:username><con:password>${#Project#password-infraportal}</con:password><con:selectedAuthProfile>Basic</con:selectedAuthProfile><con:addedBasicAuthenticationTypes>Basic</con:addedBasicAuthenticationTypes><con:authType>Global HTTP Settings</con:authType></con:credentials><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:parameters>
-    <con:entry key="serviceInstanceId" value="${#TestCase#serviceInstanceId}"/>
-    <con:entry key="vnfInstanceId" value="${#TestCase#vnfInstanceId}"/>
-</con:parameters><con:parameterOrder><con:entry>serviceInstanceId</con:entry><con:entry>vnfInstanceId</con:entry></con:parameterOrder></con:restRequest></con:config></con:testStep><con:testStep type="transfer" name="volumeGroupId Property Transfer" id="99e91bd0-7b91-41c0-9a3d-42bf35a2c028"><con:settings/><con:config xsi:type="con:PropertyTransfersStep" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"><con:transfers setNullOnMissingSource="true" transferTextContent="true" failOnError="true" disabled="false" entitize="false" ignoreEmpty="false" transferChildNodes="false" transferToAll="false" useXQuery="false"><con:name>set-testcase-volumeGroupId-property</con:name><con:sourceType>Response</con:sourceType><con:sourceStep>Create VolumeGroups</con:sourceStep><con:sourcePath>$.requestReferences.instanceId</con:sourcePath><con:targetType>vomuleGroupInstanceId</con:targetType><con:targetStep>#TestCase#</con:targetStep><con:targetPath xsi:nil="true"/><con:type>JSONPATH</con:type><con:targetTransferType>XPATH</con:targetTransferType><con:upgraded>true</con:upgraded></con:transfers><con:transfers setNullOnMissingSource="true" transferTextContent="true" failOnError="true" ignoreEmpty="false" transferToAll="false" entitize="false" transferChildNodes="false"><con:name>set-testcase-requestId</con:name><con:sourceType>Response</con:sourceType><con:sourceStep>Create VolumeGroups</con:sourceStep><con:sourcePath>$.requestReferences.requestId</con:sourcePath><con:targetType>requestId</con:targetType><con:targetStep>#TestCase#</con:targetStep><con:type>JSONPATH</con:type><con:upgraded>true</con:upgraded></con:transfers></con:config></con:testStep><con:testStep type="request" id="d991cd6a-2a42-4813-bfc2-f95da7017fa4" name="Update createVolumeGroup Request Status"><con:settings/><con:config xsi:type="con:RequestStep" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"><con:interface>MsoRequestsDbAdapterImplPortBinding</con:interface><con:operation>updateInfraRequest</con:operation><con:request name="Update createVolumeGroup Request Status" outgoingWss="" incomingWss="" timeout="" sslKeystore="" useWsAddressing="false" useWsReliableMessaging="false" wssPasswordType="" id="3345e90e-035c-470b-a4e4-41765ccb8b27"><con:settings><con:setting id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers">&lt;xml-fragment/></con:setting></con:settings><con:encoding>UTF-8</con:encoding><con:endpoint>http://${#Project#host}/dbadapters/RequestsDbAdapter</con:endpoint><con:request><![CDATA[<soapenv:Envelope xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/" xmlns:req="http://org.openecomp.mso/requestsdb">
-   <soapenv:Header/>
-   <soapenv:Body>
-      <req:updateInfraRequest>
-         <requestId>${#TestCase#requestId}</requestId>
-         <lastModifiedBy>Arq</lastModifiedBy>
-         <requestStatus>COMPLETE</requestStatus>
-         <serviceInstanceId>${#TestCase#serviceInstanceId}</serviceInstanceId>
-      </req:updateInfraRequest>
-   </soapenv:Body>
-</soapenv:Envelope>]]></con:request><con:assertion type="Valid HTTP Status Codes" id="5e83a766-cff3-473e-8a6b-7a19fec9bc03" name="Valid HTTP Status Codes"><con:configuration><codes>200</codes></con:configuration></con:assertion><con:credentials><con:username>${#Project#dbadapteruser}</con:username><con:password>${#Project#dbadapterpassword}</con:password><con:selectedAuthProfile>Basic</con:selectedAuthProfile><con:addedBasicAuthenticationTypes>Basic</con:addedBasicAuthenticationTypes><con:authType>Global HTTP Settings</con:authType></con:credentials><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:wsaConfig mustUnderstand="NONE" version="200508" action="http://org.openecomp.mso/requestsdb/RequestsDbAdapter/updateInfraRequestRequest"/><con:wsrmConfig version="1.2"/></con:request></con:config></con:testStep><con:testStep type="restrequest" name="Update VolumeGroups" id="6fec2f63-b426-4555-90f3-e0da58c9e223"><con:settings/><con:config service="Services" resourcePath="/ecomp/mso/infra/serviceInstances/v2/{serviceInstanceId}/vnfs/{vnfInstanceId}/volumeGroups/{volumeGroupInstanceId}" methodName="update volumeGroups" xsi:type="con:RestRequestStep" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"><con:restRequest name="Update VolumeGroups" id="f089d62a-371a-4596-81c8-0fd7febdefe1" mediaType="application/json" postQueryString="false"><con:settings><con:setting id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers">&lt;xml-fragment/></con:setting></con:settings><con:endpoint>http://${#Project#host}</con:endpoint><con:request>{"requestDetails": {
-    "cloudConfiguration":    {
-    "tenantId": "88a6ca3ee0394ade9403f075db23167e",
-    "lcpCloudRegionId": "MT2"
-    },
-    "modelInfo":    {
-    "modelName": "Mog111..mog_psm..module-1",
-    "modelType": "volumeGroup",
-    "modelVersion": "1.0",
-    "modelInvariantId": "0e0c206d-c414-4c84-a39f-442611ed1b46"
-    },
-    "relatedInstanceList":    [
-    {"relatedInstance":       {
-    "modelInfo":          {
-    "modelNameVersionId": "1e34774e-715e-4fd6-bd09-7b654622f35i",
-    "modelName": "dns-servicetest",
-    "modelType": "service",
-    "modelVersion": "1.0",
-    "modelInvariantId": "585822c8-4027-4f84-ba50-e9248606f111"
-    },
-    "instanceId": "a82d6977-6493-484f-ae8c-1b2f442e0d82"
-    }},
-    {"relatedInstance":       {
-    "modelInfo":          {
-    "modelNameVersionId": "fe6478e4-ea33-3346-ac12-ab121484a3fe",
-    "modelName": "DNSResource",
-    "modelType": "vnf",
-    "modelVersion": "1.0",
-    "modelCustomizationName": "DNSResource-1",
-    "modelInvariantId": "585822c7-4027-4f84-ba50-e9248606f112"
-    },
-    "instanceId": "f90f877a-3c08-43f1-b1eb-e0bd282c0b81"
-    }}
-    ],
-    "requestInfo":    {
-    "suppressRollback": false,
-    "source": "VID",
-    "instanceName": "zrdm3amogx02_psm02_vol"
-    }
-    }}</con:request><con:originalUri>http://localhost/ecomp/mso/infra/serviceInstances/v2//vnfs//volumeGroups/</con:originalUri><con:assertion type="Valid HTTP Status Codes" id="be33e2b3-3fd2-483f-9b39-390e8ee8f19c" name="Valid HTTP Status Codes"><con:configuration><codes>202</codes></con:configuration></con:assertion><con:credentials><con:username>${#Project#user-infraportal}</con:username><con:password>${#Project#user-infraportal}</con:password><con:selectedAuthProfile>Basic</con:selectedAuthProfile><con:addedBasicAuthenticationTypes>Basic</con:addedBasicAuthenticationTypes><con:authType>Global HTTP Settings</con:authType></con:credentials><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:parameters>
-    <con:entry key="volumeGroupInstanceId" value="${#TestCase#vomuleGroupInstanceId}"/>
-    <con:entry key="serviceInstanceId" value="${#TestCase#serviceInstanceId}"/>
-    <con:entry key="vnfInstanceId" value="${#TestCase#vnfInstanceId}"/>
-</con:parameters><con:parameterOrder><con:entry>serviceInstanceId</con:entry><con:entry>vnfInstanceId</con:entry><con:entry>volumeGroupInstanceId</con:entry></con:parameterOrder></con:restRequest></con:config></con:testStep><con:testStep type="transfer" name="volumeGroupId Property Transfer2" id="1d618f43-5906-439b-b797-e371edb4cfee"><con:settings/><con:config xsi:type="con:PropertyTransfersStep" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"><con:transfers setNullOnMissingSource="true" transferTextContent="true" failOnError="true" ignoreEmpty="false" transferToAll="false" entitize="false" transferChildNodes="false"><con:name>set-testcase-requestId</con:name><con:sourceType>Response</con:sourceType><con:sourceStep>Update VolumeGroups</con:sourceStep><con:sourcePath>$.requestReferences.requestId</con:sourcePath><con:targetType>requestId</con:targetType><con:targetStep>#TestCase#</con:targetStep><con:type>JSONPATH</con:type><con:upgraded>true</con:upgraded></con:transfers></con:config></con:testStep><con:testStep type="request" id="3e79fce3-ff06-4865-b0c2-6d9511ad2bf4" name="Update ureateVolumeGroup Request Status"><con:settings/><con:config xsi:type="con:RequestStep" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"><con:interface>MsoRequestsDbAdapterImplPortBinding</con:interface><con:operation>updateInfraRequest</con:operation><con:request name="Update ureateVolumeGroup Request Status" outgoingWss="" incomingWss="" timeout="" sslKeystore="" useWsAddressing="false" useWsReliableMessaging="false" wssPasswordType="" id="3345e90e-035c-470b-a4e4-41765ccb8b27"><con:settings><con:setting id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers">&lt;xml-fragment/></con:setting></con:settings><con:encoding>UTF-8</con:encoding><con:endpoint>http://${#Project#host}/dbadapters/RequestsDbAdapter</con:endpoint><con:request><![CDATA[<soapenv:Envelope xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/" xmlns:req="http://org.openecomp.mso/requestsdb">
-   <soapenv:Header/>
-   <soapenv:Body>
-      <req:updateInfraRequest>
-         <requestId>${#TestCase#requestId}</requestId>
-         <lastModifiedBy>Arq</lastModifiedBy>
-         <requestStatus>COMPLETE</requestStatus>
-         <serviceInstanceId>${#TestCase#serviceInstanceId}</serviceInstanceId>
-      </req:updateInfraRequest>
-   </soapenv:Body>
-</soapenv:Envelope>]]></con:request><con:assertion type="Valid HTTP Status Codes" id="5e83a766-cff3-473e-8a6b-7a19fec9bc03" name="Valid HTTP Status Codes"><con:configuration><codes>200</codes></con:configuration></con:assertion><con:credentials><con:username>${#Project#dbadapteruser}</con:username><con:password>${#Project#dbadapterpassword}</con:password><con:selectedAuthProfile>Basic</con:selectedAuthProfile><con:addedBasicAuthenticationTypes>Basic</con:addedBasicAuthenticationTypes><con:authType>Global HTTP Settings</con:authType></con:credentials><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:wsaConfig mustUnderstand="NONE" version="200508" action="http://org.openecomp.mso/requestsdb/RequestsDbAdapter/updateInfraRequestRequest"/><con:wsrmConfig version="1.2"/></con:request></con:config></con:testStep><con:testStep type="restrequest" name="Delete VolumeGroups" id="e8957a3c-8498-40ae-bf7f-a2d9fb07fa55"><con:settings/><con:config service="Services" methodName="delete volumeGroups" resourcePath="/ecomp/mso/infra/serviceInstances/v2/{serviceInstanceId}/vnfs/{vnfInstanceId}/volumeGroups/{volumeGroupInstanceId}" xsi:type="con:RestRequestStep" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"><con:restRequest name="Delete VolumeGroups" id="1cc37a2c-8de4-48ed-9693-b74b90d42c27" mediaType="application/json" postQueryString="false"><con:settings><con:setting id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers">&lt;xml-fragment/></con:setting></con:settings><con:encoding>UTF-8</con:encoding><con:endpoint>http://${#Project#host}</con:endpoint><con:request>{"requestDetails": {
-    "modelInfo":    {
-    "modelName": "Mog111..mog_psm..module-1",
-    "modelType": "volumeGroup",
-    "modelVersion": "1.0",
-    "modelInvariantId": "0e0c206d-c414-4c84-a39f-442611ed1b46"
-    },
-    "requestInfo":{
-    "source":"VID"
-    },
-    "cloudConfiguration":{
-    "tenantId": "88a6ca3ee0394ade9403f075db23167e",
-    "lcpCloudRegionId": "MT2"
-    }
-    }}</con:request><con:originalUri>http://localhost/ecomp/mso/infra/serviceInstances/v2//vnfs//volumeGroups/</con:originalUri><con:assertion type="Valid HTTP Status Codes" id="9714ccc7-f2b5-435f-9174-df12557f45aa" name="Valid HTTP Status Codes"><con:configuration><codes>202</codes></con:configuration></con:assertion><con:credentials><con:authType>No Authorization</con:authType></con:credentials><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:parameters>
-    <con:entry key="volumeGroupInstanceId" value="${#TestCase#vomuleGroupInstanceId}"/>
-    <con:entry key="serviceInstanceId" value="${#TestCase#serviceInstanceId}"/>
-    <con:entry key="vnfInstanceId" value="${#TestCase#vnfInstanceId}"/>
-</con:parameters></con:restRequest></con:config></con:testStep><con:testStep type="restrequest" name="Create Networks" id="855e1fb3-b709-472c-aa3f-2020f2397993"><con:settings/><con:config service="Services" methodName="create networks" resourcePath="/ecomp/mso/infra/serviceInstances/v2/{serviceInstanceId}/networks" xsi:type="con:RestRequestStep" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"><con:restRequest name="Create Networks" id="c91bf79d-4cb5-4ebb-9329-2faf92237fdc" mediaType="application/json" postQueryString="false"><con:settings><con:setting id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers">&lt;xml-fragment/></con:setting></con:settings><con:encoding>UTF-8</con:encoding><con:endpoint>http://${#Project#host}</con:endpoint><con:request>{"requestDetails": {
-    "cloudConfiguration":    {
-    "tenantId": "cff319d50266491fa744b0d493a51ce0",
-    "lcpCloudRegionId": "rdm3"
-    },
-    "modelInfo":    {
-    "modelName": "CONTRAIL30_BASIC",
-    "modelType": "network"
-    },
-    "relatedInstanceList": [{"relatedInstance":    {
-    "modelInfo":       {
-    "modelNameVersionId": "1e34774e-715e-4fd6-bd09-7b654622f35i",
-    "modelName": "dns-servicetest",
-    "modelType": "service",
-    "modelVersion": "1.0",
-    "modelInvariantId": "585822c8-4027-4f84-ba50-e9248606f111"
-    },
-    "instanceId": "a82d6977-6493-484f-ae8c-1b2f442e0d82"
-    }}],
-    "requestInfo":    {
-    "productFamilyId": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb",
-    "source": "VID",
-    "instanceName": "MNS-25180-L-06Private_tst_mns_mgmt_net_1"
-    },
-    "requestParameters": {}
-    }}</con:request><con:originalUri>http://localhost/ecomp/mso/infra/serviceInstances/v2/serviceInstanceId/networks</con:originalUri><con:assertion type="Valid HTTP Status Codes" id="29a2c44b-0e68-4f1b-832e-d8237f4a7d72" name="Valid HTTP Status Codes"><con:configuration><codes>202</codes></con:configuration></con:assertion><con:credentials><con:username>${#Project#user-infraportal}</con:username><con:password>${#Project#password-infraportal}</con:password><con:selectedAuthProfile>Basic</con:selectedAuthProfile><con:addedBasicAuthenticationTypes>Basic</con:addedBasicAuthenticationTypes><con:authType>Global HTTP Settings</con:authType></con:credentials><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:parameters><entry key="serviceInstanceId" value="${#TestCase#serviceInstanceId}" xmlns="http://eviware.com/soapui/config"/></con:parameters></con:restRequest></con:config></con:testStep><con:testStep type="transfer" name="networkId Property Transfer" id="9b0e371d-8d52-444e-89a5-dfd3e22488cb"><con:settings/><con:config xsi:type="con:PropertyTransfersStep" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"><con:transfers setNullOnMissingSource="true" transferTextContent="true" failOnError="true" ignoreEmpty="false" transferToAll="false" entitize="false" transferChildNodes="false"><con:name>set-updateCreateNetworkRequstStatus-requestId</con:name><con:sourceType>Response</con:sourceType><con:sourceStep>Create Networks</con:sourceStep><con:sourcePath>$.requestReferences.requestId</con:sourcePath><con:targetType>requestId</con:targetType><con:targetStep>#TestCase#</con:targetStep><con:targetPath/><con:type>JSONPATH</con:type><con:targetTransferType>XQUERY</con:targetTransferType><con:upgraded>true</con:upgraded></con:transfers></con:config></con:testStep><con:testStep type="request" id="f5cf27a3-e015-48af-bf07-b206b5a5f58b" name="update createNetwork Request Status"><con:settings/><con:config xsi:type="con:RequestStep" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"><con:interface>MsoRequestsDbAdapterImplPortBinding</con:interface><con:operation>updateInfraRequest</con:operation><con:request name="update createNetwork Request Status" outgoingWss="" incomingWss="" timeout="" sslKeystore="" useWsAddressing="false" useWsReliableMessaging="false" wssPasswordType="" id="3345e90e-035c-470b-a4e4-41765ccb8b27"><con:settings><con:setting id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers">&lt;xml-fragment/></con:setting></con:settings><con:encoding>UTF-8</con:encoding><con:endpoint>http://${#Project#host}/dbadapters/RequestsDbAdapter</con:endpoint><con:request><![CDATA[<soapenv:Envelope xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/" xmlns:req="http://org.openecomp.mso/requestsdb">
-   <soapenv:Header/>
-   <soapenv:Body>
-      <req:updateInfraRequest>
-         <requestId>${#TestCase#requestId}</requestId>
-         <lastModifiedBy>Arq</lastModifiedBy>
-         <requestStatus>COMPLETE</requestStatus>
-         <networkId>${#TestCase#networkId}</networkId>
-      </req:updateInfraRequest>
-   </soapenv:Body>
-</soapenv:Envelope>]]></con:request><con:assertion type="Valid HTTP Status Codes" id="5e83a766-cff3-473e-8a6b-7a19fec9bc03" name="Valid HTTP Status Codes"><con:configuration><codes>200</codes></con:configuration></con:assertion><con:credentials><con:username>${#Project#dbadapteruser}</con:username><con:password>${#Project#dbadapterpassword}</con:password><con:selectedAuthProfile>Basic</con:selectedAuthProfile><con:addedBasicAuthenticationTypes>Basic</con:addedBasicAuthenticationTypes><con:authType>Global HTTP Settings</con:authType></con:credentials><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:wsaConfig mustUnderstand="NONE" version="200508" action="http://org.openecomp.mso/requestsdb/RequestsDbAdapter/updateInfraRequestRequest"/><con:wsrmConfig version="1.2"/></con:request></con:config></con:testStep><con:testStep type="restrequest" name="Updaate Networks" id="d2fabd1e-e74d-4ef9-bc60-ecd749006f32"><con:settings/><con:config service="Services" methodName="update networks" resourcePath="/ecomp/mso/infra/serviceInstances/v2/{serviceInstanceId}/networks/{networkInstanceId}" xsi:type="con:RestRequestStep" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"><con:restRequest name="Updaate Networks" id="3f7eab49-af81-4cc5-b58b-a12c3b39b069" mediaType="application/json" postQueryString="false"><con:settings><con:setting id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers">&lt;xml-fragment/></con:setting></con:settings><con:encoding>UTF-8</con:encoding><con:endpoint>http://${#Project#host}</con:endpoint><con:request>{"requestDetails": {
-    "cloudConfiguration":    {
-    "tenantId": "cff319d50266491fa744b0d493a51ce0",
-    "lcpCloudRegionId": "rdm3"
-    },
-    "modelInfo":    {
-    "modelName": "CONTRAIL30_BASIC",
-    "modelType": "network"
-    },
-    "relatedInstanceList": [{"relatedInstance":    {
-    "modelInfo":       {
-    "modelNameVersionId": "1e34774e-715e-4fd6-bd09-7b654622f35i",
-    "modelName": "dns-servicetest",
-    "modelType": "service",
-    "modelVersion": "1.0",
-    "modelInvariantId": "585822c8-4027-4f84-ba50-e9248606f111"
-    },
-    "instanceId": "a82d6977-6493-484f-ae8c-1b2f442e0d82"
-    }}],
-    "requestInfo":    {
-    "productFamilyId": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb",
-    "source": "VID",
-    "instanceName": "MNS-25180-L-06Private_tst_mns_mgmt_net_1"
-    },
-    "requestParameters": {}
-    }}</con:request><con:originalUri>http://localhost/ecomp/mso/infra/serviceInstances/v2/c173e25c-adc4-4e66-9702-24cbd75a2243/networks/925f94f5-7ec6-4d99-a5e1-091c33709b76</con:originalUri><con:assertion type="Valid HTTP Status Codes" id="b573a9a0-c6dd-43a3-bb0e-b4c2ad11b29c" name="Valid HTTP Status Codes"><con:configuration><codes>202</codes></con:configuration></con:assertion><con:credentials><con:authType>No Authorization</con:authType></con:credentials><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:parameters>
-    <con:entry key="serviceInstanceId" value="${#TestCase#serviceInstanceId}"/>
-    <con:entry key="networkInstanceId" value="${#TestCase#networkId}"/>
-</con:parameters></con:restRequest></con:config></con:testStep><con:testStep type="transfer" name="networkId Property Transfer2" id="1d862df6-0dc4-4c77-bb7b-65ca0024fb29"><con:settings/><con:config xsi:type="con:PropertyTransfersStep" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"><con:transfers setNullOnMissingSource="true" transferTextContent="true" failOnError="true" ignoreEmpty="false" transferToAll="false" entitize="false" transferChildNodes="false"><con:name>set-updateCreateNetworkRequstStatus-requestId</con:name><con:sourceType>Response</con:sourceType><con:sourceStep>Updaate Networks</con:sourceStep><con:sourcePath>$.requestReferences.requestId</con:sourcePath><con:targetType>requestId</con:targetType><con:targetStep>#TestCase#</con:targetStep><con:targetPath/><con:type>JSONPATH</con:type><con:targetTransferType>XQUERY</con:targetTransferType><con:upgraded>true</con:upgraded></con:transfers></con:config></con:testStep><con:testStep type="request" id="9ca6bece-db4e-493a-b1eb-957b1eab7e8d" name="update updateNetwork Request Status"><con:settings/><con:config xsi:type="con:RequestStep" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"><con:interface>MsoRequestsDbAdapterImplPortBinding</con:interface><con:operation>updateInfraRequest</con:operation><con:request name="update updateNetwork Request Status" outgoingWss="" incomingWss="" timeout="" sslKeystore="" useWsAddressing="false" useWsReliableMessaging="false" wssPasswordType="" id="3345e90e-035c-470b-a4e4-41765ccb8b27"><con:settings><con:setting id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers">&lt;xml-fragment/></con:setting></con:settings><con:encoding>UTF-8</con:encoding><con:endpoint>http://${#Project#host}/dbadapters/RequestsDbAdapter</con:endpoint><con:request><![CDATA[<soapenv:Envelope xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/" xmlns:req="http://org.openecomp.mso/requestsdb">
-   <soapenv:Header/>
-   <soapenv:Body>
-      <req:updateInfraRequest>
-         <requestId>${#TestCase#requestId}</requestId>
-         <lastModifiedBy>Arq</lastModifiedBy>
-         <requestStatus>COMPLETE</requestStatus>
-         <networkId>${#TestCase#networkId}</networkId>
-      </req:updateInfraRequest>
-   </soapenv:Body>
-</soapenv:Envelope>]]></con:request><con:assertion type="Valid HTTP Status Codes" id="5e83a766-cff3-473e-8a6b-7a19fec9bc03" name="Valid HTTP Status Codes"><con:configuration><codes>200</codes></con:configuration></con:assertion><con:credentials><con:username>${#Project#dbadapteruser}</con:username><con:password>${#Project#dbadapterpassword}</con:password><con:selectedAuthProfile>Basic</con:selectedAuthProfile><con:addedBasicAuthenticationTypes>Basic</con:addedBasicAuthenticationTypes><con:authType>Global HTTP Settings</con:authType></con:credentials><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:wsaConfig mustUnderstand="NONE" version="200508" action="http://org.openecomp.mso/requestsdb/RequestsDbAdapter/updateInfraRequestRequest"/><con:wsrmConfig version="1.2"/></con:request></con:config></con:testStep><con:testStep type="restrequest" name="Delete Networks" id="6d08d36d-570c-4aad-b673-1ab07292d889"><con:settings/><con:config service="Services" methodName="delete networks" resourcePath="/ecomp/mso/infra/serviceInstances/v2/{serviceInstanceId}/networks/{networkInstanceId}" xsi:type="con:RestRequestStep" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"><con:restRequest name="Delete Networks" id="b41d29ab-28d5-4c16-af78-2ad9d06831ea" mediaType="application/json" postQueryString="false"><con:settings><con:setting id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers">&lt;xml-fragment/></con:setting></con:settings><con:encoding>UTF-8</con:encoding><con:endpoint>http://${#Project#host}</con:endpoint><con:request>{"requestDetails": {
-    "modelInfo":{
-    "modelType":"network",
-    "modelName":"CONTRAIL30_BASIC",
-    "modelVersion":"1.0",
-    "modelInvariantId":"585822c8-4027-4f84-ba50-e9248606f111"
-    },
-    "requestInfo":{"source":"VID"},
-    "cloudConfiguration":{
-    "tenantId":"cff319d50266491fa744b0d493a51ce0",
-    "lcpCloudRegionId":"rdm3"
-    }
-    }}
-</con:request><con:originalUri>http://localhost/ecomp/mso/infra/serviceInstances/v2/c173e25c-adc4-4e66-9702-24cbd75a2243/networks/925f94f5-7ec6-4d99-a5e1-091c33709b76</con:originalUri><con:assertion type="Valid HTTP Status Codes" id="c5a83bff-3bda-4394-8ad1-9d20a06d456a" name="Valid HTTP Status Codes"><con:configuration><codes>202</codes></con:configuration></con:assertion><con:credentials><con:authType>No Authorization</con:authType></con:credentials><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:parameters>
-    <con:entry key="serviceInstanceId" value="${#TestCase#serviceInstanceId}"/>
-    <con:entry key="networkInstanceId" value="${#TestCase#networkId}"/>
-</con:parameters></con:restRequest></con:config></con:testStep><con:testStep type="restrequest" name="Create Service - Bad field name - modelType" id="217ad366-cec5-42c8-bd7a-27299d6640b8"><con:settings/><con:config service="Services" resourcePath="/ecomp/mso/infra/serviceInstances/v2" methodName="create service" xsi:type="con:RestRequestStep" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"><con:restRequest name="Create Service - Bad field name - modelType" id="8ca9d822-808a-4955-a4e6-5f56ff813fec" mediaType="application/json" postQueryString="false"><con:settings><con:setting id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers">&lt;xml-fragment/></con:setting></con:settings><con:endpoint>http://${#Project#host}</con:endpoint><con:request>{
-    "requestDetails": {
-    "modelInfo": {
-    "modelTypeNotOK": "service",
-    "modelInvariantId": "ff3514e3-5a33-55df-13ab-12abad84e7ff",
-    "modelNameVersionId": "fe6985cd-ea33-3346-ac12-ab121484a3fe",
-    "modelName": "dns-servicetest",
-    "modelVersion": "1.0"
-    },
-    "subscriberInfo": {
-    "globalSubscriberId": "subscriber-1",
-    "subscriberName": "testSubscriber"
-    },
-    "requestInfo": {
-    "instanceName": "DNS_TEST",
-    "source": "VID",
-    "suppressRollback": true
-    },
-    "requestParameters": {
-    "subscriptionServiceType": "MOG",
-    "userParams": [
-    {
-    "name": "someUserParam",
-    "value": "someValue"
-    }
-    ]
-    }
-    }
-    }</con:request><con:originalUri>http://localhost/ecomp/mso/infra/serviceInstances/v2</con:originalUri><con:assertion type="Valid HTTP Status Codes" id="12d5c872-b42a-4fdf-aee1-4a5b805ed255" name="Valid HTTP Status Codes"><con:configuration><codes>400
-</codes></con:configuration></con:assertion><con:assertion type="Simple Contains" id="31739c4c-9d8a-41b6-8f51-312954c6a396" name="Contains"><con:configuration><token>Mapping of request to JSON object failed</token><ignoreCase>false</ignoreCase><useRegEx>false</useRegEx></con:configuration></con:assertion><con:credentials><con:username>${#Project#user-infraportal}</con:username><con:password>${#Project#password-infraportal}</con:password><con:selectedAuthProfile>Basic</con:selectedAuthProfile><con:addedBasicAuthenticationTypes>Basic</con:addedBasicAuthenticationTypes><con:authType>Global HTTP Settings</con:authType></con:credentials><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:parameters/></con:restRequest></con:config></con:testStep><con:testStep type="restrequest" name="Create Service - Bad field value - modelType" id="2e38074b-5aec-4816-a8a9-181a8bb3952b"><con:settings/><con:config service="Services" resourcePath="/ecomp/mso/infra/serviceInstances/v2" methodName="create service" xsi:type="con:RestRequestStep" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"><con:restRequest name="Create Service - Bad field value - modelType" id="8ca9d822-808a-4955-a4e6-5f56ff813fec" mediaType="application/json" postQueryString="false"><con:settings><con:setting id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers">&lt;xml-fragment/></con:setting></con:settings><con:endpoint>http://${#Project#host}</con:endpoint><con:request>{
-    "requestDetails": {
-    "modelInfo": {
-    "modelType": "1",
-    "modelInvariantId": "ff3514e3-5a33-55df-13ab-12abad84e7ff",
-    "modelNameVersionId": "fe6985cd-ea33-3346-ac12-ab121484a3fe",
-    "modelName": "dns-servicetest",
-    "modelVersion": "1.0"
-    },
-    "subscriberInfo": {
-    "globalSubscriberId": "subscriber-1",
-    "subscriberName": "testSubscriber"
-    },
-    "requestInfo": {
-    "instanceName": "DNS_TEST",
-    "source": "VID",
-    "suppressRollback": true
-    },
-    "requestParameters": {
-    "subscriptionServiceType": "MOG",
-    "userParams": [
-    {
-    "name": "someUserParam",
-    "value": "someValue"
-    }
-    ]
-    }
-    }
-    }</con:request><con:originalUri>http://localhost/ecomp/mso/infra/serviceInstances/v2</con:originalUri><con:assertion type="Valid HTTP Status Codes" id="12d5c872-b42a-4fdf-aee1-4a5b805ed255" name="Valid HTTP Status Codes"><con:configuration><codes>400</codes></con:configuration></con:assertion><con:assertion type="Simple Contains" id="8738bc0d-938a-4526-bee4-f8436ca96199" name="Contains 1"><con:configuration><token>Mapping of request to JSON object failed.  Can not construct instance of org.openecomp.mso.apihandlerinfra.ModelType from String value '1'</token><ignoreCase>false</ignoreCase><useRegEx>false</useRegEx></con:configuration></con:assertion><con:credentials><con:username>${#Project#user-infraportal}</con:username><con:password>${#Project#password-infraportal}</con:password><con:selectedAuthProfile>Basic</con:selectedAuthProfile><con:addedBasicAuthenticationTypes>Basic</con:addedBasicAuthenticationTypes><con:authType>Global HTTP Settings</con:authType></con:credentials><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:parameters/></con:restRequest></con:config></con:testStep><con:testStep type="restrequest" name="Create Service - Bad validation - modelInvariantId" id="307330da-deb5-40de-9361-ec9bdf81b409"><con:settings/><con:config service="Services" resourcePath="/ecomp/mso/infra/serviceInstances/v2" methodName="create service" xsi:type="con:RestRequestStep" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"><con:restRequest name="Create Service - Bad validation - modelInvariantId" id="8ca9d822-808a-4955-a4e6-5f56ff813fec" mediaType="application/json" postQueryString="false"><con:settings><con:setting id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers">&lt;xml-fragment/></con:setting></con:settings><con:endpoint>http://${#Project#host}</con:endpoint><con:request>{
-    "requestDetails": {
-    "modelInfo": {
-    "modelType": "service",
-    "modelInvariantId": "e",
-    "modelNameVersionId": "fe6985cd-ea33-3346-ac12-ab121484a3fe",
-    "modelName": "dns-servicetest",
-    "modelVersion": "1.0"
-    },
-    "subscriberInfo": {
-    "globalSubscriberId": "subscriber-1",
-    "subscriberName": "testSubscriber"
-    },
-    "requestInfo": {
-    "instanceName": "DNS_TEST",
-    "source": "VID",
-    "suppressRollback": true
-    },
-    "requestParameters": {
-    "subscriptionServiceType": "MOG",
-    "userParams": [
-    {
-    "name": "someUserParam",
-    "value": "someValue"
-    }
-    ]
-    }
-    }
-    }</con:request><con:originalUri>http://localhost/ecomp/mso/infra/serviceInstances/v2</con:originalUri><con:assertion type="Valid HTTP Status Codes" id="12d5c872-b42a-4fdf-aee1-4a5b805ed255" name="Valid HTTP Status Codes"><con:configuration><codes>400</codes></con:configuration></con:assertion><con:assertion type="Simple Contains" id="3895c243-983b-4924-81ea-dad85ee12707" name="Contains"><con:configuration><token>Error parsing request</token><ignoreCase>false</ignoreCase><useRegEx>false</useRegEx></con:configuration></con:assertion><con:assertion type="Simple Contains" id="8738bc0d-938a-4526-bee4-f8436ca96199" name="Contains 1"><con:configuration><token>No valid modelInvariantId format is specified</token><ignoreCase>false</ignoreCase><useRegEx>false</useRegEx></con:configuration></con:assertion><con:credentials><con:username>${#Project#user-infraportal}</con:username><con:password>${#Project#password-infraportal}</con:password><con:selectedAuthProfile>Basic</con:selectedAuthProfile><con:addedBasicAuthenticationTypes>Basic</con:addedBasicAuthenticationTypes><con:authType>Global HTTP Settings</con:authType></con:credentials><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:parameters/></con:restRequest></con:config></con:testStep><con:testStep type="restrequest" name="Create Service 2" id="da6e1ddf-cff3-4021-986b-e90e6aa01cbc"><con:settings/><con:config service="Services" resourcePath="/ecomp/mso/infra/serviceInstances/v2" methodName="create service" xsi:type="con:RestRequestStep" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"><con:restRequest name="Create Service 2" id="8ca9d822-808a-4955-a4e6-5f56ff813fec" mediaType="application/json" postQueryString="false"><con:settings><con:setting id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers">&lt;xml-fragment/></con:setting></con:settings><con:endpoint>http://${#Project#host}</con:endpoint><con:request>{
-    "requestDetails": {
-    "modelInfo": {
-    "modelType": "service",
-    "modelInvariantId": "ff3514e3-5a33-55df-13ab-12abad84e7ff",
-    "modelNameVersionId": "fe6985cd-ea33-3346-ac12-ab121484a3fe",
-    "modelName": "dns-servicetest",
-    "modelVersion": "1.0"
-    },
-    "subscriberInfo": {
-    "globalSubscriberId": "subscriber-1",
-    "subscriberName": "testSubscriber"
-    },
-    "requestInfo": {
-    "instanceName": "DNS_TEST",
-    "source": "VID",
-    "suppressRollback": true
-    },
-    "requestParameters": {
-    "subscriptionServiceType": "MOG",
-    "userParams": [
-    {
-    "name": "someUserParam",
-    "value": "someValue"
-    }
-    ]
-    }
-    }
-    }</con:request><con:originalUri>http://localhost/ecomp/mso/infra/serviceInstances/v2</con:originalUri><con:assertion type="Valid HTTP Status Codes" id="12d5c872-b42a-4fdf-aee1-4a5b805ed255" name="Valid HTTP Status Codes"><con:configuration><codes>202
-</codes></con:configuration></con:assertion><con:credentials><con:username>${#Project#user-infraportal}</con:username><con:password>${#Project#password-infraportal}</con:password><con:selectedAuthProfile>Basic</con:selectedAuthProfile><con:addedBasicAuthenticationTypes>Basic</con:addedBasicAuthenticationTypes><con:authType>Global HTTP Settings</con:authType></con:credentials><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:parameters/></con:restRequest></con:config></con:testStep><con:testStep type="transfer" name="ServiceInstanceId Property Transfer 2" id="03c6fc5a-5d4c-49f8-aaaf-32b11874e8e7"><con:settings/><con:config xsi:type="con:PropertyTransfersStep" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"><con:transfers setNullOnMissingSource="true" transferTextContent="true" failOnError="true" ignoreEmpty="false" transferToAll="false" entitize="false" transferChildNodes="false"><con:name>set-serviceInstanceId-property</con:name><con:sourceType>Response</con:sourceType><con:sourceStep>Create Service 2</con:sourceStep><con:sourcePath>$.requestReferences.instanceId</con:sourcePath><con:targetType>serviceInstanceId</con:targetType><con:targetStep>#TestCase#</con:targetStep><con:targetPath/><con:type>JSONPATH</con:type><con:targetTransferType>XQUERY</con:targetTransferType><con:upgraded>true</con:upgraded></con:transfers><con:transfers setNullOnMissingSource="true" transferTextContent="true" failOnError="true" ignoreEmpty="false" transferToAll="false" entitize="false" transferChildNodes="false"><con:name>set-requestId-property</con:name><con:sourceType>Response</con:sourceType><con:sourceStep>Create Service 2</con:sourceStep><con:sourcePath>$.requestReferences.requestId</con:sourcePath><con:targetType>requestId</con:targetType><con:targetStep>#TestCase#</con:targetStep><con:targetPath/><con:type>JSONPATH</con:type><con:targetTransferType>XQUERY</con:targetTransferType><con:upgraded>true</con:upgraded></con:transfers><con:transfers setNullOnMissingSource="true" transferTextContent="true" failOnError="true" ignoreEmpty="false" transferToAll="false" entitize="false" transferChildNodes="false"><con:name>transfer-to-create-network-url</con:name><con:sourceType>Response</con:sourceType><con:sourceStep>Create Service 2</con:sourceStep><con:sourcePath>$.requestReferences.instanceId</con:sourcePath><con:targetType>Request</con:targetType><con:targetStep>Create Networks with wrong BPMN script URL</con:targetStep><con:targetPath>$.requestDetails.relatedInstanceList[0].relatedInstance.instanceId</con:targetPath><con:type>JSONPATH</con:type><con:targetTransferType>JSONPATH</con:targetTransferType><con:upgraded>true</con:upgraded></con:transfers><con:transfers setNullOnMissingSource="true" transferTextContent="true" failOnError="true" disabled="false" entitize="false" ignoreEmpty="false" transferChildNodes="false" transferToAll="false" useXQuery="false"><con:name>transfer-to-create-network-url</con:name><con:sourceType>Response</con:sourceType><con:sourceStep>Create Service 2</con:sourceStep><con:sourcePath>$.requestReferences.instanceId</con:sourcePath><con:targetType>Request</con:targetType><con:targetStep>Create Networks with no BPMN script</con:targetStep><con:targetPath>$.requestDetails.relatedInstanceList[0].relatedInstance.instanceId</con:targetPath><con:type>JSONPATH</con:type><con:targetTransferType>JSONPATH</con:targetTransferType><con:upgraded>true</con:upgraded></con:transfers></con:config></con:testStep><con:testStep type="delay" name="Delay 5 seconds" id="8571311f-1326-4610-9629-a5e0ecfbe7c1"><con:settings/><con:config><delay>5000</delay></con:config></con:testStep><con:testStep type="request" id="3e640c4a-b36c-473c-916a-b243647b9729" name="UpdateInfraRequest - In progress"><con:settings/><con:config xsi:type="con:RequestStep" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"><con:interface>MsoRequestsDbAdapterImplPortBinding</con:interface><con:operation>updateInfraRequest</con:operation><con:request name="UpdateInfraRequest - In progress" outgoingWss="" incomingWss="" timeout="" sslKeystore="" useWsAddressing="false" useWsReliableMessaging="false" wssPasswordType="" id="3345e90e-035c-470b-a4e4-41765ccb8b27"><con:settings><con:setting id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers">&lt;xml-fragment/></con:setting></con:settings><con:encoding>UTF-8</con:encoding><con:endpoint>http://${#Project#host}/dbadapters/RequestsDbAdapter</con:endpoint><con:request><![CDATA[<soapenv:Envelope xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/" xmlns:req="http://org.openecomp.mso/requestsdb">
-   <soapenv:Header/>
-   <soapenv:Body>
-      <req:updateInfraRequest>
-         <requestId>${#TestCase#requestId}</requestId>
-         <lastModifiedBy>Arq</lastModifiedBy>
-         <requestStatus>IN_PROGRESS</requestStatus>
-         <serviceInstanceId>${#TestCase#serviceInstanceId}</serviceInstanceId>
-      </req:updateInfraRequest>
-   </soapenv:Body>
-</soapenv:Envelope>]]></con:request><con:assertion type="Valid HTTP Status Codes" id="5e83a766-cff3-473e-8a6b-7a19fec9bc03" name="Valid HTTP Status Codes"><con:configuration><codes>200</codes></con:configuration></con:assertion><con:credentials><con:username>${#Project#dbadapteruser}</con:username><con:password>${#Project#dbadapterpassword}</con:password><con:selectedAuthProfile>Basic</con:selectedAuthProfile><con:addedBasicAuthenticationTypes>Basic</con:addedBasicAuthenticationTypes><con:authType>Global HTTP Settings</con:authType></con:credentials><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:wsaConfig mustUnderstand="NONE" version="200508" action="http://org.openecomp.mso/requestsdb/RequestsDbAdapter/updateInfraRequestRequest"/><con:wsrmConfig version="1.2"/></con:request></con:config></con:testStep><con:testStep type="restrequest" name="Create Service - duplicate" id="848b6f6c-2e35-47b7-9511-845003dc0e99"><con:settings/><con:config service="Services" resourcePath="/ecomp/mso/infra/serviceInstances/v2" methodName="create service" xsi:type="con:RestRequestStep" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"><con:restRequest name="Create Service - duplicate" id="8ca9d822-808a-4955-a4e6-5f56ff813fec" mediaType="application/json" postQueryString="false"><con:settings><con:setting id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers">&lt;xml-fragment/></con:setting></con:settings><con:endpoint>http://${#Project#host}</con:endpoint><con:request>{
-    "requestDetails": {
-    "modelInfo": {
-    "modelType": "service",
-    "modelInvariantId": "ff3514e3-5a33-55df-13ab-12abad84e7ff",
-    "modelNameVersionId": "fe6985cd-ea33-3346-ac12-ab121484a3fe",
-    "modelName": "dns-servicetest",
-    "modelVersion": "1.0"
-    },
-    "subscriberInfo": {
-    "globalSubscriberId": "subscriber-1",
-    "subscriberName": "testSubscriber"
-    },
-    "requestInfo": {
-    "instanceName": "DNS_TEST",
-    "source": "VID",
-    "suppressRollback": true
-    },
-    "requestParameters": {
-    "subscriptionServiceType": "MOG",
-    "userParams": [
-    {
-    "name": "someUserParam",
-    "value": "someValue"
-    }
-    ]
-    }
-    }
-    }</con:request><con:originalUri>http://localhost/ecomp/mso/infra/serviceInstances/v2</con:originalUri><con:assertion type="Valid HTTP Status Codes" id="12d5c872-b42a-4fdf-aee1-4a5b805ed255" name="Valid HTTP Status Codes"><con:configuration><codes>409
-
-</codes></con:configuration></con:assertion><con:assertion type="Simple Contains" id="105dc1c2-1460-4cfe-bf84-a83ef8d17e86" name="Contains"><con:configuration><token>Error: Locked instance</token><ignoreCase>false</ignoreCase><useRegEx>false</useRegEx></con:configuration></con:assertion><con:credentials><con:username>${#Project#user-infraportal}</con:username><con:password>${#Project#password-infraportal}</con:password><con:selectedAuthProfile>Basic</con:selectedAuthProfile><con:addedBasicAuthenticationTypes>Basic</con:addedBasicAuthenticationTypes><con:authType>Global HTTP Settings</con:authType></con:credentials><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:parameters/></con:restRequest></con:config></con:testStep><con:testStep type="groovy" name="Update vnf_recipe table" id="edadefc9-6db0-410a-a6db-7edadbad2537"><con:settings/><con:config><script>import java.sql.Driver
-    import java.sql.Connection
-    import java.sql.Statement
-    import java.sql.ResultSet
-
-    def testCaseProperty = testRunner.testCase.testSuite.project.getPropertyValue( "host" )
-    def host = testCaseProperty.substring(0,testCaseProperty.lastIndexOf(':'))
-    def urlString = testRunner.testCase.testSuite.project.getPropertyValue( "db-driver" )
-
-    if (urlString.equals("")) {
-    URL[] urls = ClassLoader.systemClassLoader.getURLs()
-    String urlStr = urls[0].toString()
-    String tempUrl = urlStr.substring(0,urlStr.lastIndexOf('/'))
-    String baseUrl = tempUrl.substring(0,tempUrl.lastIndexOf('/')+1)
-
-    urlString = "jar:" + baseUrl +"mariadb-connector/mariadb-java-client-1.5.4.jar!/"
-    } else {
-    urlString = "jar:file:" + urlString +"!/"
-    }
-
-    def url = new URL(urlString)
-    URL[] classUrls = [ url ];
-    URLClassLoader urlCl = new URLClassLoader(classUrls);
-
-    Class mySqlDriver = urlCl.loadClass( "org.mariadb.jdbc.Driver" );
-    Driver sqlDriverInstance = ( Driver ) mySqlDriver.newInstance();
-    Connection con = null;
-    try {
-    String dbUrl = "jdbc:mariadb://" + host + ":3306/mso_catalog";
-    Properties userDbCredentials = new Properties();
-    userDbCredentials.put( "user", "catalog" );
-    userDbCredentials.put( "password", "catalog123" );
-
-    // safely use driver to connect
-    con = sqlDriverInstance.connect( dbUrl, userDbCredentials );
-
-    Statement stmt = con.createStatement();
-    String sql = "update network_recipe set ORCHESTRATION_URI=\"123\" where NETWORK_TYPE=\"VID_DEFAULT\" and ACTION=\"createInstance\"";
-    stmt.executeUpdate( sql );
-    } catch( Exception e ) {
-    e.printStackTrace(); // only for quick debug
-    } finally {
-    try { if ( con != null ) con.close(); } catch ( Exception ignoreThis ) {}
-    }
-</script></con:config></con:testStep><con:testStep type="restrequest" name="Create Networks with wrong BPMN script URL" id="23703e67-797f-4a9c-bd64-7d4b53d660ec"><con:settings/><con:config service="Services" methodName="create networks" resourcePath="/ecomp/mso/infra/serviceInstances/v2/{serviceInstanceId}/networks" xsi:type="con:RestRequestStep" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"><con:restRequest name="Create Networks with wrong BPMN script URL" id="c91bf79d-4cb5-4ebb-9329-2faf92237fdc" mediaType="application/json" postQueryString="false"><con:settings><con:setting id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers">&lt;xml-fragment/></con:setting></con:settings><con:encoding>UTF-8</con:encoding><con:endpoint>http://${#Project#host}</con:endpoint><con:request>{"requestDetails": {
-    "cloudConfiguration":    {
-    "tenantId": "cff319d50266491fa744b0d493a51ce0",
-    "lcpCloudRegionId": "rdm3"
-    },
-    "modelInfo":    {
-    "modelName": "CONTRAIL30_BASIC",
-    "modelType": "network"
-    },
-    "relatedInstanceList": [{"relatedInstance":    {
-    "modelInfo":       {
-    "modelNameVersionId": "1e34774e-715e-4fd6-bd09-7b654622f35i",
-    "modelName": "dns-servicetest",
-    "modelType": "service",
-    "modelVersion": "1.0",
-    "modelInvariantId": "585822c8-4027-4f84-ba50-e9248606f111"
-    },
-    "instanceId": "f75b1c7d-e878-40a3-8877-bc5605615f4d"
-    }}],
-    "requestInfo":    {
-    "productFamilyId": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb",
-    "source": "VID",
-    "instanceName": "MNS-25180-L-06Private_tst_mns_mgmt_net_1"
-    },
-    "requestParameters": {}
-    }}</con:request><con:originalUri>http://localhost/ecomp/mso/infra/serviceInstances/v2/serviceInstanceId/networks</con:originalUri><con:assertion type="Valid HTTP Status Codes" id="29a2c44b-0e68-4f1b-832e-d8237f4a7d72" name="Valid HTTP Status Codes"><con:configuration><codes>502</codes></con:configuration></con:assertion><con:assertion type="Simple Contains" id="24c29171-4bd3-4443-b16d-3f6db8599322" name="Contains"><con:configuration><token>Failed calling bpmn</token><ignoreCase>false</ignoreCase><useRegEx>false</useRegEx></con:configuration></con:assertion><con:credentials><con:username>${#Project#user-infraportal}</con:username><con:password>${#Project#password-infraportal}</con:password><con:selectedAuthProfile>Basic</con:selectedAuthProfile><con:addedBasicAuthenticationTypes>Basic</con:addedBasicAuthenticationTypes><con:authType>Global HTTP Settings</con:authType></con:credentials><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:parameters><entry key="serviceInstanceId" value="${#TestCase#serviceInstanceId}" xmlns="http://eviware.com/soapui/config"/></con:parameters></con:restRequest></con:config></con:testStep><con:testStep type="groovy" name="Remove from vnf_recipe" id="81aed2cd-d810-45fb-adba-54371ca94348"><con:settings/><con:config><script>import java.sql.Driver
-    import java.sql.Connection
-    import java.sql.Statement
-    import java.sql.ResultSet
-
-    def testCaseProperty = testRunner.testCase.testSuite.project.getPropertyValue( "host" )
-    def host = testCaseProperty.substring(0,testCaseProperty.lastIndexOf(':'))
-    def urlString = testRunner.testCase.testSuite.project.getPropertyValue( "db-driver" )
-
-    if (urlString.equals("")) {
-    URL[] urls = ClassLoader.systemClassLoader.getURLs()
-    String urlStr = urls[0].toString()
-    String tempUrl = urlStr.substring(0,urlStr.lastIndexOf('/'))
-    String baseUrl = tempUrl.substring(0,tempUrl.lastIndexOf('/')+1)
-
-    urlString = "jar:" + baseUrl +"mariadb-connector/mariadb-java-client-1.5.4.jar!/"
-    } else {
-    urlString = "jar:file:" + urlString +"!/"
-    }
-
-    def url = new URL(urlString)
-    URL[] classUrls = [ url ];
-    URLClassLoader urlCl = new URLClassLoader(classUrls);
-
-    Class mySqlDriver = urlCl.loadClass( "org.mariadb.jdbc.Driver" );
-    Driver sqlDriverInstance = ( Driver ) mySqlDriver.newInstance();
-    Connection con = null;
-    try {
-    String dbUrl = "jdbc:mariadb://" + host + ":3306/mso_catalog";
-    Properties userDbCredentials = new Properties();
-    userDbCredentials.put( "user", "catalog" );
-    userDbCredentials.put( "password", "catalog123" );
-
-    // safely use driver to connect
-    con = sqlDriverInstance.connect( dbUrl, userDbCredentials );
-
-    Statement stmt = con.createStatement();
-    String sql = "update network_recipe set NETWORK_TYPE=\"VID_DEFAULT1\" where NETWORK_TYPE=\"VID_DEFAULT\" and ACTION=\"createInstance\"";
-    stmt.executeUpdate( sql );
-    } catch( Exception e ) {
-    e.printStackTrace(); // only for quick debug
-    } finally {
-    try { if ( con != null ) con.close(); } catch ( Exception ignoreThis ) {}
-    }
-</script></con:config></con:testStep><con:testStep type="restrequest" name="Create Networks with no BPMN script" id="d2e7f1bc-af93-449d-9ebb-827b5f54cfa8"><con:settings/><con:config service="Services" methodName="create networks" resourcePath="/ecomp/mso/infra/serviceInstances/v2/{serviceInstanceId}/networks" xsi:type="con:RestRequestStep" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"><con:restRequest name="Create Networks with no BPMN script" id="c91bf79d-4cb5-4ebb-9329-2faf92237fdc" mediaType="application/json" postQueryString="false"><con:settings><con:setting id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers">&lt;xml-fragment/></con:setting></con:settings><con:encoding>UTF-8</con:encoding><con:endpoint>http://${#Project#host}</con:endpoint><con:request>{"requestDetails": {
-    "cloudConfiguration":    {
-    "tenantId": "cff319d50266491fa744b0d493a51ce0",
-    "lcpCloudRegionId": "rdm3"
-    },
-    "modelInfo":    {
-    "modelName": "CONTRAIL30_BASIC",
-    "modelType": "network"
-    },
-    "relatedInstanceList": [{"relatedInstance":    {
-    "modelInfo":       {
-    "modelNameVersionId": "1e34774e-715e-4fd6-bd09-7b654622f35i",
-    "modelName": "dns-servicetest",
-    "modelType": "service",
-    "modelVersion": "1.0",
-    "modelInvariantId": "585822c8-4027-4f84-ba50-e9248606f111"
-    },
-    "instanceId": "f75b1c7d-e878-40a3-8877-bc5605615f4d"
-    }}],
-    "requestInfo":    {
-    "productFamilyId": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb",
-    "source": "VID",
-    "instanceName": "MNS-25180-L-06Private_tst_mns_mgmt_net_1"
-    },
-    "requestParameters": {}
-    }}</con:request><con:originalUri>http://localhost/ecomp/mso/infra/serviceInstances/v2/serviceInstanceId/networks</con:originalUri><con:assertion type="Valid HTTP Status Codes" id="29a2c44b-0e68-4f1b-832e-d8237f4a7d72" name="Valid HTTP Status Codes"><con:configuration><codes>404</codes></con:configuration></con:assertion><con:assertion type="Simple Contains" id="c8d50858-a958-4348-9089-2970c81314e0" name="Contains"><con:configuration><token>Recipe does not exist in catalog DB</token><ignoreCase>false</ignoreCase><useRegEx>false</useRegEx></con:configuration></con:assertion><con:credentials><con:username>${#Project#user-infraportal}</con:username><con:password>${#Project#password-infraportal}</con:password><con:selectedAuthProfile>Basic</con:selectedAuthProfile><con:addedBasicAuthenticationTypes>Basic</con:addedBasicAuthenticationTypes><con:authType>Global HTTP Settings</con:authType></con:credentials><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:parameters><entry key="serviceInstanceId" value="${#TestCase#serviceInstanceId}" xmlns="http://eviware.com/soapui/config"/></con:parameters></con:restRequest></con:config></con:testStep><con:testStep type="groovy" name="Restore DB table" id="4cb4cdac-3344-4ac0-ad0d-352bb678a58f"><con:settings/><con:config><script>import java.sql.Driver
-    import java.sql.Connection
-    import java.sql.Statement
-    import java.sql.ResultSet
-
-    def testCaseProperty = testRunner.testCase.testSuite.project.getPropertyValue( "host" )
-    def host = testCaseProperty.substring(0,testCaseProperty.lastIndexOf(':'))
-    def urlString = testRunner.testCase.testSuite.project.getPropertyValue( "db-driver" )
-
-    if (urlString.equals("")) {
-    URL[] urls = ClassLoader.systemClassLoader.getURLs()
-    String urlStr = urls[0].toString()
-    String tempUrl = urlStr.substring(0,urlStr.lastIndexOf('/'))
-    String baseUrl = tempUrl.substring(0,tempUrl.lastIndexOf('/')+1)
-
-    urlString = "jar:" + baseUrl +"mariadb-connector/mariadb-java-client-1.5.4.jar!/"
-    } else {
-    urlString = "jar:file:" + urlString +"!/"
-    }
-
-    def url = new URL(urlString)
-    URL[] classUrls = [ url ];
-    URLClassLoader urlCl = new URLClassLoader(classUrls);
-
-    Class mySqlDriver = urlCl.loadClass( "org.mariadb.jdbc.Driver" );
-    Driver sqlDriverInstance = ( Driver ) mySqlDriver.newInstance();
-    Connection con = null;
-    try {
-    String dbUrl = "jdbc:mariadb://" + host + ":3306/mso_catalog";
-    Properties userDbCredentials = new Properties();
-    userDbCredentials.put( "user", "catalog" );
-    userDbCredentials.put( "password", "catalog123" );
-
-    // safely use driver to connect
-    con = sqlDriverInstance.connect( dbUrl, userDbCredentials );
-
-    Statement stmt = con.createStatement();
-    String sql1 = "update network_recipe set ORCHESTRATION_URI=\"/mso/async/services/CreateNetworkInstanceInfra\" where NETWORK_TYPE=\"VID_DEFAULT1\" and ACTION=\"createInstance\"";
-    stmt.executeUpdate( sql1 );
-    String sql2 = "update network_recipe set NETWORK_TYPE=\"VID_DEFAULT\" where NETWORK_TYPE=\"VID_DEFAULT1\" and ACTION=\"createInstance\"";
-    stmt.executeUpdate( sql2 );
-    } catch( Exception e ) {
-    e.printStackTrace(); // only for quick debug
-    } finally {
-    try { if ( con != null ) con.close(); } catch ( Exception ignoreThis ) {}
-    }
-</script></con:config></con:testStep><con:properties><con:property><con:name>requestId</con:name><con:value>1cf0f4b3-8e50-4b14-bc46-37514b5f2cd4</con:value></con:property><con:property><con:name>serviceInstanceId</con:name><con:value>a82d6977-6493-484f-ae8c-1b2f442e0d82</con:value></con:property><con:property><con:name>vnfInstanceId</con:name><con:value>f90f877a-3c08-43f1-b1eb-e0bd282c0b81</con:value></con:property><con:property><con:name>vfModuleInstanceId</con:name><con:value>38b74487-c406-47d7-a9eb-530dd89242cc</con:value></con:property><con:property><con:name>vomuleGroupInstanceId</con:name><con:value>20e3e2f9-25a3-494e-8108-cafa3ff992f1</con:value></con:property><con:property><con:name>networkId</con:name><con:value>ebdd074d-ba30-4d44-921c-323cec4e78fc</con:value></con:property></con:properties></con:testCase><con:properties/></con:testSuite><con:properties><con:property><con:name>host</con:name><con:value>localhost:8080</con:value></con:property><con:property><con:name>user-infraportal</con:name><con:value>InfraPortalClient</con:value></con:property><con:property><con:name>password-infraportal</con:name><con:value>password1$</con:value></con:property><con:property><con:name>db-driver</con:name><con:value/></con:property><con:property><con:name>dbadapteruser</con:name><con:value>BPELClient</con:value></con:property><con:property><con:name>dbadapterpassword</con:name><con:value>password1$</con:value></con:property></con:properties><con:wssContainer/><con:oAuth2ProfileContainer/><con:oAuth1ProfileContainer/><con:sensitiveInformation/></con:soapui-project>
\ No newline at end of file
diff --git a/packages/arquillian-unit-tests/src/test/resources/SoapUI/MSOConfig-soapui-project.xml b/packages/arquillian-unit-tests/src/test/resources/SoapUI/MSOConfig-soapui-project.xml
deleted file mode 100644
index 84449a2..0000000
--- a/packages/arquillian-unit-tests/src/test/resources/SoapUI/MSOConfig-soapui-project.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<con:soapui-project name="MsoConfig" soapui-version="5.3.0" abortOnError="false" runType="SEQUENTIAL" activeEnvironment="Default" resourceRoot="" id="9a646d8d-db03-4dfa-95cd-648d7f44b915" xmlns:con="http://eviware.com/soapui/config"><con:settings/><con:interface xsi:type="con:RestService" wadlVersion="http://wadl.dev.java.net/2009/02" name="Services" type="rest" basePath="" id="317bf83a-7f7b-4729-ba1a-e2899ca168c1" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"><con:settings/><con:definitionCache type="TEXT" rootPart=""/><con:endpoints><con:endpoint>http://localhost:8080</con:endpoint></con:endpoints><con:resource name="apihandlerinfra-show" path="/ecomp/mso/infra/properties/show" id="eb251d03-9d97-4a50-b16d-883b5aacf44c"><con:settings/><con:parameters/><con:method name="Method 1" id="3a097f13-cf93-44f3-923e-9f35d92ba347" method="GET"><con:settings/><con:parameters/><con:representation type="FAULT"><con:mediaType>text/html;charset=utf-8</con:mediaType><con:status>401 403 500 404</con:status><con:params/><con:element>html</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType xsi:nil="true"/><con:status>0</con:status><con:params/><con:element>data</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType xsi:nil="true"/><con:status>0</con:status><con:params/><con:element>data</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType xsi:nil="true"/><con:status>0</con:status><con:params/><con:element>data</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType xsi:nil="true"/><con:status>0</con:status><con:params/><con:element>data</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType>text/plain</con:mediaType><con:status>200</con:status><con:params/><con:element>data</con:element></con:representation><con:request name="Request 1" id="fa27bb04-9df7-4e1d-b4a7-668ab7b241a9" mediaType="application/json"><con:settings><con:setting id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers">&lt;xml-fragment/></con:setting></con:settings><con:endpoint>http://${#Project#host}</con:endpoint><con:request/><con:originalUri>http://localhost/ecomp/mso/properties/show</con:originalUri><con:credentials><con:username>${#Project#user-csi}</con:username><con:password>${#Project#password-csi}</con:password><con:selectedAuthProfile>Basic</con:selectedAuthProfile><con:addedBasicAuthenticationTypes>Basic</con:addedBasicAuthenticationTypes><con:authType>Global HTTP Settings</con:authType></con:credentials><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:parameters/></con:request></con:method></con:resource><con:resource name="apihandlerinfra-encrypt" path="/ecomp/mso/infra/properties/encrypt/{value}/{cryptkey}" id="eb251d03-9d97-4a50-b16d-883b5aacf44c"><con:settings/><con:parameters><con:parameter><con:name>value</con:name><con:value>mso</con:value><con:style>TEMPLATE</con:style><con:default>mso</con:default></con:parameter><con:parameter><con:name>cryptkey</con:name><con:value>566B754875657232314F5548556D3665</con:value><con:style>TEMPLATE</con:style><con:default>566B754875657232314F5548556D3665</con:default></con:parameter></con:parameters><con:method name="Method 1" id="3a097f13-cf93-44f3-923e-9f35d92ba347" method="GET"><con:settings/><con:parameters/><con:representation type="FAULT"><con:mediaType>text/html;charset=utf-8</con:mediaType><con:status>401 403 500 404</con:status><con:params/><con:element>html</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType xsi:nil="true"/><con:status>0</con:status><con:params/><con:element>data</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType xsi:nil="true"/><con:status>0</con:status><con:params/><con:element>data</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType xsi:nil="true"/><con:status>0</con:status><con:params/><con:element>data</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType xsi:nil="true"/><con:status>0</con:status><con:params/><con:element>data</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType>text/plain</con:mediaType><con:status>200</con:status><con:params/><con:element>data</con:element></con:representation><con:request name="Request 1" id="fa27bb04-9df7-4e1d-b4a7-668ab7b241a9" mediaType="application/json"><con:settings><con:setting id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers">&lt;xml-fragment/></con:setting></con:settings><con:endpoint>http://${#Project#host}</con:endpoint><con:request/><con:originalUri>http://localhost/ecomp/mso/properties/show</con:originalUri><con:credentials><con:username>${#Project#user-csi}</con:username><con:password>${#Project#password-csi}</con:password><con:selectedAuthProfile>Basic</con:selectedAuthProfile><con:addedBasicAuthenticationTypes>Basic</con:addedBasicAuthenticationTypes><con:authType>Global HTTP Settings</con:authType></con:credentials><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:parameters/><con:parameterOrder><con:entry>value</con:entry><con:entry>cryptkey</con:entry></con:parameterOrder></con:request></con:method></con:resource><con:resource name="network-show" path="/networks/rest/properties/show" id="eb251d03-9d97-4a50-b16d-883b5aacf44c"><con:settings/><con:parameters/><con:method name="Method 1" id="3a097f13-cf93-44f3-923e-9f35d92ba347" method="GET"><con:settings/><con:parameters/><con:representation type="FAULT"><con:mediaType>text/html;charset=utf-8</con:mediaType><con:status>401 403 500 404</con:status><con:params/><con:element>html</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType xsi:nil="true"/><con:status>0</con:status><con:params/><con:element>data</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType xsi:nil="true"/><con:status>0</con:status><con:params/><con:element>data</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType xsi:nil="true"/><con:status>0</con:status><con:params/><con:element>data</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType xsi:nil="true"/><con:status>0</con:status><con:params/><con:element>data</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType>text/plain</con:mediaType><con:status>200</con:status><con:params/><con:element>data</con:element></con:representation><con:request name="Request 1" id="fa27bb04-9df7-4e1d-b4a7-668ab7b241a9" mediaType="application/json"><con:settings><con:setting id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers">&lt;xml-fragment/></con:setting></con:settings><con:endpoint>http://${#Project#host}</con:endpoint><con:request/><con:originalUri>http://localhost/ecomp/mso/properties/show</con:originalUri><con:credentials><con:username>${#Project#user-csi}</con:username><con:password>${#Project#password-csi}</con:password><con:selectedAuthProfile>Basic</con:selectedAuthProfile><con:addedBasicAuthenticationTypes>Basic</con:addedBasicAuthenticationTypes><con:authType>Global HTTP Settings</con:authType></con:credentials><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:parameters/></con:request></con:method></con:resource><con:resource name="network-encrypt" path="/networks/rest/properties/encrypt/{value}/{cryptkey}" id="eb251d03-9d97-4a50-b16d-883b5aacf44c"><con:settings/><con:parameters><con:parameter><con:name>value</con:name><con:value>mso</con:value><con:style>TEMPLATE</con:style><con:default>mso</con:default></con:parameter><con:parameter><con:name>cryptkey</con:name><con:value>566B754875657232314F5548556D3665</con:value><con:style>TEMPLATE</con:style><con:default>566B754875657232314F5548556D3665</con:default></con:parameter></con:parameters><con:method name="Method 1" id="3a097f13-cf93-44f3-923e-9f35d92ba347" method="GET"><con:settings/><con:parameters/><con:representation type="FAULT"><con:mediaType>text/html;charset=utf-8</con:mediaType><con:status>401 403 500 404</con:status><con:params/><con:element>html</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType xsi:nil="true"/><con:status>0</con:status><con:params/><con:element>data</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType xsi:nil="true"/><con:status>0</con:status><con:params/><con:element>data</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType xsi:nil="true"/><con:status>0</con:status><con:params/><con:element>data</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType xsi:nil="true"/><con:status>0</con:status><con:params/><con:element>data</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType>text/plain</con:mediaType><con:status>200</con:status><con:params/><con:element>data</con:element></con:representation><con:request name="Request 1" id="fa27bb04-9df7-4e1d-b4a7-668ab7b241a9" mediaType="application/json"><con:settings><con:setting id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers">&lt;xml-fragment/></con:setting></con:settings><con:endpoint>http://${#Project#host}</con:endpoint><con:request/><con:originalUri>http://localhost/ecomp/mso/properties/show</con:originalUri><con:credentials><con:username>${#Project#user-csi}</con:username><con:password>${#Project#password-csi}</con:password><con:selectedAuthProfile>Basic</con:selectedAuthProfile><con:addedBasicAuthenticationTypes>Basic</con:addedBasicAuthenticationTypes><con:authType>Global HTTP Settings</con:authType></con:credentials><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:parameters/><con:parameterOrder><con:entry>value</con:entry><con:entry>cryptkey</con:entry></con:parameterOrder></con:request></con:method></con:resource><con:resource name="network-cloud-show" path="/networks/rest/cloud/showConfig" id="eb251d03-9d97-4a50-b16d-883b5aacf44c"><con:settings/><con:parameters/><con:method name="Method 1" id="3a097f13-cf93-44f3-923e-9f35d92ba347" method="GET"><con:settings/><con:parameters/><con:representation type="FAULT"><con:mediaType>text/html;charset=utf-8</con:mediaType><con:status>401 403 500 404</con:status><con:params/><con:element>html</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType xsi:nil="true"/><con:status>0</con:status><con:params/><con:element>data</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType xsi:nil="true"/><con:status>0</con:status><con:params/><con:element>data</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType xsi:nil="true"/><con:status>0</con:status><con:params/><con:element>data</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType xsi:nil="true"/><con:status>0</con:status><con:params/><con:element>data</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType>text/plain</con:mediaType><con:status>200</con:status><con:params/><con:element>data</con:element></con:representation><con:request name="Request 1" id="fa27bb04-9df7-4e1d-b4a7-668ab7b241a9" mediaType="application/json"><con:settings><con:setting id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers">&lt;xml-fragment/></con:setting></con:settings><con:endpoint>http://${#Project#host}</con:endpoint><con:request/><con:originalUri>http://localhost/ecomp/mso/properties/show</con:originalUri><con:credentials><con:username>${#Project#user-csi}</con:username><con:password>${#Project#password-csi}</con:password><con:selectedAuthProfile>Basic</con:selectedAuthProfile><con:addedBasicAuthenticationTypes>Basic</con:addedBasicAuthenticationTypes><con:authType>Global HTTP Settings</con:authType></con:credentials><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:parameters/></con:request></con:method></con:resource><con:resource name="network-cloud-resetClientCache" path="/networks/rest/cloud/resetClientCaches" id="eb251d03-9d97-4a50-b16d-883b5aacf44c"><con:settings/><con:parameters/><con:method name="Method 1" id="3a097f13-cf93-44f3-923e-9f35d92ba347" method="GET"><con:settings/><con:parameters/><con:representation type="FAULT"><con:mediaType>text/html;charset=utf-8</con:mediaType><con:status>401 403 500 404</con:status><con:params/><con:element>html</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType xsi:nil="true"/><con:status>0</con:status><con:params/><con:element>data</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType xsi:nil="true"/><con:status>0</con:status><con:params/><con:element>data</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType xsi:nil="true"/><con:status>0</con:status><con:params/><con:element>data</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType xsi:nil="true"/><con:status>0</con:status><con:params/><con:element>data</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType>text/plain</con:mediaType><con:status>200</con:status><con:params/><con:element>data</con:element></con:representation><con:request name="Request 1" id="fa27bb04-9df7-4e1d-b4a7-668ab7b241a9" mediaType="application/json"><con:settings><con:setting id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers">&lt;xml-fragment/></con:setting></con:settings><con:endpoint>http://${#Project#host}</con:endpoint><con:request/><con:originalUri>http://localhost/ecomp/mso/properties/show</con:originalUri><con:credentials><con:username>${#Project#user-csi}</con:username><con:password>${#Project#password-csi}</con:password><con:selectedAuthProfile>Basic</con:selectedAuthProfile><con:addedBasicAuthenticationTypes>Basic</con:addedBasicAuthenticationTypes><con:authType>Global HTTP Settings</con:authType></con:credentials><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:parameters/></con:request></con:method></con:resource><con:resource name="network-cloud-cleanupClientCaches" path="/networks/rest/cloud/cleanupClientCaches" id="eb251d03-9d97-4a50-b16d-883b5aacf44c"><con:settings/><con:parameters/><con:method name="Method 1" id="3a097f13-cf93-44f3-923e-9f35d92ba347" method="GET"><con:settings/><con:parameters/><con:representation type="FAULT"><con:mediaType>text/html;charset=utf-8</con:mediaType><con:status>401 403 500 404</con:status><con:params/><con:element>html</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType xsi:nil="true"/><con:status>0</con:status><con:params/><con:element>data</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType xsi:nil="true"/><con:status>0</con:status><con:params/><con:element>data</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType xsi:nil="true"/><con:status>0</con:status><con:params/><con:element>data</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType xsi:nil="true"/><con:status>0</con:status><con:params/><con:element>data</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType>text/plain</con:mediaType><con:status>200</con:status><con:params/><con:element>data</con:element></con:representation><con:request name="Request 1" id="fa27bb04-9df7-4e1d-b4a7-668ab7b241a9" mediaType="application/json"><con:settings><con:setting id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers">&lt;xml-fragment/></con:setting></con:settings><con:endpoint>http://${#Project#host}</con:endpoint><con:request/><con:originalUri>http://localhost/ecomp/mso/properties/show</con:originalUri><con:credentials><con:username>${#Project#user-csi}</con:username><con:password>${#Project#password-csi}</con:password><con:selectedAuthProfile>Basic</con:selectedAuthProfile><con:addedBasicAuthenticationTypes>Basic</con:addedBasicAuthenticationTypes><con:authType>Global HTTP Settings</con:authType></con:credentials><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:parameters/></con:request></con:method></con:resource><con:resource name="network-cloud-encryptPassword" path="/networks/rest/cloud/encryptPassword/{pwd}" id="eb251d03-9d97-4a50-b16d-883b5aacf44c"><con:settings/><con:parameters><con:parameter><con:name>pwd</con:name><con:value/><con:style>TEMPLATE</con:style><con:default/></con:parameter></con:parameters><con:method name="Method 1" id="3a097f13-cf93-44f3-923e-9f35d92ba347" method="GET"><con:settings/><con:parameters/><con:representation type="FAULT"><con:mediaType>text/html;charset=utf-8</con:mediaType><con:status>401 403 500 404</con:status><con:params/><con:element>html</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType xsi:nil="true"/><con:status>0</con:status><con:params/><con:element>data</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType xsi:nil="true"/><con:status>0</con:status><con:params/><con:element>data</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType xsi:nil="true"/><con:status>0</con:status><con:params/><con:element>data</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType xsi:nil="true"/><con:status>0</con:status><con:params/><con:element>data</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType>text/plain</con:mediaType><con:status>200</con:status><con:params/><con:element>data</con:element></con:representation><con:request name="Request 1" id="fa27bb04-9df7-4e1d-b4a7-668ab7b241a9" mediaType="application/json"><con:settings><con:setting id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers">&lt;xml-fragment/></con:setting></con:settings><con:endpoint>http://${#Project#host}</con:endpoint><con:request/><con:originalUri>http://localhost/ecomp/mso/properties/show</con:originalUri><con:credentials><con:username>${#Project#user-csi}</con:username><con:password>${#Project#password-csi}</con:password><con:selectedAuthProfile>Basic</con:selectedAuthProfile><con:addedBasicAuthenticationTypes>Basic</con:addedBasicAuthenticationTypes><con:authType>Global HTTP Settings</con:authType></con:credentials><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:parameters><entry key="pwd" value="mso" xmlns="http://eviware.com/soapui/config"/></con:parameters><con:parameterOrder><con:entry>pwd</con:entry></con:parameterOrder></con:request></con:method></con:resource><con:resource name="asdc-show" path="/asdc/properties/show" id="eb251d03-9d97-4a50-b16d-883b5aacf44c"><con:settings/><con:parameters/><con:method name="Method 1" id="3a097f13-cf93-44f3-923e-9f35d92ba347" method="GET"><con:settings/><con:parameters/><con:representation type="FAULT"><con:mediaType>text/html;charset=utf-8</con:mediaType><con:status>401 403 500 404</con:status><con:params/><con:element>html</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType xsi:nil="true"/><con:status>0</con:status><con:params/><con:element>data</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType xsi:nil="true"/><con:status>0</con:status><con:params/><con:element>data</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType xsi:nil="true"/><con:status>0</con:status><con:params/><con:element>data</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType xsi:nil="true"/><con:status>0</con:status><con:params/><con:element>data</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType>text/plain</con:mediaType><con:status>200</con:status><con:params/><con:element>data</con:element></con:representation><con:request name="Request 1" id="fa27bb04-9df7-4e1d-b4a7-668ab7b241a9" mediaType="application/json"><con:settings><con:setting id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers">&lt;xml-fragment/></con:setting></con:settings><con:endpoint>http://${#Project#host}</con:endpoint><con:request/><con:originalUri>http://localhost/ecomp/mso/properties/show</con:originalUri><con:credentials><con:username>${#Project#user-csi}</con:username><con:password>${#Project#password-csi}</con:password><con:selectedAuthProfile>Basic</con:selectedAuthProfile><con:addedBasicAuthenticationTypes>Basic</con:addedBasicAuthenticationTypes><con:authType>Global HTTP Settings</con:authType></con:credentials><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:parameters/></con:request></con:method></con:resource><con:resource name="asdc-encrypt" path="/asdc/properties/encrypt/{value}/{cryptkey}" id="eb251d03-9d97-4a50-b16d-883b5aacf44c"><con:settings/><con:parameters><con:parameter><con:name>value</con:name><con:value>mso</con:value><con:style>TEMPLATE</con:style><con:default>mso</con:default></con:parameter><con:parameter><con:name>cryptkey</con:name><con:value>566B754875657232314F5548556D3665</con:value><con:style>TEMPLATE</con:style><con:default>566B754875657232314F5548556D3665</con:default></con:parameter></con:parameters><con:method name="Method 1" id="3a097f13-cf93-44f3-923e-9f35d92ba347" method="GET"><con:settings/><con:parameters/><con:representation type="FAULT"><con:mediaType>text/html;charset=utf-8</con:mediaType><con:status>401 403 500 404</con:status><con:params/><con:element>html</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType xsi:nil="true"/><con:status>0</con:status><con:params/><con:element>data</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType xsi:nil="true"/><con:status>0</con:status><con:params/><con:element>data</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType xsi:nil="true"/><con:status>0</con:status><con:params/><con:element>data</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType xsi:nil="true"/><con:status>0</con:status><con:params/><con:element>data</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType>text/plain</con:mediaType><con:status>200</con:status><con:params/><con:element>data</con:element></con:representation><con:request name="Request 1" id="fa27bb04-9df7-4e1d-b4a7-668ab7b241a9" mediaType="application/json"><con:settings><con:setting id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers">&lt;xml-fragment/></con:setting></con:settings><con:endpoint>http://${#Project#host}</con:endpoint><con:request/><con:originalUri>http://localhost/ecomp/mso/properties/show</con:originalUri><con:credentials><con:username>${#Project#user-csi}</con:username><con:password>${#Project#password-csi}</con:password><con:selectedAuthProfile>Basic</con:selectedAuthProfile><con:addedBasicAuthenticationTypes>Basic</con:addedBasicAuthenticationTypes><con:authType>Global HTTP Settings</con:authType></con:credentials><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:parameters/><con:parameterOrder><con:entry>value</con:entry><con:entry>cryptkey</con:entry></con:parameterOrder></con:request></con:method></con:resource></con:interface><con:testSuite name="test_config_endpoints TestSuite" id="580326d7-451f-4771-8ac3-4f3607322cfd"><con:settings/><con:runType>SEQUENTIAL</con:runType><con:testCase id="ada487f2-c127-4032-86fc-24c3b401939d" failOnError="true" failTestCaseOnErrors="true" keepSession="false" maxResults="0" name="APiHandlerInfra testConfig" searchProperties="true"><con:settings/><con:testStep type="restrequest" name="ApiHandlerInfra-MsoPropertiesShow" id="fa19cf56-ee4c-45c7-8b6c-bc7cb81b122e"><con:settings/><con:config service="Services" resourcePath="/ecomp/mso/infra/properties/show" methodName="Method 1" xsi:type="con:RestRequestStep" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"><con:restRequest name="ApiHandlerInfra-MsoPropertiesShow" id="fa27bb04-9df7-4e1d-b4a7-668ab7b241a9" mediaType="application/json"><con:settings><con:setting id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers">&lt;xml-fragment/></con:setting></con:settings><con:endpoint>http://${#Project#host}</con:endpoint><con:request/><con:originalUri>http://localhost/ecomp/mso/properties/show</con:originalUri><con:assertion type="Simple Contains" id="04575060-e81b-4609-893c-47df2386c9fe" name="Contains ApiHandlerInfra config"><con:configuration><token>Config file </token><ignoreCase>false</ignoreCase><useRegEx>false</useRegEx></con:configuration></con:assertion><con:assertion type="Valid HTTP Status Codes" id="17fc52a7-ab93-47e7-aadf-3f5e7d1e80a8" name="Valid HTTP Status Codes"><con:configuration><codes>200</codes></con:configuration></con:assertion><con:credentials><con:username>${#Project#msoclient}</con:username><con:password>${#Project#msoclientpassword}</con:password><con:selectedAuthProfile>Basic</con:selectedAuthProfile><con:addedBasicAuthenticationTypes>Basic</con:addedBasicAuthenticationTypes><con:authType>Global HTTP Settings</con:authType></con:credentials><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:parameters/></con:restRequest></con:config></con:testStep><con:testStep type="restrequest" name="ApiHandlerInfra-MsoPropertiesEncrypt" id="c7120b5b-3188-42a7-a5da-e34e1f2783d6"><con:settings/><con:config service="Services" resourcePath="/ecomp/mso/infra/properties/encrypt/{value}/{cryptkey}" methodName="Method 1" xsi:type="con:RestRequestStep" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"><con:restRequest name="ApiHandlerInfra-MsoPropertiesEncrypt" id="fa27bb04-9df7-4e1d-b4a7-668ab7b241a9" mediaType="application/json"><con:settings><con:setting id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers">&lt;xml-fragment/></con:setting></con:settings><con:endpoint>http://${#Project#host}</con:endpoint><con:request/><con:originalUri>http://localhost/ecomp/mso/properties/show</con:originalUri><con:assertion type="Simple Contains" id="c0e9dbbd-bcd4-423a-89bd-47b749b6efd7" name="Contains Encoded string"><con:configuration><token>32221B0E4D30434BAE82C67492419CF8</token><ignoreCase>false</ignoreCase><useRegEx>false</useRegEx></con:configuration></con:assertion><con:credentials><con:username>${#Project#msoclient}</con:username><con:password>${#Project#msoclientpassword}</con:password><con:selectedAuthProfile>Basic</con:selectedAuthProfile><con:addedBasicAuthenticationTypes>Basic</con:addedBasicAuthenticationTypes><con:authType>Global HTTP Settings</con:authType></con:credentials><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:parameters/><con:parameterOrder><con:entry>value</con:entry><con:entry>cryptkey</con:entry></con:parameterOrder></con:restRequest></con:config></con:testStep><con:properties/></con:testCase><con:testCase id="76989651-aadf-4253-9ced-f31488e62f56" failOnError="true" failTestCaseOnErrors="true" keepSession="false" maxResults="0" name="Network testConfig" searchProperties="true"><con:settings/><con:testStep type="restrequest" name="Network-MsoPropertiesShow" id="718babec-0d05-4663-96a6-2ff2c01e3d53"><con:settings/><con:config service="Services" resourcePath="/networks/rest/properties/show" methodName="Method 1" xsi:type="con:RestRequestStep" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"><con:restRequest name="Network-MsoPropertiesShow" id="fa27bb04-9df7-4e1d-b4a7-668ab7b241a9" mediaType="application/json"><con:settings><con:setting id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers">&lt;xml-fragment/></con:setting></con:settings><con:endpoint>http://${#Project#host}</con:endpoint><con:request/><con:originalUri>http://localhost/ecomp/mso/properties/show</con:originalUri><con:assertion type="Simple Contains" id="04575060-e81b-4609-893c-47df2386c9fe" name="Contains ApiHandlerInfra config"><con:configuration><token>Config file </token><ignoreCase>false</ignoreCase><useRegEx>false</useRegEx></con:configuration></con:assertion><con:assertion type="Valid HTTP Status Codes" id="305e66b9-4cba-4111-8c24-e4cef067aa7a" name="Valid HTTP Status Codes"><con:configuration><codes>200</codes></con:configuration></con:assertion><con:credentials><con:username>${#Project#msoclient}</con:username><con:password>${#Project#msoclientpassword}</con:password><con:selectedAuthProfile>Basic</con:selectedAuthProfile><con:addedBasicAuthenticationTypes>Basic</con:addedBasicAuthenticationTypes><con:authType>Global HTTP Settings</con:authType></con:credentials><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:parameters/></con:restRequest></con:config></con:testStep><con:testStep type="restrequest" name="Network-MsoPropertiesEncrypt" id="4d36e0fa-9c6e-4b7f-bc5d-0ccb9f2b9772"><con:settings/><con:config service="Services" resourcePath="/networks/rest/properties/encrypt/{value}/{cryptkey}" methodName="Method 1" xsi:type="con:RestRequestStep" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"><con:restRequest name="Network-MsoPropertiesEncrypt" id="fa27bb04-9df7-4e1d-b4a7-668ab7b241a9" mediaType="application/json"><con:settings><con:setting id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers">&lt;xml-fragment/></con:setting></con:settings><con:endpoint>http://${#Project#host}</con:endpoint><con:request/><con:originalUri>http://localhost/ecomp/mso/properties/show</con:originalUri><con:assertion type="Simple Contains" id="c0e9dbbd-bcd4-423a-89bd-47b749b6efd7" name="Contains Encoded string"><con:configuration><token>32221B0E4D30434BAE82C67492419CF8</token><ignoreCase>false</ignoreCase><useRegEx>false</useRegEx></con:configuration></con:assertion><con:credentials><con:username>${#Project#msoclient}</con:username><con:password>${#Project#msoclientpassword}</con:password><con:selectedAuthProfile>Basic</con:selectedAuthProfile><con:addedBasicAuthenticationTypes>Basic</con:addedBasicAuthenticationTypes><con:authType>Global HTTP Settings</con:authType></con:credentials><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:parameters/><con:parameterOrder><con:entry>value</con:entry><con:entry>cryptkey</con:entry></con:parameterOrder></con:restRequest></con:config></con:testStep><con:properties/></con:testCase><con:testCase id="cc441f6b-920a-4b6c-80c3-976f75bd452e" failOnError="true" failTestCaseOnErrors="true" keepSession="false" maxResults="0" name="Network testCloudConfig" searchProperties="true"><con:settings/><con:testStep type="restrequest" name="Network-showCloudConfig" id="0a1ec3c9-113b-45f0-903f-dc38fec8281c"><con:settings/><con:config service="Services" resourcePath="/networks/rest/cloud/showConfig" methodName="Method 1" xsi:type="con:RestRequestStep" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"><con:restRequest name="Network-showCloudConfig" id="fa27bb04-9df7-4e1d-b4a7-668ab7b241a9" mediaType="application/json"><con:settings><con:setting id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers">&lt;xml-fragment/></con:setting></con:settings><con:endpoint>http://${#Project#host}</con:endpoint><con:request/><con:originalUri>http://localhost/ecomp/mso/properties/show</con:originalUri><con:assertion type="Simple Contains" id="5256ce2c-a288-4df0-87e5-4676af987f09" name="Contains CloudConfig 1"><con:configuration><token>CloudSite:</token><ignoreCase>false</ignoreCase><useRegEx>false</useRegEx></con:configuration></con:assertion><con:assertion type="Simple Contains" id="46a1a2a1-db66-4104-acfb-c925ae813fe8" name="Contains"><con:configuration><token>Cloud Identity Service:</token><ignoreCase>false</ignoreCase><useRegEx>false</useRegEx></con:configuration></con:assertion><con:assertion type="Valid HTTP Status Codes" id="a4b1b9de-207c-477d-b607-831a7f3744d2" name="Valid HTTP Status Codes"><con:configuration><codes>200
-</codes></con:configuration></con:assertion><con:credentials><con:username>${#Project#user-csi}</con:username><con:password>${#Project#password-csi}</con:password><con:selectedAuthProfile>Basic</con:selectedAuthProfile><con:addedBasicAuthenticationTypes>Basic</con:addedBasicAuthenticationTypes><con:authType>Global HTTP Settings</con:authType></con:credentials><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:parameters/></con:restRequest></con:config></con:testStep><con:testStep type="restrequest" name="Network-resetClientCache" id="128e3402-e939-44cb-8a0a-0f3f3b9fce86"><con:settings/><con:config service="Services" resourcePath="/networks/rest/cloud/resetClientCaches" methodName="Method 1" xsi:type="con:RestRequestStep" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"><con:restRequest name="Network-resetClientCache" id="fa27bb04-9df7-4e1d-b4a7-668ab7b241a9" mediaType="application/json"><con:settings><con:setting id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers">&lt;xml-fragment/></con:setting></con:settings><con:endpoint>http://${#Project#host}</con:endpoint><con:request/><con:originalUri>http://localhost/ecomp/mso/properties/show</con:originalUri><con:assertion type="Simple Contains" id="a55d0f14-6fb3-4b3c-930e-16810f6dd67f" name="Contains Caches reset"><con:configuration><token>Client caches reset.  All entries removed.</token><ignoreCase>false</ignoreCase><useRegEx>false</useRegEx></con:configuration></con:assertion><con:credentials><con:username>${#Project#user-csi}</con:username><con:password>${#Project#password-csi}</con:password><con:selectedAuthProfile>Basic</con:selectedAuthProfile><con:addedBasicAuthenticationTypes>Basic</con:addedBasicAuthenticationTypes><con:authType>Global HTTP Settings</con:authType></con:credentials><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:parameters/></con:restRequest></con:config></con:testStep><con:testStep type="restrequest" name="Network-cleanupClientCache" id="723e6809-17ad-4529-bb71-4134f1f9e645"><con:settings/><con:config service="Services" resourcePath="/networks/rest/cloud/cleanupClientCaches" methodName="Method 1" xsi:type="con:RestRequestStep" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"><con:restRequest name="Network-cleanupClientCache" id="fa27bb04-9df7-4e1d-b4a7-668ab7b241a9" mediaType="application/json"><con:settings><con:setting id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers">&lt;xml-fragment/></con:setting></con:settings><con:endpoint>http://${#Project#host}</con:endpoint><con:request/><con:originalUri>http://localhost/ecomp/mso/properties/show</con:originalUri><con:assertion type="Simple Contains" id="fecccae4-9493-479a-be30-9015dabf84c2" name="Contains Caches cleanup"><con:configuration><token>Client caches cleaned up.  All expired entries removed</token><ignoreCase>false</ignoreCase><useRegEx>false</useRegEx></con:configuration></con:assertion><con:credentials><con:username>${#Project#user-csi}</con:username><con:password>${#Project#password-csi}</con:password><con:selectedAuthProfile>Basic</con:selectedAuthProfile><con:addedBasicAuthenticationTypes>Basic</con:addedBasicAuthenticationTypes><con:authType>Global HTTP Settings</con:authType></con:credentials><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:parameters/></con:restRequest></con:config></con:testStep><con:testStep type="restrequest" name="Network-encryptPassword" id="09622065-23e6-4bf0-967a-95e7cfcd7daa"><con:settings/><con:config service="Services" resourcePath="/networks/rest/cloud/encryptPassword/{pwd}" methodName="Method 1" xsi:type="con:RestRequestStep" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"><con:restRequest name="Network-encryptPassword" id="fa27bb04-9df7-4e1d-b4a7-668ab7b241a9" mediaType="application/json"><con:settings><con:setting id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers">&lt;xml-fragment/></con:setting></con:settings><con:endpoint>http://${#Project#host}</con:endpoint><con:request/><con:originalUri>http://localhost/ecomp/mso/properties/show</con:originalUri><con:assertion type="Simple Contains" id="0251a62b-70b7-4d59-a41d-b924118ea515" name="Contains Encrypted Password"><con:configuration><token>Encrypted Password = BD658F0271882F8285C0D9EC839C4178</token><ignoreCase>false</ignoreCase><useRegEx>false</useRegEx></con:configuration></con:assertion><con:credentials><con:username>${#Project#user-csi}</con:username><con:password>${#Project#password-csi}</con:password><con:selectedAuthProfile>Basic</con:selectedAuthProfile><con:addedBasicAuthenticationTypes>Basic</con:addedBasicAuthenticationTypes><con:authType>Global HTTP Settings</con:authType></con:credentials><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:parameters><entry key="pwd" value="mso" xmlns="http://eviware.com/soapui/config"/></con:parameters><con:parameterOrder><con:entry>pwd</con:entry></con:parameterOrder></con:restRequest></con:config></con:testStep><con:properties/></con:testCase><con:testCase id="922f33ed-8787-4cdc-9b10-573371760e80" failOnError="true" failTestCaseOnErrors="true" keepSession="false" maxResults="0" name="ASDC testConfig" searchProperties="true"><con:settings/><con:testStep type="restrequest" name="ASDC-MsoPropertiesShow" id="5fa93824-29e8-4af1-a93a-d56002e9c93b"><con:settings/><con:config service="Services" resourcePath="/asdc/properties/show" methodName="Method 1" xsi:type="con:RestRequestStep" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"><con:restRequest name="ASDC-MsoPropertiesShow" id="fa27bb04-9df7-4e1d-b4a7-668ab7b241a9" mediaType="application/json"><con:settings><con:setting id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers">&lt;xml-fragment/></con:setting></con:settings><con:endpoint>http://${#Project#host}</con:endpoint><con:request/><con:originalUri>http://localhost/ecomp/mso/properties/show</con:originalUri><con:assertion type="Simple Contains" id="04575060-e81b-4609-893c-47df2386c9fe" name="Contains ASDC config"><con:configuration><token>Config file </token><ignoreCase>false</ignoreCase><useRegEx>false</useRegEx></con:configuration></con:assertion><con:assertion type="Valid HTTP Status Codes" id="e33b8f20-f0fb-4e9f-bf8c-e1960ee5c3f8" name="Valid HTTP Status Codes"><con:configuration><codes>200</codes></con:configuration></con:assertion><con:credentials><con:username>${#Project#msoclient}</con:username><con:password>${#Project#msoclientpassword}</con:password><con:selectedAuthProfile>Basic</con:selectedAuthProfile><con:addedBasicAuthenticationTypes>Basic</con:addedBasicAuthenticationTypes><con:authType>Global HTTP Settings</con:authType></con:credentials><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:parameters/></con:restRequest></con:config></con:testStep><con:testStep type="restrequest" name="ASDC-MsoPropertiesEncrypt" id="3f8b4c24-0d35-4735-840c-2e1d8194cd8e"><con:settings/><con:config service="Services" resourcePath="/asdc/properties/encrypt/{value}/{cryptkey}" methodName="Method 1" xsi:type="con:RestRequestStep" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"><con:restRequest name="ASDC-MsoPropertiesEncrypt" id="fa27bb04-9df7-4e1d-b4a7-668ab7b241a9" mediaType="application/json"><con:settings><con:setting id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers">&lt;xml-fragment/></con:setting></con:settings><con:endpoint>http://${#Project#host}</con:endpoint><con:request/><con:originalUri>http://localhost/ecomp/mso/properties/show</con:originalUri><con:assertion type="Simple Contains" id="c0e9dbbd-bcd4-423a-89bd-47b749b6efd7" name="Contains Encoded string"><con:configuration><token>32221B0E4D30434BAE82C67492419CF8</token><ignoreCase>false</ignoreCase><useRegEx>false</useRegEx></con:configuration></con:assertion><con:credentials><con:username>${#Project#msoclient}</con:username><con:password>${#Project#msoclientpassword}</con:password><con:selectedAuthProfile>Basic</con:selectedAuthProfile><con:addedBasicAuthenticationTypes>Basic</con:addedBasicAuthenticationTypes><con:authType>Global HTTP Settings</con:authType></con:credentials><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:parameters/><con:parameterOrder><con:entry>value</con:entry><con:entry>cryptkey</con:entry></con:parameterOrder></con:restRequest></con:config></con:testStep><con:properties/></con:testCase><con:properties/></con:testSuite><con:properties><con:property><con:name>host</con:name><con:value>localhost:18080</con:value></con:property><con:property><con:name>user-infraportal</con:name><con:value>InfraPortalClient</con:value></con:property><con:property><con:name>password-infraportal</con:name><con:value>password1$</con:value></con:property><con:property><con:name>msoclient</con:name><con:value>MSOClient</con:value></con:property><con:property><con:name>msoclientpassword</con:name><con:value>password1$</con:value></con:property></con:properties><con:wssContainer/><con:oAuth2ProfileContainer/><con:oAuth1ProfileContainer/><con:sensitiveInformation/></con:soapui-project>
\ No newline at end of file
diff --git a/packages/arquillian-unit-tests/src/test/resources/SoapUI/MSONetworkAdapter-soapui-project.xml b/packages/arquillian-unit-tests/src/test/resources/SoapUI/MSONetworkAdapter-soapui-project.xml
deleted file mode 100644
index 6c75221..0000000
--- a/packages/arquillian-unit-tests/src/test/resources/SoapUI/MSONetworkAdapter-soapui-project.xml
+++ /dev/null
@@ -1,596 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<con:soapui-project id="5ab0314b-3550-4174-a9da-938c45d052ad" activeEnvironment="Default" name="MSONetworkAdapter" resourceRoot="${projectDir}" soapui-version="5.3.0" abortOnError="false" runType="SEQUENTIAL" xmlns:con="http://eviware.com/soapui/config"><con:settings/><con:interface xsi:type="con:WsdlInterface" id="511a8e41-5d4c-4259-9027-0e95942c06fe" wsaVersion="NONE" name="MsoNetworkAdapterImplPortBinding" type="wsdl" bindingName="{http://org.openecomp.mso/network}MsoNetworkAdapterImplPortBinding" soapVersion="1_1" anonymous="optional" definition="../../../../../../adapters/mso-network-adapter/target/generated-sources/wsdl/NetworkAdapter.wsdl" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"><con:settings/><con:definitionCache type="TEXT" rootPart="file:\C:\Dev\Git\mso-unified\adapters\mso-network-adapter\target\generated-sources\wsdl\NetworkAdapter.wsdl"><con:part><con:url>file:\C:\Dev\Git\mso-unified\adapters\mso-network-adapter\target\generated-sources\wsdl\NetworkAdapter.wsdl</con:url><con:content><![CDATA[<!--Generated by JAX-WS RI at http://jax-ws.dev.java.net. RI's version is JAX-WS RI 2.2.7-b01  svn-revision#13316.-->
-<definitions targetNamespace="http://org.openecomp.mso/network" name="NetworkAdapter" xmlns="http://schemas.xmlsoap.org/wsdl/" xmlns:wsp="http://www.w3.org/ns/ws-policy" xmlns:tns="http://org.openecomp.mso/network" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:wsp1_2="http://schemas.xmlsoap.org/ws/2004/09/policy" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:wsam="http://www.w3.org/2007/05/addressing/metadata" xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd">
-  <types>
-    <xs:schema version="1.0" targetNamespace="http://org.openecomp.mso/network" xmlns:xs="http://www.w3.org/2001/XMLSchema">
-      <xs:element name="NetworkAlreadyExists" nillable="true" type="tns:networkExceptionBean"/>
-      <xs:element name="NetworkException" nillable="true" type="tns:networkExceptionBean"/>
-      <xs:element name="createNetwork" type="tns:createNetwork"/>
-      <xs:element name="createNetworkResponse" type="tns:createNetworkResponse"/>
-      <xs:element name="deleteNetwork" type="tns:deleteNetwork"/>
-      <xs:element name="deleteNetworkResponse" type="tns:deleteNetworkResponse"/>
-      <xs:element name="healthCheck" type="tns:healthCheck"/>
-      <xs:element name="healthCheckResponse" type="tns:healthCheckResponse"/>
-      <xs:element name="queryNetwork" type="tns:queryNetwork"/>
-      <xs:element name="queryNetworkResponse" type="tns:queryNetworkResponse"/>
-      <xs:element name="rollbackNetwork" type="tns:rollbackNetwork"/>
-      <xs:element name="rollbackNetworkResponse" type="tns:rollbackNetworkResponse"/>
-      <xs:element name="updateNetwork" type="tns:updateNetwork"/>
-      <xs:element name="updateNetworkResponse" type="tns:updateNetworkResponse"/>
-      <xs:complexType name="createNetwork">
-        <xs:sequence>
-          <xs:element name="cloudSiteId" type="xs:string"/>
-          <xs:element name="tenantId" type="xs:string"/>
-          <xs:element name="networkType" type="xs:string"/>
-          <xs:element name="networkName" type="xs:string"/>
-          <xs:element name="physicalNetworkName" type="xs:string" minOccurs="0"/>
-          <xs:element name="vlans" type="xs:int" minOccurs="0" maxOccurs="unbounded"/>
-          <xs:element name="failIfExists" type="xs:boolean" minOccurs="0"/>
-          <xs:element name="request" type="tns:msoRequest" minOccurs="0"/>
-        </xs:sequence>
-      </xs:complexType>
-      <xs:complexType name="msoRequest">
-        <xs:sequence>
-          <xs:element name="requestId" type="xs:string" minOccurs="0"/>
-          <xs:element name="serviceInstanceId" type="xs:string" minOccurs="0"/>
-        </xs:sequence>
-      </xs:complexType>
-      <xs:complexType name="createNetworkResponse">
-        <xs:sequence>
-          <xs:element name="networkId" type="xs:string" minOccurs="0"/>
-          <xs:element name="neutronNetworkId" type="xs:string" minOccurs="0"/>
-          <xs:element name="rollback" type="tns:networkRollback" minOccurs="0"/>
-        </xs:sequence>
-      </xs:complexType>
-      <xs:complexType name="networkRollback">
-        <xs:sequence>
-          <xs:element name="cloudId" type="xs:string" minOccurs="0"/>
-          <xs:element name="msoRequest" type="tns:msoRequest" minOccurs="0"/>
-          <xs:element name="networkCreated" type="xs:boolean"/>
-          <xs:element name="networkId" type="xs:string" minOccurs="0"/>
-          <xs:element name="networkName" type="xs:string" minOccurs="0"/>
-          <xs:element name="networkType" type="xs:string" minOccurs="0"/>
-          <xs:element name="networkUpdated" type="xs:boolean"/>
-          <xs:element name="neutronNetworkId" type="xs:string" minOccurs="0"/>
-          <xs:element name="physicalNetwork" type="xs:string" minOccurs="0"/>
-          <xs:element name="tenantId" type="xs:string" minOccurs="0"/>
-          <xs:element name="vlans" type="xs:int" nillable="true" minOccurs="0" maxOccurs="unbounded"/>
-        </xs:sequence>
-      </xs:complexType>
-      <xs:complexType name="networkExceptionBean">
-        <xs:sequence>
-          <xs:element name="category" type="tns:msoExceptionCategory" minOccurs="0"/>
-          <xs:element name="message" type="xs:string" minOccurs="0"/>
-          <xs:element name="rolledBack" type="xs:boolean" minOccurs="0"/>
-        </xs:sequence>
-      </xs:complexType>
-      <xs:complexType name="queryNetwork">
-        <xs:sequence>
-          <xs:element name="cloudSiteId" type="xs:string"/>
-          <xs:element name="tenantId" type="xs:string"/>
-          <xs:element name="networkNameOrId" type="xs:string"/>
-          <xs:element name="request" type="tns:msoRequest" minOccurs="0"/>
-        </xs:sequence>
-      </xs:complexType>
-      <xs:complexType name="queryNetworkResponse">
-        <xs:sequence>
-          <xs:element name="networkExists" type="xs:boolean" minOccurs="0"/>
-          <xs:element name="networkId" type="xs:string" minOccurs="0"/>
-          <xs:element name="neutronNetworkId" type="xs:string" minOccurs="0"/>
-          <xs:element name="status" type="tns:networkStatus" minOccurs="0"/>
-          <xs:element name="vlans" type="xs:int" minOccurs="0" maxOccurs="unbounded"/>
-        </xs:sequence>
-      </xs:complexType>
-      <xs:complexType name="updateNetwork">
-        <xs:sequence>
-          <xs:element name="cloudSiteId" type="xs:string"/>
-          <xs:element name="tenantId" type="xs:string"/>
-          <xs:element name="networkType" type="xs:string"/>
-          <xs:element name="networkId" type="xs:string"/>
-          <xs:element name="networkName" type="xs:string"/>
-          <xs:element name="physicalNetworkName" type="xs:string"/>
-          <xs:element name="vlans" type="xs:int" maxOccurs="unbounded"/>
-          <xs:element name="request" type="tns:msoRequest" minOccurs="0"/>
-        </xs:sequence>
-      </xs:complexType>
-      <xs:complexType name="updateNetworkResponse">
-        <xs:sequence>
-          <xs:element name="rollback" type="tns:networkRollback" minOccurs="0"/>
-        </xs:sequence>
-      </xs:complexType>
-      <xs:complexType name="deleteNetwork">
-        <xs:sequence>
-          <xs:element name="cloudSiteId" type="xs:string"/>
-          <xs:element name="tenantId" type="xs:string"/>
-          <xs:element name="networkType" type="xs:string"/>
-          <xs:element name="networkId" type="xs:string"/>
-          <xs:element name="request" type="tns:msoRequest" minOccurs="0"/>
-        </xs:sequence>
-      </xs:complexType>
-      <xs:complexType name="deleteNetworkResponse">
-        <xs:sequence>
-          <xs:element name="networkDeleted" type="xs:boolean" minOccurs="0"/>
-        </xs:sequence>
-      </xs:complexType>
-      <xs:complexType name="healthCheck">
-        <xs:sequence/>
-      </xs:complexType>
-      <xs:complexType name="healthCheckResponse">
-        <xs:sequence/>
-      </xs:complexType>
-      <xs:complexType name="rollbackNetwork">
-        <xs:sequence>
-          <xs:element name="rollback" type="tns:networkRollback"/>
-        </xs:sequence>
-      </xs:complexType>
-      <xs:complexType name="rollbackNetworkResponse">
-        <xs:sequence/>
-      </xs:complexType>
-      <xs:simpleType name="msoExceptionCategory">
-        <xs:restriction base="xs:string">
-          <xs:enumeration value="OPENSTACK"/>
-          <xs:enumeration value="IO"/>
-          <xs:enumeration value="INTERNAL"/>
-          <xs:enumeration value="USERDATA"/>
-        </xs:restriction>
-      </xs:simpleType>
-      <xs:simpleType name="networkStatus">
-        <xs:restriction base="xs:string">
-          <xs:enumeration value="NOTFOUND"/>
-          <xs:enumeration value="ACTIVE"/>
-          <xs:enumeration value="DOWN"/>
-          <xs:enumeration value="BUILD"/>
-          <xs:enumeration value="ERROR"/>
-          <xs:enumeration value="UNKNOWN"/>
-        </xs:restriction>
-      </xs:simpleType>
-    </xs:schema>
-  </types>
-  <message name="healthCheck">
-    <part name="parameters" element="tns:healthCheck"/>
-  </message>
-  <message name="healthCheckResponse">
-    <part name="parameters" element="tns:healthCheckResponse"/>
-  </message>
-  <message name="createNetwork">
-    <part name="parameters" element="tns:createNetwork"/>
-  </message>
-  <message name="createNetworkResponse">
-    <part name="parameters" element="tns:createNetworkResponse"/>
-  </message>
-  <message name="NetworkException">
-    <part name="fault" element="tns:NetworkException"/>
-  </message>
-  <message name="NetworkAlreadyExists">
-    <part name="fault" element="tns:NetworkAlreadyExists"/>
-  </message>
-  <message name="updateNetwork">
-    <part name="parameters" element="tns:updateNetwork"/>
-  </message>
-  <message name="updateNetworkResponse">
-    <part name="parameters" element="tns:updateNetworkResponse"/>
-  </message>
-  <message name="queryNetwork">
-    <part name="parameters" element="tns:queryNetwork"/>
-  </message>
-  <message name="queryNetworkResponse">
-    <part name="parameters" element="tns:queryNetworkResponse"/>
-  </message>
-  <message name="deleteNetwork">
-    <part name="parameters" element="tns:deleteNetwork"/>
-  </message>
-  <message name="deleteNetworkResponse">
-    <part name="parameters" element="tns:deleteNetworkResponse"/>
-  </message>
-  <message name="rollbackNetwork">
-    <part name="parameters" element="tns:rollbackNetwork"/>
-  </message>
-  <message name="rollbackNetworkResponse">
-    <part name="parameters" element="tns:rollbackNetworkResponse"/>
-  </message>
-  <portType name="NetworkAdapter">
-    <operation name="healthCheck">
-      <input wsam:Action="http://org.openecomp.mso/network/NetworkAdapter/healthCheckRequest" message="tns:healthCheck"/>
-      <output wsam:Action="http://org.openecomp.mso/network/NetworkAdapter/healthCheckResponse" message="tns:healthCheckResponse"/>
-    </operation>
-    <operation name="createNetwork">
-      <input wsam:Action="http://org.openecomp.mso/network/NetworkAdapter/createNetworkRequest" message="tns:createNetwork"/>
-      <output wsam:Action="http://org.openecomp.mso/network/NetworkAdapter/createNetworkResponse" message="tns:createNetworkResponse"/>
-      <fault message="tns:NetworkException" name="NetworkException" wsam:Action="http://org.openecomp.mso/network/NetworkAdapter/createNetwork/Fault/NetworkException"/>
-      <fault message="tns:NetworkAlreadyExists" name="NetworkAlreadyExists" wsam:Action="http://org.openecomp.mso/network/NetworkAdapter/createNetwork/Fault/NetworkAlreadyExists"/>
-    </operation>
-    <operation name="updateNetwork">
-      <input wsam:Action="http://org.openecomp.mso/network/NetworkAdapter/updateNetworkRequest" message="tns:updateNetwork"/>
-      <output wsam:Action="http://org.openecomp.mso/network/NetworkAdapter/updateNetworkResponse" message="tns:updateNetworkResponse"/>
-      <fault message="tns:NetworkException" name="NetworkException" wsam:Action="http://org.openecomp.mso/network/NetworkAdapter/updateNetwork/Fault/NetworkException"/>
-    </operation>
-    <operation name="queryNetwork">
-      <input wsam:Action="http://org.openecomp.mso/network/NetworkAdapter/queryNetworkRequest" message="tns:queryNetwork"/>
-      <output wsam:Action="http://org.openecomp.mso/network/NetworkAdapter/queryNetworkResponse" message="tns:queryNetworkResponse"/>
-      <fault message="tns:NetworkException" name="NetworkException" wsam:Action="http://org.openecomp.mso/network/NetworkAdapter/queryNetwork/Fault/NetworkException"/>
-    </operation>
-    <operation name="deleteNetwork">
-      <input wsam:Action="http://org.openecomp.mso/network/NetworkAdapter/deleteNetworkRequest" message="tns:deleteNetwork"/>
-      <output wsam:Action="http://org.openecomp.mso/network/NetworkAdapter/deleteNetworkResponse" message="tns:deleteNetworkResponse"/>
-      <fault message="tns:NetworkException" name="NetworkException" wsam:Action="http://org.openecomp.mso/network/NetworkAdapter/deleteNetwork/Fault/NetworkException"/>
-    </operation>
-    <operation name="rollbackNetwork">
-      <input wsam:Action="http://org.openecomp.mso/network/NetworkAdapter/rollbackNetworkRequest" message="tns:rollbackNetwork"/>
-      <output wsam:Action="http://org.openecomp.mso/network/NetworkAdapter/rollbackNetworkResponse" message="tns:rollbackNetworkResponse"/>
-      <fault message="tns:NetworkException" name="NetworkException" wsam:Action="http://org.openecomp.mso/network/NetworkAdapter/rollbackNetwork/Fault/NetworkException"/>
-    </operation>
-  </portType>
-  <binding name="MsoNetworkAdapterImplPortBinding" type="tns:NetworkAdapter">
-    <soap:binding transport="http://schemas.xmlsoap.org/soap/http" style="document"/>
-    <operation name="healthCheck">
-      <soap:operation soapAction=""/>
-      <input>
-        <soap:body use="literal"/>
-      </input>
-      <output>
-        <soap:body use="literal"/>
-      </output>
-    </operation>
-    <operation name="createNetwork">
-      <soap:operation soapAction=""/>
-      <input>
-        <soap:body use="literal"/>
-      </input>
-      <output>
-        <soap:body use="literal"/>
-      </output>
-      <fault name="NetworkException">
-        <soap:fault name="NetworkException" use="literal"/>
-      </fault>
-      <fault name="NetworkAlreadyExists">
-        <soap:fault name="NetworkAlreadyExists" use="literal"/>
-      </fault>
-    </operation>
-    <operation name="updateNetwork">
-      <soap:operation soapAction=""/>
-      <input>
-        <soap:body use="literal"/>
-      </input>
-      <output>
-        <soap:body use="literal"/>
-      </output>
-      <fault name="NetworkException">
-        <soap:fault name="NetworkException" use="literal"/>
-      </fault>
-    </operation>
-    <operation name="queryNetwork">
-      <soap:operation soapAction=""/>
-      <input>
-        <soap:body use="literal"/>
-      </input>
-      <output>
-        <soap:body use="literal"/>
-      </output>
-      <fault name="NetworkException">
-        <soap:fault name="NetworkException" use="literal"/>
-      </fault>
-    </operation>
-    <operation name="deleteNetwork">
-      <soap:operation soapAction=""/>
-      <input>
-        <soap:body use="literal"/>
-      </input>
-      <output>
-        <soap:body use="literal"/>
-      </output>
-      <fault name="NetworkException">
-        <soap:fault name="NetworkException" use="literal"/>
-      </fault>
-    </operation>
-    <operation name="rollbackNetwork">
-      <soap:operation soapAction=""/>
-      <input>
-        <soap:body use="literal"/>
-      </input>
-      <output>
-        <soap:body use="literal"/>
-      </output>
-      <fault name="NetworkException">
-        <soap:fault name="NetworkException" use="literal"/>
-      </fault>
-    </operation>
-  </binding>
-  <service name="NetworkAdapter">
-    <port name="MsoNetworkAdapterImplPort" binding="tns:MsoNetworkAdapterImplPortBinding">
-      <soap:address location="REPLACE_WITH_ACTUAL_URL"/>
-    </port>
-  </service>
-</definitions>]]></con:content><con:type>http://schemas.xmlsoap.org/wsdl/</con:type></con:part></con:definitionCache><con:endpoints><con:endpoint>REPLACE_WITH_ACTUAL_URL</con:endpoint></con:endpoints><con:operation id="b58b639c-8fa1-4bbd-bb60-1797f1d7b30b" isOneWay="false" action="" name="createNetwork" bindingOperationName="createNetwork" type="Request-Response" inputName="" receivesAttachments="false" sendsAttachments="false" anonymous="optional"><con:settings/><con:call id="c21bb880-9199-428c-8369-eb830b7ae1a5" name="Request 1"><con:settings><con:setting id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers">&lt;xml-fragment/></con:setting></con:settings><con:encoding>UTF-8</con:encoding><con:endpoint>http://${#Project#host}/dbadapters/RequestsDbAdapter</con:endpoint><con:request><![CDATA[<soapenv:Envelope xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/" xmlns:net="http://org.openecomp.mso/network">\r
-   <soapenv:Header/>\r
-   <soapenv:Body>\r
-      <net:createNetwork>\r
-         <cloudSiteId>cloud</cloudSiteId>\r
-         <tenantId>tenant</tenantId>\r
-         <networkType>networkType</networkType>\r
-         <networkName>networkName</networkName>\r
-         <!--Optional:-->\r
-         <physicalNetworkName>physicalNetworkName</physicalNetworkName>\r
-         <!--Zero or more repetitions:-->\r
-         <vlans>lan1</vlans>\r
-         <!--Optional:-->\r
-         <failIfExists>false</failIfExists>\r
-         <!--Optional:-->\r
-         <request>\r
-            <!--Optional:-->\r
-            <requestId>IntegTests</requestId>\r
-            <!--Optional:-->\r
-            <serviceInstanceId>toto</serviceInstanceId>\r
-         </request>\r
-      </net:createNetwork>\r
-   </soapenv:Body>\r
-</soapenv:Envelope>]]></con:request><con:credentials><con:authType>No Authorization</con:authType></con:credentials><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:wsaConfig mustUnderstand="NONE" version="200508" action="http://org.openecomp.mso/network/NetworkAdapter/createNetworkRequest"/><con:wsrmConfig version="1.2"/></con:call></con:operation><con:operation id="a2fdaa98-ace3-450a-8e9d-43e890a8e8eb" isOneWay="false" action="" name="deleteNetwork" bindingOperationName="deleteNetwork" type="Request-Response" inputName="" receivesAttachments="false" sendsAttachments="false" anonymous="optional"><con:settings/><con:call id="b6d03c13-b6d4-4eb1-a291-19c0fe6adac3" name="Request 1"><con:settings/><con:encoding>UTF-8</con:encoding><con:endpoint>REPLACE_WITH_ACTUAL_URL</con:endpoint><con:request><![CDATA[<soapenv:Envelope xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/" xmlns:net="http://org.openecomp.mso/network">\r
-   <soapenv:Header/>\r
-   <soapenv:Body>\r
-      <net:deleteNetwork>\r
-         <cloudSiteId>?</cloudSiteId>\r
-         <tenantId>?</tenantId>\r
-         <networkType>?</networkType>\r
-         <networkId>?</networkId>\r
-         <!--Optional:-->\r
-         <request>\r
-            <!--Optional:-->\r
-            <requestId>?</requestId>\r
-            <!--Optional:-->\r
-            <serviceInstanceId>?</serviceInstanceId>\r
-         </request>\r
-      </net:deleteNetwork>\r
-   </soapenv:Body>\r
-</soapenv:Envelope>]]></con:request><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:wsaConfig mustUnderstand="NONE" version="200508" action="http://org.openecomp.mso/network/NetworkAdapter/deleteNetworkRequest"/></con:call></con:operation><con:operation id="116baa59-652c-4fa8-9b83-ed47b649a7e0" isOneWay="false" action="" name="healthCheck" bindingOperationName="healthCheck" type="Request-Response" inputName="" receivesAttachments="false" sendsAttachments="false" anonymous="optional"><con:settings/><con:call id="074e4beb-337a-4cce-9d82-8766b2ee05a1" name="Request 1"><con:settings/><con:encoding>UTF-8</con:encoding><con:endpoint>REPLACE_WITH_ACTUAL_URL</con:endpoint><con:request><![CDATA[<soapenv:Envelope xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/" xmlns:net="http://org.openecomp.mso/network">\r
-   <soapenv:Header/>\r
-   <soapenv:Body>\r
-      <net:healthCheck/>\r
-   </soapenv:Body>\r
-</soapenv:Envelope>]]></con:request><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:wsaConfig mustUnderstand="NONE" version="200508" action="http://org.openecomp.mso/network/NetworkAdapter/healthCheckRequest"/></con:call></con:operation><con:operation id="df8ee9ae-86f1-4453-b7c2-c158fbe9feb2" isOneWay="false" action="" name="queryNetwork" bindingOperationName="queryNetwork" type="Request-Response" inputName="" receivesAttachments="false" sendsAttachments="false" anonymous="optional"><con:settings/><con:call id="ce7f34ca-2952-4198-b7f4-6ea6d800d3d8" name="Request 1"><con:settings/><con:encoding>UTF-8</con:encoding><con:endpoint>REPLACE_WITH_ACTUAL_URL</con:endpoint><con:request><![CDATA[<soapenv:Envelope xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/" xmlns:net="http://org.openecomp.mso/network">\r
-   <soapenv:Header/>\r
-   <soapenv:Body>\r
-      <net:queryNetwork>\r
-         <cloudSiteId>?</cloudSiteId>\r
-         <tenantId>?</tenantId>\r
-         <networkNameOrId>?</networkNameOrId>\r
-         <!--Optional:-->\r
-         <request>\r
-            <!--Optional:-->\r
-            <requestId>?</requestId>\r
-            <!--Optional:-->\r
-            <serviceInstanceId>?</serviceInstanceId>\r
-         </request>\r
-      </net:queryNetwork>\r
-   </soapenv:Body>\r
-</soapenv:Envelope>]]></con:request><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:wsaConfig mustUnderstand="NONE" version="200508" action="http://org.openecomp.mso/network/NetworkAdapter/queryNetworkRequest"/></con:call></con:operation><con:operation id="e5404399-615d-4cd7-9f67-ead64cf968f9" isOneWay="false" action="" name="rollbackNetwork" bindingOperationName="rollbackNetwork" type="Request-Response" inputName="" receivesAttachments="false" sendsAttachments="false" anonymous="optional"><con:settings/><con:call id="20936161-aa4c-4014-8eda-ac8996a49723" name="Request 1"><con:settings/><con:encoding>UTF-8</con:encoding><con:endpoint>REPLACE_WITH_ACTUAL_URL</con:endpoint><con:request><![CDATA[<soapenv:Envelope xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/" xmlns:net="http://org.openecomp.mso/network">\r
-   <soapenv:Header/>\r
-   <soapenv:Body>\r
-      <net:rollbackNetwork>\r
-         <rollback>\r
-            <!--Optional:-->\r
-            <cloudId>?</cloudId>\r
-            <!--Optional:-->\r
-            <msoRequest>\r
-               <!--Optional:-->\r
-               <requestId>?</requestId>\r
-               <!--Optional:-->\r
-               <serviceInstanceId>?</serviceInstanceId>\r
-            </msoRequest>\r
-            <networkCreated>?</networkCreated>\r
-            <!--Optional:-->\r
-            <networkId>?</networkId>\r
-            <!--Optional:-->\r
-            <networkName>?</networkName>\r
-            <!--Optional:-->\r
-            <networkType>?</networkType>\r
-            <networkUpdated>?</networkUpdated>\r
-            <!--Optional:-->\r
-            <neutronNetworkId>?</neutronNetworkId>\r
-            <!--Optional:-->\r
-            <physicalNetwork>?</physicalNetwork>\r
-            <!--Optional:-->\r
-            <tenantId>?</tenantId>\r
-            <!--Zero or more repetitions:-->\r
-            <vlans>?</vlans>\r
-         </rollback>\r
-      </net:rollbackNetwork>\r
-   </soapenv:Body>\r
-</soapenv:Envelope>]]></con:request><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:wsaConfig mustUnderstand="NONE" version="200508" action="http://org.openecomp.mso/network/NetworkAdapter/rollbackNetworkRequest"/></con:call></con:operation><con:operation id="fd83c3ba-bf0e-45f3-8ea6-bdfb976d26b7" isOneWay="false" action="" name="updateNetwork" bindingOperationName="updateNetwork" type="Request-Response" inputName="" receivesAttachments="false" sendsAttachments="false" anonymous="optional"><con:settings/><con:call id="8720ff50-26ab-4ba8-b1f4-b60520a061e3" name="Request 1"><con:settings/><con:encoding>UTF-8</con:encoding><con:endpoint>REPLACE_WITH_ACTUAL_URL</con:endpoint><con:request><![CDATA[<soapenv:Envelope xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/" xmlns:net="http://org.openecomp.mso/network">\r
-   <soapenv:Header/>\r
-   <soapenv:Body>\r
-      <net:updateNetwork>\r
-         <cloudSiteId>?</cloudSiteId>\r
-         <tenantId>?</tenantId>\r
-         <networkType>?</networkType>\r
-         <networkId>?</networkId>\r
-         <networkName>?</networkName>\r
-         <physicalNetworkName>?</physicalNetworkName>\r
-         <!--1 or more repetitions:-->\r
-         <vlans>?</vlans>\r
-         <!--Optional:-->\r
-         <request>\r
-            <!--Optional:-->\r
-            <requestId>?</requestId>\r
-            <!--Optional:-->\r
-            <serviceInstanceId>?</serviceInstanceId>\r
-         </request>\r
-      </net:updateNetwork>\r
-   </soapenv:Body>\r
-</soapenv:Envelope>]]></con:request><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:wsaConfig mustUnderstand="NONE" version="200508" action="http://org.openecomp.mso/network/NetworkAdapter/updateNetworkRequest"/></con:call></con:operation></con:interface><con:testSuite id="38ade4ab-683c-4476-a708-c8fc3d0c229e" name="MsoNetworkAdapter TestSuite"><con:settings/><con:runType>SEQUENTIAL</con:runType><con:testCase id="e672bfa9-0de6-431f-86b2-ef3b8e591d68" failOnError="true" failTestCaseOnErrors="true" keepSession="false" maxResults="0" name="createNetwork TestCase" searchProperties="true"><con:settings/><con:testStep type="request" id="6589e594-92e4-48b4-9fb7-6af6d3c9c6ab" name="createNetwork"><con:settings/><con:config xsi:type="con:RequestStep" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"><con:interface>MsoNetworkAdapterImplPortBinding</con:interface><con:operation>createNetwork</con:operation><con:request name="createNetwork" id="0ba35f43-89b5-45d6-8d2d-8664105aee9e"><con:settings><con:setting id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers">&lt;xml-fragment/></con:setting></con:settings><con:encoding>UTF-8</con:encoding><con:endpoint>http://${#Project#host}/networks/NetworkAdapter</con:endpoint><con:request><![CDATA[<soapenv:Envelope xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/" xmlns:net="http://org.openecomp.mso/network">
-   <soapenv:Header/>
-   <soapenv:Body>
-      <net:createNetwork>
-         <cloudSiteId>toto</cloudSiteId>
-         <tenantId>b0784c65ad104c9ab2df27c1b2e04bd0</tenantId>
-         <networkType>vlan</networkType>
-         <networkName>tete</networkName>
-         <!--Optional:-->
-
-         <!--Zero or more repetitions:-->
-         <physicalNetworkName>titi</physicalNetworkName><vlans>10</vlans>
-         <!--Optional:-->
-         <failIfExists>true</failIfExists>
-         <!--Optional:-->
-         <request>
-            <!--Optional:-->
-
-            <!--Optional:-->
-            <requestId>requestId</requestId><serviceInstanceId>serviceInstanceId</serviceInstanceId>
-         </request>
-      </net:createNetwork>
-   </soapenv:Body>
-</soapenv:Envelope>]]></con:request><con:assertion type="Valid HTTP Status Codes" name="Valid HTTP Status Codes" id="f0e9b782-d1d7-46aa-aff0-5da428d76531"><con:configuration><codes>500</codes></con:configuration></con:assertion><con:assertion type="Simple Contains" name="Contains" id="a1891fc0-4e82-4ae5-a4b7-5afbe7a461b0"><con:configuration><token>CloudSite does not exist in MSO Configuration</token><ignoreCase>false</ignoreCase><useRegEx>false</useRegEx></con:configuration></con:assertion><con:credentials><con:username>BPELClient</con:username><con:password>password1$</con:password><con:selectedAuthProfile>Basic</con:selectedAuthProfile><con:addedBasicAuthenticationTypes>Basic</con:addedBasicAuthenticationTypes><con:authType>Global HTTP Settings</con:authType></con:credentials><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:wsaConfig action="http://org.openecomp.mso/network/NetworkAdapter/createNetworkRequest" mustUnderstand="NONE" version="200508"/><con:wsrmConfig version="1.2"/></con:request></con:config></con:testStep><con:testStep type="request" name="createNetwork no name" id="fea3a6c5-b5a4-4db8-abe5-42bb7dc84718"><con:settings/><con:config xsi:type="con:RequestStep" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"><con:interface>MsoNetworkAdapterImplPortBinding</con:interface><con:operation>createNetwork</con:operation><con:request name="createNetwork no name" id="0ba35f43-89b5-45d6-8d2d-8664105aee9e"><con:settings><con:setting id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers">&lt;xml-fragment/></con:setting></con:settings><con:encoding>UTF-8</con:encoding><con:endpoint>http://${#Project#host}/networks/NetworkAdapter</con:endpoint><con:request><![CDATA[<soapenv:Envelope xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/" xmlns:net="http://org.openecomp.mso/network">
-   <soapenv:Header/>
-   <soapenv:Body>
-      <net:createNetwork>
-         <cloudSiteId>MT</cloudSiteId>
-         <tenantId>b0784c65ad104c9ab2df27c1b2e04bd0</tenantId>
-         <networkType>vlan</networkType>
-         <!--Optional:-->
-
-         <!--Zero or more repetitions:-->
-         <physicalNetworkName>titi</physicalNetworkName><vlans>10</vlans>
-         <!--Optional:-->
-         <failIfExists>true</failIfExists>
-         <!--Optional:-->
-         <request>
-            <!--Optional:-->
-
-            <!--Optional:-->
-            <requestId>requestId</requestId><serviceInstanceId>serviceInstanceId</serviceInstanceId>
-         </request>
-      </net:createNetwork>
-   </soapenv:Body>
-</soapenv:Envelope>]]></con:request><con:assertion type="Valid HTTP Status Codes" name="Valid HTTP Status Codes" id="4745dcba-91b9-4ac0-a727-7e2941f59f33"><con:configuration><codes>500</codes></con:configuration></con:assertion><con:assertion type="Simple Contains" name="Contains" id="d917281a-0a2b-468c-acff-e5473170c8a8"><con:configuration><token>Create Network: Missing parameters: networkName</token><ignoreCase>false</ignoreCase><useRegEx>false</useRegEx></con:configuration></con:assertion><con:credentials><con:username>BPELClient</con:username><con:password>password1$</con:password><con:selectedAuthProfile>Basic</con:selectedAuthProfile><con:addedBasicAuthenticationTypes>Basic</con:addedBasicAuthenticationTypes><con:authType>Global HTTP Settings</con:authType></con:credentials><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:wsaConfig action="http://org.openecomp.mso/network/NetworkAdapter/createNetworkRequest" mustUnderstand="NONE" version="200508"/><con:wsrmConfig version="1.2"/></con:request></con:config></con:testStep><con:testStep type="request" name="createNetwork bad type" id="cd8760de-00e0-4828-996e-f73c24951dbc"><con:settings/><con:config xsi:type="con:RequestStep" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"><con:interface>MsoNetworkAdapterImplPortBinding</con:interface><con:operation>createNetwork</con:operation><con:request name="createNetwork bad type" id="0ba35f43-89b5-45d6-8d2d-8664105aee9e"><con:settings><con:setting id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers">&lt;xml-fragment/></con:setting></con:settings><con:encoding>UTF-8</con:encoding><con:endpoint>http://${#Project#host}/networks/NetworkAdapter</con:endpoint><con:request><![CDATA[<soapenv:Envelope xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/" xmlns:net="http://org.openecomp.mso/network">
-   <soapenv:Header/>
-   <soapenv:Body>
-      <net:createNetwork>
-         <cloudSiteId>MT</cloudSiteId>
-         <tenantId>b0784c65ad104c9ab2df27c1b2e04bd0</tenantId>
-         <networkType>tata</networkType>
-         <!--Optional:-->
-
-         <!--Zero or more repetitions:-->
-         <physicalNetworkName>titi</physicalNetworkName><vlans>10</vlans>
-         <!--Optional:-->
-         <failIfExists>true</failIfExists>
-         <!--Optional:-->
-         <request>
-            <!--Optional:-->
-
-            <!--Optional:-->
-            <requestId>requestId</requestId><serviceInstanceId>serviceInstanceId</serviceInstanceId>
-         </request>
-      </net:createNetwork>
-   </soapenv:Body>
-</soapenv:Envelope>]]></con:request><con:assertion type="Valid HTTP Status Codes" name="Valid HTTP Status Codes" id="0e27fb95-ecdd-4994-ae47-bf7bfebec8b3"><con:configuration><codes>500</codes></con:configuration></con:assertion><con:assertion type="Simple Contains" name="Contains" id="336f121d-b4e5-48b6-a5f6-91ea18aeaeb9"><con:configuration><token>&lt;faultstring>Create/UpdateNetwork: Unable to get network resource with NetworkType:tata or ModelCustomizationUUID:null</token><ignoreCase>false</ignoreCase><useRegEx>false</useRegEx></con:configuration></con:assertion><con:credentials><con:username>BPELClient</con:username><con:password>password1$</con:password><con:selectedAuthProfile>Basic</con:selectedAuthProfile><con:addedBasicAuthenticationTypes>Basic</con:addedBasicAuthenticationTypes><con:authType>Global HTTP Settings</con:authType></con:credentials><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:wsaConfig action="http://org.openecomp.mso/network/NetworkAdapter/createNetworkRequest" mustUnderstand="NONE" version="200508"/><con:wsrmConfig version="1.2"/></con:request></con:config></con:testStep><con:properties/><con:reportParameters/></con:testCase><con:testCase id="bfed2f45-9ec1-479a-9fc2-79981c1614c9" failOnError="true" failTestCaseOnErrors="true" keepSession="false" maxResults="0" name="deleteNetwork TestCase" searchProperties="true"><con:settings/><con:testStep type="request" id="4d121d19-08b6-4547-ba56-3be575651c77" name="deleteNetwork"><con:settings/><con:config xsi:type="con:RequestStep" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"><con:interface>MsoNetworkAdapterImplPortBinding</con:interface><con:operation>deleteNetwork</con:operation><con:request name="deleteNetwork" id="a5958801-a7b7-429a-9c8a-fcf7d22e4fee"><con:settings><con:setting id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers">&lt;xml-fragment/></con:setting></con:settings><con:encoding>UTF-8</con:encoding><con:endpoint>http://${#Project#host}/networks/NetworkAdapter</con:endpoint><con:request><![CDATA[<soapenv:Envelope xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/" xmlns:net="http://org.openecomp.mso/network">\r
-   <soapenv:Header/>
-   <soapenv:Body>
-      <net:deleteNetwork>
-         <cloudSiteId>?</cloudSiteId>
-         <tenantId>?</tenantId>
-         <networkType>?</networkType>
-         <networkId>?</networkId>
-         <!--Optional:-->
-         <request>
-            <!--Optional:-->
-            <requestId>?</requestId>
-            <!--Optional:-->
-            <serviceInstanceId>?</serviceInstanceId>
-         </request>
-      </net:deleteNetwork>
-   </soapenv:Body>
-</soapenv:Envelope>]]></con:request><con:assertion type="Valid HTTP Status Codes" name="Valid HTTP Status Codes" id="ae765673-245e-42b3-85a1-d61a902855f9"><con:configuration><codes>500
-</codes></con:configuration></con:assertion><con:assertion type="Simple Contains" name="Contains" id="89e60334-b667-4845-b806-e1568bb21364"><con:configuration><token>[DeleteNetwork] Cloud Site [?] not found</token><ignoreCase>false</ignoreCase><useRegEx>false</useRegEx></con:configuration></con:assertion><con:credentials><con:username>BPELClient</con:username><con:password>password1$</con:password><con:selectedAuthProfile>Basic</con:selectedAuthProfile><con:addedBasicAuthenticationTypes>Basic</con:addedBasicAuthenticationTypes><con:authType>Global HTTP Settings</con:authType></con:credentials><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:wsaConfig action="http://org.openecomp.mso/network/NetworkAdapter/deleteNetworkRequest" mustUnderstand="NONE" version="200508"/><con:wsrmConfig version="1.2"/></con:request></con:config></con:testStep><con:testStep type="request" name="deleteNetwork no id" id="0342b44b-f463-4ca4-a381-ec8e159614af"><con:settings/><con:config xsi:type="con:RequestStep" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"><con:interface>MsoNetworkAdapterImplPortBinding</con:interface><con:operation>deleteNetwork</con:operation><con:request name="deleteNetwork no id" id="a5958801-a7b7-429a-9c8a-fcf7d22e4fee"><con:settings><con:setting id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers">&lt;xml-fragment/></con:setting></con:settings><con:encoding>UTF-8</con:encoding><con:endpoint>http://${#Project#host}/networks/NetworkAdapter</con:endpoint><con:request><![CDATA[<soapenv:Envelope xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/" xmlns:net="http://org.openecomp.mso/network">\r
-   <soapenv:Header/>
-   <soapenv:Body>
-      <net:deleteNetwork>
-         <cloudSiteId>Jenkins_TEST_Cloud</cloudSiteId>
-         <tenantId>toto</tenantId>
-         <networkType>vlan</networkType>
-         <!--Optional:-->
-         <request>
-            <!--Optional:-->
-            <requestId>?</requestId>
-            <!--Optional:-->
-            <serviceInstanceId>?</serviceInstanceId>
-         </request>
-      </net:deleteNetwork>
-   </soapenv:Body>
-</soapenv:Envelope>]]></con:request><con:assertion type="Valid HTTP Status Codes" name="Valid HTTP Status Codes" id="87ce9425-4cca-404d-bb04-626920fc11d4"><con:configuration><codes>500
-</codes></con:configuration></con:assertion><con:assertion type="Simple Contains" name="Contains" id="0e2f8fb4-e940-4fc6-9617-7b74aeedb54f"><con:configuration><token>&lt;faultstring>Missing mandatory parameter cloudSiteId, tenantId or networkId&lt;/faultstring></token><ignoreCase>false</ignoreCase><useRegEx>false</useRegEx></con:configuration></con:assertion><con:credentials><con:username>BPELClient</con:username><con:password>password1$</con:password><con:selectedAuthProfile>Basic</con:selectedAuthProfile><con:addedBasicAuthenticationTypes>Basic</con:addedBasicAuthenticationTypes><con:authType>Global HTTP Settings</con:authType></con:credentials><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:wsaConfig action="http://org.openecomp.mso/network/NetworkAdapter/deleteNetworkRequest" mustUnderstand="NONE" version="200508"/><con:wsrmConfig version="1.2"/></con:request></con:config></con:testStep><con:properties/><con:reportParameters/></con:testCase><con:testCase id="bc5b5187-a3ee-4993-8fc5-dc0ed125ede7" failOnError="true" failTestCaseOnErrors="true" keepSession="false" maxResults="0" name="healthCheck TestCase" searchProperties="true"><con:settings/><con:testStep type="request" id="0604c296-d3ed-4e96-9ae1-e662b3d99917" name="healthCheck"><con:settings/><con:config xsi:type="con:RequestStep" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"><con:interface>MsoNetworkAdapterImplPortBinding</con:interface><con:operation>healthCheck</con:operation><con:request name="healthCheck" id="b9b9cfa9-ecbb-4543-a718-d6cc7c65cd01"><con:settings><con:setting id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers">&lt;xml-fragment/></con:setting></con:settings><con:encoding>UTF-8</con:encoding><con:endpoint>http://${#Project#host}/networks/NetworkAdapter</con:endpoint><con:request><![CDATA[<soapenv:Envelope xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/" xmlns:net="http://org.openecomp.mso/network">\r
-   <soapenv:Header/>\r
-   <soapenv:Body>\r
-      <net:healthCheck/>\r
-   </soapenv:Body>\r
-</soapenv:Envelope>]]></con:request><con:assertion type="Valid HTTP Status Codes" name="Valid HTTP Status Codes" id="3fa5cfc0-f69f-4c3b-a7ca-1f85ecfe90d9"><con:configuration><codes>200</codes></con:configuration></con:assertion><con:credentials><con:username>BPELClient</con:username><con:password>password1$</con:password><con:selectedAuthProfile>Basic</con:selectedAuthProfile><con:addedBasicAuthenticationTypes>Basic</con:addedBasicAuthenticationTypes><con:authType>Global HTTP Settings</con:authType></con:credentials><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:wsaConfig action="http://org.openecomp.mso/network/NetworkAdapter/healthCheckRequest" mustUnderstand="NONE" version="200508"/><con:wsrmConfig version="1.2"/></con:request></con:config></con:testStep><con:properties/><con:reportParameters/></con:testCase><con:testCase id="56154ce5-1ee3-4b26-b6c9-8075ac1a8684" failOnError="true" failTestCaseOnErrors="true" keepSession="false" maxResults="0" name="queryNetwork TestCase" searchProperties="true"><con:settings/><con:testStep type="request" id="3b0bc90a-e7a4-467e-a543-95f14d83b6b9" name="queryNetwork"><con:settings/><con:config xsi:type="con:RequestStep" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"><con:interface>MsoNetworkAdapterImplPortBinding</con:interface><con:operation>queryNetwork</con:operation><con:request name="queryNetwork" id="f8b0fd29-58ee-4e7c-baca-9796c28be780"><con:settings><con:setting id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers">&lt;xml-fragment/></con:setting></con:settings><con:encoding>UTF-8</con:encoding><con:endpoint>http://${#Project#host}/networks/NetworkAdapter</con:endpoint><con:request><![CDATA[<soapenv:Envelope xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/" xmlns:net="http://org.openecomp.mso/network">\r
-   <soapenv:Header/>\r
-   <soapenv:Body>\r
-      <net:queryNetwork>\r
-         <cloudSiteId>?</cloudSiteId>\r
-         <tenantId>?</tenantId>\r
-         <networkNameOrId>?</networkNameOrId>\r
-         <!--Optional:-->\r
-         <request>\r
-            <!--Optional:-->\r
-            <requestId>?</requestId>\r
-            <!--Optional:-->\r
-            <serviceInstanceId>?</serviceInstanceId>\r
-         </request>\r
-      </net:queryNetwork>\r
-   </soapenv:Body>\r
-</soapenv:Envelope>]]></con:request><con:assertion type="Valid HTTP Status Codes" name="Valid HTTP Status Codes" id="158ee6df-e631-4161-9a59-77f3d609d3e6"><con:configuration><codes>500</codes></con:configuration></con:assertion><con:assertion type="Simple Contains" name="Contains" id="7608b5b8-0947-4b96-b5b5-fee47298fedc"><con:configuration><token>CloudSite does not exist in MSO Configuration</token><ignoreCase>false</ignoreCase><useRegEx>false</useRegEx></con:configuration></con:assertion><con:credentials><con:username>BPELClient</con:username><con:password>password1$</con:password><con:selectedAuthProfile>Basic</con:selectedAuthProfile><con:addedBasicAuthenticationTypes>Basic</con:addedBasicAuthenticationTypes><con:authType>Global HTTP Settings</con:authType></con:credentials><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:wsaConfig action="http://org.openecomp.mso/network/NetworkAdapter/queryNetworkRequest" mustUnderstand="NONE" version="200508"/><con:wsrmConfig version="1.2"/></con:request></con:config></con:testStep><con:properties/><con:reportParameters/></con:testCase><con:testCase id="e7522966-5712-4e76-9434-be104c77c449" failOnError="true" failTestCaseOnErrors="true" keepSession="false" maxResults="0" name="rollbackNetwork TestCase" searchProperties="true" disabled="true"><con:settings/><con:testStep type="request" id="eb6f002a-e935-4413-a0cb-b85b3ef089ca" name="rollbackNetwork"><con:settings/><con:config xsi:type="con:RequestStep" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"><con:interface>MsoNetworkAdapterImplPortBinding</con:interface><con:operation>rollbackNetwork</con:operation><con:request name="rollbackNetwork" id="ba43ff76-633c-4c01-bea8-c84dd1b3cb12"><con:settings><con:setting id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers">&lt;xml-fragment/></con:setting></con:settings><con:encoding>UTF-8</con:encoding><con:endpoint>http://${#Project#host}/networks/NetworkAdapter</con:endpoint><con:request><![CDATA[<soapenv:Envelope xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/" xmlns:net="http://org.openecomp.mso/network">\r
-   <soapenv:Header/>\r
-   <soapenv:Body>\r
-      <net:rollbackNetwork>\r
-         <rollback>\r
-            <!--Optional:-->\r
-            <cloudId>?</cloudId>\r
-            <!--Optional:-->\r
-            <msoRequest>\r
-               <!--Optional:-->\r
-               <requestId>12</requestId>\r
-               <!--Optional:-->\r
-               <serviceInstanceId>?</serviceInstanceId>\r
-            </msoRequest>\r
-            <networkCreated>?</networkCreated>\r
-            <!--Optional:-->\r
-            <networkId>?</networkId>\r
-            <!--Optional:-->\r
-            <networkName>?</networkName>\r
-            <!--Optional:-->\r
-            <networkType>?</networkType>\r
-            <networkUpdated>?</networkUpdated>\r
-            <!--Optional:-->\r
-            <neutronNetworkId>?</neutronNetworkId>\r
-            <networkStackId>?</networkStackId>
-            <!--Optional:-->\r
-            <physicalNetwork>?</physicalNetwork>\r
-            <!--Optional:-->\r
-            <tenantId>?</tenantId>\r
-            <!--Zero or more repetitions:-->\r
-            <vlans></vlans>\r
-         </rollback>\r
-      </net:rollbackNetwork>\r
-   </soapenv:Body>\r
-</soapenv:Envelope>]]></con:request><con:assertion type="Valid HTTP Status Codes" name="Valid HTTP Status Codes" id="1d3ad35c-4769-4ed0-9257-40751b39ef4e"><con:configuration><codes>500</codes></con:configuration></con:assertion><con:assertion type="Simple Contains" name="Contains" id="a96b5406-914f-48a6-9c45-0803d020707d"><con:configuration><token>&lt;message>Rollback Network: Unknown Network Type: ?&lt;/message></token><ignoreCase>false</ignoreCase><useRegEx>false</useRegEx></con:configuration></con:assertion><con:credentials><con:username>BPELClient</con:username><con:password>password1$</con:password><con:selectedAuthProfile>Basic</con:selectedAuthProfile><con:addedBasicAuthenticationTypes>Basic</con:addedBasicAuthenticationTypes><con:authType>Global HTTP Settings</con:authType></con:credentials><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:wsaConfig action="http://org.openecomp.mso/network/NetworkAdapter/rollbackNetworkRequest" mustUnderstand="NONE" version="200508"/><con:wsrmConfig version="1.2"/></con:request></con:config></con:testStep><con:properties/><con:reportParameters/></con:testCase><con:testCase id="af9555e0-d44e-4988-8a0b-c77d500713d7" failOnError="true" failTestCaseOnErrors="true" keepSession="false" maxResults="0" name="updateNetwork TestCase" searchProperties="true"><con:settings/><con:testStep type="request" id="499e258a-eeeb-48f4-9f31-3d6372c32b7b" name="updateNetwork"><con:settings/><con:config xsi:type="con:RequestStep" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"><con:interface>MsoNetworkAdapterImplPortBinding</con:interface><con:operation>updateNetwork</con:operation><con:request name="updateNetwork" id="c1a2d3aa-df9e-4952-8dc6-d9366d72d863"><con:settings><con:setting id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers">&lt;xml-fragment/></con:setting></con:settings><con:encoding>UTF-8</con:encoding><con:endpoint>http://${#Project#host}/networks/NetworkAdapter</con:endpoint><con:request><![CDATA[<soapenv:Envelope xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/" xmlns:net="http://org.openecomp.mso/network">\r
-   <soapenv:Header/>\r
-   <soapenv:Body>\r
-      <net:updateNetwork>\r
-         <cloudSiteId>?</cloudSiteId>\r
-         <tenantId>?</tenantId>\r
-         <networkType>?</networkType>\r
-         <networkId>?</networkId>\r
-         <networkName>?</networkName>\r
-         <physicalNetworkName>?</physicalNetworkName>\r
-         <!--1 or more repetitions:-->\r
-         <vlans></vlans>\r
-         <!--Optional:-->\r
-         <request>\r
-            <!--Optional:-->\r
-            <requestId>?</requestId>\r
-            <!--Optional:-->\r
-            <serviceInstanceId>?</serviceInstanceId>\r
-         </request>\r
-      </net:updateNetwork>\r
-   </soapenv:Body>\r
-</soapenv:Envelope>]]></con:request><con:assertion type="Valid HTTP Status Codes" name="Valid HTTP Status Codes" id="266839a6-9ba8-46ab-b5c9-18eee8e1e263"><con:configuration><codes>500</codes></con:configuration></con:assertion><con:assertion type="Simple Contains" name="Contains" id="6ce82e5e-762a-40ab-bd05-29d3353743aa"><con:configuration><token> CloudSite does not exist in MSO Configuration</token><ignoreCase>false</ignoreCase><useRegEx>false</useRegEx></con:configuration></con:assertion><con:credentials><con:username>BPELClient</con:username><con:password>password1$</con:password><con:selectedAuthProfile>Basic</con:selectedAuthProfile><con:addedBasicAuthenticationTypes>Basic</con:addedBasicAuthenticationTypes><con:authType>Global HTTP Settings</con:authType></con:credentials><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:wsaConfig action="http://org.openecomp.mso/network/NetworkAdapter/updateNetworkRequest" mustUnderstand="NONE" version="200508"/><con:wsrmConfig version="1.2"/></con:request></con:config></con:testStep><con:properties/><con:reportParameters/></con:testCase><con:properties/><con:reportParameters/></con:testSuite><con:properties><con:property><con:name>host</con:name><con:value>localhost:8080</con:value></con:property></con:properties><con:wssContainer/><con:databaseConnectionContainer/><con:oAuth2ProfileContainer/><con:oAuth1ProfileContainer/><con:reporting><con:xmlTemplates/><con:parameters/></con:reporting><con:sensitiveInformation/></con:soapui-project>
\ No newline at end of file
diff --git a/packages/arquillian-unit-tests/src/test/resources/SoapUI/MSOTenantAdapter-soapui-project.xml b/packages/arquillian-unit-tests/src/test/resources/SoapUI/MSOTenantAdapter-soapui-project.xml
deleted file mode 100644
index f3afbd3..0000000
--- a/packages/arquillian-unit-tests/src/test/resources/SoapUI/MSOTenantAdapter-soapui-project.xml
+++ /dev/null
@@ -1,422 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<con:soapui-project id="c01f429d-b7d0-4300-a508-6192e1568052" activeEnvironment="Default" name="MSOTenantAdapter" resourceRoot="" soapui-version="5.3.0" abortOnError="false" runType="SEQUENTIAL" xmlns:con="http://eviware.com/soapui/config"><con:settings/><con:interface xsi:type="con:WsdlInterface" id="a52c1618-e217-43e6-81d3-ecdfc8506517" wsaVersion="NONE" name="MsoTenantAdapterImplPortBinding" type="wsdl" bindingName="{http://org.openecomp.mso/tenant}MsoTenantAdapterImplPortBinding" soapVersion="1_1" anonymous="optional" definition="file:/C:/Dev/Git/mso/adapters/mso-tenant-adapter/target/generated-sources/wsdl/TenantAdapter.wsdl" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"><con:settings/><con:definitionCache type="TEXT" rootPart="file:\C:\Dev\Git\mso\adapters\mso-tenant-adapter\target\generated-sources\wsdl\TenantAdapter.wsdl"><con:part><con:url>file:\C:\Dev\Git\mso\adapters\mso-tenant-adapter\target\generated-sources\wsdl\TenantAdapter.wsdl</con:url><con:content><![CDATA[<!--Generated by JAX-WS RI at http://jax-ws.dev.java.net. RI's version is JAX-WS RI 2.2.7-b01  svn-revision#13316.-->
-<definitions targetNamespace="http://org.openecomp.mso/tenant" name="TenantAdapter" xmlns="http://schemas.xmlsoap.org/wsdl/" xmlns:wsp="http://www.w3.org/ns/ws-policy" xmlns:tns="http://org.openecomp.mso/tenant" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:wsp1_2="http://schemas.xmlsoap.org/ws/2004/09/policy" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:wsam="http://www.w3.org/2007/05/addressing/metadata" xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd">
-  <types>
-    <xs:schema version="1.0" targetNamespace="http://org.openecomp.mso/tenant" xmlns:xs="http://www.w3.org/2001/XMLSchema">
-      <xs:element name="TenantAlreadyExists" nillable="true" type="tns:tenantExceptionBean"/>
-      <xs:element name="TenantException" nillable="true" type="tns:tenantExceptionBean"/>
-      <xs:element name="createTenant" type="tns:createTenant"/>
-      <xs:element name="createTenantResponse" type="tns:createTenantResponse"/>
-      <xs:element name="deleteTenant" type="tns:deleteTenant"/>
-      <xs:element name="deleteTenantResponse" type="tns:deleteTenantResponse"/>
-      <xs:element name="healthCheck" type="tns:healthCheck"/>
-      <xs:element name="healthCheckResponse" type="tns:healthCheckResponse"/>
-      <xs:element name="queryTenant" type="tns:queryTenant"/>
-      <xs:element name="queryTenantResponse" type="tns:queryTenantResponse"/>
-      <xs:element name="rollbackTenant" type="tns:rollbackTenant"/>
-      <xs:element name="rollbackTenantResponse" type="tns:rollbackTenantResponse"/>
-      <xs:complexType name="createTenant">
-        <xs:sequence>
-          <xs:element name="cloudSiteId" type="xs:string"/>
-          <xs:element name="tenantName" type="xs:string"/>
-          <xs:element name="metadata">
-            <xs:complexType>
-              <xs:sequence>
-                <xs:element name="entry" minOccurs="0" maxOccurs="unbounded">
-                  <xs:complexType>
-                    <xs:sequence>
-                      <xs:element name="key" minOccurs="0" type="xs:string"/>
-                      <xs:element name="value" minOccurs="0" type="xs:string"/>
-                    </xs:sequence>
-                  </xs:complexType>
-                </xs:element>
-              </xs:sequence>
-            </xs:complexType>
-          </xs:element>
-          <xs:element name="failIfExists" type="xs:boolean" minOccurs="0"/>
-          <xs:element name="request" type="tns:msoRequest" minOccurs="0"/>
-        </xs:sequence>
-      </xs:complexType>
-      <xs:complexType name="msoRequest">
-        <xs:sequence>
-          <xs:element name="requestId" type="xs:string" minOccurs="0"/>
-          <xs:element name="serviceInstanceId" type="xs:string" minOccurs="0"/>
-        </xs:sequence>
-      </xs:complexType>
-      <xs:complexType name="createTenantResponse">
-        <xs:sequence>
-          <xs:element name="tenantId" type="xs:string" minOccurs="0"/>
-          <xs:element name="rollback" type="tns:tenantRollback" minOccurs="0"/>
-        </xs:sequence>
-      </xs:complexType>
-      <xs:complexType name="tenantRollback">
-        <xs:sequence>
-          <xs:element name="cloudId" type="xs:string" minOccurs="0"/>
-          <xs:element name="msoRequest" type="tns:msoRequest" minOccurs="0"/>
-          <xs:element name="tenantCreated" type="xs:boolean"/>
-          <xs:element name="tenantId" type="xs:string" minOccurs="0"/>
-        </xs:sequence>
-      </xs:complexType>
-      <xs:complexType name="tenantExceptionBean">
-        <xs:sequence>
-          <xs:element name="category" type="tns:msoExceptionCategory" minOccurs="0"/>
-          <xs:element name="message" type="xs:string" minOccurs="0"/>
-        </xs:sequence>
-      </xs:complexType>
-      <xs:complexType name="rollbackTenant">
-        <xs:sequence>
-          <xs:element name="rollback" type="tns:tenantRollback"/>
-        </xs:sequence>
-      </xs:complexType>
-      <xs:complexType name="rollbackTenantResponse">
-        <xs:sequence/>
-      </xs:complexType>
-      <xs:complexType name="healthCheck">
-        <xs:sequence/>
-      </xs:complexType>
-      <xs:complexType name="healthCheckResponse">
-        <xs:sequence/>
-      </xs:complexType>
-      <xs:complexType name="deleteTenant">
-        <xs:sequence>
-          <xs:element name="cloudSiteId" type="xs:string"/>
-          <xs:element name="tenantId" type="xs:string"/>
-          <xs:element name="request" type="tns:msoRequest" minOccurs="0"/>
-        </xs:sequence>
-      </xs:complexType>
-      <xs:complexType name="deleteTenantResponse">
-        <xs:sequence>
-          <xs:element name="tenantDeleted" type="xs:boolean" minOccurs="0"/>
-        </xs:sequence>
-      </xs:complexType>
-      <xs:complexType name="queryTenant">
-        <xs:sequence>
-          <xs:element name="cloudSiteId" type="xs:string"/>
-          <xs:element name="tenantNameOrId" type="xs:string"/>
-          <xs:element name="request" type="tns:msoRequest" minOccurs="0"/>
-        </xs:sequence>
-      </xs:complexType>
-      <xs:complexType name="queryTenantResponse">
-        <xs:sequence>
-          <xs:element name="tenantId" type="xs:string" minOccurs="0"/>
-          <xs:element name="tenantName" type="xs:string" minOccurs="0"/>
-          <xs:element name="metadata">
-            <xs:complexType>
-              <xs:sequence>
-                <xs:element name="entry" minOccurs="0" maxOccurs="unbounded">
-                  <xs:complexType>
-                    <xs:sequence>
-                      <xs:element name="key" minOccurs="0" type="xs:string"/>
-                      <xs:element name="value" minOccurs="0" type="xs:string"/>
-                    </xs:sequence>
-                  </xs:complexType>
-                </xs:element>
-              </xs:sequence>
-            </xs:complexType>
-          </xs:element>
-        </xs:sequence>
-      </xs:complexType>
-      <xs:simpleType name="msoExceptionCategory">
-        <xs:restriction base="xs:string">
-          <xs:enumeration value="OPENSTACK"/>
-          <xs:enumeration value="IO"/>
-          <xs:enumeration value="INTERNAL"/>
-          <xs:enumeration value="USERDATA"/>
-        </xs:restriction>
-      </xs:simpleType>
-    </xs:schema>
-  </types>
-  <message name="rollbackTenant">
-    <part name="parameters" element="tns:rollbackTenant"/>
-  </message>
-  <message name="rollbackTenantResponse">
-    <part name="parameters" element="tns:rollbackTenantResponse"/>
-  </message>
-  <message name="TenantException">
-    <part name="fault" element="tns:TenantException"/>
-  </message>
-  <message name="createTenant">
-    <part name="parameters" element="tns:createTenant"/>
-  </message>
-  <message name="createTenantResponse">
-    <part name="parameters" element="tns:createTenantResponse"/>
-  </message>
-  <message name="TenantAlreadyExists">
-    <part name="fault" element="tns:TenantAlreadyExists"/>
-  </message>
-  <message name="healthCheck">
-    <part name="parameters" element="tns:healthCheck"/>
-  </message>
-  <message name="healthCheckResponse">
-    <part name="parameters" element="tns:healthCheckResponse"/>
-  </message>
-  <message name="queryTenant">
-    <part name="parameters" element="tns:queryTenant"/>
-  </message>
-  <message name="queryTenantResponse">
-    <part name="parameters" element="tns:queryTenantResponse"/>
-  </message>
-  <message name="deleteTenant">
-    <part name="parameters" element="tns:deleteTenant"/>
-  </message>
-  <message name="deleteTenantResponse">
-    <part name="parameters" element="tns:deleteTenantResponse"/>
-  </message>
-  <portType name="TenantAdapter">
-    <operation name="rollbackTenant">
-      <input wsam:Action="http://org.openecomp.mso/tenant/TenantAdapter/rollbackTenantRequest" message="tns:rollbackTenant"/>
-      <output wsam:Action="http://org.openecomp.mso/tenant/TenantAdapter/rollbackTenantResponse" message="tns:rollbackTenantResponse"/>
-      <fault message="tns:TenantException" name="TenantException" wsam:Action="http://org.openecomp.mso/tenant/TenantAdapter/rollbackTenant/Fault/TenantException"/>
-    </operation>
-    <operation name="createTenant">
-      <input wsam:Action="http://org.openecomp.mso/tenant/TenantAdapter/createTenantRequest" message="tns:createTenant"/>
-      <output wsam:Action="http://org.openecomp.mso/tenant/TenantAdapter/createTenantResponse" message="tns:createTenantResponse"/>
-      <fault message="tns:TenantException" name="TenantException" wsam:Action="http://org.openecomp.mso/tenant/TenantAdapter/createTenant/Fault/TenantException"/>
-      <fault message="tns:TenantAlreadyExists" name="TenantAlreadyExists" wsam:Action="http://org.openecomp.mso/tenant/TenantAdapter/createTenant/Fault/TenantAlreadyExists"/>
-    </operation>
-    <operation name="healthCheck">
-      <input wsam:Action="http://org.openecomp.mso/tenant/TenantAdapter/healthCheckRequest" message="tns:healthCheck"/>
-      <output wsam:Action="http://org.openecomp.mso/tenant/TenantAdapter/healthCheckResponse" message="tns:healthCheckResponse"/>
-    </operation>
-    <operation name="queryTenant">
-      <input wsam:Action="http://org.openecomp.mso/tenant/TenantAdapter/queryTenantRequest" message="tns:queryTenant"/>
-      <output wsam:Action="http://org.openecomp.mso/tenant/TenantAdapter/queryTenantResponse" message="tns:queryTenantResponse"/>
-      <fault message="tns:TenantException" name="TenantException" wsam:Action="http://org.openecomp.mso/tenant/TenantAdapter/queryTenant/Fault/TenantException"/>
-    </operation>
-    <operation name="deleteTenant">
-      <input wsam:Action="http://org.openecomp.mso/tenant/TenantAdapter/deleteTenantRequest" message="tns:deleteTenant"/>
-      <output wsam:Action="http://org.openecomp.mso/tenant/TenantAdapter/deleteTenantResponse" message="tns:deleteTenantResponse"/>
-      <fault message="tns:TenantException" name="TenantException" wsam:Action="http://org.openecomp.mso/tenant/TenantAdapter/deleteTenant/Fault/TenantException"/>
-    </operation>
-  </portType>
-  <binding name="MsoTenantAdapterImplPortBinding" type="tns:TenantAdapter">
-    <soap:binding transport="http://schemas.xmlsoap.org/soap/http" style="document"/>
-    <operation name="rollbackTenant">
-      <soap:operation soapAction=""/>
-      <input>
-        <soap:body use="literal"/>
-      </input>
-      <output>
-        <soap:body use="literal"/>
-      </output>
-      <fault name="TenantException">
-        <soap:fault name="TenantException" use="literal"/>
-      </fault>
-    </operation>
-    <operation name="createTenant">
-      <soap:operation soapAction=""/>
-      <input>
-        <soap:body use="literal"/>
-      </input>
-      <output>
-        <soap:body use="literal"/>
-      </output>
-      <fault name="TenantException">
-        <soap:fault name="TenantException" use="literal"/>
-      </fault>
-      <fault name="TenantAlreadyExists">
-        <soap:fault name="TenantAlreadyExists" use="literal"/>
-      </fault>
-    </operation>
-    <operation name="healthCheck">
-      <soap:operation soapAction=""/>
-      <input>
-        <soap:body use="literal"/>
-      </input>
-      <output>
-        <soap:body use="literal"/>
-      </output>
-    </operation>
-    <operation name="queryTenant">
-      <soap:operation soapAction=""/>
-      <input>
-        <soap:body use="literal"/>
-      </input>
-      <output>
-        <soap:body use="literal"/>
-      </output>
-      <fault name="TenantException">
-        <soap:fault name="TenantException" use="literal"/>
-      </fault>
-    </operation>
-    <operation name="deleteTenant">
-      <soap:operation soapAction=""/>
-      <input>
-        <soap:body use="literal"/>
-      </input>
-      <output>
-        <soap:body use="literal"/>
-      </output>
-      <fault name="TenantException">
-        <soap:fault name="TenantException" use="literal"/>
-      </fault>
-    </operation>
-  </binding>
-  <service name="TenantAdapter">
-    <port name="MsoTenantAdapterImplPort" binding="tns:MsoTenantAdapterImplPortBinding">
-      <soap:address location="REPLACE_WITH_ACTUAL_URL"/>
-    </port>
-  </service>
-</definitions>]]></con:content><con:type>http://schemas.xmlsoap.org/wsdl/</con:type></con:part></con:definitionCache><con:endpoints><con:endpoint>REPLACE_WITH_ACTUAL_URL</con:endpoint></con:endpoints><con:operation id="da6ac635-e28a-4689-982f-5723b2265e13" isOneWay="false" action="" name="createTenant" bindingOperationName="createTenant" type="Request-Response" inputName="" receivesAttachments="false" sendsAttachments="false" anonymous="optional"><con:settings/><con:call id="6d9e9e3b-f725-452d-bb3e-12d70cc5e4ad" name="Request 1"><con:settings/><con:encoding>UTF-8</con:encoding><con:endpoint>REPLACE_WITH_ACTUAL_URL</con:endpoint><con:request><![CDATA[<soapenv:Envelope xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ten="http://org.openecomp.mso/tenant">\r
-   <soapenv:Header/>\r
-   <soapenv:Body>\r
-      <ten:createTenant>\r
-         <cloudSiteId>?</cloudSiteId>\r
-         <tenantName>?</tenantName>\r
-         <metadata>\r
-            <!--Zero or more repetitions:-->\r
-            <entry>\r
-               <!--Optional:-->\r
-               <key>?</key>\r
-               <!--Optional:-->\r
-               <value>?</value>\r
-            </entry>\r
-         </metadata>\r
-         <!--Optional:-->\r
-         <failIfExists>?</failIfExists>\r
-         <!--Optional:-->\r
-         <request>\r
-            <!--Optional:-->\r
-            <requestId>?</requestId>\r
-            <!--Optional:-->\r
-            <serviceInstanceId>?</serviceInstanceId>\r
-         </request>\r
-      </ten:createTenant>\r
-   </soapenv:Body>\r
-</soapenv:Envelope>]]></con:request><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:wsaConfig mustUnderstand="NONE" version="200508" action="http://org.openecomp.mso/tenant/TenantAdapter/createTenantRequest"/></con:call></con:operation><con:operation id="62050684-ca33-45b1-9ffa-68a3b7d269b6" isOneWay="false" action="" name="deleteTenant" bindingOperationName="deleteTenant" type="Request-Response" inputName="" receivesAttachments="false" sendsAttachments="false" anonymous="optional"><con:settings/><con:call id="53a2e6f6-6851-440c-99dd-5782deac5750" name="Request 1"><con:settings/><con:encoding>UTF-8</con:encoding><con:endpoint>REPLACE_WITH_ACTUAL_URL</con:endpoint><con:request><![CDATA[<soapenv:Envelope xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ten="http://org.openecomp.mso/tenant">\r
-   <soapenv:Header/>\r
-   <soapenv:Body>\r
-      <ten:deleteTenant>\r
-         <cloudSiteId>?</cloudSiteId>\r
-         <tenantId>?</tenantId>\r
-         <!--Optional:-->\r
-         <request>\r
-            <!--Optional:-->\r
-            <requestId>?</requestId>\r
-            <!--Optional:-->\r
-            <serviceInstanceId>?</serviceInstanceId>\r
-         </request>\r
-      </ten:deleteTenant>\r
-   </soapenv:Body>\r
-</soapenv:Envelope>]]></con:request><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:wsaConfig mustUnderstand="NONE" version="200508" action="http://org.openecomp.mso/tenant/TenantAdapter/deleteTenantRequest"/></con:call></con:operation><con:operation id="351c3102-190a-47d8-9723-077413751163" isOneWay="false" action="" name="healthCheck" bindingOperationName="healthCheck" type="Request-Response" inputName="" receivesAttachments="false" sendsAttachments="false" anonymous="optional"><con:settings/><con:call id="7826caac-2f47-4b1c-85d2-f36486b97957" name="Request 1"><con:settings/><con:encoding>UTF-8</con:encoding><con:endpoint>REPLACE_WITH_ACTUAL_URL</con:endpoint><con:request><![CDATA[<soapenv:Envelope xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ten="http://org.openecomp.mso/tenant">\r
-   <soapenv:Header/>\r
-   <soapenv:Body>\r
-      <ten:healthCheck/>\r
-   </soapenv:Body>\r
-</soapenv:Envelope>]]></con:request><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:wsaConfig mustUnderstand="NONE" version="200508" action="http://org.openecomp.mso/tenant/TenantAdapter/healthCheckRequest"/></con:call></con:operation><con:operation id="5ca1fd95-ebe2-4d0c-9ad7-ac05b8da0b59" isOneWay="false" action="" name="queryTenant" bindingOperationName="queryTenant" type="Request-Response" inputName="" receivesAttachments="false" sendsAttachments="false" anonymous="optional"><con:settings/><con:call id="778bb9b1-ae71-46db-8e74-8f2eae60edb1" name="Request 1"><con:settings/><con:encoding>UTF-8</con:encoding><con:endpoint>REPLACE_WITH_ACTUAL_URL</con:endpoint><con:request><![CDATA[<soapenv:Envelope xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ten="http://org.openecomp.mso/tenant">\r
-   <soapenv:Header/>\r
-   <soapenv:Body>\r
-      <ten:queryTenant>\r
-         <cloudSiteId>?</cloudSiteId>\r
-         <tenantNameOrId>?</tenantNameOrId>\r
-         <!--Optional:-->\r
-         <request>\r
-            <!--Optional:-->\r
-            <requestId>?</requestId>\r
-            <!--Optional:-->\r
-            <serviceInstanceId>?</serviceInstanceId>\r
-         </request>\r
-      </ten:queryTenant>\r
-   </soapenv:Body>\r
-</soapenv:Envelope>]]></con:request><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:wsaConfig mustUnderstand="NONE" version="200508" action="http://org.openecomp.mso/tenant/TenantAdapter/queryTenantRequest"/></con:call></con:operation><con:operation id="5b4bb04c-6c29-4743-b492-0a642da96d21" isOneWay="false" action="" name="rollbackTenant" bindingOperationName="rollbackTenant" type="Request-Response" inputName="" receivesAttachments="false" sendsAttachments="false" anonymous="optional"><con:settings/><con:call id="cb21012f-9c70-4381-b798-81d1ba8253b2" name="Request 1"><con:settings/><con:encoding>UTF-8</con:encoding><con:endpoint>REPLACE_WITH_ACTUAL_URL</con:endpoint><con:request><![CDATA[<soapenv:Envelope xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ten="http://org.openecomp.mso/tenant">\r
-   <soapenv:Header/>\r
-   <soapenv:Body>\r
-      <ten:rollbackTenant>\r
-         <rollback>\r
-            <!--Optional:-->\r
-            <cloudId>?</cloudId>\r
-            <!--Optional:-->\r
-            <msoRequest>\r
-               <!--Optional:-->\r
-               <requestId>?</requestId>\r
-               <!--Optional:-->\r
-               <serviceInstanceId>?</serviceInstanceId>\r
-            </msoRequest>\r
-            <tenantCreated>?</tenantCreated>\r
-            <!--Optional:-->\r
-            <tenantId>?</tenantId>\r
-         </rollback>\r
-      </ten:rollbackTenant>\r
-   </soapenv:Body>\r
-</soapenv:Envelope>]]></con:request><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:wsaConfig mustUnderstand="NONE" version="200508" action="http://org.openecomp.mso/tenant/TenantAdapter/rollbackTenantRequest"/></con:call></con:operation></con:interface><con:testSuite id="f25a8a48-ce32-4e6d-a7dc-8c829a91ec88" name="MsoTenantAdapter TestSuite"><con:settings/><con:runType>SEQUENTIAL</con:runType><con:testCase id="6bfcdc6e-0da1-4a60-894a-27f37d133407" failOnError="true" failTestCaseOnErrors="true" keepSession="false" maxResults="0" name="createTenant TestCase" searchProperties="true"><con:settings/><con:testStep type="request" id="1c7c7707-f9a5-4ff6-a84e-804dd4ba5842" name="createTenant"><con:settings/><con:config xsi:type="con:RequestStep" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"><con:interface>MsoTenantAdapterImplPortBinding</con:interface><con:operation>createTenant</con:operation><con:request name="createTenant" outgoingWss="" incomingWss="" timeout="" sslKeystore="" useWsAddressing="false" useWsReliableMessaging="false" wssPasswordType="" id="bab1e2a5-ce36-43b6-9bda-b3722163eb89"><con:settings><con:setting id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers">&lt;xml-fragment/></con:setting></con:settings><con:encoding>UTF-8</con:encoding><con:endpoint>http://${#Project#host}/tenants/TenantAdapter</con:endpoint><con:request><![CDATA[<soapenv:Envelope xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ten="http://org.openecomp.mso/tenant">\r
-   <soapenv:Header/>\r
-   <soapenv:Body>\r
-      <ten:createTenant>\r
-         <cloudSiteId>MT</cloudSiteId>\r
-         <tenantName>tenant</tenantName>\r
-         <metadata>\r
-            <!--Zero or more repetitions:-->\r
-            <entry>\r
-               <!--Optional:-->\r
-               <key>key1</key>\r
-               <!--Optional:-->\r
-               <value>value1</value>\r
-            </entry>\r
-         </metadata>\r
-         <!--Optional:-->\r
-         <failIfExists>true</failIfExists>\r
-         <!--Optional:-->\r
-         <request>\r
-            <!--Optional:-->\r
-            <requestId>req</requestId>\r
-            <!--Optional:-->\r
-            <serviceInstanceId>serv</serviceInstanceId>\r
-         </request>\r
-      </ten:createTenant>\r
-   </soapenv:Body>\r
-</soapenv:Envelope>]]></con:request><con:assertion type="Not SOAP Fault Assertion" id="ea506f96-9104-42ed-b80b-4269020a84ad" name="SOAP Fault"/><con:assertion type="Simple Contains" id="23bcd9d5-de82-4dc5-ba7e-1f5097e23640" name="Contains"><con:configuration><token>failed: Connection refused</token><ignoreCase>false</ignoreCase><useRegEx>false</useRegEx></con:configuration></con:assertion><con:credentials><con:username>${#Project#user-bpel}</con:username><con:password>${#Project#password-bpel}</con:password><con:selectedAuthProfile>Basic</con:selectedAuthProfile><con:addedBasicAuthenticationTypes>Basic</con:addedBasicAuthenticationTypes><con:authType>Global HTTP Settings</con:authType></con:credentials><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:wsaConfig mustUnderstand="NONE" version="200508" action="http://org.openecomp.mso/tenant/TenantAdapter/createTenantRequest"/><con:wsrmConfig version="1.2"/></con:request></con:config></con:testStep><con:properties/></con:testCase><con:testCase id="3b109f95-f964-459e-979d-2d446a10f083" failOnError="true" failTestCaseOnErrors="true" keepSession="false" maxResults="0" name="deleteTenant TestCase" searchProperties="true"><con:settings/><con:testStep type="request" id="489c149d-99b5-45f2-92f4-8622a660abf0" name="deleteTenant"><con:settings/><con:config xsi:type="con:RequestStep" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"><con:interface>MsoTenantAdapterImplPortBinding</con:interface><con:operation>deleteTenant</con:operation><con:request name="deleteTenant" outgoingWss="" incomingWss="" timeout="" sslKeystore="" useWsAddressing="false" useWsReliableMessaging="false" wssPasswordType="" id="958e291a-6355-47ca-9238-d036fe2f0427"><con:settings><con:setting id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers">&lt;xml-fragment/></con:setting></con:settings><con:encoding>UTF-8</con:encoding><con:endpoint>http://${#Project#host}/tenants/TenantAdapter</con:endpoint><con:request><![CDATA[<soapenv:Envelope xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ten="http://org.openecomp.mso/tenant">\r
-   <soapenv:Header/>\r
-   <soapenv:Body>\r
-      <ten:deleteTenant>\r
-         <cloudSiteId>MT</cloudSiteId>\r
-         <tenantId>someTenant</tenantId>\r
-         <!--Optional:-->\r
-         <request>\r
-            <!--Optional:-->\r
-            <requestId>reqD</requestId>\r
-            <!--Optional:-->\r
-            <serviceInstanceId>servD</serviceInstanceId>\r
-         </request>\r
-      </ten:deleteTenant>\r
-   </soapenv:Body>\r
-</soapenv:Envelope>]]></con:request><con:assertion type="Not SOAP Fault Assertion" id="3dad7b94-b0c0-40ee-8473-d689535e994f" name="SOAP Fault"/><con:assertion type="Simple Contains" id="fab97a2f-3537-425d-b182-2081f84268f3" name="Contains"><con:configuration><token>failed: Connection refused</token><ignoreCase>false</ignoreCase><useRegEx>false</useRegEx></con:configuration></con:assertion><con:credentials><con:username>${#Project#user-bpel}</con:username><con:password>${#Project#password-bpel}</con:password><con:domain/><con:selectedAuthProfile>Basic</con:selectedAuthProfile><con:addedBasicAuthenticationTypes>Basic</con:addedBasicAuthenticationTypes><con:authType>Global HTTP Settings</con:authType></con:credentials><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:wsaConfig mustUnderstand="NONE" version="200508" action="http://org.openecomp.mso/tenant/TenantAdapter/deleteTenantRequest"/><con:wsrmConfig version="1.2"/></con:request></con:config></con:testStep><con:properties/></con:testCase><con:testCase id="49f0412b-87dc-4f0d-b83a-90fb3887859c" failOnError="true" failTestCaseOnErrors="true" keepSession="false" maxResults="0" name="healthCheck TestCase" searchProperties="true"><con:settings/><con:testStep type="request" id="b10d0f1b-9b0f-46b6-8ec6-6f078d767a6d" name="healthCheck"><con:settings/><con:config xsi:type="con:RequestStep" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"><con:interface>MsoTenantAdapterImplPortBinding</con:interface><con:operation>healthCheck</con:operation><con:request name="healthCheck" outgoingWss="" incomingWss="" timeout="" sslKeystore="" useWsAddressing="false" useWsReliableMessaging="false" wssPasswordType="" id="52d89f8c-7688-48ec-a08d-96a55518305d"><con:settings><con:setting id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers">&lt;xml-fragment/></con:setting></con:settings><con:encoding>UTF-8</con:encoding><con:endpoint>http://${#Project#host}/tenants/TenantAdapter</con:endpoint><con:request><![CDATA[<soapenv:Envelope xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ten="http://org.openecomp.mso/tenant">\r
-   <soapenv:Header/>\r
-   <soapenv:Body>\r
-      <ten:healthCheck/>\r
-   </soapenv:Body>\r
-</soapenv:Envelope>]]></con:request><con:assertion type="Valid HTTP Status Codes" id="acb5f500-17ef-4dc8-91f8-0cd7ddf1baa0" name="Valid HTTP Status Codes"><con:configuration><codes>200</codes></con:configuration></con:assertion><con:credentials><con:username>${#Project#user-bpel}</con:username><con:password>${#Project#password-bpel}</con:password><con:selectedAuthProfile>Basic</con:selectedAuthProfile><con:addedBasicAuthenticationTypes>Basic</con:addedBasicAuthenticationTypes><con:authType>Global HTTP Settings</con:authType></con:credentials><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:wsaConfig mustUnderstand="NONE" version="200508" action="http://org.openecomp.mso/tenant/TenantAdapter/healthCheckRequest"/><con:wsrmConfig version="1.2"/></con:request></con:config></con:testStep><con:properties/></con:testCase><con:testCase id="361f993b-f73c-455f-9e4e-d92b2587a34d" failOnError="true" failTestCaseOnErrors="true" keepSession="false" maxResults="0" name="queryTenant TestCase" searchProperties="true"><con:settings/><con:testStep type="request" id="dedd7cde-13e7-4399-baa0-17a132202c90" name="queryTenant NOK"><con:settings/><con:config xsi:type="con:RequestStep" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"><con:interface>MsoTenantAdapterImplPortBinding</con:interface><con:operation>queryTenant</con:operation><con:request name="queryTenant NOK" outgoingWss="" incomingWss="" timeout="" sslKeystore="" useWsAddressing="false" useWsReliableMessaging="false" wssPasswordType="" id="ec87745e-2d80-4655-9825-22e5b8fdf397"><con:settings><con:setting id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers">&lt;xml-fragment/></con:setting></con:settings><con:encoding>UTF-8</con:encoding><con:endpoint>http://${#Project#host}/tenants/TenantAdapter</con:endpoint><con:request><![CDATA[<soapenv:Envelope xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ten="http://org.openecomp.mso/tenant">\r
-   <soapenv:Header/>\r
-   <soapenv:Body>\r
-      <ten:queryTenant>\r
-         <cloudSiteId>MT</cloudSiteId>\r
-         <tenantNameOrId>notWorkingTenant</tenantNameOrId>\r
-         <!--Optional:-->\r
-         <request>\r
-            <!--Optional:-->\r
-            <requestId>qReq</requestId>\r
-            <!--Optional:-->\r
-            <serviceInstanceId>qServ</serviceInstanceId>\r
-         </request>\r
-      </ten:queryTenant>\r
-   </soapenv:Body>\r
-</soapenv:Envelope>]]></con:request><con:assertion type="Not SOAP Fault Assertion" id="5102a4cd-a0cd-4386-b73c-6f36d50c983d" name="SOAP Fault"/><con:assertion type="Simple Contains" id="c85cc90b-fd79-435d-82ae-8b34f3168d40" name="Contains"><con:configuration><token>failed: Connection refused</token><ignoreCase>false</ignoreCase><useRegEx>false</useRegEx></con:configuration></con:assertion><con:credentials><con:username>${#Project#user-bpel}</con:username><con:password>${#Project#password-bpel}</con:password><con:domain/><con:selectedAuthProfile>Basic</con:selectedAuthProfile><con:addedBasicAuthenticationTypes>Basic</con:addedBasicAuthenticationTypes><con:authType>Global HTTP Settings</con:authType></con:credentials><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:wsaConfig mustUnderstand="NONE" version="200508" action="http://org.openecomp.mso/tenant/TenantAdapter/queryTenantRequest"/><con:wsrmConfig version="1.2"/></con:request></con:config></con:testStep><con:properties/></con:testCase><con:testCase id="3d4d3fe5-b146-4d3a-bffe-410235950701" failOnError="true" failTestCaseOnErrors="true" keepSession="false" maxResults="0" name="rollbackTenant TestCase" searchProperties="true"><con:settings/><con:testStep type="request" id="868690e2-810e-4c30-8d00-c64b9532fd64" name="rollbackTenant"><con:settings/><con:config xsi:type="con:RequestStep" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"><con:interface>MsoTenantAdapterImplPortBinding</con:interface><con:operation>rollbackTenant</con:operation><con:request name="rollbackTenant" outgoingWss="" incomingWss="" timeout="" sslKeystore="" useWsAddressing="false" useWsReliableMessaging="false" wssPasswordType="" id="a3d70125-cd70-440c-997d-7fb12b70747e"><con:settings><con:setting id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers">&lt;xml-fragment/></con:setting></con:settings><con:encoding>UTF-8</con:encoding><con:endpoint>http://${#Project#host}/tenants/TenantAdapter</con:endpoint><con:request><![CDATA[<soapenv:Envelope xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ten="http://org.openecomp.mso/tenant">\r
-   <soapenv:Header/>\r
-   <soapenv:Body>\r
-      <ten:rollbackTenant>\r
-         <rollback>\r
-            <!--Optional:-->\r
-            <cloudId>MT</cloudId>\r
-            <!--Optional:-->\r
-            <msoRequest>\r
-               <!--Optional:-->\r
-               <requestId>toto</requestId>\r
-               <!--Optional:-->\r
-               <serviceInstanceId>tutu</serviceInstanceId>\r
-            </msoRequest>\r
-            <tenantCreated>true</tenantCreated>\r
-            <!--Optional:-->\r
-            <tenantId>tenantId</tenantId>\r
-         </rollback>\r
-      </ten:rollbackTenant>\r
-   </soapenv:Body>\r
-</soapenv:Envelope>]]></con:request><con:assertion type="Not SOAP Fault Assertion" id="6a2f7016-8a35-4c0f-92c2-52cf1627ac66" name="SOAP Fault"/><con:assertion type="Simple Contains" id="fcad2d0e-237f-4986-ae8e-87d3ed7dd363" name="Contains"><con:configuration><token>failed: Connection refused</token><ignoreCase>false</ignoreCase><useRegEx>false</useRegEx></con:configuration></con:assertion><con:credentials><con:username>${#Project#user-bpel}</con:username><con:password>${#Project#password-bpel}</con:password><con:domain/><con:selectedAuthProfile>Basic</con:selectedAuthProfile><con:addedBasicAuthenticationTypes>Basic</con:addedBasicAuthenticationTypes><con:authType>Global HTTP Settings</con:authType></con:credentials><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:wsaConfig mustUnderstand="NONE" version="200508" action="http://org.openecomp.mso/tenant/TenantAdapter/rollbackTenantRequest"/><con:wsrmConfig version="1.2"/></con:request></con:config></con:testStep><con:properties/></con:testCase><con:properties/></con:testSuite><con:properties><con:property><con:name>host</con:name><con:value>localhost:18080</con:value></con:property><con:property><con:name>user-bpel</con:name><con:value>BPELClient</con:value></con:property><con:property><con:name>password-bpel</con:name><con:value>password1$</con:value></con:property></con:properties><con:wssContainer/><con:oAuth2ProfileContainer/><con:oAuth1ProfileContainer/><con:sensitiveInformation/></con:soapui-project>
\ No newline at end of file
diff --git a/packages/arquillian-unit-tests/src/test/resources/SoapUI/MSOVnfAdapter-soapui-project.xml b/packages/arquillian-unit-tests/src/test/resources/SoapUI/MSOVnfAdapter-soapui-project.xml
deleted file mode 100644
index 4d704d1..0000000
--- a/packages/arquillian-unit-tests/src/test/resources/SoapUI/MSOVnfAdapter-soapui-project.xml
+++ /dev/null
@@ -1,623 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<con:soapui-project id="e9378998-88a1-4bb9-891e-e40a5f45a001" activeEnvironment="Default" name="MSOVnfAdapter" resourceRoot="" soapui-version="5.3.0" abortOnError="false" runType="SEQUENTIAL" xmlns:con="http://eviware.com/soapui/config"><con:settings/><con:interface xsi:type="con:WsdlInterface" id="8ef48853-638b-4c23-8863-03b8ab572ed4" wsaVersion="NONE" name="MsoVnfAdapterImplPortBinding" type="wsdl" bindingName="{http://org.openecomp.mso/vnf}MsoVnfAdapterImplPortBinding" soapVersion="1_1" anonymous="optional" definition="file:/C:/Dev/Git/mso/adapters/mso-vnf-adapter/target/generated-sources/wsdl/VnfAdapter.wsdl" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"><con:settings/><con:definitionCache type="TEXT" rootPart="file:\C:\Dev\Git\mso\adapters\mso-vnf-adapter\target\generated-sources\wsdl\VnfAdapter.wsdl"><con:part><con:url>file:\C:\Dev\Git\mso\adapters\mso-vnf-adapter\target\generated-sources\wsdl\VnfAdapter.wsdl</con:url><con:content><![CDATA[<!--Generated by JAX-WS RI at http://jax-ws.dev.java.net. RI's version is JAX-WS RI 2.2.7-b01  svn-revision#13316.-->
-<definitions targetNamespace="http://org.openecomp.mso/vnf" name="VnfAdapter" xmlns="http://schemas.xmlsoap.org/wsdl/" xmlns:wsp="http://www.w3.org/ns/ws-policy" xmlns:tns="http://org.openecomp.mso/vnf" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:wsp1_2="http://schemas.xmlsoap.org/ws/2004/09/policy" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:wsam="http://www.w3.org/2007/05/addressing/metadata" xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd">
-  <types>
-    <xs:schema version="1.0" targetNamespace="http://org.openecomp.mso/vnf" xmlns:xs="http://www.w3.org/2001/XMLSchema">
-      <xs:element name="VnfAlreadyExists" nillable="true" type="tns:vnfExceptionBean"/>
-      <xs:element name="VnfException" nillable="true" type="tns:vnfExceptionBean"/>
-      <xs:element name="createVnf" type="tns:createVnf"/>
-      <xs:element name="createVnfResponse" type="tns:createVnfResponse"/>
-      <xs:element name="deleteVnf" type="tns:deleteVnf"/>
-      <xs:element name="deleteVnfResponse" type="tns:deleteVnfResponse"/>
-      <xs:element name="healthCheck" type="tns:healthCheck"/>
-      <xs:element name="healthCheckResponse" type="tns:healthCheckResponse"/>
-      <xs:element name="queryVnf" type="tns:queryVnf"/>
-      <xs:element name="queryVnfResponse" type="tns:queryVnfResponse"/>
-      <xs:element name="rollbackVnf" type="tns:rollbackVnf"/>
-      <xs:element name="rollbackVnfResponse" type="tns:rollbackVnfResponse"/>
-      <xs:element name="updateVnf" type="tns:updateVnf"/>
-      <xs:element name="updateVnfResponse" type="tns:updateVnfResponse"/>
-      <xs:complexType name="healthCheck">
-        <xs:sequence/>
-      </xs:complexType>
-      <xs:complexType name="healthCheckResponse">
-        <xs:sequence/>
-      </xs:complexType>
-      <xs:complexType name="deleteVnf">
-        <xs:sequence>
-          <xs:element name="cloudSiteId" type="xs:string"/>
-          <xs:element name="tenantId" type="xs:string"/>
-          <xs:element name="vnfName" type="xs:string"/>
-          <xs:element name="request" type="tns:msoRequest" minOccurs="0"/>
-        </xs:sequence>
-      </xs:complexType>
-      <xs:complexType name="msoRequest">
-        <xs:sequence>
-          <xs:element name="requestId" type="xs:string" minOccurs="0"/>
-          <xs:element name="serviceInstanceId" type="xs:string" minOccurs="0"/>
-        </xs:sequence>
-      </xs:complexType>
-      <xs:complexType name="deleteVnfResponse">
-        <xs:sequence/>
-      </xs:complexType>
-      <xs:complexType name="vnfExceptionBean">
-        <xs:sequence>
-          <xs:element name="category" type="tns:msoExceptionCategory" minOccurs="0"/>
-          <xs:element name="message" type="xs:string" minOccurs="0"/>
-          <xs:element name="rolledBack" type="xs:boolean" minOccurs="0"/>
-        </xs:sequence>
-      </xs:complexType>
-      <xs:complexType name="queryVnf">
-        <xs:sequence>
-          <xs:element name="cloudSiteId" type="xs:string"/>
-          <xs:element name="tenantId" type="xs:string"/>
-          <xs:element name="vnfName" type="xs:string"/>
-          <xs:element name="request" type="tns:msoRequest" minOccurs="0"/>
-        </xs:sequence>
-      </xs:complexType>
-      <xs:complexType name="queryVnfResponse">
-        <xs:sequence>
-          <xs:element name="vnfExists" type="xs:boolean" minOccurs="0"/>
-          <xs:element name="vnfId" type="xs:string" minOccurs="0"/>
-          <xs:element name="status" type="tns:vnfStatus" minOccurs="0"/>
-          <xs:element name="outputs">
-            <xs:complexType>
-              <xs:sequence>
-                <xs:element name="entry" minOccurs="0" maxOccurs="unbounded">
-                  <xs:complexType>
-                    <xs:sequence>
-                      <xs:element name="key" minOccurs="0" type="xs:string"/>
-                      <xs:element name="value" minOccurs="0" type="xs:string"/>
-                    </xs:sequence>
-                  </xs:complexType>
-                </xs:element>
-              </xs:sequence>
-            </xs:complexType>
-          </xs:element>
-        </xs:sequence>
-      </xs:complexType>
-      <xs:complexType name="createVnf">
-        <xs:sequence>
-          <xs:element name="cloudSiteId" type="xs:string"/>
-          <xs:element name="tenantId" type="xs:string"/>
-          <xs:element name="vnfType" type="xs:string"/>
-          <xs:element name="vnfVersion" type="xs:string" minOccurs="0"/>
-          <xs:element name="vnfName" type="xs:string"/>
-          <xs:element name="inputs">
-            <xs:complexType>
-              <xs:sequence>
-                <xs:element name="entry" minOccurs="0" maxOccurs="unbounded">
-                  <xs:complexType>
-                    <xs:sequence>
-                      <xs:element name="key" minOccurs="0" type="xs:string"/>
-                      <xs:element name="value" minOccurs="0" type="xs:string"/>
-                    </xs:sequence>
-                  </xs:complexType>
-                </xs:element>
-              </xs:sequence>
-            </xs:complexType>
-          </xs:element>
-          <xs:element name="failIfExists" type="xs:boolean" minOccurs="0"/>
-          <xs:element name="request" type="tns:msoRequest" minOccurs="0"/>
-        </xs:sequence>
-      </xs:complexType>
-      <xs:complexType name="createVnfResponse">
-        <xs:sequence>
-          <xs:element name="vnfId" type="xs:string" minOccurs="0"/>
-          <xs:element name="outputs">
-            <xs:complexType>
-              <xs:sequence>
-                <xs:element name="entry" minOccurs="0" maxOccurs="unbounded">
-                  <xs:complexType>
-                    <xs:sequence>
-                      <xs:element name="key" minOccurs="0" type="xs:string"/>
-                      <xs:element name="value" minOccurs="0" type="xs:string"/>
-                    </xs:sequence>
-                  </xs:complexType>
-                </xs:element>
-              </xs:sequence>
-            </xs:complexType>
-          </xs:element>
-          <xs:element name="rollback" type="tns:vnfRollback" minOccurs="0"/>
-        </xs:sequence>
-      </xs:complexType>
-      <xs:complexType name="vnfRollback">
-        <xs:sequence>
-          <xs:element name="cloudSiteId" type="xs:string" minOccurs="0"/>
-          <xs:element name="msoRequest" type="tns:msoRequest" minOccurs="0"/>
-          <xs:element name="tenantCreated" type="xs:boolean"/>
-          <xs:element name="tenantId" type="xs:string" minOccurs="0"/>
-          <xs:element name="vnfCreated" type="xs:boolean"/>
-          <xs:element name="vnfId" type="xs:string" minOccurs="0"/>
-        </xs:sequence>
-      </xs:complexType>
-      <xs:complexType name="rollbackVnf">
-        <xs:sequence>
-          <xs:element name="rollback" type="tns:vnfRollback"/>
-        </xs:sequence>
-      </xs:complexType>
-      <xs:complexType name="rollbackVnfResponse">
-        <xs:sequence/>
-      </xs:complexType>
-      <xs:complexType name="updateVnf">
-        <xs:sequence>
-          <xs:element name="cloudSiteId" type="xs:string"/>
-          <xs:element name="tenantId" type="xs:string"/>
-          <xs:element name="vnfType" type="xs:string"/>
-          <xs:element name="vnfVersion" type="xs:string" minOccurs="0"/>
-          <xs:element name="vnfName" type="xs:string"/>
-          <xs:element name="inputs">
-            <xs:complexType>
-              <xs:sequence>
-                <xs:element name="entry" minOccurs="0" maxOccurs="unbounded">
-                  <xs:complexType>
-                    <xs:sequence>
-                      <xs:element name="key" minOccurs="0" type="xs:string"/>
-                      <xs:element name="value" minOccurs="0" type="xs:string"/>
-                    </xs:sequence>
-                  </xs:complexType>
-                </xs:element>
-              </xs:sequence>
-            </xs:complexType>
-          </xs:element>
-          <xs:element name="request" type="tns:msoRequest" minOccurs="0"/>
-        </xs:sequence>
-      </xs:complexType>
-      <xs:complexType name="updateVnfResponse">
-        <xs:sequence>
-          <xs:element name="outputs">
-            <xs:complexType>
-              <xs:sequence>
-                <xs:element name="entry" minOccurs="0" maxOccurs="unbounded">
-                  <xs:complexType>
-                    <xs:sequence>
-                      <xs:element name="key" minOccurs="0" type="xs:string"/>
-                      <xs:element name="value" minOccurs="0" type="xs:string"/>
-                    </xs:sequence>
-                  </xs:complexType>
-                </xs:element>
-              </xs:sequence>
-            </xs:complexType>
-          </xs:element>
-          <xs:element name="rollback" type="tns:vnfRollback" minOccurs="0"/>
-        </xs:sequence>
-      </xs:complexType>
-      <xs:simpleType name="msoExceptionCategory">
-        <xs:restriction base="xs:string">
-          <xs:enumeration value="OPENSTACK"/>
-          <xs:enumeration value="IO"/>
-          <xs:enumeration value="INTERNAL"/>
-          <xs:enumeration value="USERDATA"/>
-        </xs:restriction>
-      </xs:simpleType>
-      <xs:simpleType name="vnfStatus">
-        <xs:restriction base="xs:string">
-          <xs:enumeration value="ACTIVE"/>
-          <xs:enumeration value="FAILED"/>
-          <xs:enumeration value="NOTFOUND"/>
-          <xs:enumeration value="UNKNOWN"/>
-        </xs:restriction>
-      </xs:simpleType>
-    </xs:schema>
-  </types>
-  <message name="createVnf">
-    <part name="parameters" element="tns:createVnf"/>
-  </message>
-  <message name="createVnfResponse">
-    <part name="parameters" element="tns:createVnfResponse"/>
-  </message>
-  <message name="VnfException">
-    <part name="fault" element="tns:VnfException"/>
-  </message>
-  <message name="VnfAlreadyExists">
-    <part name="fault" element="tns:VnfAlreadyExists"/>
-  </message>
-  <message name="healthCheck">
-    <part name="parameters" element="tns:healthCheck"/>
-  </message>
-  <message name="healthCheckResponse">
-    <part name="parameters" element="tns:healthCheckResponse"/>
-  </message>
-  <message name="updateVnf">
-    <part name="parameters" element="tns:updateVnf"/>
-  </message>
-  <message name="updateVnfResponse">
-    <part name="parameters" element="tns:updateVnfResponse"/>
-  </message>
-  <message name="queryVnf">
-    <part name="parameters" element="tns:queryVnf"/>
-  </message>
-  <message name="queryVnfResponse">
-    <part name="parameters" element="tns:queryVnfResponse"/>
-  </message>
-  <message name="deleteVnf">
-    <part name="parameters" element="tns:deleteVnf"/>
-  </message>
-  <message name="deleteVnfResponse">
-    <part name="parameters" element="tns:deleteVnfResponse"/>
-  </message>
-  <message name="rollbackVnf">
-    <part name="parameters" element="tns:rollbackVnf"/>
-  </message>
-  <message name="rollbackVnfResponse">
-    <part name="parameters" element="tns:rollbackVnfResponse"/>
-  </message>
-  <portType name="VnfAdapter">
-    <operation name="createVnf">
-      <input wsam:Action="http://org.openecomp.mso/vnf/VnfAdapter/createVnfRequest" message="tns:createVnf"/>
-      <output wsam:Action="http://org.openecomp.mso/vnf/VnfAdapter/createVnfResponse" message="tns:createVnfResponse"/>
-      <fault message="tns:VnfException" name="VnfException" wsam:Action="http://org.openecomp.mso/vnf/VnfAdapter/createVnf/Fault/VnfException"/>
-      <fault message="tns:VnfAlreadyExists" name="VnfAlreadyExists" wsam:Action="http://org.openecomp.mso/vnf/VnfAdapter/createVnf/Fault/VnfAlreadyExists"/>
-    </operation>
-    <operation name="healthCheck">
-      <input wsam:Action="http://org.openecomp.mso/vnf/VnfAdapter/healthCheckRequest" message="tns:healthCheck"/>
-      <output wsam:Action="http://org.openecomp.mso/vnf/VnfAdapter/healthCheckResponse" message="tns:healthCheckResponse"/>
-    </operation>
-    <operation name="updateVnf">
-      <input wsam:Action="http://org.openecomp.mso/vnf/VnfAdapter/updateVnfRequest" message="tns:updateVnf"/>
-      <output wsam:Action="http://org.openecomp.mso/vnf/VnfAdapter/updateVnfResponse" message="tns:updateVnfResponse"/>
-      <fault message="tns:VnfException" name="VnfException" wsam:Action="http://org.openecomp.mso/vnf/VnfAdapter/updateVnf/Fault/VnfException"/>
-    </operation>
-    <operation name="queryVnf">
-      <input wsam:Action="http://org.openecomp.mso/vnf/VnfAdapter/queryVnfRequest" message="tns:queryVnf"/>
-      <output wsam:Action="http://org.openecomp.mso/vnf/VnfAdapter/queryVnfResponse" message="tns:queryVnfResponse"/>
-      <fault message="tns:VnfException" name="VnfException" wsam:Action="http://org.openecomp.mso/vnf/VnfAdapter/queryVnf/Fault/VnfException"/>
-    </operation>
-    <operation name="deleteVnf">
-      <input wsam:Action="http://org.openecomp.mso/vnf/VnfAdapter/deleteVnfRequest" message="tns:deleteVnf"/>
-      <output wsam:Action="http://org.openecomp.mso/vnf/VnfAdapter/deleteVnfResponse" message="tns:deleteVnfResponse"/>
-      <fault message="tns:VnfException" name="VnfException" wsam:Action="http://org.openecomp.mso/vnf/VnfAdapter/deleteVnf/Fault/VnfException"/>
-    </operation>
-    <operation name="rollbackVnf">
-      <input wsam:Action="http://org.openecomp.mso/vnf/VnfAdapter/rollbackVnfRequest" message="tns:rollbackVnf"/>
-      <output wsam:Action="http://org.openecomp.mso/vnf/VnfAdapter/rollbackVnfResponse" message="tns:rollbackVnfResponse"/>
-      <fault message="tns:VnfException" name="VnfException" wsam:Action="http://org.openecomp.mso/vnf/VnfAdapter/rollbackVnf/Fault/VnfException"/>
-    </operation>
-  </portType>
-  <binding name="MsoVnfAdapterImplPortBinding" type="tns:VnfAdapter">
-    <soap:binding transport="http://schemas.xmlsoap.org/soap/http" style="document"/>
-    <operation name="createVnf">
-      <soap:operation soapAction=""/>
-      <input>
-        <soap:body use="literal"/>
-      </input>
-      <output>
-        <soap:body use="literal"/>
-      </output>
-      <fault name="VnfException">
-        <soap:fault name="VnfException" use="literal"/>
-      </fault>
-      <fault name="VnfAlreadyExists">
-        <soap:fault name="VnfAlreadyExists" use="literal"/>
-      </fault>
-    </operation>
-    <operation name="healthCheck">
-      <soap:operation soapAction=""/>
-      <input>
-        <soap:body use="literal"/>
-      </input>
-      <output>
-        <soap:body use="literal"/>
-      </output>
-    </operation>
-    <operation name="updateVnf">
-      <soap:operation soapAction=""/>
-      <input>
-        <soap:body use="literal"/>
-      </input>
-      <output>
-        <soap:body use="literal"/>
-      </output>
-      <fault name="VnfException">
-        <soap:fault name="VnfException" use="literal"/>
-      </fault>
-    </operation>
-    <operation name="queryVnf">
-      <soap:operation soapAction=""/>
-      <input>
-        <soap:body use="literal"/>
-      </input>
-      <output>
-        <soap:body use="literal"/>
-      </output>
-      <fault name="VnfException">
-        <soap:fault name="VnfException" use="literal"/>
-      </fault>
-    </operation>
-    <operation name="deleteVnf">
-      <soap:operation soapAction=""/>
-      <input>
-        <soap:body use="literal"/>
-      </input>
-      <output>
-        <soap:body use="literal"/>
-      </output>
-      <fault name="VnfException">
-        <soap:fault name="VnfException" use="literal"/>
-      </fault>
-    </operation>
-    <operation name="rollbackVnf">
-      <soap:operation soapAction=""/>
-      <input>
-        <soap:body use="literal"/>
-      </input>
-      <output>
-        <soap:body use="literal"/>
-      </output>
-      <fault name="VnfException">
-        <soap:fault name="VnfException" use="literal"/>
-      </fault>
-    </operation>
-  </binding>
-  <service name="VnfAdapter">
-    <port name="MsoVnfAdapterImplPort" binding="tns:MsoVnfAdapterImplPortBinding">
-      <soap:address location="REPLACE_WITH_ACTUAL_URL"/>
-    </port>
-  </service>
-</definitions>]]></con:content><con:type>http://schemas.xmlsoap.org/wsdl/</con:type></con:part></con:definitionCache><con:endpoints><con:endpoint>REPLACE_WITH_ACTUAL_URL</con:endpoint></con:endpoints><con:operation id="b545611c-10af-4376-8828-320559ee74e3" isOneWay="false" action="" name="createVnf" bindingOperationName="createVnf" type="Request-Response" inputName="" receivesAttachments="false" sendsAttachments="false" anonymous="optional"><con:settings/><con:call id="2671a8f5-d5f9-45d2-9826-fb3b37b8757c" name="CreateVNF"><con:settings><con:setting id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers">&lt;xml-fragment/></con:setting></con:settings><con:encoding>UTF-8</con:encoding><con:endpoint>http://${#Project#host}/vnfs/VnfAdapter</con:endpoint><con:request><![CDATA[<soapenv:Envelope xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/" xmlns:vnf="http://org.openecomp.mso/vnf">\r
-   <soapenv:Header/>\r
-   <soapenv:Body>\r
-      <vnf:createVnf>\r
-         <cloudSiteId>Toto</cloudSiteId>\r
-         <tenantId>tenant</tenantId>\r
-         <vnfType>VF</vnfType>\r
-         <!--Optional:-->\r
-         <vnfVersion>1</vnfVersion>\r
-         <vnfName>Turlututu</vnfName>\r
-         <inputs>\r
-            <!--Zero or more repetitions:-->\r
-            <entry>\r
-               <!--Optional:-->\r
-               <key>key1</key>\r
-               <!--Optional:-->\r
-               <value>value1</value>\r
-            </entry>\r
-         </inputs>\r
-         <!--Optional:-->\r
-         <failIfExists>true</failIfExists>\r
-         <!--Optional:-->\r
-         <request>\r
-            <!--Optional:-->\r
-            <requestId>reqSoapUI</requestId>\r
-            <!--Optional:-->\r
-            <serviceInstanceId>servSoapUI</serviceInstanceId>\r
-         </request>\r
-      </vnf:createVnf>\r
-   </soapenv:Body>\r
-</soapenv:Envelope>]]></con:request><con:credentials><con:username>BPELClient</con:username><con:password>password1$</con:password><con:selectedAuthProfile>Basic</con:selectedAuthProfile><con:addedBasicAuthenticationTypes>Basic</con:addedBasicAuthenticationTypes><con:authType>Global HTTP Settings</con:authType></con:credentials><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:wsaConfig mustUnderstand="NONE" version="200508" action="http://org.openecomp.mso/vnf/VnfAdapter/createVnfRequest"/><con:wsrmConfig version="1.2"/></con:call></con:operation><con:operation id="b34239df-f801-4541-acd1-02a113005d09" isOneWay="false" action="" name="deleteVnf" bindingOperationName="deleteVnf" type="Request-Response" inputName="" receivesAttachments="false" sendsAttachments="false" anonymous="optional"><con:settings/><con:call id="85399339-b09e-4925-b255-b56104c33886" name="Request 1"><con:settings/><con:encoding>UTF-8</con:encoding><con:endpoint>REPLACE_WITH_ACTUAL_URL</con:endpoint><con:request><![CDATA[<soapenv:Envelope xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/" xmlns:vnf="http://org.openecomp.mso/vnf">\r
-   <soapenv:Header/>\r
-   <soapenv:Body>\r
-      <vnf:deleteVnf>\r
-         <cloudSiteId>?</cloudSiteId>\r
-         <tenantId>?</tenantId>\r
-         <vnfName>?</vnfName>\r
-         <!--Optional:-->\r
-         <request>\r
-            <!--Optional:-->\r
-            <requestId>?</requestId>\r
-            <!--Optional:-->\r
-            <serviceInstanceId>?</serviceInstanceId>\r
-         </request>\r
-      </vnf:deleteVnf>\r
-   </soapenv:Body>\r
-</soapenv:Envelope>]]></con:request><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:wsaConfig mustUnderstand="NONE" version="200508" action="http://org.openecomp.mso/vnf/VnfAdapter/deleteVnfRequest"/></con:call></con:operation><con:operation id="9c0286b4-146d-4190-bac2-3450d179b238" isOneWay="false" action="" name="healthCheck" bindingOperationName="healthCheck" type="Request-Response" inputName="" receivesAttachments="false" sendsAttachments="false" anonymous="optional"><con:settings/><con:call id="9c7a5ae0-0b95-45ab-b0c7-b084c1f564c8" name="Request 1"><con:settings/><con:encoding>UTF-8</con:encoding><con:endpoint>REPLACE_WITH_ACTUAL_URL</con:endpoint><con:request><![CDATA[<soapenv:Envelope xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/" xmlns:vnf="http://org.openecomp.mso/vnf">\r
-   <soapenv:Header/>\r
-   <soapenv:Body>\r
-      <vnf:healthCheck/>\r
-   </soapenv:Body>\r
-</soapenv:Envelope>]]></con:request><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:wsaConfig mustUnderstand="NONE" version="200508" action="http://org.openecomp.mso/vnf/VnfAdapter/healthCheckRequest"/></con:call></con:operation><con:operation id="faef04de-f492-4831-ad4d-c9ec3f43346b" isOneWay="false" action="" name="queryVnf" bindingOperationName="queryVnf" type="Request-Response" inputName="" receivesAttachments="false" sendsAttachments="false" anonymous="optional"><con:settings/><con:call id="d0ce94d9-16d8-4f8c-bc6f-538e8affeabf" name="Request 1"><con:settings/><con:encoding>UTF-8</con:encoding><con:endpoint>REPLACE_WITH_ACTUAL_URL</con:endpoint><con:request><![CDATA[<soapenv:Envelope xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/" xmlns:vnf="http://org.openecomp.mso/vnf">\r
-   <soapenv:Header/>\r
-   <soapenv:Body>\r
-      <vnf:queryVnf>\r
-         <cloudSiteId>?</cloudSiteId>\r
-         <tenantId>?</tenantId>\r
-         <vnfName>?</vnfName>\r
-         <!--Optional:-->\r
-         <request>\r
-            <!--Optional:-->\r
-            <requestId>?</requestId>\r
-            <!--Optional:-->\r
-            <serviceInstanceId>?</serviceInstanceId>\r
-         </request>\r
-      </vnf:queryVnf>\r
-   </soapenv:Body>\r
-</soapenv:Envelope>]]></con:request><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:wsaConfig mustUnderstand="NONE" version="200508" action="http://org.openecomp.mso/vnf/VnfAdapter/queryVnfRequest"/></con:call></con:operation><con:operation id="c72d2d3f-a9cd-46ee-9b44-e880f0b8429d" isOneWay="false" action="" name="rollbackVnf" bindingOperationName="rollbackVnf" type="Request-Response" inputName="" receivesAttachments="false" sendsAttachments="false" anonymous="optional"><con:settings/><con:call id="fa939945-151c-4a72-b476-5d65551fd483" name="Request 1"><con:settings/><con:encoding>UTF-8</con:encoding><con:endpoint>REPLACE_WITH_ACTUAL_URL</con:endpoint><con:request><![CDATA[<soapenv:Envelope xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/" xmlns:vnf="http://org.openecomp.mso/vnf">\r
-   <soapenv:Header/>\r
-   <soapenv:Body>\r
-      <vnf:rollbackVnf>\r
-         <rollback>\r
-            <!--Optional:-->\r
-            <cloudSiteId>?</cloudSiteId>\r
-            <!--Optional:-->\r
-            <msoRequest>\r
-               <!--Optional:-->\r
-               <requestId>?</requestId>\r
-               <!--Optional:-->\r
-               <serviceInstanceId>?</serviceInstanceId>\r
-            </msoRequest>\r
-            <tenantCreated>?</tenantCreated>\r
-            <!--Optional:-->\r
-            <tenantId>?</tenantId>\r
-            <vnfCreated>?</vnfCreated>\r
-            <!--Optional:-->\r
-            <vnfId>?</vnfId>\r
-         </rollback>\r
-      </vnf:rollbackVnf>\r
-   </soapenv:Body>\r
-</soapenv:Envelope>]]></con:request><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:wsaConfig mustUnderstand="NONE" version="200508" action="http://org.openecomp.mso/vnf/VnfAdapter/rollbackVnfRequest"/></con:call></con:operation><con:operation id="8835ef36-b71c-470b-9a83-9fdf2bef7fe9" isOneWay="false" action="" name="updateVnf" bindingOperationName="updateVnf" type="Request-Response" inputName="" receivesAttachments="false" sendsAttachments="false" anonymous="optional"><con:settings/><con:call id="f056db27-1843-47d1-a17f-bae1d74571b5" name="Request 1"><con:settings/><con:encoding>UTF-8</con:encoding><con:endpoint>REPLACE_WITH_ACTUAL_URL</con:endpoint><con:request><![CDATA[<soapenv:Envelope xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/" xmlns:vnf="http://org.openecomp.mso/vnf">\r
-   <soapenv:Header/>\r
-   <soapenv:Body>\r
-      <vnf:updateVnf>\r
-         <cloudSiteId>?</cloudSiteId>\r
-         <tenantId>?</tenantId>\r
-         <vnfType>?</vnfType>\r
-         <!--Optional:-->\r
-         <vnfVersion>?</vnfVersion>\r
-         <vnfName>?</vnfName>\r
-         <inputs>\r
-            <!--Zero or more repetitions:-->\r
-            <entry>\r
-               <!--Optional:-->\r
-               <key>?</key>\r
-               <!--Optional:-->\r
-               <value>?</value>\r
-            </entry>\r
-         </inputs>\r
-         <!--Optional:-->\r
-         <request>\r
-            <!--Optional:-->\r
-            <requestId>?</requestId>\r
-            <!--Optional:-->\r
-            <serviceInstanceId>?</serviceInstanceId>\r
-         </request>\r
-      </vnf:updateVnf>\r
-   </soapenv:Body>\r
-</soapenv:Envelope>]]></con:request><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:wsaConfig mustUnderstand="NONE" version="200508" action="http://org.openecomp.mso/vnf/VnfAdapter/updateVnfRequest"/></con:call></con:operation></con:interface><con:testSuite id="dc83900f-87f1-4ea2-8930-200f41748686" name="MsoVnfAdapter TestSuite"><con:settings/><con:runType>SEQUENTIAL</con:runType><con:testCase id="abceaa02-5d09-469f-9b23-f3646a3090c8" failOnError="true" failTestCaseOnErrors="true" keepSession="false" maxResults="0" name="createVnf TestCase" searchProperties="true"><con:settings/><con:testStep type="request" id="96605331-616d-411c-b4a9-9f2a6d6fdde1" name="createVnf"><con:settings/><con:config xsi:type="con:RequestStep" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"><con:interface>MsoVnfAdapterImplPortBinding</con:interface><con:operation>createVnf</con:operation><con:request name="createVnf" outgoingWss="" incomingWss="" timeout="" sslKeystore="" useWsAddressing="false" useWsReliableMessaging="false" wssPasswordType="" id="67ec8acf-ac98-464e-b242-f6e4f1616ae9"><con:settings><con:setting id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers">&lt;xml-fragment/></con:setting></con:settings><con:encoding>UTF-8</con:encoding><con:endpoint>http://${#Project#host}/vnfs/VnfAdapter</con:endpoint><con:request><![CDATA[<soapenv:Envelope xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/" xmlns:vnf="http://org.openecomp.mso/vnf">
-   <soapenv:Header/>
-   <soapenv:Body>
-      <vnf:createVnf>
-         <cloudSiteId>Toto</cloudSiteId>
-         <tenantId>tenant</tenantId>
-         <vnfType>VF</vnfType>
-         <!--Optional:-->
-         <vnfVersion>1</vnfVersion>
-         <vnfName>Turlututu</vnfName>
-         <inputs>
-            <!--Zero or more repetitions:-->
-            <entry>
-               <!--Optional:-->
-               <key>key1</key>
-               <!--Optional:-->
-               <value>value1</value>
-            </entry>
-         </inputs>
-         <!--Optional:-->
-         <failIfExists>true</failIfExists>
-         <!--Optional:-->
-         <request>
-            <!--Optional:-->
-            <requestId>reqSoapUI</requestId>
-            <!--Optional:-->
-            <serviceInstanceId>servSoapUI</serviceInstanceId>
-         </request>
-      </vnf:createVnf>
-   </soapenv:Body>
-</soapenv:Envelope>]]></con:request><con:assertion type="Not SOAP Fault Assertion" id="d6b707c9-ac60-4213-8dbf-2076021e50e4" name="SOAP Fault"/><con:assertion type="Simple Contains" id="6915f4e4-13cc-4006-9760-937a45300135" name="Contains"><con:configuration><token>&lt;message>[CreateVFModule] Cloud Site [Toto] not found&lt;/message></token><ignoreCase>false</ignoreCase><useRegEx>false</useRegEx></con:configuration></con:assertion><con:credentials><con:username>BPELClient</con:username><con:password>password1$</con:password><con:selectedAuthProfile>Basic</con:selectedAuthProfile><con:addedBasicAuthenticationTypes>Basic</con:addedBasicAuthenticationTypes><con:authType>Global HTTP Settings</con:authType></con:credentials><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:wsaConfig mustUnderstand="NONE" version="200508" action="http://org.openecomp.mso/vnf/VnfAdapter/createVnfRequest"/><con:wsrmConfig version="1.2"/></con:request></con:config></con:testStep><con:testStep type="request" id="c346b2f5-fea4-4665-a503-8d827aefa503" name="createVnf no name"><con:settings/><con:config xsi:type="con:RequestStep" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"><con:interface>MsoVnfAdapterImplPortBinding</con:interface><con:operation>createVnf</con:operation><con:request name="createVnf no name" outgoingWss="" incomingWss="" timeout="" sslKeystore="" useWsAddressing="false" useWsReliableMessaging="false" wssPasswordType="" id="67ec8acf-ac98-464e-b242-f6e4f1616ae9"><con:settings><con:setting id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers">&lt;xml-fragment/></con:setting></con:settings><con:encoding>UTF-8</con:encoding><con:endpoint>http://${#Project#host}/vnfs/VnfAdapter</con:endpoint><con:request><![CDATA[<soapenv:Envelope xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/" xmlns:vnf="http://org.openecomp.mso/vnf">
-   <soapenv:Header/>
-   <soapenv:Body>
-      <vnf:createVnf>
-         <cloudSiteId>MT</cloudSiteId>
-         <tenantId>tenant</tenantId>
-         <vnfType>VF</vnfType>
-         <!--Optional:-->
-         <vnfVersion>1</vnfVersion>
-         <vnfName/>
-         <inputs>
-            <!--Zero or more repetitions:-->
-            <entry>
-               <!--Optional:-->
-               <key>key1</key>
-               <!--Optional:-->
-               <value>value1</value>
-            </entry>
-         </inputs>
-         <!--Optional:-->
-         <failIfExists>true</failIfExists>
-         <!--Optional:-->
-         <request>
-            <!--Optional:-->
-            <requestId>reqSoapUI</requestId>
-            <!--Optional:-->
-            <serviceInstanceId>servSoapUI</serviceInstanceId>
-         </request>
-      </vnf:createVnf>
-   </soapenv:Body>
-</soapenv:Envelope>]]></con:request><con:assertion type="Not SOAP Fault Assertion" id="d6b707c9-ac60-4213-8dbf-2076021e50e4" name="SOAP Fault"/><con:assertion type="Simple Contains" id="6915f4e4-13cc-4006-9760-937a45300135" name="Contains"><con:configuration><token>failed: Connection refused</token><ignoreCase>false</ignoreCase><useRegEx>false</useRegEx></con:configuration></con:assertion><con:credentials><con:username>BPELClient</con:username><con:password>password1$</con:password><con:selectedAuthProfile>Basic</con:selectedAuthProfile><con:addedBasicAuthenticationTypes>Basic</con:addedBasicAuthenticationTypes><con:authType>Global HTTP Settings</con:authType></con:credentials><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:wsaConfig mustUnderstand="NONE" version="200508" action="http://org.openecomp.mso/vnf/VnfAdapter/createVnfRequest"/><con:wsrmConfig version="1.2"/></con:request></con:config></con:testStep><con:properties/></con:testCase><con:testCase id="3d197248-7223-4422-99d8-13c9e3722dd8" failOnError="true" failTestCaseOnErrors="true" keepSession="false" maxResults="0" name="deleteVnf TestCase" searchProperties="true"><con:settings/><con:testStep type="request" id="e3ee2457-84d0-48ca-a946-c2049731e279" name="deleteVnf"><con:settings/><con:config xsi:type="con:RequestStep" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"><con:interface>MsoVnfAdapterImplPortBinding</con:interface><con:operation>deleteVnf</con:operation><con:request name="deleteVnf" outgoingWss="" incomingWss="" timeout="" sslKeystore="" useWsAddressing="false" useWsReliableMessaging="false" wssPasswordType="" id="02a9e934-d2f7-41c4-b186-ccd55f481de1"><con:settings><con:setting id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers">&lt;xml-fragment/></con:setting></con:settings><con:encoding>UTF-8</con:encoding><con:endpoint>http://${#Project#host}/vnfs/VnfAdapter</con:endpoint><con:request><![CDATA[<soapenv:Envelope xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/" xmlns:vnf="http://org.openecomp.mso/vnf">\r
-   <soapenv:Header/>\r
-   <soapenv:Body>\r
-      <vnf:deleteVnf>\r
-         <cloudSiteId>MT</cloudSiteId>\r
-         <tenantId>tenant</tenantId>\r
-         <vnfName>name</vnfName>\r
-         <!--Optional:-->\r
-         <request>\r
-            <!--Optional:-->\r
-            <requestId>reqSoapUI</requestId>\r
-            <!--Optional:-->\r
-            <serviceInstanceId>servSoapUI</serviceInstanceId>\r
-         </request>\r
-      </vnf:deleteVnf>\r
-   </soapenv:Body>\r
-</soapenv:Envelope>]]></con:request><con:assertion type="Not SOAP Fault Assertion" id="3b17740f-67dd-4e9b-8555-5408bbb1316f" name="SOAP Fault"/><con:assertion type="Simple Contains" id="27b5579f-dfdc-44e0-bc7c-25060bf19302" name="Contains"><con:configuration><token>failed: Connection refused</token><ignoreCase>false</ignoreCase><useRegEx>false</useRegEx></con:configuration></con:assertion><con:credentials><con:username>BPELClient</con:username><con:password>password1$</con:password><con:selectedAuthProfile>Basic</con:selectedAuthProfile><con:addedBasicAuthenticationTypes>Basic</con:addedBasicAuthenticationTypes><con:authType>Global HTTP Settings</con:authType></con:credentials><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:wsaConfig mustUnderstand="NONE" version="200508" action="http://org.openecomp.mso/vnf/VnfAdapter/deleteVnfRequest"/><con:wsrmConfig version="1.2"/></con:request></con:config></con:testStep><con:properties/></con:testCase><con:testCase id="a42192f9-e3c0-44dc-98b6-d5fcc977e56e" failOnError="true" failTestCaseOnErrors="true" keepSession="false" maxResults="0" name="healthCheck TestCase" searchProperties="true"><con:settings/><con:testStep type="request" id="0b08733f-3e6e-4ed6-93b4-85ee5657bcf2" name="healthCheck"><con:settings/><con:config xsi:type="con:RequestStep" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"><con:interface>MsoVnfAdapterImplPortBinding</con:interface><con:operation>healthCheck</con:operation><con:request name="healthCheck" outgoingWss="" incomingWss="" timeout="" sslKeystore="" useWsAddressing="false" useWsReliableMessaging="false" wssPasswordType="" id="4a2436e1-77b6-4fe4-a837-a3146cdc6bba"><con:settings><con:setting id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers">&lt;xml-fragment/></con:setting></con:settings><con:encoding>UTF-8</con:encoding><con:endpoint>http://${#Project#host}/vnfs/VnfAdapter</con:endpoint><con:request><![CDATA[<soapenv:Envelope xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/" xmlns:vnf="http://org.openecomp.mso/vnf">\r
-   <soapenv:Header/>\r
-   <soapenv:Body>\r
-      <vnf:healthCheck/>\r
-   </soapenv:Body>\r
-</soapenv:Envelope>]]></con:request><con:assertion type="Valid HTTP Status Codes" id="92219146-442f-48c5-9b1a-d9d52655f689" name="Valid HTTP Status Codes"><con:configuration><codes>200</codes></con:configuration></con:assertion><con:credentials><con:username>BPELClient</con:username><con:password>password1$</con:password><con:selectedAuthProfile>Basic</con:selectedAuthProfile><con:addedBasicAuthenticationTypes>Basic</con:addedBasicAuthenticationTypes><con:authType>Global HTTP Settings</con:authType></con:credentials><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:wsaConfig mustUnderstand="NONE" version="200508" action="http://org.openecomp.mso/vnf/VnfAdapter/healthCheckRequest"/><con:wsrmConfig version="1.2"/></con:request></con:config></con:testStep><con:properties/></con:testCase><con:testCase id="fbc5a034-b5b3-4038-a4d8-c52423957e3b" failOnError="true" failTestCaseOnErrors="true" keepSession="false" maxResults="0" name="queryVnf TestCase" searchProperties="true"><con:settings/><con:testStep type="request" id="4a41a857-6faa-48cb-b346-bf00e712d18f" name="queryVnf"><con:settings/><con:config xsi:type="con:RequestStep" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"><con:interface>MsoVnfAdapterImplPortBinding</con:interface><con:operation>queryVnf</con:operation><con:request name="queryVnf" outgoingWss="" incomingWss="" timeout="" sslKeystore="" useWsAddressing="false" useWsReliableMessaging="false" wssPasswordType="" id="07944f97-f417-423a-bee6-faa10ff6595b"><con:settings><con:setting id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers">&lt;xml-fragment/></con:setting></con:settings><con:encoding>UTF-8</con:encoding><con:endpoint>http://${#Project#host}/vnfs/VnfAdapter</con:endpoint><con:request><![CDATA[<soapenv:Envelope xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/" xmlns:vnf="http://org.openecomp.mso/vnf">\r
-   <soapenv:Header/>\r
-   <soapenv:Body>\r
-      <vnf:queryVnf>\r
-         <cloudSiteId>MT</cloudSiteId>\r
-         <tenantId>tt</tenantId>\r
-         <vnfName>vv</vnfName>\r
-         <!--Optional:-->\r
-         <request>\r
-            <!--Optional:-->\r
-            <requestId>req</requestId>\r
-            <!--Optional:-->\r
-            <serviceInstanceId>serv</serviceInstanceId>\r
-         </request>\r
-      </vnf:queryVnf>\r
-   </soapenv:Body>\r
-</soapenv:Envelope>]]></con:request><con:assertion type="Not SOAP Fault Assertion" id="e619b7e7-6ea3-4fe3-b0f2-ad2db613da07" name="SOAP Fault"/><con:assertion type="Simple Contains" id="6f267d05-5676-43cd-91b7-119796a313ce" name="Contains"><con:configuration><token>failed: Connection refused</token><ignoreCase>false</ignoreCase><useRegEx>false</useRegEx></con:configuration></con:assertion><con:credentials><con:username>BPELClient</con:username><con:password>password1$</con:password><con:selectedAuthProfile>Basic</con:selectedAuthProfile><con:addedBasicAuthenticationTypes>Basic</con:addedBasicAuthenticationTypes><con:authType>Global HTTP Settings</con:authType></con:credentials><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:wsaConfig mustUnderstand="NONE" version="200508" action="http://org.openecomp.mso/vnf/VnfAdapter/queryVnfRequest"/><con:wsrmConfig version="1.2"/></con:request></con:config></con:testStep><con:properties/></con:testCase><con:testCase id="0ddf3b96-c253-432a-a475-65d5b00969e1" failOnError="true" failTestCaseOnErrors="true" keepSession="false" maxResults="0" name="rollbackVnf TestCase" searchProperties="true"><con:settings/><con:testStep type="request" id="04feea7a-3825-4496-83ce-3c34e66f6856" name="rollbackVnf"><con:settings/><con:config xsi:type="con:RequestStep" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"><con:interface>MsoVnfAdapterImplPortBinding</con:interface><con:operation>rollbackVnf</con:operation><con:request name="rollbackVnf" outgoingWss="" incomingWss="" timeout="" sslKeystore="" useWsAddressing="false" useWsReliableMessaging="false" wssPasswordType="" id="469ab0a7-9d8e-444b-b9b5-24298758fb48"><con:settings><con:setting id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers">&lt;xml-fragment/></con:setting></con:settings><con:encoding>UTF-8</con:encoding><con:endpoint>http://${#Project#host}/vnfs/VnfAdapter</con:endpoint><con:request><![CDATA[<soapenv:Envelope xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/" xmlns:vnf="http://org.openecomp.mso/vnf">\r
-   <soapenv:Header/>\r
-   <soapenv:Body>\r
-      <vnf:rollbackVnf>\r
-         <rollback>\r
-            <!--Optional:-->\r
-            <cloudSiteId>MT</cloudSiteId>\r
-            <!--Optional:-->\r
-            <msoRequest>\r
-               <!--Optional:-->\r
-               <requestId>rq</requestId>\r
-               <!--Optional:-->\r
-               <serviceInstanceId>sv</serviceInstanceId>\r
-            </msoRequest>\r
-            <tenantCreated>true</tenantCreated>\r
-            <!--Optional:-->\r
-            <tenantId>tt</tenantId>\r
-            <vnfCreated>true</vnfCreated>\r
-            <!--Optional:-->\r
-            <vnfId>vv</vnfId>\r
-         </rollback>\r
-      </vnf:rollbackVnf>\r
-   </soapenv:Body>\r
-</soapenv:Envelope>]]></con:request><con:assertion type="Not SOAP Fault Assertion" id="9d2e62ef-7de8-42cc-a7d7-ee59c50164f7" name="SOAP Fault"/><con:assertion type="Simple Contains" id="aafbdcc8-413b-42bb-b2f0-2af735146f60" name="Contains"><con:configuration><token>failed: Connection refused</token><ignoreCase>false</ignoreCase><useRegEx>false</useRegEx></con:configuration></con:assertion><con:credentials><con:username>BPELClient</con:username><con:password>password1$</con:password><con:selectedAuthProfile>Basic</con:selectedAuthProfile><con:addedBasicAuthenticationTypes>Basic</con:addedBasicAuthenticationTypes><con:authType>Global HTTP Settings</con:authType></con:credentials><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:wsaConfig mustUnderstand="NONE" version="200508" action="http://org.openecomp.mso/vnf/VnfAdapter/rollbackVnfRequest"/><con:wsrmConfig version="1.2"/></con:request></con:config></con:testStep><con:properties/></con:testCase><con:testCase id="f9b4b408-d267-4a83-9003-b4c55267aab8" failOnError="true" failTestCaseOnErrors="true" keepSession="false" maxResults="0" name="updateVnf TestCase" searchProperties="true"><con:settings/><con:testStep type="request" id="db21513a-4ae4-4284-b5b3-c53272977257" name="updateVnf"><con:settings/><con:config xsi:type="con:RequestStep" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"><con:interface>MsoVnfAdapterImplPortBinding</con:interface><con:operation>updateVnf</con:operation><con:request name="updateVnf" outgoingWss="" incomingWss="" timeout="" sslKeystore="" useWsAddressing="false" useWsReliableMessaging="false" wssPasswordType="" id="70a92e44-0841-4eec-9555-5c1beae7cbb3"><con:settings><con:setting id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers">&lt;xml-fragment/></con:setting></con:settings><con:encoding>UTF-8</con:encoding><con:endpoint>http://${#Project#host}/vnfs/VnfAdapter</con:endpoint><con:request><![CDATA[<soapenv:Envelope xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/" xmlns:vnf="http://org.openecomp.mso/vnf">\r
-   <soapenv:Header/>\r
-   <soapenv:Body>\r
-      <vnf:updateVnf>\r
-         <cloudSiteId>MT</cloudSiteId>\r
-         <tenantId>to</tenantId>\r
-         <vnfType>vo</vnfType>\r
-         <!--Optional:-->\r
-         <vnfVersion>1</vnfVersion>\r
-         <vnfName>name</vnfName>\r
-         <inputs>\r
-            <!--Zero or more repetitions:-->\r
-            <entry>\r
-               <!--Optional:-->\r
-               <key>key1</key>\r
-               <!--Optional:-->\r
-               <value>val1</value>\r
-            </entry>\r
-         </inputs>\r
-         <!--Optional:-->\r
-         <request>\r
-            <!--Optional:-->\r
-            <requestId>reqq</requestId>\r
-            <!--Optional:-->\r
-            <serviceInstanceId>servv</serviceInstanceId>\r
-         </request>\r
-      </vnf:updateVnf>\r
-   </soapenv:Body>\r
-</soapenv:Envelope>]]></con:request><con:assertion type="Not SOAP Fault Assertion" id="8c7be0ab-d1c4-4525-90f6-46427afb1454" name="SOAP Fault"/><con:assertion type="Simple Contains" id="404c82cd-ce60-4a00-adba-1486fd47a3d3" name="Contains"><con:configuration><token>failed: Connection refused</token><ignoreCase>false</ignoreCase><useRegEx>false</useRegEx></con:configuration></con:assertion><con:credentials><con:username>BPELClient</con:username><con:password>password1$</con:password><con:selectedAuthProfile>Basic</con:selectedAuthProfile><con:addedBasicAuthenticationTypes>Basic</con:addedBasicAuthenticationTypes><con:authType>Global HTTP Settings</con:authType></con:credentials><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:wsaConfig mustUnderstand="NONE" version="200508" action="http://org.openecomp.mso/vnf/VnfAdapter/updateVnfRequest"/><con:wsrmConfig version="1.2"/></con:request></con:config></con:testStep><con:properties/></con:testCase><con:properties/></con:testSuite><con:properties><con:property><con:name>host</con:name><con:value>localhost:18080</con:value></con:property></con:properties><con:wssContainer/><con:oAuth2ProfileContainer/><con:oAuth1ProfileContainer/><con:sensitiveInformation/></con:soapui-project>
\ No newline at end of file
diff --git a/packages/arquillian-unit-tests/src/test/resources/SoapUI/MsoRequestDB-soapui-project.xml b/packages/arquillian-unit-tests/src/test/resources/SoapUI/MsoRequestDB-soapui-project.xml
deleted file mode 100644
index fd68b22..0000000
--- a/packages/arquillian-unit-tests/src/test/resources/SoapUI/MsoRequestDB-soapui-project.xml
+++ /dev/null
@@ -1,377 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<con:soapui-project id="59ec1eae-57ab-4eb4-9060-6033845c3079" activeEnvironment="Default" name="MsoRequestDB" resourceRoot="" soapui-version="5.2.1" abortOnError="false" runType="SEQUENTIAL" xmlns:con="http://eviware.com/soapui/config"><con:settings/><con:interface xsi:type="con:WsdlInterface" id="245dad31-1423-4c0f-a230-e5e00dfa4ed3" wsaVersion="NONE" name="MsoRequestsDbAdapterImplPortBinding" type="wsdl" bindingName="{http://org.openecomp.mso/requestsdb}MsoRequestsDbAdapterImplPortBinding" soapVersion="1_1" anonymous="optional" definition="/RequestsDbAdapter.wsdl" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"><con:settings/><con:definitionCache type="TEXT" rootPart="file:/RequestsDbAdapter.wsdl"><con:part><con:url>file:/RequestsDbAdapter.wsdl</con:url><con:content><![CDATA[<!--Generated by JAX-WS RI at http://jax-ws.dev.java.net. RI's version is JAX-WS RI 2.2.7-b01  svn-revision#13316.-->
-<definitions targetNamespace="http://org.openecomp.mso/requestsdb" name="RequestsDbAdapter" xmlns="http://schemas.xmlsoap.org/wsdl/" xmlns:wsp="http://www.w3.org/ns/ws-policy" xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd" xmlns:wsp1_2="http://schemas.xmlsoap.org/ws/2004/09/policy" xmlns:tns="http://org.openecomp.mso/requestsdb" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:wsam="http://www.w3.org/2007/05/addressing/metadata">
-  <types>
-    <xs:schema version="1.0" targetNamespace="http://org.openecomp.mso/requestsdb" xmlns:xs="http://www.w3.org/2001/XMLSchema">
-      <xs:element name="MsoRequestsDbException" nillable="true" type="tns:msoRequestsDbExceptionBean"/>
-      <xs:element name="getInfraRequest" type="tns:getInfraRequest"/>
-      <xs:element name="getInfraRequestResponse" type="tns:getInfraRequestResponse"/>
-      <xs:element name="getSiteStatus" type="tns:getSiteStatus"/>
-      <xs:element name="getSiteStatusResponse" type="tns:getSiteStatusResponse"/>
-      <xs:element name="updateInfraRequest" type="tns:updateInfraRequest"/>
-      <xs:element name="updateInfraRequestResponse" type="tns:updateInfraRequestResponse"/>
-      <xs:complexType name="updateInfraRequest">
-        <xs:sequence>
-          <xs:element name="requestId" type="xs:string"/>
-          <xs:element name="lastModifiedBy" type="xs:string"/>
-          <xs:element name="statusMessage" type="xs:string" minOccurs="0"/>
-          <xs:element name="responseBody" type="xs:string" minOccurs="0"/>
-          <xs:element name="requestStatus" type="tns:request-status-type" minOccurs="0"/>
-          <xs:element name="progress" type="xs:string" minOccurs="0"/>
-          <xs:element name="vnfOutputs" type="xs:string" minOccurs="0"/>
-          <xs:element name="serviceInstanceId" type="xs:string" minOccurs="0"/>
-          <xs:element name="networkId" type="xs:string" minOccurs="0"/>
-          <xs:element name="vnfId" type="xs:string" minOccurs="0"/>
-          <xs:element name="vfModuleId" type="xs:string" minOccurs="0"/>
-          <xs:element name="volumeGroupId" type="xs:string" minOccurs="0"/>
-        </xs:sequence>
-      </xs:complexType>
-      <xs:complexType name="updateInfraRequestResponse">
-        <xs:sequence/>
-      </xs:complexType>
-      <xs:complexType name="msoRequestsDbExceptionBean">
-        <xs:sequence>
-          <xs:element name="message" type="xs:string" minOccurs="0"/>
-        </xs:sequence>
-      </xs:complexType>
-      <xs:complexType name="getInfraRequest">
-        <xs:sequence>
-          <xs:element name="requestId" type="xs:string"/>
-        </xs:sequence>
-      </xs:complexType>
-      <xs:complexType name="getInfraRequestResponse">
-        <xs:sequence>
-          <xs:element name="return" type="tns:infraActiveRequests" minOccurs="0"/>
-        </xs:sequence>
-      </xs:complexType>
-      <xs:complexType name="infraActiveRequests">
-        <xs:complexContent>
-          <xs:extension base="tns:infraRequests">
-            <xs:sequence/>
-          </xs:extension>
-        </xs:complexContent>
-      </xs:complexType>
-      <xs:complexType name="infraRequests">
-        <xs:sequence>
-          <xs:element name="aaiServiceId" type="xs:string" minOccurs="0"/>
-          <xs:element name="action" type="xs:string" minOccurs="0"/>
-          <xs:element name="aicCloudRegion" type="xs:string" minOccurs="0"/>
-          <xs:element name="aicNodeClli" type="xs:string" minOccurs="0"/>
-          <xs:element name="callBackUrl" type="xs:string" minOccurs="0"/>
-          <xs:element name="clientRequestId" type="xs:string" minOccurs="0"/>
-          <xs:element name="correlator" type="xs:string" minOccurs="0"/>
-          <xs:element name="endTime" type="xs:long" minOccurs="0"/>
-          <xs:element name="lastModifiedBy" type="xs:string" minOccurs="0"/>
-          <xs:element name="modifyTime" type="xs:long" minOccurs="0"/>
-          <xs:element name="networkId" type="xs:string" minOccurs="0"/>
-          <xs:element name="networkName" type="xs:string" minOccurs="0"/>
-          <xs:element name="networkType" type="xs:string" minOccurs="0"/>
-          <xs:element name="progress" type="xs:long" minOccurs="0"/>
-          <xs:element name="provStatus" type="xs:string" minOccurs="0"/>
-          <xs:element name="requestAction" type="xs:string" minOccurs="0"/>
-          <xs:element name="requestBody" type="xs:string" minOccurs="0"/>
-          <xs:element name="requestId" type="xs:string" minOccurs="0"/>
-          <xs:element name="requestScope" type="xs:string" minOccurs="0"/>
-          <xs:element name="requestStatus" type="xs:string" minOccurs="0"/>
-          <xs:element name="requestType" type="xs:string" minOccurs="0"/>
-          <xs:element name="responseBody" type="xs:string" minOccurs="0"/>
-          <xs:element name="serviceInstanceId" type="xs:string" minOccurs="0"/>
-          <xs:element name="serviceInstanceName" type="xs:string" minOccurs="0"/>
-          <xs:element name="serviceType" type="xs:string" minOccurs="0"/>
-          <xs:element name="source" type="xs:string" minOccurs="0"/>
-          <xs:element name="startTime" type="xs:long" minOccurs="0"/>
-          <xs:element name="statusMessage" type="xs:string" minOccurs="0"/>
-          <xs:element name="tenantId" type="xs:string" minOccurs="0"/>
-          <xs:element name="vfModuleId" type="xs:string" minOccurs="0"/>
-          <xs:element name="vfModuleModelName" type="xs:string" minOccurs="0"/>
-          <xs:element name="vfModuleName" type="xs:string" minOccurs="0"/>
-          <xs:element name="vnfId" type="xs:string" minOccurs="0"/>
-          <xs:element name="vnfName" type="xs:string" minOccurs="0"/>
-          <xs:element name="vnfOutputs" type="xs:string" minOccurs="0"/>
-          <xs:element name="vnfParams" type="xs:string" minOccurs="0"/>
-          <xs:element name="vnfType" type="xs:string" minOccurs="0"/>
-          <xs:element name="volumeGroupId" type="xs:string" minOccurs="0"/>
-          <xs:element name="volumeGroupName" type="xs:string" minOccurs="0"/>
-        </xs:sequence>
-      </xs:complexType>
-      <xs:complexType name="getSiteStatus">
-        <xs:sequence>
-          <xs:element name="siteName" type="xs:string"/>
-        </xs:sequence>
-      </xs:complexType>
-      <xs:complexType name="getSiteStatusResponse">
-        <xs:sequence>
-          <xs:element name="return" type="xs:boolean"/>
-        </xs:sequence>
-      </xs:complexType>
-      <xs:simpleType name="request-status-type">
-        <xs:restriction base="xs:string">
-          <xs:enumeration value="COMPLETE"/>
-          <xs:enumeration value="FAILED"/>
-          <xs:enumeration value="IN_PROGRESS"/>
-        </xs:restriction>
-      </xs:simpleType>
-    </xs:schema>
-  </types>
-  <message name="updateInfraRequest">
-    <part name="parameters" element="tns:updateInfraRequest"/>
-  </message>
-  <message name="updateInfraRequestResponse">
-    <part name="parameters" element="tns:updateInfraRequestResponse"/>
-  </message>
-  <message name="MsoRequestsDbException">
-    <part name="fault" element="tns:MsoRequestsDbException"/>
-  </message>
-  <message name="getInfraRequest">
-    <part name="parameters" element="tns:getInfraRequest"/>
-  </message>
-  <message name="getInfraRequestResponse">
-    <part name="parameters" element="tns:getInfraRequestResponse"/>
-  </message>
-  <message name="getSiteStatus">
-    <part name="parameters" element="tns:getSiteStatus"/>
-  </message>
-  <message name="getSiteStatusResponse">
-    <part name="parameters" element="tns:getSiteStatusResponse"/>
-  </message>
-  <portType name="RequestsDbAdapter">
-    <operation name="updateInfraRequest">
-      <input wsam:Action="http://org.openecomp.mso/requestsdb/RequestsDbAdapter/updateInfraRequestRequest" message="tns:updateInfraRequest"/>
-      <output wsam:Action="http://org.openecomp.mso/requestsdb/RequestsDbAdapter/updateInfraRequestResponse" message="tns:updateInfraRequestResponse"/>
-      <fault message="tns:MsoRequestsDbException" name="MsoRequestsDbException" wsam:Action="http://org.openecomp.mso/requestsdb/RequestsDbAdapter/updateInfraRequest/Fault/MsoRequestsDbException"/>
-    </operation>
-    <operation name="getInfraRequest">
-      <input wsam:Action="http://org.openecomp.mso/requestsdb/RequestsDbAdapter/getInfraRequestRequest" message="tns:getInfraRequest"/>
-      <output wsam:Action="http://org.openecomp.mso/requestsdb/RequestsDbAdapter/getInfraRequestResponse" message="tns:getInfraRequestResponse"/>
-      <fault message="tns:MsoRequestsDbException" name="MsoRequestsDbException" wsam:Action="http://org.openecomp.mso/requestsdb/RequestsDbAdapter/getInfraRequest/Fault/MsoRequestsDbException"/>
-    </operation>
-    <operation name="getSiteStatus">
-      <input wsam:Action="http://org.openecomp.mso/requestsdb/RequestsDbAdapter/getSiteStatusRequest" message="tns:getSiteStatus"/>
-      <output wsam:Action="http://org.openecomp.mso/requestsdb/RequestsDbAdapter/getSiteStatusResponse" message="tns:getSiteStatusResponse"/>
-    </operation>
-  </portType>
-  <binding name="MsoRequestsDbAdapterImplPortBinding" type="tns:RequestsDbAdapter">
-    <soap:binding transport="http://schemas.xmlsoap.org/soap/http" style="document"/>
-    <operation name="updateInfraRequest">
-      <soap:operation soapAction=""/>
-      <input>
-        <soap:body use="literal"/>
-      </input>
-      <output>
-        <soap:body use="literal"/>
-      </output>
-      <fault name="MsoRequestsDbException">
-        <soap:fault name="MsoRequestsDbException" use="literal"/>
-      </fault>
-    </operation>
-    <operation name="getInfraRequest">
-      <soap:operation soapAction=""/>
-      <input>
-        <soap:body use="literal"/>
-      </input>
-      <output>
-        <soap:body use="literal"/>
-      </output>
-      <fault name="MsoRequestsDbException">
-        <soap:fault name="MsoRequestsDbException" use="literal"/>
-      </fault>
-    </operation>
-    <operation name="getSiteStatus">
-      <soap:operation soapAction=""/>
-      <input>
-        <soap:body use="literal"/>
-      </input>
-      <output>
-        <soap:body use="literal"/>
-      </output>
-    </operation>
-  </binding>
-  <service name="RequestsDbAdapter">
-    <port name="MsoRequestsDbAdapterImplPort" binding="tns:MsoRequestsDbAdapterImplPortBinding">
-      <soap:address location="REPLACE_WITH_ACTUAL_URL"/>
-    </port>
-  </service>
-</definitions>]]></con:content><con:type>http://schemas.xmlsoap.org/wsdl/</con:type></con:part></con:definitionCache><con:endpoints><con:endpoint>REPLACE_WITH_ACTUAL_URL</con:endpoint></con:endpoints><con:operation id="e3a7d1f5-8130-4bdd-92d8-292897634187" isOneWay="false" action="" name="getInfraRequest" bindingOperationName="getInfraRequest" type="Request-Response" inputName="" receivesAttachments="false" sendsAttachments="false" anonymous="optional"><con:settings/><con:call id="05eeaf45-4e87-41d3-990a-7cc587a8200b" name="Request 1"><con:settings/><con:encoding>UTF-8</con:encoding><con:endpoint>REPLACE_WITH_ACTUAL_URL</con:endpoint><con:request><![CDATA[<soapenv:Envelope xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/" xmlns:req="http://org.openecomp.mso/requestsdb">\r
-   <soapenv:Header/>\r
-   <soapenv:Body>\r
-      <req:getInfraRequest>\r
-         <requestId>?</requestId>\r
-      </req:getInfraRequest>\r
-   </soapenv:Body>\r
-</soapenv:Envelope>]]></con:request><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:wsaConfig mustUnderstand="NONE" version="200508" action="http://org.openecomp.mso/requestsdb/RequestsDbAdapter/getInfraRequestRequest"/></con:call></con:operation><con:operation id="8a51a273-feed-4160-b7f4-adb16bb04143" isOneWay="false" action="" name="updateInfraRequest" bindingOperationName="updateInfraRequest" type="Request-Response" inputName="" receivesAttachments="false" sendsAttachments="false" anonymous="optional"><con:settings/><con:call id="f7bd11d2-3e62-4548-9ef8-16eade6d2bae" name="Request 1"><con:settings/><con:encoding>UTF-8</con:encoding><con:endpoint>REPLACE_WITH_ACTUAL_URL</con:endpoint><con:request><![CDATA[<soapenv:Envelope xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/" xmlns:req="http://org.openecomp.mso/requestsdb">\r
-   <soapenv:Header/>\r
-   <soapenv:Body>\r
-      <req:updateInfraRequest>\r
-         <requestId>?</requestId>\r
-         <lastModifiedBy>?</lastModifiedBy>\r
-         <!--Optional:-->\r
-         <statusMessage>?</statusMessage>\r
-         <!--Optional:-->\r
-         <responseBody>?</responseBody>\r
-         <!--Optional:-->\r
-         <requestStatus>?</requestStatus>\r
-         <!--Optional:-->\r
-         <progress>?</progress>\r
-         <!--Optional:-->\r
-         <vnfOutputs>?</vnfOutputs>\r
-      </req:updateInfraRequest>\r
-   </soapenv:Body>\r
-</soapenv:Envelope>]]></con:request><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:wsaConfig mustUnderstand="NONE" version="200508" action="http://org.openecomp.mso/requestsdb/RequestsDbAdapter/updateInfraRequestRequest"/></con:call></con:operation><con:operation id="66bc9192-7f64-4529-bbfb-e08c59ddf8ae" isOneWay="false" action="" name="getSiteStatus" bindingOperationName="getSiteStatus" type="Request-Response" inputName="" receivesAttachments="false" sendsAttachments="false" anonymous="optional"><con:settings/><con:call id="8fb41a34-98d1-4695-a6be-936e612ef30c" name="Request 1"><con:settings/><con:encoding>UTF-8</con:encoding><con:endpoint>REPLACE_WITH_ACTUAL_URL</con:endpoint><con:request><![CDATA[<soapenv:Envelope xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/" xmlns:req="http://org.openecomp.mso/requestsdb">
-   <soapenv:Header/>
-   <soapenv:Body>
-      <req:getSiteStatus>
-         <siteName>?</siteName>
-      </req:getSiteStatus>
-   </soapenv:Body>
-</soapenv:Envelope>]]></con:request><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:wsaConfig mustUnderstand="NONE" version="200508" action="http://org.openecomp.mso/requestsdb/RequestsDbAdapter/getSiteStatusRequest"/></con:call></con:operation></con:interface><con:interface xsi:type="con:RestService" wadlVersion="http://wadl.dev.java.net/2009/02" name="Services" type="rest" basePath="" id="b27c3a4f-f300-4b6c-9ab9-a228f72e1d8a" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"><con:settings/><con:definitionCache type="TEXT" rootPart=""/><con:endpoints><con:endpoint>http://localhost:8080</con:endpoint></con:endpoints><con:resource name="POST Infra Service" path="/ecomp/mso/infra/v1/vnf-request" id="83e49cf4-3ed6-4e8f-8b3e-f948faa2147c"><con:settings/><con:parameters/><con:method name="POST Service" method="POST" id="6cc44937-74f5-493b-b395-32272539160f"><con:settings/><con:parameters/><con:representation type="REQUEST"><con:mediaType>application/xml</con:mediaType><con:params/><con:element xmlns:v1="http://org.openecomp/mso/request/layer3serviceactivate/schema/v1">v1:service-request</con:element></con:representation><con:representation type="FAULT"><con:mediaType>text/html</con:mediaType><con:status>500</con:status><con:params/><con:element>html</con:element></con:representation><con:representation type="FAULT"><con:mediaType>application/xml</con:mediaType><con:status>500 400 503 404 502 409</con:status><con:params/><con:element xmlns:v1="http://org.openecomp/mso/request/schema/v1">v1:service-response</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType>application/xml</con:mediaType><con:status>202</con:status><con:params/><con:element xmlns:v1="http://org.openecomp/mso/request/schema/v1">v1:service-response</con:element></con:representation><con:representation type="FAULT"><con:mediaType>text/html;charset=utf-8</con:mediaType><con:status>401 404 403 405 500</con:status><con:params/><con:element>html</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType xsi:nil="true"/><con:status>0</con:status><con:params/><con:element>data</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType xsi:nil="true"/><con:status>0</con:status><con:params/><con:element>data</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType xsi:nil="true"/><con:status>0</con:status><con:params/><con:element>data</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType xsi:nil="true"/><con:status>0</con:status><con:params/><con:element>data</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType xsi:nil="true"/><con:status>0</con:status><con:params/><con:element>data</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType xsi:nil="true"/><con:status>0</con:status><con:params/><con:element>data</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType xsi:nil="true"/><con:status>0</con:status><con:params/><con:element>data</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType xsi:nil="true"/><con:status>0</con:status><con:params/><con:element>data</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType xsi:nil="true"/><con:status>0</con:status><con:params/><con:element>data</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType xsi:nil="true"/><con:status>0</con:status><con:params/><con:element>data</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType xsi:nil="true"/><con:status>0</con:status><con:params/><con:element>data</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType xsi:nil="true"/><con:status>0</con:status><con:params/><con:element>data</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType xsi:nil="true"/><con:status>0</con:status><con:params/><con:element>data</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType xsi:nil="true"/><con:status>0</con:status><con:params/><con:element>data</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType xsi:nil="true"/><con:status>0</con:status><con:params/><con:element>data</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType xsi:nil="true"/><con:status>0</con:status><con:params/><con:element>data</con:element></con:representation><con:request name="Request 1" mediaType="application/xml" postQueryString="false" id="5a0bb560-c181-42a6-ad3d-082acf724d6a"><con:settings><con:setting id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers">&lt;xml-fragment/></con:setting></con:settings><con:endpoint>http://${#Project#host}</con:endpoint><con:request><![CDATA[<aetgt:vnf-request xmlns:aetgt="http://org.openecomp/mso/infra/vnf-request/v1"
-                   xmlns="http://org.openecomp/mso/infra/vnf-request/v1"
-                   xmlns:rest="http://schemas.activebpel.org/REST/2007/12/01/aeREST.xsd">
-    <request-info>
-        <request-id>3d878a8e-51fa-44aa-8cb5-a56ae9352252</request-id>
-        <action>CREATE</action>
-        <source>PORTAL</source>
-    </request-info>
-    <vnf-inputs>
-        <vnf-name>yjvnfvmsc</vnf-name>
-        <vnf-type>VPE</vnf-type>
-        <service-type>SDN-ETHERNET-INTERNET</service-type>
-        <aic-node-clli>AUSTXAALCP1</aic-node-clli>
-        <tenant-id>276b95b6d2b04e2e830c976eb70c9405</tenant-id>
-    </vnf-inputs>
-    <vnf-params xmlns:tns="http://org.openecomp/mso/infra/vnf-request/v1"/>
-</aetgt:vnf-request>
-]]></con:request><con:originalUri>http://localhost/ecomp/mso/v1/services</con:originalUri><con:credentials><con:username>${#Project#user-csi}</con:username><con:password>${#Project#password-csi}</con:password><con:selectedAuthProfile>Basic</con:selectedAuthProfile><con:addedBasicAuthenticationTypes>Basic</con:addedBasicAuthenticationTypes><con:authType>Global HTTP Settings</con:authType></con:credentials><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:parameters/><con:parameterOrder/></con:request></con:method></con:resource><con:resource name="GET Infra Request" path="/ecomp/mso/infra/v1/vnf-request/{request-id}" id="a04a14a0-b7cc-4c24-bdd4-72d5a7fa1dc9"><con:settings/><con:parameters><con:parameter><con:name>request-id</con:name><con:value/><con:style>TEMPLATE</con:style><con:default/><con:description xsi:nil="true"/></con:parameter></con:parameters><con:method name="Method 1" method="GET" id="c61df2ee-5d7a-4d94-8e73-bd10afd104ff"><con:settings/><con:parameters/><con:representation type="REQUEST"><con:mediaType>application/xml</con:mediaType><con:params/><con:element xmlns:v1="http://org.openecomp/mso/request/layer3serviceactivate/schema/v1">v1:service-request</con:element></con:representation><con:representation type="FAULT"><con:mediaType>text/html</con:mediaType><con:status>500</con:status><con:params/><con:element>html</con:element></con:representation><con:representation type="FAULT"><con:mediaType>application/xml</con:mediaType><con:status>500 400 503 404</con:status><con:params/><con:element xmlns:v1="http://org.openecomp/mso/request/schema/v1">v1:service-response</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType>application/xml</con:mediaType><con:status>202</con:status><con:params/><con:element xmlns:v1="http://org.openecomp/mso/request/schema/v1">v1:service-response</con:element></con:representation><con:representation type="FAULT"><con:mediaType>text/html;charset=utf-8</con:mediaType><con:status>401 404 403 405 500</con:status><con:params/><con:element>html</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType xsi:nil="true"/><con:status>0</con:status><con:params/><con:element>data</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType xsi:nil="true"/><con:status>0</con:status><con:params/><con:element>data</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType xsi:nil="true"/><con:status>0</con:status><con:params/><con:element>data</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType xsi:nil="true"/><con:status>0</con:status><con:params/><con:element>data</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType xsi:nil="true"/><con:status>0</con:status><con:params/><con:element>data</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType xsi:nil="true"/><con:status>0</con:status><con:params/><con:element>data</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType xsi:nil="true"/><con:status>0</con:status><con:params/><con:element>data</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType xsi:nil="true"/><con:status>0</con:status><con:params/><con:element>data</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType xsi:nil="true"/><con:status>0</con:status><con:params/><con:element>data</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType xsi:nil="true"/><con:status>0</con:status><con:params/><con:element>data</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType xsi:nil="true"/><con:status>0</con:status><con:params/><con:element>data</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType xsi:nil="true"/><con:status>0</con:status><con:params/><con:element>data</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType xsi:nil="true"/><con:status>0</con:status><con:params/><con:element>data</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType xsi:nil="true"/><con:status>0</con:status><con:params/><con:element>data</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType xsi:nil="true"/><con:status>0</con:status><con:params/><con:element>data</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType>*/*</con:mediaType><con:status>200</con:status><con:params/><con:element xmlns:v1="http://org.openecomp/mso/request/query/schema/v1">v1:query-response</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType xsi:nil="true"/><con:status>0</con:status><con:params/><con:element>data</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType>application/octet-stream</con:mediaType><con:status>200</con:status><con:params/><con:element xmlns:v1="http://org.openecomp/mso/infra/vnf-request/v1">v1:vnf-request</con:element></con:representation><con:request name="GetService" mediaType="application/xml" postQueryString="false" id="7b0d5ac4-8e25-4f63-bd6a-b4fc0004bad3"><con:settings><con:setting id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers">&lt;xml-fragment/></con:setting></con:settings><con:endpoint>http://${#Project#host}</con:endpoint><con:request><![CDATA[<feature-request
-	xmlns="http://org.openecomp/mso/request/layer3serviceactivate/schema/v1"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:msolayer3="http://org.openecomp/mso/request/layer3/schema/v1"
-	xmlns:msoservtypes="http://org.openecomp/mso/request/types/v1">
-	<msoservtypes:request-information>
-		<msoservtypes:request-id>155415ab-b4a7-4382-b4c6-d17d950565</msoservtypes:request-id>
-		<msoservtypes:request-action>FeatureChangeActivateRequest</msoservtypes:request-action>
-		<msoservtypes:source>OMX</msoservtypes:source>
-		<msoservtypes:notification-url>https://localhost:22443/Services/com/cingular/csi/sdn/SendManagedNetworkStatusNotification.jws</msoservtypes:notification-url>
-		<msoservtypes:order-number>5051560</msoservtypes:order-number>
-		<msoservtypes:order-version>1</msoservtypes:order-version>
-	</msoservtypes:request-information>
-	<msoservtypes:service-information>
-		<msoservtypes:service-type>SDN-ETHERNET-INTERNET</msoservtypes:service-type>
-		<msoservtypes:service-instance-id>HI/VLXM/003717//SW_INTERNET</msoservtypes:service-instance-id>
-		<msoservtypes:subscriber-name>ST E2E Test50565_13000050565</msoservtypes:subscriber-name>
-	</msoservtypes:service-information>
-	<msoservtypes:feature-information>
-		<msoservtypes:feature-type>FIREWALL-LITE</msoservtypes:feature-type>
-		<msoservtypes:feature-instance-id>HI/VLXM/003717//SW_INTERNET</msoservtypes:feature-instance-id>
-		<msoservtypes:feature-yang-model>ST E2E Test50565_13000050565</msoservtypes:feature-yang-model>
-	</msoservtypes:feature-information>
-	</feature-request>
-]]></con:request><con:originalUri>http://localhost/ecomp/mso/v1/services/feature</con:originalUri><con:credentials><con:username>${#Project#user-csi}</con:username><con:password>${#Project#password-csi}</con:password><con:selectedAuthProfile>Basic</con:selectedAuthProfile><con:addedBasicAuthenticationTypes>Basic</con:addedBasicAuthenticationTypes><con:authType>Global HTTP Settings</con:authType></con:credentials><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:parameters><entry key="request-id" value="test0-service" xmlns="http://eviware.com/soapui/config"/></con:parameters><con:parameterOrder><con:entry>request-id</con:entry></con:parameterOrder></con:request></con:method></con:resource></con:interface><con:testSuite id="44a1f9ae-4601-4eec-8315-3ecbc3de275b" name="MsoRequestsDbAdapterImplPortBinding TestSuite"><con:settings/><con:runType>SEQUENTIAL</con:runType><con:testCase id="b69961dd-4f10-4b75-a411-330dbf9bc42c" failOnError="true" failTestCaseOnErrors="true" keepSession="false" maxResults="0" name="updateInfraRequest TestCase" searchProperties="true"><con:settings/><con:testStep type="restrequest" name="POST VNF infra request - NO BPEL" id="ea3454c5-8e93-40d8-9399-d79b2f6329ff"><con:settings/><con:config service="Services" resourcePath="/ecomp/mso/infra/v1/vnf-request" methodName="POST Service" xsi:type="con:RestRequestStep" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"><con:restRequest name="POST VNF infra request - NO BPEL" mediaType="application/xml" postQueryString="false" id="6d727ada-da68-4a94-8f33-f82953731cd5"><con:settings><con:setting id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers">&lt;xml-fragment/></con:setting></con:settings><con:endpoint>http://${#Project#host}</con:endpoint><con:request><![CDATA[<aetgt:vnf-request xmlns:aetgt="http://org.openecomp/mso/infra/vnf-request/v1"
-                   xmlns="http://org.openecomp/mso/infra/vnf-request/v1"
-                   xmlns:rest="http://schemas.activebpel.org/REST/2007/12/01/aeREST.xsd">
-    <request-info>
-        <request-id>IntegTestsInfra</request-id>
-        <action>CREATE</action>
-        <source>PORTAL</source>
-    </request-info>
-    <vnf-inputs>
-        <vnf-name>ArqVnf</vnf-name>
-        <vnf-type>VPE</vnf-type>
-        <service-type>SDN-ETHERNET-INTERNET</service-type>
-        <aic-node-clli>AUSTXAALCP1</aic-node-clli>
-        <tenant-id>276b95b6d2b04e2e830c976eb70c9405</tenant-id>
-    </vnf-inputs>
-    <vnf-params xmlns:tns="http://org.openecomp/mso/infra/vnf-request/v1"/>
-</aetgt:vnf-request>
-]]></con:request><con:originalUri>http://localhost/ecomp/mso/v1/services</con:originalUri><con:assertion type="Valid HTTP Status Codes" name="Valid HTTP Status Codes 500" id="19038271-9229-4ae5-a743-24d0b2790cae"><con:configuration><codes>500,400</codes></con:configuration></con:assertion><con:assertion type="Simple Contains" name="Contains Status FAILED" id="dfef30b8-13ab-486f-97b8-8f9eed1c9ac1"><con:configuration><token>&lt;request-status>FAILED&lt;/request-status></token><ignoreCase>false</ignoreCase><useRegEx>false</useRegEx></con:configuration></con:assertion><con:credentials><con:username>${#Project#user-infraportal}</con:username><con:password>${#Project#password-infraportal}</con:password><con:selectedAuthProfile>Basic</con:selectedAuthProfile><con:addedBasicAuthenticationTypes>Basic</con:addedBasicAuthenticationTypes><con:authType>Global HTTP Settings</con:authType></con:credentials><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:parameters/><con:parameterOrder/></con:restRequest></con:config></con:testStep><con:testStep type="transfer" name="RequestId Transfer" id="2f9e16f1-55ce-4ddb-a934-785b28e1e57f"><con:settings/><con:config xsi:type="con:PropertyTransfersStep" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"><con:transfers setNullOnMissingSource="false" transferTextContent="true" failOnError="true" ignoreEmpty="false" transferToAll="false" entitize="false" transferChildNodes="false"><con:name>RequestId</con:name><con:sourceType>Response</con:sourceType><con:sourceStep>POST VNF infra request - NO BPEL</con:sourceStep><con:sourcePath>declare namespace vnf='http://org.openecomp/mso/infra/vnf-request/v1';
-//vnf:vnf-request[1]/vnf:request-info[1]/vnf:request-id[1]</con:sourcePath><con:targetType>Request</con:targetType><con:targetStep>updateInfraRequest</con:targetStep><con:targetPath>declare namespace soapenv='http://schemas.xmlsoap.org/soap/envelope/';
-declare namespace req='http://org.openecomp.mso/requestsdb';
-//soapenv:Envelope/soapenv:Body/req:updateInfraRequest/requestId
-</con:targetPath><con:upgraded>true</con:upgraded></con:transfers><con:transfers setNullOnMissingSource="true" transferTextContent="true" failOnError="true" ignoreEmpty="false" transferToAll="false" entitize="false" transferChildNodes="false"><con:name>ToGet</con:name><con:sourceType>Response</con:sourceType><con:sourceStep>POST VNF infra request - NO BPEL</con:sourceStep><con:sourcePath>declare namespace vnf='http://org.openecomp/mso/infra/vnf-request/v1';
-//vnf:vnf-request[1]/vnf:request-info[1]/vnf:request-id[1]</con:sourcePath><con:targetType>request-id</con:targetType><con:targetStep>Get Infra request</con:targetStep><con:targetPath/><con:upgraded>true</con:upgraded></con:transfers><con:transfers setNullOnMissingSource="true" transferTextContent="true" failOnError="true" ignoreEmpty="false" transferToAll="false" entitize="false" transferChildNodes="false"><con:name>ToSoapGet</con:name><con:sourceType>Response</con:sourceType><con:sourceStep>POST VNF infra request - NO BPEL</con:sourceStep><con:sourcePath>declare namespace vnf='http://org.openecomp/mso/infra/vnf-request/v1';
-//vnf:vnf-request[1]/vnf:request-info[1]/vnf:request-id[1]</con:sourcePath><con:targetType>Request</con:targetType><con:targetStep>get infra soap</con:targetStep><con:targetPath>declare namespace soapenv='http://schemas.xmlsoap.org/soap/envelope/';
-declare namespace req='http://org.openecomp.mso/requestsdb';
-//soapenv:Envelope/soapenv:Body/req:getInfraRequest/requestId
-</con:targetPath><con:upgraded>true</con:upgraded></con:transfers><con:transfers setNullOnMissingSource="false" transferTextContent="true" failOnError="true" disabled="false" entitize="false" ignoreEmpty="false" transferChildNodes="false" transferToAll="false" useXQuery="false"><con:name>RequestId2</con:name><con:sourceType>Response</con:sourceType><con:sourceStep>POST VNF infra request - NO BPEL</con:sourceStep><con:sourcePath>declare namespace vnf='http://org.openecomp/mso/infra/vnf-request/v1';
-//vnf:vnf-request[1]/vnf:request-info[1]/vnf:request-id[1]</con:sourcePath><con:targetType>Request</con:targetType><con:targetStep>updateInfraRequest 2</con:targetStep><con:targetPath>declare namespace soapenv='http://schemas.xmlsoap.org/soap/envelope/';
-declare namespace req='http://org.openecomp.mso/requestsdb';
-//soapenv:Envelope/soapenv:Body/req:updateInfraRequest/requestId
-</con:targetPath><con:type>XPATH</con:type><con:targetTransferType>XPATH</con:targetTransferType><con:upgraded>true</con:upgraded></con:transfers><con:transfers setNullOnMissingSource="true" transferTextContent="true" failOnError="true" disabled="false" entitize="false" ignoreEmpty="false" transferChildNodes="false" transferToAll="false" useXQuery="false"><con:name>ToSoapGet2</con:name><con:sourceType>Response</con:sourceType><con:sourceStep>POST VNF infra request - NO BPEL</con:sourceStep><con:sourcePath>declare namespace vnf='http://org.openecomp/mso/infra/vnf-request/v1';
-//vnf:vnf-request[1]/vnf:request-info[1]/vnf:request-id[1]</con:sourcePath><con:targetType>Request</con:targetType><con:targetStep>get infra soap 2</con:targetStep><con:targetPath>declare namespace soapenv='http://schemas.xmlsoap.org/soap/envelope/';
-declare namespace req='http://org.openecomp.mso/requestsdb';
-//soapenv:Envelope/soapenv:Body/req:getInfraRequest/requestId
-</con:targetPath><con:type>XPATH</con:type><con:targetTransferType>XPATH</con:targetTransferType><con:upgraded>true</con:upgraded></con:transfers><con:transfers setNullOnMissingSource="false" transferTextContent="true" failOnError="true" disabled="false" entitize="false" ignoreEmpty="false" transferChildNodes="false" transferToAll="false" useXQuery="false"><con:name>RequestId status</con:name><con:sourceType>Response</con:sourceType><con:sourceStep>POST VNF infra request - NO BPEL</con:sourceStep><con:sourcePath>declare namespace vnf='http://org.openecomp/mso/infra/vnf-request/v1';
-//vnf:vnf-request[1]/vnf:request-info[1]/vnf:request-id[1]</con:sourcePath><con:targetType>Request</con:targetType><con:targetStep>updateInfraRequest status</con:targetStep><con:targetPath>declare namespace soapenv='http://schemas.xmlsoap.org/soap/envelope/';
-declare namespace req='http://org.openecomp.mso/requestsdb';
-//soapenv:Envelope/soapenv:Body/req:updateInfraRequest/requestId
-</con:targetPath><con:type>XPATH</con:type><con:targetTransferType>XPATH</con:targetTransferType><con:upgraded>true</con:upgraded></con:transfers></con:config></con:testStep><con:testStep type="request" id="82ce5ddb-df4c-4b6b-b1c3-874c2e615c02" name="updateInfraRequest"><con:settings/><con:config xsi:type="con:RequestStep" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"><con:interface>MsoRequestsDbAdapterImplPortBinding</con:interface><con:operation>updateInfraRequest</con:operation><con:request name="updateInfraRequest" outgoingWss="" incomingWss="" timeout="" sslKeystore="" useWsAddressing="false" useWsReliableMessaging="false" wssPasswordType="" id="3345e90e-035c-470b-a4e4-41765ccb8b27"><con:settings><con:setting id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers">&lt;xml-fragment/></con:setting></con:settings><con:encoding>UTF-8</con:encoding><con:endpoint>http://${#Project#host}/dbadapters/RequestsDbAdapter</con:endpoint><con:request><![CDATA[<soapenv:Envelope xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/" xmlns:req="http://org.openecomp.mso/requestsdb">
-   <soapenv:Header/>
-   <soapenv:Body>
-      <req:updateInfraRequest>
-         <requestId>22ae9257-022b-4050-8b31-998034cc49a8</requestId>
-         <lastModifiedBy>Arq</lastModifiedBy>
-         <requestStatus>IN_PROGRESS</requestStatus>
-      </req:updateInfraRequest>
-   </soapenv:Body>
-</soapenv:Envelope>]]></con:request><con:assertion type="Valid HTTP Status Codes" id="5e83a766-cff3-473e-8a6b-7a19fec9bc03" name="Valid HTTP Status Codes"><con:configuration><codes>200</codes></con:configuration></con:assertion><con:credentials><con:username>${#Project#dbadapteruser}</con:username><con:password>${#Project#dbadapterpassword}</con:password><con:selectedAuthProfile>Basic</con:selectedAuthProfile><con:addedBasicAuthenticationTypes>Basic</con:addedBasicAuthenticationTypes><con:authType>Global HTTP Settings</con:authType></con:credentials><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:wsaConfig mustUnderstand="NONE" version="200508" action="http://org.openecomp.mso/requestsdb/RequestsDbAdapter/updateInfraRequestRequest"/><con:wsrmConfig version="1.2"/></con:request></con:config></con:testStep><con:testStep type="request" id="22ed441e-1e1f-447a-a570-da0b6bb39a5b" name="updateInfraRequest status"><con:settings/><con:config xsi:type="con:RequestStep" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"><con:interface>MsoRequestsDbAdapterImplPortBinding</con:interface><con:operation>updateInfraRequest</con:operation><con:request name="updateInfraRequest status" outgoingWss="" incomingWss="" timeout="" sslKeystore="" useWsAddressing="false" useWsReliableMessaging="false" wssPasswordType="" id="3345e90e-035c-470b-a4e4-41765ccb8b27"><con:settings><con:setting id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers">&lt;xml-fragment/></con:setting></con:settings><con:encoding>UTF-8</con:encoding><con:endpoint>http://${#Project#host}/dbadapters/RequestsDbAdapter</con:endpoint><con:request><![CDATA[<soapenv:Envelope xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/" xmlns:req="http://org.openecomp.mso/requestsdb">
-   <soapenv:Header/>
-   <soapenv:Body>
-      <req:updateInfraRequest>
-         <requestId>22ae9257-022b-4050-8b31-998034cc49a8</requestId>
-         <lastModifiedBy>Arq</lastModifiedBy>
-         <requestStatus>COMPLETE</requestStatus>
-      </req:updateInfraRequest>
-   </soapenv:Body>
-</soapenv:Envelope>]]></con:request><con:assertion type="Valid HTTP Status Codes" id="5e83a766-cff3-473e-8a6b-7a19fec9bc03" name="Valid HTTP Status Codes"><con:configuration><codes>200</codes></con:configuration></con:assertion><con:credentials><con:username>${#Project#dbadapteruser}</con:username><con:password>${#Project#dbadapterpassword}</con:password><con:selectedAuthProfile>Basic</con:selectedAuthProfile><con:addedBasicAuthenticationTypes>Basic</con:addedBasicAuthenticationTypes><con:authType>Global HTTP Settings</con:authType></con:credentials><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:wsaConfig mustUnderstand="NONE" version="200508" action="http://org.openecomp.mso/requestsdb/RequestsDbAdapter/updateInfraRequestRequest"/><con:wsrmConfig version="1.2"/></con:request></con:config></con:testStep><con:testStep type="restrequest" name="Get Infra request" id="3ec19844-8cb2-483c-992b-5e735e8be32d"><con:settings/><con:config service="Services" resourcePath="/ecomp/mso/infra/v1/vnf-request/{request-id}" methodName="Method 1" xsi:type="con:RestRequestStep" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"><con:restRequest name="Get Infra request" mediaType="application/xml" postQueryString="false" id="7b0d5ac4-8e25-4f63-bd6a-b4fc0004bad3"><con:settings><con:setting id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers">&lt;xml-fragment/></con:setting></con:settings><con:endpoint>http://${#Project#host}</con:endpoint><con:request><![CDATA[<feature-request
-	xmlns="http://org.openecomp/mso/request/layer3serviceactivate/schema/v1"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:msolayer3="http://org.openecomp/mso/request/layer3/schema/v1"
-	xmlns:msoservtypes="http://org.openecomp/mso/request/types/v1">
-	<msoservtypes:request-information>
-		<msoservtypes:request-id>155415ab-b4a7-4382-b4c6-d17d950565</msoservtypes:request-id>
-		<msoservtypes:request-action>FeatureChangeActivateRequest</msoservtypes:request-action>
-		<msoservtypes:source>OMX</msoservtypes:source>
-		<msoservtypes:notification-url>https://localhost:22443/Services/com/cingular/csi/sdn/SendManagedNetworkStatusNotification.jws</msoservtypes:notification-url>
-		<msoservtypes:order-number>5051560</msoservtypes:order-number>
-		<msoservtypes:order-version>1</msoservtypes:order-version>
-	</msoservtypes:request-information>
-	<msoservtypes:service-information>
-		<msoservtypes:service-type>SDN-ETHERNET-INTERNET</msoservtypes:service-type>
-		<msoservtypes:service-instance-id>HI/VLXM/003717//SW_INTERNET</msoservtypes:service-instance-id>
-		<msoservtypes:subscriber-name>ST E2E Test50565_13000050565</msoservtypes:subscriber-name>
-	</msoservtypes:service-information>
-	<msoservtypes:feature-information>
-		<msoservtypes:feature-type>FIREWALL-LITE</msoservtypes:feature-type>
-		<msoservtypes:feature-instance-id>HI/VLXM/003717//SW_INTERNET</msoservtypes:feature-instance-id>
-		<msoservtypes:feature-yang-model>ST E2E Test50565_13000050565</msoservtypes:feature-yang-model>
-	</msoservtypes:feature-information>
-	</feature-request>
-]]></con:request><con:originalUri>http://localhost/ecomp/mso/v1/services/feature</con:originalUri><con:assertion type="Valid HTTP Status Codes" id="87fd8d08-2b41-48fe-b09a-4fc8126db768" name="Valid HTTP Status Codes"><con:configuration><codes>200</codes></con:configuration></con:assertion><con:assertion type="Simple Contains" id="df899510-c7f4-40ee-8804-eee04f358b61" name="Contains"><con:configuration><token>&lt;request-status>COMPLETE&lt;/request-status></token><ignoreCase>false</ignoreCase><useRegEx>false</useRegEx></con:configuration></con:assertion><con:assertion type="Simple Contains" id="cd085d60-dc5a-426b-87e2-76536d7636aa" name="Contains UUID"><con:configuration><token>(?s).*&lt;request-id>[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}&lt;\/request-id>(?s).*</token><ignoreCase>false</ignoreCase><useRegEx>true</useRegEx></con:configuration></con:assertion><con:credentials><con:username>${#Project#user-infraportal}</con:username><con:password>${#Project#password-infraportal}</con:password><con:selectedAuthProfile>Basic</con:selectedAuthProfile><con:addedBasicAuthenticationTypes>Basic</con:addedBasicAuthenticationTypes><con:authType>Global HTTP Settings</con:authType></con:credentials><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:parameters><entry key="request-id" value="22ae9257-022b-4050-8b31-998034cc49a8" xmlns="http://eviware.com/soapui/config"/></con:parameters><con:parameterOrder><con:entry>request-id</con:entry></con:parameterOrder></con:restRequest></con:config></con:testStep><con:testStep type="request" name="get infra soap" id="46a78de9-c0b9-4f3d-bfac-bb4c1d0464e3"><con:settings/><con:config xsi:type="con:RequestStep" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"><con:interface>MsoRequestsDbAdapterImplPortBinding</con:interface><con:operation>getInfraRequest</con:operation><con:request name="get infra soap" id="d9bdad79-b89c-4939-bfc8-a1eb7f9bbfad"><con:settings><con:setting id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers">&lt;xml-fragment/></con:setting></con:settings><con:encoding>UTF-8</con:encoding><con:endpoint>http://${#Project#host}/dbadapters/RequestsDbAdapter</con:endpoint><con:request><![CDATA[<soapenv:Envelope xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/" xmlns:req="http://org.openecomp.mso/requestsdb">
-   <soapenv:Header/>
-   <soapenv:Body>
-      <req:getInfraRequest>
-         <requestId>22ae9257-022b-4050-8b31-998034cc49a8</requestId>
-      </req:getInfraRequest>
-   </soapenv:Body>
-</soapenv:Envelope>]]></con:request><con:assertion type="SOAP Response" id="50273e00-b97b-4ed3-888f-950fa14bee5e"/><con:assertion type="SOAP Fault Assertion" id="59908871-5e28-4c04-a5e0-fbc23c2bb962"/><con:assertion type="Simple Contains" id="0c450ede-ed03-47b6-be4e-93b718b2cc05" name="Contains"><con:configuration><token>&lt;lastModifiedBy>Arq&lt;/lastModifiedBy></token><ignoreCase>false</ignoreCase><useRegEx>false</useRegEx></con:configuration></con:assertion><con:credentials><con:username>${#Project#dbadapteruser}</con:username><con:password>${#Project#dbadapterpassword}</con:password><con:selectedAuthProfile>Basic</con:selectedAuthProfile><con:addedBasicAuthenticationTypes>Basic</con:addedBasicAuthenticationTypes><con:authType>Global HTTP Settings</con:authType></con:credentials><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:wsaConfig mustUnderstand="NONE" version="200508"/><con:wsrmConfig version="1.2"/></con:request></con:config></con:testStep><con:testStep type="request" id="452fa72a-3bb1-4891-b941-c0faa59a6fb9" name="updateInfraRequest 2"><con:settings/><con:config xsi:type="con:RequestStep" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"><con:interface>MsoRequestsDbAdapterImplPortBinding</con:interface><con:operation>updateInfraRequest</con:operation><con:request name="updateInfraRequest 2" outgoingWss="" incomingWss="" timeout="" sslKeystore="" useWsAddressing="false" useWsReliableMessaging="false" wssPasswordType="" id="3345e90e-035c-470b-a4e4-41765ccb8b27"><con:settings><con:setting id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers">&lt;xml-fragment/></con:setting></con:settings><con:encoding>UTF-8</con:encoding><con:endpoint>http://${#Project#host}/dbadapters/RequestsDbAdapter</con:endpoint><con:request><![CDATA[<soapenv:Envelope xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/" xmlns:req="http://org.openecomp.mso/requestsdb">
-   <soapenv:Header/>
-   <soapenv:Body>
-      <req:updateInfraRequest>
-         <requestId>22ae9257-022b-4050-8b31-998034cc49a8</requestId>
-         <lastModifiedBy>Arq</lastModifiedBy>
-         <!--Optional:-->
-         <statusMessage>newStatus</statusMessage>
-         <!--Optional:-->
-         <responseBody>body</responseBody>
-         <!--Optional:-->
-         <requestStatus>status</requestStatus>
-         <!--Optional:-->
-         <progress>98</progress>
-         <!--Optional:-->
-         <vnfOutputs>OneSmallStepForMan</vnfOutputs>
-      </req:updateInfraRequest>
-   </soapenv:Body>
-</soapenv:Envelope>]]></con:request><con:assertion type="Valid HTTP Status Codes" id="5e83a766-cff3-473e-8a6b-7a19fec9bc03" name="Valid HTTP Status Codes"><con:configuration><codes>200</codes></con:configuration></con:assertion><con:credentials><con:username>${#Project#dbadapteruser}</con:username><con:password>${#Project#dbadapterpassword}</con:password><con:selectedAuthProfile>Basic</con:selectedAuthProfile><con:addedBasicAuthenticationTypes>Basic</con:addedBasicAuthenticationTypes><con:authType>Global HTTP Settings</con:authType></con:credentials><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:wsaConfig mustUnderstand="NONE" version="200508" action="http://org.openecomp.mso/requestsdb/RequestsDbAdapter/updateInfraRequestRequest"/><con:wsrmConfig version="1.2"/></con:request></con:config></con:testStep><con:testStep type="request" name="get infra soap 2" id="f6ac229b-fac5-4c7e-afd0-8e1ce72ddaa9"><con:settings/><con:config xsi:type="con:RequestStep" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"><con:interface>MsoRequestsDbAdapterImplPortBinding</con:interface><con:operation>getInfraRequest</con:operation><con:request name="get infra soap 2" id="d9bdad79-b89c-4939-bfc8-a1eb7f9bbfad"><con:settings><con:setting id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers">&lt;xml-fragment/></con:setting></con:settings><con:encoding>UTF-8</con:encoding><con:endpoint>http://${#Project#host}/dbadapters/RequestsDbAdapter</con:endpoint><con:request><![CDATA[<soapenv:Envelope xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/" xmlns:req="http://org.openecomp.mso/requestsdb">
-   <soapenv:Header/>
-   <soapenv:Body>
-      <req:getInfraRequest>
-         <requestId>22ae9257-022b-4050-8b31-998034cc49a8</requestId>
-      </req:getInfraRequest>
-   </soapenv:Body>
-</soapenv:Envelope>]]></con:request><con:assertion type="SOAP Response" id="50273e00-b97b-4ed3-888f-950fa14bee5e"/><con:assertion type="SOAP Fault Assertion" id="59908871-5e28-4c04-a5e0-fbc23c2bb962"/><con:assertion type="Simple Contains" id="0c450ede-ed03-47b6-be4e-93b718b2cc05" name="Contains"><con:configuration><token>&lt;lastModifiedBy>Arq&lt;/lastModifiedBy></token><ignoreCase>false</ignoreCase><useRegEx>false</useRegEx></con:configuration></con:assertion><con:credentials><con:username>${#Project#dbadapteruser}</con:username><con:password>${#Project#dbadapterpassword}</con:password><con:selectedAuthProfile>Basic</con:selectedAuthProfile><con:addedBasicAuthenticationTypes>Basic</con:addedBasicAuthenticationTypes><con:authType>Global HTTP Settings</con:authType></con:credentials><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:wsaConfig mustUnderstand="NONE" version="200508"/><con:wsrmConfig version="1.2"/></con:request></con:config></con:testStep><con:properties/></con:testCase><con:properties/></con:testSuite><con:properties><con:property><con:name>host</con:name><con:value>localhost:18080</con:value></con:property><con:property><con:name>user-infraportal</con:name><con:value>InfraPortalClient</con:value></con:property><con:property><con:name>password-infraportal</con:name><con:value>password1$</con:value></con:property><con:property><con:name>dbadapteruser</con:name><con:value>BPELClient</con:value></con:property><con:property><con:name>dbadapterpassword</con:name><con:value>password1$</con:value></con:property></con:properties><con:wssContainer/><con:oAuth2ProfileContainer/><con:oAuth1ProfileContainer/><con:sensitiveInformation/></con:soapui-project>
\ No newline at end of file
diff --git a/packages/arquillian-unit-tests/src/test/resources/SoapUI/soapui-settings.xml b/packages/arquillian-unit-tests/src/test/resources/SoapUI/soapui-settings.xml
deleted file mode 100644
index 2c03cdc..0000000
--- a/packages/arquillian-unit-tests/src/test/resources/SoapUI/soapui-settings.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<con:soapui-settings xmlns:con="http://eviware.com/soapui/config"><con:setting id="WsdlSettings@excluded-types">&lt;con:entry xmlns:con="http://eviware.com/soapui/config">schema@http://www.w3.org/2001/XMLSchema&lt;/con:entry></con:setting><con:setting id="WsdlSettings@name-with-binding">true</con:setting><con:setting id="HttpSettings@http_version">1.1</con:setting><con:setting id="HttpSettings@max_total_connections">2000</con:setting><con:setting id="HttpSettings@response-compression">true</con:setting><con:setting id="HttpSettings@leave_mockengine">true</con:setting><con:setting id="UISettings@auto_save_projects_on_exit">true</con:setting><con:setting id="UISettings@show_descriptions">true</con:setting><con:setting id="WsdlSettings@xml-generation-always-include-optional-elements">true</con:setting><con:setting id="WsaSettings@useDefaultRelatesTo">true</con:setting><con:setting id="WsaSettings@useDefaultRelationshipType">true</con:setting><con:setting id="UISettings@show_startup_page">true</con:setting><con:setting id="UISettings@gc_interval">60</con:setting><con:setting id="WsdlSettings@cache-wsdls">true</con:setting><con:setting id="WsdlSettings@pretty-print-response-xml">true</con:setting><con:setting id="HttpSettings@include_request_in_time_taken">true</con:setting><con:setting id="HttpSettings@include_response_in_time_taken">true</con:setting><con:setting id="HttpSettings@start_mock_service">true</con:setting><con:setting id="UISettings@auto_save_interval">0</con:setting><con:setting id="WsaSettings@soapActionOverridesWsaAction">true</con:setting><con:setting id="WsaSettings@overrideExistingHeaders">true</con:setting><con:setting id="WsaSettings@enableForOptional">true</con:setting><con:setting id="VersionUpdateSettings@auto-check-version-update">true</con:setting><con:setting id="ProxySettings@autoProxy">true</con:setting><con:setting id="ProxySettings@enableProxy">false</con:setting><con:setting id="WSISettings@location">/usr/share/SoapUI-5.2.1/wsi-test-tools</con:setting><con:setting id="UISettings@disable_analytics">true</con:setting><con:setting id="UISettings@analytics_opt_out_version">5.2</con:setting><con:setting id="GlobalPropertySettings@properties">&lt;xml-fragment/></con:setting><con:setting id="RecentProjects"><![CDATA[<xml-fragment xmlns:con="http://eviware.com/soapui/config">
- 
-</xml-fragment>]]></con:setting></con:soapui-settings>
\ No newline at end of file
diff --git a/packages/arquillian-unit-tests/src/test/resources/arquillian.xml b/packages/arquillian-unit-tests/src/test/resources/arquillian.xml
deleted file mode 100644
index 6da80f2..0000000
--- a/packages/arquillian-unit-tests/src/test/resources/arquillian.xml
+++ /dev/null
@@ -1,102 +0,0 @@
-<arquillian xmlns="http://jboss.org/schema/arquillian"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="
-        http://jboss.org/schema/arquillian
-        http://jboss.org/schema/arquillian/arquillian_1_0.xsd">
-
-    <defaultProtocol type="Servlet 3.0" />
-
-	<extension qualifier="cube">
-	  <property name="connectionMode">STARTANDSTOP</property>
-	</extension>
-
-    <extension qualifier="docker">
-
-      <property name="serverVersion">1.24</property>
-
-      <property name="serverUri">${docker.url}</property>
-      <property name="definitionFormat">CUBE</property>
-      <property name="dockerContainers">
-         mso:
-           image: openecomp/mso-arquillian:${images.version}
-           beforeStop:
-            - copy:
-                   from: /opt/jboss/standalone/log/
-                   to: ${target.folder}/mso-automated-tests/jboss-logs
-            - copy:
-                   from: /var/log/ecomp/MSO
-                   to: ${target.folder}/mso-automated-tests/mso-logs
-            - copy:
-                   from: /tmp/mso-log-checker.log
-                   to: ${target.folder}/mso-automated-tests/
-           hostName: mso
-           await:
-              strategy: http
-              match: 'regexp:(.*)Welcome to WildFly 10(.*)'
-              responseCode: 200
-              url: http://dockerHost:18080
-              sleepPollingTime: 30 s
-              iterations: 20
-           portBindings: [18080->8080/tcp, 9990/tcp, 9999/tcp]
-           volumes: [/shared]
-           binds:
-            - ${target.folder}/test-classes/docker/mso:/shared
-           links:
-             - mariadb:mariadb
-             - jacoco-shared:jacoco-shared
-         jacoco-shared:
-            image: openecomp/jacoco:1.0
-            beforeStop:
-             - copy:
-                   from: /shared/jacoco-it.exec
-                   to: ${target.folder}/mso-automated-tests/
-            hostName: jacoco
-            volumes: [/shared]
-            binds:
-             - ${target.folder}/test-classes/docker/mso:/shared:ro
-         mariadb:
-            image: mariadb:10.1.11
-            beforeStop:
-                - log:
-                   to: ${target.folder}/mso-automated-tests/db/mariadb.log
-                   follow: false
-                   stdout: true
-                   stderr: true
-                   timestamps: true
-            exposedPorts: [3306/tcp]
-            await:
-             strategy: polling
-             ports: [3306]
-             sleepPollingTime: 15 s
-             iterations: 80
-            env: [MYSQL_ROOT_PASSWORD=Etoile19_]
-            portBindings: [3306/tcp]
-            hostName: mariadb
-            volumes: [/etc/mysql/conf.d,/docker-entrypoint-initdb.d]
-            binds:
-             - ${target.folder}/test-classes/docker/mariadb/conf1:/etc/mysql/conf.d:ro
-             - ${target.folder}/../../root-pack-extras/config-resources/mariadb:/docker-entrypoint-initdb.d:ro
-
-        </property>
-        <property name="shouldAllowToConnectToRunningContainers">false</property>
-        <property name="clean">true</property>
-        <property name="removeVolumes">true</property>
-        <property name="autoStartContainers">mso</property>
-    </extension>
-
-
-    <container qualifier="jboss-as" default="true">
-        <configuration>
-            <property name="managementAddress">${docker.hostname}</property>
-            <property name="managementPort">9990</property>
-            <property name="username">admin</property>
-            <property name="password">Kp8bJ4SXszM0WXlhak3eHlcse2gAw84vaoGGmJvUy2U</property>
-        </configuration>
-        <protocol type="Servlet 3.0">
-        	<property name="host">${docker.hostname}</property>
-        	<property name="port">18080</property>
-    	</protocol>
-    </container>
-
-
-</arquillian>
\ No newline at end of file
diff --git a/packages/arquillian-unit-tests/src/test/resources/docker/mariadb/conf1/mariadb1.cnf b/packages/arquillian-unit-tests/src/test/resources/docker/mariadb/conf1/mariadb1.cnf
deleted file mode 100644
index 0be1bd7..0000000
--- a/packages/arquillian-unit-tests/src/test/resources/docker/mariadb/conf1/mariadb1.cnf
+++ /dev/null
@@ -1,194 +0,0 @@
-# Example MySQL config file for medium systems.
-#
-# This is for a system with memory 8G where MySQL plays
-# an important part, or systems up to 128M where MySQL is used together with
-# other programs (such as a web server)
-#
-# In this file, you can use all long options that a program supports.
-# If you want to know which options a program supports, run the program
-# with the "--help" option.
-
-# The following options will be passed to all MySQL clients
-##[client]
-##user            = root
-##port            = 3306
-##socket          = //opt/app/mysql/mysql.sock
-
-# Here follows entries for some specific programs
-
-# The MySQL server
-[mysqld]
-##performance_schema
-
-slow_query_log =ON
-long_query_time =2
-slow_query_log_file =//var/lib/mysql/slow_query.log
-##basedir         = //opt/app/mysql/product/mariadb-10.1.11-linux-x86_64
-##datadir         = //opt/app/mysql/data
-##port            = 3306
-##socket          = //opt/app/mysql/mysql.sock
-skip-external-locking
-explicit_defaults_for_timestamp = true
-skip-symbolic-links
-local-infile = 0
-#ignore_db_dir=lost+found
-key_buffer_size = 16M
-max_allowed_packet = 4M
-table_open_cache = 100
-sort_buffer_size = 512K
-net_buffer_length = 8K
-read_buffer_size = 256K
-read_rnd_buffer_size = 512K
-myisam_sort_buffer_size = 8M
-max_connections = 500
-lower_case_table_names = 1
-thread_stack = 256K
-thread_cache_size = 25
-query_cache_size = 8M
-query_cache_type = 0
-query_prealloc_size = 512K
-query_cache_limit = 1M
-
-# Password validation
-##plugin-load-add=simple_password_check.so
-##simple_password_check_other_characters=0
-
-# Audit Log settings
-plugin-load-add=server_audit.so
-server_audit=FORCE_PLUS_PERMANENT
-server_audit_file_path=//var/lib/mysql/audit.log
-server_audit_file_rotate_size=50M
-server_audit_events=CONNECT,QUERY,TABLE
-server_audit_logging=on
-
-# Don't listen on a TCP/IP port at all. This can be a security enhancement,
-# if all processes that need to connect to mysqld run on the same host.
-# All interaction with mysqld must be made via Unix sockets or named pipes.
-# Note that using this option without enabling named pipes on Windows
-# (via the "enable-named-pipe" option) will render mysqld useless!
-#
-#skip-networking
-
-# Replication Master Server (default)
-# binary logging is required for replication
-##log-bin=//var/lib/mysql/mysql-bin
-
-# binary logging format - mixed recommended
-binlog_format=row
-
-# required unique id between 1 and 2^32 - 1
-# defaults to 1 if master-host is not set
-# but will not function as a master if omitted
-
-# Replication Slave (comment out master section to use this)
-#
-# To configure this host as a replication slave, you can choose between
-# two methods :
-#
-# 1) Use the CHANGE MASTER TO command (fully described in our manual) -
-#    the syntax is:
-#
-#    CHANGE MASTER TO MASTER_HOST=<host>, MASTER_PORT=<port>,
-#    MASTER_USER=<user>, MASTER_PASSWORD=<password> ;
-#
-#    where you replace <host>, <user>, <password> by quoted strings and
-#    <port> by the master's port number (3306 by default).
-#
-#    Example:
-#
-#    CHANGE MASTER TO MASTER_HOST='125.564.12.1', MASTER_PORT=3306,
-#    MASTER_USER='joe', MASTER_PASSWORD='secret';
-#
-# OR
-#
-# 2) Set the variables below. However, in case you choose this method, then
-#    start replication for the first time (even unsuccessfully, for example
-#    if you mistyped the password in master-password and the slave fails to
-#    connect), the slave will create a master.info file, and any later
-#    change in this file to the variables' values below will be ignored and
-#    overridden by the content of the master.info file, unless you shutdown
-#    the slave server, delete master.info and restart the slaver server.
-#    For that reason, you may want to leave the lines below untouched
-#    (commented) and instead use CHANGE MASTER TO (see above)
-#
-# required unique id between 2 and 2^32 - 1
-# (and different from the master)
-# defaults to 2 if master-host is set
-# but will not function as a slave if omitted
-#server-id       = 2
-#
-# The replication master for this slave - required
-#master-host     =   <hostname>
-#
-# The username the slave will use for authentication when connecting
-# to the master - required
-#master-user     =   <username>
-#
-# The password the slave will authenticate with when connecting to
-# the master - required
-#master-password =   <password>
-#
-# The port the master is listening on.
-# optional - defaults to 3306
-#master-port     =  <port>
-#
-# binary logging - not required for slaves, but recommended
-#log-bin=mysql-bin
-
-# Uncomment the following if you are using InnoDB tables
-##innodb_data_home_dir = //opt/app/mysql/data
-##innodb_data_file_path = ibdata1:20M:autoextend:max:32G
-##innodb_log_group_home_dir = //opt/app/mysql/iblogs
-# You can set .._buffer_pool_size up to 50 - 80 %
-# of RAM but beware of setting memory usage too high
-innodb_buffer_pool_size = 6380M
-#innodb_additional_mem_pool_size = 2M
-# Set .._log_file_size to 25 % of buffer pool size
-innodb_log_file_size = 150M
-innodb_log_files_in_group = 3
-innodb_log_buffer_size = 8M
-#innodb_flush_log_at_trx_commit = 1
-innodb_lock_wait_timeout = 50
-innodb_autoextend_increment = 100
-expire_logs_days = 8
-open_files_limit = 2000
-transaction-isolation=READ-COMMITTED
-####### Galera parameters #######
-## Galera Provider configuration
-wsrep_provider=/usr/lib/galera/libgalera_smm.so
-wsrep_provider_options="gcache.size=2G; gcache.page_size=1G"
-## Galera Cluster configuration
-wsrep_cluster_name="MSO-automated-tests-cluster"
-wsrep_cluster_address="gcomm://"
-#wsrep_cluster_address="gcomm://mariadb1,mariadb2,mariadb3"
-##wsrep_cluster_address="gcomm://192.169.3.184,192.169.3.185,192.169.3.186"
-## Galera Synchronization configuration
-wsrep_sst_method=rsync
-#wsrep_sst_method=xtrabackup-v2
-#wsrep_sst_auth="sstuser:Mon#2o!6"
-## Galera Node configuration
-wsrep_node_name="mariadb1"
-##wsrep_node_address="192.169.3.184"
-wsrep_on=ON
-## Status notification
-#wsrep_notify_cmd=/opt/app/mysql/bin/wsrep_notify
-#######
-
-
-[mysqldump]
-quick
-max_allowed_packet = 16M
-
-[mysql]
-no-auto-rehash
-# Remove the next comment character if you are not familiar with SQL
-#safe-updates
-
-[myisamchk]
-key_buffer_size = 20971520
-
-##[mysqlhotcopy]
-##interactive-timeout
-##[mysqld_safe]
-##malloc-lib=//opt/app/mysql/local/lib/libjemalloc.so.1
-##log-error=//opt/app/mysql/log/mysqld.log
\ No newline at end of file
diff --git a/packages/arquillian-unit-tests/src/test/resources/docker/mariadb/conf2/mariadb2.cnf b/packages/arquillian-unit-tests/src/test/resources/docker/mariadb/conf2/mariadb2.cnf
deleted file mode 100644
index bf5f9c1..0000000
--- a/packages/arquillian-unit-tests/src/test/resources/docker/mariadb/conf2/mariadb2.cnf
+++ /dev/null
@@ -1,193 +0,0 @@
-# Example MySQL config file for medium systems.
-#
-# This is for a system with memory 8G where MySQL plays
-# an important part, or systems up to 128M where MySQL is used together with
-# other programs (such as a web server)
-#
-# In this file, you can use all long options that a program supports.
-# If you want to know which options a program supports, run the program
-# with the "--help" option.
-
-# The following options will be passed to all MySQL clients
-##[client]
-##user            = root
-##port            = 3306
-##socket          = //opt/app/mysql/mysql.sock
-
-# Here follows entries for some specific programs
-
-# The MySQL server
-[mysqld]
-##performance_schema
-
-slow_query_log =ON
-long_query_time =2
-slow_query_log_file =//var/lib/mysql/slow_query.log
-##basedir         = //opt/app/mysql/product/mariadb-10.1.11-linux-x86_64
-##datadir         = //opt/app/mysql/data
-##port            = 3306
-##socket          = //opt/app/mysql/mysql.sock
-skip-external-locking
-explicit_defaults_for_timestamp = true
-skip-symbolic-links
-local-infile = 0
-#ignore_db_dir=lost+found
-key_buffer_size = 16M
-max_allowed_packet = 4M
-table_open_cache = 100
-sort_buffer_size = 512K
-net_buffer_length = 8K
-read_buffer_size = 256K
-read_rnd_buffer_size = 512K
-myisam_sort_buffer_size = 8M
-max_connections = 500
-lower_case_table_names = 1
-thread_stack = 256K
-thread_cache_size = 25
-query_cache_size = 8M
-query_cache_type = 0
-query_prealloc_size = 512K
-query_cache_limit = 1M
-
-# Password validation
-##plugin-load-add=simple_password_check.so
-##simple_password_check_other_characters=0
-
-# Audit Log settings
-plugin-load-add=server_audit.so
-server_audit=FORCE_PLUS_PERMANENT
-server_audit_file_path=//var/lib/mysql/audit.log
-server_audit_file_rotate_size=50M
-server_audit_events=CONNECT,QUERY,TABLE
-server_audit_logging=on
-
-# Don't listen on a TCP/IP port at all. This can be a security enhancement,
-# if all processes that need to connect to mysqld run on the same host.
-# All interaction with mysqld must be made via Unix sockets or named pipes.
-# Note that using this option without enabling named pipes on Windows
-# (via the "enable-named-pipe" option) will render mysqld useless!
-#
-#skip-networking
-
-# Replication Master Server (default)
-# binary logging is required for replication
-##log-bin=//var/lib/mysql/mysql-bin
-
-# binary logging format - mixed recommended
-binlog_format=row
-
-# required unique id between 1 and 2^32 - 1
-# defaults to 1 if master-host is not set
-# but will not function as a master if omitted
-
-# Replication Slave (comment out master section to use this)
-#
-# To configure this host as a replication slave, you can choose between
-# two methods :
-#
-# 1) Use the CHANGE MASTER TO command (fully described in our manual) -
-#    the syntax is:
-#
-#    CHANGE MASTER TO MASTER_HOST=<host>, MASTER_PORT=<port>,
-#    MASTER_USER=<user>, MASTER_PASSWORD=<password> ;
-#
-#    where you replace <host>, <user>, <password> by quoted strings and
-#    <port> by the master's port number (3306 by default).
-#
-#    Example:
-#
-#    CHANGE MASTER TO MASTER_HOST='125.564.12.1', MASTER_PORT=3306,
-#    MASTER_USER='joe', MASTER_PASSWORD='secret';
-#
-# OR
-#
-# 2) Set the variables below. However, in case you choose this method, then
-#    start replication for the first time (even unsuccessfully, for example
-#    if you mistyped the password in master-password and the slave fails to
-#    connect), the slave will create a master.info file, and any later
-#    change in this file to the variables' values below will be ignored and
-#    overridden by the content of the master.info file, unless you shutdown
-#    the slave server, delete master.info and restart the slaver server.
-#    For that reason, you may want to leave the lines below untouched
-#    (commented) and instead use CHANGE MASTER TO (see above)
-#
-# required unique id between 2 and 2^32 - 1
-# (and different from the master)
-# defaults to 2 if master-host is set
-# but will not function as a slave if omitted
-#server-id       = 2
-#
-# The replication master for this slave - required
-#master-host     =   <hostname>
-#
-# The username the slave will use for authentication when connecting
-# to the master - required
-#master-user     =   <username>
-#
-# The password the slave will authenticate with when connecting to
-# the master - required
-#master-password =   <password>
-#
-# The port the master is listening on.
-# optional - defaults to 3306
-#master-port     =  <port>
-#
-# binary logging - not required for slaves, but recommended
-#log-bin=mysql-bin
-
-# Uncomment the following if you are using InnoDB tables
-##innodb_data_home_dir = //opt/app/mysql/data
-##innodb_data_file_path = ibdata1:20M:autoextend:max:32G
-##innodb_log_group_home_dir = //opt/app/mysql/iblogs
-# You can set .._buffer_pool_size up to 50 - 80 %
-# of RAM but beware of setting memory usage too high
-innodb_buffer_pool_size = 6380M
-#innodb_additional_mem_pool_size = 2M
-# Set .._log_file_size to 25 % of buffer pool size
-innodb_log_file_size = 150M
-innodb_log_files_in_group = 3
-innodb_log_buffer_size = 8M
-#innodb_flush_log_at_trx_commit = 1
-innodb_lock_wait_timeout = 50
-innodb_autoextend_increment = 100
-expire_logs_days = 8
-open_files_limit = 2000
-transaction-isolation=READ-COMMITTED
-####### Galera parameters #######
-## Galera Provider configuration
-wsrep_provider=/usr/lib/galera/libgalera_smm.so
-wsrep_provider_options="gcache.size=2G; gcache.page_size=1G"
-## Galera Cluster configuration
-wsrep_cluster_name="MSO-automated-tests-cluster"
-wsrep_cluster_address="gcomm://mariadb1,mariadb2,mariadb3"
-##wsrep_cluster_address="gcomm://192.169.3.184,192.169.3.185,192.169.3.186"
-## Galera Synchronization configuration
-wsrep_sst_method=rsync
-#wsrep_sst_method=xtrabackup-v2
-#wsrep_sst_auth="sstuser:Mon#2o!6"
-## Galera Node configuration
-wsrep_node_name="mariadb2"
-##wsrep_node_address="192.169.3.184"
-wsrep_on=ON
-## Status notification
-#wsrep_notify_cmd=/opt/app/mysql/bin/wsrep_notify
-#######
-
-
-[mysqldump]
-quick
-max_allowed_packet = 16M
-
-[mysql]
-no-auto-rehash
-# Remove the next comment character if you are not familiar with SQL
-#safe-updates
-
-[myisamchk]
-key_buffer_size = 20971520
-
-##[mysqlhotcopy]
-##interactive-timeout
-##[mysqld_safe]
-##malloc-lib=//opt/app/mysql/local/lib/libjemalloc.so.1
-##log-error=//opt/app/mysql/log/mysqld.log
\ No newline at end of file
diff --git a/packages/arquillian-unit-tests/src/test/resources/docker/mariadb/conf3/mariadb3.cnf b/packages/arquillian-unit-tests/src/test/resources/docker/mariadb/conf3/mariadb3.cnf
deleted file mode 100644
index 74f7a31..0000000
--- a/packages/arquillian-unit-tests/src/test/resources/docker/mariadb/conf3/mariadb3.cnf
+++ /dev/null
@@ -1,193 +0,0 @@
-# Example MySQL config file for medium systems.
-#
-# This is for a system with memory 8G where MySQL plays
-# an important part, or systems up to 128M where MySQL is used together with
-# other programs (such as a web server)
-#
-# In this file, you can use all long options that a program supports.
-# If you want to know which options a program supports, run the program
-# with the "--help" option.
-
-# The following options will be passed to all MySQL clients
-##[client]
-##user            = root
-##port            = 3306
-##socket          = //opt/app/mysql/mysql.sock
-
-# Here follows entries for some specific programs
-
-# The MySQL server
-[mysqld]
-##performance_schema
-
-slow_query_log =ON
-long_query_time =2
-slow_query_log_file =//var/lib/mysql/slow_query.log
-##basedir         = //opt/app/mysql/product/mariadb-10.1.11-linux-x86_64
-##datadir         = //opt/app/mysql/data
-##port            = 3306
-##socket          = //opt/app/mysql/mysql.sock
-skip-external-locking
-explicit_defaults_for_timestamp = true
-skip-symbolic-links
-local-infile = 0
-#ignore_db_dir=lost+found
-key_buffer_size = 16M
-max_allowed_packet = 4M
-table_open_cache = 100
-sort_buffer_size = 512K
-net_buffer_length = 8K
-read_buffer_size = 256K
-read_rnd_buffer_size = 512K
-myisam_sort_buffer_size = 8M
-max_connections = 500
-lower_case_table_names = 1
-thread_stack = 256K
-thread_cache_size = 25
-query_cache_size = 8M
-query_cache_type = 0
-query_prealloc_size = 512K
-query_cache_limit = 1M
-
-# Password validation
-##plugin-load-add=simple_password_check.so
-##simple_password_check_other_characters=0
-
-# Audit Log settings
-plugin-load-add=server_audit.so
-server_audit=FORCE_PLUS_PERMANENT
-server_audit_file_path=//var/lib/mysql/audit.log
-server_audit_file_rotate_size=50M
-server_audit_events=CONNECT,QUERY,TABLE
-server_audit_logging=on
-
-# Don't listen on a TCP/IP port at all. This can be a security enhancement,
-# if all processes that need to connect to mysqld run on the same host.
-# All interaction with mysqld must be made via Unix sockets or named pipes.
-# Note that using this option without enabling named pipes on Windows
-# (via the "enable-named-pipe" option) will render mysqld useless!
-#
-#skip-networking
-
-# Replication Master Server (default)
-# binary logging is required for replication
-##log-bin=//var/lib/mysql/mysql-bin
-
-# binary logging format - mixed recommended
-binlog_format=row
-
-# required unique id between 1 and 2^32 - 1
-# defaults to 1 if master-host is not set
-# but will not function as a master if omitted
-
-# Replication Slave (comment out master section to use this)
-#
-# To configure this host as a replication slave, you can choose between
-# two methods :
-#
-# 1) Use the CHANGE MASTER TO command (fully described in our manual) -
-#    the syntax is:
-#
-#    CHANGE MASTER TO MASTER_HOST=<host>, MASTER_PORT=<port>,
-#    MASTER_USER=<user>, MASTER_PASSWORD=<password> ;
-#
-#    where you replace <host>, <user>, <password> by quoted strings and
-#    <port> by the master's port number (3306 by default).
-#
-#    Example:
-#
-#    CHANGE MASTER TO MASTER_HOST='125.564.12.1', MASTER_PORT=3306,
-#    MASTER_USER='joe', MASTER_PASSWORD='secret';
-#
-# OR
-#
-# 2) Set the variables below. However, in case you choose this method, then
-#    start replication for the first time (even unsuccessfully, for example
-#    if you mistyped the password in master-password and the slave fails to
-#    connect), the slave will create a master.info file, and any later
-#    change in this file to the variables' values below will be ignored and
-#    overridden by the content of the master.info file, unless you shutdown
-#    the slave server, delete master.info and restart the slaver server.
-#    For that reason, you may want to leave the lines below untouched
-#    (commented) and instead use CHANGE MASTER TO (see above)
-#
-# required unique id between 2 and 2^32 - 1
-# (and different from the master)
-# defaults to 2 if master-host is set
-# but will not function as a slave if omitted
-#server-id       = 2
-#
-# The replication master for this slave - required
-#master-host     =   <hostname>
-#
-# The username the slave will use for authentication when connecting
-# to the master - required
-#master-user     =   <username>
-#
-# The password the slave will authenticate with when connecting to
-# the master - required
-#master-password =   <password>
-#
-# The port the master is listening on.
-# optional - defaults to 3306
-#master-port     =  <port>
-#
-# binary logging - not required for slaves, but recommended
-#log-bin=mysql-bin
-
-# Uncomment the following if you are using InnoDB tables
-##innodb_data_home_dir = //opt/app/mysql/data
-##innodb_data_file_path = ibdata1:20M:autoextend:max:32G
-##innodb_log_group_home_dir = //opt/app/mysql/iblogs
-# You can set .._buffer_pool_size up to 50 - 80 %
-# of RAM but beware of setting memory usage too high
-innodb_buffer_pool_size = 6380M
-#innodb_additional_mem_pool_size = 2M
-# Set .._log_file_size to 25 % of buffer pool size
-innodb_log_file_size = 150M
-innodb_log_files_in_group = 3
-innodb_log_buffer_size = 8M
-#innodb_flush_log_at_trx_commit = 1
-innodb_lock_wait_timeout = 50
-innodb_autoextend_increment = 100
-expire_logs_days = 8
-open_files_limit = 2000
-transaction-isolation=READ-COMMITTED
-####### Galera parameters #######
-## Galera Provider configuration
-wsrep_provider=/usr/lib/galera/libgalera_smm.so
-wsrep_provider_options="gcache.size=2G; gcache.page_size=1G"
-## Galera Cluster configuration
-wsrep_cluster_name="MSO-automated-tests-cluster"
-wsrep_cluster_address="gcomm://mariadb1,mariadb2,mariadb3"
-##wsrep_cluster_address="gcomm://192.169.3.184,192.169.3.185,192.169.3.186"
-## Galera Synchronization configuration
-wsrep_sst_method=rsync
-#wsrep_sst_method=xtrabackup-v2
-#wsrep_sst_auth="sstuser:Mon#2o!6"
-## Galera Node configuration
-wsrep_node_name="mariadb3"
-##wsrep_node_address="192.169.3.184"
-wsrep_on=ON
-## Status notification
-#wsrep_notify_cmd=/opt/app/mysql/bin/wsrep_notify
-#######
-
-
-[mysqldump]
-quick
-max_allowed_packet = 16M
-
-[mysql]
-no-auto-rehash
-# Remove the next comment character if you are not familiar with SQL
-#safe-updates
-
-[myisamchk]
-key_buffer_size = 20971520
-
-##[mysqlhotcopy]
-##interactive-timeout
-##[mysqld_safe]
-##malloc-lib=//opt/app/mysql/local/lib/libjemalloc.so.1
-##log-error=//opt/app/mysql/log/mysqld.log
\ No newline at end of file
diff --git a/packages/arquillian-unit-tests/src/test/resources/docker/mso/mso-docker.json b/packages/arquillian-unit-tests/src/test/resources/docker/mso/mso-docker.json
deleted file mode 100644
index d49645a..0000000
--- a/packages/arquillian-unit-tests/src/test/resources/docker/mso/mso-docker.json
+++ /dev/null
@@ -1,230 +0,0 @@
-{
-    "name": "mso-docker",
-    "description": "MSO Docker Images",
-    "chef_type": "environment",
-    "json_class": "Chef::Environment",
-    "default_attributes":
-    {
-        "mso_config_path": "/etc/mso/config.d/",
-
-        "mso-api-handler-infra-config":
-        {
-            "bpelURL": "http://mso:8080",
-            "bpelAuth": "786864AA53D0DCD881AED1154230C0C3058D58B9339D2EFB6193A0F0D82530E1",
-            "camundaURL": "http://mso:8080",
-            "camundaAuth": "5119D1AF37F671FC01FFAD2151D93EFB2BBB503E879FD07104D024EDDF118FD1"
-        },
-
-        "mso-asdc-controller-config":
-        {
-          "aaiEndpoint": "https://aai.api.simpledemo.onap.org:8443"
-        },
-
-        "asdc-connections":
-        {
-            "asdc-controller1":
-            {
-                "user": "user",
-                "consumerGroup": "mso",
-                "consumerId": "mso",
-                "environmentName": "PROD",
-                "asdcAddress": "asdc_hostname1:8443",
-                "password": "f3895035812addbf115bfaf7d2dc850e",
-                "pollingInterval": 30,
-                "pollingTimeout": 30,
-                "relevantArtifactTypes": "HEAT,HEAT_ENV,HEAT_VOL",
-                "activateServerTLSAuth": "false",
-                "keyStorePassword": "",
-                "keyStorePath": ""
-            },
-
-            "asdc-controller2":
-            {
-                "user": "user",
-                "consumerGroup": "mso",
-                "consumerId": "mso",
-                "environmentName": "PROD",
-                "asdcAddress": "asdc_hostname2:8443",
-                "password": "f3895035812addbf115bfaf7d2dc850e",
-                "pollingInterval": 30,
-                "pollingTimeout": 30,
-                "relevantArtifactTypes": "HEAT,HEAT_ENV,HEAT_VOL",
-                "activateServerTLSAuth": "false",
-                "keyStorePassword": "",
-                "keyStorePath": ""
-            }
-        },
-
-        "mso-sdnc-adapter-config":
-        {
-            "sdncurls":
-            [
-                "https://localhost:8443/restconf/operations/L3SDN-API:",
-                "https://localhost:8443/restconf/config/L3SDN-API:",
-                "https://localhost:8443/restconf/operations/Firewall-API:",
-                "https://localhost:8443/restconf/config",
-                "https://localhost:8443/restconf/operations/VNF-API:",
-                "https://localhost:8443/restconf/operations/NBNC-API:",
-                "https://localhost:8443/restconf/operations/NORTHBOUND-API:service-topology-operation",
-                "https://localhost:8443/restconf/operations/GENERIC-RESOURCE-API:",
-                "https://localhost:8443/restconf/operations/VNFTOPOLOGYAIC-API:"
-            ],
-
-            "bpelurl": "http://mso:8080/mso/SDNCAdapterCallbackService",
-            "myurl": "http://mso:8080/adapters/rest/SDNCNotify",
-            "sdncauth": "406B2AE613211B6FB52466DE6E1769AC",
-            "bpelauth": "5119D1AF37F671FC01FFAD2151D93EFB2BBB503E879FD07104D024EDDF118FD1",
-            "sdncconnecttime": "5000"
-        },
-
-        "mso-po-adapter-config":
-        {
-            "identity_services":
-            [
-                {
-                    "dcp_clli": "MT_KEYSTONE",
-                    "identity_url": "https://localhost:5000/v2.0",
-                    "mso_id": "userid",
-                    "mso_pass": "313DECE408AF7759D442D7B06DD9A6AA",
-                    "admin_tenant": "service",
-                    "member_role": "admin",
-                    "tenant_metadata": "true",
-                    "identity_server_type": "KEYSTONE",
-                    "identity_authentication_type": "RACKSPACE_APIKEY"
-                },
-
-                {
-                    "dcp_clli": "MT_KEYSTONE2",
-                    "identity_url": "https://localhost:5000/v2.0",
-                    "mso_id": "userid",
-                    "mso_pass": "313DECE408AF7759D442D7B06DD9A6AA",
-                    "admin_tenant": "service",
-                    "member_role": "admin",
-                     "tenant_metadata": "true",
-                    "identity_server_type": "KEYSTONE",
-                    "identity_authentication_type": "USERNAME_PASSWORD"
-                }
-            ],
-
-            "cloud_sites":
-            [
-                {
-                    "id": "MT",
-                    "aic_version": "2.5",
-                    "lcp_clli": "MT",
-                    "region_id": "lcp_region",
-                    "identity_service_id": "MT_KEYSTONE"
-                },
-
-                {
-                    "id": "MT2",
-                    "aic_version": "2.5",
-                    "lcp_clli": "MT2",
-                    "region_id": "lcp_region",
-                    "identity_service_id": "MT_KEYSTONE2"
-                }
-            ],
-
-            "vnfbpelauth": "5119D1AF37F671FC01FFAD2151D93EFB2BBB503E879FD07104D024EDDF118FD1",
-            "checkrequiredparameters": "true",
-            "nwbpelauth": "5119D1AF37F671FC01FFAD2151D93EFB2BBB503E879FD07104D024EDDF118FD1"
-        },
-
-        "mso-bpmn-config":
-        {
-            "urnFileSystemLoadingEnabled": "true"
-        },
-
-        "mso-bpmn-urn-config":
-        {
-            "logDebugAsyncQueryAAICustomer": "false",
-            "logDebugChangeFeatureActivateV1": "false",
-            "logDebugChangeLayer3ServiceActivateV1": "false",
-            "logDebugChangeLayer3ServiceProvV1": "false",
-            "logDebugLayer3TestAndTurnUpV1": "false",
-            "logDebugVnfAdapterRollbackV1": "false",
-            "logDebugVnfAdapterQueryV1": "false",
-            "logDebugCreateNetworkV1": "false",
-            "logDebugCreateCinderVolumeV1": "false",
-            "logDebugDeleteCinderVolumeV1": "false",
-            "logDebugUpdateCinderVolumeV1": "false",
-            "logDebugDeleteGenericVNFV1": "false",
-            "logDebugDisconnectLayer3Service": "false",
-            "logDebugCompleteMsoProcess": "false",
-            "logDebugCreateCustomerV1": "false",
-            "logDebugCreateTenantV1": "false",
-            "logDebugDeleteNetworkV1": "false",
-            "logDebugDeleteTenantV1": "false",
-            "logDebugDeleteVCEV1": "false",
-            "logDebugGetLayer3ServiceDetailsV1": "false",
-            "logDebugL3ToHigherLayerAddBonding": "false",
-            "logDebugL3ToHigherLayerDeleteBonding": "false",
-            "logDebugLayer3ServiceActivateV1": "false",
-            "logDebugQueryAAICustomer": "false",
-            "logDebugQueryTenantInfo": "false",
-            "logDebugSdncAdapter": "false",
-            "logDebugVnfAdapterCreateV1": "false",
-            "logDebugVnfAdapterDeleteV1": "false",
-            "logDebugRemoveLayer3Service": "false",
-            "logDebugUpdateNetworkV2": "false",
-            "logDebugCreateVfModuleVolumeInfraV1": "false",
-            "logDebugDeleteVfModuleVolumeInfraV1": "false",
-            "logDebugUpdateVfModuleVolumeInfraV1": "false",
-            "logDebugCreateServiceInstanceInfra": "false",
-            "logDebugDeleteServiceInstanceInfra": "false",
-            "logDebugCreateNetworkInstanceInfra": "false",
-            "logDebugDeleteNetworkInstanceInfra": "false",
-            "logDebugUpdateNetworkInstanceInfra": "false",
-            "aaiEndpoint": "http://mso:8080/aai-emul",
-            "adaptersCompletemsoprocessEndpoint": "http://mso:8080/CompleteMsoProcess",
-            "adaptersNamespace": "http://org.openecomp.mso",
-            "adaptersDbEndpoint": "http://mso:8080/dbadapters/MsoRequestsDbAdapter",
-            "adaptersOpenecompDbEndpoint": "http://mso:8080/dbadapters/RequestsDbAdapter",
-            "adaptersSdncEndpoint": "http://mso:8080/adapters/SDNCAdapter",
-            "adaptersTenantEndpoint": "http://mso:8080/tenants/TenantAdapter",
-            "adaptersDbAuth": "6B0E6863FB8EE010AB6F191B3C0489437601E81DC7C86305CB92DB98AFC53D74",
-            "workflowSdncadapterCallback": "http://mso:8080/mso/SDNCAdapterCallbackService",
-            "msoKey": "07a7159d3bf51a0e53be7a8f89699be7",
-            "adaptersPoAuth": "6B0E6863FB8EE010AB6F191B3C0489437601E81DC7C86305CB92DB98AFC53D74",
-            "sdncTimeout": "PT5M",
-            "rollback": "true",
-            "adaptersNetworkEndpoint": "http://mso:8080/networks/NetworkAdapter",
-            "adaptersNetworkRestEndpoint": "http://mso:8080/networks/rest/v1/networks",
-            "adaptersVnfAsyncEndpoint": "http://mso/vnfs/VnfAdapterAsync",
-            "workflowVnfAdapterDeleteCallback": "http://mso:8080/mso/vnfAdapterNotify",
-            "workflowVnfAdapterCreateCallback": "http://mso:8080/mso/vnfAdapterNotify",
-            "adaptersVnfRestEndpoint": "http://mso:8080/vnfs/rest/v1/vnfs",
-            "workflowVnfAdapterRestCallback": "http://mso:8080/mso/vnfAdapterRestNotify",
-            "poTimeout": "PT5M",
-            "sdncFirewallYangModel": "http://com/att/svc/mis/firewall-lite-gui",
-            "sdncFirewallYangModelVersion": "2015-05-15",
-            "sdncTimeoutFirewall": "20",
-            "callbackRetryAttempts": "30",
-            "callbackRetrySleepTime": "1000",
-            "workflowDefaultAAINetworkGenericVnfUri": "/aai/v8/network/generic-vnfs/generic-vnf",
-            "workflowDeleteGenericVNFV1AAINetworkGenericVnfUri": "/aai/v8/network/generic-vnfs/generic-vnf",
-            "workflowDefaultAAINetworkVpnBindingUri": "/aai/v8/network/vpn-bindings/vpn-binding",
-            "workflowCreateNetworkV1AAINetworkVpnBindingUri": "",
-            "workflowDefaultAAINetworkVceUri": "/aai/v8/network/vces/vce",
-            "workflowDeleteVCEV1AAINetworkVceUri": "",
-            "workflowDefaultAAINetworkL3NetworkUri": "/aai/v8/network/l3-networks/l3-network",
-            "workflowCreateNetworkV1AAINetworkL3NetworkUri": "/aai/v8/network/l3-networks/l3-network",
-            "workflowDeleteNetworkV1AAINetworkL3NetworkUri": "/aai/v8/network/l3-networks/l3-network",
-            "workflowDefaultAAIBusinessCustomerUri": "/aai/v8/business/customers/customer",
-            "workflowDefaultAAICloudInfrastructureVolumeGroupUri": "/aai/v8/cloud-infrastructure/volume-groups/volume-group",
-            "workflowCreateCinderVolumeV1AAICloudInfrastructureVolumeGroupUri": "",
-            "workflowDefaultAAICloudInfrastructureTenantUri": "/aai/v8/cloud-infrastructure/tenants/tenant",
-            "workflowDefaultAAISearchGenericQueryUri": "/aai/v8/search/generic-query",
-            "aaiAuth": "2630606608347B7124C244AB0FE34F6F"
-        }
-    },
-
-    "override_attributes":
-    {
-    },
-
-    "cookbook_versions":
-    {
-        "mso-config": "~> 1.0.0"
-    }
-}
diff --git a/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/demo-dns-V1/artifacts/base_vlb.env b/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/demo-dns-V1/artifacts/base_vlb.env
deleted file mode 100644
index b8cb810..0000000
--- a/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/demo-dns-V1/artifacts/base_vlb.env
+++ /dev/null
@@ -1,20 +0,0 @@
-parameters:
-  vlb_image_name: Ubuntu 14.04 LTS (Trusty Tahr) (PVHVM)
-  vlb_flavor_name: 4 GB General Purpose v1
-  public_net_id: 00000000-0000-0000-0000-000000000000
-  vlb_private_net_id: zdfw1lb01_private
-  ecomp_private_net_id: oam_ecomp
-  vlb_private_net_cidr: 192.168.10.0/24
-  ecomp_private_net_cidr: 192.168.9.0/24
-  vlb_private_ip_0: 192.168.10.100
-  vlb_private_ip_1: 192.168.20.100
-  vdns_private_ip_0: 192.168.10.200
-  vdns_private_ip_1: 192.168.9.200
-  vlb_name_0: zdfw1lb01lb01
-  vdns_name_0: zdfw1lb01dns01
-  vnf_id: vLoadBalancer_demo_app
-  vf_module_id: vLoadBalancer
-  webserver_ip: 162.242.237.182
-  dcae_collector_ip: 192.168.9.1
-  key_name: vfw_key
-  pub_key: INSERT PUBLIC KEY HERE
diff --git a/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/demo-dns-V1/artifacts/base_vlb.yaml b/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/demo-dns-V1/artifacts/base_vlb.yaml
deleted file mode 100644
index 089fcee..0000000
--- a/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/demo-dns-V1/artifacts/base_vlb.yaml
+++ /dev/null
@@ -1,188 +0,0 @@
-heat_template_version: 2013-05-23
-
-description: Heat template to deploy vLoadBalancer/vDNS demo app for OpenECOMP
-
-parameters:
-  vlb_image_name:
-    type: string
-    label: Image name or ID
-    description: Image to be used for compute instance
-  vlb_flavor_name:
-    type: string
-    label: Flavor
-    description: Type of instance (flavor) to be used
-  public_net_id:
-    type: string
-    label: Public network name or ID
-    description: Public network that enables remote connection to VNF
-  vlb_private_net_id:
-    type: string
-    label: vLoadBalancer private network name or ID
-    description: Private network that connects vLoadBalancer with vDNSs
-  ecomp_private_net_id:
-    type: string
-    label: ECOMP management network name or ID
-    description: Private network that connects ECOMP component and the VNF
-  vlb_private_net_cidr:
-    type: string
-    label: vLoadBalancer private network CIDR
-    description: The CIDR of the vLoadBalancer private network
-  ecomp_private_net_cidr:
-    type: string
-    label: ECOMP private network CIDR
-    description: The CIDR of the protected private network
-  vlb_private_ip_0:
-    type: string
-    label: vLoadBalancer private IP address towards the private network
-    description: Private IP address that is assigned to the vLoadBalancer to communicate with the vDNSs
-  vlb_private_ip_1:
-    type: string
-    label: vLoadBalancer private IP address towards the ECOMP management network
-    description: Private IP address that is assigned to the vLoadBalancer to communicate with ECOMP components
-  vdns_private_ip_0:
-    type: string
-    label: vDNS private IP address towards the private network
-    description: Private IP address that is assigned to the vDNS to communicate with the vLoadBalancer
-  vdns_private_ip_1:
-    type: string
-    label: vDNS private IP address towards the ECOMP management network
-    description: Private IP address that is assigned to the vDNS to communicate with ECOMP components
-  vlb_name_0:
-    type: string
-    label: vLoadBalancer name
-    description: Name of the vLoadBalancer
-  vdsn_name_0:
-    type: string
-    label: vDNS name
-    description: Name of the vDNS
-  vnf_id:
-    type: string
-    label: VNF ID
-    description: The VNF ID is provided by ECOMP
-  vf_module_id:
-    type: string
-    label: vFirewall module ID
-    description: The vLoadBalancer Module ID is provided by ECOMP
-  webserver_ip:
-    type: string
-    label: Webserver IP address
-    description: IP address of the webserver that hosts the source code and binaries
-  dcae_collector_ip:
-    type: string
-    label: DCAE collector IP address
-    description: IP address of the DCAE collector
-  key_name:
-    type: string
-    label: Key pair name
-    description: Public/Private key pair name
-  pub_key:
-    type: string
-    label: Public key
-    description: Public key to be installed on the compute instance
-
-resources:
-  my_keypair:
-    type: OS::Nova::KeyPair
-    properties:
-      name: { get_param: key_name }
-      public_key: { get_param: pub_key }
-      save_private_key: false
-
-  vlb_private_network:
-    type: OS::Neutron::Net
-    properties:
-      name: { get_param: vlb_private_net_id }
-
-  vlb_private_subnet:
-    type: OS::Neutron::Subnet
-    properties:
-      network_id: { get_resource: vlb_private_network }
-      cidr: { get_param: vlb_private_net_cidr }
-
-  vlb_0:
-    type: OS::Nova::Server
-    properties:
-      image: { get_param: vlb_image_name }
-      flavor: { get_param: vlb_flavor_name }
-      name: { get_param: vlb_name_0 }
-      key_name: { get_resource: my_keypair }
-      networks:
-        - network: { get_param: public_net_id }
-        - port: { get_resource: vlb_private_0_port }
-        - port: { get_resource: vlb_private_1_port }
-      metadata: {vnf_id: { get_param: vnf_id }, vf_module_id: { get_param: vf_module_id }}
-      user_data_format: RAW
-      user_data:
-        str_replace:
-          params:
-            __webserver__: { get_param: webserver_ip }
-            __dcae_collector_ip__ : { get_param: dcae_collector_ip }
-          template: |
-            #!/bin/bash
-
-            WEBSERVER_IP=__webserver__
-            DCAE_COLLECTOR_IP=__dcae_collector_ip__
-
-            mkdir /opt/config
-            cd /opt
-            wget http://$WEBSERVER_IP/demo_repo/v_lb_init.sh
-            chmod +x v_lb_init.sh
-            echo $WEBSERVER_IP > config/webserver_ip.txt
-            echo $DCAE_COLLECTOR_IP > config/dcae_collector_ip.txt
-            ./v_lb_init.sh
-
-  vlb_private_0_port:
-    type: OS::Neutron::Port
-    properties:
-      network: { get_resource: vlb_private_network }
-      fixed_ips: [{"subnet": { get_resource: vlb_private_subnet }, "ip_address": { get_param: vlb_private_ip_0 }}]
-
-  vlb_private_1_port:
-    type: OS::Neutron::Port
-    properties:
-      network: { get_param: ecomp_private_net_id }
-      fixed_ips: [{"subnet": { get_param: ecomp_private_net_id }, "ip_address": { get_param: vlb_private_ip_1 }}]
-
-  vdns_0:
-    type: OS::Nova::Server
-    properties:
-      image: { get_param: vlb_image_name }
-      flavor: { get_param: vlb_flavor_name }
-      name: { get_param: vdsn_name_0 }
-      key_name: { get_resource: my_keypair }
-      networks:
-        - network: { get_param: public_net_id }
-        - port: { get_resource: vdns_private_0_port }
-        - port: { get_resource: vdns_private_1_port }
-      metadata: {vnf_id: { get_param: vnf_id }, vf_module_id: { get_param: vf_module_id }}
-      user_data_format: RAW
-      user_data:
-        str_replace:
-          params:
-            __webserver__: { get_param: webserver_ip }
-            __fw_ipaddr__: { get_param: vlb_private_ip_0 }
-          template: |
-            #!/bin/bash
-
-            WEBSERVER_IP=__webserver__
-            LB_IPADDR=__lb_ipaddr__
-
-            mkdir /opt/config
-            cd /opt
-            wget http://$WEBSERVER_IP/demo_repo/v_dns_init.sh
-            chmod +x v_dns_init.sh
-            echo $WEBSERVER_IP > config/webserver_ip.txt
-            echo $LB_IPADDR > config/lb_ipaddr.txt
-            ./v_dns_init.sh
-
-  vdns_private_0_port:
-    type: OS::Neutron::Port
-    properties:
-      network: { get_resource: vlb_private_network }
-      fixed_ips: [{"subnet": { get_resource: vlb_private_subnet }, "ip_address": { get_param: vdns_private_ip_0 }}]
-
-  vdns_private_1_port:
-    type: OS::Neutron::Port
-    properties:
-      network: { get_param: ecomp_private_net_id }
-      fixed_ips: [{"subnet": { get_param: ecomp_private_net_id }, "ip_address": { get_param: vdns_private_ip_1 }}]
diff --git a/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/demo-dns-V1/artifacts/dnsscaling.env b/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/demo-dns-V1/artifacts/dnsscaling.env
deleted file mode 100644
index 15895ac..0000000
--- a/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/demo-dns-V1/artifacts/dnsscaling.env
+++ /dev/null
@@ -1,16 +0,0 @@
-parameters:
-  vlb_image_name: Ubuntu 14.04 LTS (Trusty Tahr) (PVHVM)
-  vlb_flavor_name: 4 GB General Purpose v1
-  public_net_id: 00000000-0000-0000-0000-000000000000
-  vlb_private_net_id: zdfw1lb01_private
-  ecomp_private_net_id: oam_ecomp
-  vlb_private_ip_0: 192.168.10.100
-  vdns_private_ip_0: 192.168.10.200
-  vdns_private_ip_1: 192.168.9.200
-  vdns_name_0: zdfw1lb01dns01
-  vnf_id: vLoadBalancer_demo_app
-  vf_module_id: vLoadBalancer
-  webserver_ip: 162.242.237.182
-  dcae_collector_ip: 192.168.9.1
-  key_name: vfw_key
-  pub_key: INSERT PUBLIC KEY HERE
\ No newline at end of file
diff --git a/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/demo-dns-V1/artifacts/dnsscaling.yaml b/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/demo-dns-V1/artifacts/dnsscaling.yaml
deleted file mode 100644
index 6ec4b0b..0000000
--- a/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/demo-dns-V1/artifacts/dnsscaling.yaml
+++ /dev/null
@@ -1,117 +0,0 @@
-heat_template_version: 2013-05-23
-
-description: Heat template to deploy a vDNS for OpenECOMP (scaling-up scenario)
-
-parameters:
-  vlb_image_name:
-    type: string
-    label: Image name or ID
-    description: Image to be used for compute instance
-  vlb_flavor_name:
-    type: string
-    label: Flavor
-    description: Type of instance (flavor) to be used
-  public_net_id:
-    type: string
-    label: Public network name or ID
-    description: Public network that enables remote connection to VNF
-  vlb_private_net_id:
-    type: string
-    label: vLoadBalancer private network name or ID
-    description: Private network that connects vLoadBalancer with vDNSs
-  ecomp_private_net_id:
-    type: string
-    label: ECOMP management network name or ID
-    description: Private network that connects ECOMP component and the VNF
-  vlb_private_ip_0:
-    type: string
-    label: vLoadBalancer private IP address towards the private network
-    description: Private IP address that is assigned to the vLoadBalancer to communicate with the vDNSs
-  vdns_private_ip_0:
-    type: string
-    label: vDNS private IP address towards the private network
-    description: Private IP address that is assigned to the vDNS to communicate with the vLoadBalancer
-  vdns_private_ip_1:
-    type: string
-    label: vDNS private IP address towards the ECOMP management network
-    description: Private IP address that is assigned to the vDNS to communicate with ECOMP components
-  vdsn_name_0:
-    type: string
-    label: vDNS name
-    description: Name of the vDNS
-  vnf_id:
-    type: string
-    label: VNF ID
-    description: The VNF ID is provided by ECOMP
-  vf_module_id:
-    type: string
-    label: vFirewall module ID
-    description: The vLoadBalancer Module ID is provided by ECOMP
-  webserver_ip:
-    type: string
-    label: Webserver IP address
-    description: IP address of the webserver that hosts the source code and binaries
-  dcae_collector_ip:
-    type: string
-    label: DCAE collector IP address
-    description: IP address of the DCAE collector
-  key_name:
-    type: string
-    label: Key pair name
-    description: Public/Private key pair name
-  pub_key:
-    type: string
-    label: Public key
-    description: Public key to be installed on the compute instance
-
-resources:
-  my_keypair:
-    type: OS::Nova::KeyPair
-    properties:
-      name: { get_param: key_name }
-      public_key: { get_param: pub_key }
-      save_private_key: false
-
-  vdns_0:
-    type: OS::Nova::Server
-    properties:
-      image: { get_param: vlb_image_name }
-      flavor: { get_param: vlb_flavor_name }
-      name: { get_param: vdsn_name_0 }
-      key_name: { get_resource: my_keypair }
-      networks:
-        - network: { get_param: public_net_id }
-        - port: { get_resource: vdns_private_0_port }
-        - port: { get_resource: vdns_private_1_port }
-      metadata: {vnf_id: { get_param: vnf_id }, vf_module_id: { get_param: vf_module_id }}
-      user_data_format: RAW
-      user_data:
-        str_replace:
-          params:
-            __webserver__: { get_param: webserver_ip }
-            __fw_ipaddr__: { get_param: vlb_private_ip_0 }
-          template: |
-            #!/bin/bash
-
-            WEBSERVER_IP=__webserver__
-            LB_IPADDR=__lb_ipaddr__
-
-            mkdir /opt/config
-            cd /opt
-            wget http://$WEBSERVER_IP/demo_repo/v_dns_init.sh
-            chmod +x v_dns_init.sh
-            echo $WEBSERVER_IP > config/webserver_ip.txt
-            echo $LB_IPADDR > config/lb_ipaddr.txt
-            ./v_dns_init.sh
-
-  vdns_private_0_port:
-    type: OS::Neutron::Port
-    properties:
-      network: { get_param: vlb_private_net_id }
-      fixed_ips: [{"subnet": { get_param: vlb_private_net_id }, "ip_address": { get_param: vdns_private_ip_0 }}]
-
-  vdns_private_1_port:
-    type: OS::Neutron::Port
-    properties:
-      network: { get_param: ecomp_private_net_id }
-      fixed_ips: [{"subnet": { get_param: ecomp_private_net_id }, "ip_address": { get_param: vdns_private_ip_1 }}]
diff --git a/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/demo-dns-V1/artifacts/vnf-module-artifact.json b/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/demo-dns-V1/artifacts/vnf-module-artifact.json
deleted file mode 100644
index 9f51e83..0000000
--- a/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/demo-dns-V1/artifacts/vnf-module-artifact.json
+++ /dev/null
@@ -1,30 +0,0 @@
-[
-  {
-    "vfModuleModelName": "VF_RI1_DNS::module-1",
-    "vfModuleModelInvariantUUID": "585822c7-4027-4f84-ba50-e9248606f132",
-    "vfModuleModelVersion": "1.0",
-    "vfModuleModelUUID": "1e34774e-715e-4fd5-bd08-7b654622f33e.VF_RI1_DNS::module-1::module-1.group",
-    "vfModuleModelDescription": "vf Module Description",
-    "vfModuleModelCustomizationUUID": "585822c7-4027-4f84-ba50-e9248606f132",
-    "isBase": true,
-    "artifacts": [
-      "Artifact-UUID1",
-      "EnvArtifact-UUID1"
-    ],
-    "properties": {"test":"test"}
-  },
-  {
-    "vfModuleModelName": "VF_RI1_DNS::module-2",
-    "vfModuleModelInvariantUUID": "585822c7-4027-4f84-ba50-e9248606f133",
-    "vfModuleModelVersion": "1.0",
-    "vfModuleModelUUID": "1e34774e-715e-4fd5-bd08-7b654622f33e.VF_RI1_DNS::module-2::module-1.group",
-    "vfModuleModelDescription": "vf Module Description",
-    "vfModuleModelCustomizationUUID": "585822c7-4027-4f84-ba50-e9248606f133",
-    "isBase": false,
-    "artifacts": [
-      "Artifact-UUID2",
-      "EnvArtifact-UUID2"
-    ],
-    "properties": {"test":"test"}
-  }
-]
\ No newline at end of file
diff --git a/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/demo-dns-V1/notif-structure.json b/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/demo-dns-V1/notif-structure.json
deleted file mode 100644
index ebda7b7..0000000
--- a/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/demo-dns-V1/notif-structure.json
+++ /dev/null
@@ -1,95 +0,0 @@
-{
-    "serviceName": "dns-service",
-    "serviceInvariantUUID": "585822c8-4027-4f84-ba50-e9248606f111",
-    "serviceUUID": "1e34774e-715e-4fd6-bd09-7b654622f35i",
-    "serviceVersion": "1.0",
-    "serviceArtifacts":
-    [
-
-    ],
-
-    "resources":
-    [
-        {
-            "resourceInstanceName": "DNSResource-1",
-            "resourceInvariantUUID": "585822c7-4027-4f84-ba50-e9248606f112",
-            "resourceName": "DNSResource",
-            "resourceType": "VF",
-            "resourceUUID": "585822c7-4027-4f84-ba50-e9248606f131",
-            "resourceVersion": "1.0",
-            "category":  "category",
-            "artifacts":
-            [
-                {
-                    "artifactChecksum": "CheckSum",
-                    "artifactDescription": "Meta data for VFModule",
-                    "artifactName": "vnf-module-artifact.json",
-
-                    "artifactType": "VF_MODULES_METADATA",
-                    "artifactURL": "vnf-module-artifact.json",
-                    "artifactUUID": "VfArtifact-UUID1",
-                    "artifactVersion": "1.0"
-
-                },
-                {
-                    "artifactChecksum": "CheckSum",
-                    "artifactDescription": "Base VLB Heat",
-                    "artifactName": "base_vlb.yaml",
-                    "artifactTimeout": 300,
-                    "artifactType": "HEAT",
-                    "artifactURL": "base_vlb.yaml",
-                    "artifactUUID": "Artifact-UUID1",
-                    "artifactVersion": "1.0",
-                    "generatedArtifact": "EnvArtifact-UUID1",
-                    "relatedArtifact":
-                    [
-
-                    ]
-                },
-
-                {
-                    "artifactChecksum": "CheckSum",
-                    "artifactDescription": "BASE VLB ENV file",
-                    "artifactName": "base_vlb.env",
-
-                    "artifactType": "HEAT_ENV",
-                    "artifactURL": "base_vlb.env",
-                    "artifactUUID": "EnvArtifact-UUID1",
-                    "artifactVersion": "1.0"
-
-                },
-            	{
-                    "artifactChecksum": "CheckSum",
-                    "artifactDescription": "DNS Scaling Heat",
-                    "artifactName": "dnsscaling.yaml",
-                    "artifactTimeout": 300,
-                    "artifactType": "HEAT",
-                    "artifactURL": "dnsscaling.yaml",
-                    "artifactUUID": "Artifact-UUID2",
-                    "artifactVersion": "1.0",
-                    "generatedArtifact": "EnvArtifact-UUID2",
-                    "relatedArtifact":
-                    [
-
-                    ]
-                },
-
-                {
-                    "artifactChecksum": "CheckSum",
-                    "artifactDescription": "DNS Scaling ENV file",
-                    "artifactName": "dnsscaling.env",
-
-                    "artifactType": "HEAT_ENV",
-                    "artifactURL": "dnsscaling.env",
-                    "artifactUUID": "EnvArtifact-UUID2",
-                    "artifactVersion": "1.0"
-
-                }
-
-            ]
-        }
-    ],
-
-    "serviceDescription": "dns service for unit test",
-    "distributionID": "35120a87-1f83-4276-9735-f6de5a244d61"
-}
\ No newline at end of file
diff --git a/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/demo-vfw-V1/artifacts/base_vfw.env b/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/demo-vfw-V1/artifacts/base_vfw.env
deleted file mode 100644
index 27ccb3b..0000000
--- a/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/demo-vfw-V1/artifacts/base_vfw.env
+++ /dev/null
@@ -1,26 +0,0 @@
-parameters:
-  vfw_image_name: Ubuntu 14.04 LTS (Trusty Tahr) (PVHVM)
-  vfw_flavor_name: 4 GB General Purpose v1
-  public_net_id: 00000000-0000-0000-0000-000000000000
-  unprotected_private_net_id: zdfw1fwl01_unprotected
-  protected_private_net_id: zdfw1fwl01_protected
-  ecomp_private_net_id: oam_ecomp
-  unprotected_private_net_cidr: 192.168.10.0/24
-  protected_private_net_cidr: 192.168.20.0/24
-  ecomp_private_net_cidr: 192.168.9.0/24
-  vfw_private_ip_0: 192.168.10.100
-  vfw_private_ip_1: 192.168.20.100
-  vfw_private_ip_2: 192.168.9.100
-  vpg_private_ip_0: 192.168.10.200
-  vpg_private_ip_1: 192.168.9.200
-  vsn_private_ip_0: 192.168.20.250
-  vsn_private_ip_1: 192.168.9.250
-  vfw_name_0: zdfw1fwl01fwl01
-  vpg_name_0: zdfw1fwl01pgn01
-  vsn_name_0: zdfw1fwl01snk01
-  vnf_id: vFirewall_demo_app
-  vf_module_id: vFirewall
-  webserver_ip: 162.242.237.182
-  dcae_collector_ip: 192.168.9.1
-  key_name: vfw_key
-  pub_key: PUT YOUR PUBLIC KEY HERE
diff --git a/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/demo-vfw-V1/artifacts/base_vfw.yaml b/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/demo-vfw-V1/artifacts/base_vfw.yaml
deleted file mode 100644
index d4e89ad..0000000
--- a/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/demo-vfw-V1/artifacts/base_vfw.yaml
+++ /dev/null
@@ -1,298 +0,0 @@
-heat_template_version: 2013-05-23
-
-description: Heat template to deploy vFirewall demo app for OpenECOMP
-
-parameters:
-  vfw_image_name:
-    type: string
-    label: Image name or ID
-    description: Image to be used for compute instance
-  vfw_flavor_name:
-    type: string
-    label: Flavor
-    description: Type of instance (flavor) to be used
-  public_net_id:
-    type: string
-    label: Public network name or ID
-    description: Public network that enables remote connection to VNF
-  unprotected_private_net_id:
-    type: string
-    label: Unprotected private network name or ID
-    description: Private network that connects vPacketGenerator with vFirewall
-  protected_private_net_id:
-    type: string
-    label: Protected private network name or ID
-    description: Private network that connects vFirewall with vSink
-  ecomp_private_net_id:
-    type: string
-    label: ECOMP management network name or ID
-    description: Private network that connects ECOMP component and the VNF
-  unprotected_private_net_cidr:
-    type: string
-    label: Unprotected private network CIDR
-    description: The CIDR of the unprotected private network
-  protected_private_net_cidr:
-    type: string
-    label: Protected private network CIDR
-    description: The CIDR of the protected private network
-  ecomp_private_net_cidr:
-    type: string
-    label: ECOMP private network CIDR
-    description: The CIDR of the protected private network
-  vfw_private_ip_0:
-    type: string
-    label: vFirewall private IP address towards the unprotected network
-    description: Private IP address that is assigned to the vFirewall to communicate with the vPacketGenerator
-  vfw_private_ip_1:
-    type: string
-    label: vFirewall private IP address towards the protected network
-    description: Private IP address that is assigned to the vFirewall to communicate with the vSink
-  vfw_private_ip_2:
-    type: string
-    label: vFirewall private IP address towards the ECOMP management network
-    description: Private IP address that is assigned to the vFirewall to communicate with ECOMP components
-  vpg_private_ip_0:
-    type: string
-    label: vPacketGenerator private IP address towards the unprotected network
-    description: Private IP address that is assigned to the vPacketGenerator to communicate with the vFirewall
-  vpg_private_ip_1:
-    type: string
-    label: vPacketGenerator private IP address towards the ECOMP management network
-    description: Private IP address that is assigned to the vPacketGenerator to communicate with ECOMP components
-  vsn_private_ip_0:
-    type: string
-    label: vSink private IP address towards the protected network
-    description: Private IP address that is assigned to the vSink to communicate with the vFirewall
-  vsn_private_ip_1:
-    type: string
-    label: vSink private IP address towards the ECOMP management network
-    description: Private IP address that is assigned to the vSink to communicate with ECOMP components
-  vfw_name_0:
-    type: string
-    label: vFirewall name
-    description: Name of the vFirewall
-  vpg_name_0:
-    type: string
-    label: vPacketGenerator name
-    description: Name of the vPacketGenerator
-  vsn_name_0:
-    type: string
-    label: vSink name
-    description: Name of the vSink
-  vnf_id:
-    type: string
-    label: VNF ID
-    description: The VNF ID is provided by ECOMP
-  vf_module_id:
-    type: string
-    label: vFirewall module ID
-    description: The vFirewall Module ID is provided by ECOMP
-  webserver_ip:
-    type: string
-    label: Webserver IP address
-    description: IP address of the webserver that hosts the source code and binaries
-  dcae_collector_ip:
-    type: string
-    label: DCAE collector IP address
-    description: IP address of the DCAE collector
-  key_name:
-    type: string
-    label: Key pair name
-    description: Public/Private key pair name
-  pub_key:
-    type: string
-    label: Public key
-    description: Public key to be installed on the compute instance
-
-resources:
-  my_keypair:
-    type: OS::Nova::KeyPair
-    properties:
-      name: { get_param: key_name }
-      public_key: { get_param: pub_key }
-      save_private_key: false
-
-  unprotected_private_network:
-    type: OS::Neutron::Net
-    properties:
-      name: { get_param: unprotected_private_net_id }
-
-  protected_private_network:
-    type: OS::Neutron::Net
-    properties:
-      name: { get_param: protected_private_net_id }
-
-  unprotected_private_subnet:
-    type: OS::Neutron::Subnet
-    properties:
-      network_id: { get_resource: unprotected_private_network }
-      cidr: { get_param: unprotected_private_net_cidr }
-
-  protected_private_subnet:
-    type: OS::Neutron::Subnet
-    properties:
-      network_id: { get_resource: protected_private_network }
-      cidr: { get_param: protected_private_net_cidr }
-
-  vfw_0:
-    type: OS::Nova::Server
-    properties:
-      image: { get_param: vfw_image_name }
-      flavor: { get_param: vfw_flavor_name }
-      name: { get_param: vfw_name_0 }
-      key_name: { get_resource: my_keypair }
-      networks:
-        - network: { get_param: public_net_id }
-        - port: { get_resource: vfw_private_0_port }
-        - port: { get_resource: vfw_private_1_port }
-        - port: { get_resource: vfw_private_2_port }
-      metadata: {vnf_id: { get_param: vnf_id }, vf_module_id: { get_param: vf_module_id }}
-      user_data_format: RAW
-      user_data:
-        str_replace:
-          params:
-            __webserver__: { get_param: webserver_ip }
-            __dcae_collector_ip__ : { get_param: dcae_collector_ip }
-          template: |
-            #!/bin/bash
-
-            WEBSERVER_IP=__webserver__
-            DCAE_COLLECTOR_IP=__dcae_collector_ip__
-
-            mkdir /opt/config
-            cd /opt
-            wget http://$WEBSERVER_IP/demo_repo/v_firewall_init.sh
-            wget http://$WEBSERVER_IP/demo_repo/vfirewall.sh
-            chmod +x v_firewall_init.sh
-            chmod +x vfirewall.sh
-            echo $WEBSERVER_IP > config/webserver_ip.txt
-            echo $DCAE_COLLECTOR_IP > config/dcae_collector_ip.txt
-            echo "no" > config/install.txt
-            mv vfirewall.sh /etc/init.d
-            sudo update-rc.d vfirewall.sh defaults
-            ./v_firewall_init.sh
-
-  vfw_private_0_port:
-    type: OS::Neutron::Port
-    properties:
-      network: { get_resource: unprotected_private_network }
-      fixed_ips: [{"subnet": { get_resource: unprotected_private_subnet }, "ip_address": { get_param: vfw_private_ip_0 }}]
-
-  vfw_private_1_port:
-    type: OS::Neutron::Port
-    properties:
-      network: { get_resource: protected_private_network }
-      fixed_ips: [{"subnet": { get_resource: protected_private_subnet }, "ip_address": { get_param: vfw_private_ip_1 }}]
-
-  vfw_private_2_port:
-    type: OS::Neutron::Port
-    properties:
-      network: { get_param: ecomp_private_net_id }
-      fixed_ips: [{"subnet": { get_param: ecomp_private_net_id }, "ip_address": { get_param: vfw_private_ip_2 }}]
-
-  vpg_0:
-    type: OS::Nova::Server
-    properties:
-      image: { get_param: vfw_image_name }
-      flavor: { get_param: vfw_flavor_name }
-      name: { get_param: vpg_name_0 }
-      key_name: { get_resource: my_keypair }
-      networks:
-        - network: { get_param: public_net_id }
-        - port: { get_resource: vpg_private_0_port }
-        - port: { get_resource: vpg_private_1_port }
-      metadata: {vnf_id: { get_param: vnf_id }, vf_module_id: { get_param: vf_module_id }}
-      user_data_format: RAW
-      user_data:
-        str_replace:
-          params:
-            __webserver__: { get_param: webserver_ip }
-            __fw_ipaddr__: { get_param: vfw_private_ip_0 }
-            __protected_net_cidr__: { get_param: protected_private_net_cidr }
-            __sink_ipaddr__: { get_param: vsn_private_ip_0 }
-          template: |
-            #!/bin/bash
-
-            WEBSERVER_IP=__webserver__
-            FW_IPADDR=__fw_ipaddr__
-            PROTECTED_NET_CIDR=__protected_net_cidr__
-            SINK_IPADDR=__sink_ipaddr__
-
-            mkdir /opt/config
-            cd /opt
-            wget http://$WEBSERVER_IP/demo_repo/v_packetgen_init.sh
-            wget http://$WEBSERVER_IP/demo_repo/vpacketgen.sh
-            chmod +x v_packetgen_init.sh
-            chmod +x vpacketgen.sh
-            echo $WEBSERVER_IP > config/webserver_ip.txt
-            echo $FW_IPADDR > config/fw_ipaddr.txt
-            echo $PROTECTED_NET_CIDR > config/protected_net_cidr.txt
-            echo $SINK_IPADDR > config/sink_ipaddr.txt
-            echo "no" > config/install.txt
-            mv vpacketgen.sh /etc/init.d
-            sudo update-rc.d vpacketgen.sh defaults
-            ./v_packetgen_init.sh
-
-  vpg_private_0_port:
-    type: OS::Neutron::Port
-    properties:
-      network: { get_resource: unprotected_private_network }
-      fixed_ips: [{"subnet": { get_resource: unprotected_private_subnet }, "ip_address": { get_param: vpg_private_ip_0 }}]
-
-  vpg_private_1_port:
-    type: OS::Neutron::Port
-    properties:
-      network: { get_param: ecomp_private_net_id }
-      fixed_ips: [{"subnet": { get_param: ecomp_private_net_id }, "ip_address": { get_param: vpg_private_ip_1 }}]
-
-  vsn_0:
-    type: OS::Nova::Server
-    properties:
-      image: { get_param: vfw_image_name }
-      flavor: { get_param: vfw_flavor_name }
-      name: { get_param: vsn_name_0 }
-      key_name: { get_resource: my_keypair }
-      networks:
-        - network: { get_param: public_net_id }
-        - port: { get_resource: vsn_private_0_port }
-        - port: { get_resource: vsn_private_1_port }
-      metadata: {vnf_id: { get_param: vnf_id }, vf_module_id: { get_param: vf_module_id }}
-      user_data_format: RAW
-      user_data:
-        str_replace:
-          params:
-            __webserver__: { get_param: webserver_ip }
-            __protected_net_gw__: { get_param: vfw_private_ip_1 }
-            __unprotected_net__: { get_param: unprotected_private_net_cidr }
-          template: |
-            #!/bin/bash
-
-            WEBSERVER_IP=__webserver__
-            PROTECTED_NET_GW=__protected_net_gw__
-            UNPROTECTED_NET=__unprotected_net__
-            UNPROTECTED_NET=$(echo $UNPROTECTED_NET | cut -d'/' -f1)
-
-            mkdir /opt/config
-            cd /opt
-            wget http://$WEBSERVER_IP/demo_repo/v_sink_init.sh
-            wget http://$WEBSERVER_IP/demo_repo/vsink.sh
-            chmod +x v_sink_init.sh
-            chmod +x vsink.sh
-            echo $PROTECTED_NET_GW > config/protected_net_gw.txt
-            echo $UNPROTECTED_NET > config/unprotected_net.txt
-            echo "no" > config/install.txt
-            mv vsink.sh /etc/init.d
-            sudo update-rc.d vsink.sh defaults
-            ./v_sink_init.sh
-
-  vsn_private_0_port:
-    type: OS::Neutron::Port
-    properties:
-      network: { get_resource: protected_private_network }
-      fixed_ips: [{"subnet": { get_resource: protected_private_subnet }, "ip_address": { get_param: vsn_private_ip_0 }}]
-
-  vsn_private_1_port:
-    type: OS::Neutron::Port
-    properties:
-      network: { get_param: ecomp_private_net_id }
-      fixed_ips: [{"subnet": { get_param: ecomp_private_net_id }, "ip_address": { get_param: vsn_private_ip_1 }}]
diff --git a/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/demo-vfw-V1/artifacts/vnf-module-artifact.json b/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/demo-vfw-V1/artifacts/vnf-module-artifact.json
deleted file mode 100644
index 0e45ba6..0000000
--- a/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/demo-vfw-V1/artifacts/vnf-module-artifact.json
+++ /dev/null
@@ -1,16 +0,0 @@
-[
-  {
-    "vfModuleModelName": "VF_RI1_VFW::module-1",
-    "vfModuleModelInvariantUUID": "585822c7-4027-4f84-ba50-e9248606f134",
-    "vfModuleModelVersion": "1.0",
-    "vfModuleModelUUID": "1e34774e-715e-4fd5-bd08-7b654622f33f.VF_RI1_VFW::module-1::module-1.group",
-    "vfModuleModelDescription": "vf Module Description",
-    "vfModuleModelCustomizationUUID": "585822c7-4027-4f84-ba50-e9248606f134",
-    "isBase": true,
-    "artifacts": [
-      "Artifact-UUID3",
-      "EnvArtifact-UUID3"
-    ],
-    "properties": {"test":"test"}
-  }
-]
\ No newline at end of file
diff --git a/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/demo-vfw-V1/notif-structure.json b/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/demo-vfw-V1/notif-structure.json
deleted file mode 100644
index bec8bed..0000000
--- a/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/demo-vfw-V1/notif-structure.json
+++ /dev/null
@@ -1,66 +0,0 @@
-{
-    "serviceName": "vfw-service",
-    "serviceInvariantUUID": "585822c7-4027-4f84-ba50-e9248606f112",
-    "serviceUUID": "2e34774e-715e-4fd5-bd09-7b654622f35i",
-    "serviceVersion": "1.0",
-    "serviceArtifacts":
-    [
-
-    ],
-
-    "resources":
-    [
-        {
-            "resourceInstanceName": "VFWResource-1",
-            "resourceInvariantUUID": "585822c7-4027-4f84-ba50-e9248606f113",
-            "resourceName": "VFWResource",
-            "resourceType": "VF",
-            "resourceUUID": "685822c7-4027-4f84-ba50-e9248606f132",
-            "resourceVersion": "1.0",
-            "category":  "category",
-            "artifacts":
-            [
-                {
-                    "artifactChecksum": "CheckSum",
-                    "artifactDescription": "Meta data for VFModule",
-                    "artifactName": "vnf-module-artifact.json",
-
-                    "artifactType": "VF_MODULES_METADATA",
-                    "artifactURL": "vnf-module-artifact.json",
-                    "artifactUUID": "VfArtifact-UUID2",
-                    "artifactVersion": "1.0"
-
-                },
-                {
-                    "artifactChecksum": "CheckSum",
-                    "artifactDescription": "Base VFW Heat",
-                    "artifactName": "base_vfw.yaml",
-                    "artifactTimeout": 300,
-                    "artifactType": "HEAT",
-                    "artifactURL": "base_vfw.yaml",
-                    "artifactUUID": "Artifact-UUID3",
-                    "artifactVersion": "1.0",
-                    "generatedArtifact": "EnvArtifact-UUID3",
-                    "relatedArtifact":
-                    [
-
-                    ]
-                },
-
-                {
-                    "artifactChecksum": "CheckSum",
-                    "artifactDescription": "base_vfw ENV file",
-                    "artifactName": "base_vfw.env",
-
-                    "artifactType": "HEAT_ENV",
-                    "artifactURL": "base_vfw.env",
-                    "artifactUUID": "EnvArtifact-UUID3",
-                    "artifactVersion": "1.0"
-                 }
-            ]
-        }
-    ],
-
-    "serviceDescription": "VFW service",
-    "distributionID": "35120a87-1f82-4276-9735-f6de5a244d62"
-}
\ No newline at end of file
diff --git a/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/notif-without-modules-metadata/artifacts/cloud-nimbus.sh b/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/notif-without-modules-metadata/artifacts/cloud-nimbus.sh
deleted file mode 100644
index 48485f3..0000000
--- a/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/notif-without-modules-metadata/artifacts/cloud-nimbus.sh
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/bin/bash
-echo "Running first-boot script"
-FLAG="first-boot.sh"
-echo "First boot run" > ${FLAG}
-echo "$vm_name" >> ${FLAG}
-touch /var/lib/cloud/instance/payload/launch-params
-chmod 644 /var/lib/cloud/instance/payload/launch-params
-#for i in $(ls /sys/class/net); do
-#  echo "Restart $i" >> ${FLAG}
-#  ifdown ${i}
-#  ifup ${i}
-#done
diff --git a/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/notif-without-modules-metadata/artifacts/hot-nimbus-oam_v1.0.env b/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/notif-without-modules-metadata/artifacts/hot-nimbus-oam_v1.0.env
deleted file mode 100644
index 7e51e67..0000000
--- a/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/notif-without-modules-metadata/artifacts/hot-nimbus-oam_v1.0.env
+++ /dev/null
@@ -1,18 +0,0 @@
-parameters:
-  pcrf_oam_server_names: ZRDM1PCRF01OAM001,ZRDM1PCRF01OAM002
-  pcrf_oam_image_name: PCRF_8.995-ATTM1.0.3.qcow2
-  pcrf_oam_flavor_name: lc.4xlarge4
-  availabilityzone_name: nova
-  pcrf_cps_net_name: Mobisupport-25193-I-INT1_int_pcrf_net_0
-  pcrf_cps_net_ips: 172.26.16.111,172.26.16.112
-  pcrf_arbiter_vip: 172.26.16.115
-  pcrf_cps_net_mask: 255.255.255.0
-  pcrf_oam_net_name: MNS-25180-L-01_oam_protected_net_0
-  pcrf_oam_net_ips: 107.239.64.117,107.239.64.118
-  pcrf_oam_net_gw: 107.239.64.1
-  pcrf_oam_net_mask: 255.255.248.0
-  pcrf_oam_volume_id_1: a4aa05fb-fcdc-457b-8077-6845fdfc3257
-  pcrf_oam_volume_id_2: 93d8fc1f-f1c3-4933-86b2-039881ee910f
-  pcrf_security_group_name: nimbus_security_group
-  pcrf_vnf_id: 730797234b4a40aa99335157b02871cd
-
diff --git a/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/notif-without-modules-metadata/artifacts/hot-nimbus-oam_v1.0.yaml b/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/notif-without-modules-metadata/artifacts/hot-nimbus-oam_v1.0.yaml
deleted file mode 100644
index 98c4e3b..0000000
--- a/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/notif-without-modules-metadata/artifacts/hot-nimbus-oam_v1.0.yaml
+++ /dev/null
@@ -1,109 +0,0 @@
-heat_template_version: 2013-05-23
-
-description: heat template that creates multiple PCRF OAM nodes stack
-
-parameters:
-  pcrf_oam_server_names:
-    type: comma_delimited_list
-    label: PCRF OAM server names
-    description: name of the PCRF OAM instance
-  pcrf_oam_image_name:
-    type: string
-    label: PCRF OAM image name
-    description: PCRF OAM image name
-  pcrf_oam_flavor_name:
-    type: string
-    label: PCRF OAM flavor name
-    description: flavor name of PCRF OAM instance
-  availabilityzone_name:
-    type: string
-    label: availabilityzone name
-    description: availabilityzone name
-  pcrf_cps_net_name:
-    type: string
-    label: CPS network name
-    description: CPS network name
-  pcrf_cps_net_ips:
-    type: comma_delimited_list
-    label: CPS network ips
-    description: CPS network ips
-  pcrf_cps_net_mask:
-    type: string
-    label: CPS network mask
-    description: CPS network mask
-  pcrf_arbiter_vip:
-    type: string
-    label: OAM Arbiter LB VIP
-    description: OAM Arbiter LB VIP
-  pcrf_oam_net_name:
-    type: string
-    label: OAM network name
-    description: OAM network name
-  pcrf_oam_net_ips:
-    type: comma_delimited_list
-    label: OAM network ips
-    description: OAM network ips
-  pcrf_oam_net_gw:
-    type: string
-    label: CPS network gateway
-    description: CPS network gateway
-  pcrf_oam_net_mask:
-    type: string
-    label: CPS network mask
-    description: CPS network mask
-  pcrf_oam_volume_id_1:
-    type: string
-    label: CPS OAM 001 Cinder Volume
-    description: CPS OAM 001 Cinder Volumes
-  pcrf_oam_volume_id_2:
-    type: string
-    label: CPS OAM 002 Cinder Volume
-    description: CPS OAM 002 Cinder Volumes
-  pcrf_security_group_name:
-    type: string
-    label: security group name
-    description: the name of security group
-  pcrf_vnf_id:
-    type: string
-    label: PCRF VNF Id
-    description: PCRF VNF Id
-
-resources:
-  server_pcrf_oam_001:
-    type: nested-oam_v1.0.yaml
-    properties:
-      pcrf_oam_server_name: { get_param: [pcrf_oam_server_names, 0] }
-      pcrf_oam_image_name: { get_param: pcrf_oam_image_name }
-      pcrf_oam_flavor_name: { get_param: pcrf_oam_flavor_name }
-      availabilityzone_name: { get_param: availabilityzone_name }
-      pcrf_security_group_name: { get_param: pcrf_security_group_name }
-      pcrf_oam_volume_id: { get_param: pcrf_oam_volume_id_1 }
-      pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
-      pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 0] }
-      pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
-      pcrf_oam_net_name: { get_param: pcrf_oam_net_name }
-      pcrf_oam_net_ip: { get_param: [pcrf_oam_net_ips, 0] }
-      pcrf_oam_net_mask: { get_param: pcrf_oam_net_mask }
-      pcrf_oam_net_gw: { get_param: pcrf_oam_net_gw }
-      pcrf_arbiter_vip: { get_param: pcrf_arbiter_vip }
-      pcrf_vnf_id: {get_param: pcrf_vnf_id}
-
-  server_pcrf_oam_002:
-    type: nested-oam_v1.0.yaml
-    depends_on: [server_pcrf_oam_001]
-    properties:
-      pcrf_oam_server_name: { get_param: [pcrf_oam_server_names, 1] }
-      pcrf_oam_image_name: { get_param: pcrf_oam_image_name }
-      pcrf_oam_flavor_name: { get_param: pcrf_oam_flavor_name }
-      availabilityzone_name: { get_param: availabilityzone_name }
-      pcrf_security_group_name: { get_param: pcrf_security_group_name }
-      pcrf_oam_volume_id: { get_param: pcrf_oam_volume_id_2 }
-      pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
-      pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 1] }
-      pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
-      pcrf_oam_net_name: { get_param: pcrf_oam_net_name }
-      pcrf_oam_net_ip: { get_param: [pcrf_oam_net_ips, 1] }
-      pcrf_oam_net_mask: { get_param: pcrf_oam_net_mask }
-      pcrf_oam_net_gw: { get_param: pcrf_oam_net_gw }
-      pcrf_arbiter_vip: { get_param: pcrf_arbiter_vip }
-      pcrf_vnf_id: {get_param: pcrf_vnf_id}
diff --git a/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/notif-without-modules-metadata/artifacts/nested-oam_v1.0.yaml b/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/notif-without-modules-metadata/artifacts/nested-oam_v1.0.yaml
deleted file mode 100644
index fa3b04e..0000000
--- a/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/notif-without-modules-metadata/artifacts/nested-oam_v1.0.yaml
+++ /dev/null
@@ -1,156 +0,0 @@
-heat_template_version: 2013-05-23
-
-description: nested heat template that creates a PCRF OAM node stack
-
-parameters:
-  pcrf_oam_server_name:
-    type: string
-    label: PCRF OAM server name
-    description: PCRF OAM server name
-  pcrf_oam_image_name:
-    type: string
-    label: image name
-    description: PCRF OAM image name
-  pcrf_oam_flavor_name:
-    type: string
-    label: PCRF OAM flavor name
-    description: flavor name of PCRF OAM instance
-  availabilityzone_name:
-    type: string
-    label: availabilityzone name
-    description: availabilityzone name
-  pcrf_cps_net_name:
-    type: string
-    label: CPS network name
-    description: CPS network name
-  pcrf_cps_net_ip:
-    type: string
-    label: CPS network ip
-    description: CPS network ip
-  pcrf_cps_net_mask:
-    type: string
-    label: CPS network mask
-    description: CPS network mask
-  pcrf_arbiter_vip:
-    type: string
-    label: OAM Arbiter LB VIP
-    description: OAM Arbiter LB VIP
-  pcrf_oam_net_name:
-    type: string
-    label: OAM network name
-    description: OAM network name
-  pcrf_oam_net_ip:
-    type: string
-    label: OAM network ip
-    description: OAM network ip
-  pcrf_oam_net_gw:
-    type: string
-    label: CPS network gateway
-    description: CPS network gateway
-  pcrf_oam_net_mask:
-    type: string
-    label: CPS network mask
-    description: CPS network mask
-  pcrf_oam_volume_id:
-    type: string
-    label: CPS OAM Cinder Volume
-    description: CPS OAM Cinder Volume
-  pcrf_security_group_name:
-    type: string
-    label: security group name
-    description: the name of security group
-  pcrf_vnf_id:
-    type: string
-    label: PCRF VNF Id
-    description: PCRF VNF Id
-
-resources:
-  network:
-    type: OS::Heat::CloudConfig
-    properties:
-      cloud_config:
-        write_files:
-          - path: /etc/sysconfig/network-scripts/ifcfg-eth0
-            permissions: "0644"
-            content:
-              str_replace:
-                template: { get_file: nimbus-ethernet }
-                params:
-                  $dev: eth0
-                  $ip: { get_param: pcrf_cps_net_ip }
-                  $netmask: { get_param: pcrf_cps_net_mask }
-          - path: /etc/sysconfig/network-scripts/ifcfg-eth1
-            permissions: "0644"
-            content:
-              str_replace:
-                template: { get_file: nimbus-ethernet-gw }
-                params:
-                  $dev: eth1
-                  $ip: { get_param: pcrf_oam_net_ip }
-                  $netmask: { get_param: pcrf_oam_net_mask }
-                  $gateway: { get_param: pcrf_oam_net_gw }
-        runcmd:
-          - ifdown eth0 && ifup eth0
-          - ifdown eth1 && ifup eth1
-  script_init:
-    type: OS::Heat::SoftwareConfig
-    properties:
-      group: ungrouped
-      config:
-        str_replace:
-          template: { get_file: cloud-nimbus.sh }
-          params:
-            $vm_name: { get_param: pcrf_oam_server_name }
-  pcrf_server_init:
-    type: OS::Heat::MultipartMime
-    properties:
-      parts:
-      - config: { get_resource: network}
-      - config: { get_resource: script_init}
-
-  pcrf_server_oam:
-    type: OS::Nova::Server
-    properties:
-      config_drive: "True"
-      name: { get_param: pcrf_oam_server_name }
-      image: { get_param: pcrf_oam_image_name }
-      flavor: { get_param: pcrf_oam_flavor_name }
-      availability_zone: { get_param: availabilityzone_name }
-      networks:
-        - port: { get_resource: pcrf_oam_port_0}
-        - port: { get_resource: pcrf_oam_port_1}
-      user_data_format: RAW
-      user_data:
-        get_resource: pcrf_server_init
-      metadata:
-        vnf_id: {get_param: pcrf_vnf_id}
-  
-  pcrf_oam_port_0:
-    type: OS::Neutron::Port
-    properties:
-      network: { get_param: pcrf_cps_net_name }
-      fixed_ips:
-        - ip_address: { get_param: pcrf_cps_net_ip }
-      allowed_address_pairs:
-        - ip_address: { get_param: pcrf_arbiter_vip }
-      security_groups: [{ get_param: pcrf_security_group_name }]
-
-  pcrf_oam_port_1:
-    type: OS::Neutron::Port
-    properties:
-      network: { get_param: pcrf_oam_net_name }
-      fixed_ips:
-        - ip_address: { get_param: pcrf_oam_net_ip }
-      security_groups: [{ get_param: pcrf_security_group_name }]
-
-  pcrf_oam_vol_attachment:
-    type: OS::Cinder::VolumeAttachment
-    properties:
-      volume_id: { get_param: pcrf_oam_volume_id }
-      mountpoint: /dev/vdd
-      instance_uuid: { get_resource: pcrf_server_oam }
-
-outputs:
-  pcrf_oam_vol_attachment_id:
-    description: the pcrf_oam_vol_attachment_id id
-    value: { get_resource: pcrf_oam_vol_attachment }
diff --git a/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/notif-without-modules-metadata/notif-structure.json b/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/notif-without-modules-metadata/notif-structure.json
deleted file mode 100644
index 622ea3c..0000000
--- a/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/notif-without-modules-metadata/notif-structure.json
+++ /dev/null
@@ -1,69 +0,0 @@
-{
-    "serviceName": "test-service",
-    "serviceInvariantUUID": "585822c7-4027-4f84-ba50-e9248606f132",
-    "serviceUUID": "1e34774e-715e-4fd5-bd09-7b654622f33e",
-    "serviceVersion": "1.0",
-    "serviceArtifacts":
-    [
-
-    ],
-
-    "resources":
-    [
-        {
-            "resourceInstanceName": "wrong-resource-1",
-            "resourceInvariantUUID": "585822c7-4027-4f84-ba50-e9248606f134",
-            "resourceName": "wrong-resourceName-1",
-            "resourceType": "VF",
-            "resourceUUID": "585822c7-4027-4f84-ba50-e9248606f136",
-            "resourceVersion": "1.0",
-            "category":  "category",
-            "artifacts":
-            [
-
-                {
-                    "artifactChecksum": "CheckSum",
-                    "artifactDescription": "Nimbus Heat OAM",
-                    "artifactName": "hot-nimbus-oam_v1.0.yaml",
-                    "artifactTimeout": 100,
-                    "artifactType": "HEAT",
-                    "artifactURL": "hot-nimbus-oam_v1.0.yaml",
-                    "artifactUUID": "Artifact-UUID1",
-                    "artifactVersion": "1.0",
-                    "generatedArtifact": "EnvArtifact-UUID2",
-                    "relatedArtifact":
-                    [
-                        "NestedArtifact-UUID3"
-                    ]
-                },
-
-                {
-                    "artifactChecksum": "CheckSum",
-                    "artifactDescription": "Nimbus Heat ENV OAM",
-                    "artifactName": "hot-nimbus-oam_v1.0.env",
-                    "artifactTimeout": 100,
-                    "artifactType": "HEAT_ENV",
-                    "artifactURL": "hot-nimbus-oam_v1.0.env",
-                    "artifactUUID": "EnvArtifact-UUID2",
-                    "artifactVersion": "1.0"
-
-                },
-
-                {
-                    "artifactChecksum": "CheckSum",
-                    "artifactDescription": "Nested OAM",
-                    "artifactName": "nested-oam_v1.0.yaml",
-                    "artifactTimeout": 10,
-                    "artifactType": "HEAT_NESTED",
-                    "artifactURL": "nested-oam_v1.0.yaml",
-                    "artifactUUID": "NestedArtifact-UUID3",
-                    "artifactVersion": "1.0"
-
-                }
-            ]
-        }
-    ],
-
-    "serviceDescription": "test service for unit testing",
-    "distributionID": "35120a87-1f82-4276-9735-f6de5a244d65"
-}
\ No newline at end of file
diff --git a/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/resource_Extvl.csar b/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/resource_Extvl.csar
deleted file mode 100644
index b6281fc..0000000
--- a/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/resource_Extvl.csar
+++ /dev/null
Binary files differ
diff --git a/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/service-ServiceFdnt-csar-0904-2.csar b/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/service-ServiceFdnt-csar-0904-2.csar
deleted file mode 100644
index daa270b..0000000
--- a/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/service-ServiceFdnt-csar-0904-2.csar
+++ /dev/null
Binary files differ
diff --git a/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/service-ServiceFdnt-with-allotted.csar b/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/service-ServiceFdnt-with-allotted.csar
deleted file mode 100644
index 21b5f5e..0000000
--- a/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/service-ServiceFdnt-with-allotted.csar
+++ /dev/null
Binary files differ
diff --git a/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/service_Rg511NfmService.csar b/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/service_Rg511NfmService.csar
deleted file mode 100644
index a7ea454..0000000
--- a/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/service_Rg511NfmService.csar
+++ /dev/null
Binary files differ
diff --git a/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/service_Rg516VmmscSrvc_csar.csar b/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/service_Rg516VmmscSrvc_csar.csar
deleted file mode 100644
index 6bbac7d..0000000
--- a/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/service_Rg516VmmscSrvc_csar.csar
+++ /dev/null
Binary files differ
diff --git a/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/simpleNotif-V1/artifacts/cloud-nimbus.sh b/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/simpleNotif-V1/artifacts/cloud-nimbus.sh
deleted file mode 100644
index 48485f3..0000000
--- a/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/simpleNotif-V1/artifacts/cloud-nimbus.sh
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/bin/bash
-echo "Running first-boot script"
-FLAG="first-boot.sh"
-echo "First boot run" > ${FLAG}
-echo "$vm_name" >> ${FLAG}
-touch /var/lib/cloud/instance/payload/launch-params
-chmod 644 /var/lib/cloud/instance/payload/launch-params
-#for i in $(ls /sys/class/net); do
-#  echo "Restart $i" >> ${FLAG}
-#  ifdown ${i}
-#  ifup ${i}
-#done
diff --git a/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/simpleNotif-V1/artifacts/hot-nimbus-oam-volumes_v1.0.env b/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/simpleNotif-V1/artifacts/hot-nimbus-oam-volumes_v1.0.env
deleted file mode 100644
index b494d8c..0000000
--- a/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/simpleNotif-V1/artifacts/hot-nimbus-oam-volumes_v1.0.env
+++ /dev/null
@@ -1,6 +0,0 @@
-parameters:
-  pcrf_oam_vol_size: 500
-  pcrf_oam_volume_silver-1: Silver
-  pcrf_oam_volume_silver-2: Silver
-  pcrf_oam_vol_name_1: sde1-pcrfx01-oam001-vol-1
-  pcrf_oam_vol_name_2: sde1-pcrfx01-oam001-vol-2
\ No newline at end of file
diff --git a/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/simpleNotif-V1/artifacts/hot-nimbus-oam-volumes_v1.0.yaml b/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/simpleNotif-V1/artifacts/hot-nimbus-oam-volumes_v1.0.yaml
deleted file mode 100644
index 9e12054..0000000
--- a/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/simpleNotif-V1/artifacts/hot-nimbus-oam-volumes_v1.0.yaml
+++ /dev/null
@@ -1,45 +0,0 @@
-heat_template_version:  2013-05-23
-
-parameters:
-    pcrf_oam_vol_size:
-     type: number
-     label: Cinder volume size
-     description: the size of the Cinder volume
-    pcrf_oam_vol_name_1:
-     type: string
-     label: OAM volume name 1
-     description: Assigning name to volume
-    pcrf_oam_vol_name_2:
-     type: string
-     label: OAM volume name 2
-     description: Assigning name to volume
-    pcrf_oam_volume_silver-1:
-     type: string
-     label: vm volume type
-     description: the name of the target volume backend for OAM1
-    pcrf_oam_volume_silver-2:
-     type: string
-     label: vm volume type
-     description: the name of the target volume backend for OAM2
-
-resources:
-  pcrf_oam_volume_1:
-    type: OS::Cinder::Volume
-    properties:
-      size: {get_param: pcrf_oam_vol_size}
-      volume_type: {get_param: pcrf_oam_volume_silver-1}
-      name: {get_param: pcrf_oam_vol_name_1}
-
-  pcrf_oam_volume_2:
-    type: OS::Cinder::Volume
-    properties:
-      size: {get_param: pcrf_oam_vol_size}
-      volume_type: {get_param: pcrf_oam_volume_silver-2}
-      name: {get_param: pcrf_oam_vol_name_2}
-outputs:
-  pcrf_oam_volume_id_1:
-    description: the oam 001 volume id
-    value: { get_resource: pcrf_oam_volume_1 }
-  pcrf_oam_volume_id_2:
-    description: the oam 002 volume id
-    value: { get_resource: pcrf_oam_volume_2 }
\ No newline at end of file
diff --git a/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/simpleNotif-V1/artifacts/hot-nimbus-oam_v1.0.env b/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/simpleNotif-V1/artifacts/hot-nimbus-oam_v1.0.env
deleted file mode 100644
index 7e51e67..0000000
--- a/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/simpleNotif-V1/artifacts/hot-nimbus-oam_v1.0.env
+++ /dev/null
@@ -1,18 +0,0 @@
-parameters:
-  pcrf_oam_server_names: ZRDM1PCRF01OAM001,ZRDM1PCRF01OAM002
-  pcrf_oam_image_name: PCRF_8.995-ATTM1.0.3.qcow2
-  pcrf_oam_flavor_name: lc.4xlarge4
-  availabilityzone_name: nova
-  pcrf_cps_net_name: Mobisupport-25193-I-INT1_int_pcrf_net_0
-  pcrf_cps_net_ips: 172.26.16.111,172.26.16.112
-  pcrf_arbiter_vip: 172.26.16.115
-  pcrf_cps_net_mask: 255.255.255.0
-  pcrf_oam_net_name: MNS-25180-L-01_oam_protected_net_0
-  pcrf_oam_net_ips: 107.239.64.117,107.239.64.118
-  pcrf_oam_net_gw: 107.239.64.1
-  pcrf_oam_net_mask: 255.255.248.0
-  pcrf_oam_volume_id_1: a4aa05fb-fcdc-457b-8077-6845fdfc3257
-  pcrf_oam_volume_id_2: 93d8fc1f-f1c3-4933-86b2-039881ee910f
-  pcrf_security_group_name: nimbus_security_group
-  pcrf_vnf_id: 730797234b4a40aa99335157b02871cd
-
diff --git a/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/simpleNotif-V1/artifacts/hot-nimbus-oam_v1.0.yaml b/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/simpleNotif-V1/artifacts/hot-nimbus-oam_v1.0.yaml
deleted file mode 100644
index 98c4e3b..0000000
--- a/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/simpleNotif-V1/artifacts/hot-nimbus-oam_v1.0.yaml
+++ /dev/null
@@ -1,109 +0,0 @@
-heat_template_version: 2013-05-23
-
-description: heat template that creates multiple PCRF OAM nodes stack
-
-parameters:
-  pcrf_oam_server_names:
-    type: comma_delimited_list
-    label: PCRF OAM server names
-    description: name of the PCRF OAM instance
-  pcrf_oam_image_name:
-    type: string
-    label: PCRF OAM image name
-    description: PCRF OAM image name
-  pcrf_oam_flavor_name:
-    type: string
-    label: PCRF OAM flavor name
-    description: flavor name of PCRF OAM instance
-  availabilityzone_name:
-    type: string
-    label: availabilityzone name
-    description: availabilityzone name
-  pcrf_cps_net_name:
-    type: string
-    label: CPS network name
-    description: CPS network name
-  pcrf_cps_net_ips:
-    type: comma_delimited_list
-    label: CPS network ips
-    description: CPS network ips
-  pcrf_cps_net_mask:
-    type: string
-    label: CPS network mask
-    description: CPS network mask
-  pcrf_arbiter_vip:
-    type: string
-    label: OAM Arbiter LB VIP
-    description: OAM Arbiter LB VIP
-  pcrf_oam_net_name:
-    type: string
-    label: OAM network name
-    description: OAM network name
-  pcrf_oam_net_ips:
-    type: comma_delimited_list
-    label: OAM network ips
-    description: OAM network ips
-  pcrf_oam_net_gw:
-    type: string
-    label: CPS network gateway
-    description: CPS network gateway
-  pcrf_oam_net_mask:
-    type: string
-    label: CPS network mask
-    description: CPS network mask
-  pcrf_oam_volume_id_1:
-    type: string
-    label: CPS OAM 001 Cinder Volume
-    description: CPS OAM 001 Cinder Volumes
-  pcrf_oam_volume_id_2:
-    type: string
-    label: CPS OAM 002 Cinder Volume
-    description: CPS OAM 002 Cinder Volumes
-  pcrf_security_group_name:
-    type: string
-    label: security group name
-    description: the name of security group
-  pcrf_vnf_id:
-    type: string
-    label: PCRF VNF Id
-    description: PCRF VNF Id
-
-resources:
-  server_pcrf_oam_001:
-    type: nested-oam_v1.0.yaml
-    properties:
-      pcrf_oam_server_name: { get_param: [pcrf_oam_server_names, 0] }
-      pcrf_oam_image_name: { get_param: pcrf_oam_image_name }
-      pcrf_oam_flavor_name: { get_param: pcrf_oam_flavor_name }
-      availabilityzone_name: { get_param: availabilityzone_name }
-      pcrf_security_group_name: { get_param: pcrf_security_group_name }
-      pcrf_oam_volume_id: { get_param: pcrf_oam_volume_id_1 }
-      pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
-      pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 0] }
-      pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
-      pcrf_oam_net_name: { get_param: pcrf_oam_net_name }
-      pcrf_oam_net_ip: { get_param: [pcrf_oam_net_ips, 0] }
-      pcrf_oam_net_mask: { get_param: pcrf_oam_net_mask }
-      pcrf_oam_net_gw: { get_param: pcrf_oam_net_gw }
-      pcrf_arbiter_vip: { get_param: pcrf_arbiter_vip }
-      pcrf_vnf_id: {get_param: pcrf_vnf_id}
-
-  server_pcrf_oam_002:
-    type: nested-oam_v1.0.yaml
-    depends_on: [server_pcrf_oam_001]
-    properties:
-      pcrf_oam_server_name: { get_param: [pcrf_oam_server_names, 1] }
-      pcrf_oam_image_name: { get_param: pcrf_oam_image_name }
-      pcrf_oam_flavor_name: { get_param: pcrf_oam_flavor_name }
-      availabilityzone_name: { get_param: availabilityzone_name }
-      pcrf_security_group_name: { get_param: pcrf_security_group_name }
-      pcrf_oam_volume_id: { get_param: pcrf_oam_volume_id_2 }
-      pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
-      pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 1] }
-      pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
-      pcrf_oam_net_name: { get_param: pcrf_oam_net_name }
-      pcrf_oam_net_ip: { get_param: [pcrf_oam_net_ips, 1] }
-      pcrf_oam_net_mask: { get_param: pcrf_oam_net_mask }
-      pcrf_oam_net_gw: { get_param: pcrf_oam_net_gw }
-      pcrf_arbiter_vip: { get_param: pcrf_arbiter_vip }
-      pcrf_vnf_id: {get_param: pcrf_vnf_id}
diff --git a/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/simpleNotif-V1/artifacts/hot-nimbus-pcm-volumes_v1.0.env b/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/simpleNotif-V1/artifacts/hot-nimbus-pcm-volumes_v1.0.env
deleted file mode 100644
index 788365d..0000000
--- a/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/simpleNotif-V1/artifacts/hot-nimbus-pcm-volumes_v1.0.env
+++ /dev/null
@@ -1,4 +0,0 @@
-parameters:
-  pcrf_pcm_vol_size: 50
-  pcrf_pcm_volume_silver: Silver
-  pcrf_pcm_vol_name_1: sde1-pcrfx01-pcm001-vol-1
diff --git a/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/simpleNotif-V1/artifacts/hot-nimbus-pcm-volumes_v1.0.yaml b/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/simpleNotif-V1/artifacts/hot-nimbus-pcm-volumes_v1.0.yaml
deleted file mode 100644
index bcc3e89..0000000
--- a/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/simpleNotif-V1/artifacts/hot-nimbus-pcm-volumes_v1.0.yaml
+++ /dev/null
@@ -1,28 +0,0 @@
-heat_template_version:  2013-05-23
-
-parameters:
-   pcrf_pcm_vol_size:
-     type: number
-     label: Cinder volume size
-     description: the size of the Cinder volume
-   pcrf_pcm_vol_name_1:
-     type: string
-     label: PCM volume name
-     description: Assigning name to volume
-   pcrf_pcm_volume_silver:
-     type: string
-     label: vm volume type
-     description: the name of the target volume backend for PCM
-
-resources: 
-  pcrf_pcm_volume_1:
-     type: OS::Cinder::Volume
-     properties:
-      size: { get_param: pcrf_pcm_vol_size }
-      volume_type: { get_param: pcrf_pcm_volume_silver }
-      name: { get_param: pcrf_pcm_vol_name_1 }
-
-outputs:
-  pcrf_pcm_volume_id_1:
-    description: the pcrf_pcm_volume_id
-    value: { get_resource: pcrf_pcm_volume_1 }
\ No newline at end of file
diff --git a/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/simpleNotif-V1/artifacts/hot-nimbus-pcm_v1.0.env b/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/simpleNotif-V1/artifacts/hot-nimbus-pcm_v1.0.env
deleted file mode 100644
index b23014d..0000000
--- a/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/simpleNotif-V1/artifacts/hot-nimbus-pcm_v1.0.env
+++ /dev/null
@@ -1,16 +0,0 @@
-parameters:
-  pcrf_pcm_server_names: ZRDM1PCRF01PCM001
-  pcrf_pcm_image_name: PCRF_8.995-ATTM1.0.3.qcow2
-  pcrf_pcm_flavor_name: lc.2xlarge4
-  availabilityzone_name: nova
-  pcrf_cps_net_name: Mobisupport-25193-I-INT1_int_pcrf_net_0
-  pcrf_cps_net_ips: 172.26.16.113
-  pcrf_cps_net_mask: 255.255.255.0
-  pcrf_oam_net_name: MNS-25180-L-01_oam_protected_net_0
-  pcrf_oam_net_ips: 107.239.64.121
-  pcrf_oam_net_gw: 107.239.64.1
-  pcrf_oam_net_mask: 255.255.248.0
-  pcrf_pcm_volume_id_1: 3438a3fe-1241-4390-80f2-d0b86238c40e
-  pcrf_security_group_name: nimbus_security_group
-  pcrf_vnf_id: 730797234b4a40aa99335157b02871cd
-
diff --git a/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/simpleNotif-V1/artifacts/hot-nimbus-pcm_v1.0.yaml b/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/simpleNotif-V1/artifacts/hot-nimbus-pcm_v1.0.yaml
deleted file mode 100644
index defb373..0000000
--- a/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/simpleNotif-V1/artifacts/hot-nimbus-pcm_v1.0.yaml
+++ /dev/null
@@ -1,80 +0,0 @@
-heat_template_version: 2013-05-23
-
-description: heat template that creates PCRF Cluman stack
-
-parameters:
-  pcrf_pcm_server_names:
-    type: comma_delimited_list
-    label: PCRF CM server names
-    description: name of the PCRF CM instance
-  pcrf_pcm_image_name:
-    type: string
-    label: PCRF CM image name
-    description: PCRF CM image name
-  pcrf_pcm_flavor_name:
-    type: string
-    label: PCRF CM flavor name
-    description: flavor name of PCRF CM instance
-  availabilityzone_name:
-    type: string
-    label: availabilityzone name
-    description: availabilityzone name
-  pcrf_cps_net_name:
-    type: string
-    label: CPS network name
-    description: CPS network name
-  pcrf_cps_net_ips:
-    type: comma_delimited_list
-    label: CPS network ips
-    description: CPS network ips
-  pcrf_cps_net_mask:
-    type: string
-    label: CPS network mask
-    description: CPS network mask
-  pcrf_oam_net_name:
-    type: string
-    label: OAM network name
-    description: OAM network name
-  pcrf_oam_net_ips:
-    type: comma_delimited_list
-    label: OAM network ips
-    description: OAM network ips
-  pcrf_oam_net_gw:
-    type: string
-    label: CPS network gateway
-    description: CPS network gateway
-  pcrf_oam_net_mask:
-    type: string
-    label: CPS network mask
-    description: CPS network mask
-  pcrf_pcm_volume_id_1:
-    type: string
-    label: CPS Cluman Cinder Volume
-    description: CPS Cluman Cinder Volume
-  pcrf_security_group_name:
-    type: string
-    label: security group name
-    description: the name of security group
-  pcrf_vnf_id:
-    type: string
-    label: PCRF VNF Id
-    description: PCRF VNF Id
-
-resources:
-  server_pcrf_pcm_001:
-    type: nested-pcm_v1.0.yaml
-    properties:
-      pcrf_pcm_server_name: { get_param: [pcrf_pcm_server_names, 0] }
-      pcrf_pcm_image_name: { get_param: pcrf_pcm_image_name }
-      pcrf_pcm_flavor_name: { get_param: pcrf_pcm_flavor_name }
-      availabilityzone_name: { get_param: availabilityzone_name }
-      pcrf_security_group_name: { get_param: pcrf_security_group_name }
-      pcrf_pcm_volume_id: { get_param: pcrf_pcm_volume_id_1 }
-      pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
-      pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 0] }
-      pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
-      pcrf_oam_net_name: { get_param: pcrf_oam_net_name }
-      pcrf_oam_net_ip: { get_param: [pcrf_oam_net_ips, 0] }
-      pcrf_oam_net_mask: { get_param: pcrf_oam_net_mask }
-      pcrf_oam_net_gw: { get_param: pcrf_oam_net_gw }
-      pcrf_vnf_id: {get_param: pcrf_vnf_id}
diff --git a/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/simpleNotif-V1/artifacts/hot-nimbus-ppd_v1.0.yaml b/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/simpleNotif-V1/artifacts/hot-nimbus-ppd_v1.0.yaml
deleted file mode 100644
index 8631592..0000000
--- a/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/simpleNotif-V1/artifacts/hot-nimbus-ppd_v1.0.yaml
+++ /dev/null
@@ -1,286 +0,0 @@
-heat_template_version: 2013-05-23
-
-description: heat template that creates PCRF Policy Director stack
-
-parameters:
-  pcrf_ppd_server_names:
-    type: comma_delimited_list
-    label: PCRF PD server names
-    description: name of the PCRF PD instance
-  pcrf_ppd_image_name:
-    type: string
-    label: PCRF PD image name
-    description: PCRF PD image name
-  pcrf_ppd_flavor_name:
-    type: string
-    label: PCRF PD flavor name
-    description: flavor name of PCRF PD instance
-  availabilityzone_name:
-    type: string
-    label: availabilityzone name
-    description: availabilityzone name
-  pcrf_cps_net_name:
-    type: string
-    label: CPS network name
-    description: CPS network name
-  pcrf_cps_net_ips:
-    type: comma_delimited_list
-    label: CPS network ips
-    description: CPS network ips
-  pcrf_cps_net_mask:
-    type: string
-    label: CPS network mask
-    description: CPS network mask
-  pcrf_lb_internal_vip:
-    type: string
-    label: CPS Internal LB VIP
-    description: CPS Internal LB VIP
-  pcrf_oam_net_name:
-    type: string
-    label: OAM network name
-    description: OAM network name
-  pcrf_oam_net_ips:
-    type: comma_delimited_list
-    label: OAM network ips
-    description: OAM network ips
-  pcrf_oam_net_gw:
-    type: string
-    label: CPS network gateway
-    description: CPS network gateway
-  pcrf_oam_net_mask:
-    type: string
-    label: CPS network mask
-    description: CPS network mask
-  pcrf_lb_management_vip:
-    type: string
-    label: CPS OAM LB VIP
-    description: CPS OAM LB VIP
-  pcrf_gx_net_name:
-    type: string
-    label: Gx network name
-    description: Gx network name
-  pcrf_gx_net_ips:
-    type: comma_delimited_list
-    label: Gx network ips
-    description: Gx network ips
-  pcrf_gx_net_mask:
-    type: string
-    label: Gx network mask
-    description: Gx network mask
-  pcrf_sp_net_name:
-    type: string
-    label: Sp network name
-    description: Sp network name
-  pcrf_sp_net_ips:
-    type: comma_delimited_list
-    label: Sp network ips
-    description: Sp network ips
-  pcrf_sp_net_mask:
-    type: string
-    label: Sp network mask
-    description: Sp network mask
-  pcrf_sy_net_name:
-    type: string
-    label: Sy network name
-    description: Sy network name
-  pcrf_sy_net_ips:
-    type: comma_delimited_list
-    label: Sy network ips
-    description: Sy network ips
-  pcrf_sy_net_mask:
-    type: string
-    label: Sy network mask
-    description: Sy network mask
-  pcrf_rx_net_name:
-    type: string
-    label: Rx network name
-    description: Rx network name
-  pcrf_rx_net_ips:
-    type: comma_delimited_list
-    label: Rx network ips
-    description: Rx network ips
-  pcrf_rx_net_mask:
-    type: string
-    label: Rx network mask
-    description: Rx network mask
-  pcrf_sd_net_name:
-    type: string
-    label: Sd network name
-    description: Sd network name
-  pcrf_sd_net_ips:
-    type: comma_delimited_list
-    label: Sd network ips
-    description: Sd network ips
-  pcrf_sd_net_mask:
-    type: string
-    label: Sd network mask
-    description: Sd network mask
-  pcrf_sgi_sy_net_name:
-    type: string
-    label: Sgi Sy network name
-    description: Sgi Sy network name
-  pcrf_sgi_sy_net_ips:
-    type: comma_delimited_list
-    label: Sgi Sy network ips
-    description: Sgi Sy network ips
-  pcrf_sgi_sy_net_mask:
-    type: string
-    label: Sgi Sy network mask
-    description: Sgi Sy network mask
-  pcrf_security_group_name:
-    type: string
-    label: security group name
-    description: the name of security group
-  pcrf_vnf_id:
-    type: string
-    label: PCRF VNF Id
-    description: PCRF VNF Id
-
-resources:
-  server_pcrf_ppd_001:
-    type: nested-ppd_v1.0.yaml
-    properties:
-      pcrf_ppd_server_name: { get_param: [pcrf_ppd_server_names, 0] }
-      pcrf_ppd_image_name: { get_param: pcrf_ppd_image_name }
-      pcrf_ppd_flavor_name: { get_param: pcrf_ppd_flavor_name }
-      availabilityzone_name: { get_param: availabilityzone_name }
-      pcrf_security_group_name: { get_param: pcrf_security_group_name }
-      pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
-      pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 0] }
-      pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
-      pcrf_lb_internal_vip: { get_param: pcrf_lb_internal_vip }
-      pcrf_oam_net_name: { get_param: pcrf_oam_net_name }
-      pcrf_oam_net_ip: { get_param: [pcrf_oam_net_ips, 0] }
-      pcrf_oam_net_mask: { get_param: pcrf_oam_net_mask }
-      pcrf_oam_net_gw: { get_param: pcrf_oam_net_gw }
-      pcrf_lb_management_vip: { get_param: pcrf_lb_management_vip }
-      pcrf_gx_net_name: { get_param: pcrf_gx_net_name }
-      pcrf_gx_net_ip: { get_param: [pcrf_gx_net_ips, 0] }
-      pcrf_gx_net_mask: { get_param: pcrf_gx_net_mask }
-      pcrf_sp_net_name: { get_param: pcrf_sp_net_name }
-      pcrf_sp_net_ip: { get_param: [pcrf_sp_net_ips, 0] }
-      pcrf_sp_net_mask: { get_param: pcrf_sp_net_mask }
-      pcrf_sy_net_name: { get_param: pcrf_sy_net_name }
-      pcrf_sy_net_ip: { get_param: [pcrf_sy_net_ips, 0] }
-      pcrf_sy_net_mask: { get_param: pcrf_sy_net_mask }
-      pcrf_rx_net_name: { get_param: pcrf_rx_net_name }
-      pcrf_rx_net_ip: { get_param: [pcrf_rx_net_ips, 0] }
-      pcrf_rx_net_mask: { get_param: pcrf_rx_net_mask }
-      pcrf_sd_net_name: { get_param: pcrf_sd_net_name }
-      pcrf_sd_net_ip: { get_param: [pcrf_sd_net_ips, 0] }
-      pcrf_sd_net_mask: { get_param: pcrf_sd_net_mask }
-      pcrf_sgi_sy_net_name: { get_param: pcrf_sgi_sy_net_name }
-      pcrf_sgi_sy_net_ip: { get_param: [pcrf_sgi_sy_net_ips, 0] }
-      pcrf_sgi_sy_net_mask: { get_param: pcrf_sgi_sy_net_mask }
-      pcrf_vnf_id: {get_param: pcrf_vnf_id}
-
-  server_pcrf_ppd_002:
-    type: nested-ppd_v1.0.yaml
-    properties:
-      pcrf_ppd_server_name: { get_param: [pcrf_ppd_server_names, 1] }
-      pcrf_ppd_image_name: { get_param: pcrf_ppd_image_name }
-      pcrf_ppd_flavor_name: { get_param: pcrf_ppd_flavor_name }
-      availabilityzone_name: { get_param: availabilityzone_name }
-      pcrf_security_group_name: { get_param: pcrf_security_group_name }
-      pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
-      pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 1] }
-      pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
-      pcrf_lb_internal_vip: { get_param: pcrf_lb_internal_vip }
-      pcrf_oam_net_name: { get_param: pcrf_oam_net_name }
-      pcrf_oam_net_ip: { get_param: [pcrf_oam_net_ips, 1] }
-      pcrf_oam_net_mask: { get_param: pcrf_oam_net_mask }
-      pcrf_oam_net_gw: { get_param: pcrf_oam_net_gw }
-      pcrf_lb_management_vip: { get_param: pcrf_lb_management_vip }
-      pcrf_gx_net_name: { get_param: pcrf_gx_net_name }
-      pcrf_gx_net_ip: { get_param: [pcrf_gx_net_ips, 1] }
-      pcrf_gx_net_mask: { get_param: pcrf_gx_net_mask }
-      pcrf_sp_net_name: { get_param: pcrf_sp_net_name }
-      pcrf_sp_net_ip: { get_param: [pcrf_sp_net_ips, 1] }
-      pcrf_sp_net_mask: { get_param: pcrf_sp_net_mask }
-      pcrf_sy_net_name: { get_param: pcrf_sy_net_name }
-      pcrf_sy_net_ip: { get_param: [pcrf_sy_net_ips, 1] }
-      pcrf_sy_net_mask: { get_param: pcrf_sy_net_mask }
-      pcrf_rx_net_name: { get_param: pcrf_rx_net_name }
-      pcrf_rx_net_ip: { get_param: [pcrf_rx_net_ips, 1] }
-      pcrf_rx_net_mask: { get_param: pcrf_rx_net_mask }
-      pcrf_sd_net_name: { get_param: pcrf_sd_net_name }
-      pcrf_sd_net_ip: { get_param: [pcrf_sd_net_ips, 1] }
-      pcrf_sd_net_mask: { get_param: pcrf_sd_net_mask }
-      pcrf_sgi_sy_net_name: { get_param: pcrf_sgi_sy_net_name }
-      pcrf_sgi_sy_net_ip: { get_param: [pcrf_sgi_sy_net_ips, 1] }
-      pcrf_sgi_sy_net_mask: { get_param: pcrf_sgi_sy_net_mask }
-      pcrf_vnf_id: {get_param: pcrf_vnf_id}
-
-  server_pcrf_ppd_003:
-    type: nested-ppd_v1.0.yaml
-    properties:
-      pcrf_ppd_server_name: { get_param: [pcrf_ppd_server_names, 2] }
-      pcrf_ppd_image_name: { get_param: pcrf_ppd_image_name }
-      pcrf_ppd_flavor_name: { get_param: pcrf_ppd_flavor_name }
-      availabilityzone_name: { get_param: availabilityzone_name }
-      pcrf_security_group_name: { get_param: pcrf_security_group_name }
-      pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
-      pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 2] }
-      pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
-      pcrf_lb_internal_vip: { get_param: pcrf_lb_internal_vip }
-      pcrf_oam_net_name: { get_param: pcrf_oam_net_name }
-      pcrf_oam_net_ip: { get_param: [pcrf_oam_net_ips, 2] }
-      pcrf_oam_net_mask: { get_param: pcrf_oam_net_mask }
-      pcrf_oam_net_gw: { get_param: pcrf_oam_net_gw }
-      pcrf_lb_management_vip: { get_param: pcrf_lb_management_vip }
-      pcrf_gx_net_name: { get_param: pcrf_gx_net_name }
-      pcrf_gx_net_ip: { get_param: [pcrf_gx_net_ips, 2] }
-      pcrf_gx_net_mask: { get_param: pcrf_gx_net_mask }
-      pcrf_sp_net_name: { get_param: pcrf_sp_net_name }
-      pcrf_sp_net_ip: { get_param: [pcrf_sp_net_ips, 2] }
-      pcrf_sp_net_mask: { get_param: pcrf_sp_net_mask }
-      pcrf_sy_net_name: { get_param: pcrf_sy_net_name }
-      pcrf_sy_net_ip: { get_param: [pcrf_sy_net_ips, 2] }
-      pcrf_sy_net_mask: { get_param: pcrf_sy_net_mask }
-      pcrf_rx_net_name: { get_param: pcrf_rx_net_name }
-      pcrf_rx_net_ip: { get_param: [pcrf_rx_net_ips, 2] }
-      pcrf_rx_net_mask: { get_param: pcrf_rx_net_mask }
-      pcrf_sd_net_name: { get_param: pcrf_sd_net_name }
-      pcrf_sd_net_ip: { get_param: [pcrf_sd_net_ips, 2] }
-      pcrf_sd_net_mask: { get_param: pcrf_sd_net_mask }
-      pcrf_sgi_sy_net_name: { get_param: pcrf_sgi_sy_net_name }
-      pcrf_sgi_sy_net_ip: { get_param: [pcrf_sgi_sy_net_ips, 2] }
-      pcrf_sgi_sy_net_mask: { get_param: pcrf_sgi_sy_net_mask }
-      pcrf_vnf_id: {get_param: pcrf_vnf_id}
-
-  server_pcrf_ppd_004:
-    type: nested-ppd_v1.0.yaml
-    properties:
-      pcrf_ppd_server_name: { get_param: [pcrf_ppd_server_names, 3] }
-      pcrf_ppd_image_name: { get_param: pcrf_ppd_image_name }
-      pcrf_ppd_flavor_name: { get_param: pcrf_ppd_flavor_name }
-      availabilityzone_name: { get_param: availabilityzone_name }
-      pcrf_security_group_name: { get_param: pcrf_security_group_name }
-      pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
-      pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 3] }
-      pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
-      pcrf_lb_internal_vip: { get_param: pcrf_lb_internal_vip }
-      pcrf_oam_net_name: { get_param: pcrf_oam_net_name }
-      pcrf_oam_net_ip: { get_param: [pcrf_oam_net_ips, 3] }
-      pcrf_oam_net_mask: { get_param: pcrf_oam_net_mask }
-      pcrf_oam_net_gw: { get_param: pcrf_oam_net_gw }
-      pcrf_lb_management_vip: { get_param: pcrf_lb_management_vip }
-      pcrf_gx_net_name: { get_param: pcrf_gx_net_name }
-      pcrf_gx_net_ip: { get_param: [pcrf_gx_net_ips, 3] }
-      pcrf_gx_net_mask: { get_param: pcrf_gx_net_mask }
-      pcrf_sp_net_name: { get_param: pcrf_sp_net_name }
-      pcrf_sp_net_ip: { get_param: [pcrf_sp_net_ips, 3] }
-      pcrf_sp_net_mask: { get_param: pcrf_sp_net_mask }
-      pcrf_sy_net_name: { get_param: pcrf_sy_net_name }
-      pcrf_sy_net_ip: { get_param: [pcrf_sy_net_ips, 3] }
-      pcrf_sy_net_mask: { get_param: pcrf_sy_net_mask }
-      pcrf_rx_net_name: { get_param: pcrf_rx_net_name }
-      pcrf_rx_net_ip: { get_param: [pcrf_rx_net_ips, 3] }
-      pcrf_rx_net_mask: { get_param: pcrf_rx_net_mask }
-      pcrf_sd_net_name: { get_param: pcrf_sd_net_name }
-      pcrf_sd_net_ip: { get_param: [pcrf_sd_net_ips, 3] }
-      pcrf_sd_net_mask: { get_param: pcrf_sd_net_mask }
-      pcrf_sgi_sy_net_name: { get_param: pcrf_sgi_sy_net_name }
-      pcrf_sgi_sy_net_ip: { get_param: [pcrf_sgi_sy_net_ips, 3] }
-      pcrf_sgi_sy_net_mask: { get_param: pcrf_sgi_sy_net_mask }
-      pcrf_vnf_id: {get_param: pcrf_vnf_id}
diff --git a/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/simpleNotif-V1/artifacts/hot-nimbus-ppd_v1.1.env b/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/simpleNotif-V1/artifacts/hot-nimbus-ppd_v1.1.env
deleted file mode 100644
index 10697bc..0000000
--- a/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/simpleNotif-V1/artifacts/hot-nimbus-ppd_v1.1.env
+++ /dev/null
@@ -1,35 +0,0 @@
-parameters:
-  pcrf_ppd_server_names: ZRDM1PCRF01PPD001,ZRDM1PCRF01PPD002,ZRDM1PCRF01PPD003,ZRDM1PCRF01PPD004
-  pcrf_ppd_image_name: PCRF_8.995-ATTM1.0.3.qcow2
-  pcrf_ppd_flavor_name: lc.4xlarge4
-  availabilityzone_name: nova
-  pcrf_cps_net_name: Mobisupport-25193-I-INT1_int_pcrf_net_0
-  pcrf_cps_net_ips: 172.26.16.3,172.26.16.4,172.26.16.5,172.26.16.6
-  pcrf_lb_internal_vip: 172.26.16.114
-  pcrf_cps_net_mask: 255.255.255.0
-  pcrf_oam_net_name: MNS-25180-L-01_oam_protected_net_0
-  pcrf_oam_net_ips: 107.239.64.113,107.239.64.114,107.239.64.115,107.239.64.116
-  pcrf_lb_management_vip: 107.239.64.123
-  pcrf_oam_net_gw: 107.239.64.1
-  pcrf_oam_net_mask: 255.255.248.0
-  pcrf_gx_net_name: Mobisupport-25193-I-INT1_cor_pcrf_gx_net_0
-  pcrf_gx_net_ips: 107.239.24.67,107.239.24.68,107.239.24.69,107.239.24.70
-  pcrf_gx_net_mask: 255.255.255.248
-  pcrf_sp_net_name: Mobisupport-25193-I-INT1_cor_pcrf_sp_net_0
-  pcrf_sp_net_ips: 107.239.24.75,107.239.24.76,107.239.24.77,107.239.24.78
-  pcrf_sp_net_mask: 255.255.255.248
-  pcrf_sy_net_name: Mobisupport-25193-I-INT1_cor_pcrf_sy_net_0
-  pcrf_sy_net_ips: 107.239.24.83,107.239.24.84,107.239.24.85,107.239.24.86
-  pcrf_sy_net_mask: 255.255.255.248
-  pcrf_rx_net_name: Mobisupport-25193-I-INT1_cor_pcrf_rx_net_0
-  pcrf_rx_net_ips: 107.239.24.91,107.239.24.92,107.239.24.93,107.239.24.94
-  pcrf_rx_net_mask: 255.255.255.248
-  pcrf_sd_net_name: Mobisupport-25193-I-INT1_cor_pcrf_sd_net_0
-  pcrf_sd_net_ips: 107.239.24.99,107.239.24.100,107.239.24.101,107.239.24.102
-  pcrf_sd_net_mask: 255.255.255.248
-  pcrf_sgi_sy_net_name: Mobisupport-25193-I-INT1_sgi_pcrf_sy_net_0
-  pcrf_sgi_sy_net_ips: 107.239.26.131,107.239.26.132,107.239.26.133,107.239.26.134
-  pcrf_sgi_sy_net_mask: 255.255.255.248
-  pcrf_security_group_name: nimbus_security_group
-  pcrf_vnf_id: 730797234b4a40aa99335157b02871cd
-
diff --git a/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/simpleNotif-V1/artifacts/hot-nimbus-pps_v1.0.env b/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/simpleNotif-V1/artifacts/hot-nimbus-pps_v1.0.env
deleted file mode 100644
index 18c064c..0000000
--- a/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/simpleNotif-V1/artifacts/hot-nimbus-pps_v1.0.env
+++ /dev/null
@@ -1,11 +0,0 @@
-parameters:
-  pcrf_pps_server_names: ZRDM1PCRF01PPS001,ZRDM1PCRF01PPS002,ZRDM1PCRF01PPS003,ZRDM1PCRF01PPS004,ZRDM1PCRF01PPS005,ZRDM1PCRF01PPS006
-  pcrf_pps_image_name: PCRF_8.995-ATTM1.0.3.qcow2
-  pcrf_pps_flavor_name: lc.3xlarge
-  availabilityzone_name: nova
-  pcrf_cps_net_name: Mobisupport-25193-I-INT1_int_pcrf_net_0
-  pcrf_cps_net_ips: 172.26.16.7,172.26.16.8,172.26.16.9,172.26.16.10,172.26.16.11,172.26.16.12
-  pcrf_cps_net_mask: 255.255.255.0
-  pcrf_security_group_name: nimbus_security_group
-  pcrf_vnf_id: 730797234b4a40aa99335157b02871cd
-
diff --git a/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/simpleNotif-V1/artifacts/hot-nimbus-pps_v1.0.yaml b/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/simpleNotif-V1/artifacts/hot-nimbus-pps_v1.0.yaml
deleted file mode 100644
index 0fadd00..0000000
--- a/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/simpleNotif-V1/artifacts/hot-nimbus-pps_v1.0.yaml
+++ /dev/null
@@ -1,121 +0,0 @@
-heat_template_version: 2013-05-23
-
-description: heat template that creates PCRF Policy Server stack
-
-parameters:
-  pcrf_pps_server_names:
-    type: comma_delimited_list
-    label: PCRF PS server names
-    description: PCRF PS server names
-  pcrf_pps_image_name:
-    type: string
-    label: PCRF PS image name
-    description: PCRF PS image name
-  pcrf_pps_flavor_name:
-    type: string
-    label: PCRF PS flavor name
-    description: flavor name of PCRF PS instance
-  availabilityzone_name:
-    type: string
-    label: availabilityzone name
-    description: availabilityzone name
-  pcrf_cps_net_name:
-    type: string
-    label: CPS network name
-    description: CPS network name
-  pcrf_cps_net_ips:
-    type: comma_delimited_list
-    label: CPS network ips
-    description: CPS network ips
-  pcrf_cps_net_mask:
-    type: string
-    label: CPS network mask
-    description: CPS network mask
-  pcrf_security_group_name:
-    type: string
-    label: security group name
-    description: the name of security group
-  pcrf_vnf_id:
-    type: string
-    label: PCRF VNF Id
-    description: PCRF VNF Id
-
-resources:
-  server_pcrf_pps_001:
-    type: nested-pps_v1.0.yaml
-    properties:
-      pcrf_pps_server_name: { get_param: [pcrf_pps_server_names, 0] }
-      pcrf_pps_image_name: { get_param: pcrf_pps_image_name }
-      pcrf_pps_flavor_name: { get_param: pcrf_pps_flavor_name }
-      availabilityzone_name: { get_param: availabilityzone_name }
-      pcrf_security_group_name: { get_param: pcrf_security_group_name }
-      pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
-      pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 0] }
-      pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
-      pcrf_vnf_id: {get_param: pcrf_vnf_id}
-
-  server_pcrf_pps_002:
-    type: nested-pps_v1.0.yaml
-    properties:
-      pcrf_pps_server_name: { get_param: [pcrf_pps_server_names, 1] }
-      pcrf_pps_image_name: { get_param: pcrf_pps_image_name }
-      pcrf_pps_flavor_name: { get_param: pcrf_pps_flavor_name }
-      availabilityzone_name: { get_param: availabilityzone_name }
-      pcrf_security_group_name: { get_param: pcrf_security_group_name }
-      pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
-      pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 1] }
-      pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
-      pcrf_vnf_id: {get_param: pcrf_vnf_id}
-
-  server_pcrf_pps_003:
-    type: nested-pps_v1.0.yaml
-    properties:
-      pcrf_pps_server_name: { get_param: [pcrf_pps_server_names, 2] }
-      pcrf_pps_image_name: { get_param: pcrf_pps_image_name }
-      pcrf_pps_flavor_name: { get_param: pcrf_pps_flavor_name }
-      availabilityzone_name: { get_param: availabilityzone_name }
-      pcrf_security_group_name: { get_param: pcrf_security_group_name }
-      pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
-      pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 2] }
-      pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
-      pcrf_vnf_id: {get_param: pcrf_vnf_id}
-
-  server_pcrf_pps_004:
-    type: nested-pps_v1.0.yaml
-    properties:
-      pcrf_pps_server_name: { get_param: [pcrf_pps_server_names, 3] }
-      pcrf_pps_image_name: { get_param: pcrf_pps_image_name }
-      pcrf_pps_flavor_name: { get_param: pcrf_pps_flavor_name }
-      availabilityzone_name: { get_param: availabilityzone_name }
-      pcrf_security_group_name: { get_param: pcrf_security_group_name }
-      pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
-      pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 3] }
-      pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
-      pcrf_vnf_id: {get_param: pcrf_vnf_id}
-
-  server_pcrf_pps_005:
-    type: nested-pps_v1.0.yaml
-    properties:
-      pcrf_pps_server_name: { get_param: [pcrf_pps_server_names, 4] }
-      pcrf_pps_image_name: { get_param: pcrf_pps_image_name }
-      pcrf_pps_flavor_name: { get_param: pcrf_pps_flavor_name }
-      availabilityzone_name: { get_param: availabilityzone_name }
-      pcrf_security_group_name: { get_param: pcrf_security_group_name }
-      pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
-      pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 4] }
-      pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
-      pcrf_vnf_id: {get_param: pcrf_vnf_id}
-
-  server_pcrf_pps_006:
-    type: nested-pps_v1.0.yaml
-    properties:
-      pcrf_pps_server_name: { get_param: [pcrf_pps_server_names, 5] }
-      pcrf_pps_image_name: { get_param: pcrf_pps_image_name }
-      pcrf_pps_flavor_name: { get_param: pcrf_pps_flavor_name }
-      availabilityzone_name: { get_param: availabilityzone_name }
-      pcrf_security_group_name: { get_param: pcrf_security_group_name }
-      pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
-      pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 5] }
-      pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
-      pcrf_vnf_id: {get_param: pcrf_vnf_id}
-
diff --git a/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/simpleNotif-V1/artifacts/hot-nimbus-psm_v1.0.env b/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/simpleNotif-V1/artifacts/hot-nimbus-psm_v1.0.env
deleted file mode 100644
index 95e450e..0000000
--- a/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/simpleNotif-V1/artifacts/hot-nimbus-psm_v1.0.env
+++ /dev/null
@@ -1,10 +0,0 @@
-parameters:
-  pcrf_psm_server_names: ZRDM1PCRF01PSM001,ZRDM1PCRF01PSM002,ZRDM1PCRF01PSM003,ZRDM1PCRF01PSM004,ZRDM1PCRF01PSM005,ZRDM1PCRF01PSM006,ZRDM1PCRF01PSM007,ZRDM1PCRF01PSM008,ZRDM1PCRF01PSM009,ZRDM1PCRF01PSM010,ZRDM1PCRF01PSM011,ZRDM1PCRF01PSM012
-  pcrf_psm_image_name: PCRF_8.995-ATTM1.0.3.qcow2
-  pcrf_psm_flavor_name: lc.4xlarge4
-  availabilityzone_name: nova
-  pcrf_cps_net_name: Mobisupport-25193-I-INT1_int_pcrf_net_0
-  pcrf_cps_net_ips: 172.26.16.63,172.26.16.64,172.26.16.65,172.26.16.66,172.26.16.67,172.26.16.68,172.26.16.69,172.26.16.70,172.26.16.71,172.26.16.72,172.26.16.73,172.26.16.74
-  pcrf_cps_net_mask: 255.255.255.0
-  pcrf_security_group_name: nimbus_security_group
-  pcrf_vnf_id: 730797234b4a40aa99335157b02871cd
diff --git a/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/simpleNotif-V1/artifacts/hot-nimbus-psm_v1.0.yaml b/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/simpleNotif-V1/artifacts/hot-nimbus-psm_v1.0.yaml
deleted file mode 100644
index 217b0fe..0000000
--- a/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/simpleNotif-V1/artifacts/hot-nimbus-psm_v1.0.yaml
+++ /dev/null
@@ -1,199 +0,0 @@
-heat_template_version: 2013-05-23
-
-description: heat template that creates PCRF Session Manager stack
-
-parameters:
-  pcrf_psm_server_names:
-    type: comma_delimited_list
-    label: PCRF SM server names
-    description: name of the PCRF SM instance
-  pcrf_psm_image_name:
-    type: string
-    label: PCRF SM image name
-    description: PCRF SM image name
-  pcrf_psm_flavor_name:
-    type: string
-    label: PCRF SM flavor name
-    description: flavor name of PCRF SM instance 
-  availabilityzone_name:
-    type: string
-    label: availabilityzone name
-    description: availabilityzone name
-  pcrf_cps_net_name:
-    type: string
-    label: CPS network name
-    description: CPS network name
-  pcrf_cps_net_ips:
-    type: comma_delimited_list
-    label: CPS network ips
-    description: CPS network ips
-  pcrf_cps_net_mask:
-    type: string
-    label: CPS network mask
-    description: CPS network mask
-  pcrf_security_group_name:
-    type: string
-    label: security group name
-    description: the name of security group
-  pcrf_vnf_id:
-    type: string
-    label: PCRF VNF Id
-    description: PCRF VNF Id
-
-resources:
-  server_pcrf_psm_001:
-    type: nested-psm_v1.0.yaml
-    properties:
-      pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 0] }
-      pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
-      pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
-      availabilityzone_name: { get_param: availabilityzone_name }
-      pcrf_security_group_name: { get_param: pcrf_security_group_name }
-      pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
-      pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 0] }
-      pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
-      pcrf_vnf_id: {get_param: pcrf_vnf_id}
-
-  server_pcrf_psm_002:
-    type: nested-psm_v1.0.yaml
-    properties:
-      pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 1] }
-      pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
-      pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
-      availabilityzone_name: { get_param: availabilityzone_name }
-      pcrf_security_group_name: { get_param: pcrf_security_group_name }
-      pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
-      pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 1] }
-      pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
-      pcrf_vnf_id: {get_param: pcrf_vnf_id}
-
-  server_pcrf_psm_003:
-    type: nested-psm_v1.0.yaml
-    properties:
-      pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 2] }
-      pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
-      pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
-      availabilityzone_name: { get_param: availabilityzone_name }
-      pcrf_security_group_name: { get_param: pcrf_security_group_name }
-      pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
-      pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 2] }
-      pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
-      pcrf_vnf_id: {get_param: pcrf_vnf_id}
-
-  server_pcrf_psm_004:
-    type: nested-psm_v1.0.yaml
-    properties:
-      pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 3] }
-      pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
-      pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
-      availabilityzone_name: { get_param: availabilityzone_name }
-      pcrf_security_group_name: { get_param: pcrf_security_group_name }
-      pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
-      pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 3] }
-      pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
-      pcrf_vnf_id: {get_param: pcrf_vnf_id}
-
-  server_pcrf_psm_005:
-    type: nested-psm_v1.0.yaml
-    properties:
-      pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 4] }
-      pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
-      pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
-      availabilityzone_name: { get_param: availabilityzone_name }
-      pcrf_security_group_name: { get_param: pcrf_security_group_name }
-      pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
-      pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 4] }
-      pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
-      pcrf_vnf_id: {get_param: pcrf_vnf_id}
-
-  server_pcrf_psm_006:
-    type: nested-psm_v1.0.yaml
-    properties:
-      pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 5] }
-      pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
-      pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
-      availabilityzone_name: { get_param: availabilityzone_name }
-      pcrf_security_group_name: { get_param: pcrf_security_group_name }
-      pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
-      pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 5] }
-      pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
-      pcrf_vnf_id: {get_param: pcrf_vnf_id}
-
-  server_pcrf_psm_007:
-    type: nested-psm_v1.0.yaml
-    properties:
-      pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 6] }
-      pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
-      pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
-      availabilityzone_name: { get_param: availabilityzone_name }
-      pcrf_security_group_name: { get_param: pcrf_security_group_name }
-      pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
-      pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 6] }
-      pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
-      pcrf_vnf_id: {get_param: pcrf_vnf_id}
-
-  server_pcrf_psm_008:
-    type: nested-psm_v1.0.yaml
-    properties:
-      pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 7] }
-      pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
-      pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
-      availabilityzone_name: { get_param: availabilityzone_name }
-      pcrf_security_group_name: { get_param: pcrf_security_group_name }
-      pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
-      pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 7] }
-      pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
-      pcrf_vnf_id: {get_param: pcrf_vnf_id}
-
-  server_pcrf_psm_009:
-    type: nested-psm_v1.0.yaml
-    properties:
-      pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 8] }
-      pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
-      pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
-      availabilityzone_name: { get_param: availabilityzone_name }
-      pcrf_security_group_name: { get_param: pcrf_security_group_name }
-      pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
-      pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 8] }
-      pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
-      pcrf_vnf_id: {get_param: pcrf_vnf_id}
-
-  server_pcrf_psm_010:
-    type: nested-psm_v1.0.yaml
-    properties:
-      pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 9] }
-      pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
-      pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
-      availabilityzone_name: { get_param: availabilityzone_name }
-      pcrf_security_group_name: { get_param: pcrf_security_group_name }
-      pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
-      pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 9] }
-      pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
-      pcrf_vnf_id: {get_param: pcrf_vnf_id}
-
-  server_pcrf_psm_011:
-    type: nested-psm_v1.0.yaml
-    properties:
-      pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 10] }
-      pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
-      pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
-      availabilityzone_name: { get_param: availabilityzone_name }
-      pcrf_security_group_name: { get_param: pcrf_security_group_name }
-      pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
-      pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 10] }
-      pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
-      pcrf_vnf_id: {get_param: pcrf_vnf_id}
-
-  server_pcrf_psm_012:
-    type: nested-psm_v1.0.yaml
-    properties:
-      pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 11] }
-      pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
-      pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
-      availabilityzone_name: { get_param: availabilityzone_name }
-      pcrf_security_group_name: { get_param: pcrf_security_group_name }
-      pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
-      pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 11] }
-      pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
-      pcrf_vnf_id: {get_param: pcrf_vnf_id}
- 
diff --git a/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/simpleNotif-V1/artifacts/hot-nimbus-swift-container_v1.0.env b/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/simpleNotif-V1/artifacts/hot-nimbus-swift-container_v1.0.env
deleted file mode 100644
index 5267ee4..0000000
--- a/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/simpleNotif-V1/artifacts/hot-nimbus-swift-container_v1.0.env
+++ /dev/null
@@ -1,3 +0,0 @@
-parameters:
-  pcrf_swift_container_name_1: PCRF_Config_Container_1
-  pcrf_swift_container_purge_on_delete_flag_1: false
diff --git a/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/simpleNotif-V1/artifacts/hot-nimbus-swift-container_v1.0.yaml b/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/simpleNotif-V1/artifacts/hot-nimbus-swift-container_v1.0.yaml
deleted file mode 100644
index ab427bb..0000000
--- a/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/simpleNotif-V1/artifacts/hot-nimbus-swift-container_v1.0.yaml
+++ /dev/null
@@ -1,30 +0,0 @@
-heat_template_version: 2013-05-23
-
-description: heat template that creates PCRF Session Manager stack
-
-parameters:
-   pcrf_swift_container_name_1:
-     type: string
-     label: Swift Container name
-     description: Swift Container Name
-   pcrf_swift_container_purge_on_delete_flag_1:
-     type: boolean
-     label: Purge on Delete Flag
-     description: Purge on Delete Flag
-
-resources:
-  pcrf_swift_container_1:
-    type: OS::Swift::Container
-    properties:
-      name: { get_param: pcrf_swift_container_name_1 }
-      PurgeOnDelete: { get_param: pcrf_swift_container_purge_on_delete_flag_1 }
-      X-Container-Read: ".r:*"
-     
-outputs:
-  pcrf_swift_container_id_1:
-    description: the pcrf_swift_container_1 id
-    value: { get_resource: pcrf_swift_container_1 }
-  pcrf_swift_container_url_1:
-    description: the pcrf_swift_container_1 url
-    value: { get_attr: [ pcrf_swift_container_1, WebsiteURL ] }
-    
\ No newline at end of file
diff --git a/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/simpleNotif-V1/artifacts/mount_iso_script.sh b/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/simpleNotif-V1/artifacts/mount_iso_script.sh
deleted file mode 100644
index 91df598..0000000
--- a/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/simpleNotif-V1/artifacts/mount_iso_script.sh
+++ /dev/null
@@ -1,34 +0,0 @@
-#!/bin/bash
-
-#. .config 
-#following would be in the .config file
- device_name="/dev/vde"
- install_script="install_nimbus.sh"
- enable_logic_flag_file=".flag"
-#end of config file
-
-#get the semaphore, 0 - disbaled, 1- enabled
-flag=$(cat ${enable_logic_flag_file})
-
-#check if device is mounted already
-test=$(mount | grep ${device_name})
-if [ "$flag" == "1" ]; then
-	if [ -e ${device_name} ] && [ ! "${test}" ]; then
-		#mount the iso image
-		mount -t iso9660 -v -o loop /dev/vde/ /mnt/iso
-		#if availabe run the install script (it contains the install.sh steps)
-		if [ -e "${install_script}" ] && [ -f "${install_script}" ]; then
-			${install_script}
-		fi
-		#disable the script from attempting to 
-		#  mount and run install again until needed;
-		echo "0" > ${enable_logic_flag_file}
-		#if nedeed add step to comment out the crontab line here;
-	fi
-else
-	echo "Auto mounting ISO & run install logic disabled!"
-fi
-
-#cron job
-# * * * * * /mount_iso_script.sh
-
diff --git a/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/simpleNotif-V1/artifacts/nested-oam_v1.0.yaml b/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/simpleNotif-V1/artifacts/nested-oam_v1.0.yaml
deleted file mode 100644
index fa3b04e..0000000
--- a/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/simpleNotif-V1/artifacts/nested-oam_v1.0.yaml
+++ /dev/null
@@ -1,156 +0,0 @@
-heat_template_version: 2013-05-23
-
-description: nested heat template that creates a PCRF OAM node stack
-
-parameters:
-  pcrf_oam_server_name:
-    type: string
-    label: PCRF OAM server name
-    description: PCRF OAM server name
-  pcrf_oam_image_name:
-    type: string
-    label: image name
-    description: PCRF OAM image name
-  pcrf_oam_flavor_name:
-    type: string
-    label: PCRF OAM flavor name
-    description: flavor name of PCRF OAM instance
-  availabilityzone_name:
-    type: string
-    label: availabilityzone name
-    description: availabilityzone name
-  pcrf_cps_net_name:
-    type: string
-    label: CPS network name
-    description: CPS network name
-  pcrf_cps_net_ip:
-    type: string
-    label: CPS network ip
-    description: CPS network ip
-  pcrf_cps_net_mask:
-    type: string
-    label: CPS network mask
-    description: CPS network mask
-  pcrf_arbiter_vip:
-    type: string
-    label: OAM Arbiter LB VIP
-    description: OAM Arbiter LB VIP
-  pcrf_oam_net_name:
-    type: string
-    label: OAM network name
-    description: OAM network name
-  pcrf_oam_net_ip:
-    type: string
-    label: OAM network ip
-    description: OAM network ip
-  pcrf_oam_net_gw:
-    type: string
-    label: CPS network gateway
-    description: CPS network gateway
-  pcrf_oam_net_mask:
-    type: string
-    label: CPS network mask
-    description: CPS network mask
-  pcrf_oam_volume_id:
-    type: string
-    label: CPS OAM Cinder Volume
-    description: CPS OAM Cinder Volume
-  pcrf_security_group_name:
-    type: string
-    label: security group name
-    description: the name of security group
-  pcrf_vnf_id:
-    type: string
-    label: PCRF VNF Id
-    description: PCRF VNF Id
-
-resources:
-  network:
-    type: OS::Heat::CloudConfig
-    properties:
-      cloud_config:
-        write_files:
-          - path: /etc/sysconfig/network-scripts/ifcfg-eth0
-            permissions: "0644"
-            content:
-              str_replace:
-                template: { get_file: nimbus-ethernet }
-                params:
-                  $dev: eth0
-                  $ip: { get_param: pcrf_cps_net_ip }
-                  $netmask: { get_param: pcrf_cps_net_mask }
-          - path: /etc/sysconfig/network-scripts/ifcfg-eth1
-            permissions: "0644"
-            content:
-              str_replace:
-                template: { get_file: nimbus-ethernet-gw }
-                params:
-                  $dev: eth1
-                  $ip: { get_param: pcrf_oam_net_ip }
-                  $netmask: { get_param: pcrf_oam_net_mask }
-                  $gateway: { get_param: pcrf_oam_net_gw }
-        runcmd:
-          - ifdown eth0 && ifup eth0
-          - ifdown eth1 && ifup eth1
-  script_init:
-    type: OS::Heat::SoftwareConfig
-    properties:
-      group: ungrouped
-      config:
-        str_replace:
-          template: { get_file: cloud-nimbus.sh }
-          params:
-            $vm_name: { get_param: pcrf_oam_server_name }
-  pcrf_server_init:
-    type: OS::Heat::MultipartMime
-    properties:
-      parts:
-      - config: { get_resource: network}
-      - config: { get_resource: script_init}
-
-  pcrf_server_oam:
-    type: OS::Nova::Server
-    properties:
-      config_drive: "True"
-      name: { get_param: pcrf_oam_server_name }
-      image: { get_param: pcrf_oam_image_name }
-      flavor: { get_param: pcrf_oam_flavor_name }
-      availability_zone: { get_param: availabilityzone_name }
-      networks:
-        - port: { get_resource: pcrf_oam_port_0}
-        - port: { get_resource: pcrf_oam_port_1}
-      user_data_format: RAW
-      user_data:
-        get_resource: pcrf_server_init
-      metadata:
-        vnf_id: {get_param: pcrf_vnf_id}
-  
-  pcrf_oam_port_0:
-    type: OS::Neutron::Port
-    properties:
-      network: { get_param: pcrf_cps_net_name }
-      fixed_ips:
-        - ip_address: { get_param: pcrf_cps_net_ip }
-      allowed_address_pairs:
-        - ip_address: { get_param: pcrf_arbiter_vip }
-      security_groups: [{ get_param: pcrf_security_group_name }]
-
-  pcrf_oam_port_1:
-    type: OS::Neutron::Port
-    properties:
-      network: { get_param: pcrf_oam_net_name }
-      fixed_ips:
-        - ip_address: { get_param: pcrf_oam_net_ip }
-      security_groups: [{ get_param: pcrf_security_group_name }]
-
-  pcrf_oam_vol_attachment:
-    type: OS::Cinder::VolumeAttachment
-    properties:
-      volume_id: { get_param: pcrf_oam_volume_id }
-      mountpoint: /dev/vdd
-      instance_uuid: { get_resource: pcrf_server_oam }
-
-outputs:
-  pcrf_oam_vol_attachment_id:
-    description: the pcrf_oam_vol_attachment_id id
-    value: { get_resource: pcrf_oam_vol_attachment }
diff --git a/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/simpleNotif-V1/artifacts/nested-pcm_v1.0.yaml b/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/simpleNotif-V1/artifacts/nested-pcm_v1.0.yaml
deleted file mode 100644
index a3129bb..0000000
--- a/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/simpleNotif-V1/artifacts/nested-pcm_v1.0.yaml
+++ /dev/null
@@ -1,150 +0,0 @@
-heat_template_version: 2013-05-23
-
-description: heat template that creates PCRF Cluman stack
-
-parameters:
-  pcrf_pcm_server_name:
-    type: string
-    label: PCRF CM server name
-    description: PCRF CM server name
-  pcrf_pcm_image_name:
-    type: string
-    label: image name
-    description: PCRF CM image name
-  pcrf_pcm_flavor_name:
-    type: string
-    label: PCRF CM flavor name
-    description: flavor name of PCRF CM instance
-  availabilityzone_name:
-    type: string
-    label: availabilityzone name
-    description: availabilityzone name
-  pcrf_cps_net_name:
-    type: string
-    label: CPS network name
-    description: CPS network name
-  pcrf_cps_net_ip:
-    type: string
-    label: CPS network ip
-    description: CPS network ip
-  pcrf_cps_net_mask:
-    type: string
-    label: CPS network mask
-    description: CPS network mask
-  pcrf_oam_net_name:
-    type: string
-    label: OAM network name
-    description: OAM network name
-  pcrf_oam_net_ip:
-    type: string
-    label: OAM network ip
-    description: OAM network ip
-  pcrf_oam_net_gw:
-    type: string
-    label: CPS network gateway
-    description: CPS network gateway
-  pcrf_oam_net_mask:
-    type: string
-    label: CPS network mask
-    description: CPS network mask
-  pcrf_pcm_volume_id:
-    type: string
-    label: CPS Cluman Cinder Volume
-    description: CPS Cluman Cinder Volume
-  pcrf_security_group_name:
-    type: string
-    label: security group name
-    description: the name of security group
-  pcrf_vnf_id:
-    type: string
-    label: PCRF VNF Id
-    description: PCRF VNF Id
-
-resources:
-  network:
-    type: OS::Heat::CloudConfig
-    properties:
-      cloud_config:
-        write_files:
-          - path: /etc/sysconfig/network-scripts/ifcfg-eth0
-            permissions: "0644"
-            content:
-              str_replace:
-                template: { get_file: nimbus-ethernet }
-                params:
-                  $dev: eth0
-                  $ip: { get_param: pcrf_cps_net_ip }
-                  $netmask: { get_param: pcrf_cps_net_mask }
-          - path: /etc/sysconfig/network-scripts/ifcfg-eth1
-            permissions: "0644"
-            content:
-              str_replace:
-                template: { get_file: nimbus-ethernet-gw }
-                params:
-                  $dev: eth1
-                  $ip: { get_param: pcrf_oam_net_ip }
-                  $netmask: { get_param: pcrf_oam_net_mask }
-                  $gateway: { get_param: pcrf_oam_net_gw }
-        runcmd:
-          - ifdown eth0 && ifup eth0
-          - ifdown eth1 && ifup eth1
-  script_init:
-    type: OS::Heat::SoftwareConfig
-    properties:
-      group: ungrouped
-      config:
-        str_replace:
-          template: { get_file: cloud-nimbus.sh }
-          params:
-            $vm_name: { get_param: pcrf_pcm_server_name }
-  pcrf_server_init:
-    type: OS::Heat::MultipartMime
-    properties:
-      parts:
-      - config: { get_resource: network}
-      - config: { get_resource: script_init}
-
-  pcrf_server_pcm:
-    type: OS::Nova::Server
-    properties:
-      config_drive: "True"
-      name: { get_param: pcrf_pcm_server_name }
-      image: { get_param: pcrf_pcm_image_name }
-      flavor: { get_param: pcrf_pcm_flavor_name }
-      availability_zone: { get_param: availabilityzone_name }
-      networks:
-        - port: { get_resource: pcrf_pcm_port_0}
-        - port: { get_resource: pcrf_pcm_port_1}
-      user_data_format: RAW
-      user_data:
-        get_resource: pcrf_server_init
-      metadata:
-        vnf_id: {get_param: pcrf_vnf_id}
-
-  pcrf_pcm_port_0:
-    type: OS::Neutron::Port
-    properties:
-      network: { get_param: pcrf_cps_net_name }
-      fixed_ips:
-        - ip_address: { get_param: pcrf_cps_net_ip }
-      security_groups: [{ get_param: pcrf_security_group_name }]
-
-  pcrf_pcm_port_1:
-    type: OS::Neutron::Port
-    properties:
-      network: { get_param: pcrf_oam_net_name }
-      fixed_ips:
-        - ip_address: { get_param: pcrf_oam_net_ip }
-      security_groups: [{ get_param: pcrf_security_group_name }]
-
-  volume_attachment:
-    type: OS::Cinder::VolumeAttachment
-    properties:
-      volume_id: { get_param: pcrf_pcm_volume_id }
-      mountpoint: /dev/vdd
-      instance_uuid: { get_resource: pcrf_server_pcm }
-
-outputs:
-  pcrf_server_pcm_id:
-    description: the pcm server id
-    value: { get_resource: pcrf_server_pcm }
\ No newline at end of file
diff --git a/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/simpleNotif-V1/artifacts/nested-ppd_v1.0.yaml b/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/simpleNotif-V1/artifacts/nested-ppd_v1.0.yaml
deleted file mode 100644
index 169522b..0000000
--- a/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/simpleNotif-V1/artifacts/nested-ppd_v1.0.yaml
+++ /dev/null
@@ -1,333 +0,0 @@
-heat_template_version: 2013-05-23
-
-description: heat template that creates PCRF Policy Director stack
-
-parameters:
-  pcrf_ppd_server_name:
-    type: string
-    label: PCRF PD server name
-    description: PCRF PD server name
-  pcrf_ppd_image_name:
-    type: string
-    label: image name
-    description: PCRF PD image name
-  pcrf_ppd_flavor_name:
-    type: string
-    label: PCRF PD flavor name
-    description: flavor name of PCRF PD instance
-  availabilityzone_name:
-    type: string
-    label: availabilityzone name
-    description: availabilityzone name
-  pcrf_cps_net_name:
-    type: string
-    label: CPS network name
-    description: CPS network name
-  pcrf_cps_net_ip:
-    type: string
-    label: CPS network ip
-    description: CPS network ip
-  pcrf_cps_net_mask:
-    type: string
-    label: CPS network mask
-    description: CPS network mask
-  pcrf_lb_internal_vip:
-    type: string
-    label: CPS Internal LB VIP
-    description: CPS Internal LB VIP
-  pcrf_oam_net_name:
-    type: string
-    label: OAM network name
-    description: OAM network name
-  pcrf_oam_net_ip:
-    type: string
-    label: OAM network ip
-    description: OAM network ip
-  pcrf_oam_net_gw:
-    type: string
-    label: CPS network gateway
-    description: CPS network gateway
-  pcrf_oam_net_mask:
-    type: string
-    label: CPS network mask
-    description: CPS network mask
-  pcrf_lb_management_vip:
-    type: string
-    label: CPS OAM LB VIP
-    description: CPS OAM LB VIP
-  pcrf_gx_net_name:
-    type: string
-    label: Gx network name
-    description: Gx network name
-  pcrf_gx_net_ip:
-    type: string
-    label: Gx network ip
-    description: Gx network ip
-  pcrf_gx_net_mask:
-    type: string
-    label: Gx network mask
-    description: Gx network mask
-  pcrf_sp_net_name:
-    type: string
-    label: Sp network name
-    description: Sp network name
-  pcrf_sp_net_ip:
-    type: string
-    label: Sp network ip
-    description: Sp network ip
-  pcrf_sp_net_mask:
-    type: string
-    label: Sp network mask
-    description: Sp network mask
-  pcrf_sy_net_name:
-    type: string
-    label: Sy network name
-    description: Sy network name
-  pcrf_sy_net_ip:
-    type: string
-    label: Sy network ip
-    description: Sy network ip
-  pcrf_sy_net_mask:
-    type: string
-    label: Sy network mask
-    description: Sy network mask
-  pcrf_rx_net_name:
-    type: string
-    label: Rx network name
-    description: Rx network name
-  pcrf_rx_net_ip:
-    type: string
-    label: Rx network ip
-    description: Rx network ip
-  pcrf_rx_net_mask:
-    type: string
-    label: Rx network mask
-    description: Rx network mask
-  pcrf_sd_net_name:
-    type: string
-    label: Sd network name
-    description: Sd network name
-  pcrf_sd_net_ip:
-    type: string
-    label: Sd network ip
-    description: Sd network ip
-  pcrf_sd_net_mask:
-    type: string
-    label: Sd network mask
-    description: Sd network mask
-  pcrf_sgi_sy_net_name:
-    type: string
-    label: Sgi Sy network name
-    description: Sgi Sy network name
-  pcrf_sgi_sy_net_ip:
-    type: string
-    label: Sgi Sy network ip
-    description: Sgi Sy network ip
-  pcrf_sgi_sy_net_mask:
-    type: string
-    label: Sgi Sy network mask
-    description: Sgi Sy network mask
-  pcrf_security_group_name:
-    type: string
-    label: security group name
-    description: the name of security group
-  pcrf_vnf_id:
-    type: string
-    label: PCRF VNF Id
-    description: PCRF VNF Id
-
-resources:
-  network:
-    type: OS::Heat::CloudConfig
-    properties:
-      cloud_config:
-        write_files:
-          - path: /etc/sysconfig/network-scripts/ifcfg-eth0
-            permissions: "0644"
-            content:
-              str_replace:
-                template: { get_file: nimbus-ethernet }
-                params:
-                  $dev: eth0
-                  $ip: { get_param: pcrf_cps_net_ip }
-                  $netmask: { get_param: pcrf_cps_net_mask }
-          - path: /etc/sysconfig/network-scripts/ifcfg-eth1
-            permissions: "0644"
-            content:
-              str_replace:
-                template: { get_file: nimbus-ethernet-gw }
-                params:
-                  $dev: eth1
-                  $ip: { get_param: pcrf_oam_net_ip }
-                  $netmask: { get_param: pcrf_oam_net_mask }
-                  $gateway: { get_param: pcrf_oam_net_gw }
-          - path: /etc/sysconfig/network-scripts/ifcfg-eth2
-            permissions: "0644"
-            content:
-              str_replace:
-                template: { get_file: nimbus-ethernet }
-                params:
-                  $dev: eth2
-                  $ip: { get_param: pcrf_gx_net_ip }
-                  $netmask: { get_param: pcrf_gx_net_mask }
-          - path: /etc/sysconfig/network-scripts/ifcfg-eth3
-            permissions: "0644"
-            content:
-              str_replace:
-                template: { get_file: nimbus-ethernet }
-                params:
-                  $dev: eth3
-                  $ip: { get_param: pcrf_sp_net_ip }
-                  $netmask: { get_param: pcrf_sp_net_mask }
-          - path: /etc/sysconfig/network-scripts/ifcfg-eth4
-            permissions: "0644"
-            content:
-              str_replace:
-                template: { get_file: nimbus-ethernet }
-                params:
-                  $dev: eth4
-                  $ip: { get_param: pcrf_sy_net_ip }
-                  $netmask: { get_param: pcrf_sy_net_mask }
-          - path: /etc/sysconfig/network-scripts/ifcfg-eth5
-            permissions: "0644"
-            content:
-              str_replace:
-                template: { get_file: nimbus-ethernet }
-                params:
-                  $dev: eth5
-                  $ip: { get_param: pcrf_rx_net_ip }
-                  $netmask: { get_param: pcrf_rx_net_mask }
-          - path: /etc/sysconfig/network-scripts/ifcfg-eth6
-            permissions: "0644"
-            content:
-              str_replace:
-                template: { get_file: nimbus-ethernet }
-                params:
-                  $dev: eth6
-                  $ip: { get_param: pcrf_sd_net_ip }
-                  $netmask: { get_param: pcrf_sd_net_mask }
-          - path: /etc/sysconfig/network-scripts/ifcfg-eth7
-            permissions: "0644"
-            content:
-              str_replace:
-                template: { get_file: nimbus-ethernet }
-                params:
-                  $dev: eth7
-                  $ip: { get_param: pcrf_sgi_sy_net_ip }
-                  $netmask: { get_param: pcrf_sgi_sy_net_mask }
-        runcmd:
-          - ifdown eth0 && ifup eth0
-          - ifdown eth1 && ifup eth1
-          - ifdown eth2 && ifup eth2
-          - ifdown eth3 && ifup eth3
-          - ifdown eth4 && ifup eth4
-          - ifdown eth5 && ifup eth5
-          - ifdown eth6 && ifup eth6
-          - ifdown eth7 && ifup eth7
-  script_init:
-    type: OS::Heat::SoftwareConfig
-    properties:
-      group: ungrouped
-      config:
-        str_replace:
-          template: { get_file: cloud-nimbus.sh }
-          params:
-            $vm_name: { get_param: pcrf_ppd_server_name }
-  pcrf_server_init:
-    type: OS::Heat::MultipartMime
-    properties:
-      parts:
-      - config: { get_resource: network}
-      - config: { get_resource: script_init}
-
-  pcrf_server_ppd: 
-    type: OS::Nova::Server
-    properties:
-      config_drive: "True"
-      name: { get_param: pcrf_ppd_server_name }
-      image: { get_param: pcrf_ppd_image_name }
-      flavor: { get_param: pcrf_ppd_flavor_name }
-      availability_zone: { get_param: availabilityzone_name }
-      networks:
-        - port: { get_resource: pcrf_ppd_port_0}
-        - port: { get_resource: pcrf_ppd_port_1}
-        - port: { get_resource: pcrf_ppd_port_2}
-        - port: { get_resource: pcrf_ppd_port_3}
-        - port: { get_resource: pcrf_ppd_port_4}
-        - port: { get_resource: pcrf_ppd_port_5}
-        - port: { get_resource: pcrf_ppd_port_6}
-        - port: { get_resource: pcrf_ppd_port_7}
-      user_data_format: RAW
-      user_data:
-        get_resource: pcrf_server_init
-      metadata:
-        vnf_id: {get_param: pcrf_vnf_id}
-
-  pcrf_ppd_port_0:
-    type: OS::Neutron::Port
-    properties:
-      network: { get_param: pcrf_cps_net_name }
-      fixed_ips:
-        - ip_address: { get_param: pcrf_cps_net_ip }
-      security_groups: [{ get_param: pcrf_security_group_name }]
-      allowed_address_pairs:
-        - ip_address: { get_param: pcrf_lb_internal_vip }
-
-  pcrf_ppd_port_1:
-    type: OS::Neutron::Port
-    properties:
-      network: { get_param: pcrf_oam_net_name }
-      fixed_ips:
-        - ip_address: { get_param: pcrf_oam_net_ip }
-      security_groups: [{ get_param: pcrf_security_group_name }]
-      allowed_address_pairs:
-        - ip_address: { get_param: pcrf_lb_management_vip } 
- 
-  pcrf_ppd_port_2:
-    type: OS::Neutron::Port
-    properties:
-      network: { get_param: pcrf_gx_net_name }
-      fixed_ips:
-        - ip_address: { get_param: pcrf_gx_net_ip }
-      security_groups: [{ get_param: pcrf_security_group_name }]
-
-  pcrf_ppd_port_3:
-    type: OS::Neutron::Port
-    properties:
-      network: { get_param: pcrf_sp_net_name }
-      fixed_ips:
-        - ip_address: { get_param: pcrf_sp_net_ip }
-      security_groups: [{ get_param: pcrf_security_group_name }]
-
-  pcrf_ppd_port_4:
-    type: OS::Neutron::Port
-    properties:
-      network: { get_param: pcrf_sy_net_name }
-      fixed_ips:
-        - ip_address: { get_param: pcrf_sy_net_ip }
-      security_groups: [{ get_param: pcrf_security_group_name }]
-
-  pcrf_ppd_port_5:
-    type: OS::Neutron::Port
-    properties:
-      network: { get_param: pcrf_rx_net_name }
-      fixed_ips:
-        - ip_address: { get_param: pcrf_rx_net_ip }
-      security_groups: [{ get_param: pcrf_security_group_name }]
-  
-  pcrf_ppd_port_6:
-    type: OS::Neutron::Port
-    properties:
-      network: { get_param: pcrf_sd_net_name }
-      fixed_ips:
-        - ip_address: { get_param: pcrf_sd_net_ip }
-      security_groups: [{ get_param: pcrf_security_group_name }]
-
-  pcrf_ppd_port_7:
-    type: OS::Neutron::Port
-    properties:
-      network: { get_param: pcrf_sgi_sy_net_name }
-      fixed_ips:
-        - ip_address: { get_param: pcrf_sgi_sy_net_ip }
-      security_groups: [{ get_param: pcrf_security_group_name }]
-
diff --git a/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/simpleNotif-V1/artifacts/nested-pps_v1.0.yaml b/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/simpleNotif-V1/artifacts/nested-pps_v1.0.yaml
deleted file mode 100644
index 8cb6e15..0000000
--- a/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/simpleNotif-V1/artifacts/nested-pps_v1.0.yaml
+++ /dev/null
@@ -1,99 +0,0 @@
-heat_template_version: 2013-05-23
-
-description: heat template that creates PCRF Policy Server stack
-
-parameters:
-  pcrf_pps_server_name:
-    type: string
-    label: PCRF PS server name
-    description: PCRF PS server name
-  pcrf_pps_image_name:
-    type: string
-    label: PCRF PS image name
-    description: PCRF PS image name
-  pcrf_pps_flavor_name:
-    type: string
-    label: PCRF PS flavor name
-    description: flavor name of PCRF PS instance
-  availabilityzone_name:
-    type: string
-    label: availabilityzone name
-    description: availabilityzone name
-  pcrf_cps_net_name:
-    type: string
-    label: CPS network name
-    description: CPS network name
-  pcrf_cps_net_ip:
-    type: string
-    label: CPS network ip
-    description: CPS network ip
-  pcrf_cps_net_mask:
-    type: string
-    label: CPS network mask
-    description: CPS network mask
-  pcrf_security_group_name:
-    type: string
-    label: security group name
-    description: the name of security group
-  pcrf_vnf_id:
-    type: string
-    label: PCRF VNF Id
-    description: PCRF VNF Id
-
-resources:
-  script_init:
-    type: OS::Heat::SoftwareConfig
-    properties:
-      group: ungrouped
-      config:
-        str_replace:
-          template: { get_file: cloud-nimbus.sh }
-          params:
-            $vm_name: { get_param: pcrf_pps_server_name }
-  network:
-    type: OS::Heat::CloudConfig
-    properties:
-      cloud_config:
-        write_files:
-          - path: /etc/sysconfig/network-scripts/ifcfg-eth0
-            permissions: "0644"
-            content:
-              str_replace:
-                template: { get_file: nimbus-ethernet }
-                params:
-                  $dev: eth0
-                  $ip: { get_param: pcrf_cps_net_ip }
-                  $netmask: { get_param: pcrf_cps_net_mask }
-        runcmd:
-          - ifdown eth0 && ifup eth0
-
-  pcrf_server_init:
-    type: OS::Heat::MultipartMime
-    properties:
-      parts:
-      - config: { get_resource: network}
-      - config: { get_resource: script_init}
-
-  pcrf_server_pps:
-    type: OS::Nova::Server
-    properties:
-      config_drive: "True"
-      name: { get_param: pcrf_pps_server_name }
-      image: { get_param: pcrf_pps_image_name }
-      flavor: { get_param: pcrf_pps_flavor_name }
-      availability_zone: { get_param: availabilityzone_name }
-      networks:
-        - port: { get_resource: pcrf_pps_port_0}
-      user_data_format: RAW
-      user_data:
-        get_resource: pcrf_server_init
-      metadata:
-        vnf_id: {get_param: pcrf_vnf_id}
-
-  pcrf_pps_port_0:
-    type: OS::Neutron::Port
-    properties:
-      network: { get_param: pcrf_cps_net_name }
-      fixed_ips:
-        - ip_address: { get_param: pcrf_cps_net_ip }
-      security_groups: [{ get_param: pcrf_security_group_name }]
diff --git a/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/simpleNotif-V1/artifacts/nested-psm_v1.0.yaml b/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/simpleNotif-V1/artifacts/nested-psm_v1.0.yaml
deleted file mode 100644
index 64c7484..0000000
--- a/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/simpleNotif-V1/artifacts/nested-psm_v1.0.yaml
+++ /dev/null
@@ -1,99 +0,0 @@
-heat_template_version: 2013-05-23
-
-description: heat template that creates PCRF Session Manager stack
-
-parameters:
-  pcrf_psm_server_name:
-    type: string
-    label: PCRF SM server name
-    description: PCRF SM server name
-  pcrf_psm_image_name:
-    type: string
-    label: image name
-    description: PCRF SM image name
-  pcrf_psm_flavor_name:
-    type: string
-    label: PCRF SM flavor name
-    description: flavor name of PCRF SM instance 
-  availabilityzone_name:
-    type: string
-    label: availabilityzone name
-    description: availabilityzone name
-  pcrf_cps_net_name:
-    type: string
-    label: CPS network name
-    description: CPS network name
-  pcrf_cps_net_ip:
-    type: string
-    label: CPS network ip
-    description: CPS network ip
-  pcrf_cps_net_mask:
-    type: string
-    label: CPS network mask
-    description: CPS network mask
-  pcrf_security_group_name:
-    type: string
-    label: security group name
-    description: the name of security group
-  pcrf_vnf_id:
-    type: string
-    label: PCRF VNF Id
-    description: PCRF VNF Id
-
-resources:
-  network:
-    type: OS::Heat::CloudConfig
-    properties:
-      cloud_config:
-        write_files:
-          - path: /etc/sysconfig/network-scripts/ifcfg-eth0
-            permissions: "0644"
-            content:
-              str_replace:
-                template: { get_file: nimbus-ethernet }
-                params:
-                  $dev: eth0
-                  $ip: { get_param: pcrf_cps_net_ip }
-                  $netmask: { get_param: pcrf_cps_net_mask }
-        runcmd:
-          - ifdown eth0 && ifup eth0
-  script_init:
-    type: OS::Heat::SoftwareConfig
-    properties:
-      group: ungrouped
-      config:
-        str_replace:
-          template: { get_file: cloud-nimbus.sh }
-          params:
-            $vm_name: { get_param: pcrf_psm_server_name }
-  pcrf_server_init:
-    type: OS::Heat::MultipartMime
-    properties:
-      parts:
-      - config: { get_resource: network}
-      - config: { get_resource: script_init}
-
-  pcrf_server_psm:
-    type: OS::Nova::Server
-    properties:
-      config_drive: "True"
-      name: { get_param: pcrf_psm_server_name }
-      image: { get_param: pcrf_psm_image_name }
-      flavor: { get_param: pcrf_psm_flavor_name }
-      availability_zone: { get_param: availabilityzone_name }
-      networks:
-        - port: { get_resource: psm01_port_0}
-      user_data_format: RAW
-      user_data:
-        get_resource: pcrf_server_init
-      metadata:
-        vnf_id: {get_param: pcrf_vnf_id}
-      #scheduler_hints: {group: { get_resource: servergroup_nimbus }}
-  
-  psm01_port_0:
-    type: OS::Neutron::Port
-    properties:
-      network: { get_param: pcrf_cps_net_name }
-      fixed_ips:
-        - ip_address: { get_param: pcrf_cps_net_ip }
-      security_groups: [{ get_param: pcrf_security_group_name }]
\ No newline at end of file
diff --git a/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/simpleNotif-V1/artifacts/vnf-module-artifact.json b/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/simpleNotif-V1/artifacts/vnf-module-artifact.json
deleted file mode 100644
index 29aa483..0000000
--- a/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/simpleNotif-V1/artifacts/vnf-module-artifact.json
+++ /dev/null
@@ -1,17 +0,0 @@
-[
-  {
-    "vfModuleModelName": "VF_RI2_G6_withArtifacts::module-0",
-    "vfModuleModelInvariantUUID": "585822c7-4027-4f84-ba50-e9248606f131",
-    "vfModuleModelVersion": "1.0",
-    "vfModuleModelUUID": "1e34774e-715e-4fd5-bd08-7b654622f33e.VF_RI2_G6_withArtifacts::module-0.group",
-    "vfModuleModelDescription": "vf Module Description",
-    "vfModuleModelCustomizationUUID": "585822c7-4027-4f84-ba50-e9248606f136",
-    "isBase": true,
-    "artifacts": [
-      "Artifact-UUID1",
-      "EnvArtifact-UUID2",
-      "NestedArtifact-UUID3"
-    ] ,
-    "properties": {"test":"test"}
-  }
-]
\ No newline at end of file
diff --git a/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/simpleNotif-V1/notif-structure.json b/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/simpleNotif-V1/notif-structure.json
deleted file mode 100644
index 64b4b68..0000000
--- a/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/simpleNotif-V1/notif-structure.json
+++ /dev/null
@@ -1,76 +0,0 @@
-{
-    "serviceName": "test-service",
-    "serviceInvariantUUID": "585822c7-4027-4f84-ba50-e9248606f132",
-    "serviceUUID": "1e34774e-715e-4fd5-bd09-7b654622f33e",
-    "serviceVersion": "1.0",
-    "serviceArtifacts":
-    [
-
-    ],
-
-    "resources":
-    [
-        {
-            "resourceInstanceName": "resource-1",
-            "resourceInvariantUUID": "585822c7-4027-4f84-ba50-e9248606f134",
-            "resourceName": "resourceName-1",
-            "resourceType": "VF",
-            "resourceUUID": "585822c7-4027-4f84-ba50-e9248606f136",
-            "resourceVersion": "1.0",
-            "category":  "category",
-            "artifacts":
-            [
-                {
-                    "artifactChecksum": "CheckSum",
-                    "artifactDescription": "Meta data for VFModule",
-                    "artifactName": "vnf-module-artifact.json",
-
-                    "artifactType": "VF_MODULES_METADATA",
-                    "artifactURL": "vnf-module-artifact.json",
-                    "artifactUUID": "VfArtifact-UUID1",
-                    "artifactVersion": "1.0"
-
-                },
-                {
-                    "artifactChecksum": "CheckSum",
-                    "artifactDescription": "Nimbus Heat OAM",
-                    "artifactName": "hot-nimbus-oam_v1.0.yaml",
-                    "artifactTimeout": 100,
-                    "artifactType": "HEAT",
-                    "artifactURL": "hot-nimbus-oam_v1.0.yaml",
-                    "artifactUUID": "Artifact-UUID1",
-                    "artifactVersion": "1.0",
-                    "generatedArtifact": "EnvArtifact-UUID2"
-
-                },
-
-                {
-                    "artifactChecksum": "CheckSum",
-                    "artifactDescription": "Nimbus Heat ENV OAM",
-                    "artifactName": "hot-nimbus-oam_v1.0.env",
-
-                    "artifactType": "HEAT_ENV",
-                    "artifactURL": "hot-nimbus-oam_v1.0.env",
-                    "artifactUUID": "EnvArtifact-UUID2",
-                    "artifactVersion": "1.0"
-
-                },
-
-                {
-                    "artifactChecksum": "CheckSum",
-                    "artifactDescription": "Nested OAM",
-                    "artifactName": "nested-oam_v1.0.yaml",
-                    "artifactTimeout": 10,
-                    "artifactType": "HEAT_NESTED",
-                    "artifactURL": "nested-oam_v1.0.yaml",
-                    "artifactUUID": "NestedArtifact-UUID3",
-                    "artifactVersion": "1.0"
-
-                }
-            ]
-        }
-    ],
-
-    "serviceDescription": "vfw service for unit test",
-    "distributionID": "35120a87-1f82-4276-9735-f6de5a244d65"
-}
\ No newline at end of file
diff --git a/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/simpleNotif-V2/artifacts/cloud-nimbus.sh b/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/simpleNotif-V2/artifacts/cloud-nimbus.sh
deleted file mode 100644
index 48485f3..0000000
--- a/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/simpleNotif-V2/artifacts/cloud-nimbus.sh
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/bin/bash
-echo "Running first-boot script"
-FLAG="first-boot.sh"
-echo "First boot run" > ${FLAG}
-echo "$vm_name" >> ${FLAG}
-touch /var/lib/cloud/instance/payload/launch-params
-chmod 644 /var/lib/cloud/instance/payload/launch-params
-#for i in $(ls /sys/class/net); do
-#  echo "Restart $i" >> ${FLAG}
-#  ifdown ${i}
-#  ifup ${i}
-#done
diff --git a/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/simpleNotif-V2/artifacts/hot-nimbus-oam-volumes_v1.0.env b/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/simpleNotif-V2/artifacts/hot-nimbus-oam-volumes_v1.0.env
deleted file mode 100644
index b494d8c..0000000
--- a/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/simpleNotif-V2/artifacts/hot-nimbus-oam-volumes_v1.0.env
+++ /dev/null
@@ -1,6 +0,0 @@
-parameters:
-  pcrf_oam_vol_size: 500
-  pcrf_oam_volume_silver-1: Silver
-  pcrf_oam_volume_silver-2: Silver
-  pcrf_oam_vol_name_1: sde1-pcrfx01-oam001-vol-1
-  pcrf_oam_vol_name_2: sde1-pcrfx01-oam001-vol-2
\ No newline at end of file
diff --git a/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/simpleNotif-V2/artifacts/hot-nimbus-oam-volumes_v1.0.yaml b/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/simpleNotif-V2/artifacts/hot-nimbus-oam-volumes_v1.0.yaml
deleted file mode 100644
index 9e12054..0000000
--- a/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/simpleNotif-V2/artifacts/hot-nimbus-oam-volumes_v1.0.yaml
+++ /dev/null
@@ -1,45 +0,0 @@
-heat_template_version:  2013-05-23
-
-parameters:
-    pcrf_oam_vol_size:
-     type: number
-     label: Cinder volume size
-     description: the size of the Cinder volume
-    pcrf_oam_vol_name_1:
-     type: string
-     label: OAM volume name 1
-     description: Assigning name to volume
-    pcrf_oam_vol_name_2:
-     type: string
-     label: OAM volume name 2
-     description: Assigning name to volume
-    pcrf_oam_volume_silver-1:
-     type: string
-     label: vm volume type
-     description: the name of the target volume backend for OAM1
-    pcrf_oam_volume_silver-2:
-     type: string
-     label: vm volume type
-     description: the name of the target volume backend for OAM2
-
-resources:
-  pcrf_oam_volume_1:
-    type: OS::Cinder::Volume
-    properties:
-      size: {get_param: pcrf_oam_vol_size}
-      volume_type: {get_param: pcrf_oam_volume_silver-1}
-      name: {get_param: pcrf_oam_vol_name_1}
-
-  pcrf_oam_volume_2:
-    type: OS::Cinder::Volume
-    properties:
-      size: {get_param: pcrf_oam_vol_size}
-      volume_type: {get_param: pcrf_oam_volume_silver-2}
-      name: {get_param: pcrf_oam_vol_name_2}
-outputs:
-  pcrf_oam_volume_id_1:
-    description: the oam 001 volume id
-    value: { get_resource: pcrf_oam_volume_1 }
-  pcrf_oam_volume_id_2:
-    description: the oam 002 volume id
-    value: { get_resource: pcrf_oam_volume_2 }
\ No newline at end of file
diff --git a/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/simpleNotif-V2/artifacts/hot-nimbus-oam_v1.0.env b/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/simpleNotif-V2/artifacts/hot-nimbus-oam_v1.0.env
deleted file mode 100644
index 7e51e67..0000000
--- a/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/simpleNotif-V2/artifacts/hot-nimbus-oam_v1.0.env
+++ /dev/null
@@ -1,18 +0,0 @@
-parameters:
-  pcrf_oam_server_names: ZRDM1PCRF01OAM001,ZRDM1PCRF01OAM002
-  pcrf_oam_image_name: PCRF_8.995-ATTM1.0.3.qcow2
-  pcrf_oam_flavor_name: lc.4xlarge4
-  availabilityzone_name: nova
-  pcrf_cps_net_name: Mobisupport-25193-I-INT1_int_pcrf_net_0
-  pcrf_cps_net_ips: 172.26.16.111,172.26.16.112
-  pcrf_arbiter_vip: 172.26.16.115
-  pcrf_cps_net_mask: 255.255.255.0
-  pcrf_oam_net_name: MNS-25180-L-01_oam_protected_net_0
-  pcrf_oam_net_ips: 107.239.64.117,107.239.64.118
-  pcrf_oam_net_gw: 107.239.64.1
-  pcrf_oam_net_mask: 255.255.248.0
-  pcrf_oam_volume_id_1: a4aa05fb-fcdc-457b-8077-6845fdfc3257
-  pcrf_oam_volume_id_2: 93d8fc1f-f1c3-4933-86b2-039881ee910f
-  pcrf_security_group_name: nimbus_security_group
-  pcrf_vnf_id: 730797234b4a40aa99335157b02871cd
-
diff --git a/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/simpleNotif-V2/artifacts/hot-nimbus-oam_v1.0.yaml b/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/simpleNotif-V2/artifacts/hot-nimbus-oam_v1.0.yaml
deleted file mode 100644
index 98c4e3b..0000000
--- a/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/simpleNotif-V2/artifacts/hot-nimbus-oam_v1.0.yaml
+++ /dev/null
@@ -1,109 +0,0 @@
-heat_template_version: 2013-05-23
-
-description: heat template that creates multiple PCRF OAM nodes stack
-
-parameters:
-  pcrf_oam_server_names:
-    type: comma_delimited_list
-    label: PCRF OAM server names
-    description: name of the PCRF OAM instance
-  pcrf_oam_image_name:
-    type: string
-    label: PCRF OAM image name
-    description: PCRF OAM image name
-  pcrf_oam_flavor_name:
-    type: string
-    label: PCRF OAM flavor name
-    description: flavor name of PCRF OAM instance
-  availabilityzone_name:
-    type: string
-    label: availabilityzone name
-    description: availabilityzone name
-  pcrf_cps_net_name:
-    type: string
-    label: CPS network name
-    description: CPS network name
-  pcrf_cps_net_ips:
-    type: comma_delimited_list
-    label: CPS network ips
-    description: CPS network ips
-  pcrf_cps_net_mask:
-    type: string
-    label: CPS network mask
-    description: CPS network mask
-  pcrf_arbiter_vip:
-    type: string
-    label: OAM Arbiter LB VIP
-    description: OAM Arbiter LB VIP
-  pcrf_oam_net_name:
-    type: string
-    label: OAM network name
-    description: OAM network name
-  pcrf_oam_net_ips:
-    type: comma_delimited_list
-    label: OAM network ips
-    description: OAM network ips
-  pcrf_oam_net_gw:
-    type: string
-    label: CPS network gateway
-    description: CPS network gateway
-  pcrf_oam_net_mask:
-    type: string
-    label: CPS network mask
-    description: CPS network mask
-  pcrf_oam_volume_id_1:
-    type: string
-    label: CPS OAM 001 Cinder Volume
-    description: CPS OAM 001 Cinder Volumes
-  pcrf_oam_volume_id_2:
-    type: string
-    label: CPS OAM 002 Cinder Volume
-    description: CPS OAM 002 Cinder Volumes
-  pcrf_security_group_name:
-    type: string
-    label: security group name
-    description: the name of security group
-  pcrf_vnf_id:
-    type: string
-    label: PCRF VNF Id
-    description: PCRF VNF Id
-
-resources:
-  server_pcrf_oam_001:
-    type: nested-oam_v1.0.yaml
-    properties:
-      pcrf_oam_server_name: { get_param: [pcrf_oam_server_names, 0] }
-      pcrf_oam_image_name: { get_param: pcrf_oam_image_name }
-      pcrf_oam_flavor_name: { get_param: pcrf_oam_flavor_name }
-      availabilityzone_name: { get_param: availabilityzone_name }
-      pcrf_security_group_name: { get_param: pcrf_security_group_name }
-      pcrf_oam_volume_id: { get_param: pcrf_oam_volume_id_1 }
-      pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
-      pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 0] }
-      pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
-      pcrf_oam_net_name: { get_param: pcrf_oam_net_name }
-      pcrf_oam_net_ip: { get_param: [pcrf_oam_net_ips, 0] }
-      pcrf_oam_net_mask: { get_param: pcrf_oam_net_mask }
-      pcrf_oam_net_gw: { get_param: pcrf_oam_net_gw }
-      pcrf_arbiter_vip: { get_param: pcrf_arbiter_vip }
-      pcrf_vnf_id: {get_param: pcrf_vnf_id}
-
-  server_pcrf_oam_002:
-    type: nested-oam_v1.0.yaml
-    depends_on: [server_pcrf_oam_001]
-    properties:
-      pcrf_oam_server_name: { get_param: [pcrf_oam_server_names, 1] }
-      pcrf_oam_image_name: { get_param: pcrf_oam_image_name }
-      pcrf_oam_flavor_name: { get_param: pcrf_oam_flavor_name }
-      availabilityzone_name: { get_param: availabilityzone_name }
-      pcrf_security_group_name: { get_param: pcrf_security_group_name }
-      pcrf_oam_volume_id: { get_param: pcrf_oam_volume_id_2 }
-      pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
-      pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 1] }
-      pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
-      pcrf_oam_net_name: { get_param: pcrf_oam_net_name }
-      pcrf_oam_net_ip: { get_param: [pcrf_oam_net_ips, 1] }
-      pcrf_oam_net_mask: { get_param: pcrf_oam_net_mask }
-      pcrf_oam_net_gw: { get_param: pcrf_oam_net_gw }
-      pcrf_arbiter_vip: { get_param: pcrf_arbiter_vip }
-      pcrf_vnf_id: {get_param: pcrf_vnf_id}
diff --git a/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/simpleNotif-V2/artifacts/hot-nimbus-pcm-volumes_v1.0.env b/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/simpleNotif-V2/artifacts/hot-nimbus-pcm-volumes_v1.0.env
deleted file mode 100644
index 788365d..0000000
--- a/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/simpleNotif-V2/artifacts/hot-nimbus-pcm-volumes_v1.0.env
+++ /dev/null
@@ -1,4 +0,0 @@
-parameters:
-  pcrf_pcm_vol_size: 50
-  pcrf_pcm_volume_silver: Silver
-  pcrf_pcm_vol_name_1: sde1-pcrfx01-pcm001-vol-1
diff --git a/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/simpleNotif-V2/artifacts/hot-nimbus-pcm-volumes_v1.0.yaml b/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/simpleNotif-V2/artifacts/hot-nimbus-pcm-volumes_v1.0.yaml
deleted file mode 100644
index bcc3e89..0000000
--- a/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/simpleNotif-V2/artifacts/hot-nimbus-pcm-volumes_v1.0.yaml
+++ /dev/null
@@ -1,28 +0,0 @@
-heat_template_version:  2013-05-23
-
-parameters:
-   pcrf_pcm_vol_size:
-     type: number
-     label: Cinder volume size
-     description: the size of the Cinder volume
-   pcrf_pcm_vol_name_1:
-     type: string
-     label: PCM volume name
-     description: Assigning name to volume
-   pcrf_pcm_volume_silver:
-     type: string
-     label: vm volume type
-     description: the name of the target volume backend for PCM
-
-resources: 
-  pcrf_pcm_volume_1:
-     type: OS::Cinder::Volume
-     properties:
-      size: { get_param: pcrf_pcm_vol_size }
-      volume_type: { get_param: pcrf_pcm_volume_silver }
-      name: { get_param: pcrf_pcm_vol_name_1 }
-
-outputs:
-  pcrf_pcm_volume_id_1:
-    description: the pcrf_pcm_volume_id
-    value: { get_resource: pcrf_pcm_volume_1 }
\ No newline at end of file
diff --git a/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/simpleNotif-V2/artifacts/hot-nimbus-pcm_v1.0.env b/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/simpleNotif-V2/artifacts/hot-nimbus-pcm_v1.0.env
deleted file mode 100644
index b23014d..0000000
--- a/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/simpleNotif-V2/artifacts/hot-nimbus-pcm_v1.0.env
+++ /dev/null
@@ -1,16 +0,0 @@
-parameters:
-  pcrf_pcm_server_names: ZRDM1PCRF01PCM001
-  pcrf_pcm_image_name: PCRF_8.995-ATTM1.0.3.qcow2
-  pcrf_pcm_flavor_name: lc.2xlarge4
-  availabilityzone_name: nova
-  pcrf_cps_net_name: Mobisupport-25193-I-INT1_int_pcrf_net_0
-  pcrf_cps_net_ips: 172.26.16.113
-  pcrf_cps_net_mask: 255.255.255.0
-  pcrf_oam_net_name: MNS-25180-L-01_oam_protected_net_0
-  pcrf_oam_net_ips: 107.239.64.121
-  pcrf_oam_net_gw: 107.239.64.1
-  pcrf_oam_net_mask: 255.255.248.0
-  pcrf_pcm_volume_id_1: 3438a3fe-1241-4390-80f2-d0b86238c40e
-  pcrf_security_group_name: nimbus_security_group
-  pcrf_vnf_id: 730797234b4a40aa99335157b02871cd
-
diff --git a/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/simpleNotif-V2/artifacts/hot-nimbus-pcm_v1.0.yaml b/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/simpleNotif-V2/artifacts/hot-nimbus-pcm_v1.0.yaml
deleted file mode 100644
index defb373..0000000
--- a/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/simpleNotif-V2/artifacts/hot-nimbus-pcm_v1.0.yaml
+++ /dev/null
@@ -1,80 +0,0 @@
-heat_template_version: 2013-05-23
-
-description: heat template that creates PCRF Cluman stack
-
-parameters:
-  pcrf_pcm_server_names:
-    type: comma_delimited_list
-    label: PCRF CM server names
-    description: name of the PCRF CM instance
-  pcrf_pcm_image_name:
-    type: string
-    label: PCRF CM image name
-    description: PCRF CM image name
-  pcrf_pcm_flavor_name:
-    type: string
-    label: PCRF CM flavor name
-    description: flavor name of PCRF CM instance
-  availabilityzone_name:
-    type: string
-    label: availabilityzone name
-    description: availabilityzone name
-  pcrf_cps_net_name:
-    type: string
-    label: CPS network name
-    description: CPS network name
-  pcrf_cps_net_ips:
-    type: comma_delimited_list
-    label: CPS network ips
-    description: CPS network ips
-  pcrf_cps_net_mask:
-    type: string
-    label: CPS network mask
-    description: CPS network mask
-  pcrf_oam_net_name:
-    type: string
-    label: OAM network name
-    description: OAM network name
-  pcrf_oam_net_ips:
-    type: comma_delimited_list
-    label: OAM network ips
-    description: OAM network ips
-  pcrf_oam_net_gw:
-    type: string
-    label: CPS network gateway
-    description: CPS network gateway
-  pcrf_oam_net_mask:
-    type: string
-    label: CPS network mask
-    description: CPS network mask
-  pcrf_pcm_volume_id_1:
-    type: string
-    label: CPS Cluman Cinder Volume
-    description: CPS Cluman Cinder Volume
-  pcrf_security_group_name:
-    type: string
-    label: security group name
-    description: the name of security group
-  pcrf_vnf_id:
-    type: string
-    label: PCRF VNF Id
-    description: PCRF VNF Id
-
-resources:
-  server_pcrf_pcm_001:
-    type: nested-pcm_v1.0.yaml
-    properties:
-      pcrf_pcm_server_name: { get_param: [pcrf_pcm_server_names, 0] }
-      pcrf_pcm_image_name: { get_param: pcrf_pcm_image_name }
-      pcrf_pcm_flavor_name: { get_param: pcrf_pcm_flavor_name }
-      availabilityzone_name: { get_param: availabilityzone_name }
-      pcrf_security_group_name: { get_param: pcrf_security_group_name }
-      pcrf_pcm_volume_id: { get_param: pcrf_pcm_volume_id_1 }
-      pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
-      pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 0] }
-      pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
-      pcrf_oam_net_name: { get_param: pcrf_oam_net_name }
-      pcrf_oam_net_ip: { get_param: [pcrf_oam_net_ips, 0] }
-      pcrf_oam_net_mask: { get_param: pcrf_oam_net_mask }
-      pcrf_oam_net_gw: { get_param: pcrf_oam_net_gw }
-      pcrf_vnf_id: {get_param: pcrf_vnf_id}
diff --git a/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/simpleNotif-V2/artifacts/hot-nimbus-ppd_v1.0.yaml b/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/simpleNotif-V2/artifacts/hot-nimbus-ppd_v1.0.yaml
deleted file mode 100644
index 8631592..0000000
--- a/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/simpleNotif-V2/artifacts/hot-nimbus-ppd_v1.0.yaml
+++ /dev/null
@@ -1,286 +0,0 @@
-heat_template_version: 2013-05-23
-
-description: heat template that creates PCRF Policy Director stack
-
-parameters:
-  pcrf_ppd_server_names:
-    type: comma_delimited_list
-    label: PCRF PD server names
-    description: name of the PCRF PD instance
-  pcrf_ppd_image_name:
-    type: string
-    label: PCRF PD image name
-    description: PCRF PD image name
-  pcrf_ppd_flavor_name:
-    type: string
-    label: PCRF PD flavor name
-    description: flavor name of PCRF PD instance
-  availabilityzone_name:
-    type: string
-    label: availabilityzone name
-    description: availabilityzone name
-  pcrf_cps_net_name:
-    type: string
-    label: CPS network name
-    description: CPS network name
-  pcrf_cps_net_ips:
-    type: comma_delimited_list
-    label: CPS network ips
-    description: CPS network ips
-  pcrf_cps_net_mask:
-    type: string
-    label: CPS network mask
-    description: CPS network mask
-  pcrf_lb_internal_vip:
-    type: string
-    label: CPS Internal LB VIP
-    description: CPS Internal LB VIP
-  pcrf_oam_net_name:
-    type: string
-    label: OAM network name
-    description: OAM network name
-  pcrf_oam_net_ips:
-    type: comma_delimited_list
-    label: OAM network ips
-    description: OAM network ips
-  pcrf_oam_net_gw:
-    type: string
-    label: CPS network gateway
-    description: CPS network gateway
-  pcrf_oam_net_mask:
-    type: string
-    label: CPS network mask
-    description: CPS network mask
-  pcrf_lb_management_vip:
-    type: string
-    label: CPS OAM LB VIP
-    description: CPS OAM LB VIP
-  pcrf_gx_net_name:
-    type: string
-    label: Gx network name
-    description: Gx network name
-  pcrf_gx_net_ips:
-    type: comma_delimited_list
-    label: Gx network ips
-    description: Gx network ips
-  pcrf_gx_net_mask:
-    type: string
-    label: Gx network mask
-    description: Gx network mask
-  pcrf_sp_net_name:
-    type: string
-    label: Sp network name
-    description: Sp network name
-  pcrf_sp_net_ips:
-    type: comma_delimited_list
-    label: Sp network ips
-    description: Sp network ips
-  pcrf_sp_net_mask:
-    type: string
-    label: Sp network mask
-    description: Sp network mask
-  pcrf_sy_net_name:
-    type: string
-    label: Sy network name
-    description: Sy network name
-  pcrf_sy_net_ips:
-    type: comma_delimited_list
-    label: Sy network ips
-    description: Sy network ips
-  pcrf_sy_net_mask:
-    type: string
-    label: Sy network mask
-    description: Sy network mask
-  pcrf_rx_net_name:
-    type: string
-    label: Rx network name
-    description: Rx network name
-  pcrf_rx_net_ips:
-    type: comma_delimited_list
-    label: Rx network ips
-    description: Rx network ips
-  pcrf_rx_net_mask:
-    type: string
-    label: Rx network mask
-    description: Rx network mask
-  pcrf_sd_net_name:
-    type: string
-    label: Sd network name
-    description: Sd network name
-  pcrf_sd_net_ips:
-    type: comma_delimited_list
-    label: Sd network ips
-    description: Sd network ips
-  pcrf_sd_net_mask:
-    type: string
-    label: Sd network mask
-    description: Sd network mask
-  pcrf_sgi_sy_net_name:
-    type: string
-    label: Sgi Sy network name
-    description: Sgi Sy network name
-  pcrf_sgi_sy_net_ips:
-    type: comma_delimited_list
-    label: Sgi Sy network ips
-    description: Sgi Sy network ips
-  pcrf_sgi_sy_net_mask:
-    type: string
-    label: Sgi Sy network mask
-    description: Sgi Sy network mask
-  pcrf_security_group_name:
-    type: string
-    label: security group name
-    description: the name of security group
-  pcrf_vnf_id:
-    type: string
-    label: PCRF VNF Id
-    description: PCRF VNF Id
-
-resources:
-  server_pcrf_ppd_001:
-    type: nested-ppd_v1.0.yaml
-    properties:
-      pcrf_ppd_server_name: { get_param: [pcrf_ppd_server_names, 0] }
-      pcrf_ppd_image_name: { get_param: pcrf_ppd_image_name }
-      pcrf_ppd_flavor_name: { get_param: pcrf_ppd_flavor_name }
-      availabilityzone_name: { get_param: availabilityzone_name }
-      pcrf_security_group_name: { get_param: pcrf_security_group_name }
-      pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
-      pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 0] }
-      pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
-      pcrf_lb_internal_vip: { get_param: pcrf_lb_internal_vip }
-      pcrf_oam_net_name: { get_param: pcrf_oam_net_name }
-      pcrf_oam_net_ip: { get_param: [pcrf_oam_net_ips, 0] }
-      pcrf_oam_net_mask: { get_param: pcrf_oam_net_mask }
-      pcrf_oam_net_gw: { get_param: pcrf_oam_net_gw }
-      pcrf_lb_management_vip: { get_param: pcrf_lb_management_vip }
-      pcrf_gx_net_name: { get_param: pcrf_gx_net_name }
-      pcrf_gx_net_ip: { get_param: [pcrf_gx_net_ips, 0] }
-      pcrf_gx_net_mask: { get_param: pcrf_gx_net_mask }
-      pcrf_sp_net_name: { get_param: pcrf_sp_net_name }
-      pcrf_sp_net_ip: { get_param: [pcrf_sp_net_ips, 0] }
-      pcrf_sp_net_mask: { get_param: pcrf_sp_net_mask }
-      pcrf_sy_net_name: { get_param: pcrf_sy_net_name }
-      pcrf_sy_net_ip: { get_param: [pcrf_sy_net_ips, 0] }
-      pcrf_sy_net_mask: { get_param: pcrf_sy_net_mask }
-      pcrf_rx_net_name: { get_param: pcrf_rx_net_name }
-      pcrf_rx_net_ip: { get_param: [pcrf_rx_net_ips, 0] }
-      pcrf_rx_net_mask: { get_param: pcrf_rx_net_mask }
-      pcrf_sd_net_name: { get_param: pcrf_sd_net_name }
-      pcrf_sd_net_ip: { get_param: [pcrf_sd_net_ips, 0] }
-      pcrf_sd_net_mask: { get_param: pcrf_sd_net_mask }
-      pcrf_sgi_sy_net_name: { get_param: pcrf_sgi_sy_net_name }
-      pcrf_sgi_sy_net_ip: { get_param: [pcrf_sgi_sy_net_ips, 0] }
-      pcrf_sgi_sy_net_mask: { get_param: pcrf_sgi_sy_net_mask }
-      pcrf_vnf_id: {get_param: pcrf_vnf_id}
-
-  server_pcrf_ppd_002:
-    type: nested-ppd_v1.0.yaml
-    properties:
-      pcrf_ppd_server_name: { get_param: [pcrf_ppd_server_names, 1] }
-      pcrf_ppd_image_name: { get_param: pcrf_ppd_image_name }
-      pcrf_ppd_flavor_name: { get_param: pcrf_ppd_flavor_name }
-      availabilityzone_name: { get_param: availabilityzone_name }
-      pcrf_security_group_name: { get_param: pcrf_security_group_name }
-      pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
-      pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 1] }
-      pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
-      pcrf_lb_internal_vip: { get_param: pcrf_lb_internal_vip }
-      pcrf_oam_net_name: { get_param: pcrf_oam_net_name }
-      pcrf_oam_net_ip: { get_param: [pcrf_oam_net_ips, 1] }
-      pcrf_oam_net_mask: { get_param: pcrf_oam_net_mask }
-      pcrf_oam_net_gw: { get_param: pcrf_oam_net_gw }
-      pcrf_lb_management_vip: { get_param: pcrf_lb_management_vip }
-      pcrf_gx_net_name: { get_param: pcrf_gx_net_name }
-      pcrf_gx_net_ip: { get_param: [pcrf_gx_net_ips, 1] }
-      pcrf_gx_net_mask: { get_param: pcrf_gx_net_mask }
-      pcrf_sp_net_name: { get_param: pcrf_sp_net_name }
-      pcrf_sp_net_ip: { get_param: [pcrf_sp_net_ips, 1] }
-      pcrf_sp_net_mask: { get_param: pcrf_sp_net_mask }
-      pcrf_sy_net_name: { get_param: pcrf_sy_net_name }
-      pcrf_sy_net_ip: { get_param: [pcrf_sy_net_ips, 1] }
-      pcrf_sy_net_mask: { get_param: pcrf_sy_net_mask }
-      pcrf_rx_net_name: { get_param: pcrf_rx_net_name }
-      pcrf_rx_net_ip: { get_param: [pcrf_rx_net_ips, 1] }
-      pcrf_rx_net_mask: { get_param: pcrf_rx_net_mask }
-      pcrf_sd_net_name: { get_param: pcrf_sd_net_name }
-      pcrf_sd_net_ip: { get_param: [pcrf_sd_net_ips, 1] }
-      pcrf_sd_net_mask: { get_param: pcrf_sd_net_mask }
-      pcrf_sgi_sy_net_name: { get_param: pcrf_sgi_sy_net_name }
-      pcrf_sgi_sy_net_ip: { get_param: [pcrf_sgi_sy_net_ips, 1] }
-      pcrf_sgi_sy_net_mask: { get_param: pcrf_sgi_sy_net_mask }
-      pcrf_vnf_id: {get_param: pcrf_vnf_id}
-
-  server_pcrf_ppd_003:
-    type: nested-ppd_v1.0.yaml
-    properties:
-      pcrf_ppd_server_name: { get_param: [pcrf_ppd_server_names, 2] }
-      pcrf_ppd_image_name: { get_param: pcrf_ppd_image_name }
-      pcrf_ppd_flavor_name: { get_param: pcrf_ppd_flavor_name }
-      availabilityzone_name: { get_param: availabilityzone_name }
-      pcrf_security_group_name: { get_param: pcrf_security_group_name }
-      pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
-      pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 2] }
-      pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
-      pcrf_lb_internal_vip: { get_param: pcrf_lb_internal_vip }
-      pcrf_oam_net_name: { get_param: pcrf_oam_net_name }
-      pcrf_oam_net_ip: { get_param: [pcrf_oam_net_ips, 2] }
-      pcrf_oam_net_mask: { get_param: pcrf_oam_net_mask }
-      pcrf_oam_net_gw: { get_param: pcrf_oam_net_gw }
-      pcrf_lb_management_vip: { get_param: pcrf_lb_management_vip }
-      pcrf_gx_net_name: { get_param: pcrf_gx_net_name }
-      pcrf_gx_net_ip: { get_param: [pcrf_gx_net_ips, 2] }
-      pcrf_gx_net_mask: { get_param: pcrf_gx_net_mask }
-      pcrf_sp_net_name: { get_param: pcrf_sp_net_name }
-      pcrf_sp_net_ip: { get_param: [pcrf_sp_net_ips, 2] }
-      pcrf_sp_net_mask: { get_param: pcrf_sp_net_mask }
-      pcrf_sy_net_name: { get_param: pcrf_sy_net_name }
-      pcrf_sy_net_ip: { get_param: [pcrf_sy_net_ips, 2] }
-      pcrf_sy_net_mask: { get_param: pcrf_sy_net_mask }
-      pcrf_rx_net_name: { get_param: pcrf_rx_net_name }
-      pcrf_rx_net_ip: { get_param: [pcrf_rx_net_ips, 2] }
-      pcrf_rx_net_mask: { get_param: pcrf_rx_net_mask }
-      pcrf_sd_net_name: { get_param: pcrf_sd_net_name }
-      pcrf_sd_net_ip: { get_param: [pcrf_sd_net_ips, 2] }
-      pcrf_sd_net_mask: { get_param: pcrf_sd_net_mask }
-      pcrf_sgi_sy_net_name: { get_param: pcrf_sgi_sy_net_name }
-      pcrf_sgi_sy_net_ip: { get_param: [pcrf_sgi_sy_net_ips, 2] }
-      pcrf_sgi_sy_net_mask: { get_param: pcrf_sgi_sy_net_mask }
-      pcrf_vnf_id: {get_param: pcrf_vnf_id}
-
-  server_pcrf_ppd_004:
-    type: nested-ppd_v1.0.yaml
-    properties:
-      pcrf_ppd_server_name: { get_param: [pcrf_ppd_server_names, 3] }
-      pcrf_ppd_image_name: { get_param: pcrf_ppd_image_name }
-      pcrf_ppd_flavor_name: { get_param: pcrf_ppd_flavor_name }
-      availabilityzone_name: { get_param: availabilityzone_name }
-      pcrf_security_group_name: { get_param: pcrf_security_group_name }
-      pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
-      pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 3] }
-      pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
-      pcrf_lb_internal_vip: { get_param: pcrf_lb_internal_vip }
-      pcrf_oam_net_name: { get_param: pcrf_oam_net_name }
-      pcrf_oam_net_ip: { get_param: [pcrf_oam_net_ips, 3] }
-      pcrf_oam_net_mask: { get_param: pcrf_oam_net_mask }
-      pcrf_oam_net_gw: { get_param: pcrf_oam_net_gw }
-      pcrf_lb_management_vip: { get_param: pcrf_lb_management_vip }
-      pcrf_gx_net_name: { get_param: pcrf_gx_net_name }
-      pcrf_gx_net_ip: { get_param: [pcrf_gx_net_ips, 3] }
-      pcrf_gx_net_mask: { get_param: pcrf_gx_net_mask }
-      pcrf_sp_net_name: { get_param: pcrf_sp_net_name }
-      pcrf_sp_net_ip: { get_param: [pcrf_sp_net_ips, 3] }
-      pcrf_sp_net_mask: { get_param: pcrf_sp_net_mask }
-      pcrf_sy_net_name: { get_param: pcrf_sy_net_name }
-      pcrf_sy_net_ip: { get_param: [pcrf_sy_net_ips, 3] }
-      pcrf_sy_net_mask: { get_param: pcrf_sy_net_mask }
-      pcrf_rx_net_name: { get_param: pcrf_rx_net_name }
-      pcrf_rx_net_ip: { get_param: [pcrf_rx_net_ips, 3] }
-      pcrf_rx_net_mask: { get_param: pcrf_rx_net_mask }
-      pcrf_sd_net_name: { get_param: pcrf_sd_net_name }
-      pcrf_sd_net_ip: { get_param: [pcrf_sd_net_ips, 3] }
-      pcrf_sd_net_mask: { get_param: pcrf_sd_net_mask }
-      pcrf_sgi_sy_net_name: { get_param: pcrf_sgi_sy_net_name }
-      pcrf_sgi_sy_net_ip: { get_param: [pcrf_sgi_sy_net_ips, 3] }
-      pcrf_sgi_sy_net_mask: { get_param: pcrf_sgi_sy_net_mask }
-      pcrf_vnf_id: {get_param: pcrf_vnf_id}
diff --git a/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/simpleNotif-V2/artifacts/hot-nimbus-ppd_v1.1.env b/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/simpleNotif-V2/artifacts/hot-nimbus-ppd_v1.1.env
deleted file mode 100644
index 10697bc..0000000
--- a/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/simpleNotif-V2/artifacts/hot-nimbus-ppd_v1.1.env
+++ /dev/null
@@ -1,35 +0,0 @@
-parameters:
-  pcrf_ppd_server_names: ZRDM1PCRF01PPD001,ZRDM1PCRF01PPD002,ZRDM1PCRF01PPD003,ZRDM1PCRF01PPD004
-  pcrf_ppd_image_name: PCRF_8.995-ATTM1.0.3.qcow2
-  pcrf_ppd_flavor_name: lc.4xlarge4
-  availabilityzone_name: nova
-  pcrf_cps_net_name: Mobisupport-25193-I-INT1_int_pcrf_net_0
-  pcrf_cps_net_ips: 172.26.16.3,172.26.16.4,172.26.16.5,172.26.16.6
-  pcrf_lb_internal_vip: 172.26.16.114
-  pcrf_cps_net_mask: 255.255.255.0
-  pcrf_oam_net_name: MNS-25180-L-01_oam_protected_net_0
-  pcrf_oam_net_ips: 107.239.64.113,107.239.64.114,107.239.64.115,107.239.64.116
-  pcrf_lb_management_vip: 107.239.64.123
-  pcrf_oam_net_gw: 107.239.64.1
-  pcrf_oam_net_mask: 255.255.248.0
-  pcrf_gx_net_name: Mobisupport-25193-I-INT1_cor_pcrf_gx_net_0
-  pcrf_gx_net_ips: 107.239.24.67,107.239.24.68,107.239.24.69,107.239.24.70
-  pcrf_gx_net_mask: 255.255.255.248
-  pcrf_sp_net_name: Mobisupport-25193-I-INT1_cor_pcrf_sp_net_0
-  pcrf_sp_net_ips: 107.239.24.75,107.239.24.76,107.239.24.77,107.239.24.78
-  pcrf_sp_net_mask: 255.255.255.248
-  pcrf_sy_net_name: Mobisupport-25193-I-INT1_cor_pcrf_sy_net_0
-  pcrf_sy_net_ips: 107.239.24.83,107.239.24.84,107.239.24.85,107.239.24.86
-  pcrf_sy_net_mask: 255.255.255.248
-  pcrf_rx_net_name: Mobisupport-25193-I-INT1_cor_pcrf_rx_net_0
-  pcrf_rx_net_ips: 107.239.24.91,107.239.24.92,107.239.24.93,107.239.24.94
-  pcrf_rx_net_mask: 255.255.255.248
-  pcrf_sd_net_name: Mobisupport-25193-I-INT1_cor_pcrf_sd_net_0
-  pcrf_sd_net_ips: 107.239.24.99,107.239.24.100,107.239.24.101,107.239.24.102
-  pcrf_sd_net_mask: 255.255.255.248
-  pcrf_sgi_sy_net_name: Mobisupport-25193-I-INT1_sgi_pcrf_sy_net_0
-  pcrf_sgi_sy_net_ips: 107.239.26.131,107.239.26.132,107.239.26.133,107.239.26.134
-  pcrf_sgi_sy_net_mask: 255.255.255.248
-  pcrf_security_group_name: nimbus_security_group
-  pcrf_vnf_id: 730797234b4a40aa99335157b02871cd
-
diff --git a/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/simpleNotif-V2/artifacts/hot-nimbus-pps_v1.0.env b/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/simpleNotif-V2/artifacts/hot-nimbus-pps_v1.0.env
deleted file mode 100644
index 18c064c..0000000
--- a/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/simpleNotif-V2/artifacts/hot-nimbus-pps_v1.0.env
+++ /dev/null
@@ -1,11 +0,0 @@
-parameters:
-  pcrf_pps_server_names: ZRDM1PCRF01PPS001,ZRDM1PCRF01PPS002,ZRDM1PCRF01PPS003,ZRDM1PCRF01PPS004,ZRDM1PCRF01PPS005,ZRDM1PCRF01PPS006
-  pcrf_pps_image_name: PCRF_8.995-ATTM1.0.3.qcow2
-  pcrf_pps_flavor_name: lc.3xlarge
-  availabilityzone_name: nova
-  pcrf_cps_net_name: Mobisupport-25193-I-INT1_int_pcrf_net_0
-  pcrf_cps_net_ips: 172.26.16.7,172.26.16.8,172.26.16.9,172.26.16.10,172.26.16.11,172.26.16.12
-  pcrf_cps_net_mask: 255.255.255.0
-  pcrf_security_group_name: nimbus_security_group
-  pcrf_vnf_id: 730797234b4a40aa99335157b02871cd
-
diff --git a/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/simpleNotif-V2/artifacts/hot-nimbus-pps_v1.0.yaml b/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/simpleNotif-V2/artifacts/hot-nimbus-pps_v1.0.yaml
deleted file mode 100644
index 0fadd00..0000000
--- a/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/simpleNotif-V2/artifacts/hot-nimbus-pps_v1.0.yaml
+++ /dev/null
@@ -1,121 +0,0 @@
-heat_template_version: 2013-05-23
-
-description: heat template that creates PCRF Policy Server stack
-
-parameters:
-  pcrf_pps_server_names:
-    type: comma_delimited_list
-    label: PCRF PS server names
-    description: PCRF PS server names
-  pcrf_pps_image_name:
-    type: string
-    label: PCRF PS image name
-    description: PCRF PS image name
-  pcrf_pps_flavor_name:
-    type: string
-    label: PCRF PS flavor name
-    description: flavor name of PCRF PS instance
-  availabilityzone_name:
-    type: string
-    label: availabilityzone name
-    description: availabilityzone name
-  pcrf_cps_net_name:
-    type: string
-    label: CPS network name
-    description: CPS network name
-  pcrf_cps_net_ips:
-    type: comma_delimited_list
-    label: CPS network ips
-    description: CPS network ips
-  pcrf_cps_net_mask:
-    type: string
-    label: CPS network mask
-    description: CPS network mask
-  pcrf_security_group_name:
-    type: string
-    label: security group name
-    description: the name of security group
-  pcrf_vnf_id:
-    type: string
-    label: PCRF VNF Id
-    description: PCRF VNF Id
-
-resources:
-  server_pcrf_pps_001:
-    type: nested-pps_v1.0.yaml
-    properties:
-      pcrf_pps_server_name: { get_param: [pcrf_pps_server_names, 0] }
-      pcrf_pps_image_name: { get_param: pcrf_pps_image_name }
-      pcrf_pps_flavor_name: { get_param: pcrf_pps_flavor_name }
-      availabilityzone_name: { get_param: availabilityzone_name }
-      pcrf_security_group_name: { get_param: pcrf_security_group_name }
-      pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
-      pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 0] }
-      pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
-      pcrf_vnf_id: {get_param: pcrf_vnf_id}
-
-  server_pcrf_pps_002:
-    type: nested-pps_v1.0.yaml
-    properties:
-      pcrf_pps_server_name: { get_param: [pcrf_pps_server_names, 1] }
-      pcrf_pps_image_name: { get_param: pcrf_pps_image_name }
-      pcrf_pps_flavor_name: { get_param: pcrf_pps_flavor_name }
-      availabilityzone_name: { get_param: availabilityzone_name }
-      pcrf_security_group_name: { get_param: pcrf_security_group_name }
-      pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
-      pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 1] }
-      pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
-      pcrf_vnf_id: {get_param: pcrf_vnf_id}
-
-  server_pcrf_pps_003:
-    type: nested-pps_v1.0.yaml
-    properties:
-      pcrf_pps_server_name: { get_param: [pcrf_pps_server_names, 2] }
-      pcrf_pps_image_name: { get_param: pcrf_pps_image_name }
-      pcrf_pps_flavor_name: { get_param: pcrf_pps_flavor_name }
-      availabilityzone_name: { get_param: availabilityzone_name }
-      pcrf_security_group_name: { get_param: pcrf_security_group_name }
-      pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
-      pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 2] }
-      pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
-      pcrf_vnf_id: {get_param: pcrf_vnf_id}
-
-  server_pcrf_pps_004:
-    type: nested-pps_v1.0.yaml
-    properties:
-      pcrf_pps_server_name: { get_param: [pcrf_pps_server_names, 3] }
-      pcrf_pps_image_name: { get_param: pcrf_pps_image_name }
-      pcrf_pps_flavor_name: { get_param: pcrf_pps_flavor_name }
-      availabilityzone_name: { get_param: availabilityzone_name }
-      pcrf_security_group_name: { get_param: pcrf_security_group_name }
-      pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
-      pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 3] }
-      pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
-      pcrf_vnf_id: {get_param: pcrf_vnf_id}
-
-  server_pcrf_pps_005:
-    type: nested-pps_v1.0.yaml
-    properties:
-      pcrf_pps_server_name: { get_param: [pcrf_pps_server_names, 4] }
-      pcrf_pps_image_name: { get_param: pcrf_pps_image_name }
-      pcrf_pps_flavor_name: { get_param: pcrf_pps_flavor_name }
-      availabilityzone_name: { get_param: availabilityzone_name }
-      pcrf_security_group_name: { get_param: pcrf_security_group_name }
-      pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
-      pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 4] }
-      pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
-      pcrf_vnf_id: {get_param: pcrf_vnf_id}
-
-  server_pcrf_pps_006:
-    type: nested-pps_v1.0.yaml
-    properties:
-      pcrf_pps_server_name: { get_param: [pcrf_pps_server_names, 5] }
-      pcrf_pps_image_name: { get_param: pcrf_pps_image_name }
-      pcrf_pps_flavor_name: { get_param: pcrf_pps_flavor_name }
-      availabilityzone_name: { get_param: availabilityzone_name }
-      pcrf_security_group_name: { get_param: pcrf_security_group_name }
-      pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
-      pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 5] }
-      pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
-      pcrf_vnf_id: {get_param: pcrf_vnf_id}
-
diff --git a/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/simpleNotif-V2/artifacts/hot-nimbus-psm_v1.0.env b/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/simpleNotif-V2/artifacts/hot-nimbus-psm_v1.0.env
deleted file mode 100644
index 95e450e..0000000
--- a/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/simpleNotif-V2/artifacts/hot-nimbus-psm_v1.0.env
+++ /dev/null
@@ -1,10 +0,0 @@
-parameters:
-  pcrf_psm_server_names: ZRDM1PCRF01PSM001,ZRDM1PCRF01PSM002,ZRDM1PCRF01PSM003,ZRDM1PCRF01PSM004,ZRDM1PCRF01PSM005,ZRDM1PCRF01PSM006,ZRDM1PCRF01PSM007,ZRDM1PCRF01PSM008,ZRDM1PCRF01PSM009,ZRDM1PCRF01PSM010,ZRDM1PCRF01PSM011,ZRDM1PCRF01PSM012
-  pcrf_psm_image_name: PCRF_8.995-ATTM1.0.3.qcow2
-  pcrf_psm_flavor_name: lc.4xlarge4
-  availabilityzone_name: nova
-  pcrf_cps_net_name: Mobisupport-25193-I-INT1_int_pcrf_net_0
-  pcrf_cps_net_ips: 172.26.16.63,172.26.16.64,172.26.16.65,172.26.16.66,172.26.16.67,172.26.16.68,172.26.16.69,172.26.16.70,172.26.16.71,172.26.16.72,172.26.16.73,172.26.16.74
-  pcrf_cps_net_mask: 255.255.255.0
-  pcrf_security_group_name: nimbus_security_group
-  pcrf_vnf_id: 730797234b4a40aa99335157b02871cd
diff --git a/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/simpleNotif-V2/artifacts/hot-nimbus-psm_v1.0.yaml b/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/simpleNotif-V2/artifacts/hot-nimbus-psm_v1.0.yaml
deleted file mode 100644
index 217b0fe..0000000
--- a/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/simpleNotif-V2/artifacts/hot-nimbus-psm_v1.0.yaml
+++ /dev/null
@@ -1,199 +0,0 @@
-heat_template_version: 2013-05-23
-
-description: heat template that creates PCRF Session Manager stack
-
-parameters:
-  pcrf_psm_server_names:
-    type: comma_delimited_list
-    label: PCRF SM server names
-    description: name of the PCRF SM instance
-  pcrf_psm_image_name:
-    type: string
-    label: PCRF SM image name
-    description: PCRF SM image name
-  pcrf_psm_flavor_name:
-    type: string
-    label: PCRF SM flavor name
-    description: flavor name of PCRF SM instance 
-  availabilityzone_name:
-    type: string
-    label: availabilityzone name
-    description: availabilityzone name
-  pcrf_cps_net_name:
-    type: string
-    label: CPS network name
-    description: CPS network name
-  pcrf_cps_net_ips:
-    type: comma_delimited_list
-    label: CPS network ips
-    description: CPS network ips
-  pcrf_cps_net_mask:
-    type: string
-    label: CPS network mask
-    description: CPS network mask
-  pcrf_security_group_name:
-    type: string
-    label: security group name
-    description: the name of security group
-  pcrf_vnf_id:
-    type: string
-    label: PCRF VNF Id
-    description: PCRF VNF Id
-
-resources:
-  server_pcrf_psm_001:
-    type: nested-psm_v1.0.yaml
-    properties:
-      pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 0] }
-      pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
-      pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
-      availabilityzone_name: { get_param: availabilityzone_name }
-      pcrf_security_group_name: { get_param: pcrf_security_group_name }
-      pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
-      pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 0] }
-      pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
-      pcrf_vnf_id: {get_param: pcrf_vnf_id}
-
-  server_pcrf_psm_002:
-    type: nested-psm_v1.0.yaml
-    properties:
-      pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 1] }
-      pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
-      pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
-      availabilityzone_name: { get_param: availabilityzone_name }
-      pcrf_security_group_name: { get_param: pcrf_security_group_name }
-      pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
-      pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 1] }
-      pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
-      pcrf_vnf_id: {get_param: pcrf_vnf_id}
-
-  server_pcrf_psm_003:
-    type: nested-psm_v1.0.yaml
-    properties:
-      pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 2] }
-      pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
-      pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
-      availabilityzone_name: { get_param: availabilityzone_name }
-      pcrf_security_group_name: { get_param: pcrf_security_group_name }
-      pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
-      pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 2] }
-      pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
-      pcrf_vnf_id: {get_param: pcrf_vnf_id}
-
-  server_pcrf_psm_004:
-    type: nested-psm_v1.0.yaml
-    properties:
-      pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 3] }
-      pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
-      pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
-      availabilityzone_name: { get_param: availabilityzone_name }
-      pcrf_security_group_name: { get_param: pcrf_security_group_name }
-      pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
-      pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 3] }
-      pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
-      pcrf_vnf_id: {get_param: pcrf_vnf_id}
-
-  server_pcrf_psm_005:
-    type: nested-psm_v1.0.yaml
-    properties:
-      pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 4] }
-      pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
-      pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
-      availabilityzone_name: { get_param: availabilityzone_name }
-      pcrf_security_group_name: { get_param: pcrf_security_group_name }
-      pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
-      pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 4] }
-      pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
-      pcrf_vnf_id: {get_param: pcrf_vnf_id}
-
-  server_pcrf_psm_006:
-    type: nested-psm_v1.0.yaml
-    properties:
-      pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 5] }
-      pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
-      pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
-      availabilityzone_name: { get_param: availabilityzone_name }
-      pcrf_security_group_name: { get_param: pcrf_security_group_name }
-      pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
-      pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 5] }
-      pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
-      pcrf_vnf_id: {get_param: pcrf_vnf_id}
-
-  server_pcrf_psm_007:
-    type: nested-psm_v1.0.yaml
-    properties:
-      pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 6] }
-      pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
-      pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
-      availabilityzone_name: { get_param: availabilityzone_name }
-      pcrf_security_group_name: { get_param: pcrf_security_group_name }
-      pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
-      pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 6] }
-      pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
-      pcrf_vnf_id: {get_param: pcrf_vnf_id}
-
-  server_pcrf_psm_008:
-    type: nested-psm_v1.0.yaml
-    properties:
-      pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 7] }
-      pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
-      pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
-      availabilityzone_name: { get_param: availabilityzone_name }
-      pcrf_security_group_name: { get_param: pcrf_security_group_name }
-      pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
-      pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 7] }
-      pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
-      pcrf_vnf_id: {get_param: pcrf_vnf_id}
-
-  server_pcrf_psm_009:
-    type: nested-psm_v1.0.yaml
-    properties:
-      pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 8] }
-      pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
-      pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
-      availabilityzone_name: { get_param: availabilityzone_name }
-      pcrf_security_group_name: { get_param: pcrf_security_group_name }
-      pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
-      pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 8] }
-      pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
-      pcrf_vnf_id: {get_param: pcrf_vnf_id}
-
-  server_pcrf_psm_010:
-    type: nested-psm_v1.0.yaml
-    properties:
-      pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 9] }
-      pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
-      pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
-      availabilityzone_name: { get_param: availabilityzone_name }
-      pcrf_security_group_name: { get_param: pcrf_security_group_name }
-      pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
-      pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 9] }
-      pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
-      pcrf_vnf_id: {get_param: pcrf_vnf_id}
-
-  server_pcrf_psm_011:
-    type: nested-psm_v1.0.yaml
-    properties:
-      pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 10] }
-      pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
-      pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
-      availabilityzone_name: { get_param: availabilityzone_name }
-      pcrf_security_group_name: { get_param: pcrf_security_group_name }
-      pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
-      pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 10] }
-      pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
-      pcrf_vnf_id: {get_param: pcrf_vnf_id}
-
-  server_pcrf_psm_012:
-    type: nested-psm_v1.0.yaml
-    properties:
-      pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 11] }
-      pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
-      pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
-      availabilityzone_name: { get_param: availabilityzone_name }
-      pcrf_security_group_name: { get_param: pcrf_security_group_name }
-      pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
-      pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 11] }
-      pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
-      pcrf_vnf_id: {get_param: pcrf_vnf_id}
- 
diff --git a/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/simpleNotif-V2/artifacts/hot-nimbus-swift-container_v1.0.env b/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/simpleNotif-V2/artifacts/hot-nimbus-swift-container_v1.0.env
deleted file mode 100644
index 5267ee4..0000000
--- a/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/simpleNotif-V2/artifacts/hot-nimbus-swift-container_v1.0.env
+++ /dev/null
@@ -1,3 +0,0 @@
-parameters:
-  pcrf_swift_container_name_1: PCRF_Config_Container_1
-  pcrf_swift_container_purge_on_delete_flag_1: false
diff --git a/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/simpleNotif-V2/artifacts/hot-nimbus-swift-container_v1.0.yaml b/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/simpleNotif-V2/artifacts/hot-nimbus-swift-container_v1.0.yaml
deleted file mode 100644
index ab427bb..0000000
--- a/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/simpleNotif-V2/artifacts/hot-nimbus-swift-container_v1.0.yaml
+++ /dev/null
@@ -1,30 +0,0 @@
-heat_template_version: 2013-05-23
-
-description: heat template that creates PCRF Session Manager stack
-
-parameters:
-   pcrf_swift_container_name_1:
-     type: string
-     label: Swift Container name
-     description: Swift Container Name
-   pcrf_swift_container_purge_on_delete_flag_1:
-     type: boolean
-     label: Purge on Delete Flag
-     description: Purge on Delete Flag
-
-resources:
-  pcrf_swift_container_1:
-    type: OS::Swift::Container
-    properties:
-      name: { get_param: pcrf_swift_container_name_1 }
-      PurgeOnDelete: { get_param: pcrf_swift_container_purge_on_delete_flag_1 }
-      X-Container-Read: ".r:*"
-     
-outputs:
-  pcrf_swift_container_id_1:
-    description: the pcrf_swift_container_1 id
-    value: { get_resource: pcrf_swift_container_1 }
-  pcrf_swift_container_url_1:
-    description: the pcrf_swift_container_1 url
-    value: { get_attr: [ pcrf_swift_container_1, WebsiteURL ] }
-    
\ No newline at end of file
diff --git a/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/simpleNotif-V2/artifacts/mount_iso_script.sh b/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/simpleNotif-V2/artifacts/mount_iso_script.sh
deleted file mode 100644
index 91df598..0000000
--- a/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/simpleNotif-V2/artifacts/mount_iso_script.sh
+++ /dev/null
@@ -1,34 +0,0 @@
-#!/bin/bash
-
-#. .config 
-#following would be in the .config file
- device_name="/dev/vde"
- install_script="install_nimbus.sh"
- enable_logic_flag_file=".flag"
-#end of config file
-
-#get the semaphore, 0 - disbaled, 1- enabled
-flag=$(cat ${enable_logic_flag_file})
-
-#check if device is mounted already
-test=$(mount | grep ${device_name})
-if [ "$flag" == "1" ]; then
-	if [ -e ${device_name} ] && [ ! "${test}" ]; then
-		#mount the iso image
-		mount -t iso9660 -v -o loop /dev/vde/ /mnt/iso
-		#if availabe run the install script (it contains the install.sh steps)
-		if [ -e "${install_script}" ] && [ -f "${install_script}" ]; then
-			${install_script}
-		fi
-		#disable the script from attempting to 
-		#  mount and run install again until needed;
-		echo "0" > ${enable_logic_flag_file}
-		#if nedeed add step to comment out the crontab line here;
-	fi
-else
-	echo "Auto mounting ISO & run install logic disabled!"
-fi
-
-#cron job
-# * * * * * /mount_iso_script.sh
-
diff --git a/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/simpleNotif-V2/artifacts/nested-oam_v1.0.yaml b/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/simpleNotif-V2/artifacts/nested-oam_v1.0.yaml
deleted file mode 100644
index fa3b04e..0000000
--- a/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/simpleNotif-V2/artifacts/nested-oam_v1.0.yaml
+++ /dev/null
@@ -1,156 +0,0 @@
-heat_template_version: 2013-05-23
-
-description: nested heat template that creates a PCRF OAM node stack
-
-parameters:
-  pcrf_oam_server_name:
-    type: string
-    label: PCRF OAM server name
-    description: PCRF OAM server name
-  pcrf_oam_image_name:
-    type: string
-    label: image name
-    description: PCRF OAM image name
-  pcrf_oam_flavor_name:
-    type: string
-    label: PCRF OAM flavor name
-    description: flavor name of PCRF OAM instance
-  availabilityzone_name:
-    type: string
-    label: availabilityzone name
-    description: availabilityzone name
-  pcrf_cps_net_name:
-    type: string
-    label: CPS network name
-    description: CPS network name
-  pcrf_cps_net_ip:
-    type: string
-    label: CPS network ip
-    description: CPS network ip
-  pcrf_cps_net_mask:
-    type: string
-    label: CPS network mask
-    description: CPS network mask
-  pcrf_arbiter_vip:
-    type: string
-    label: OAM Arbiter LB VIP
-    description: OAM Arbiter LB VIP
-  pcrf_oam_net_name:
-    type: string
-    label: OAM network name
-    description: OAM network name
-  pcrf_oam_net_ip:
-    type: string
-    label: OAM network ip
-    description: OAM network ip
-  pcrf_oam_net_gw:
-    type: string
-    label: CPS network gateway
-    description: CPS network gateway
-  pcrf_oam_net_mask:
-    type: string
-    label: CPS network mask
-    description: CPS network mask
-  pcrf_oam_volume_id:
-    type: string
-    label: CPS OAM Cinder Volume
-    description: CPS OAM Cinder Volume
-  pcrf_security_group_name:
-    type: string
-    label: security group name
-    description: the name of security group
-  pcrf_vnf_id:
-    type: string
-    label: PCRF VNF Id
-    description: PCRF VNF Id
-
-resources:
-  network:
-    type: OS::Heat::CloudConfig
-    properties:
-      cloud_config:
-        write_files:
-          - path: /etc/sysconfig/network-scripts/ifcfg-eth0
-            permissions: "0644"
-            content:
-              str_replace:
-                template: { get_file: nimbus-ethernet }
-                params:
-                  $dev: eth0
-                  $ip: { get_param: pcrf_cps_net_ip }
-                  $netmask: { get_param: pcrf_cps_net_mask }
-          - path: /etc/sysconfig/network-scripts/ifcfg-eth1
-            permissions: "0644"
-            content:
-              str_replace:
-                template: { get_file: nimbus-ethernet-gw }
-                params:
-                  $dev: eth1
-                  $ip: { get_param: pcrf_oam_net_ip }
-                  $netmask: { get_param: pcrf_oam_net_mask }
-                  $gateway: { get_param: pcrf_oam_net_gw }
-        runcmd:
-          - ifdown eth0 && ifup eth0
-          - ifdown eth1 && ifup eth1
-  script_init:
-    type: OS::Heat::SoftwareConfig
-    properties:
-      group: ungrouped
-      config:
-        str_replace:
-          template: { get_file: cloud-nimbus.sh }
-          params:
-            $vm_name: { get_param: pcrf_oam_server_name }
-  pcrf_server_init:
-    type: OS::Heat::MultipartMime
-    properties:
-      parts:
-      - config: { get_resource: network}
-      - config: { get_resource: script_init}
-
-  pcrf_server_oam:
-    type: OS::Nova::Server
-    properties:
-      config_drive: "True"
-      name: { get_param: pcrf_oam_server_name }
-      image: { get_param: pcrf_oam_image_name }
-      flavor: { get_param: pcrf_oam_flavor_name }
-      availability_zone: { get_param: availabilityzone_name }
-      networks:
-        - port: { get_resource: pcrf_oam_port_0}
-        - port: { get_resource: pcrf_oam_port_1}
-      user_data_format: RAW
-      user_data:
-        get_resource: pcrf_server_init
-      metadata:
-        vnf_id: {get_param: pcrf_vnf_id}
-  
-  pcrf_oam_port_0:
-    type: OS::Neutron::Port
-    properties:
-      network: { get_param: pcrf_cps_net_name }
-      fixed_ips:
-        - ip_address: { get_param: pcrf_cps_net_ip }
-      allowed_address_pairs:
-        - ip_address: { get_param: pcrf_arbiter_vip }
-      security_groups: [{ get_param: pcrf_security_group_name }]
-
-  pcrf_oam_port_1:
-    type: OS::Neutron::Port
-    properties:
-      network: { get_param: pcrf_oam_net_name }
-      fixed_ips:
-        - ip_address: { get_param: pcrf_oam_net_ip }
-      security_groups: [{ get_param: pcrf_security_group_name }]
-
-  pcrf_oam_vol_attachment:
-    type: OS::Cinder::VolumeAttachment
-    properties:
-      volume_id: { get_param: pcrf_oam_volume_id }
-      mountpoint: /dev/vdd
-      instance_uuid: { get_resource: pcrf_server_oam }
-
-outputs:
-  pcrf_oam_vol_attachment_id:
-    description: the pcrf_oam_vol_attachment_id id
-    value: { get_resource: pcrf_oam_vol_attachment }
diff --git a/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/simpleNotif-V2/artifacts/nested-pcm_v1.0.yaml b/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/simpleNotif-V2/artifacts/nested-pcm_v1.0.yaml
deleted file mode 100644
index a3129bb..0000000
--- a/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/simpleNotif-V2/artifacts/nested-pcm_v1.0.yaml
+++ /dev/null
@@ -1,150 +0,0 @@
-heat_template_version: 2013-05-23
-
-description: heat template that creates PCRF Cluman stack
-
-parameters:
-  pcrf_pcm_server_name:
-    type: string
-    label: PCRF CM server name
-    description: PCRF CM server name
-  pcrf_pcm_image_name:
-    type: string
-    label: image name
-    description: PCRF CM image name
-  pcrf_pcm_flavor_name:
-    type: string
-    label: PCRF CM flavor name
-    description: flavor name of PCRF CM instance
-  availabilityzone_name:
-    type: string
-    label: availabilityzone name
-    description: availabilityzone name
-  pcrf_cps_net_name:
-    type: string
-    label: CPS network name
-    description: CPS network name
-  pcrf_cps_net_ip:
-    type: string
-    label: CPS network ip
-    description: CPS network ip
-  pcrf_cps_net_mask:
-    type: string
-    label: CPS network mask
-    description: CPS network mask
-  pcrf_oam_net_name:
-    type: string
-    label: OAM network name
-    description: OAM network name
-  pcrf_oam_net_ip:
-    type: string
-    label: OAM network ip
-    description: OAM network ip
-  pcrf_oam_net_gw:
-    type: string
-    label: CPS network gateway
-    description: CPS network gateway
-  pcrf_oam_net_mask:
-    type: string
-    label: CPS network mask
-    description: CPS network mask
-  pcrf_pcm_volume_id:
-    type: string
-    label: CPS Cluman Cinder Volume
-    description: CPS Cluman Cinder Volume
-  pcrf_security_group_name:
-    type: string
-    label: security group name
-    description: the name of security group
-  pcrf_vnf_id:
-    type: string
-    label: PCRF VNF Id
-    description: PCRF VNF Id
-
-resources:
-  network:
-    type: OS::Heat::CloudConfig
-    properties:
-      cloud_config:
-        write_files:
-          - path: /etc/sysconfig/network-scripts/ifcfg-eth0
-            permissions: "0644"
-            content:
-              str_replace:
-                template: { get_file: nimbus-ethernet }
-                params:
-                  $dev: eth0
-                  $ip: { get_param: pcrf_cps_net_ip }
-                  $netmask: { get_param: pcrf_cps_net_mask }
-          - path: /etc/sysconfig/network-scripts/ifcfg-eth1
-            permissions: "0644"
-            content:
-              str_replace:
-                template: { get_file: nimbus-ethernet-gw }
-                params:
-                  $dev: eth1
-                  $ip: { get_param: pcrf_oam_net_ip }
-                  $netmask: { get_param: pcrf_oam_net_mask }
-                  $gateway: { get_param: pcrf_oam_net_gw }
-        runcmd:
-          - ifdown eth0 && ifup eth0
-          - ifdown eth1 && ifup eth1
-  script_init:
-    type: OS::Heat::SoftwareConfig
-    properties:
-      group: ungrouped
-      config:
-        str_replace:
-          template: { get_file: cloud-nimbus.sh }
-          params:
-            $vm_name: { get_param: pcrf_pcm_server_name }
-  pcrf_server_init:
-    type: OS::Heat::MultipartMime
-    properties:
-      parts:
-      - config: { get_resource: network}
-      - config: { get_resource: script_init}
-
-  pcrf_server_pcm:
-    type: OS::Nova::Server
-    properties:
-      config_drive: "True"
-      name: { get_param: pcrf_pcm_server_name }
-      image: { get_param: pcrf_pcm_image_name }
-      flavor: { get_param: pcrf_pcm_flavor_name }
-      availability_zone: { get_param: availabilityzone_name }
-      networks:
-        - port: { get_resource: pcrf_pcm_port_0}
-        - port: { get_resource: pcrf_pcm_port_1}
-      user_data_format: RAW
-      user_data:
-        get_resource: pcrf_server_init
-      metadata:
-        vnf_id: {get_param: pcrf_vnf_id}
-
-  pcrf_pcm_port_0:
-    type: OS::Neutron::Port
-    properties:
-      network: { get_param: pcrf_cps_net_name }
-      fixed_ips:
-        - ip_address: { get_param: pcrf_cps_net_ip }
-      security_groups: [{ get_param: pcrf_security_group_name }]
-
-  pcrf_pcm_port_1:
-    type: OS::Neutron::Port
-    properties:
-      network: { get_param: pcrf_oam_net_name }
-      fixed_ips:
-        - ip_address: { get_param: pcrf_oam_net_ip }
-      security_groups: [{ get_param: pcrf_security_group_name }]
-
-  volume_attachment:
-    type: OS::Cinder::VolumeAttachment
-    properties:
-      volume_id: { get_param: pcrf_pcm_volume_id }
-      mountpoint: /dev/vdd
-      instance_uuid: { get_resource: pcrf_server_pcm }
-
-outputs:
-  pcrf_server_pcm_id:
-    description: the pcm server id
-    value: { get_resource: pcrf_server_pcm }
\ No newline at end of file
diff --git a/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/simpleNotif-V2/artifacts/nested-ppd_v1.0.yaml b/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/simpleNotif-V2/artifacts/nested-ppd_v1.0.yaml
deleted file mode 100644
index 169522b..0000000
--- a/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/simpleNotif-V2/artifacts/nested-ppd_v1.0.yaml
+++ /dev/null
@@ -1,333 +0,0 @@
-heat_template_version: 2013-05-23
-
-description: heat template that creates PCRF Policy Director stack
-
-parameters:
-  pcrf_ppd_server_name:
-    type: string
-    label: PCRF PD server name
-    description: PCRF PD server name
-  pcrf_ppd_image_name:
-    type: string
-    label: image name
-    description: PCRF PD image name
-  pcrf_ppd_flavor_name:
-    type: string
-    label: PCRF PD flavor name
-    description: flavor name of PCRF PD instance
-  availabilityzone_name:
-    type: string
-    label: availabilityzone name
-    description: availabilityzone name
-  pcrf_cps_net_name:
-    type: string
-    label: CPS network name
-    description: CPS network name
-  pcrf_cps_net_ip:
-    type: string
-    label: CPS network ip
-    description: CPS network ip
-  pcrf_cps_net_mask:
-    type: string
-    label: CPS network mask
-    description: CPS network mask
-  pcrf_lb_internal_vip:
-    type: string
-    label: CPS Internal LB VIP
-    description: CPS Internal LB VIP
-  pcrf_oam_net_name:
-    type: string
-    label: OAM network name
-    description: OAM network name
-  pcrf_oam_net_ip:
-    type: string
-    label: OAM network ip
-    description: OAM network ip
-  pcrf_oam_net_gw:
-    type: string
-    label: CPS network gateway
-    description: CPS network gateway
-  pcrf_oam_net_mask:
-    type: string
-    label: CPS network mask
-    description: CPS network mask
-  pcrf_lb_management_vip:
-    type: string
-    label: CPS OAM LB VIP
-    description: CPS OAM LB VIP
-  pcrf_gx_net_name:
-    type: string
-    label: Gx network name
-    description: Gx network name
-  pcrf_gx_net_ip:
-    type: string
-    label: Gx network ip
-    description: Gx network ip
-  pcrf_gx_net_mask:
-    type: string
-    label: Gx network mask
-    description: Gx network mask
-  pcrf_sp_net_name:
-    type: string
-    label: Sp network name
-    description: Sp network name
-  pcrf_sp_net_ip:
-    type: string
-    label: Sp network ip
-    description: Sp network ip
-  pcrf_sp_net_mask:
-    type: string
-    label: Sp network mask
-    description: Sp network mask
-  pcrf_sy_net_name:
-    type: string
-    label: Sy network name
-    description: Sy network name
-  pcrf_sy_net_ip:
-    type: string
-    label: Sy network ip
-    description: Sy network ip
-  pcrf_sy_net_mask:
-    type: string
-    label: Sy network mask
-    description: Sy network mask
-  pcrf_rx_net_name:
-    type: string
-    label: Rx network name
-    description: Rx network name
-  pcrf_rx_net_ip:
-    type: string
-    label: Rx network ip
-    description: Rx network ip
-  pcrf_rx_net_mask:
-    type: string
-    label: Rx network mask
-    description: Rx network mask
-  pcrf_sd_net_name:
-    type: string
-    label: Sd network name
-    description: Sd network name
-  pcrf_sd_net_ip:
-    type: string
-    label: Sd network ip
-    description: Sd network ip
-  pcrf_sd_net_mask:
-    type: string
-    label: Sd network mask
-    description: Sd network mask
-  pcrf_sgi_sy_net_name:
-    type: string
-    label: Sgi Sy network name
-    description: Sgi Sy network name
-  pcrf_sgi_sy_net_ip:
-    type: string
-    label: Sgi Sy network ip
-    description: Sgi Sy network ip
-  pcrf_sgi_sy_net_mask:
-    type: string
-    label: Sgi Sy network mask
-    description: Sgi Sy network mask
-  pcrf_security_group_name:
-    type: string
-    label: security group name
-    description: the name of security group
-  pcrf_vnf_id:
-    type: string
-    label: PCRF VNF Id
-    description: PCRF VNF Id
-
-resources:
-  network:
-    type: OS::Heat::CloudConfig
-    properties:
-      cloud_config:
-        write_files:
-          - path: /etc/sysconfig/network-scripts/ifcfg-eth0
-            permissions: "0644"
-            content:
-              str_replace:
-                template: { get_file: nimbus-ethernet }
-                params:
-                  $dev: eth0
-                  $ip: { get_param: pcrf_cps_net_ip }
-                  $netmask: { get_param: pcrf_cps_net_mask }
-          - path: /etc/sysconfig/network-scripts/ifcfg-eth1
-            permissions: "0644"
-            content:
-              str_replace:
-                template: { get_file: nimbus-ethernet-gw }
-                params:
-                  $dev: eth1
-                  $ip: { get_param: pcrf_oam_net_ip }
-                  $netmask: { get_param: pcrf_oam_net_mask }
-                  $gateway: { get_param: pcrf_oam_net_gw }
-          - path: /etc/sysconfig/network-scripts/ifcfg-eth2
-            permissions: "0644"
-            content:
-              str_replace:
-                template: { get_file: nimbus-ethernet }
-                params:
-                  $dev: eth2
-                  $ip: { get_param: pcrf_gx_net_ip }
-                  $netmask: { get_param: pcrf_gx_net_mask }
-          - path: /etc/sysconfig/network-scripts/ifcfg-eth3
-            permissions: "0644"
-            content:
-              str_replace:
-                template: { get_file: nimbus-ethernet }
-                params:
-                  $dev: eth3
-                  $ip: { get_param: pcrf_sp_net_ip }
-                  $netmask: { get_param: pcrf_sp_net_mask }
-          - path: /etc/sysconfig/network-scripts/ifcfg-eth4
-            permissions: "0644"
-            content:
-              str_replace:
-                template: { get_file: nimbus-ethernet }
-                params:
-                  $dev: eth4
-                  $ip: { get_param: pcrf_sy_net_ip }
-                  $netmask: { get_param: pcrf_sy_net_mask }
-          - path: /etc/sysconfig/network-scripts/ifcfg-eth5
-            permissions: "0644"
-            content:
-              str_replace:
-                template: { get_file: nimbus-ethernet }
-                params:
-                  $dev: eth5
-                  $ip: { get_param: pcrf_rx_net_ip }
-                  $netmask: { get_param: pcrf_rx_net_mask }
-          - path: /etc/sysconfig/network-scripts/ifcfg-eth6
-            permissions: "0644"
-            content:
-              str_replace:
-                template: { get_file: nimbus-ethernet }
-                params:
-                  $dev: eth6
-                  $ip: { get_param: pcrf_sd_net_ip }
-                  $netmask: { get_param: pcrf_sd_net_mask }
-          - path: /etc/sysconfig/network-scripts/ifcfg-eth7
-            permissions: "0644"
-            content:
-              str_replace:
-                template: { get_file: nimbus-ethernet }
-                params:
-                  $dev: eth7
-                  $ip: { get_param: pcrf_sgi_sy_net_ip }
-                  $netmask: { get_param: pcrf_sgi_sy_net_mask }
-        runcmd:
-          - ifdown eth0 && ifup eth0
-          - ifdown eth1 && ifup eth1
-          - ifdown eth2 && ifup eth2
-          - ifdown eth3 && ifup eth3
-          - ifdown eth4 && ifup eth4
-          - ifdown eth5 && ifup eth5
-          - ifdown eth6 && ifup eth6
-          - ifdown eth7 && ifup eth7
-  script_init:
-    type: OS::Heat::SoftwareConfig
-    properties:
-      group: ungrouped
-      config:
-        str_replace:
-          template: { get_file: cloud-nimbus.sh }
-          params:
-            $vm_name: { get_param: pcrf_ppd_server_name }
-  pcrf_server_init:
-    type: OS::Heat::MultipartMime
-    properties:
-      parts:
-      - config: { get_resource: network}
-      - config: { get_resource: script_init}
-
-  pcrf_server_ppd: 
-    type: OS::Nova::Server
-    properties:
-      config_drive: "True"
-      name: { get_param: pcrf_ppd_server_name }
-      image: { get_param: pcrf_ppd_image_name }
-      flavor: { get_param: pcrf_ppd_flavor_name }
-      availability_zone: { get_param: availabilityzone_name }
-      networks:
-        - port: { get_resource: pcrf_ppd_port_0}
-        - port: { get_resource: pcrf_ppd_port_1}
-        - port: { get_resource: pcrf_ppd_port_2}
-        - port: { get_resource: pcrf_ppd_port_3}
-        - port: { get_resource: pcrf_ppd_port_4}
-        - port: { get_resource: pcrf_ppd_port_5}
-        - port: { get_resource: pcrf_ppd_port_6}
-        - port: { get_resource: pcrf_ppd_port_7}
-      user_data_format: RAW
-      user_data:
-        get_resource: pcrf_server_init
-      metadata:
-        vnf_id: {get_param: pcrf_vnf_id}
-
-  pcrf_ppd_port_0:
-    type: OS::Neutron::Port
-    properties:
-      network: { get_param: pcrf_cps_net_name }
-      fixed_ips:
-        - ip_address: { get_param: pcrf_cps_net_ip }
-      security_groups: [{ get_param: pcrf_security_group_name }]
-      allowed_address_pairs:
-        - ip_address: { get_param: pcrf_lb_internal_vip }
-
-  pcrf_ppd_port_1:
-    type: OS::Neutron::Port
-    properties:
-      network: { get_param: pcrf_oam_net_name }
-      fixed_ips:
-        - ip_address: { get_param: pcrf_oam_net_ip }
-      security_groups: [{ get_param: pcrf_security_group_name }]
-      allowed_address_pairs:
-        - ip_address: { get_param: pcrf_lb_management_vip } 
- 
-  pcrf_ppd_port_2:
-    type: OS::Neutron::Port
-    properties:
-      network: { get_param: pcrf_gx_net_name }
-      fixed_ips:
-        - ip_address: { get_param: pcrf_gx_net_ip }
-      security_groups: [{ get_param: pcrf_security_group_name }]
-
-  pcrf_ppd_port_3:
-    type: OS::Neutron::Port
-    properties:
-      network: { get_param: pcrf_sp_net_name }
-      fixed_ips:
-        - ip_address: { get_param: pcrf_sp_net_ip }
-      security_groups: [{ get_param: pcrf_security_group_name }]
-
-  pcrf_ppd_port_4:
-    type: OS::Neutron::Port
-    properties:
-      network: { get_param: pcrf_sy_net_name }
-      fixed_ips:
-        - ip_address: { get_param: pcrf_sy_net_ip }
-      security_groups: [{ get_param: pcrf_security_group_name }]
-
-  pcrf_ppd_port_5:
-    type: OS::Neutron::Port
-    properties:
-      network: { get_param: pcrf_rx_net_name }
-      fixed_ips:
-        - ip_address: { get_param: pcrf_rx_net_ip }
-      security_groups: [{ get_param: pcrf_security_group_name }]
-  
-  pcrf_ppd_port_6:
-    type: OS::Neutron::Port
-    properties:
-      network: { get_param: pcrf_sd_net_name }
-      fixed_ips:
-        - ip_address: { get_param: pcrf_sd_net_ip }
-      security_groups: [{ get_param: pcrf_security_group_name }]
-
-  pcrf_ppd_port_7:
-    type: OS::Neutron::Port
-    properties:
-      network: { get_param: pcrf_sgi_sy_net_name }
-      fixed_ips:
-        - ip_address: { get_param: pcrf_sgi_sy_net_ip }
-      security_groups: [{ get_param: pcrf_security_group_name }]
-
diff --git a/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/simpleNotif-V2/artifacts/nested-pps_v1.0.yaml b/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/simpleNotif-V2/artifacts/nested-pps_v1.0.yaml
deleted file mode 100644
index 8cb6e15..0000000
--- a/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/simpleNotif-V2/artifacts/nested-pps_v1.0.yaml
+++ /dev/null
@@ -1,99 +0,0 @@
-heat_template_version: 2013-05-23
-
-description: heat template that creates PCRF Policy Server stack
-
-parameters:
-  pcrf_pps_server_name:
-    type: string
-    label: PCRF PS server name
-    description: PCRF PS server name
-  pcrf_pps_image_name:
-    type: string
-    label: PCRF PS image name
-    description: PCRF PS image name
-  pcrf_pps_flavor_name:
-    type: string
-    label: PCRF PS flavor name
-    description: flavor name of PCRF PS instance
-  availabilityzone_name:
-    type: string
-    label: availabilityzone name
-    description: availabilityzone name
-  pcrf_cps_net_name:
-    type: string
-    label: CPS network name
-    description: CPS network name
-  pcrf_cps_net_ip:
-    type: string
-    label: CPS network ip
-    description: CPS network ip
-  pcrf_cps_net_mask:
-    type: string
-    label: CPS network mask
-    description: CPS network mask
-  pcrf_security_group_name:
-    type: string
-    label: security group name
-    description: the name of security group
-  pcrf_vnf_id:
-    type: string
-    label: PCRF VNF Id
-    description: PCRF VNF Id
-
-resources:
-  script_init:
-    type: OS::Heat::SoftwareConfig
-    properties:
-      group: ungrouped
-      config:
-        str_replace:
-          template: { get_file: cloud-nimbus.sh }
-          params:
-            $vm_name: { get_param: pcrf_pps_server_name }
-  network:
-    type: OS::Heat::CloudConfig
-    properties:
-      cloud_config:
-        write_files:
-          - path: /etc/sysconfig/network-scripts/ifcfg-eth0
-            permissions: "0644"
-            content:
-              str_replace:
-                template: { get_file: nimbus-ethernet }
-                params:
-                  $dev: eth0
-                  $ip: { get_param: pcrf_cps_net_ip }
-                  $netmask: { get_param: pcrf_cps_net_mask }
-        runcmd:
-          - ifdown eth0 && ifup eth0
-
-  pcrf_server_init:
-    type: OS::Heat::MultipartMime
-    properties:
-      parts:
-      - config: { get_resource: network}
-      - config: { get_resource: script_init}
-
-  pcrf_server_pps:
-    type: OS::Nova::Server
-    properties:
-      config_drive: "True"
-      name: { get_param: pcrf_pps_server_name }
-      image: { get_param: pcrf_pps_image_name }
-      flavor: { get_param: pcrf_pps_flavor_name }
-      availability_zone: { get_param: availabilityzone_name }
-      networks:
-        - port: { get_resource: pcrf_pps_port_0}
-      user_data_format: RAW
-      user_data:
-        get_resource: pcrf_server_init
-      metadata:
-        vnf_id: {get_param: pcrf_vnf_id}
-
-  pcrf_pps_port_0:
-    type: OS::Neutron::Port
-    properties:
-      network: { get_param: pcrf_cps_net_name }
-      fixed_ips:
-        - ip_address: { get_param: pcrf_cps_net_ip }
-      security_groups: [{ get_param: pcrf_security_group_name }]
diff --git a/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/simpleNotif-V2/artifacts/nested-psm_v1.0.yaml b/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/simpleNotif-V2/artifacts/nested-psm_v1.0.yaml
deleted file mode 100644
index 64c7484..0000000
--- a/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/simpleNotif-V2/artifacts/nested-psm_v1.0.yaml
+++ /dev/null
@@ -1,99 +0,0 @@
-heat_template_version: 2013-05-23
-
-description: heat template that creates PCRF Session Manager stack
-
-parameters:
-  pcrf_psm_server_name:
-    type: string
-    label: PCRF SM server name
-    description: PCRF SM server name
-  pcrf_psm_image_name:
-    type: string
-    label: image name
-    description: PCRF SM image name
-  pcrf_psm_flavor_name:
-    type: string
-    label: PCRF SM flavor name
-    description: flavor name of PCRF SM instance 
-  availabilityzone_name:
-    type: string
-    label: availabilityzone name
-    description: availabilityzone name
-  pcrf_cps_net_name:
-    type: string
-    label: CPS network name
-    description: CPS network name
-  pcrf_cps_net_ip:
-    type: string
-    label: CPS network ip
-    description: CPS network ip
-  pcrf_cps_net_mask:
-    type: string
-    label: CPS network mask
-    description: CPS network mask
-  pcrf_security_group_name:
-    type: string
-    label: security group name
-    description: the name of security group
-  pcrf_vnf_id:
-    type: string
-    label: PCRF VNF Id
-    description: PCRF VNF Id
-
-resources:
-  network:
-    type: OS::Heat::CloudConfig
-    properties:
-      cloud_config:
-        write_files:
-          - path: /etc/sysconfig/network-scripts/ifcfg-eth0
-            permissions: "0644"
-            content:
-              str_replace:
-                template: { get_file: nimbus-ethernet }
-                params:
-                  $dev: eth0
-                  $ip: { get_param: pcrf_cps_net_ip }
-                  $netmask: { get_param: pcrf_cps_net_mask }
-        runcmd:
-          - ifdown eth0 && ifup eth0
-  script_init:
-    type: OS::Heat::SoftwareConfig
-    properties:
-      group: ungrouped
-      config:
-        str_replace:
-          template: { get_file: cloud-nimbus.sh }
-          params:
-            $vm_name: { get_param: pcrf_psm_server_name }
-  pcrf_server_init:
-    type: OS::Heat::MultipartMime
-    properties:
-      parts:
-      - config: { get_resource: network}
-      - config: { get_resource: script_init}
-
-  pcrf_server_psm:
-    type: OS::Nova::Server
-    properties:
-      config_drive: "True"
-      name: { get_param: pcrf_psm_server_name }
-      image: { get_param: pcrf_psm_image_name }
-      flavor: { get_param: pcrf_psm_flavor_name }
-      availability_zone: { get_param: availabilityzone_name }
-      networks:
-        - port: { get_resource: psm01_port_0}
-      user_data_format: RAW
-      user_data:
-        get_resource: pcrf_server_init
-      metadata:
-        vnf_id: {get_param: pcrf_vnf_id}
-      #scheduler_hints: {group: { get_resource: servergroup_nimbus }}
-  
-  psm01_port_0:
-    type: OS::Neutron::Port
-    properties:
-      network: { get_param: pcrf_cps_net_name }
-      fixed_ips:
-        - ip_address: { get_param: pcrf_cps_net_ip }
-      security_groups: [{ get_param: pcrf_security_group_name }]
\ No newline at end of file
diff --git a/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/simpleNotif-V2/artifacts/vnf-module-artifact.json b/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/simpleNotif-V2/artifacts/vnf-module-artifact.json
deleted file mode 100644
index 301012e..0000000
--- a/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/simpleNotif-V2/artifacts/vnf-module-artifact.json
+++ /dev/null
@@ -1,17 +0,0 @@
-[
-  {
-    "vfModuleModelName": "VF_RI2_G6_withArtifacts::module-0",
-    "vfModuleModelInvariantUUID": "585822c7-4027-4f84-ba50-e9248606f131",
-    "vfModuleModelVersion": "1.0",
-    "vfModuleModelUUID": "1e34774e-715e-4fd5-bd08-7b654622f33e.VF_RI2_G6_withArtifacts::module-0.group",
-    "vfModuleModelDescription": "vf Module Description",
-    "vfModuleModelCustomizationUUID": "585822c7-4027-4f84-ba50-e9248606f131",
-    "isBase": true,
-    "artifacts": [
-      "Artifact-UUID1",
-      "EnvArtifact-UUID2",
-      "NestedArtifact-UUID3"
-    ],
-    "properties": {"test":"test"}
-  }
-]
\ No newline at end of file
diff --git a/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/simpleNotif-V2/notif-structure.json b/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/simpleNotif-V2/notif-structure.json
deleted file mode 100644
index ef9f256..0000000
--- a/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/simpleNotif-V2/notif-structure.json
+++ /dev/null
@@ -1,79 +0,0 @@
-{
-    "serviceName": "test-service",
-    "serviceInvariantUUID": "585822c7-4027-4f84-ba50-e9248606f132",
-    "serviceUUID": "1e34774e-715e-4fd5-bd09-7b654622f33f",
-    "serviceVersion": "2.0",
-    "serviceArtifacts":
-    [
-
-    ],
-
-    "resources":
-    [
-        {
-            "resourceInstanceName": "resource-1",
-            "resourceInvariantUUID": "585822c7-4027-4f84-ba50-e9248606f134",
-            "resourceName": "resourceName-1",
-            "resourceType": "VF",
-            "resourceUUID": "585822c7-4027-4f84-ba50-e9248606f136",
-            "resourceVersion": "1.0",
-            "category":  "category",
-            "artifacts":
-            [
-                {
-                    "artifactChecksum": "CheckSum",
-                    "artifactDescription": "Meta data for VFModule",
-                    "artifactName": "vnf-module-artifact.json",
-
-                    "artifactType": "VF_MODULES_METADATA",
-                    "artifactURL": "vnf-module-artifact.json",
-                    "artifactUUID": "VfArtifact-UUID1",
-                    "artifactVersion": "1.0"
-
-                },
-                {
-                    "artifactChecksum": "CheckSum",
-                    "artifactDescription": "Nimbus Heat OAM",
-                    "artifactName": "hot-nimbus-oam_v1.0.yaml",
-                    "artifactTimeout": 100,
-                    "artifactType": "HEAT",
-                    "artifactURL": "hot-nimbus-oam_v1.0.yaml",
-                    "artifactUUID": "Artifact-UUID1",
-                    "artifactVersion": "1.0",
-                    "generatedArtifact": "EnvArtifact-UUID2",
-                    "relatedArtifact":
-                    [
-                        "NestedArtifact-UUID3"
-                    ]
-                },
-
-                {
-                    "artifactChecksum": "CheckSum",
-                    "artifactDescription": "Nimbus Heat ENV OAM",
-                    "artifactName": "hot-nimbus-oam_v1.0.env",
-
-                    "artifactType": "HEAT_ENV",
-                    "artifactURL": "hot-nimbus-oam_v1.0.env",
-                    "artifactUUID": "EnvArtifact-UUID2",
-                    "artifactVersion": "1.0"
-
-                },
-
-                {
-                    "artifactChecksum": "CheckSum",
-                    "artifactDescription": "Nested OAM",
-                    "artifactName": "nested-oam_v1.0.yaml",
-                    "artifactTimeout": 10,
-                    "artifactType": "HEAT_NESTED",
-                    "artifactURL": "nested-oam_v1.0.yaml",
-                    "artifactUUID": "NestedArtifact-UUID3",
-                    "artifactVersion": "1.0"
-
-                }
-            ]
-        }
-    ],
-
-    "serviceDescription": "test service for unit testing",
-    "distributionID": "35120a87-1f82-4276-9735-f6de5a244d65"
-}
\ No newline at end of file
diff --git a/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/simpleNotif-V3/artifacts/cloud-nimbus.sh b/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/simpleNotif-V3/artifacts/cloud-nimbus.sh
deleted file mode 100644
index 48485f3..0000000
--- a/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/simpleNotif-V3/artifacts/cloud-nimbus.sh
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/bin/bash
-echo "Running first-boot script"
-FLAG="first-boot.sh"
-echo "First boot run" > ${FLAG}
-echo "$vm_name" >> ${FLAG}
-touch /var/lib/cloud/instance/payload/launch-params
-chmod 644 /var/lib/cloud/instance/payload/launch-params
-#for i in $(ls /sys/class/net); do
-#  echo "Restart $i" >> ${FLAG}
-#  ifdown ${i}
-#  ifup ${i}
-#done
diff --git a/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/simpleNotif-V3/artifacts/hot-nimbus-oam-volumes_v1.0.env b/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/simpleNotif-V3/artifacts/hot-nimbus-oam-volumes_v1.0.env
deleted file mode 100644
index b494d8c..0000000
--- a/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/simpleNotif-V3/artifacts/hot-nimbus-oam-volumes_v1.0.env
+++ /dev/null
@@ -1,6 +0,0 @@
-parameters:
-  pcrf_oam_vol_size: 500
-  pcrf_oam_volume_silver-1: Silver
-  pcrf_oam_volume_silver-2: Silver
-  pcrf_oam_vol_name_1: sde1-pcrfx01-oam001-vol-1
-  pcrf_oam_vol_name_2: sde1-pcrfx01-oam001-vol-2
\ No newline at end of file
diff --git a/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/simpleNotif-V3/artifacts/hot-nimbus-oam-volumes_v1.0.yaml b/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/simpleNotif-V3/artifacts/hot-nimbus-oam-volumes_v1.0.yaml
deleted file mode 100644
index 9e12054..0000000
--- a/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/simpleNotif-V3/artifacts/hot-nimbus-oam-volumes_v1.0.yaml
+++ /dev/null
@@ -1,45 +0,0 @@
-heat_template_version:  2013-05-23
-
-parameters:
-    pcrf_oam_vol_size:
-     type: number
-     label: Cinder volume size
-     description: the size of the Cinder volume
-    pcrf_oam_vol_name_1:
-     type: string
-     label: OAM volume name 1
-     description: Assigning name to volume
-    pcrf_oam_vol_name_2:
-     type: string
-     label: OAM volume name 2
-     description: Assigning name to volume
-    pcrf_oam_volume_silver-1:
-     type: string
-     label: vm volume type
-     description: the name of the target volume backend for OAM1
-    pcrf_oam_volume_silver-2:
-     type: string
-     label: vm volume type
-     description: the name of the target volume backend for OAM2
-
-resources:
-  pcrf_oam_volume_1:
-    type: OS::Cinder::Volume
-    properties:
-      size: {get_param: pcrf_oam_vol_size}
-      volume_type: {get_param: pcrf_oam_volume_silver-1}
-      name: {get_param: pcrf_oam_vol_name_1}
-
-  pcrf_oam_volume_2:
-    type: OS::Cinder::Volume
-    properties:
-      size: {get_param: pcrf_oam_vol_size}
-      volume_type: {get_param: pcrf_oam_volume_silver-2}
-      name: {get_param: pcrf_oam_vol_name_2}
-outputs:
-  pcrf_oam_volume_id_1:
-    description: the oam 001 volume id
-    value: { get_resource: pcrf_oam_volume_1 }
-  pcrf_oam_volume_id_2:
-    description: the oam 002 volume id
-    value: { get_resource: pcrf_oam_volume_2 }
\ No newline at end of file
diff --git a/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/simpleNotif-V3/artifacts/hot-nimbus-oam_v1.0.env b/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/simpleNotif-V3/artifacts/hot-nimbus-oam_v1.0.env
deleted file mode 100644
index 7e51e67..0000000
--- a/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/simpleNotif-V3/artifacts/hot-nimbus-oam_v1.0.env
+++ /dev/null
@@ -1,18 +0,0 @@
-parameters:
-  pcrf_oam_server_names: ZRDM1PCRF01OAM001,ZRDM1PCRF01OAM002
-  pcrf_oam_image_name: PCRF_8.995-ATTM1.0.3.qcow2
-  pcrf_oam_flavor_name: lc.4xlarge4
-  availabilityzone_name: nova
-  pcrf_cps_net_name: Mobisupport-25193-I-INT1_int_pcrf_net_0
-  pcrf_cps_net_ips: 172.26.16.111,172.26.16.112
-  pcrf_arbiter_vip: 172.26.16.115
-  pcrf_cps_net_mask: 255.255.255.0
-  pcrf_oam_net_name: MNS-25180-L-01_oam_protected_net_0
-  pcrf_oam_net_ips: 107.239.64.117,107.239.64.118
-  pcrf_oam_net_gw: 107.239.64.1
-  pcrf_oam_net_mask: 255.255.248.0
-  pcrf_oam_volume_id_1: a4aa05fb-fcdc-457b-8077-6845fdfc3257
-  pcrf_oam_volume_id_2: 93d8fc1f-f1c3-4933-86b2-039881ee910f
-  pcrf_security_group_name: nimbus_security_group
-  pcrf_vnf_id: 730797234b4a40aa99335157b02871cd
-
diff --git a/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/simpleNotif-V3/artifacts/hot-nimbus-oam_v1.0.yaml b/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/simpleNotif-V3/artifacts/hot-nimbus-oam_v1.0.yaml
deleted file mode 100644
index 98c4e3b..0000000
--- a/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/simpleNotif-V3/artifacts/hot-nimbus-oam_v1.0.yaml
+++ /dev/null
@@ -1,109 +0,0 @@
-heat_template_version: 2013-05-23
-
-description: heat template that creates multiple PCRF OAM nodes stack
-
-parameters:
-  pcrf_oam_server_names:
-    type: comma_delimited_list
-    label: PCRF OAM server names
-    description: name of the PCRF OAM instance
-  pcrf_oam_image_name:
-    type: string
-    label: PCRF OAM image name
-    description: PCRF OAM image name
-  pcrf_oam_flavor_name:
-    type: string
-    label: PCRF OAM flavor name
-    description: flavor name of PCRF OAM instance
-  availabilityzone_name:
-    type: string
-    label: availabilityzone name
-    description: availabilityzone name
-  pcrf_cps_net_name:
-    type: string
-    label: CPS network name
-    description: CPS network name
-  pcrf_cps_net_ips:
-    type: comma_delimited_list
-    label: CPS network ips
-    description: CPS network ips
-  pcrf_cps_net_mask:
-    type: string
-    label: CPS network mask
-    description: CPS network mask
-  pcrf_arbiter_vip:
-    type: string
-    label: OAM Arbiter LB VIP
-    description: OAM Arbiter LB VIP
-  pcrf_oam_net_name:
-    type: string
-    label: OAM network name
-    description: OAM network name
-  pcrf_oam_net_ips:
-    type: comma_delimited_list
-    label: OAM network ips
-    description: OAM network ips
-  pcrf_oam_net_gw:
-    type: string
-    label: CPS network gateway
-    description: CPS network gateway
-  pcrf_oam_net_mask:
-    type: string
-    label: CPS network mask
-    description: CPS network mask
-  pcrf_oam_volume_id_1:
-    type: string
-    label: CPS OAM 001 Cinder Volume
-    description: CPS OAM 001 Cinder Volumes
-  pcrf_oam_volume_id_2:
-    type: string
-    label: CPS OAM 002 Cinder Volume
-    description: CPS OAM 002 Cinder Volumes
-  pcrf_security_group_name:
-    type: string
-    label: security group name
-    description: the name of security group
-  pcrf_vnf_id:
-    type: string
-    label: PCRF VNF Id
-    description: PCRF VNF Id
-
-resources:
-  server_pcrf_oam_001:
-    type: nested-oam_v1.0.yaml
-    properties:
-      pcrf_oam_server_name: { get_param: [pcrf_oam_server_names, 0] }
-      pcrf_oam_image_name: { get_param: pcrf_oam_image_name }
-      pcrf_oam_flavor_name: { get_param: pcrf_oam_flavor_name }
-      availabilityzone_name: { get_param: availabilityzone_name }
-      pcrf_security_group_name: { get_param: pcrf_security_group_name }
-      pcrf_oam_volume_id: { get_param: pcrf_oam_volume_id_1 }
-      pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
-      pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 0] }
-      pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
-      pcrf_oam_net_name: { get_param: pcrf_oam_net_name }
-      pcrf_oam_net_ip: { get_param: [pcrf_oam_net_ips, 0] }
-      pcrf_oam_net_mask: { get_param: pcrf_oam_net_mask }
-      pcrf_oam_net_gw: { get_param: pcrf_oam_net_gw }
-      pcrf_arbiter_vip: { get_param: pcrf_arbiter_vip }
-      pcrf_vnf_id: {get_param: pcrf_vnf_id}
-
-  server_pcrf_oam_002:
-    type: nested-oam_v1.0.yaml
-    depends_on: [server_pcrf_oam_001]
-    properties:
-      pcrf_oam_server_name: { get_param: [pcrf_oam_server_names, 1] }
-      pcrf_oam_image_name: { get_param: pcrf_oam_image_name }
-      pcrf_oam_flavor_name: { get_param: pcrf_oam_flavor_name }
-      availabilityzone_name: { get_param: availabilityzone_name }
-      pcrf_security_group_name: { get_param: pcrf_security_group_name }
-      pcrf_oam_volume_id: { get_param: pcrf_oam_volume_id_2 }
-      pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
-      pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 1] }
-      pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
-      pcrf_oam_net_name: { get_param: pcrf_oam_net_name }
-      pcrf_oam_net_ip: { get_param: [pcrf_oam_net_ips, 1] }
-      pcrf_oam_net_mask: { get_param: pcrf_oam_net_mask }
-      pcrf_oam_net_gw: { get_param: pcrf_oam_net_gw }
-      pcrf_arbiter_vip: { get_param: pcrf_arbiter_vip }
-      pcrf_vnf_id: {get_param: pcrf_vnf_id}
diff --git a/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/simpleNotif-V3/artifacts/hot-nimbus-pcm-volumes_v1.0.env b/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/simpleNotif-V3/artifacts/hot-nimbus-pcm-volumes_v1.0.env
deleted file mode 100644
index 788365d..0000000
--- a/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/simpleNotif-V3/artifacts/hot-nimbus-pcm-volumes_v1.0.env
+++ /dev/null
@@ -1,4 +0,0 @@
-parameters:
-  pcrf_pcm_vol_size: 50
-  pcrf_pcm_volume_silver: Silver
-  pcrf_pcm_vol_name_1: sde1-pcrfx01-pcm001-vol-1
diff --git a/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/simpleNotif-V3/artifacts/hot-nimbus-pcm-volumes_v1.0.yaml b/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/simpleNotif-V3/artifacts/hot-nimbus-pcm-volumes_v1.0.yaml
deleted file mode 100644
index bcc3e89..0000000
--- a/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/simpleNotif-V3/artifacts/hot-nimbus-pcm-volumes_v1.0.yaml
+++ /dev/null
@@ -1,28 +0,0 @@
-heat_template_version:  2013-05-23
-
-parameters:
-   pcrf_pcm_vol_size:
-     type: number
-     label: Cinder volume size
-     description: the size of the Cinder volume
-   pcrf_pcm_vol_name_1:
-     type: string
-     label: PCM volume name
-     description: Assigning name to volume
-   pcrf_pcm_volume_silver:
-     type: string
-     label: vm volume type
-     description: the name of the target volume backend for PCM
-
-resources: 
-  pcrf_pcm_volume_1:
-     type: OS::Cinder::Volume
-     properties:
-      size: { get_param: pcrf_pcm_vol_size }
-      volume_type: { get_param: pcrf_pcm_volume_silver }
-      name: { get_param: pcrf_pcm_vol_name_1 }
-
-outputs:
-  pcrf_pcm_volume_id_1:
-    description: the pcrf_pcm_volume_id
-    value: { get_resource: pcrf_pcm_volume_1 }
\ No newline at end of file
diff --git a/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/simpleNotif-V3/artifacts/hot-nimbus-pcm_v1.0.env b/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/simpleNotif-V3/artifacts/hot-nimbus-pcm_v1.0.env
deleted file mode 100644
index b23014d..0000000
--- a/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/simpleNotif-V3/artifacts/hot-nimbus-pcm_v1.0.env
+++ /dev/null
@@ -1,16 +0,0 @@
-parameters:
-  pcrf_pcm_server_names: ZRDM1PCRF01PCM001
-  pcrf_pcm_image_name: PCRF_8.995-ATTM1.0.3.qcow2
-  pcrf_pcm_flavor_name: lc.2xlarge4
-  availabilityzone_name: nova
-  pcrf_cps_net_name: Mobisupport-25193-I-INT1_int_pcrf_net_0
-  pcrf_cps_net_ips: 172.26.16.113
-  pcrf_cps_net_mask: 255.255.255.0
-  pcrf_oam_net_name: MNS-25180-L-01_oam_protected_net_0
-  pcrf_oam_net_ips: 107.239.64.121
-  pcrf_oam_net_gw: 107.239.64.1
-  pcrf_oam_net_mask: 255.255.248.0
-  pcrf_pcm_volume_id_1: 3438a3fe-1241-4390-80f2-d0b86238c40e
-  pcrf_security_group_name: nimbus_security_group
-  pcrf_vnf_id: 730797234b4a40aa99335157b02871cd
-
diff --git a/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/simpleNotif-V3/artifacts/hot-nimbus-pcm_v1.0.yaml b/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/simpleNotif-V3/artifacts/hot-nimbus-pcm_v1.0.yaml
deleted file mode 100644
index defb373..0000000
--- a/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/simpleNotif-V3/artifacts/hot-nimbus-pcm_v1.0.yaml
+++ /dev/null
@@ -1,80 +0,0 @@
-heat_template_version: 2013-05-23
-
-description: heat template that creates PCRF Cluman stack
-
-parameters:
-  pcrf_pcm_server_names:
-    type: comma_delimited_list
-    label: PCRF CM server names
-    description: name of the PCRF CM instance
-  pcrf_pcm_image_name:
-    type: string
-    label: PCRF CM image name
-    description: PCRF CM image name
-  pcrf_pcm_flavor_name:
-    type: string
-    label: PCRF CM flavor name
-    description: flavor name of PCRF CM instance
-  availabilityzone_name:
-    type: string
-    label: availabilityzone name
-    description: availabilityzone name
-  pcrf_cps_net_name:
-    type: string
-    label: CPS network name
-    description: CPS network name
-  pcrf_cps_net_ips:
-    type: comma_delimited_list
-    label: CPS network ips
-    description: CPS network ips
-  pcrf_cps_net_mask:
-    type: string
-    label: CPS network mask
-    description: CPS network mask
-  pcrf_oam_net_name:
-    type: string
-    label: OAM network name
-    description: OAM network name
-  pcrf_oam_net_ips:
-    type: comma_delimited_list
-    label: OAM network ips
-    description: OAM network ips
-  pcrf_oam_net_gw:
-    type: string
-    label: CPS network gateway
-    description: CPS network gateway
-  pcrf_oam_net_mask:
-    type: string
-    label: CPS network mask
-    description: CPS network mask
-  pcrf_pcm_volume_id_1:
-    type: string
-    label: CPS Cluman Cinder Volume
-    description: CPS Cluman Cinder Volume
-  pcrf_security_group_name:
-    type: string
-    label: security group name
-    description: the name of security group
-  pcrf_vnf_id:
-    type: string
-    label: PCRF VNF Id
-    description: PCRF VNF Id
-
-resources:
-  server_pcrf_pcm_001:
-    type: nested-pcm_v1.0.yaml
-    properties:
-      pcrf_pcm_server_name: { get_param: [pcrf_pcm_server_names, 0] }
-      pcrf_pcm_image_name: { get_param: pcrf_pcm_image_name }
-      pcrf_pcm_flavor_name: { get_param: pcrf_pcm_flavor_name }
-      availabilityzone_name: { get_param: availabilityzone_name }
-      pcrf_security_group_name: { get_param: pcrf_security_group_name }
-      pcrf_pcm_volume_id: { get_param: pcrf_pcm_volume_id_1 }
-      pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
-      pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 0] }
-      pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
-      pcrf_oam_net_name: { get_param: pcrf_oam_net_name }
-      pcrf_oam_net_ip: { get_param: [pcrf_oam_net_ips, 0] }
-      pcrf_oam_net_mask: { get_param: pcrf_oam_net_mask }
-      pcrf_oam_net_gw: { get_param: pcrf_oam_net_gw }
-      pcrf_vnf_id: {get_param: pcrf_vnf_id}
diff --git a/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/simpleNotif-V3/artifacts/hot-nimbus-ppd_v1.0.yaml b/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/simpleNotif-V3/artifacts/hot-nimbus-ppd_v1.0.yaml
deleted file mode 100644
index 8631592..0000000
--- a/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/simpleNotif-V3/artifacts/hot-nimbus-ppd_v1.0.yaml
+++ /dev/null
@@ -1,286 +0,0 @@
-heat_template_version: 2013-05-23
-
-description: heat template that creates PCRF Policy Director stack
-
-parameters:
-  pcrf_ppd_server_names:
-    type: comma_delimited_list
-    label: PCRF PD server names
-    description: name of the PCRF PD instance
-  pcrf_ppd_image_name:
-    type: string
-    label: PCRF PD image name
-    description: PCRF PD image name
-  pcrf_ppd_flavor_name:
-    type: string
-    label: PCRF PD flavor name
-    description: flavor name of PCRF PD instance
-  availabilityzone_name:
-    type: string
-    label: availabilityzone name
-    description: availabilityzone name
-  pcrf_cps_net_name:
-    type: string
-    label: CPS network name
-    description: CPS network name
-  pcrf_cps_net_ips:
-    type: comma_delimited_list
-    label: CPS network ips
-    description: CPS network ips
-  pcrf_cps_net_mask:
-    type: string
-    label: CPS network mask
-    description: CPS network mask
-  pcrf_lb_internal_vip:
-    type: string
-    label: CPS Internal LB VIP
-    description: CPS Internal LB VIP
-  pcrf_oam_net_name:
-    type: string
-    label: OAM network name
-    description: OAM network name
-  pcrf_oam_net_ips:
-    type: comma_delimited_list
-    label: OAM network ips
-    description: OAM network ips
-  pcrf_oam_net_gw:
-    type: string
-    label: CPS network gateway
-    description: CPS network gateway
-  pcrf_oam_net_mask:
-    type: string
-    label: CPS network mask
-    description: CPS network mask
-  pcrf_lb_management_vip:
-    type: string
-    label: CPS OAM LB VIP
-    description: CPS OAM LB VIP
-  pcrf_gx_net_name:
-    type: string
-    label: Gx network name
-    description: Gx network name
-  pcrf_gx_net_ips:
-    type: comma_delimited_list
-    label: Gx network ips
-    description: Gx network ips
-  pcrf_gx_net_mask:
-    type: string
-    label: Gx network mask
-    description: Gx network mask
-  pcrf_sp_net_name:
-    type: string
-    label: Sp network name
-    description: Sp network name
-  pcrf_sp_net_ips:
-    type: comma_delimited_list
-    label: Sp network ips
-    description: Sp network ips
-  pcrf_sp_net_mask:
-    type: string
-    label: Sp network mask
-    description: Sp network mask
-  pcrf_sy_net_name:
-    type: string
-    label: Sy network name
-    description: Sy network name
-  pcrf_sy_net_ips:
-    type: comma_delimited_list
-    label: Sy network ips
-    description: Sy network ips
-  pcrf_sy_net_mask:
-    type: string
-    label: Sy network mask
-    description: Sy network mask
-  pcrf_rx_net_name:
-    type: string
-    label: Rx network name
-    description: Rx network name
-  pcrf_rx_net_ips:
-    type: comma_delimited_list
-    label: Rx network ips
-    description: Rx network ips
-  pcrf_rx_net_mask:
-    type: string
-    label: Rx network mask
-    description: Rx network mask
-  pcrf_sd_net_name:
-    type: string
-    label: Sd network name
-    description: Sd network name
-  pcrf_sd_net_ips:
-    type: comma_delimited_list
-    label: Sd network ips
-    description: Sd network ips
-  pcrf_sd_net_mask:
-    type: string
-    label: Sd network mask
-    description: Sd network mask
-  pcrf_sgi_sy_net_name:
-    type: string
-    label: Sgi Sy network name
-    description: Sgi Sy network name
-  pcrf_sgi_sy_net_ips:
-    type: comma_delimited_list
-    label: Sgi Sy network ips
-    description: Sgi Sy network ips
-  pcrf_sgi_sy_net_mask:
-    type: string
-    label: Sgi Sy network mask
-    description: Sgi Sy network mask
-  pcrf_security_group_name:
-    type: string
-    label: security group name
-    description: the name of security group
-  pcrf_vnf_id:
-    type: string
-    label: PCRF VNF Id
-    description: PCRF VNF Id
-
-resources:
-  server_pcrf_ppd_001:
-    type: nested-ppd_v1.0.yaml
-    properties:
-      pcrf_ppd_server_name: { get_param: [pcrf_ppd_server_names, 0] }
-      pcrf_ppd_image_name: { get_param: pcrf_ppd_image_name }
-      pcrf_ppd_flavor_name: { get_param: pcrf_ppd_flavor_name }
-      availabilityzone_name: { get_param: availabilityzone_name }
-      pcrf_security_group_name: { get_param: pcrf_security_group_name }
-      pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
-      pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 0] }
-      pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
-      pcrf_lb_internal_vip: { get_param: pcrf_lb_internal_vip }
-      pcrf_oam_net_name: { get_param: pcrf_oam_net_name }
-      pcrf_oam_net_ip: { get_param: [pcrf_oam_net_ips, 0] }
-      pcrf_oam_net_mask: { get_param: pcrf_oam_net_mask }
-      pcrf_oam_net_gw: { get_param: pcrf_oam_net_gw }
-      pcrf_lb_management_vip: { get_param: pcrf_lb_management_vip }
-      pcrf_gx_net_name: { get_param: pcrf_gx_net_name }
-      pcrf_gx_net_ip: { get_param: [pcrf_gx_net_ips, 0] }
-      pcrf_gx_net_mask: { get_param: pcrf_gx_net_mask }
-      pcrf_sp_net_name: { get_param: pcrf_sp_net_name }
-      pcrf_sp_net_ip: { get_param: [pcrf_sp_net_ips, 0] }
-      pcrf_sp_net_mask: { get_param: pcrf_sp_net_mask }
-      pcrf_sy_net_name: { get_param: pcrf_sy_net_name }
-      pcrf_sy_net_ip: { get_param: [pcrf_sy_net_ips, 0] }
-      pcrf_sy_net_mask: { get_param: pcrf_sy_net_mask }
-      pcrf_rx_net_name: { get_param: pcrf_rx_net_name }
-      pcrf_rx_net_ip: { get_param: [pcrf_rx_net_ips, 0] }
-      pcrf_rx_net_mask: { get_param: pcrf_rx_net_mask }
-      pcrf_sd_net_name: { get_param: pcrf_sd_net_name }
-      pcrf_sd_net_ip: { get_param: [pcrf_sd_net_ips, 0] }
-      pcrf_sd_net_mask: { get_param: pcrf_sd_net_mask }
-      pcrf_sgi_sy_net_name: { get_param: pcrf_sgi_sy_net_name }
-      pcrf_sgi_sy_net_ip: { get_param: [pcrf_sgi_sy_net_ips, 0] }
-      pcrf_sgi_sy_net_mask: { get_param: pcrf_sgi_sy_net_mask }
-      pcrf_vnf_id: {get_param: pcrf_vnf_id}
-
-  server_pcrf_ppd_002:
-    type: nested-ppd_v1.0.yaml
-    properties:
-      pcrf_ppd_server_name: { get_param: [pcrf_ppd_server_names, 1] }
-      pcrf_ppd_image_name: { get_param: pcrf_ppd_image_name }
-      pcrf_ppd_flavor_name: { get_param: pcrf_ppd_flavor_name }
-      availabilityzone_name: { get_param: availabilityzone_name }
-      pcrf_security_group_name: { get_param: pcrf_security_group_name }
-      pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
-      pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 1] }
-      pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
-      pcrf_lb_internal_vip: { get_param: pcrf_lb_internal_vip }
-      pcrf_oam_net_name: { get_param: pcrf_oam_net_name }
-      pcrf_oam_net_ip: { get_param: [pcrf_oam_net_ips, 1] }
-      pcrf_oam_net_mask: { get_param: pcrf_oam_net_mask }
-      pcrf_oam_net_gw: { get_param: pcrf_oam_net_gw }
-      pcrf_lb_management_vip: { get_param: pcrf_lb_management_vip }
-      pcrf_gx_net_name: { get_param: pcrf_gx_net_name }
-      pcrf_gx_net_ip: { get_param: [pcrf_gx_net_ips, 1] }
-      pcrf_gx_net_mask: { get_param: pcrf_gx_net_mask }
-      pcrf_sp_net_name: { get_param: pcrf_sp_net_name }
-      pcrf_sp_net_ip: { get_param: [pcrf_sp_net_ips, 1] }
-      pcrf_sp_net_mask: { get_param: pcrf_sp_net_mask }
-      pcrf_sy_net_name: { get_param: pcrf_sy_net_name }
-      pcrf_sy_net_ip: { get_param: [pcrf_sy_net_ips, 1] }
-      pcrf_sy_net_mask: { get_param: pcrf_sy_net_mask }
-      pcrf_rx_net_name: { get_param: pcrf_rx_net_name }
-      pcrf_rx_net_ip: { get_param: [pcrf_rx_net_ips, 1] }
-      pcrf_rx_net_mask: { get_param: pcrf_rx_net_mask }
-      pcrf_sd_net_name: { get_param: pcrf_sd_net_name }
-      pcrf_sd_net_ip: { get_param: [pcrf_sd_net_ips, 1] }
-      pcrf_sd_net_mask: { get_param: pcrf_sd_net_mask }
-      pcrf_sgi_sy_net_name: { get_param: pcrf_sgi_sy_net_name }
-      pcrf_sgi_sy_net_ip: { get_param: [pcrf_sgi_sy_net_ips, 1] }
-      pcrf_sgi_sy_net_mask: { get_param: pcrf_sgi_sy_net_mask }
-      pcrf_vnf_id: {get_param: pcrf_vnf_id}
-
-  server_pcrf_ppd_003:
-    type: nested-ppd_v1.0.yaml
-    properties:
-      pcrf_ppd_server_name: { get_param: [pcrf_ppd_server_names, 2] }
-      pcrf_ppd_image_name: { get_param: pcrf_ppd_image_name }
-      pcrf_ppd_flavor_name: { get_param: pcrf_ppd_flavor_name }
-      availabilityzone_name: { get_param: availabilityzone_name }
-      pcrf_security_group_name: { get_param: pcrf_security_group_name }
-      pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
-      pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 2] }
-      pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
-      pcrf_lb_internal_vip: { get_param: pcrf_lb_internal_vip }
-      pcrf_oam_net_name: { get_param: pcrf_oam_net_name }
-      pcrf_oam_net_ip: { get_param: [pcrf_oam_net_ips, 2] }
-      pcrf_oam_net_mask: { get_param: pcrf_oam_net_mask }
-      pcrf_oam_net_gw: { get_param: pcrf_oam_net_gw }
-      pcrf_lb_management_vip: { get_param: pcrf_lb_management_vip }
-      pcrf_gx_net_name: { get_param: pcrf_gx_net_name }
-      pcrf_gx_net_ip: { get_param: [pcrf_gx_net_ips, 2] }
-      pcrf_gx_net_mask: { get_param: pcrf_gx_net_mask }
-      pcrf_sp_net_name: { get_param: pcrf_sp_net_name }
-      pcrf_sp_net_ip: { get_param: [pcrf_sp_net_ips, 2] }
-      pcrf_sp_net_mask: { get_param: pcrf_sp_net_mask }
-      pcrf_sy_net_name: { get_param: pcrf_sy_net_name }
-      pcrf_sy_net_ip: { get_param: [pcrf_sy_net_ips, 2] }
-      pcrf_sy_net_mask: { get_param: pcrf_sy_net_mask }
-      pcrf_rx_net_name: { get_param: pcrf_rx_net_name }
-      pcrf_rx_net_ip: { get_param: [pcrf_rx_net_ips, 2] }
-      pcrf_rx_net_mask: { get_param: pcrf_rx_net_mask }
-      pcrf_sd_net_name: { get_param: pcrf_sd_net_name }
-      pcrf_sd_net_ip: { get_param: [pcrf_sd_net_ips, 2] }
-      pcrf_sd_net_mask: { get_param: pcrf_sd_net_mask }
-      pcrf_sgi_sy_net_name: { get_param: pcrf_sgi_sy_net_name }
-      pcrf_sgi_sy_net_ip: { get_param: [pcrf_sgi_sy_net_ips, 2] }
-      pcrf_sgi_sy_net_mask: { get_param: pcrf_sgi_sy_net_mask }
-      pcrf_vnf_id: {get_param: pcrf_vnf_id}
-
-  server_pcrf_ppd_004:
-    type: nested-ppd_v1.0.yaml
-    properties:
-      pcrf_ppd_server_name: { get_param: [pcrf_ppd_server_names, 3] }
-      pcrf_ppd_image_name: { get_param: pcrf_ppd_image_name }
-      pcrf_ppd_flavor_name: { get_param: pcrf_ppd_flavor_name }
-      availabilityzone_name: { get_param: availabilityzone_name }
-      pcrf_security_group_name: { get_param: pcrf_security_group_name }
-      pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
-      pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 3] }
-      pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
-      pcrf_lb_internal_vip: { get_param: pcrf_lb_internal_vip }
-      pcrf_oam_net_name: { get_param: pcrf_oam_net_name }
-      pcrf_oam_net_ip: { get_param: [pcrf_oam_net_ips, 3] }
-      pcrf_oam_net_mask: { get_param: pcrf_oam_net_mask }
-      pcrf_oam_net_gw: { get_param: pcrf_oam_net_gw }
-      pcrf_lb_management_vip: { get_param: pcrf_lb_management_vip }
-      pcrf_gx_net_name: { get_param: pcrf_gx_net_name }
-      pcrf_gx_net_ip: { get_param: [pcrf_gx_net_ips, 3] }
-      pcrf_gx_net_mask: { get_param: pcrf_gx_net_mask }
-      pcrf_sp_net_name: { get_param: pcrf_sp_net_name }
-      pcrf_sp_net_ip: { get_param: [pcrf_sp_net_ips, 3] }
-      pcrf_sp_net_mask: { get_param: pcrf_sp_net_mask }
-      pcrf_sy_net_name: { get_param: pcrf_sy_net_name }
-      pcrf_sy_net_ip: { get_param: [pcrf_sy_net_ips, 3] }
-      pcrf_sy_net_mask: { get_param: pcrf_sy_net_mask }
-      pcrf_rx_net_name: { get_param: pcrf_rx_net_name }
-      pcrf_rx_net_ip: { get_param: [pcrf_rx_net_ips, 3] }
-      pcrf_rx_net_mask: { get_param: pcrf_rx_net_mask }
-      pcrf_sd_net_name: { get_param: pcrf_sd_net_name }
-      pcrf_sd_net_ip: { get_param: [pcrf_sd_net_ips, 3] }
-      pcrf_sd_net_mask: { get_param: pcrf_sd_net_mask }
-      pcrf_sgi_sy_net_name: { get_param: pcrf_sgi_sy_net_name }
-      pcrf_sgi_sy_net_ip: { get_param: [pcrf_sgi_sy_net_ips, 3] }
-      pcrf_sgi_sy_net_mask: { get_param: pcrf_sgi_sy_net_mask }
-      pcrf_vnf_id: {get_param: pcrf_vnf_id}
diff --git a/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/simpleNotif-V3/artifacts/hot-nimbus-ppd_v1.1.env b/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/simpleNotif-V3/artifacts/hot-nimbus-ppd_v1.1.env
deleted file mode 100644
index 10697bc..0000000
--- a/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/simpleNotif-V3/artifacts/hot-nimbus-ppd_v1.1.env
+++ /dev/null
@@ -1,35 +0,0 @@
-parameters:
-  pcrf_ppd_server_names: ZRDM1PCRF01PPD001,ZRDM1PCRF01PPD002,ZRDM1PCRF01PPD003,ZRDM1PCRF01PPD004
-  pcrf_ppd_image_name: PCRF_8.995-ATTM1.0.3.qcow2
-  pcrf_ppd_flavor_name: lc.4xlarge4
-  availabilityzone_name: nova
-  pcrf_cps_net_name: Mobisupport-25193-I-INT1_int_pcrf_net_0
-  pcrf_cps_net_ips: 172.26.16.3,172.26.16.4,172.26.16.5,172.26.16.6
-  pcrf_lb_internal_vip: 172.26.16.114
-  pcrf_cps_net_mask: 255.255.255.0
-  pcrf_oam_net_name: MNS-25180-L-01_oam_protected_net_0
-  pcrf_oam_net_ips: 107.239.64.113,107.239.64.114,107.239.64.115,107.239.64.116
-  pcrf_lb_management_vip: 107.239.64.123
-  pcrf_oam_net_gw: 107.239.64.1
-  pcrf_oam_net_mask: 255.255.248.0
-  pcrf_gx_net_name: Mobisupport-25193-I-INT1_cor_pcrf_gx_net_0
-  pcrf_gx_net_ips: 107.239.24.67,107.239.24.68,107.239.24.69,107.239.24.70
-  pcrf_gx_net_mask: 255.255.255.248
-  pcrf_sp_net_name: Mobisupport-25193-I-INT1_cor_pcrf_sp_net_0
-  pcrf_sp_net_ips: 107.239.24.75,107.239.24.76,107.239.24.77,107.239.24.78
-  pcrf_sp_net_mask: 255.255.255.248
-  pcrf_sy_net_name: Mobisupport-25193-I-INT1_cor_pcrf_sy_net_0
-  pcrf_sy_net_ips: 107.239.24.83,107.239.24.84,107.239.24.85,107.239.24.86
-  pcrf_sy_net_mask: 255.255.255.248
-  pcrf_rx_net_name: Mobisupport-25193-I-INT1_cor_pcrf_rx_net_0
-  pcrf_rx_net_ips: 107.239.24.91,107.239.24.92,107.239.24.93,107.239.24.94
-  pcrf_rx_net_mask: 255.255.255.248
-  pcrf_sd_net_name: Mobisupport-25193-I-INT1_cor_pcrf_sd_net_0
-  pcrf_sd_net_ips: 107.239.24.99,107.239.24.100,107.239.24.101,107.239.24.102
-  pcrf_sd_net_mask: 255.255.255.248
-  pcrf_sgi_sy_net_name: Mobisupport-25193-I-INT1_sgi_pcrf_sy_net_0
-  pcrf_sgi_sy_net_ips: 107.239.26.131,107.239.26.132,107.239.26.133,107.239.26.134
-  pcrf_sgi_sy_net_mask: 255.255.255.248
-  pcrf_security_group_name: nimbus_security_group
-  pcrf_vnf_id: 730797234b4a40aa99335157b02871cd
-
diff --git a/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/simpleNotif-V3/artifacts/hot-nimbus-pps_v1.0.env b/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/simpleNotif-V3/artifacts/hot-nimbus-pps_v1.0.env
deleted file mode 100644
index 18c064c..0000000
--- a/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/simpleNotif-V3/artifacts/hot-nimbus-pps_v1.0.env
+++ /dev/null
@@ -1,11 +0,0 @@
-parameters:
-  pcrf_pps_server_names: ZRDM1PCRF01PPS001,ZRDM1PCRF01PPS002,ZRDM1PCRF01PPS003,ZRDM1PCRF01PPS004,ZRDM1PCRF01PPS005,ZRDM1PCRF01PPS006
-  pcrf_pps_image_name: PCRF_8.995-ATTM1.0.3.qcow2
-  pcrf_pps_flavor_name: lc.3xlarge
-  availabilityzone_name: nova
-  pcrf_cps_net_name: Mobisupport-25193-I-INT1_int_pcrf_net_0
-  pcrf_cps_net_ips: 172.26.16.7,172.26.16.8,172.26.16.9,172.26.16.10,172.26.16.11,172.26.16.12
-  pcrf_cps_net_mask: 255.255.255.0
-  pcrf_security_group_name: nimbus_security_group
-  pcrf_vnf_id: 730797234b4a40aa99335157b02871cd
-
diff --git a/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/simpleNotif-V3/artifacts/hot-nimbus-pps_v1.0.yaml b/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/simpleNotif-V3/artifacts/hot-nimbus-pps_v1.0.yaml
deleted file mode 100644
index 0fadd00..0000000
--- a/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/simpleNotif-V3/artifacts/hot-nimbus-pps_v1.0.yaml
+++ /dev/null
@@ -1,121 +0,0 @@
-heat_template_version: 2013-05-23
-
-description: heat template that creates PCRF Policy Server stack
-
-parameters:
-  pcrf_pps_server_names:
-    type: comma_delimited_list
-    label: PCRF PS server names
-    description: PCRF PS server names
-  pcrf_pps_image_name:
-    type: string
-    label: PCRF PS image name
-    description: PCRF PS image name
-  pcrf_pps_flavor_name:
-    type: string
-    label: PCRF PS flavor name
-    description: flavor name of PCRF PS instance
-  availabilityzone_name:
-    type: string
-    label: availabilityzone name
-    description: availabilityzone name
-  pcrf_cps_net_name:
-    type: string
-    label: CPS network name
-    description: CPS network name
-  pcrf_cps_net_ips:
-    type: comma_delimited_list
-    label: CPS network ips
-    description: CPS network ips
-  pcrf_cps_net_mask:
-    type: string
-    label: CPS network mask
-    description: CPS network mask
-  pcrf_security_group_name:
-    type: string
-    label: security group name
-    description: the name of security group
-  pcrf_vnf_id:
-    type: string
-    label: PCRF VNF Id
-    description: PCRF VNF Id
-
-resources:
-  server_pcrf_pps_001:
-    type: nested-pps_v1.0.yaml
-    properties:
-      pcrf_pps_server_name: { get_param: [pcrf_pps_server_names, 0] }
-      pcrf_pps_image_name: { get_param: pcrf_pps_image_name }
-      pcrf_pps_flavor_name: { get_param: pcrf_pps_flavor_name }
-      availabilityzone_name: { get_param: availabilityzone_name }
-      pcrf_security_group_name: { get_param: pcrf_security_group_name }
-      pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
-      pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 0] }
-      pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
-      pcrf_vnf_id: {get_param: pcrf_vnf_id}
-
-  server_pcrf_pps_002:
-    type: nested-pps_v1.0.yaml
-    properties:
-      pcrf_pps_server_name: { get_param: [pcrf_pps_server_names, 1] }
-      pcrf_pps_image_name: { get_param: pcrf_pps_image_name }
-      pcrf_pps_flavor_name: { get_param: pcrf_pps_flavor_name }
-      availabilityzone_name: { get_param: availabilityzone_name }
-      pcrf_security_group_name: { get_param: pcrf_security_group_name }
-      pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
-      pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 1] }
-      pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
-      pcrf_vnf_id: {get_param: pcrf_vnf_id}
-
-  server_pcrf_pps_003:
-    type: nested-pps_v1.0.yaml
-    properties:
-      pcrf_pps_server_name: { get_param: [pcrf_pps_server_names, 2] }
-      pcrf_pps_image_name: { get_param: pcrf_pps_image_name }
-      pcrf_pps_flavor_name: { get_param: pcrf_pps_flavor_name }
-      availabilityzone_name: { get_param: availabilityzone_name }
-      pcrf_security_group_name: { get_param: pcrf_security_group_name }
-      pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
-      pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 2] }
-      pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
-      pcrf_vnf_id: {get_param: pcrf_vnf_id}
-
-  server_pcrf_pps_004:
-    type: nested-pps_v1.0.yaml
-    properties:
-      pcrf_pps_server_name: { get_param: [pcrf_pps_server_names, 3] }
-      pcrf_pps_image_name: { get_param: pcrf_pps_image_name }
-      pcrf_pps_flavor_name: { get_param: pcrf_pps_flavor_name }
-      availabilityzone_name: { get_param: availabilityzone_name }
-      pcrf_security_group_name: { get_param: pcrf_security_group_name }
-      pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
-      pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 3] }
-      pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
-      pcrf_vnf_id: {get_param: pcrf_vnf_id}
-
-  server_pcrf_pps_005:
-    type: nested-pps_v1.0.yaml
-    properties:
-      pcrf_pps_server_name: { get_param: [pcrf_pps_server_names, 4] }
-      pcrf_pps_image_name: { get_param: pcrf_pps_image_name }
-      pcrf_pps_flavor_name: { get_param: pcrf_pps_flavor_name }
-      availabilityzone_name: { get_param: availabilityzone_name }
-      pcrf_security_group_name: { get_param: pcrf_security_group_name }
-      pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
-      pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 4] }
-      pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
-      pcrf_vnf_id: {get_param: pcrf_vnf_id}
-
-  server_pcrf_pps_006:
-    type: nested-pps_v1.0.yaml
-    properties:
-      pcrf_pps_server_name: { get_param: [pcrf_pps_server_names, 5] }
-      pcrf_pps_image_name: { get_param: pcrf_pps_image_name }
-      pcrf_pps_flavor_name: { get_param: pcrf_pps_flavor_name }
-      availabilityzone_name: { get_param: availabilityzone_name }
-      pcrf_security_group_name: { get_param: pcrf_security_group_name }
-      pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
-      pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 5] }
-      pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
-      pcrf_vnf_id: {get_param: pcrf_vnf_id}
-
diff --git a/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/simpleNotif-V3/artifacts/hot-nimbus-psm_v1.0.env b/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/simpleNotif-V3/artifacts/hot-nimbus-psm_v1.0.env
deleted file mode 100644
index 95e450e..0000000
--- a/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/simpleNotif-V3/artifacts/hot-nimbus-psm_v1.0.env
+++ /dev/null
@@ -1,10 +0,0 @@
-parameters:
-  pcrf_psm_server_names: ZRDM1PCRF01PSM001,ZRDM1PCRF01PSM002,ZRDM1PCRF01PSM003,ZRDM1PCRF01PSM004,ZRDM1PCRF01PSM005,ZRDM1PCRF01PSM006,ZRDM1PCRF01PSM007,ZRDM1PCRF01PSM008,ZRDM1PCRF01PSM009,ZRDM1PCRF01PSM010,ZRDM1PCRF01PSM011,ZRDM1PCRF01PSM012
-  pcrf_psm_image_name: PCRF_8.995-ATTM1.0.3.qcow2
-  pcrf_psm_flavor_name: lc.4xlarge4
-  availabilityzone_name: nova
-  pcrf_cps_net_name: Mobisupport-25193-I-INT1_int_pcrf_net_0
-  pcrf_cps_net_ips: 172.26.16.63,172.26.16.64,172.26.16.65,172.26.16.66,172.26.16.67,172.26.16.68,172.26.16.69,172.26.16.70,172.26.16.71,172.26.16.72,172.26.16.73,172.26.16.74
-  pcrf_cps_net_mask: 255.255.255.0
-  pcrf_security_group_name: nimbus_security_group
-  pcrf_vnf_id: 730797234b4a40aa99335157b02871cd
diff --git a/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/simpleNotif-V3/artifacts/hot-nimbus-psm_v1.0.yaml b/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/simpleNotif-V3/artifacts/hot-nimbus-psm_v1.0.yaml
deleted file mode 100644
index 217b0fe..0000000
--- a/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/simpleNotif-V3/artifacts/hot-nimbus-psm_v1.0.yaml
+++ /dev/null
@@ -1,199 +0,0 @@
-heat_template_version: 2013-05-23
-
-description: heat template that creates PCRF Session Manager stack
-
-parameters:
-  pcrf_psm_server_names:
-    type: comma_delimited_list
-    label: PCRF SM server names
-    description: name of the PCRF SM instance
-  pcrf_psm_image_name:
-    type: string
-    label: PCRF SM image name
-    description: PCRF SM image name
-  pcrf_psm_flavor_name:
-    type: string
-    label: PCRF SM flavor name
-    description: flavor name of PCRF SM instance 
-  availabilityzone_name:
-    type: string
-    label: availabilityzone name
-    description: availabilityzone name
-  pcrf_cps_net_name:
-    type: string
-    label: CPS network name
-    description: CPS network name
-  pcrf_cps_net_ips:
-    type: comma_delimited_list
-    label: CPS network ips
-    description: CPS network ips
-  pcrf_cps_net_mask:
-    type: string
-    label: CPS network mask
-    description: CPS network mask
-  pcrf_security_group_name:
-    type: string
-    label: security group name
-    description: the name of security group
-  pcrf_vnf_id:
-    type: string
-    label: PCRF VNF Id
-    description: PCRF VNF Id
-
-resources:
-  server_pcrf_psm_001:
-    type: nested-psm_v1.0.yaml
-    properties:
-      pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 0] }
-      pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
-      pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
-      availabilityzone_name: { get_param: availabilityzone_name }
-      pcrf_security_group_name: { get_param: pcrf_security_group_name }
-      pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
-      pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 0] }
-      pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
-      pcrf_vnf_id: {get_param: pcrf_vnf_id}
-
-  server_pcrf_psm_002:
-    type: nested-psm_v1.0.yaml
-    properties:
-      pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 1] }
-      pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
-      pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
-      availabilityzone_name: { get_param: availabilityzone_name }
-      pcrf_security_group_name: { get_param: pcrf_security_group_name }
-      pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
-      pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 1] }
-      pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
-      pcrf_vnf_id: {get_param: pcrf_vnf_id}
-
-  server_pcrf_psm_003:
-    type: nested-psm_v1.0.yaml
-    properties:
-      pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 2] }
-      pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
-      pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
-      availabilityzone_name: { get_param: availabilityzone_name }
-      pcrf_security_group_name: { get_param: pcrf_security_group_name }
-      pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
-      pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 2] }
-      pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
-      pcrf_vnf_id: {get_param: pcrf_vnf_id}
-
-  server_pcrf_psm_004:
-    type: nested-psm_v1.0.yaml
-    properties:
-      pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 3] }
-      pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
-      pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
-      availabilityzone_name: { get_param: availabilityzone_name }
-      pcrf_security_group_name: { get_param: pcrf_security_group_name }
-      pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
-      pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 3] }
-      pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
-      pcrf_vnf_id: {get_param: pcrf_vnf_id}
-
-  server_pcrf_psm_005:
-    type: nested-psm_v1.0.yaml
-    properties:
-      pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 4] }
-      pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
-      pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
-      availabilityzone_name: { get_param: availabilityzone_name }
-      pcrf_security_group_name: { get_param: pcrf_security_group_name }
-      pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
-      pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 4] }
-      pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
-      pcrf_vnf_id: {get_param: pcrf_vnf_id}
-
-  server_pcrf_psm_006:
-    type: nested-psm_v1.0.yaml
-    properties:
-      pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 5] }
-      pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
-      pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
-      availabilityzone_name: { get_param: availabilityzone_name }
-      pcrf_security_group_name: { get_param: pcrf_security_group_name }
-      pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
-      pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 5] }
-      pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
-      pcrf_vnf_id: {get_param: pcrf_vnf_id}
-
-  server_pcrf_psm_007:
-    type: nested-psm_v1.0.yaml
-    properties:
-      pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 6] }
-      pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
-      pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
-      availabilityzone_name: { get_param: availabilityzone_name }
-      pcrf_security_group_name: { get_param: pcrf_security_group_name }
-      pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
-      pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 6] }
-      pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
-      pcrf_vnf_id: {get_param: pcrf_vnf_id}
-
-  server_pcrf_psm_008:
-    type: nested-psm_v1.0.yaml
-    properties:
-      pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 7] }
-      pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
-      pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
-      availabilityzone_name: { get_param: availabilityzone_name }
-      pcrf_security_group_name: { get_param: pcrf_security_group_name }
-      pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
-      pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 7] }
-      pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
-      pcrf_vnf_id: {get_param: pcrf_vnf_id}
-
-  server_pcrf_psm_009:
-    type: nested-psm_v1.0.yaml
-    properties:
-      pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 8] }
-      pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
-      pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
-      availabilityzone_name: { get_param: availabilityzone_name }
-      pcrf_security_group_name: { get_param: pcrf_security_group_name }
-      pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
-      pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 8] }
-      pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
-      pcrf_vnf_id: {get_param: pcrf_vnf_id}
-
-  server_pcrf_psm_010:
-    type: nested-psm_v1.0.yaml
-    properties:
-      pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 9] }
-      pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
-      pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
-      availabilityzone_name: { get_param: availabilityzone_name }
-      pcrf_security_group_name: { get_param: pcrf_security_group_name }
-      pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
-      pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 9] }
-      pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
-      pcrf_vnf_id: {get_param: pcrf_vnf_id}
-
-  server_pcrf_psm_011:
-    type: nested-psm_v1.0.yaml
-    properties:
-      pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 10] }
-      pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
-      pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
-      availabilityzone_name: { get_param: availabilityzone_name }
-      pcrf_security_group_name: { get_param: pcrf_security_group_name }
-      pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
-      pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 10] }
-      pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
-      pcrf_vnf_id: {get_param: pcrf_vnf_id}
-
-  server_pcrf_psm_012:
-    type: nested-psm_v1.0.yaml
-    properties:
-      pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 11] }
-      pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
-      pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
-      availabilityzone_name: { get_param: availabilityzone_name }
-      pcrf_security_group_name: { get_param: pcrf_security_group_name }
-      pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
-      pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 11] }
-      pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
-      pcrf_vnf_id: {get_param: pcrf_vnf_id}
- 
diff --git a/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/simpleNotif-V3/artifacts/hot-nimbus-swift-container_v1.0.env b/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/simpleNotif-V3/artifacts/hot-nimbus-swift-container_v1.0.env
deleted file mode 100644
index 5267ee4..0000000
--- a/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/simpleNotif-V3/artifacts/hot-nimbus-swift-container_v1.0.env
+++ /dev/null
@@ -1,3 +0,0 @@
-parameters:
-  pcrf_swift_container_name_1: PCRF_Config_Container_1
-  pcrf_swift_container_purge_on_delete_flag_1: false
diff --git a/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/simpleNotif-V3/artifacts/hot-nimbus-swift-container_v1.0.yaml b/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/simpleNotif-V3/artifacts/hot-nimbus-swift-container_v1.0.yaml
deleted file mode 100644
index ab427bb..0000000
--- a/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/simpleNotif-V3/artifacts/hot-nimbus-swift-container_v1.0.yaml
+++ /dev/null
@@ -1,30 +0,0 @@
-heat_template_version: 2013-05-23
-
-description: heat template that creates PCRF Session Manager stack
-
-parameters:
-   pcrf_swift_container_name_1:
-     type: string
-     label: Swift Container name
-     description: Swift Container Name
-   pcrf_swift_container_purge_on_delete_flag_1:
-     type: boolean
-     label: Purge on Delete Flag
-     description: Purge on Delete Flag
-
-resources:
-  pcrf_swift_container_1:
-    type: OS::Swift::Container
-    properties:
-      name: { get_param: pcrf_swift_container_name_1 }
-      PurgeOnDelete: { get_param: pcrf_swift_container_purge_on_delete_flag_1 }
-      X-Container-Read: ".r:*"
-     
-outputs:
-  pcrf_swift_container_id_1:
-    description: the pcrf_swift_container_1 id
-    value: { get_resource: pcrf_swift_container_1 }
-  pcrf_swift_container_url_1:
-    description: the pcrf_swift_container_1 url
-    value: { get_attr: [ pcrf_swift_container_1, WebsiteURL ] }
-    
\ No newline at end of file
diff --git a/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/simpleNotif-V3/artifacts/mount_iso_script.sh b/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/simpleNotif-V3/artifacts/mount_iso_script.sh
deleted file mode 100644
index 91df598..0000000
--- a/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/simpleNotif-V3/artifacts/mount_iso_script.sh
+++ /dev/null
@@ -1,34 +0,0 @@
-#!/bin/bash
-
-#. .config 
-#following would be in the .config file
- device_name="/dev/vde"
- install_script="install_nimbus.sh"
- enable_logic_flag_file=".flag"
-#end of config file
-
-#get the semaphore, 0 - disbaled, 1- enabled
-flag=$(cat ${enable_logic_flag_file})
-
-#check if device is mounted already
-test=$(mount | grep ${device_name})
-if [ "$flag" == "1" ]; then
-	if [ -e ${device_name} ] && [ ! "${test}" ]; then
-		#mount the iso image
-		mount -t iso9660 -v -o loop /dev/vde/ /mnt/iso
-		#if availabe run the install script (it contains the install.sh steps)
-		if [ -e "${install_script}" ] && [ -f "${install_script}" ]; then
-			${install_script}
-		fi
-		#disable the script from attempting to 
-		#  mount and run install again until needed;
-		echo "0" > ${enable_logic_flag_file}
-		#if nedeed add step to comment out the crontab line here;
-	fi
-else
-	echo "Auto mounting ISO & run install logic disabled!"
-fi
-
-#cron job
-# * * * * * /mount_iso_script.sh
-
diff --git a/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/simpleNotif-V3/artifacts/nested-oam_v1.0.yaml b/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/simpleNotif-V3/artifacts/nested-oam_v1.0.yaml
deleted file mode 100644
index fa3b04e..0000000
--- a/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/simpleNotif-V3/artifacts/nested-oam_v1.0.yaml
+++ /dev/null
@@ -1,156 +0,0 @@
-heat_template_version: 2013-05-23
-
-description: nested heat template that creates a PCRF OAM node stack
-
-parameters:
-  pcrf_oam_server_name:
-    type: string
-    label: PCRF OAM server name
-    description: PCRF OAM server name
-  pcrf_oam_image_name:
-    type: string
-    label: image name
-    description: PCRF OAM image name
-  pcrf_oam_flavor_name:
-    type: string
-    label: PCRF OAM flavor name
-    description: flavor name of PCRF OAM instance
-  availabilityzone_name:
-    type: string
-    label: availabilityzone name
-    description: availabilityzone name
-  pcrf_cps_net_name:
-    type: string
-    label: CPS network name
-    description: CPS network name
-  pcrf_cps_net_ip:
-    type: string
-    label: CPS network ip
-    description: CPS network ip
-  pcrf_cps_net_mask:
-    type: string
-    label: CPS network mask
-    description: CPS network mask
-  pcrf_arbiter_vip:
-    type: string
-    label: OAM Arbiter LB VIP
-    description: OAM Arbiter LB VIP
-  pcrf_oam_net_name:
-    type: string
-    label: OAM network name
-    description: OAM network name
-  pcrf_oam_net_ip:
-    type: string
-    label: OAM network ip
-    description: OAM network ip
-  pcrf_oam_net_gw:
-    type: string
-    label: CPS network gateway
-    description: CPS network gateway
-  pcrf_oam_net_mask:
-    type: string
-    label: CPS network mask
-    description: CPS network mask
-  pcrf_oam_volume_id:
-    type: string
-    label: CPS OAM Cinder Volume
-    description: CPS OAM Cinder Volume
-  pcrf_security_group_name:
-    type: string
-    label: security group name
-    description: the name of security group
-  pcrf_vnf_id:
-    type: string
-    label: PCRF VNF Id
-    description: PCRF VNF Id
-
-resources:
-  network:
-    type: OS::Heat::CloudConfig
-    properties:
-      cloud_config:
-        write_files:
-          - path: /etc/sysconfig/network-scripts/ifcfg-eth0
-            permissions: "0644"
-            content:
-              str_replace:
-                template: { get_file: nimbus-ethernet }
-                params:
-                  $dev: eth0
-                  $ip: { get_param: pcrf_cps_net_ip }
-                  $netmask: { get_param: pcrf_cps_net_mask }
-          - path: /etc/sysconfig/network-scripts/ifcfg-eth1
-            permissions: "0644"
-            content:
-              str_replace:
-                template: { get_file: nimbus-ethernet-gw }
-                params:
-                  $dev: eth1
-                  $ip: { get_param: pcrf_oam_net_ip }
-                  $netmask: { get_param: pcrf_oam_net_mask }
-                  $gateway: { get_param: pcrf_oam_net_gw }
-        runcmd:
-          - ifdown eth0 && ifup eth0
-          - ifdown eth1 && ifup eth1
-  script_init:
-    type: OS::Heat::SoftwareConfig
-    properties:
-      group: ungrouped
-      config:
-        str_replace:
-          template: { get_file: cloud-nimbus.sh }
-          params:
-            $vm_name: { get_param: pcrf_oam_server_name }
-  pcrf_server_init:
-    type: OS::Heat::MultipartMime
-    properties:
-      parts:
-      - config: { get_resource: network}
-      - config: { get_resource: script_init}
-
-  pcrf_server_oam:
-    type: OS::Nova::Server
-    properties:
-      config_drive: "True"
-      name: { get_param: pcrf_oam_server_name }
-      image: { get_param: pcrf_oam_image_name }
-      flavor: { get_param: pcrf_oam_flavor_name }
-      availability_zone: { get_param: availabilityzone_name }
-      networks:
-        - port: { get_resource: pcrf_oam_port_0}
-        - port: { get_resource: pcrf_oam_port_1}
-      user_data_format: RAW
-      user_data:
-        get_resource: pcrf_server_init
-      metadata:
-        vnf_id: {get_param: pcrf_vnf_id}
-  
-  pcrf_oam_port_0:
-    type: OS::Neutron::Port
-    properties:
-      network: { get_param: pcrf_cps_net_name }
-      fixed_ips:
-        - ip_address: { get_param: pcrf_cps_net_ip }
-      allowed_address_pairs:
-        - ip_address: { get_param: pcrf_arbiter_vip }
-      security_groups: [{ get_param: pcrf_security_group_name }]
-
-  pcrf_oam_port_1:
-    type: OS::Neutron::Port
-    properties:
-      network: { get_param: pcrf_oam_net_name }
-      fixed_ips:
-        - ip_address: { get_param: pcrf_oam_net_ip }
-      security_groups: [{ get_param: pcrf_security_group_name }]
-
-  pcrf_oam_vol_attachment:
-    type: OS::Cinder::VolumeAttachment
-    properties:
-      volume_id: { get_param: pcrf_oam_volume_id }
-      mountpoint: /dev/vdd
-      instance_uuid: { get_resource: pcrf_server_oam }
-
-outputs:
-  pcrf_oam_vol_attachment_id:
-    description: the pcrf_oam_vol_attachment_id id
-    value: { get_resource: pcrf_oam_vol_attachment }
diff --git a/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/simpleNotif-V3/artifacts/nested-pcm_v1.0.yaml b/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/simpleNotif-V3/artifacts/nested-pcm_v1.0.yaml
deleted file mode 100644
index a3129bb..0000000
--- a/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/simpleNotif-V3/artifacts/nested-pcm_v1.0.yaml
+++ /dev/null
@@ -1,150 +0,0 @@
-heat_template_version: 2013-05-23
-
-description: heat template that creates PCRF Cluman stack
-
-parameters:
-  pcrf_pcm_server_name:
-    type: string
-    label: PCRF CM server name
-    description: PCRF CM server name
-  pcrf_pcm_image_name:
-    type: string
-    label: image name
-    description: PCRF CM image name
-  pcrf_pcm_flavor_name:
-    type: string
-    label: PCRF CM flavor name
-    description: flavor name of PCRF CM instance
-  availabilityzone_name:
-    type: string
-    label: availabilityzone name
-    description: availabilityzone name
-  pcrf_cps_net_name:
-    type: string
-    label: CPS network name
-    description: CPS network name
-  pcrf_cps_net_ip:
-    type: string
-    label: CPS network ip
-    description: CPS network ip
-  pcrf_cps_net_mask:
-    type: string
-    label: CPS network mask
-    description: CPS network mask
-  pcrf_oam_net_name:
-    type: string
-    label: OAM network name
-    description: OAM network name
-  pcrf_oam_net_ip:
-    type: string
-    label: OAM network ip
-    description: OAM network ip
-  pcrf_oam_net_gw:
-    type: string
-    label: CPS network gateway
-    description: CPS network gateway
-  pcrf_oam_net_mask:
-    type: string
-    label: CPS network mask
-    description: CPS network mask
-  pcrf_pcm_volume_id:
-    type: string
-    label: CPS Cluman Cinder Volume
-    description: CPS Cluman Cinder Volume
-  pcrf_security_group_name:
-    type: string
-    label: security group name
-    description: the name of security group
-  pcrf_vnf_id:
-    type: string
-    label: PCRF VNF Id
-    description: PCRF VNF Id
-
-resources:
-  network:
-    type: OS::Heat::CloudConfig
-    properties:
-      cloud_config:
-        write_files:
-          - path: /etc/sysconfig/network-scripts/ifcfg-eth0
-            permissions: "0644"
-            content:
-              str_replace:
-                template: { get_file: nimbus-ethernet }
-                params:
-                  $dev: eth0
-                  $ip: { get_param: pcrf_cps_net_ip }
-                  $netmask: { get_param: pcrf_cps_net_mask }
-          - path: /etc/sysconfig/network-scripts/ifcfg-eth1
-            permissions: "0644"
-            content:
-              str_replace:
-                template: { get_file: nimbus-ethernet-gw }
-                params:
-                  $dev: eth1
-                  $ip: { get_param: pcrf_oam_net_ip }
-                  $netmask: { get_param: pcrf_oam_net_mask }
-                  $gateway: { get_param: pcrf_oam_net_gw }
-        runcmd:
-          - ifdown eth0 && ifup eth0
-          - ifdown eth1 && ifup eth1
-  script_init:
-    type: OS::Heat::SoftwareConfig
-    properties:
-      group: ungrouped
-      config:
-        str_replace:
-          template: { get_file: cloud-nimbus.sh }
-          params:
-            $vm_name: { get_param: pcrf_pcm_server_name }
-  pcrf_server_init:
-    type: OS::Heat::MultipartMime
-    properties:
-      parts:
-      - config: { get_resource: network}
-      - config: { get_resource: script_init}
-
-  pcrf_server_pcm:
-    type: OS::Nova::Server
-    properties:
-      config_drive: "True"
-      name: { get_param: pcrf_pcm_server_name }
-      image: { get_param: pcrf_pcm_image_name }
-      flavor: { get_param: pcrf_pcm_flavor_name }
-      availability_zone: { get_param: availabilityzone_name }
-      networks:
-        - port: { get_resource: pcrf_pcm_port_0}
-        - port: { get_resource: pcrf_pcm_port_1}
-      user_data_format: RAW
-      user_data:
-        get_resource: pcrf_server_init
-      metadata:
-        vnf_id: {get_param: pcrf_vnf_id}
-
-  pcrf_pcm_port_0:
-    type: OS::Neutron::Port
-    properties:
-      network: { get_param: pcrf_cps_net_name }
-      fixed_ips:
-        - ip_address: { get_param: pcrf_cps_net_ip }
-      security_groups: [{ get_param: pcrf_security_group_name }]
-
-  pcrf_pcm_port_1:
-    type: OS::Neutron::Port
-    properties:
-      network: { get_param: pcrf_oam_net_name }
-      fixed_ips:
-        - ip_address: { get_param: pcrf_oam_net_ip }
-      security_groups: [{ get_param: pcrf_security_group_name }]
-
-  volume_attachment:
-    type: OS::Cinder::VolumeAttachment
-    properties:
-      volume_id: { get_param: pcrf_pcm_volume_id }
-      mountpoint: /dev/vdd
-      instance_uuid: { get_resource: pcrf_server_pcm }
-
-outputs:
-  pcrf_server_pcm_id:
-    description: the pcm server id
-    value: { get_resource: pcrf_server_pcm }
\ No newline at end of file
diff --git a/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/simpleNotif-V3/artifacts/nested-ppd_v1.0.yaml b/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/simpleNotif-V3/artifacts/nested-ppd_v1.0.yaml
deleted file mode 100644
index 169522b..0000000
--- a/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/simpleNotif-V3/artifacts/nested-ppd_v1.0.yaml
+++ /dev/null
@@ -1,333 +0,0 @@
-heat_template_version: 2013-05-23
-
-description: heat template that creates PCRF Policy Director stack
-
-parameters:
-  pcrf_ppd_server_name:
-    type: string
-    label: PCRF PD server name
-    description: PCRF PD server name
-  pcrf_ppd_image_name:
-    type: string
-    label: image name
-    description: PCRF PD image name
-  pcrf_ppd_flavor_name:
-    type: string
-    label: PCRF PD flavor name
-    description: flavor name of PCRF PD instance
-  availabilityzone_name:
-    type: string
-    label: availabilityzone name
-    description: availabilityzone name
-  pcrf_cps_net_name:
-    type: string
-    label: CPS network name
-    description: CPS network name
-  pcrf_cps_net_ip:
-    type: string
-    label: CPS network ip
-    description: CPS network ip
-  pcrf_cps_net_mask:
-    type: string
-    label: CPS network mask
-    description: CPS network mask
-  pcrf_lb_internal_vip:
-    type: string
-    label: CPS Internal LB VIP
-    description: CPS Internal LB VIP
-  pcrf_oam_net_name:
-    type: string
-    label: OAM network name
-    description: OAM network name
-  pcrf_oam_net_ip:
-    type: string
-    label: OAM network ip
-    description: OAM network ip
-  pcrf_oam_net_gw:
-    type: string
-    label: CPS network gateway
-    description: CPS network gateway
-  pcrf_oam_net_mask:
-    type: string
-    label: CPS network mask
-    description: CPS network mask
-  pcrf_lb_management_vip:
-    type: string
-    label: CPS OAM LB VIP
-    description: CPS OAM LB VIP
-  pcrf_gx_net_name:
-    type: string
-    label: Gx network name
-    description: Gx network name
-  pcrf_gx_net_ip:
-    type: string
-    label: Gx network ip
-    description: Gx network ip
-  pcrf_gx_net_mask:
-    type: string
-    label: Gx network mask
-    description: Gx network mask
-  pcrf_sp_net_name:
-    type: string
-    label: Sp network name
-    description: Sp network name
-  pcrf_sp_net_ip:
-    type: string
-    label: Sp network ip
-    description: Sp network ip
-  pcrf_sp_net_mask:
-    type: string
-    label: Sp network mask
-    description: Sp network mask
-  pcrf_sy_net_name:
-    type: string
-    label: Sy network name
-    description: Sy network name
-  pcrf_sy_net_ip:
-    type: string
-    label: Sy network ip
-    description: Sy network ip
-  pcrf_sy_net_mask:
-    type: string
-    label: Sy network mask
-    description: Sy network mask
-  pcrf_rx_net_name:
-    type: string
-    label: Rx network name
-    description: Rx network name
-  pcrf_rx_net_ip:
-    type: string
-    label: Rx network ip
-    description: Rx network ip
-  pcrf_rx_net_mask:
-    type: string
-    label: Rx network mask
-    description: Rx network mask
-  pcrf_sd_net_name:
-    type: string
-    label: Sd network name
-    description: Sd network name
-  pcrf_sd_net_ip:
-    type: string
-    label: Sd network ip
-    description: Sd network ip
-  pcrf_sd_net_mask:
-    type: string
-    label: Sd network mask
-    description: Sd network mask
-  pcrf_sgi_sy_net_name:
-    type: string
-    label: Sgi Sy network name
-    description: Sgi Sy network name
-  pcrf_sgi_sy_net_ip:
-    type: string
-    label: Sgi Sy network ip
-    description: Sgi Sy network ip
-  pcrf_sgi_sy_net_mask:
-    type: string
-    label: Sgi Sy network mask
-    description: Sgi Sy network mask
-  pcrf_security_group_name:
-    type: string
-    label: security group name
-    description: the name of security group
-  pcrf_vnf_id:
-    type: string
-    label: PCRF VNF Id
-    description: PCRF VNF Id
-
-resources:
-  network:
-    type: OS::Heat::CloudConfig
-    properties:
-      cloud_config:
-        write_files:
-          - path: /etc/sysconfig/network-scripts/ifcfg-eth0
-            permissions: "0644"
-            content:
-              str_replace:
-                template: { get_file: nimbus-ethernet }
-                params:
-                  $dev: eth0
-                  $ip: { get_param: pcrf_cps_net_ip }
-                  $netmask: { get_param: pcrf_cps_net_mask }
-          - path: /etc/sysconfig/network-scripts/ifcfg-eth1
-            permissions: "0644"
-            content:
-              str_replace:
-                template: { get_file: nimbus-ethernet-gw }
-                params:
-                  $dev: eth1
-                  $ip: { get_param: pcrf_oam_net_ip }
-                  $netmask: { get_param: pcrf_oam_net_mask }
-                  $gateway: { get_param: pcrf_oam_net_gw }
-          - path: /etc/sysconfig/network-scripts/ifcfg-eth2
-            permissions: "0644"
-            content:
-              str_replace:
-                template: { get_file: nimbus-ethernet }
-                params:
-                  $dev: eth2
-                  $ip: { get_param: pcrf_gx_net_ip }
-                  $netmask: { get_param: pcrf_gx_net_mask }
-          - path: /etc/sysconfig/network-scripts/ifcfg-eth3
-            permissions: "0644"
-            content:
-              str_replace:
-                template: { get_file: nimbus-ethernet }
-                params:
-                  $dev: eth3
-                  $ip: { get_param: pcrf_sp_net_ip }
-                  $netmask: { get_param: pcrf_sp_net_mask }
-          - path: /etc/sysconfig/network-scripts/ifcfg-eth4
-            permissions: "0644"
-            content:
-              str_replace:
-                template: { get_file: nimbus-ethernet }
-                params:
-                  $dev: eth4
-                  $ip: { get_param: pcrf_sy_net_ip }
-                  $netmask: { get_param: pcrf_sy_net_mask }
-          - path: /etc/sysconfig/network-scripts/ifcfg-eth5
-            permissions: "0644"
-            content:
-              str_replace:
-                template: { get_file: nimbus-ethernet }
-                params:
-                  $dev: eth5
-                  $ip: { get_param: pcrf_rx_net_ip }
-                  $netmask: { get_param: pcrf_rx_net_mask }
-          - path: /etc/sysconfig/network-scripts/ifcfg-eth6
-            permissions: "0644"
-            content:
-              str_replace:
-                template: { get_file: nimbus-ethernet }
-                params:
-                  $dev: eth6
-                  $ip: { get_param: pcrf_sd_net_ip }
-                  $netmask: { get_param: pcrf_sd_net_mask }
-          - path: /etc/sysconfig/network-scripts/ifcfg-eth7
-            permissions: "0644"
-            content:
-              str_replace:
-                template: { get_file: nimbus-ethernet }
-                params:
-                  $dev: eth7
-                  $ip: { get_param: pcrf_sgi_sy_net_ip }
-                  $netmask: { get_param: pcrf_sgi_sy_net_mask }
-        runcmd:
-          - ifdown eth0 && ifup eth0
-          - ifdown eth1 && ifup eth1
-          - ifdown eth2 && ifup eth2
-          - ifdown eth3 && ifup eth3
-          - ifdown eth4 && ifup eth4
-          - ifdown eth5 && ifup eth5
-          - ifdown eth6 && ifup eth6
-          - ifdown eth7 && ifup eth7
-  script_init:
-    type: OS::Heat::SoftwareConfig
-    properties:
-      group: ungrouped
-      config:
-        str_replace:
-          template: { get_file: cloud-nimbus.sh }
-          params:
-            $vm_name: { get_param: pcrf_ppd_server_name }
-  pcrf_server_init:
-    type: OS::Heat::MultipartMime
-    properties:
-      parts:
-      - config: { get_resource: network}
-      - config: { get_resource: script_init}
-
-  pcrf_server_ppd: 
-    type: OS::Nova::Server
-    properties:
-      config_drive: "True"
-      name: { get_param: pcrf_ppd_server_name }
-      image: { get_param: pcrf_ppd_image_name }
-      flavor: { get_param: pcrf_ppd_flavor_name }
-      availability_zone: { get_param: availabilityzone_name }
-      networks:
-        - port: { get_resource: pcrf_ppd_port_0}
-        - port: { get_resource: pcrf_ppd_port_1}
-        - port: { get_resource: pcrf_ppd_port_2}
-        - port: { get_resource: pcrf_ppd_port_3}
-        - port: { get_resource: pcrf_ppd_port_4}
-        - port: { get_resource: pcrf_ppd_port_5}
-        - port: { get_resource: pcrf_ppd_port_6}
-        - port: { get_resource: pcrf_ppd_port_7}
-      user_data_format: RAW
-      user_data:
-        get_resource: pcrf_server_init
-      metadata:
-        vnf_id: {get_param: pcrf_vnf_id}
-
-  pcrf_ppd_port_0:
-    type: OS::Neutron::Port
-    properties:
-      network: { get_param: pcrf_cps_net_name }
-      fixed_ips:
-        - ip_address: { get_param: pcrf_cps_net_ip }
-      security_groups: [{ get_param: pcrf_security_group_name }]
-      allowed_address_pairs:
-        - ip_address: { get_param: pcrf_lb_internal_vip }
-
-  pcrf_ppd_port_1:
-    type: OS::Neutron::Port
-    properties:
-      network: { get_param: pcrf_oam_net_name }
-      fixed_ips:
-        - ip_address: { get_param: pcrf_oam_net_ip }
-      security_groups: [{ get_param: pcrf_security_group_name }]
-      allowed_address_pairs:
-        - ip_address: { get_param: pcrf_lb_management_vip } 
- 
-  pcrf_ppd_port_2:
-    type: OS::Neutron::Port
-    properties:
-      network: { get_param: pcrf_gx_net_name }
-      fixed_ips:
-        - ip_address: { get_param: pcrf_gx_net_ip }
-      security_groups: [{ get_param: pcrf_security_group_name }]
-
-  pcrf_ppd_port_3:
-    type: OS::Neutron::Port
-    properties:
-      network: { get_param: pcrf_sp_net_name }
-      fixed_ips:
-        - ip_address: { get_param: pcrf_sp_net_ip }
-      security_groups: [{ get_param: pcrf_security_group_name }]
-
-  pcrf_ppd_port_4:
-    type: OS::Neutron::Port
-    properties:
-      network: { get_param: pcrf_sy_net_name }
-      fixed_ips:
-        - ip_address: { get_param: pcrf_sy_net_ip }
-      security_groups: [{ get_param: pcrf_security_group_name }]
-
-  pcrf_ppd_port_5:
-    type: OS::Neutron::Port
-    properties:
-      network: { get_param: pcrf_rx_net_name }
-      fixed_ips:
-        - ip_address: { get_param: pcrf_rx_net_ip }
-      security_groups: [{ get_param: pcrf_security_group_name }]
-  
-  pcrf_ppd_port_6:
-    type: OS::Neutron::Port
-    properties:
-      network: { get_param: pcrf_sd_net_name }
-      fixed_ips:
-        - ip_address: { get_param: pcrf_sd_net_ip }
-      security_groups: [{ get_param: pcrf_security_group_name }]
-
-  pcrf_ppd_port_7:
-    type: OS::Neutron::Port
-    properties:
-      network: { get_param: pcrf_sgi_sy_net_name }
-      fixed_ips:
-        - ip_address: { get_param: pcrf_sgi_sy_net_ip }
-      security_groups: [{ get_param: pcrf_security_group_name }]
-
diff --git a/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/simpleNotif-V3/artifacts/nested-pps_v1.0.yaml b/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/simpleNotif-V3/artifacts/nested-pps_v1.0.yaml
deleted file mode 100644
index 8cb6e15..0000000
--- a/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/simpleNotif-V3/artifacts/nested-pps_v1.0.yaml
+++ /dev/null
@@ -1,99 +0,0 @@
-heat_template_version: 2013-05-23
-
-description: heat template that creates PCRF Policy Server stack
-
-parameters:
-  pcrf_pps_server_name:
-    type: string
-    label: PCRF PS server name
-    description: PCRF PS server name
-  pcrf_pps_image_name:
-    type: string
-    label: PCRF PS image name
-    description: PCRF PS image name
-  pcrf_pps_flavor_name:
-    type: string
-    label: PCRF PS flavor name
-    description: flavor name of PCRF PS instance
-  availabilityzone_name:
-    type: string
-    label: availabilityzone name
-    description: availabilityzone name
-  pcrf_cps_net_name:
-    type: string
-    label: CPS network name
-    description: CPS network name
-  pcrf_cps_net_ip:
-    type: string
-    label: CPS network ip
-    description: CPS network ip
-  pcrf_cps_net_mask:
-    type: string
-    label: CPS network mask
-    description: CPS network mask
-  pcrf_security_group_name:
-    type: string
-    label: security group name
-    description: the name of security group
-  pcrf_vnf_id:
-    type: string
-    label: PCRF VNF Id
-    description: PCRF VNF Id
-
-resources:
-  script_init:
-    type: OS::Heat::SoftwareConfig
-    properties:
-      group: ungrouped
-      config:
-        str_replace:
-          template: { get_file: cloud-nimbus.sh }
-          params:
-            $vm_name: { get_param: pcrf_pps_server_name }
-  network:
-    type: OS::Heat::CloudConfig
-    properties:
-      cloud_config:
-        write_files:
-          - path: /etc/sysconfig/network-scripts/ifcfg-eth0
-            permissions: "0644"
-            content:
-              str_replace:
-                template: { get_file: nimbus-ethernet }
-                params:
-                  $dev: eth0
-                  $ip: { get_param: pcrf_cps_net_ip }
-                  $netmask: { get_param: pcrf_cps_net_mask }
-        runcmd:
-          - ifdown eth0 && ifup eth0
-
-  pcrf_server_init:
-    type: OS::Heat::MultipartMime
-    properties:
-      parts:
-      - config: { get_resource: network}
-      - config: { get_resource: script_init}
-
-  pcrf_server_pps:
-    type: OS::Nova::Server
-    properties:
-      config_drive: "True"
-      name: { get_param: pcrf_pps_server_name }
-      image: { get_param: pcrf_pps_image_name }
-      flavor: { get_param: pcrf_pps_flavor_name }
-      availability_zone: { get_param: availabilityzone_name }
-      networks:
-        - port: { get_resource: pcrf_pps_port_0}
-      user_data_format: RAW
-      user_data:
-        get_resource: pcrf_server_init
-      metadata:
-        vnf_id: {get_param: pcrf_vnf_id}
-
-  pcrf_pps_port_0:
-    type: OS::Neutron::Port
-    properties:
-      network: { get_param: pcrf_cps_net_name }
-      fixed_ips:
-        - ip_address: { get_param: pcrf_cps_net_ip }
-      security_groups: [{ get_param: pcrf_security_group_name }]
diff --git a/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/simpleNotif-V3/artifacts/nested-psm_v1.0.yaml b/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/simpleNotif-V3/artifacts/nested-psm_v1.0.yaml
deleted file mode 100644
index 64c7484..0000000
--- a/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/simpleNotif-V3/artifacts/nested-psm_v1.0.yaml
+++ /dev/null
@@ -1,99 +0,0 @@
-heat_template_version: 2013-05-23
-
-description: heat template that creates PCRF Session Manager stack
-
-parameters:
-  pcrf_psm_server_name:
-    type: string
-    label: PCRF SM server name
-    description: PCRF SM server name
-  pcrf_psm_image_name:
-    type: string
-    label: image name
-    description: PCRF SM image name
-  pcrf_psm_flavor_name:
-    type: string
-    label: PCRF SM flavor name
-    description: flavor name of PCRF SM instance 
-  availabilityzone_name:
-    type: string
-    label: availabilityzone name
-    description: availabilityzone name
-  pcrf_cps_net_name:
-    type: string
-    label: CPS network name
-    description: CPS network name
-  pcrf_cps_net_ip:
-    type: string
-    label: CPS network ip
-    description: CPS network ip
-  pcrf_cps_net_mask:
-    type: string
-    label: CPS network mask
-    description: CPS network mask
-  pcrf_security_group_name:
-    type: string
-    label: security group name
-    description: the name of security group
-  pcrf_vnf_id:
-    type: string
-    label: PCRF VNF Id
-    description: PCRF VNF Id
-
-resources:
-  network:
-    type: OS::Heat::CloudConfig
-    properties:
-      cloud_config:
-        write_files:
-          - path: /etc/sysconfig/network-scripts/ifcfg-eth0
-            permissions: "0644"
-            content:
-              str_replace:
-                template: { get_file: nimbus-ethernet }
-                params:
-                  $dev: eth0
-                  $ip: { get_param: pcrf_cps_net_ip }
-                  $netmask: { get_param: pcrf_cps_net_mask }
-        runcmd:
-          - ifdown eth0 && ifup eth0
-  script_init:
-    type: OS::Heat::SoftwareConfig
-    properties:
-      group: ungrouped
-      config:
-        str_replace:
-          template: { get_file: cloud-nimbus.sh }
-          params:
-            $vm_name: { get_param: pcrf_psm_server_name }
-  pcrf_server_init:
-    type: OS::Heat::MultipartMime
-    properties:
-      parts:
-      - config: { get_resource: network}
-      - config: { get_resource: script_init}
-
-  pcrf_server_psm:
-    type: OS::Nova::Server
-    properties:
-      config_drive: "True"
-      name: { get_param: pcrf_psm_server_name }
-      image: { get_param: pcrf_psm_image_name }
-      flavor: { get_param: pcrf_psm_flavor_name }
-      availability_zone: { get_param: availabilityzone_name }
-      networks:
-        - port: { get_resource: psm01_port_0}
-      user_data_format: RAW
-      user_data:
-        get_resource: pcrf_server_init
-      metadata:
-        vnf_id: {get_param: pcrf_vnf_id}
-      #scheduler_hints: {group: { get_resource: servergroup_nimbus }}
-  
-  psm01_port_0:
-    type: OS::Neutron::Port
-    properties:
-      network: { get_param: pcrf_cps_net_name }
-      fixed_ips:
-        - ip_address: { get_param: pcrf_cps_net_ip }
-      security_groups: [{ get_param: pcrf_security_group_name }]
\ No newline at end of file
diff --git a/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/simpleNotif-V3/artifacts/vnf-module-artifact.json b/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/simpleNotif-V3/artifacts/vnf-module-artifact.json
deleted file mode 100644
index 50fb1b7..0000000
--- a/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/simpleNotif-V3/artifacts/vnf-module-artifact.json
+++ /dev/null
@@ -1,20 +0,0 @@
-[
-  {
-    "vfModuleModelName": "VF_RI2_G6_withArtifacts::module-1",
-    "vfModuleModelInvariantUUID": "585822c7-4027-4f84-ba50-e9248606f132",
-    "vfModuleModelVersion": "1.0",
-    "vfModuleModelUUID": "1e34774e-715e-4fd5-bd08-7b654622f33e.VF_RI2_G6_withArtifacts::module-1.group",
-    "vfModuleModelDescription": "vf Module Description",
-    "vfModuleModelCustomizationUUID": "585822c7-4027-4f84-ba50-e9248606f132",
-    "isBase": true,
-    "artifacts": [
-      "Artifact-UUID1",
-      "EnvArtifact-UUID2",
-      "NestedArtifact-UUID3",
-      "ScriptArtifact-UUID1",
-      "VolumeArtifact-UUID1",
-      "VolumeEnvArtifact-UUID1"
-    ],
-    "properties": {"test":"test"}
-  }
-]
\ No newline at end of file
diff --git a/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/simpleNotif-V3/notif-structure.json b/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/simpleNotif-V3/notif-structure.json
deleted file mode 100644
index c5c6f92..0000000
--- a/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/simpleNotif-V3/notif-structure.json
+++ /dev/null
@@ -1,117 +0,0 @@
-{
-    "serviceName": "test-service",
-    "serviceInvariantUUID": "585822c7-4027-4f84-ba50-e9248606f133",
-    "serviceUUID": "1e34774e-715e-4fd5-bd09-7b654622f34g",
-    "serviceVersion": "3.0",
-    "serviceArtifacts":
-    [
-
-    ],
-
-    "resources":
-    [
-        {
-            "resourceInstanceName": "resource-1",
-            "resourceInvariantUUID": "585822c7-4027-4f84-ba50-e9248606f134",
-            "resourceName": "resourceName-1",
-            "resourceType": "VF",
-            "resourceUUID": "585822c7-4027-4f84-ba50-e9248606f136",
-            "resourceVersion": "2.0",
-            "category":  "category",
-            "artifacts":
-            [
-                {
-                    "artifactChecksum": "CheckSum",
-                    "artifactDescription": "Meta data for VFModule",
-                    "artifactName": "vnf-module-artifact.json",
-
-                    "artifactType": "VF_MODULES_METADATA",
-                    "artifactURL": "vnf-module-artifact.json",
-                    "artifactUUID": "VfArtifact-UUID2",
-                    "artifactVersion": "1.0"
-
-                },
-                {
-                    "artifactChecksum": "CheckSum",
-                    "artifactDescription": "Nimbus Heat OAM",
-                    "artifactName": "hot-nimbus-oam_v1.0.yaml",
-                    "artifactTimeout": 100,
-                    "artifactType": "HEAT",
-                    "artifactURL": "hot-nimbus-oam_v1.0.yaml",
-                    "artifactUUID": "Artifact-UUID1",
-                    "artifactVersion": "1.0",
-                    "generatedArtifact": "EnvArtifact-UUID2",
-                    "relatedArtifact":
-                    [
-                        "NestedArtifact-UUID3",
-                        "ScriptArtifact-UUID1"
-                    ]
-                },
-
-                {
-                    "artifactChecksum": "CheckSum",
-                    "artifactDescription": "Nimbus Heat ENV OAM",
-                    "artifactName": "hot-nimbus-oam_v1.0.env",
-
-                    "artifactType": "HEAT_ENV",
-                    "artifactURL": "hot-nimbus-oam_v1.0.env",
-                    "artifactUUID": "EnvArtifact-UUID2",
-                    "artifactVersion": "1.0"
-
-                },
-
-                {
-                    "artifactChecksum": "CheckSum",
-                    "artifactDescription": "Nested OAM",
-                    "artifactName": "nested-oam_v1.0.yaml",
-                    "artifactTimeout": 10,
-                    "artifactType": "HEAT_NESTED",
-                    "artifactURL": "nested-oam_v1.0.yaml",
-                    "artifactUUID": "NestedArtifact-UUID3",
-                    "artifactVersion": "1.0"
-
-                },
-
-                {
-                    "artifactChecksum": "CheckSum",
-                    "artifactDescription": "Script for OAM",
-                    "artifactName": "mount_iso_script.sh",
-
-                    "artifactType": "HEAT_ARTIFACT",
-                    "artifactURL": "mount_iso_script.sh",
-                    "artifactUUID": "ScriptArtifact-UUID1",
-                    "artifactVersion": "1.0"
-
-                },
-
-                {
-                    "artifactChecksum": "CheckSum",
-                    "artifactDescription": "Heat Vol for OAM",
-                    "artifactName": "hot-nimbus-oam-volumes_v1.0.yaml",
-                    "artifactTimeout": 10,
-                    "artifactType": "HEAT_VOL",
-                    "artifactURL": "hot-nimbus-oam-volumes_v1.0.yaml",
-                    "artifactUUID": "VolumeArtifact-UUID1",
-                    "artifactVersion": "1.0",
-                    "generatedArtifact": "VolumeEnvArtifact-UUID1"
-
-                },
-
-                {
-                    "artifactChecksum": "CheckSum",
-                    "artifactDescription": "Heat Env Vol for OAM",
-                    "artifactName": "hot-nimbus-oam-volumes_v1.0.env",
-
-                    "artifactType": "HEAT_ENV",
-                    "artifactURL": "hot-nimbus-oam-volumes_v1.0.env",
-                    "artifactUUID": "VolumeEnvArtifact-UUID1",
-                    "artifactVersion": "1.0"
-
-                }
-            ]
-        }
-    ],
-
-    "serviceDescription": "test service for unit testing",
-    "distributionID": "35120a87-1f82-4276-9735-f6de5a244d65"
-}
\ No newline at end of file
diff --git a/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/simpleNotif-V4/artifacts/cloud-nimbus.sh b/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/simpleNotif-V4/artifacts/cloud-nimbus.sh
deleted file mode 100644
index 48485f3..0000000
--- a/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/simpleNotif-V4/artifacts/cloud-nimbus.sh
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/bin/bash
-echo "Running first-boot script"
-FLAG="first-boot.sh"
-echo "First boot run" > ${FLAG}
-echo "$vm_name" >> ${FLAG}
-touch /var/lib/cloud/instance/payload/launch-params
-chmod 644 /var/lib/cloud/instance/payload/launch-params
-#for i in $(ls /sys/class/net); do
-#  echo "Restart $i" >> ${FLAG}
-#  ifdown ${i}
-#  ifup ${i}
-#done
diff --git a/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/simpleNotif-V4/artifacts/hot-nimbus-oam-volumes_v1.0.env b/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/simpleNotif-V4/artifacts/hot-nimbus-oam-volumes_v1.0.env
deleted file mode 100644
index b494d8c..0000000
--- a/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/simpleNotif-V4/artifacts/hot-nimbus-oam-volumes_v1.0.env
+++ /dev/null
@@ -1,6 +0,0 @@
-parameters:
-  pcrf_oam_vol_size: 500
-  pcrf_oam_volume_silver-1: Silver
-  pcrf_oam_volume_silver-2: Silver
-  pcrf_oam_vol_name_1: sde1-pcrfx01-oam001-vol-1
-  pcrf_oam_vol_name_2: sde1-pcrfx01-oam001-vol-2
\ No newline at end of file
diff --git a/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/simpleNotif-V4/artifacts/hot-nimbus-oam-volumes_v1.0.yaml b/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/simpleNotif-V4/artifacts/hot-nimbus-oam-volumes_v1.0.yaml
deleted file mode 100644
index 9e12054..0000000
--- a/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/simpleNotif-V4/artifacts/hot-nimbus-oam-volumes_v1.0.yaml
+++ /dev/null
@@ -1,45 +0,0 @@
-heat_template_version:  2013-05-23
-
-parameters:
-    pcrf_oam_vol_size:
-     type: number
-     label: Cinder volume size
-     description: the size of the Cinder volume
-    pcrf_oam_vol_name_1:
-     type: string
-     label: OAM volume name 1
-     description: Assigning name to volume
-    pcrf_oam_vol_name_2:
-     type: string
-     label: OAM volume name 2
-     description: Assigning name to volume
-    pcrf_oam_volume_silver-1:
-     type: string
-     label: vm volume type
-     description: the name of the target volume backend for OAM1
-    pcrf_oam_volume_silver-2:
-     type: string
-     label: vm volume type
-     description: the name of the target volume backend for OAM2
-
-resources:
-  pcrf_oam_volume_1:
-    type: OS::Cinder::Volume
-    properties:
-      size: {get_param: pcrf_oam_vol_size}
-      volume_type: {get_param: pcrf_oam_volume_silver-1}
-      name: {get_param: pcrf_oam_vol_name_1}
-
-  pcrf_oam_volume_2:
-    type: OS::Cinder::Volume
-    properties:
-      size: {get_param: pcrf_oam_vol_size}
-      volume_type: {get_param: pcrf_oam_volume_silver-2}
-      name: {get_param: pcrf_oam_vol_name_2}
-outputs:
-  pcrf_oam_volume_id_1:
-    description: the oam 001 volume id
-    value: { get_resource: pcrf_oam_volume_1 }
-  pcrf_oam_volume_id_2:
-    description: the oam 002 volume id
-    value: { get_resource: pcrf_oam_volume_2 }
\ No newline at end of file
diff --git a/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/simpleNotif-V4/artifacts/hot-nimbus-oam_v1.0.env b/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/simpleNotif-V4/artifacts/hot-nimbus-oam_v1.0.env
deleted file mode 100644
index 7e51e67..0000000
--- a/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/simpleNotif-V4/artifacts/hot-nimbus-oam_v1.0.env
+++ /dev/null
@@ -1,18 +0,0 @@
-parameters:
-  pcrf_oam_server_names: ZRDM1PCRF01OAM001,ZRDM1PCRF01OAM002
-  pcrf_oam_image_name: PCRF_8.995-ATTM1.0.3.qcow2
-  pcrf_oam_flavor_name: lc.4xlarge4
-  availabilityzone_name: nova
-  pcrf_cps_net_name: Mobisupport-25193-I-INT1_int_pcrf_net_0
-  pcrf_cps_net_ips: 172.26.16.111,172.26.16.112
-  pcrf_arbiter_vip: 172.26.16.115
-  pcrf_cps_net_mask: 255.255.255.0
-  pcrf_oam_net_name: MNS-25180-L-01_oam_protected_net_0
-  pcrf_oam_net_ips: 107.239.64.117,107.239.64.118
-  pcrf_oam_net_gw: 107.239.64.1
-  pcrf_oam_net_mask: 255.255.248.0
-  pcrf_oam_volume_id_1: a4aa05fb-fcdc-457b-8077-6845fdfc3257
-  pcrf_oam_volume_id_2: 93d8fc1f-f1c3-4933-86b2-039881ee910f
-  pcrf_security_group_name: nimbus_security_group
-  pcrf_vnf_id: 730797234b4a40aa99335157b02871cd
-
diff --git a/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/simpleNotif-V4/artifacts/hot-nimbus-oam_v1.0.yaml b/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/simpleNotif-V4/artifacts/hot-nimbus-oam_v1.0.yaml
deleted file mode 100644
index 98c4e3b..0000000
--- a/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/simpleNotif-V4/artifacts/hot-nimbus-oam_v1.0.yaml
+++ /dev/null
@@ -1,109 +0,0 @@
-heat_template_version: 2013-05-23
-
-description: heat template that creates multiple PCRF OAM nodes stack
-
-parameters:
-  pcrf_oam_server_names:
-    type: comma_delimited_list
-    label: PCRF OAM server names
-    description: name of the PCRF OAM instance
-  pcrf_oam_image_name:
-    type: string
-    label: PCRF OAM image name
-    description: PCRF OAM image name
-  pcrf_oam_flavor_name:
-    type: string
-    label: PCRF OAM flavor name
-    description: flavor name of PCRF OAM instance
-  availabilityzone_name:
-    type: string
-    label: availabilityzone name
-    description: availabilityzone name
-  pcrf_cps_net_name:
-    type: string
-    label: CPS network name
-    description: CPS network name
-  pcrf_cps_net_ips:
-    type: comma_delimited_list
-    label: CPS network ips
-    description: CPS network ips
-  pcrf_cps_net_mask:
-    type: string
-    label: CPS network mask
-    description: CPS network mask
-  pcrf_arbiter_vip:
-    type: string
-    label: OAM Arbiter LB VIP
-    description: OAM Arbiter LB VIP
-  pcrf_oam_net_name:
-    type: string
-    label: OAM network name
-    description: OAM network name
-  pcrf_oam_net_ips:
-    type: comma_delimited_list
-    label: OAM network ips
-    description: OAM network ips
-  pcrf_oam_net_gw:
-    type: string
-    label: CPS network gateway
-    description: CPS network gateway
-  pcrf_oam_net_mask:
-    type: string
-    label: CPS network mask
-    description: CPS network mask
-  pcrf_oam_volume_id_1:
-    type: string
-    label: CPS OAM 001 Cinder Volume
-    description: CPS OAM 001 Cinder Volumes
-  pcrf_oam_volume_id_2:
-    type: string
-    label: CPS OAM 002 Cinder Volume
-    description: CPS OAM 002 Cinder Volumes
-  pcrf_security_group_name:
-    type: string
-    label: security group name
-    description: the name of security group
-  pcrf_vnf_id:
-    type: string
-    label: PCRF VNF Id
-    description: PCRF VNF Id
-
-resources:
-  server_pcrf_oam_001:
-    type: nested-oam_v1.0.yaml
-    properties:
-      pcrf_oam_server_name: { get_param: [pcrf_oam_server_names, 0] }
-      pcrf_oam_image_name: { get_param: pcrf_oam_image_name }
-      pcrf_oam_flavor_name: { get_param: pcrf_oam_flavor_name }
-      availabilityzone_name: { get_param: availabilityzone_name }
-      pcrf_security_group_name: { get_param: pcrf_security_group_name }
-      pcrf_oam_volume_id: { get_param: pcrf_oam_volume_id_1 }
-      pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
-      pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 0] }
-      pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
-      pcrf_oam_net_name: { get_param: pcrf_oam_net_name }
-      pcrf_oam_net_ip: { get_param: [pcrf_oam_net_ips, 0] }
-      pcrf_oam_net_mask: { get_param: pcrf_oam_net_mask }
-      pcrf_oam_net_gw: { get_param: pcrf_oam_net_gw }
-      pcrf_arbiter_vip: { get_param: pcrf_arbiter_vip }
-      pcrf_vnf_id: {get_param: pcrf_vnf_id}
-
-  server_pcrf_oam_002:
-    type: nested-oam_v1.0.yaml
-    depends_on: [server_pcrf_oam_001]
-    properties:
-      pcrf_oam_server_name: { get_param: [pcrf_oam_server_names, 1] }
-      pcrf_oam_image_name: { get_param: pcrf_oam_image_name }
-      pcrf_oam_flavor_name: { get_param: pcrf_oam_flavor_name }
-      availabilityzone_name: { get_param: availabilityzone_name }
-      pcrf_security_group_name: { get_param: pcrf_security_group_name }
-      pcrf_oam_volume_id: { get_param: pcrf_oam_volume_id_2 }
-      pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
-      pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 1] }
-      pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
-      pcrf_oam_net_name: { get_param: pcrf_oam_net_name }
-      pcrf_oam_net_ip: { get_param: [pcrf_oam_net_ips, 1] }
-      pcrf_oam_net_mask: { get_param: pcrf_oam_net_mask }
-      pcrf_oam_net_gw: { get_param: pcrf_oam_net_gw }
-      pcrf_arbiter_vip: { get_param: pcrf_arbiter_vip }
-      pcrf_vnf_id: {get_param: pcrf_vnf_id}
diff --git a/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/simpleNotif-V4/artifacts/hot-nimbus-pcm-volumes_v1.0.env b/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/simpleNotif-V4/artifacts/hot-nimbus-pcm-volumes_v1.0.env
deleted file mode 100644
index 788365d..0000000
--- a/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/simpleNotif-V4/artifacts/hot-nimbus-pcm-volumes_v1.0.env
+++ /dev/null
@@ -1,4 +0,0 @@
-parameters:
-  pcrf_pcm_vol_size: 50
-  pcrf_pcm_volume_silver: Silver
-  pcrf_pcm_vol_name_1: sde1-pcrfx01-pcm001-vol-1
diff --git a/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/simpleNotif-V4/artifacts/hot-nimbus-pcm-volumes_v1.0.yaml b/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/simpleNotif-V4/artifacts/hot-nimbus-pcm-volumes_v1.0.yaml
deleted file mode 100644
index bcc3e89..0000000
--- a/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/simpleNotif-V4/artifacts/hot-nimbus-pcm-volumes_v1.0.yaml
+++ /dev/null
@@ -1,28 +0,0 @@
-heat_template_version:  2013-05-23
-
-parameters:
-   pcrf_pcm_vol_size:
-     type: number
-     label: Cinder volume size
-     description: the size of the Cinder volume
-   pcrf_pcm_vol_name_1:
-     type: string
-     label: PCM volume name
-     description: Assigning name to volume
-   pcrf_pcm_volume_silver:
-     type: string
-     label: vm volume type
-     description: the name of the target volume backend for PCM
-
-resources: 
-  pcrf_pcm_volume_1:
-     type: OS::Cinder::Volume
-     properties:
-      size: { get_param: pcrf_pcm_vol_size }
-      volume_type: { get_param: pcrf_pcm_volume_silver }
-      name: { get_param: pcrf_pcm_vol_name_1 }
-
-outputs:
-  pcrf_pcm_volume_id_1:
-    description: the pcrf_pcm_volume_id
-    value: { get_resource: pcrf_pcm_volume_1 }
\ No newline at end of file
diff --git a/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/simpleNotif-V4/artifacts/hot-nimbus-pcm_v1.0.env b/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/simpleNotif-V4/artifacts/hot-nimbus-pcm_v1.0.env
deleted file mode 100644
index b23014d..0000000
--- a/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/simpleNotif-V4/artifacts/hot-nimbus-pcm_v1.0.env
+++ /dev/null
@@ -1,16 +0,0 @@
-parameters:
-  pcrf_pcm_server_names: ZRDM1PCRF01PCM001
-  pcrf_pcm_image_name: PCRF_8.995-ATTM1.0.3.qcow2
-  pcrf_pcm_flavor_name: lc.2xlarge4
-  availabilityzone_name: nova
-  pcrf_cps_net_name: Mobisupport-25193-I-INT1_int_pcrf_net_0
-  pcrf_cps_net_ips: 172.26.16.113
-  pcrf_cps_net_mask: 255.255.255.0
-  pcrf_oam_net_name: MNS-25180-L-01_oam_protected_net_0
-  pcrf_oam_net_ips: 107.239.64.121
-  pcrf_oam_net_gw: 107.239.64.1
-  pcrf_oam_net_mask: 255.255.248.0
-  pcrf_pcm_volume_id_1: 3438a3fe-1241-4390-80f2-d0b86238c40e
-  pcrf_security_group_name: nimbus_security_group
-  pcrf_vnf_id: 730797234b4a40aa99335157b02871cd
-
diff --git a/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/simpleNotif-V4/artifacts/hot-nimbus-pcm_v1.0.yaml b/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/simpleNotif-V4/artifacts/hot-nimbus-pcm_v1.0.yaml
deleted file mode 100644
index defb373..0000000
--- a/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/simpleNotif-V4/artifacts/hot-nimbus-pcm_v1.0.yaml
+++ /dev/null
@@ -1,80 +0,0 @@
-heat_template_version: 2013-05-23
-
-description: heat template that creates PCRF Cluman stack
-
-parameters:
-  pcrf_pcm_server_names:
-    type: comma_delimited_list
-    label: PCRF CM server names
-    description: name of the PCRF CM instance
-  pcrf_pcm_image_name:
-    type: string
-    label: PCRF CM image name
-    description: PCRF CM image name
-  pcrf_pcm_flavor_name:
-    type: string
-    label: PCRF CM flavor name
-    description: flavor name of PCRF CM instance
-  availabilityzone_name:
-    type: string
-    label: availabilityzone name
-    description: availabilityzone name
-  pcrf_cps_net_name:
-    type: string
-    label: CPS network name
-    description: CPS network name
-  pcrf_cps_net_ips:
-    type: comma_delimited_list
-    label: CPS network ips
-    description: CPS network ips
-  pcrf_cps_net_mask:
-    type: string
-    label: CPS network mask
-    description: CPS network mask
-  pcrf_oam_net_name:
-    type: string
-    label: OAM network name
-    description: OAM network name
-  pcrf_oam_net_ips:
-    type: comma_delimited_list
-    label: OAM network ips
-    description: OAM network ips
-  pcrf_oam_net_gw:
-    type: string
-    label: CPS network gateway
-    description: CPS network gateway
-  pcrf_oam_net_mask:
-    type: string
-    label: CPS network mask
-    description: CPS network mask
-  pcrf_pcm_volume_id_1:
-    type: string
-    label: CPS Cluman Cinder Volume
-    description: CPS Cluman Cinder Volume
-  pcrf_security_group_name:
-    type: string
-    label: security group name
-    description: the name of security group
-  pcrf_vnf_id:
-    type: string
-    label: PCRF VNF Id
-    description: PCRF VNF Id
-
-resources:
-  server_pcrf_pcm_001:
-    type: nested-pcm_v1.0.yaml
-    properties:
-      pcrf_pcm_server_name: { get_param: [pcrf_pcm_server_names, 0] }
-      pcrf_pcm_image_name: { get_param: pcrf_pcm_image_name }
-      pcrf_pcm_flavor_name: { get_param: pcrf_pcm_flavor_name }
-      availabilityzone_name: { get_param: availabilityzone_name }
-      pcrf_security_group_name: { get_param: pcrf_security_group_name }
-      pcrf_pcm_volume_id: { get_param: pcrf_pcm_volume_id_1 }
-      pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
-      pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 0] }
-      pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
-      pcrf_oam_net_name: { get_param: pcrf_oam_net_name }
-      pcrf_oam_net_ip: { get_param: [pcrf_oam_net_ips, 0] }
-      pcrf_oam_net_mask: { get_param: pcrf_oam_net_mask }
-      pcrf_oam_net_gw: { get_param: pcrf_oam_net_gw }
-      pcrf_vnf_id: {get_param: pcrf_vnf_id}
diff --git a/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/simpleNotif-V4/artifacts/hot-nimbus-ppd_v1.0.yaml b/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/simpleNotif-V4/artifacts/hot-nimbus-ppd_v1.0.yaml
deleted file mode 100644
index 8631592..0000000
--- a/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/simpleNotif-V4/artifacts/hot-nimbus-ppd_v1.0.yaml
+++ /dev/null
@@ -1,286 +0,0 @@
-heat_template_version: 2013-05-23
-
-description: heat template that creates PCRF Policy Director stack
-
-parameters:
-  pcrf_ppd_server_names:
-    type: comma_delimited_list
-    label: PCRF PD server names
-    description: name of the PCRF PD instance
-  pcrf_ppd_image_name:
-    type: string
-    label: PCRF PD image name
-    description: PCRF PD image name
-  pcrf_ppd_flavor_name:
-    type: string
-    label: PCRF PD flavor name
-    description: flavor name of PCRF PD instance
-  availabilityzone_name:
-    type: string
-    label: availabilityzone name
-    description: availabilityzone name
-  pcrf_cps_net_name:
-    type: string
-    label: CPS network name
-    description: CPS network name
-  pcrf_cps_net_ips:
-    type: comma_delimited_list
-    label: CPS network ips
-    description: CPS network ips
-  pcrf_cps_net_mask:
-    type: string
-    label: CPS network mask
-    description: CPS network mask
-  pcrf_lb_internal_vip:
-    type: string
-    label: CPS Internal LB VIP
-    description: CPS Internal LB VIP
-  pcrf_oam_net_name:
-    type: string
-    label: OAM network name
-    description: OAM network name
-  pcrf_oam_net_ips:
-    type: comma_delimited_list
-    label: OAM network ips
-    description: OAM network ips
-  pcrf_oam_net_gw:
-    type: string
-    label: CPS network gateway
-    description: CPS network gateway
-  pcrf_oam_net_mask:
-    type: string
-    label: CPS network mask
-    description: CPS network mask
-  pcrf_lb_management_vip:
-    type: string
-    label: CPS OAM LB VIP
-    description: CPS OAM LB VIP
-  pcrf_gx_net_name:
-    type: string
-    label: Gx network name
-    description: Gx network name
-  pcrf_gx_net_ips:
-    type: comma_delimited_list
-    label: Gx network ips
-    description: Gx network ips
-  pcrf_gx_net_mask:
-    type: string
-    label: Gx network mask
-    description: Gx network mask
-  pcrf_sp_net_name:
-    type: string
-    label: Sp network name
-    description: Sp network name
-  pcrf_sp_net_ips:
-    type: comma_delimited_list
-    label: Sp network ips
-    description: Sp network ips
-  pcrf_sp_net_mask:
-    type: string
-    label: Sp network mask
-    description: Sp network mask
-  pcrf_sy_net_name:
-    type: string
-    label: Sy network name
-    description: Sy network name
-  pcrf_sy_net_ips:
-    type: comma_delimited_list
-    label: Sy network ips
-    description: Sy network ips
-  pcrf_sy_net_mask:
-    type: string
-    label: Sy network mask
-    description: Sy network mask
-  pcrf_rx_net_name:
-    type: string
-    label: Rx network name
-    description: Rx network name
-  pcrf_rx_net_ips:
-    type: comma_delimited_list
-    label: Rx network ips
-    description: Rx network ips
-  pcrf_rx_net_mask:
-    type: string
-    label: Rx network mask
-    description: Rx network mask
-  pcrf_sd_net_name:
-    type: string
-    label: Sd network name
-    description: Sd network name
-  pcrf_sd_net_ips:
-    type: comma_delimited_list
-    label: Sd network ips
-    description: Sd network ips
-  pcrf_sd_net_mask:
-    type: string
-    label: Sd network mask
-    description: Sd network mask
-  pcrf_sgi_sy_net_name:
-    type: string
-    label: Sgi Sy network name
-    description: Sgi Sy network name
-  pcrf_sgi_sy_net_ips:
-    type: comma_delimited_list
-    label: Sgi Sy network ips
-    description: Sgi Sy network ips
-  pcrf_sgi_sy_net_mask:
-    type: string
-    label: Sgi Sy network mask
-    description: Sgi Sy network mask
-  pcrf_security_group_name:
-    type: string
-    label: security group name
-    description: the name of security group
-  pcrf_vnf_id:
-    type: string
-    label: PCRF VNF Id
-    description: PCRF VNF Id
-
-resources:
-  server_pcrf_ppd_001:
-    type: nested-ppd_v1.0.yaml
-    properties:
-      pcrf_ppd_server_name: { get_param: [pcrf_ppd_server_names, 0] }
-      pcrf_ppd_image_name: { get_param: pcrf_ppd_image_name }
-      pcrf_ppd_flavor_name: { get_param: pcrf_ppd_flavor_name }
-      availabilityzone_name: { get_param: availabilityzone_name }
-      pcrf_security_group_name: { get_param: pcrf_security_group_name }
-      pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
-      pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 0] }
-      pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
-      pcrf_lb_internal_vip: { get_param: pcrf_lb_internal_vip }
-      pcrf_oam_net_name: { get_param: pcrf_oam_net_name }
-      pcrf_oam_net_ip: { get_param: [pcrf_oam_net_ips, 0] }
-      pcrf_oam_net_mask: { get_param: pcrf_oam_net_mask }
-      pcrf_oam_net_gw: { get_param: pcrf_oam_net_gw }
-      pcrf_lb_management_vip: { get_param: pcrf_lb_management_vip }
-      pcrf_gx_net_name: { get_param: pcrf_gx_net_name }
-      pcrf_gx_net_ip: { get_param: [pcrf_gx_net_ips, 0] }
-      pcrf_gx_net_mask: { get_param: pcrf_gx_net_mask }
-      pcrf_sp_net_name: { get_param: pcrf_sp_net_name }
-      pcrf_sp_net_ip: { get_param: [pcrf_sp_net_ips, 0] }
-      pcrf_sp_net_mask: { get_param: pcrf_sp_net_mask }
-      pcrf_sy_net_name: { get_param: pcrf_sy_net_name }
-      pcrf_sy_net_ip: { get_param: [pcrf_sy_net_ips, 0] }
-      pcrf_sy_net_mask: { get_param: pcrf_sy_net_mask }
-      pcrf_rx_net_name: { get_param: pcrf_rx_net_name }
-      pcrf_rx_net_ip: { get_param: [pcrf_rx_net_ips, 0] }
-      pcrf_rx_net_mask: { get_param: pcrf_rx_net_mask }
-      pcrf_sd_net_name: { get_param: pcrf_sd_net_name }
-      pcrf_sd_net_ip: { get_param: [pcrf_sd_net_ips, 0] }
-      pcrf_sd_net_mask: { get_param: pcrf_sd_net_mask }
-      pcrf_sgi_sy_net_name: { get_param: pcrf_sgi_sy_net_name }
-      pcrf_sgi_sy_net_ip: { get_param: [pcrf_sgi_sy_net_ips, 0] }
-      pcrf_sgi_sy_net_mask: { get_param: pcrf_sgi_sy_net_mask }
-      pcrf_vnf_id: {get_param: pcrf_vnf_id}
-
-  server_pcrf_ppd_002:
-    type: nested-ppd_v1.0.yaml
-    properties:
-      pcrf_ppd_server_name: { get_param: [pcrf_ppd_server_names, 1] }
-      pcrf_ppd_image_name: { get_param: pcrf_ppd_image_name }
-      pcrf_ppd_flavor_name: { get_param: pcrf_ppd_flavor_name }
-      availabilityzone_name: { get_param: availabilityzone_name }
-      pcrf_security_group_name: { get_param: pcrf_security_group_name }
-      pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
-      pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 1] }
-      pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
-      pcrf_lb_internal_vip: { get_param: pcrf_lb_internal_vip }
-      pcrf_oam_net_name: { get_param: pcrf_oam_net_name }
-      pcrf_oam_net_ip: { get_param: [pcrf_oam_net_ips, 1] }
-      pcrf_oam_net_mask: { get_param: pcrf_oam_net_mask }
-      pcrf_oam_net_gw: { get_param: pcrf_oam_net_gw }
-      pcrf_lb_management_vip: { get_param: pcrf_lb_management_vip }
-      pcrf_gx_net_name: { get_param: pcrf_gx_net_name }
-      pcrf_gx_net_ip: { get_param: [pcrf_gx_net_ips, 1] }
-      pcrf_gx_net_mask: { get_param: pcrf_gx_net_mask }
-      pcrf_sp_net_name: { get_param: pcrf_sp_net_name }
-      pcrf_sp_net_ip: { get_param: [pcrf_sp_net_ips, 1] }
-      pcrf_sp_net_mask: { get_param: pcrf_sp_net_mask }
-      pcrf_sy_net_name: { get_param: pcrf_sy_net_name }
-      pcrf_sy_net_ip: { get_param: [pcrf_sy_net_ips, 1] }
-      pcrf_sy_net_mask: { get_param: pcrf_sy_net_mask }
-      pcrf_rx_net_name: { get_param: pcrf_rx_net_name }
-      pcrf_rx_net_ip: { get_param: [pcrf_rx_net_ips, 1] }
-      pcrf_rx_net_mask: { get_param: pcrf_rx_net_mask }
-      pcrf_sd_net_name: { get_param: pcrf_sd_net_name }
-      pcrf_sd_net_ip: { get_param: [pcrf_sd_net_ips, 1] }
-      pcrf_sd_net_mask: { get_param: pcrf_sd_net_mask }
-      pcrf_sgi_sy_net_name: { get_param: pcrf_sgi_sy_net_name }
-      pcrf_sgi_sy_net_ip: { get_param: [pcrf_sgi_sy_net_ips, 1] }
-      pcrf_sgi_sy_net_mask: { get_param: pcrf_sgi_sy_net_mask }
-      pcrf_vnf_id: {get_param: pcrf_vnf_id}
-
-  server_pcrf_ppd_003:
-    type: nested-ppd_v1.0.yaml
-    properties:
-      pcrf_ppd_server_name: { get_param: [pcrf_ppd_server_names, 2] }
-      pcrf_ppd_image_name: { get_param: pcrf_ppd_image_name }
-      pcrf_ppd_flavor_name: { get_param: pcrf_ppd_flavor_name }
-      availabilityzone_name: { get_param: availabilityzone_name }
-      pcrf_security_group_name: { get_param: pcrf_security_group_name }
-      pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
-      pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 2] }
-      pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
-      pcrf_lb_internal_vip: { get_param: pcrf_lb_internal_vip }
-      pcrf_oam_net_name: { get_param: pcrf_oam_net_name }
-      pcrf_oam_net_ip: { get_param: [pcrf_oam_net_ips, 2] }
-      pcrf_oam_net_mask: { get_param: pcrf_oam_net_mask }
-      pcrf_oam_net_gw: { get_param: pcrf_oam_net_gw }
-      pcrf_lb_management_vip: { get_param: pcrf_lb_management_vip }
-      pcrf_gx_net_name: { get_param: pcrf_gx_net_name }
-      pcrf_gx_net_ip: { get_param: [pcrf_gx_net_ips, 2] }
-      pcrf_gx_net_mask: { get_param: pcrf_gx_net_mask }
-      pcrf_sp_net_name: { get_param: pcrf_sp_net_name }
-      pcrf_sp_net_ip: { get_param: [pcrf_sp_net_ips, 2] }
-      pcrf_sp_net_mask: { get_param: pcrf_sp_net_mask }
-      pcrf_sy_net_name: { get_param: pcrf_sy_net_name }
-      pcrf_sy_net_ip: { get_param: [pcrf_sy_net_ips, 2] }
-      pcrf_sy_net_mask: { get_param: pcrf_sy_net_mask }
-      pcrf_rx_net_name: { get_param: pcrf_rx_net_name }
-      pcrf_rx_net_ip: { get_param: [pcrf_rx_net_ips, 2] }
-      pcrf_rx_net_mask: { get_param: pcrf_rx_net_mask }
-      pcrf_sd_net_name: { get_param: pcrf_sd_net_name }
-      pcrf_sd_net_ip: { get_param: [pcrf_sd_net_ips, 2] }
-      pcrf_sd_net_mask: { get_param: pcrf_sd_net_mask }
-      pcrf_sgi_sy_net_name: { get_param: pcrf_sgi_sy_net_name }
-      pcrf_sgi_sy_net_ip: { get_param: [pcrf_sgi_sy_net_ips, 2] }
-      pcrf_sgi_sy_net_mask: { get_param: pcrf_sgi_sy_net_mask }
-      pcrf_vnf_id: {get_param: pcrf_vnf_id}
-
-  server_pcrf_ppd_004:
-    type: nested-ppd_v1.0.yaml
-    properties:
-      pcrf_ppd_server_name: { get_param: [pcrf_ppd_server_names, 3] }
-      pcrf_ppd_image_name: { get_param: pcrf_ppd_image_name }
-      pcrf_ppd_flavor_name: { get_param: pcrf_ppd_flavor_name }
-      availabilityzone_name: { get_param: availabilityzone_name }
-      pcrf_security_group_name: { get_param: pcrf_security_group_name }
-      pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
-      pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 3] }
-      pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
-      pcrf_lb_internal_vip: { get_param: pcrf_lb_internal_vip }
-      pcrf_oam_net_name: { get_param: pcrf_oam_net_name }
-      pcrf_oam_net_ip: { get_param: [pcrf_oam_net_ips, 3] }
-      pcrf_oam_net_mask: { get_param: pcrf_oam_net_mask }
-      pcrf_oam_net_gw: { get_param: pcrf_oam_net_gw }
-      pcrf_lb_management_vip: { get_param: pcrf_lb_management_vip }
-      pcrf_gx_net_name: { get_param: pcrf_gx_net_name }
-      pcrf_gx_net_ip: { get_param: [pcrf_gx_net_ips, 3] }
-      pcrf_gx_net_mask: { get_param: pcrf_gx_net_mask }
-      pcrf_sp_net_name: { get_param: pcrf_sp_net_name }
-      pcrf_sp_net_ip: { get_param: [pcrf_sp_net_ips, 3] }
-      pcrf_sp_net_mask: { get_param: pcrf_sp_net_mask }
-      pcrf_sy_net_name: { get_param: pcrf_sy_net_name }
-      pcrf_sy_net_ip: { get_param: [pcrf_sy_net_ips, 3] }
-      pcrf_sy_net_mask: { get_param: pcrf_sy_net_mask }
-      pcrf_rx_net_name: { get_param: pcrf_rx_net_name }
-      pcrf_rx_net_ip: { get_param: [pcrf_rx_net_ips, 3] }
-      pcrf_rx_net_mask: { get_param: pcrf_rx_net_mask }
-      pcrf_sd_net_name: { get_param: pcrf_sd_net_name }
-      pcrf_sd_net_ip: { get_param: [pcrf_sd_net_ips, 3] }
-      pcrf_sd_net_mask: { get_param: pcrf_sd_net_mask }
-      pcrf_sgi_sy_net_name: { get_param: pcrf_sgi_sy_net_name }
-      pcrf_sgi_sy_net_ip: { get_param: [pcrf_sgi_sy_net_ips, 3] }
-      pcrf_sgi_sy_net_mask: { get_param: pcrf_sgi_sy_net_mask }
-      pcrf_vnf_id: {get_param: pcrf_vnf_id}
diff --git a/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/simpleNotif-V4/artifacts/hot-nimbus-ppd_v1.1.env b/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/simpleNotif-V4/artifacts/hot-nimbus-ppd_v1.1.env
deleted file mode 100644
index 10697bc..0000000
--- a/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/simpleNotif-V4/artifacts/hot-nimbus-ppd_v1.1.env
+++ /dev/null
@@ -1,35 +0,0 @@
-parameters:
-  pcrf_ppd_server_names: ZRDM1PCRF01PPD001,ZRDM1PCRF01PPD002,ZRDM1PCRF01PPD003,ZRDM1PCRF01PPD004
-  pcrf_ppd_image_name: PCRF_8.995-ATTM1.0.3.qcow2
-  pcrf_ppd_flavor_name: lc.4xlarge4
-  availabilityzone_name: nova
-  pcrf_cps_net_name: Mobisupport-25193-I-INT1_int_pcrf_net_0
-  pcrf_cps_net_ips: 172.26.16.3,172.26.16.4,172.26.16.5,172.26.16.6
-  pcrf_lb_internal_vip: 172.26.16.114
-  pcrf_cps_net_mask: 255.255.255.0
-  pcrf_oam_net_name: MNS-25180-L-01_oam_protected_net_0
-  pcrf_oam_net_ips: 107.239.64.113,107.239.64.114,107.239.64.115,107.239.64.116
-  pcrf_lb_management_vip: 107.239.64.123
-  pcrf_oam_net_gw: 107.239.64.1
-  pcrf_oam_net_mask: 255.255.248.0
-  pcrf_gx_net_name: Mobisupport-25193-I-INT1_cor_pcrf_gx_net_0
-  pcrf_gx_net_ips: 107.239.24.67,107.239.24.68,107.239.24.69,107.239.24.70
-  pcrf_gx_net_mask: 255.255.255.248
-  pcrf_sp_net_name: Mobisupport-25193-I-INT1_cor_pcrf_sp_net_0
-  pcrf_sp_net_ips: 107.239.24.75,107.239.24.76,107.239.24.77,107.239.24.78
-  pcrf_sp_net_mask: 255.255.255.248
-  pcrf_sy_net_name: Mobisupport-25193-I-INT1_cor_pcrf_sy_net_0
-  pcrf_sy_net_ips: 107.239.24.83,107.239.24.84,107.239.24.85,107.239.24.86
-  pcrf_sy_net_mask: 255.255.255.248
-  pcrf_rx_net_name: Mobisupport-25193-I-INT1_cor_pcrf_rx_net_0
-  pcrf_rx_net_ips: 107.239.24.91,107.239.24.92,107.239.24.93,107.239.24.94
-  pcrf_rx_net_mask: 255.255.255.248
-  pcrf_sd_net_name: Mobisupport-25193-I-INT1_cor_pcrf_sd_net_0
-  pcrf_sd_net_ips: 107.239.24.99,107.239.24.100,107.239.24.101,107.239.24.102
-  pcrf_sd_net_mask: 255.255.255.248
-  pcrf_sgi_sy_net_name: Mobisupport-25193-I-INT1_sgi_pcrf_sy_net_0
-  pcrf_sgi_sy_net_ips: 107.239.26.131,107.239.26.132,107.239.26.133,107.239.26.134
-  pcrf_sgi_sy_net_mask: 255.255.255.248
-  pcrf_security_group_name: nimbus_security_group
-  pcrf_vnf_id: 730797234b4a40aa99335157b02871cd
-
diff --git a/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/simpleNotif-V4/artifacts/hot-nimbus-pps_v1.0.env b/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/simpleNotif-V4/artifacts/hot-nimbus-pps_v1.0.env
deleted file mode 100644
index 18c064c..0000000
--- a/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/simpleNotif-V4/artifacts/hot-nimbus-pps_v1.0.env
+++ /dev/null
@@ -1,11 +0,0 @@
-parameters:
-  pcrf_pps_server_names: ZRDM1PCRF01PPS001,ZRDM1PCRF01PPS002,ZRDM1PCRF01PPS003,ZRDM1PCRF01PPS004,ZRDM1PCRF01PPS005,ZRDM1PCRF01PPS006
-  pcrf_pps_image_name: PCRF_8.995-ATTM1.0.3.qcow2
-  pcrf_pps_flavor_name: lc.3xlarge
-  availabilityzone_name: nova
-  pcrf_cps_net_name: Mobisupport-25193-I-INT1_int_pcrf_net_0
-  pcrf_cps_net_ips: 172.26.16.7,172.26.16.8,172.26.16.9,172.26.16.10,172.26.16.11,172.26.16.12
-  pcrf_cps_net_mask: 255.255.255.0
-  pcrf_security_group_name: nimbus_security_group
-  pcrf_vnf_id: 730797234b4a40aa99335157b02871cd
-
diff --git a/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/simpleNotif-V4/artifacts/hot-nimbus-pps_v1.0.yaml b/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/simpleNotif-V4/artifacts/hot-nimbus-pps_v1.0.yaml
deleted file mode 100644
index 0fadd00..0000000
--- a/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/simpleNotif-V4/artifacts/hot-nimbus-pps_v1.0.yaml
+++ /dev/null
@@ -1,121 +0,0 @@
-heat_template_version: 2013-05-23
-
-description: heat template that creates PCRF Policy Server stack
-
-parameters:
-  pcrf_pps_server_names:
-    type: comma_delimited_list
-    label: PCRF PS server names
-    description: PCRF PS server names
-  pcrf_pps_image_name:
-    type: string
-    label: PCRF PS image name
-    description: PCRF PS image name
-  pcrf_pps_flavor_name:
-    type: string
-    label: PCRF PS flavor name
-    description: flavor name of PCRF PS instance
-  availabilityzone_name:
-    type: string
-    label: availabilityzone name
-    description: availabilityzone name
-  pcrf_cps_net_name:
-    type: string
-    label: CPS network name
-    description: CPS network name
-  pcrf_cps_net_ips:
-    type: comma_delimited_list
-    label: CPS network ips
-    description: CPS network ips
-  pcrf_cps_net_mask:
-    type: string
-    label: CPS network mask
-    description: CPS network mask
-  pcrf_security_group_name:
-    type: string
-    label: security group name
-    description: the name of security group
-  pcrf_vnf_id:
-    type: string
-    label: PCRF VNF Id
-    description: PCRF VNF Id
-
-resources:
-  server_pcrf_pps_001:
-    type: nested-pps_v1.0.yaml
-    properties:
-      pcrf_pps_server_name: { get_param: [pcrf_pps_server_names, 0] }
-      pcrf_pps_image_name: { get_param: pcrf_pps_image_name }
-      pcrf_pps_flavor_name: { get_param: pcrf_pps_flavor_name }
-      availabilityzone_name: { get_param: availabilityzone_name }
-      pcrf_security_group_name: { get_param: pcrf_security_group_name }
-      pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
-      pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 0] }
-      pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
-      pcrf_vnf_id: {get_param: pcrf_vnf_id}
-
-  server_pcrf_pps_002:
-    type: nested-pps_v1.0.yaml
-    properties:
-      pcrf_pps_server_name: { get_param: [pcrf_pps_server_names, 1] }
-      pcrf_pps_image_name: { get_param: pcrf_pps_image_name }
-      pcrf_pps_flavor_name: { get_param: pcrf_pps_flavor_name }
-      availabilityzone_name: { get_param: availabilityzone_name }
-      pcrf_security_group_name: { get_param: pcrf_security_group_name }
-      pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
-      pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 1] }
-      pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
-      pcrf_vnf_id: {get_param: pcrf_vnf_id}
-
-  server_pcrf_pps_003:
-    type: nested-pps_v1.0.yaml
-    properties:
-      pcrf_pps_server_name: { get_param: [pcrf_pps_server_names, 2] }
-      pcrf_pps_image_name: { get_param: pcrf_pps_image_name }
-      pcrf_pps_flavor_name: { get_param: pcrf_pps_flavor_name }
-      availabilityzone_name: { get_param: availabilityzone_name }
-      pcrf_security_group_name: { get_param: pcrf_security_group_name }
-      pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
-      pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 2] }
-      pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
-      pcrf_vnf_id: {get_param: pcrf_vnf_id}
-
-  server_pcrf_pps_004:
-    type: nested-pps_v1.0.yaml
-    properties:
-      pcrf_pps_server_name: { get_param: [pcrf_pps_server_names, 3] }
-      pcrf_pps_image_name: { get_param: pcrf_pps_image_name }
-      pcrf_pps_flavor_name: { get_param: pcrf_pps_flavor_name }
-      availabilityzone_name: { get_param: availabilityzone_name }
-      pcrf_security_group_name: { get_param: pcrf_security_group_name }
-      pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
-      pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 3] }
-      pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
-      pcrf_vnf_id: {get_param: pcrf_vnf_id}
-
-  server_pcrf_pps_005:
-    type: nested-pps_v1.0.yaml
-    properties:
-      pcrf_pps_server_name: { get_param: [pcrf_pps_server_names, 4] }
-      pcrf_pps_image_name: { get_param: pcrf_pps_image_name }
-      pcrf_pps_flavor_name: { get_param: pcrf_pps_flavor_name }
-      availabilityzone_name: { get_param: availabilityzone_name }
-      pcrf_security_group_name: { get_param: pcrf_security_group_name }
-      pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
-      pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 4] }
-      pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
-      pcrf_vnf_id: {get_param: pcrf_vnf_id}
-
-  server_pcrf_pps_006:
-    type: nested-pps_v1.0.yaml
-    properties:
-      pcrf_pps_server_name: { get_param: [pcrf_pps_server_names, 5] }
-      pcrf_pps_image_name: { get_param: pcrf_pps_image_name }
-      pcrf_pps_flavor_name: { get_param: pcrf_pps_flavor_name }
-      availabilityzone_name: { get_param: availabilityzone_name }
-      pcrf_security_group_name: { get_param: pcrf_security_group_name }
-      pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
-      pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 5] }
-      pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
-      pcrf_vnf_id: {get_param: pcrf_vnf_id}
-
diff --git a/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/simpleNotif-V4/artifacts/hot-nimbus-psm_v1.0.env b/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/simpleNotif-V4/artifacts/hot-nimbus-psm_v1.0.env
deleted file mode 100644
index 95e450e..0000000
--- a/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/simpleNotif-V4/artifacts/hot-nimbus-psm_v1.0.env
+++ /dev/null
@@ -1,10 +0,0 @@
-parameters:
-  pcrf_psm_server_names: ZRDM1PCRF01PSM001,ZRDM1PCRF01PSM002,ZRDM1PCRF01PSM003,ZRDM1PCRF01PSM004,ZRDM1PCRF01PSM005,ZRDM1PCRF01PSM006,ZRDM1PCRF01PSM007,ZRDM1PCRF01PSM008,ZRDM1PCRF01PSM009,ZRDM1PCRF01PSM010,ZRDM1PCRF01PSM011,ZRDM1PCRF01PSM012
-  pcrf_psm_image_name: PCRF_8.995-ATTM1.0.3.qcow2
-  pcrf_psm_flavor_name: lc.4xlarge4
-  availabilityzone_name: nova
-  pcrf_cps_net_name: Mobisupport-25193-I-INT1_int_pcrf_net_0
-  pcrf_cps_net_ips: 172.26.16.63,172.26.16.64,172.26.16.65,172.26.16.66,172.26.16.67,172.26.16.68,172.26.16.69,172.26.16.70,172.26.16.71,172.26.16.72,172.26.16.73,172.26.16.74
-  pcrf_cps_net_mask: 255.255.255.0
-  pcrf_security_group_name: nimbus_security_group
-  pcrf_vnf_id: 730797234b4a40aa99335157b02871cd
diff --git a/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/simpleNotif-V4/artifacts/hot-nimbus-psm_v1.0.yaml b/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/simpleNotif-V4/artifacts/hot-nimbus-psm_v1.0.yaml
deleted file mode 100644
index 217b0fe..0000000
--- a/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/simpleNotif-V4/artifacts/hot-nimbus-psm_v1.0.yaml
+++ /dev/null
@@ -1,199 +0,0 @@
-heat_template_version: 2013-05-23
-
-description: heat template that creates PCRF Session Manager stack
-
-parameters:
-  pcrf_psm_server_names:
-    type: comma_delimited_list
-    label: PCRF SM server names
-    description: name of the PCRF SM instance
-  pcrf_psm_image_name:
-    type: string
-    label: PCRF SM image name
-    description: PCRF SM image name
-  pcrf_psm_flavor_name:
-    type: string
-    label: PCRF SM flavor name
-    description: flavor name of PCRF SM instance 
-  availabilityzone_name:
-    type: string
-    label: availabilityzone name
-    description: availabilityzone name
-  pcrf_cps_net_name:
-    type: string
-    label: CPS network name
-    description: CPS network name
-  pcrf_cps_net_ips:
-    type: comma_delimited_list
-    label: CPS network ips
-    description: CPS network ips
-  pcrf_cps_net_mask:
-    type: string
-    label: CPS network mask
-    description: CPS network mask
-  pcrf_security_group_name:
-    type: string
-    label: security group name
-    description: the name of security group
-  pcrf_vnf_id:
-    type: string
-    label: PCRF VNF Id
-    description: PCRF VNF Id
-
-resources:
-  server_pcrf_psm_001:
-    type: nested-psm_v1.0.yaml
-    properties:
-      pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 0] }
-      pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
-      pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
-      availabilityzone_name: { get_param: availabilityzone_name }
-      pcrf_security_group_name: { get_param: pcrf_security_group_name }
-      pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
-      pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 0] }
-      pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
-      pcrf_vnf_id: {get_param: pcrf_vnf_id}
-
-  server_pcrf_psm_002:
-    type: nested-psm_v1.0.yaml
-    properties:
-      pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 1] }
-      pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
-      pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
-      availabilityzone_name: { get_param: availabilityzone_name }
-      pcrf_security_group_name: { get_param: pcrf_security_group_name }
-      pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
-      pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 1] }
-      pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
-      pcrf_vnf_id: {get_param: pcrf_vnf_id}
-
-  server_pcrf_psm_003:
-    type: nested-psm_v1.0.yaml
-    properties:
-      pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 2] }
-      pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
-      pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
-      availabilityzone_name: { get_param: availabilityzone_name }
-      pcrf_security_group_name: { get_param: pcrf_security_group_name }
-      pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
-      pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 2] }
-      pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
-      pcrf_vnf_id: {get_param: pcrf_vnf_id}
-
-  server_pcrf_psm_004:
-    type: nested-psm_v1.0.yaml
-    properties:
-      pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 3] }
-      pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
-      pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
-      availabilityzone_name: { get_param: availabilityzone_name }
-      pcrf_security_group_name: { get_param: pcrf_security_group_name }
-      pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
-      pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 3] }
-      pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
-      pcrf_vnf_id: {get_param: pcrf_vnf_id}
-
-  server_pcrf_psm_005:
-    type: nested-psm_v1.0.yaml
-    properties:
-      pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 4] }
-      pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
-      pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
-      availabilityzone_name: { get_param: availabilityzone_name }
-      pcrf_security_group_name: { get_param: pcrf_security_group_name }
-      pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
-      pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 4] }
-      pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
-      pcrf_vnf_id: {get_param: pcrf_vnf_id}
-
-  server_pcrf_psm_006:
-    type: nested-psm_v1.0.yaml
-    properties:
-      pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 5] }
-      pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
-      pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
-      availabilityzone_name: { get_param: availabilityzone_name }
-      pcrf_security_group_name: { get_param: pcrf_security_group_name }
-      pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
-      pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 5] }
-      pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
-      pcrf_vnf_id: {get_param: pcrf_vnf_id}
-
-  server_pcrf_psm_007:
-    type: nested-psm_v1.0.yaml
-    properties:
-      pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 6] }
-      pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
-      pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
-      availabilityzone_name: { get_param: availabilityzone_name }
-      pcrf_security_group_name: { get_param: pcrf_security_group_name }
-      pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
-      pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 6] }
-      pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
-      pcrf_vnf_id: {get_param: pcrf_vnf_id}
-
-  server_pcrf_psm_008:
-    type: nested-psm_v1.0.yaml
-    properties:
-      pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 7] }
-      pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
-      pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
-      availabilityzone_name: { get_param: availabilityzone_name }
-      pcrf_security_group_name: { get_param: pcrf_security_group_name }
-      pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
-      pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 7] }
-      pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
-      pcrf_vnf_id: {get_param: pcrf_vnf_id}
-
-  server_pcrf_psm_009:
-    type: nested-psm_v1.0.yaml
-    properties:
-      pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 8] }
-      pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
-      pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
-      availabilityzone_name: { get_param: availabilityzone_name }
-      pcrf_security_group_name: { get_param: pcrf_security_group_name }
-      pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
-      pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 8] }
-      pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
-      pcrf_vnf_id: {get_param: pcrf_vnf_id}
-
-  server_pcrf_psm_010:
-    type: nested-psm_v1.0.yaml
-    properties:
-      pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 9] }
-      pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
-      pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
-      availabilityzone_name: { get_param: availabilityzone_name }
-      pcrf_security_group_name: { get_param: pcrf_security_group_name }
-      pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
-      pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 9] }
-      pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
-      pcrf_vnf_id: {get_param: pcrf_vnf_id}
-
-  server_pcrf_psm_011:
-    type: nested-psm_v1.0.yaml
-    properties:
-      pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 10] }
-      pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
-      pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
-      availabilityzone_name: { get_param: availabilityzone_name }
-      pcrf_security_group_name: { get_param: pcrf_security_group_name }
-      pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
-      pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 10] }
-      pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
-      pcrf_vnf_id: {get_param: pcrf_vnf_id}
-
-  server_pcrf_psm_012:
-    type: nested-psm_v1.0.yaml
-    properties:
-      pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 11] }
-      pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
-      pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
-      availabilityzone_name: { get_param: availabilityzone_name }
-      pcrf_security_group_name: { get_param: pcrf_security_group_name }
-      pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
-      pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 11] }
-      pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
-      pcrf_vnf_id: {get_param: pcrf_vnf_id}
- 
diff --git a/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/simpleNotif-V4/artifacts/hot-nimbus-swift-container_v1.0.env b/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/simpleNotif-V4/artifacts/hot-nimbus-swift-container_v1.0.env
deleted file mode 100644
index 5267ee4..0000000
--- a/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/simpleNotif-V4/artifacts/hot-nimbus-swift-container_v1.0.env
+++ /dev/null
@@ -1,3 +0,0 @@
-parameters:
-  pcrf_swift_container_name_1: PCRF_Config_Container_1
-  pcrf_swift_container_purge_on_delete_flag_1: false
diff --git a/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/simpleNotif-V4/artifacts/hot-nimbus-swift-container_v1.0.yaml b/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/simpleNotif-V4/artifacts/hot-nimbus-swift-container_v1.0.yaml
deleted file mode 100644
index ab427bb..0000000
--- a/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/simpleNotif-V4/artifacts/hot-nimbus-swift-container_v1.0.yaml
+++ /dev/null
@@ -1,30 +0,0 @@
-heat_template_version: 2013-05-23
-
-description: heat template that creates PCRF Session Manager stack
-
-parameters:
-   pcrf_swift_container_name_1:
-     type: string
-     label: Swift Container name
-     description: Swift Container Name
-   pcrf_swift_container_purge_on_delete_flag_1:
-     type: boolean
-     label: Purge on Delete Flag
-     description: Purge on Delete Flag
-
-resources:
-  pcrf_swift_container_1:
-    type: OS::Swift::Container
-    properties:
-      name: { get_param: pcrf_swift_container_name_1 }
-      PurgeOnDelete: { get_param: pcrf_swift_container_purge_on_delete_flag_1 }
-      X-Container-Read: ".r:*"
-     
-outputs:
-  pcrf_swift_container_id_1:
-    description: the pcrf_swift_container_1 id
-    value: { get_resource: pcrf_swift_container_1 }
-  pcrf_swift_container_url_1:
-    description: the pcrf_swift_container_1 url
-    value: { get_attr: [ pcrf_swift_container_1, WebsiteURL ] }
-    
\ No newline at end of file
diff --git a/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/simpleNotif-V4/artifacts/mount_iso_script.sh b/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/simpleNotif-V4/artifacts/mount_iso_script.sh
deleted file mode 100644
index 91df598..0000000
--- a/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/simpleNotif-V4/artifacts/mount_iso_script.sh
+++ /dev/null
@@ -1,34 +0,0 @@
-#!/bin/bash
-
-#. .config 
-#following would be in the .config file
- device_name="/dev/vde"
- install_script="install_nimbus.sh"
- enable_logic_flag_file=".flag"
-#end of config file
-
-#get the semaphore, 0 - disbaled, 1- enabled
-flag=$(cat ${enable_logic_flag_file})
-
-#check if device is mounted already
-test=$(mount | grep ${device_name})
-if [ "$flag" == "1" ]; then
-	if [ -e ${device_name} ] && [ ! "${test}" ]; then
-		#mount the iso image
-		mount -t iso9660 -v -o loop /dev/vde/ /mnt/iso
-		#if availabe run the install script (it contains the install.sh steps)
-		if [ -e "${install_script}" ] && [ -f "${install_script}" ]; then
-			${install_script}
-		fi
-		#disable the script from attempting to 
-		#  mount and run install again until needed;
-		echo "0" > ${enable_logic_flag_file}
-		#if nedeed add step to comment out the crontab line here;
-	fi
-else
-	echo "Auto mounting ISO & run install logic disabled!"
-fi
-
-#cron job
-# * * * * * /mount_iso_script.sh
-
diff --git a/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/simpleNotif-V4/artifacts/nested-oam_v1.0.yaml b/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/simpleNotif-V4/artifacts/nested-oam_v1.0.yaml
deleted file mode 100644
index fa3b04e..0000000
--- a/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/simpleNotif-V4/artifacts/nested-oam_v1.0.yaml
+++ /dev/null
@@ -1,156 +0,0 @@
-heat_template_version: 2013-05-23
-
-description: nested heat template that creates a PCRF OAM node stack
-
-parameters:
-  pcrf_oam_server_name:
-    type: string
-    label: PCRF OAM server name
-    description: PCRF OAM server name
-  pcrf_oam_image_name:
-    type: string
-    label: image name
-    description: PCRF OAM image name
-  pcrf_oam_flavor_name:
-    type: string
-    label: PCRF OAM flavor name
-    description: flavor name of PCRF OAM instance
-  availabilityzone_name:
-    type: string
-    label: availabilityzone name
-    description: availabilityzone name
-  pcrf_cps_net_name:
-    type: string
-    label: CPS network name
-    description: CPS network name
-  pcrf_cps_net_ip:
-    type: string
-    label: CPS network ip
-    description: CPS network ip
-  pcrf_cps_net_mask:
-    type: string
-    label: CPS network mask
-    description: CPS network mask
-  pcrf_arbiter_vip:
-    type: string
-    label: OAM Arbiter LB VIP
-    description: OAM Arbiter LB VIP
-  pcrf_oam_net_name:
-    type: string
-    label: OAM network name
-    description: OAM network name
-  pcrf_oam_net_ip:
-    type: string
-    label: OAM network ip
-    description: OAM network ip
-  pcrf_oam_net_gw:
-    type: string
-    label: CPS network gateway
-    description: CPS network gateway
-  pcrf_oam_net_mask:
-    type: string
-    label: CPS network mask
-    description: CPS network mask
-  pcrf_oam_volume_id:
-    type: string
-    label: CPS OAM Cinder Volume
-    description: CPS OAM Cinder Volume
-  pcrf_security_group_name:
-    type: string
-    label: security group name
-    description: the name of security group
-  pcrf_vnf_id:
-    type: string
-    label: PCRF VNF Id
-    description: PCRF VNF Id
-
-resources:
-  network:
-    type: OS::Heat::CloudConfig
-    properties:
-      cloud_config:
-        write_files:
-          - path: /etc/sysconfig/network-scripts/ifcfg-eth0
-            permissions: "0644"
-            content:
-              str_replace:
-                template: { get_file: nimbus-ethernet }
-                params:
-                  $dev: eth0
-                  $ip: { get_param: pcrf_cps_net_ip }
-                  $netmask: { get_param: pcrf_cps_net_mask }
-          - path: /etc/sysconfig/network-scripts/ifcfg-eth1
-            permissions: "0644"
-            content:
-              str_replace:
-                template: { get_file: nimbus-ethernet-gw }
-                params:
-                  $dev: eth1
-                  $ip: { get_param: pcrf_oam_net_ip }
-                  $netmask: { get_param: pcrf_oam_net_mask }
-                  $gateway: { get_param: pcrf_oam_net_gw }
-        runcmd:
-          - ifdown eth0 && ifup eth0
-          - ifdown eth1 && ifup eth1
-  script_init:
-    type: OS::Heat::SoftwareConfig
-    properties:
-      group: ungrouped
-      config:
-        str_replace:
-          template: { get_file: cloud-nimbus.sh }
-          params:
-            $vm_name: { get_param: pcrf_oam_server_name }
-  pcrf_server_init:
-    type: OS::Heat::MultipartMime
-    properties:
-      parts:
-      - config: { get_resource: network}
-      - config: { get_resource: script_init}
-
-  pcrf_server_oam:
-    type: OS::Nova::Server
-    properties:
-      config_drive: "True"
-      name: { get_param: pcrf_oam_server_name }
-      image: { get_param: pcrf_oam_image_name }
-      flavor: { get_param: pcrf_oam_flavor_name }
-      availability_zone: { get_param: availabilityzone_name }
-      networks:
-        - port: { get_resource: pcrf_oam_port_0}
-        - port: { get_resource: pcrf_oam_port_1}
-      user_data_format: RAW
-      user_data:
-        get_resource: pcrf_server_init
-      metadata:
-        vnf_id: {get_param: pcrf_vnf_id}
-  
-  pcrf_oam_port_0:
-    type: OS::Neutron::Port
-    properties:
-      network: { get_param: pcrf_cps_net_name }
-      fixed_ips:
-        - ip_address: { get_param: pcrf_cps_net_ip }
-      allowed_address_pairs:
-        - ip_address: { get_param: pcrf_arbiter_vip }
-      security_groups: [{ get_param: pcrf_security_group_name }]
-
-  pcrf_oam_port_1:
-    type: OS::Neutron::Port
-    properties:
-      network: { get_param: pcrf_oam_net_name }
-      fixed_ips:
-        - ip_address: { get_param: pcrf_oam_net_ip }
-      security_groups: [{ get_param: pcrf_security_group_name }]
-
-  pcrf_oam_vol_attachment:
-    type: OS::Cinder::VolumeAttachment
-    properties:
-      volume_id: { get_param: pcrf_oam_volume_id }
-      mountpoint: /dev/vdd
-      instance_uuid: { get_resource: pcrf_server_oam }
-
-outputs:
-  pcrf_oam_vol_attachment_id:
-    description: the pcrf_oam_vol_attachment_id id
-    value: { get_resource: pcrf_oam_vol_attachment }
diff --git a/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/simpleNotif-V4/artifacts/nested-pcm_v1.0.yaml b/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/simpleNotif-V4/artifacts/nested-pcm_v1.0.yaml
deleted file mode 100644
index a3129bb..0000000
--- a/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/simpleNotif-V4/artifacts/nested-pcm_v1.0.yaml
+++ /dev/null
@@ -1,150 +0,0 @@
-heat_template_version: 2013-05-23
-
-description: heat template that creates PCRF Cluman stack
-
-parameters:
-  pcrf_pcm_server_name:
-    type: string
-    label: PCRF CM server name
-    description: PCRF CM server name
-  pcrf_pcm_image_name:
-    type: string
-    label: image name
-    description: PCRF CM image name
-  pcrf_pcm_flavor_name:
-    type: string
-    label: PCRF CM flavor name
-    description: flavor name of PCRF CM instance
-  availabilityzone_name:
-    type: string
-    label: availabilityzone name
-    description: availabilityzone name
-  pcrf_cps_net_name:
-    type: string
-    label: CPS network name
-    description: CPS network name
-  pcrf_cps_net_ip:
-    type: string
-    label: CPS network ip
-    description: CPS network ip
-  pcrf_cps_net_mask:
-    type: string
-    label: CPS network mask
-    description: CPS network mask
-  pcrf_oam_net_name:
-    type: string
-    label: OAM network name
-    description: OAM network name
-  pcrf_oam_net_ip:
-    type: string
-    label: OAM network ip
-    description: OAM network ip
-  pcrf_oam_net_gw:
-    type: string
-    label: CPS network gateway
-    description: CPS network gateway
-  pcrf_oam_net_mask:
-    type: string
-    label: CPS network mask
-    description: CPS network mask
-  pcrf_pcm_volume_id:
-    type: string
-    label: CPS Cluman Cinder Volume
-    description: CPS Cluman Cinder Volume
-  pcrf_security_group_name:
-    type: string
-    label: security group name
-    description: the name of security group
-  pcrf_vnf_id:
-    type: string
-    label: PCRF VNF Id
-    description: PCRF VNF Id
-
-resources:
-  network:
-    type: OS::Heat::CloudConfig
-    properties:
-      cloud_config:
-        write_files:
-          - path: /etc/sysconfig/network-scripts/ifcfg-eth0
-            permissions: "0644"
-            content:
-              str_replace:
-                template: { get_file: nimbus-ethernet }
-                params:
-                  $dev: eth0
-                  $ip: { get_param: pcrf_cps_net_ip }
-                  $netmask: { get_param: pcrf_cps_net_mask }
-          - path: /etc/sysconfig/network-scripts/ifcfg-eth1
-            permissions: "0644"
-            content:
-              str_replace:
-                template: { get_file: nimbus-ethernet-gw }
-                params:
-                  $dev: eth1
-                  $ip: { get_param: pcrf_oam_net_ip }
-                  $netmask: { get_param: pcrf_oam_net_mask }
-                  $gateway: { get_param: pcrf_oam_net_gw }
-        runcmd:
-          - ifdown eth0 && ifup eth0
-          - ifdown eth1 && ifup eth1
-  script_init:
-    type: OS::Heat::SoftwareConfig
-    properties:
-      group: ungrouped
-      config:
-        str_replace:
-          template: { get_file: cloud-nimbus.sh }
-          params:
-            $vm_name: { get_param: pcrf_pcm_server_name }
-  pcrf_server_init:
-    type: OS::Heat::MultipartMime
-    properties:
-      parts:
-      - config: { get_resource: network}
-      - config: { get_resource: script_init}
-
-  pcrf_server_pcm:
-    type: OS::Nova::Server
-    properties:
-      config_drive: "True"
-      name: { get_param: pcrf_pcm_server_name }
-      image: { get_param: pcrf_pcm_image_name }
-      flavor: { get_param: pcrf_pcm_flavor_name }
-      availability_zone: { get_param: availabilityzone_name }
-      networks:
-        - port: { get_resource: pcrf_pcm_port_0}
-        - port: { get_resource: pcrf_pcm_port_1}
-      user_data_format: RAW
-      user_data:
-        get_resource: pcrf_server_init
-      metadata:
-        vnf_id: {get_param: pcrf_vnf_id}
-
-  pcrf_pcm_port_0:
-    type: OS::Neutron::Port
-    properties:
-      network: { get_param: pcrf_cps_net_name }
-      fixed_ips:
-        - ip_address: { get_param: pcrf_cps_net_ip }
-      security_groups: [{ get_param: pcrf_security_group_name }]
-
-  pcrf_pcm_port_1:
-    type: OS::Neutron::Port
-    properties:
-      network: { get_param: pcrf_oam_net_name }
-      fixed_ips:
-        - ip_address: { get_param: pcrf_oam_net_ip }
-      security_groups: [{ get_param: pcrf_security_group_name }]
-
-  volume_attachment:
-    type: OS::Cinder::VolumeAttachment
-    properties:
-      volume_id: { get_param: pcrf_pcm_volume_id }
-      mountpoint: /dev/vdd
-      instance_uuid: { get_resource: pcrf_server_pcm }
-
-outputs:
-  pcrf_server_pcm_id:
-    description: the pcm server id
-    value: { get_resource: pcrf_server_pcm }
\ No newline at end of file
diff --git a/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/simpleNotif-V4/artifacts/nested-ppd_v1.0.yaml b/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/simpleNotif-V4/artifacts/nested-ppd_v1.0.yaml
deleted file mode 100644
index 169522b..0000000
--- a/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/simpleNotif-V4/artifacts/nested-ppd_v1.0.yaml
+++ /dev/null
@@ -1,333 +0,0 @@
-heat_template_version: 2013-05-23
-
-description: heat template that creates PCRF Policy Director stack
-
-parameters:
-  pcrf_ppd_server_name:
-    type: string
-    label: PCRF PD server name
-    description: PCRF PD server name
-  pcrf_ppd_image_name:
-    type: string
-    label: image name
-    description: PCRF PD image name
-  pcrf_ppd_flavor_name:
-    type: string
-    label: PCRF PD flavor name
-    description: flavor name of PCRF PD instance
-  availabilityzone_name:
-    type: string
-    label: availabilityzone name
-    description: availabilityzone name
-  pcrf_cps_net_name:
-    type: string
-    label: CPS network name
-    description: CPS network name
-  pcrf_cps_net_ip:
-    type: string
-    label: CPS network ip
-    description: CPS network ip
-  pcrf_cps_net_mask:
-    type: string
-    label: CPS network mask
-    description: CPS network mask
-  pcrf_lb_internal_vip:
-    type: string
-    label: CPS Internal LB VIP
-    description: CPS Internal LB VIP
-  pcrf_oam_net_name:
-    type: string
-    label: OAM network name
-    description: OAM network name
-  pcrf_oam_net_ip:
-    type: string
-    label: OAM network ip
-    description: OAM network ip
-  pcrf_oam_net_gw:
-    type: string
-    label: CPS network gateway
-    description: CPS network gateway
-  pcrf_oam_net_mask:
-    type: string
-    label: CPS network mask
-    description: CPS network mask
-  pcrf_lb_management_vip:
-    type: string
-    label: CPS OAM LB VIP
-    description: CPS OAM LB VIP
-  pcrf_gx_net_name:
-    type: string
-    label: Gx network name
-    description: Gx network name
-  pcrf_gx_net_ip:
-    type: string
-    label: Gx network ip
-    description: Gx network ip
-  pcrf_gx_net_mask:
-    type: string
-    label: Gx network mask
-    description: Gx network mask
-  pcrf_sp_net_name:
-    type: string
-    label: Sp network name
-    description: Sp network name
-  pcrf_sp_net_ip:
-    type: string
-    label: Sp network ip
-    description: Sp network ip
-  pcrf_sp_net_mask:
-    type: string
-    label: Sp network mask
-    description: Sp network mask
-  pcrf_sy_net_name:
-    type: string
-    label: Sy network name
-    description: Sy network name
-  pcrf_sy_net_ip:
-    type: string
-    label: Sy network ip
-    description: Sy network ip
-  pcrf_sy_net_mask:
-    type: string
-    label: Sy network mask
-    description: Sy network mask
-  pcrf_rx_net_name:
-    type: string
-    label: Rx network name
-    description: Rx network name
-  pcrf_rx_net_ip:
-    type: string
-    label: Rx network ip
-    description: Rx network ip
-  pcrf_rx_net_mask:
-    type: string
-    label: Rx network mask
-    description: Rx network mask
-  pcrf_sd_net_name:
-    type: string
-    label: Sd network name
-    description: Sd network name
-  pcrf_sd_net_ip:
-    type: string
-    label: Sd network ip
-    description: Sd network ip
-  pcrf_sd_net_mask:
-    type: string
-    label: Sd network mask
-    description: Sd network mask
-  pcrf_sgi_sy_net_name:
-    type: string
-    label: Sgi Sy network name
-    description: Sgi Sy network name
-  pcrf_sgi_sy_net_ip:
-    type: string
-    label: Sgi Sy network ip
-    description: Sgi Sy network ip
-  pcrf_sgi_sy_net_mask:
-    type: string
-    label: Sgi Sy network mask
-    description: Sgi Sy network mask
-  pcrf_security_group_name:
-    type: string
-    label: security group name
-    description: the name of security group
-  pcrf_vnf_id:
-    type: string
-    label: PCRF VNF Id
-    description: PCRF VNF Id
-
-resources:
-  network:
-    type: OS::Heat::CloudConfig
-    properties:
-      cloud_config:
-        write_files:
-          - path: /etc/sysconfig/network-scripts/ifcfg-eth0
-            permissions: "0644"
-            content:
-              str_replace:
-                template: { get_file: nimbus-ethernet }
-                params:
-                  $dev: eth0
-                  $ip: { get_param: pcrf_cps_net_ip }
-                  $netmask: { get_param: pcrf_cps_net_mask }
-          - path: /etc/sysconfig/network-scripts/ifcfg-eth1
-            permissions: "0644"
-            content:
-              str_replace:
-                template: { get_file: nimbus-ethernet-gw }
-                params:
-                  $dev: eth1
-                  $ip: { get_param: pcrf_oam_net_ip }
-                  $netmask: { get_param: pcrf_oam_net_mask }
-                  $gateway: { get_param: pcrf_oam_net_gw }
-          - path: /etc/sysconfig/network-scripts/ifcfg-eth2
-            permissions: "0644"
-            content:
-              str_replace:
-                template: { get_file: nimbus-ethernet }
-                params:
-                  $dev: eth2
-                  $ip: { get_param: pcrf_gx_net_ip }
-                  $netmask: { get_param: pcrf_gx_net_mask }
-          - path: /etc/sysconfig/network-scripts/ifcfg-eth3
-            permissions: "0644"
-            content:
-              str_replace:
-                template: { get_file: nimbus-ethernet }
-                params:
-                  $dev: eth3
-                  $ip: { get_param: pcrf_sp_net_ip }
-                  $netmask: { get_param: pcrf_sp_net_mask }
-          - path: /etc/sysconfig/network-scripts/ifcfg-eth4
-            permissions: "0644"
-            content:
-              str_replace:
-                template: { get_file: nimbus-ethernet }
-                params:
-                  $dev: eth4
-                  $ip: { get_param: pcrf_sy_net_ip }
-                  $netmask: { get_param: pcrf_sy_net_mask }
-          - path: /etc/sysconfig/network-scripts/ifcfg-eth5
-            permissions: "0644"
-            content:
-              str_replace:
-                template: { get_file: nimbus-ethernet }
-                params:
-                  $dev: eth5
-                  $ip: { get_param: pcrf_rx_net_ip }
-                  $netmask: { get_param: pcrf_rx_net_mask }
-          - path: /etc/sysconfig/network-scripts/ifcfg-eth6
-            permissions: "0644"
-            content:
-              str_replace:
-                template: { get_file: nimbus-ethernet }
-                params:
-                  $dev: eth6
-                  $ip: { get_param: pcrf_sd_net_ip }
-                  $netmask: { get_param: pcrf_sd_net_mask }
-          - path: /etc/sysconfig/network-scripts/ifcfg-eth7
-            permissions: "0644"
-            content:
-              str_replace:
-                template: { get_file: nimbus-ethernet }
-                params:
-                  $dev: eth7
-                  $ip: { get_param: pcrf_sgi_sy_net_ip }
-                  $netmask: { get_param: pcrf_sgi_sy_net_mask }
-        runcmd:
-          - ifdown eth0 && ifup eth0
-          - ifdown eth1 && ifup eth1
-          - ifdown eth2 && ifup eth2
-          - ifdown eth3 && ifup eth3
-          - ifdown eth4 && ifup eth4
-          - ifdown eth5 && ifup eth5
-          - ifdown eth6 && ifup eth6
-          - ifdown eth7 && ifup eth7
-  script_init:
-    type: OS::Heat::SoftwareConfig
-    properties:
-      group: ungrouped
-      config:
-        str_replace:
-          template: { get_file: cloud-nimbus.sh }
-          params:
-            $vm_name: { get_param: pcrf_ppd_server_name }
-  pcrf_server_init:
-    type: OS::Heat::MultipartMime
-    properties:
-      parts:
-      - config: { get_resource: network}
-      - config: { get_resource: script_init}
-
-  pcrf_server_ppd: 
-    type: OS::Nova::Server
-    properties:
-      config_drive: "True"
-      name: { get_param: pcrf_ppd_server_name }
-      image: { get_param: pcrf_ppd_image_name }
-      flavor: { get_param: pcrf_ppd_flavor_name }
-      availability_zone: { get_param: availabilityzone_name }
-      networks:
-        - port: { get_resource: pcrf_ppd_port_0}
-        - port: { get_resource: pcrf_ppd_port_1}
-        - port: { get_resource: pcrf_ppd_port_2}
-        - port: { get_resource: pcrf_ppd_port_3}
-        - port: { get_resource: pcrf_ppd_port_4}
-        - port: { get_resource: pcrf_ppd_port_5}
-        - port: { get_resource: pcrf_ppd_port_6}
-        - port: { get_resource: pcrf_ppd_port_7}
-      user_data_format: RAW
-      user_data:
-        get_resource: pcrf_server_init
-      metadata:
-        vnf_id: {get_param: pcrf_vnf_id}
-
-  pcrf_ppd_port_0:
-    type: OS::Neutron::Port
-    properties:
-      network: { get_param: pcrf_cps_net_name }
-      fixed_ips:
-        - ip_address: { get_param: pcrf_cps_net_ip }
-      security_groups: [{ get_param: pcrf_security_group_name }]
-      allowed_address_pairs:
-        - ip_address: { get_param: pcrf_lb_internal_vip }
-
-  pcrf_ppd_port_1:
-    type: OS::Neutron::Port
-    properties:
-      network: { get_param: pcrf_oam_net_name }
-      fixed_ips:
-        - ip_address: { get_param: pcrf_oam_net_ip }
-      security_groups: [{ get_param: pcrf_security_group_name }]
-      allowed_address_pairs:
-        - ip_address: { get_param: pcrf_lb_management_vip } 
- 
-  pcrf_ppd_port_2:
-    type: OS::Neutron::Port
-    properties:
-      network: { get_param: pcrf_gx_net_name }
-      fixed_ips:
-        - ip_address: { get_param: pcrf_gx_net_ip }
-      security_groups: [{ get_param: pcrf_security_group_name }]
-
-  pcrf_ppd_port_3:
-    type: OS::Neutron::Port
-    properties:
-      network: { get_param: pcrf_sp_net_name }
-      fixed_ips:
-        - ip_address: { get_param: pcrf_sp_net_ip }
-      security_groups: [{ get_param: pcrf_security_group_name }]
-
-  pcrf_ppd_port_4:
-    type: OS::Neutron::Port
-    properties:
-      network: { get_param: pcrf_sy_net_name }
-      fixed_ips:
-        - ip_address: { get_param: pcrf_sy_net_ip }
-      security_groups: [{ get_param: pcrf_security_group_name }]
-
-  pcrf_ppd_port_5:
-    type: OS::Neutron::Port
-    properties:
-      network: { get_param: pcrf_rx_net_name }
-      fixed_ips:
-        - ip_address: { get_param: pcrf_rx_net_ip }
-      security_groups: [{ get_param: pcrf_security_group_name }]
-  
-  pcrf_ppd_port_6:
-    type: OS::Neutron::Port
-    properties:
-      network: { get_param: pcrf_sd_net_name }
-      fixed_ips:
-        - ip_address: { get_param: pcrf_sd_net_ip }
-      security_groups: [{ get_param: pcrf_security_group_name }]
-
-  pcrf_ppd_port_7:
-    type: OS::Neutron::Port
-    properties:
-      network: { get_param: pcrf_sgi_sy_net_name }
-      fixed_ips:
-        - ip_address: { get_param: pcrf_sgi_sy_net_ip }
-      security_groups: [{ get_param: pcrf_security_group_name }]
-
diff --git a/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/simpleNotif-V4/artifacts/nested-pps_v1.0.yaml b/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/simpleNotif-V4/artifacts/nested-pps_v1.0.yaml
deleted file mode 100644
index 8cb6e15..0000000
--- a/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/simpleNotif-V4/artifacts/nested-pps_v1.0.yaml
+++ /dev/null
@@ -1,99 +0,0 @@
-heat_template_version: 2013-05-23
-
-description: heat template that creates PCRF Policy Server stack
-
-parameters:
-  pcrf_pps_server_name:
-    type: string
-    label: PCRF PS server name
-    description: PCRF PS server name
-  pcrf_pps_image_name:
-    type: string
-    label: PCRF PS image name
-    description: PCRF PS image name
-  pcrf_pps_flavor_name:
-    type: string
-    label: PCRF PS flavor name
-    description: flavor name of PCRF PS instance
-  availabilityzone_name:
-    type: string
-    label: availabilityzone name
-    description: availabilityzone name
-  pcrf_cps_net_name:
-    type: string
-    label: CPS network name
-    description: CPS network name
-  pcrf_cps_net_ip:
-    type: string
-    label: CPS network ip
-    description: CPS network ip
-  pcrf_cps_net_mask:
-    type: string
-    label: CPS network mask
-    description: CPS network mask
-  pcrf_security_group_name:
-    type: string
-    label: security group name
-    description: the name of security group
-  pcrf_vnf_id:
-    type: string
-    label: PCRF VNF Id
-    description: PCRF VNF Id
-
-resources:
-  script_init:
-    type: OS::Heat::SoftwareConfig
-    properties:
-      group: ungrouped
-      config:
-        str_replace:
-          template: { get_file: cloud-nimbus.sh }
-          params:
-            $vm_name: { get_param: pcrf_pps_server_name }
-  network:
-    type: OS::Heat::CloudConfig
-    properties:
-      cloud_config:
-        write_files:
-          - path: /etc/sysconfig/network-scripts/ifcfg-eth0
-            permissions: "0644"
-            content:
-              str_replace:
-                template: { get_file: nimbus-ethernet }
-                params:
-                  $dev: eth0
-                  $ip: { get_param: pcrf_cps_net_ip }
-                  $netmask: { get_param: pcrf_cps_net_mask }
-        runcmd:
-          - ifdown eth0 && ifup eth0
-
-  pcrf_server_init:
-    type: OS::Heat::MultipartMime
-    properties:
-      parts:
-      - config: { get_resource: network}
-      - config: { get_resource: script_init}
-
-  pcrf_server_pps:
-    type: OS::Nova::Server
-    properties:
-      config_drive: "True"
-      name: { get_param: pcrf_pps_server_name }
-      image: { get_param: pcrf_pps_image_name }
-      flavor: { get_param: pcrf_pps_flavor_name }
-      availability_zone: { get_param: availabilityzone_name }
-      networks:
-        - port: { get_resource: pcrf_pps_port_0}
-      user_data_format: RAW
-      user_data:
-        get_resource: pcrf_server_init
-      metadata:
-        vnf_id: {get_param: pcrf_vnf_id}
-
-  pcrf_pps_port_0:
-    type: OS::Neutron::Port
-    properties:
-      network: { get_param: pcrf_cps_net_name }
-      fixed_ips:
-        - ip_address: { get_param: pcrf_cps_net_ip }
-      security_groups: [{ get_param: pcrf_security_group_name }]
diff --git a/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/simpleNotif-V4/artifacts/nested-psm_v1.0.yaml b/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/simpleNotif-V4/artifacts/nested-psm_v1.0.yaml
deleted file mode 100644
index 64c7484..0000000
--- a/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/simpleNotif-V4/artifacts/nested-psm_v1.0.yaml
+++ /dev/null
@@ -1,99 +0,0 @@
-heat_template_version: 2013-05-23
-
-description: heat template that creates PCRF Session Manager stack
-
-parameters:
-  pcrf_psm_server_name:
-    type: string
-    label: PCRF SM server name
-    description: PCRF SM server name
-  pcrf_psm_image_name:
-    type: string
-    label: image name
-    description: PCRF SM image name
-  pcrf_psm_flavor_name:
-    type: string
-    label: PCRF SM flavor name
-    description: flavor name of PCRF SM instance 
-  availabilityzone_name:
-    type: string
-    label: availabilityzone name
-    description: availabilityzone name
-  pcrf_cps_net_name:
-    type: string
-    label: CPS network name
-    description: CPS network name
-  pcrf_cps_net_ip:
-    type: string
-    label: CPS network ip
-    description: CPS network ip
-  pcrf_cps_net_mask:
-    type: string
-    label: CPS network mask
-    description: CPS network mask
-  pcrf_security_group_name:
-    type: string
-    label: security group name
-    description: the name of security group
-  pcrf_vnf_id:
-    type: string
-    label: PCRF VNF Id
-    description: PCRF VNF Id
-
-resources:
-  network:
-    type: OS::Heat::CloudConfig
-    properties:
-      cloud_config:
-        write_files:
-          - path: /etc/sysconfig/network-scripts/ifcfg-eth0
-            permissions: "0644"
-            content:
-              str_replace:
-                template: { get_file: nimbus-ethernet }
-                params:
-                  $dev: eth0
-                  $ip: { get_param: pcrf_cps_net_ip }
-                  $netmask: { get_param: pcrf_cps_net_mask }
-        runcmd:
-          - ifdown eth0 && ifup eth0
-  script_init:
-    type: OS::Heat::SoftwareConfig
-    properties:
-      group: ungrouped
-      config:
-        str_replace:
-          template: { get_file: cloud-nimbus.sh }
-          params:
-            $vm_name: { get_param: pcrf_psm_server_name }
-  pcrf_server_init:
-    type: OS::Heat::MultipartMime
-    properties:
-      parts:
-      - config: { get_resource: network}
-      - config: { get_resource: script_init}
-
-  pcrf_server_psm:
-    type: OS::Nova::Server
-    properties:
-      config_drive: "True"
-      name: { get_param: pcrf_psm_server_name }
-      image: { get_param: pcrf_psm_image_name }
-      flavor: { get_param: pcrf_psm_flavor_name }
-      availability_zone: { get_param: availabilityzone_name }
-      networks:
-        - port: { get_resource: psm01_port_0}
-      user_data_format: RAW
-      user_data:
-        get_resource: pcrf_server_init
-      metadata:
-        vnf_id: {get_param: pcrf_vnf_id}
-      #scheduler_hints: {group: { get_resource: servergroup_nimbus }}
-  
-  psm01_port_0:
-    type: OS::Neutron::Port
-    properties:
-      network: { get_param: pcrf_cps_net_name }
-      fixed_ips:
-        - ip_address: { get_param: pcrf_cps_net_ip }
-      security_groups: [{ get_param: pcrf_security_group_name }]
\ No newline at end of file
diff --git a/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/simpleNotif-V4/artifacts/vnf-module-artifact.json b/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/simpleNotif-V4/artifacts/vnf-module-artifact.json
deleted file mode 100644
index 50fb1b7..0000000
--- a/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/simpleNotif-V4/artifacts/vnf-module-artifact.json
+++ /dev/null
@@ -1,20 +0,0 @@
-[
-  {
-    "vfModuleModelName": "VF_RI2_G6_withArtifacts::module-1",
-    "vfModuleModelInvariantUUID": "585822c7-4027-4f84-ba50-e9248606f132",
-    "vfModuleModelVersion": "1.0",
-    "vfModuleModelUUID": "1e34774e-715e-4fd5-bd08-7b654622f33e.VF_RI2_G6_withArtifacts::module-1.group",
-    "vfModuleModelDescription": "vf Module Description",
-    "vfModuleModelCustomizationUUID": "585822c7-4027-4f84-ba50-e9248606f132",
-    "isBase": true,
-    "artifacts": [
-      "Artifact-UUID1",
-      "EnvArtifact-UUID2",
-      "NestedArtifact-UUID3",
-      "ScriptArtifact-UUID1",
-      "VolumeArtifact-UUID1",
-      "VolumeEnvArtifact-UUID1"
-    ],
-    "properties": {"test":"test"}
-  }
-]
\ No newline at end of file
diff --git a/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/simpleNotif-V4/notif-structure.json b/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/simpleNotif-V4/notif-structure.json
deleted file mode 100644
index c4b1134..0000000
--- a/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/simpleNotif-V4/notif-structure.json
+++ /dev/null
@@ -1,117 +0,0 @@
-{
-    "serviceName": "test-service",
-    "serviceInvariantUUID": "585822c7-4027-4f84-ba50-e9248606f134",
-    "serviceUUID": "1e34774e-715e-4fd5-bd09-7b654622f35h",
-    "serviceVersion": "4.0",
-    "serviceArtifacts":
-    [
-
-    ],
-
-    "resources":
-    [
-        {
-            "resourceInstanceName": "resource-1",
-            "resourceInvariantUUID": "585822c7-4027-4f84-ba50-e9248606f134",
-            "resourceName": "resourceName-1",
-            "resourceType": "VF",
-            "resourceUUID": "585822c7-4027-4f84-ba50-e9248606f136",
-            "resourceVersion": "2.0",
-            "category":  "category",
-            "artifacts":
-            [
-                {
-                    "artifactChecksum": "CheckSum",
-                    "artifactDescription": "Meta data for VFModule",
-                    "artifactName": "vnf-module-artifact.json",
-
-                    "artifactType": "VF_MODULES_METADATA",
-                    "artifactURL": "vnf-module-artifact.json",
-                    "artifactUUID": "VfArtifact-UUID2",
-                    "artifactVersion": "1.0"
-
-                },
-                {
-                    "artifactChecksum": "CheckSum",
-                    "artifactDescription": "Nimbus Heat OAM",
-                    "artifactName": "hot-nimbus-oam_v1.0.yaml",
-                    "artifactTimeout": 100,
-                    "artifactType": "HEAT",
-                    "artifactURL": "hot-nimbus-oam_v1.0.yaml",
-                    "artifactUUID": "Artifact-UUID1",
-                    "artifactVersion": "1.0",
-                    "generatedArtifact": "EnvArtifact-UUID2",
-                    "relatedArtifact":
-                    [
-                        "NestedArtifact-UUID3",
-                        "ScriptArtifact-UUID1"
-                    ]
-                },
-
-                {
-                    "artifactChecksum": "CheckSum",
-                    "artifactDescription": "Nimbus Heat ENV OAM",
-                    "artifactName": "hot-nimbus-oam_v1.0.env",
-
-                    "artifactType": "HEAT_ENV",
-                    "artifactURL": "hot-nimbus-oam_v1.0.env",
-                    "artifactUUID": "EnvArtifact-UUID2",
-                    "artifactVersion": "1.0"
-
-                },
-
-                {
-                    "artifactChecksum": "CheckSum",
-                    "artifactDescription": "Nested OAM",
-                    "artifactName": "nested-oam_v1.0.yaml",
-                    "artifactTimeout": 10,
-                    "artifactType": "HEAT_NESTED",
-                    "artifactURL": "nested-oam_v1.0.yaml",
-                    "artifactUUID": "NestedArtifact-UUID3",
-                    "artifactVersion": "1.0"
-
-                },
-
-                {
-                    "artifactChecksum": "CheckSum",
-                    "artifactDescription": "Script for OAM",
-                    "artifactName": "mount_iso_script.sh",
-
-                    "artifactType": "HEAT_ARTIFACT",
-                    "artifactURL": "mount_iso_script.sh",
-                    "artifactUUID": "ScriptArtifact-UUID1",
-                    "artifactVersion": "1.0"
-
-                },
-
-                {
-                    "artifactChecksum": "CheckSum",
-                    "artifactDescription": "Heat Vol for OAM",
-                    "artifactName": "hot-nimbus-oam-volumes_v1.0.yaml",
-                    "artifactTimeout": 10,
-                    "artifactType": "HEAT_VOL",
-                    "artifactURL": "hot-nimbus-oam-volumes_v1.0.yaml",
-                    "artifactUUID": "VolumeArtifact-UUID1",
-                    "artifactVersion": "1.0",
-                    "generatedArtifact": "VolumeEnvArtifact-UUID1"
-
-                },
-
-                {
-                    "artifactChecksum": "CheckSum",
-                    "artifactDescription": "Heat Env Vol for OAM",
-                    "artifactName": "hot-nimbus-oam-volumes_v1.0.env",
-
-                    "artifactType": "HEAT_ENV",
-                    "artifactURL": "hot-nimbus-oam-volumes_v1.0.env",
-                    "artifactUUID": "VolumeEnvArtifact-UUID1",
-                    "artifactVersion": "1.0"
-
-                }
-            ]
-        }
-    ],
-
-    "serviceDescription": "test service for unit testing",
-    "distributionID": "35120a87-1f82-4276-9735-f6de5a244d65"
-}
\ No newline at end of file
diff --git a/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/simpleNotif-V5/artifacts/att_nimbus_vsaegw_ht_base_v13_0728v1.yaml b/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/simpleNotif-V5/artifacts/att_nimbus_vsaegw_ht_base_v13_0728v1.yaml
deleted file mode 100644
index 2aa58fb..0000000
--- a/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/simpleNotif-V5/artifacts/att_nimbus_vsaegw_ht_base_v13_0728v1.yaml
+++ /dev/null
@@ -1,3374 +0,0 @@
-
-heat_template_version: 2013-05-23
-
-
-description: SAEGW (version 20.1.0v) HEAT Template (2CFs and 10SFs) 
-
-parameters:
-#    description: instance name
-  vnf_name:
-    type: string
-    description: Unique name for this VF instance
-#   For manual spinups, value must be in the ENV file. Must be removed from ENV before uploading to ASDC
-  vnf_id:
-    type: string
-    description: Unique ID for this VF instance
-#   For manual spinups, value must be in the ENV file. Must be removed from ENV before uploading to ASDC
-  vf_module_id:
-    type: string
-    description: Unique ID for this VF Module instance
-#   For manual spinups, value must be in the ENV file. Must be removed from ENV before uploading to ASDC
-  admin_password:
-    type: string
-    description: cf instance admin password
-  cf_oam_protected_vip:
-    type: string
-    description: cf instance mgmt vip address
-  cf_vpc_vip_gateway:
-    type: string
-    description: cf instance mgmt gateway address
-  availability_zone_0:
-    type: string
-    description: Availability_zone where the VNF should be created
-  cf_image_name_0:
-    type: string
-    description: instance cf1 image
-  cf_image_name_1:
-    type: string
-    description: instance cf2 image
-  sf_image_name:
-    type: string
-    description: instance sf image
-  cf_flavor_name:
-    type: string
-    description: instance flavor for CFs
-  sf_flavor_name:
-    type: string
-    description: instance flavor for SFs
-  oam_protected_net_name:
-    type: string
-    description: instance oam network
-  oam_calea_net_name:
-    type: string
-    description: network name of service network 5
-  int_icsr_net_name:
-    type: string
-    description: network name of service network 6
-  cgwy_int_di2_net_name:
-    type: string
-    description: network name of DI Internal network
-  cf_oam_protected_ip_0:
-    type: string
-    description: Static IP for CF01 management Neutron port
-  cf_oam_protected_ip_1:
-    type: string
-    description: Static IP for CF02 management Neutron port
-  sf_gn_ips:
-    type: comma_delimited_list
-    description: Static IPs for Gn IPv4 Ports
-  sf_cor_ips:
-    type: comma_delimited_list
-    description: Static IPs for Cor IPv4 Ports
-  sf_sgi_prot_ips:
-    type: comma_delimited_list
-    description: Static IPs for SGi Ports
-  sf_sgi_ims_ips:
-    type: comma_delimited_list
-    description: Static IPs for Sgi IMS Ports
-  sf_oam_calea_ips:
-    type: comma_delimited_list
-    description: Static IPs for OAM Calea Ports
-  sf_int_icsr_ips:
-    type: comma_delimited_list
-    description: Static IPs for icsr Ports
-
-  sf_gn_v6_ips:
-    type: comma_delimited_list
-    description: Static IPs for Gn IPv6 Ports
-  sf_cor_v6_ips:
-    type: comma_delimited_list
-    description: Static IPs for Cor IPv6 Ports
-  sf_sgi_prot_v6_ips:
-    type: comma_delimited_list
-    description: Static IPs for SGi Ports
-  sf_sgi_ims_v6_ips:
-    type: comma_delimited_list
-    description: Static IPs for Sgi IMS Ports
-# Added per AIC team request
-#  srv_grp_sf:
-#    type: string
-#    description: Service Group Description
-
-  cgwy_names:
-    type: comma_delimited_list
-    description: VM hostname
-  cf_name:
-    type: string
-    description: CF GW Cluster Name
-  cf_volume_size_0:
-    type: string
-    description: volume for CF1
-  cf_volume_size_1:
-    type: string
-    description: volume for CF2
-  gn_net_fqdn:
-    type: string
-    description: GN network FQ name
-  sgi_net_fqdn:
-    type: string
-    description: SGI network FQ name
-  ims_net_fqdn:
-    type: string
-    description: IMS network FQ name
-  cor_net_fqdn:
-    type: string
-    description: COR network FQ name
-  vmi_allowed_address_pair_address_mode:  
-    type: string
-    description: allow address paire active-active mode
-  vmi_allowed_address_pair_prefix_lenth:
-    type: string
-    description: IPv4 VIP prefix length
-  sf_gn_rii_v6:
-    type: string
-    description: GN IPv6 VIP loopback
-  sf_cor_rii_v6:
-    type: string
-    description: COR IPv6 VIP loopback
-  sf_sgi_rii_v6:
-    type: string
-    description: SGI IPv6 VIP loopback
-  sf_ims_rii_v6:
-    type: string
-    description: IMS IPv4 VIP loopback
-  vmi_allowed_address_pair_prefix_lenth_v6:
-    type: string
-    description: IPv6 VIP prefix length
-  instance_ip_family_v6:
-    type: string
-    description: iip address family IPv6
-
-
-
-  bgpaas_name:
-    type: comma_delimited_list
-    description: name for the BgpAsAService
-  bgpaas_autonomous_system:
-    type: number
-    description: AS for the BgpAsAService
-    constraints:
-    - range: {min: 0, max: 999999}
-  bgpaas_ip_address:
-    type: comma_delimited_list
-    description: bgpaas peer address for the BgpAsAService
-  bgpaas_session_attributes_passive:
-    type: boolean
-    description: passive mode selection for the BgpAsAService
-  bgpaas_session_attributes_hold_time:
-    type: number
-    description: hold_time for the BgpAsAService
-    constraints:
-    - range: {min: 0, max: 999}
-  bgpaas_session_attributes_admin_down:
-    type: boolean
-    description: admin_down for the BgpAsAService
-  bgpaas_session_attributes_address_families_family_4:
-    type: string
-    description: family for the BgpAsAService
-  bgpaas_session_attributes_address_families_family_6:
-    type: string
-    description: family for the BgpAsAService
-  bgpaas_session_attributes_family_attributes_af_4:
-    type: string
-    description: address_family ipv4 unitcast for the BgpAsAService
-  bgpaas_session_attributes_family_attributes_loop_count_4:
-    type: number
-    description: loop_count ipv4 unitcast for the BgpAsAService
-    constraints:
-    - range: {min: 0, max: 999}
-  bgpaas_session_attributes_family_attributes_prefix_limit_maximum_4:
-    type: number
-    description: maximum prefix ipv4 unicast for the BgpAsAService
-    constraints:
-    - range: {min: 0, max: 9999}
-  bgpaas_session_attributes_family_attributes_af_6:
-    type: string
-    description: address_family v6_ips unicast for the BgpAsAService
-  bgpaas_session_attributes_family_attributes_loop_count_6:
-    type: number
-    description: loop_count v6_ips unicast for the BgpAsAService
-    constraints:
-    - range: {min: 0, max: 999}
-  bgpaas_session_attributes_family_attributes_prefix_limit_maximum_6:
-    type: number
-    description: maximum v6_ips unicast for the BgpAsAService
-    constraints:
-    - range: {min: 0, max: 9999}
-  sf_shc_enabled:
-    type: boolean
-    description: enabled for the ServiceHealthCheck
-  sf_shc_monitor_type:
-    type: string
-    description: monitor_type for the ServiceHealthCheck
-  sf_shc_delay:
-    type: number
-    description: delay for the ServiceHealthCheck
-    constraints:
-    - range: {min: 0, max: 999}
-  sf_shc_timeout:
-    type: number
-    description: timeout for the ServiceHealthCheck
-    constraints:
-    - range: {min: 0, max: 999}
-  sf_shc_max_retries:
-    type: number
-    description: max_retries for the ServiceHealthCheck
-    constraints:
-    - range: {min: 0, max: 999}
-  sf_shc_url_path:
-    type: string
-    description: url for the ServiceHealthCheck
-
-
-resources:
-  # Create anti-affinity Server Group
-  cf_vpc-servergroup:
-    type: OS::Nova::ServerGroup
-    properties:
-      policies:
-        - anti-affinity
-  # Create anti-affinity Server Group
-  sf_vpc-servergroup:
-    type: OS::Nova::ServerGroup
-    properties:
-      policies:
-        - anti-affinity
-
-
-  # Create CF1 and CF2 ports on DI Internal Network DI Management Network
-  cf_int_di2_0_port:
-    type: OS::Neutron::Port
-    properties:
-      network: {get_param: cgwy_int_di2_net_name}
-
-  cf_mgmt_0_port:
-    type: OS::Neutron::Port
-    properties:
-      network: {get_param: oam_protected_net_name}
-      fixed_ips: [{"ip_address": {get_param: cf_oam_protected_ip_0}}]
-      allowed_address_pairs: [{"ip_address": {get_param: cf_oam_protected_vip}}]
-
-  cf_int_di2_1_port:
-    type: OS::Neutron::Port
-    properties:
-      network: {get_param: cgwy_int_di2_net_name}
-
-  cf_mgmt_1_port:
-    type: OS::Neutron::Port
-    properties:
-      network: {get_param: oam_protected_net_name}
-      fixed_ips: [{"ip_address": {get_param: cf_oam_protected_ip_1}}]
-      allowed_address_pairs: [{"ip_address": {get_param: cf_oam_protected_vip}}]
-  
-  # Create hard drives for CF1 and CF2 to store CDR
-  cf_volume_name_0:
-    type: OS::Cinder::Volume
-    properties:
-      size: { get_param: cf_volume_size_0 }
-  #    volume_type: iscsi
-
-  cf_volume_name_1:
-    type: OS::Cinder::Volume
-    properties:
-      size: { get_param: cf_volume_size_1 }
-  #    volume_type: iscsi
-  
-  # Create CF1 instance
-  cf_server0:
-    type: OS::Nova::Server
-    properties:
-      metadata:
-         vnf_id: { get_param: vnf_id }
-         vnf_name: { get_param: vnf_name }
-         vf_module_id: { get_param: vf_module_id }
-#      name:
-#        str_replace:
-#          template: Z${CZ_ID}CGWY${VF_ID}${VM_TYPE}${VM_NUM}
-#          params:
-#            ${CZ_ID}: {get_param: czid}
-#            ${VF_ID}: {get_param: vf_inst_number}
-#            ${VM_TYPE}: DCF
-#            ${VM_NUM}: "001"
-      name: {get_param: [cgwy_names, 0]}
-      image: {get_param: cf_image_name_0}
-      flavor: {get_param: cf_flavor_name}
-      availability_zone: {get_param: availability_zone_0}
-      config_drive: True
-      networks:
-        - port: {get_resource: cf_int_di2_0_port}
-        - port: {get_resource: cf_mgmt_0_port}
-# Tempoarry comment out for testing 
-      scheduler_hints:
-        group: {get_resource: cf_vpc-servergroup}
-      personality:
-      # Associate VM to slot-1 and identify it is a CF
-        "staros_param.cfg":
-          str_replace:
-            template: |
-              CARDSLOT=${CARD_NUMBER}
-              CARDTYPE=${CARD_TYPE}
-              CPUID=${CPUID}
-            params:
-              ${CARD_NUMBER}: 1
-              ${CARD_TYPE}: CFC
-              ${CPUID}: 0
-      # Day-0 config for CF1
-        "staros_config.txt":
-          str_replace:
-            template: |
-              config
-                  system hostname ${HOSTNAME}
-                  ssh key-gen wait-time 0
-                  context local
-                      administrator admin password ${ADMIN_PASSWD} ftp
-                          interface LOCAL1
-                              ip address ${CF_VIP_ADDR} 255.255.255.0
-                          #exit
-                      ip route 0.0.0.0 0.0.0.0 ${CF_VIP_GATEWAY} LOCAL1
-                      ssh generate key
-                      server sshd
-                          subsystem sftp
-                      #exit
-                  #exit
-                  port ethernet 1/1
-                      bind interface LOCAL1 local
-                      no shutdown
-                  #exit
-                  snmp community public read-only
-              end
-              chassis key value Cisco12345
-            params:
-#                  system hostname Z${CZ_ID}CGWY${VF_ID}${VM_TYPE}${VM_NUM}
-
-#              ${CZ_ID}: {get_param: czid}
-#              ${VF_ID}: {get_param: vf_inst_number}
-#              ${VM_TYPE}: DCF
-              #${VM_NUM}: "01"
-              ${HOSTNAME}: {get_param: cf_name}
-              ${ADMIN_PASSWD}: {get_param: admin_password}
-              ${CF_VIP_ADDR}: {get_param: cf_oam_protected_vip}
-              ${CF_VIP_GATEWAY}: {get_param: cf_vpc_vip_gateway}
-  
-  # Attach hard drive (CDR) to CF1 instance
-  cf_volume_att_0:
-    type: OS::Cinder::VolumeAttachment
-    properties:
-      instance_uuid: { get_resource: cf_server0 }
-      volume_id: { get_resource: cf_volume_name_0 }
-
-  # Create CF2 instance
-  cf_server1:
-    type: OS::Nova::Server
-    properties:
-      metadata:
-          vnf_id: { get_param: vnf_id }
-          vnf_name: { get_param: vnf_name }
-          vf_module_id: { get_param: vf_module_id }
-
-#      name:
-#        str_replace:
-#          template: Z${CZ_ID}CGWY${VF_ID}${VM_TYPE}${VM_NUM}
-#          params:
-#            ${CZ_ID}: {get_param: czid}
-#            ${VF_ID}: {get_param: vf_inst_number}
-#            ${VM_TYPE}: DCF
-#            ${VM_NUM}: "002"
-      name: {get_param: [cgwy_names, 1]}
-      image: {get_param: cf_image_name_1}
-      flavor: {get_param: cf_flavor_name}
-      availability_zone: {get_param: availability_zone_0}
-      config_drive: True
-      networks:
-        - port: {get_resource: cf_int_di2_1_port}
-        - port: {get_resource: cf_mgmt_1_port}
-# commented out for testing only
-      scheduler_hints:
-        group: {get_resource: cf_vpc-servergroup}
-      personality:
-      # Associate VM to slot-2 and identify it is a CF
-        "staros_param.cfg":
-          str_replace:
-            template: |
-              CARDSLOT=${CARD_NUMBER}
-              CARDTYPE=${CARD_TYPE}
-              CPUID=${CPUID}
-            params:
-              ${CARD_NUMBER}: 2
-              ${CARD_TYPE}: CFC
-              ${CPUID}: 0
-      # Day-0 config for CF2
-        "staros_config.txt":
-          str_replace:
-            template: |
-              config
-                  system hostname ${HOSTNAME}
-                  ssh key-gen wait-time 0 
-                  context local
-                      administrator admin password ${ADMIN_PASSWD} ftp
-                          interface LOCAL1
-                              ip address ${CF_VIP_ADDR} 255.255.255.0
-                          #exit
-                      ip route 0.0.0.0 0.0.0.0 ${CF_VIP_GATEWAY} LOCAL1
-                      ssh generate key
-                      server sshd
-                          subsystem sftp
-                      #exit
-                  #exit
-                  port ethernet 1/1
-                      bind interface LOCAL1 local
-                      no shutdown
-                  #exit
-                  snmp community public read-only
-              end
-              chassis key value Cisco12345
-            params:
-#                  system hostname Z${CZ_ID}CGWY${VF_ID}${VM_TYPE}${VM_NUM}
-#              ${CZ_ID}: {get_param: czid}
-#              ${VF_ID}: {get_param: vf_inst_number}
-#              ${VM_TYPE}: DCF
-#              ${VM_NUM}: "01"
-              ${HOSTNAME}: {get_param: cf_name}
-              ${ADMIN_PASSWD}: {get_param: admin_password}
-              ${CF_VIP_ADDR}: {get_param: cf_oam_protected_vip}
-              ${CF_VIP_GATEWAY}: {get_param: cf_vpc_vip_gateway}
-
-  # Attach hard drive (CDR) to CF2 instance
-  cf_volume_att_1:
-    type: OS::Cinder::VolumeAttachment
-    properties:
-      instance_uuid: { get_resource: cf_server1 }
-      volume_id: { get_resource: cf_volume_name_1 }
-
-  #### SF03 ######
-  # Create port for DI-Internal Network
-  sf_int_di2_2_port:
-    type: OS::Neutron::Port
-    properties:
-      network: {get_param: cgwy_int_di2_net_name}
-# Create port for Transport Interface in SAEGW Context
-  SF3_GN_10_RVMI:
-    type: OS::ContrailV2::VirtualMachineInterface
-    properties:
-      virtual_network_refs:
-        - {get_param: gn_net_fqdn}
-#      service_health_check_refs: 
-#        - { get_resource: SF3_GN_10_RSHC }
-      virtual_machine_interface_allowed_address_pairs:
-        virtual_machine_interface_allowed_address_pairs_allowed_address_pair:
-          - virtual_machine_interface_allowed_address_pairs_allowed_address_pair_address_mode: { get_param: vmi_allowed_address_pair_address_mode }
-            virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip:
-              virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip_ip_prefix: { get_param: [bgpaas_ip_address,0] }
-              virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip_ip_prefix_len: { get_param: vmi_allowed_address_pair_prefix_lenth }
-          - virtual_machine_interface_allowed_address_pairs_allowed_address_pair_address_mode: { get_param: vmi_allowed_address_pair_address_mode }
-            virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip:
-              virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip_ip_prefix: { get_param: sf_gn_rii_v6 }
-              virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip_ip_prefix_len: { get_param: vmi_allowed_address_pair_prefix_lenth_v6 }
-
-  SF3_GN_10_RII:
-    type: OS::ContrailV2::InstanceIp
-    depends_on: [ SF3_GN_10_RVMI ]
-    properties:
-      virtual_network_refs:
-        - get_param: gn_net_fqdn
-      virtual_machine_interface_refs:
-        - get_resource: SF3_GN_10_RVMI
-      instance_ip_address: { get_param: [sf_gn_ips, 0] }
-
-  SF3_GN_10_v6_RII:
-    type: OS::ContrailV2::InstanceIp
-    depends_on: [ SF3_GN_10_RVMI ]
-    properties:
-      virtual_network_refs:
-        - get_param: gn_net_fqdn
-      virtual_machine_interface_refs:
-        - get_resource: SF3_GN_10_RVMI
-      instance_ip_address: { get_param: [sf_gn_v6_ips, 0] }
-      instance_ip_family: { get_param: instance_ip_family_v6 }
-
-  SF3_GN_10_RSHC:
-    type: OS::ContrailV2::ServiceHealthCheck
-    properties:
-      name: SF3_GN_10_RSHC
-      service_health_check_properties:
-        service_health_check_properties_enabled: { get_param: sf_shc_enabled }
-        service_health_check_properties_monitor_type: { get_param: sf_shc_monitor_type }
-        service_health_check_properties_delay: { get_param: sf_shc_delay }
-        service_health_check_properties_timeout: { get_param: sf_shc_timeout }
-        service_health_check_properties_max_retries: { get_param: sf_shc_max_retries }
-        service_health_check_properties_url_path: { get_param: sf_shc_url_path }
-
-  # Create port for Transport interface(SGi-data) in SGi Context
-  SF3_SGI_11_RVMI:
-    type: OS::ContrailV2::VirtualMachineInterface
-    properties:
-      virtual_network_refs:
-        - get_param: sgi_net_fqdn
-#      service_health_check_refs: 
-#        - { get_resource: SF3_SGI_11_RSHC }
-      virtual_machine_interface_allowed_address_pairs:
-        virtual_machine_interface_allowed_address_pairs_allowed_address_pair:
-          - virtual_machine_interface_allowed_address_pairs_allowed_address_pair_address_mode: { get_param: vmi_allowed_address_pair_address_mode }
-            virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip:
-              virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip_ip_prefix: { get_param: [bgpaas_ip_address,1] }
-              virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip_ip_prefix_len: { get_param: vmi_allowed_address_pair_prefix_lenth }
-          - virtual_machine_interface_allowed_address_pairs_allowed_address_pair_address_mode: { get_param: vmi_allowed_address_pair_address_mode }
-            virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip:
-              virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip_ip_prefix: { get_param: sf_sgi_rii_v6 }
-              virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip_ip_prefix_len: { get_param: vmi_allowed_address_pair_prefix_lenth_v6 }
-
-  SF3_SGI_11_RII:
-    type: OS::ContrailV2::InstanceIp
-    depends_on: [ SF3_SGI_11_RVMI ]
-    properties:
-      virtual_network_refs:
-        - get_param: sgi_net_fqdn
-      virtual_machine_interface_refs:
-        - get_resource: SF3_SGI_11_RVMI
-      instance_ip_address: { get_param: [sf_sgi_prot_ips, 0] }
-
-  SF3_SGI_11_v6_RII:
-    type: OS::ContrailV2::InstanceIp
-    depends_on: [ SF3_SGI_11_RVMI ]
-    properties:
-      virtual_network_refs:
-        - get_param: sgi_net_fqdn
-      virtual_machine_interface_refs:
-        - get_resource: SF3_SGI_11_RVMI
-      instance_ip_address: { get_param: [sf_sgi_prot_v6_ips, 0] }
-      instance_ip_family: { get_param: instance_ip_family_v6 }
-
-  SF3_SGI_11_RSHC:
-    type: OS::ContrailV2::ServiceHealthCheck
-    properties:
-      name: SF3_SGI_11_RSHC
-      service_health_check_properties:
-        service_health_check_properties_enabled: { get_param: sf_shc_enabled }
-        service_health_check_properties_monitor_type: { get_param: sf_shc_monitor_type }
-        service_health_check_properties_delay: { get_param: sf_shc_delay }
-        service_health_check_properties_timeout: { get_param: sf_shc_timeout }
-        service_health_check_properties_max_retries: { get_param: sf_shc_max_retries }
-        service_health_check_properties_url_path: { get_param: sf_shc_url_path }
-
-  # Create port for Transport interface(SGi-ims) in SGi Context
-  SF3_IMS_12_RVMI:
-    type: OS::ContrailV2::VirtualMachineInterface
-    properties:
-      virtual_network_refs:
-        - get_param: ims_net_fqdn
-#      service_health_check_refs: 
-#        - { get_resource: SF3_IMS_12_RSHC }
-      virtual_machine_interface_allowed_address_pairs:
-        virtual_machine_interface_allowed_address_pairs_allowed_address_pair:
-          - virtual_machine_interface_allowed_address_pairs_allowed_address_pair_address_mode: { get_param: vmi_allowed_address_pair_address_mode }
-            virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip:
-              virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip_ip_prefix: { get_param: [bgpaas_ip_address,2] }
-              virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip_ip_prefix_len: { get_param: vmi_allowed_address_pair_prefix_lenth }
-          - virtual_machine_interface_allowed_address_pairs_allowed_address_pair_address_mode: { get_param: vmi_allowed_address_pair_address_mode }
-            virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip:
-              virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip_ip_prefix: { get_param: sf_ims_rii_v6 }
-              virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip_ip_prefix_len: { get_param: vmi_allowed_address_pair_prefix_lenth_v6 }
-
-  SF3_IMS_12_RII:
-    type: OS::ContrailV2::InstanceIp
-    depends_on: [ SF3_IMS_12_RVMI ]
-    properties:
-      virtual_network_refs:
-        - get_param: ims_net_fqdn
-      virtual_machine_interface_refs:
-        - get_resource: SF3_IMS_12_RVMI
-      instance_ip_address: { get_param: [sf_sgi_ims_ips, 0] }
-
-  SF3_IMS_12_v6_RII:
-    type: OS::ContrailV2::InstanceIp
-    depends_on: [ SF3_IMS_12_RVMI ]
-    properties:
-      virtual_network_refs:
-        - get_param: ims_net_fqdn
-      virtual_machine_interface_refs:
-        - get_resource: SF3_IMS_12_RVMI
-      instance_ip_address: { get_param: [sf_sgi_ims_v6_ips, 0] }
-      instance_ip_family: { get_param: instance_ip_family_v6 }
-
-  SF3_IMS_12_RSHC:
-    type: OS::ContrailV2::ServiceHealthCheck
-    properties:
-      name: SF3_IMS_12_RSHC
-      service_health_check_properties:
-        service_health_check_properties_enabled: { get_param: sf_shc_enabled }
-        service_health_check_properties_monitor_type: { get_param: sf_shc_monitor_type }
-        service_health_check_properties_delay: { get_param: sf_shc_delay }
-        service_health_check_properties_timeout: { get_param: sf_shc_timeout }
-        service_health_check_properties_max_retries: { get_param: sf_shc_max_retries }
-        service_health_check_properties_url_path: { get_param: sf_shc_url_path }
-
-  # Create port for Transport Interface in SUPPORT Context
-  SF3_COR_13_RVMI:
-    type: OS::ContrailV2::VirtualMachineInterface
-    properties:
-      virtual_network_refs:
-        - get_param: cor_net_fqdn
-#      service_health_check_refs: 
-#        - { get_resource: SF3_COR_13_RSHC }
-      virtual_machine_interface_allowed_address_pairs:
-        virtual_machine_interface_allowed_address_pairs_allowed_address_pair:
-          - virtual_machine_interface_allowed_address_pairs_allowed_address_pair_address_mode: { get_param: vmi_allowed_address_pair_address_mode }
-            virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip:
-              virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip_ip_prefix: { get_param: [bgpaas_ip_address,3] }
-              virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip_ip_prefix_len: { get_param: vmi_allowed_address_pair_prefix_lenth }
-          - virtual_machine_interface_allowed_address_pairs_allowed_address_pair_address_mode: { get_param: vmi_allowed_address_pair_address_mode }
-            virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip:
-              virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip_ip_prefix: { get_param: sf_cor_rii_v6 }
-              virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip_ip_prefix_len: { get_param: vmi_allowed_address_pair_prefix_lenth_v6 }
-
-  SF3_COR_13_RII:
-    type: OS::ContrailV2::InstanceIp
-    depends_on: [ SF3_COR_13_RVMI ]
-    properties:
-      virtual_network_refs:
-        - get_param: cor_net_fqdn
-      virtual_machine_interface_refs:
-        - get_resource: SF3_COR_13_RVMI
-      instance_ip_address: { get_param: [sf_cor_ips, 0] }
-
-  SF3_COR_13_v6_RII:
-    type: OS::ContrailV2::InstanceIp
-    depends_on: [ SF3_COR_13_RVMI ]
-    properties:
-      virtual_network_refs:
-        - get_param: cor_net_fqdn
-      virtual_machine_interface_refs:
-        - get_resource: SF3_COR_13_RVMI
-      instance_ip_address: { get_param: [sf_cor_v6_ips, 0] }
-      instance_ip_family: { get_param: instance_ip_family_v6 }
-
-  SF3_COR_13_RSHC:
-    type: OS::ContrailV2::ServiceHealthCheck
-    properties:
-      name: SF3_COR_13_RSHC
-      service_health_check_properties:
-        service_health_check_properties_enabled: { get_param: sf_shc_enabled }
-        service_health_check_properties_monitor_type: { get_param: sf_shc_monitor_type }
-        service_health_check_properties_delay: { get_param: sf_shc_delay }
-        service_health_check_properties_timeout: { get_param: sf_shc_timeout }
-        service_health_check_properties_max_retries: { get_param: sf_shc_max_retries }
-        service_health_check_properties_url_path: { get_param: sf_shc_url_path }
-
-
-
-
- # Create port for Transport interface in LI Context 
-  SF3_OAM_CALEA_14_PORT:
-    type: OS::Neutron::Port
-    properties:
-      network: {get_param: oam_calea_net_name}
-      fixed_ips: [{"ip_address": {get_param: [sf_oam_calea_ips, 0]}}]
-  # Create port for Transport interface in SRP Context 
-  SF3_INT_ICSR_15_PORT:
-    type: OS::Neutron::Port
-    properties:
-      network: {get_param: int_icsr_net_name}
-      fixed_ips: [{"ip_address": {get_param: [sf_int_icsr_ips, 0]}}]
-
-  # Create VPC SF 03 Instance
-  sf_server_2:
-    type: OS::Nova::Server
-    depends_on: [ SF3_GN_10_RII, SF3_GN_10_v6_RII, SF3_SGI_11_RII, SF3_SGI_11_v6_RII, SF3_IMS_12_RII, SF3_IMS_12_v6_RII, SF3_COR_13_RII, SF3_COR_13_v6_RII ]
-    properties:
-      metadata:
-        vnf_id: { get_param: vnf_id }
-        vnf_name: { get_param: vnf_name }
-        vf_module_id: { get_param: vf_module_id }
-
-#      name:
-#        str_replace:
-#          template: Z${CZ_ID}CGWY${VF_ID}${VM_TYPE}${VM_NUM}
-#          params:
-#            ${CZ_ID}: {get_param: czid}
-#            ${VF_ID}: {get_param: vf_inst_number}
-#            ${VM_TYPE}: DSF
-#            ${VM_NUM}: "003"
-      name: {get_param: [cgwy_names, 2]}
-      config_drive: True
-      image: {get_param: sf_image_name}
-      flavor: {get_param: sf_flavor_name}
-      networks:
-        - port: {get_resource: sf_int_di2_2_port}
-        - port: {get_resource: SF3_GN_10_RVMI}
-        - port: {get_resource: SF3_SGI_11_RVMI}
-        - port: {get_resource: SF3_IMS_12_RVMI}
-        - port: {get_resource: SF3_COR_13_RVMI}
-        - port: {get_resource: SF3_OAM_CALEA_14_PORT}
-        - port: {get_resource: SF3_INT_ICSR_15_PORT}
-      personality:
-        "staros_param.cfg":
-          str_replace:
-            template: |
-              CARDSLOT=$CARD_NUMBER
-              CARDTYPE=$CARD_TYPE
-              CPUID=$CPUID
-            params:
-              $CARD_NUMBER: 3
-              $CARD_TYPE: SFC
-              $CPUID: 0
-      availability_zone: {get_param: availability_zone_0}
-      scheduler_hints:
-        group: {get_resource: sf_vpc-servergroup}
-        
-  #### SF04 ######
-  # Create port for DI-Internal Network
-  sf_int_di2_3_port:
-    type: OS::Neutron::Port
-    properties:
-      network: {get_param: cgwy_int_di2_net_name}
-# Create port for Transport Interface in SAEGW Context
-  SF4_GN_10_RVMI:
-    type: OS::ContrailV2::VirtualMachineInterface
-    properties:
-      virtual_network_refs:
-        - get_param: gn_net_fqdn
-#      service_health_check_refs: 
-#        - { get_resource: SF4_GN_10_RSHC }
-      virtual_machine_interface_allowed_address_pairs:
-        virtual_machine_interface_allowed_address_pairs_allowed_address_pair:
-          - virtual_machine_interface_allowed_address_pairs_allowed_address_pair_address_mode: { get_param: vmi_allowed_address_pair_address_mode }
-            virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip:
-              virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip_ip_prefix: { get_param: [bgpaas_ip_address,0] }
-              virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip_ip_prefix_len: { get_param: vmi_allowed_address_pair_prefix_lenth }
-          - virtual_machine_interface_allowed_address_pairs_allowed_address_pair_address_mode: { get_param: vmi_allowed_address_pair_address_mode }
-            virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip:
-              virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip_ip_prefix: { get_param: sf_gn_rii_v6 }
-              virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip_ip_prefix_len: { get_param: vmi_allowed_address_pair_prefix_lenth_v6 }
-
-  SF4_GN_10_RII:
-    type: OS::ContrailV2::InstanceIp
-    depends_on: [ SF4_GN_10_RVMI ]
-    properties:
-      virtual_network_refs:
-        - get_param: gn_net_fqdn
-      virtual_machine_interface_refs:
-        - get_resource: SF4_GN_10_RVMI
-      instance_ip_address: { get_param: [sf_gn_ips, 1] }
-
-  SF4_GN_10_v6_RII:
-    type: OS::ContrailV2::InstanceIp
-    depends_on: [ SF4_GN_10_RVMI ]
-    properties:
-      virtual_network_refs:
-        - get_param: gn_net_fqdn
-      virtual_machine_interface_refs:
-        - get_resource: SF4_GN_10_RVMI
-      instance_ip_address: { get_param: [sf_gn_v6_ips, 1] }
-      instance_ip_family: { get_param: instance_ip_family_v6 }
-
-  SF4_GN_10_RSHC:
-    type: OS::ContrailV2::ServiceHealthCheck
-    properties:
-      name: SF4_GN_10_RSHC
-      service_health_check_properties:
-        service_health_check_properties_enabled: { get_param: sf_shc_enabled }
-        service_health_check_properties_monitor_type: { get_param: sf_shc_monitor_type }
-        service_health_check_properties_delay: { get_param: sf_shc_delay }
-        service_health_check_properties_timeout: { get_param: sf_shc_timeout }
-        service_health_check_properties_max_retries: { get_param: sf_shc_max_retries }
-        service_health_check_properties_url_path: { get_param: sf_shc_url_path }
-
-  # Create port for Transport interface(SGi-data) in SGi Context
-  SF4_SGI_11_RVMI:
-    type: OS::ContrailV2::VirtualMachineInterface
-    properties:
-      virtual_network_refs:
-        - get_param: sgi_net_fqdn
-#      service_health_check_refs: 
-#        - { get_resource: SF4_SGI_11_RSHC }
-      virtual_machine_interface_allowed_address_pairs:
-        virtual_machine_interface_allowed_address_pairs_allowed_address_pair:
-          - virtual_machine_interface_allowed_address_pairs_allowed_address_pair_address_mode: { get_param: vmi_allowed_address_pair_address_mode }
-            virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip:
-              virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip_ip_prefix: { get_param: [bgpaas_ip_address,1] }
-              virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip_ip_prefix_len: { get_param: vmi_allowed_address_pair_prefix_lenth }
-          - virtual_machine_interface_allowed_address_pairs_allowed_address_pair_address_mode: { get_param: vmi_allowed_address_pair_address_mode }
-            virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip:
-              virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip_ip_prefix: { get_param: sf_sgi_rii_v6 }
-              virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip_ip_prefix_len: { get_param: vmi_allowed_address_pair_prefix_lenth_v6 }
-
-  SF4_SGI_11_RII:
-    type: OS::ContrailV2::InstanceIp
-    depends_on: [ SF4_SGI_11_RVMI ]
-    properties:
-      virtual_network_refs:
-        - get_param: sgi_net_fqdn
-      virtual_machine_interface_refs:
-        - get_resource: SF4_SGI_11_RVMI
-      instance_ip_address: { get_param: [sf_sgi_prot_ips, 1] }
-
-  SF4_SGI_11_v6_RII:
-    type: OS::ContrailV2::InstanceIp
-    depends_on: [ SF4_SGI_11_RVMI ]
-    properties:
-      virtual_network_refs:
-        - get_param: sgi_net_fqdn
-      virtual_machine_interface_refs:
-        - get_resource: SF4_SGI_11_RVMI
-      instance_ip_address: { get_param: [sf_sgi_prot_v6_ips, 1] }
-      instance_ip_family: { get_param: instance_ip_family_v6 }
-
-  SF4_SGI_11_RSHC:
-    type: OS::ContrailV2::ServiceHealthCheck
-    properties:
-      name: SF4_SGI_11_RSHC
-      service_health_check_properties:
-        service_health_check_properties_enabled: { get_param: sf_shc_enabled }
-        service_health_check_properties_monitor_type: { get_param: sf_shc_monitor_type }
-        service_health_check_properties_delay: { get_param: sf_shc_delay }
-        service_health_check_properties_timeout: { get_param: sf_shc_timeout }
-        service_health_check_properties_max_retries: { get_param: sf_shc_max_retries }
-        service_health_check_properties_url_path: { get_param: sf_shc_url_path }
-
-  # Create port for Transport interface(SGi-ims) in SGi Context
-  SF4_IMS_12_RVMI:
-    type: OS::ContrailV2::VirtualMachineInterface
-    properties:
-      virtual_network_refs:
-        - get_param: ims_net_fqdn
-#      service_health_check_refs: 
-#        - { get_resource: SF4_IMS_12_RSHC }
-      virtual_machine_interface_allowed_address_pairs:
-        virtual_machine_interface_allowed_address_pairs_allowed_address_pair:
-          - virtual_machine_interface_allowed_address_pairs_allowed_address_pair_address_mode: { get_param: vmi_allowed_address_pair_address_mode }
-            virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip:
-              virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip_ip_prefix: { get_param: [bgpaas_ip_address,2] }
-              virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip_ip_prefix_len: { get_param: vmi_allowed_address_pair_prefix_lenth }
-          - virtual_machine_interface_allowed_address_pairs_allowed_address_pair_address_mode: { get_param: vmi_allowed_address_pair_address_mode }
-            virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip:
-              virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip_ip_prefix: { get_param: sf_ims_rii_v6 }
-              virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip_ip_prefix_len: { get_param: vmi_allowed_address_pair_prefix_lenth_v6 }
-
-  SF4_IMS_12_RII:
-    type: OS::ContrailV2::InstanceIp
-    depends_on: [ SF4_IMS_12_RVMI ]
-    properties:
-      virtual_network_refs:
-        - get_param: ims_net_fqdn
-      virtual_machine_interface_refs:
-        - get_resource: SF4_IMS_12_RVMI
-      instance_ip_address: { get_param: [sf_sgi_ims_ips, 1] }
-
-  SF4_IMS_12_v6_RII:
-    type: OS::ContrailV2::InstanceIp
-    depends_on: [ SF4_IMS_12_RVMI ]
-    properties:
-      virtual_network_refs:
-        - get_param: ims_net_fqdn
-      virtual_machine_interface_refs:
-        - get_resource: SF4_IMS_12_RVMI
-      instance_ip_address: { get_param: [sf_sgi_ims_v6_ips, 1] }
-      instance_ip_family: { get_param: instance_ip_family_v6 }
-
-  SF4_IMS_12_RSHC:
-    type: OS::ContrailV2::ServiceHealthCheck
-    properties:
-      name: SF4_IMS_12_RSHC
-      service_health_check_properties:
-        service_health_check_properties_enabled: { get_param: sf_shc_enabled }
-        service_health_check_properties_monitor_type: { get_param: sf_shc_monitor_type }
-        service_health_check_properties_delay: { get_param: sf_shc_delay }
-        service_health_check_properties_timeout: { get_param: sf_shc_timeout }
-        service_health_check_properties_max_retries: { get_param: sf_shc_max_retries }
-        service_health_check_properties_url_path: { get_param: sf_shc_url_path }
-
-  # Create port for Transport Interface in SUPPORT Context
-  SF4_COR_13_RVMI:
-    type: OS::ContrailV2::VirtualMachineInterface
-    properties:
-      virtual_network_refs:
-        - get_param: cor_net_fqdn
-#      service_health_check_refs: 
-#        - { get_resource: SF4_COR_13_RSHC }
-      virtual_machine_interface_allowed_address_pairs:
-        virtual_machine_interface_allowed_address_pairs_allowed_address_pair:
-          - virtual_machine_interface_allowed_address_pairs_allowed_address_pair_address_mode: { get_param: vmi_allowed_address_pair_address_mode }
-            virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip:
-              virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip_ip_prefix: { get_param: [bgpaas_ip_address,3] }
-              virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip_ip_prefix_len: { get_param: vmi_allowed_address_pair_prefix_lenth }
-          - virtual_machine_interface_allowed_address_pairs_allowed_address_pair_address_mode: { get_param: vmi_allowed_address_pair_address_mode }
-            virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip:
-              virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip_ip_prefix: { get_param: sf_cor_rii_v6 }
-              virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip_ip_prefix_len: { get_param: vmi_allowed_address_pair_prefix_lenth_v6 }
-
-  SF4_COR_13_RII:
-    type: OS::ContrailV2::InstanceIp
-    depends_on: [ SF4_COR_13_RVMI ]
-    properties:
-      virtual_network_refs:
-        - get_param: cor_net_fqdn
-      virtual_machine_interface_refs:
-        - get_resource: SF4_COR_13_RVMI
-      instance_ip_address: { get_param: [sf_cor_ips, 1] }
-
-  SF4_COR_13_v6_RII:
-    type: OS::ContrailV2::InstanceIp
-    depends_on: [ SF4_COR_13_RVMI ]
-    properties:
-      virtual_network_refs:
-        - get_param: cor_net_fqdn
-      virtual_machine_interface_refs:
-        - get_resource: SF4_COR_13_RVMI
-      instance_ip_address: { get_param: [sf_cor_v6_ips, 1] }
-      instance_ip_family: { get_param: instance_ip_family_v6 }
-
-  SF4_COR_13_RSHC:
-    type: OS::ContrailV2::ServiceHealthCheck
-    properties:
-      name: SF4_COR_13_RSHC
-      service_health_check_properties:
-        service_health_check_properties_enabled: { get_param: sf_shc_enabled }
-        service_health_check_properties_monitor_type: { get_param: sf_shc_monitor_type }
-        service_health_check_properties_delay: { get_param: sf_shc_delay }
-        service_health_check_properties_timeout: { get_param: sf_shc_timeout }
-        service_health_check_properties_max_retries: { get_param: sf_shc_max_retries }
-        service_health_check_properties_url_path: { get_param: sf_shc_url_path }
-
-
-  SF4_OAM_CALEA_14_PORT:
-    type: OS::Neutron::Port
-    properties:
-      network: {get_param: oam_calea_net_name}
-      fixed_ips: [{"ip_address": {get_param: [sf_oam_calea_ips, 1]}}]
-  # Create port for Transport interface in SRP Context 
-  SF4_INT_ICSR_15_PORT:
-    type: OS::Neutron::Port
-    properties:
-      network: {get_param: int_icsr_net_name}
-      fixed_ips: [{"ip_address": {get_param: [sf_int_icsr_ips, 1]}}]
-
-  # Create VPC SF 04 Instance
-  sf_server_3:
-    type: OS::Nova::Server
-    depends_on: [ SF4_GN_10_RII, SF4_GN_10_v6_RII, SF4_SGI_11_RII, SF4_SGI_11_v6_RII, SF4_IMS_12_RII, SF4_IMS_12_v6_RII, SF4_COR_13_RII, SF4_COR_13_v6_RII ]
-    properties:
-      metadata:
-          vnf_id: { get_param: vnf_id }
-          vnf_name: { get_param: vnf_name }
-          vf_module_id: { get_param: vf_module_id }
-
-#      name:
-#        str_replace:
-#          template: Z${CZ_ID}CGWY${VF_ID}${VM_TYPE}${VM_NUM}
-#          params:
-#            ${CZ_ID}: {get_param: czid}
-#            ${VF_ID}: {get_param: vf_inst_number}
-#            ${VM_TYPE}: DSF
-#            ${VM_NUM}: "004"
-      name: {get_param: [cgwy_names, 3]}
-      config_drive: True
-      image: {get_param: sf_image_name}
-      flavor: {get_param: sf_flavor_name}
-      networks:
-        - port: {get_resource: sf_int_di2_3_port}
-        - port: {get_resource: SF4_GN_10_RVMI}
-        - port: {get_resource: SF4_SGI_11_RVMI}
-        - port: {get_resource: SF4_IMS_12_RVMI}
-        - port: {get_resource: SF4_COR_13_RVMI}
-        - port: {get_resource: SF4_OAM_CALEA_14_PORT}
-        - port: {get_resource: SF4_INT_ICSR_15_PORT}
-      personality:
-        "staros_param.cfg":
-          str_replace:
-            template: |
-              CARDSLOT=$CARD_NUMBER
-              CARDTYPE=$CARD_TYPE
-              CPUID=$CPUID
-            params:
-              $CARD_NUMBER: 4
-              $CARD_TYPE: SFC
-              $CPUID: 0
-      availability_zone: {get_param: availability_zone_0}
-      scheduler_hints:
-        group: {get_resource: sf_vpc-servergroup}
-
-
-  #### SF05 ######
-  # Create port for DI-Internal Network
-  sf_int_di2_4_port:
-    type: OS::Neutron::Port
-    properties:
-      network: {get_param: cgwy_int_di2_net_name}
-  # Create port for Transport Interface in SAEGW Context
-  SF5_GN_10_RVMI:
-    type: OS::ContrailV2::VirtualMachineInterface
-    properties:
-      virtual_network_refs:
-        - get_param: gn_net_fqdn
-#      service_health_check_refs: 
-#        - { get_resource: SF5_GN_10_RSHC }
-      virtual_machine_interface_allowed_address_pairs:
-        virtual_machine_interface_allowed_address_pairs_allowed_address_pair:
-          - virtual_machine_interface_allowed_address_pairs_allowed_address_pair_address_mode: { get_param: vmi_allowed_address_pair_address_mode }
-            virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip:
-              virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip_ip_prefix: { get_param: [bgpaas_ip_address,0] }
-              virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip_ip_prefix_len: { get_param: vmi_allowed_address_pair_prefix_lenth }
-          - virtual_machine_interface_allowed_address_pairs_allowed_address_pair_address_mode: { get_param: vmi_allowed_address_pair_address_mode }
-            virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip:
-              virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip_ip_prefix: { get_param: sf_gn_rii_v6 }
-              virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip_ip_prefix_len: { get_param: vmi_allowed_address_pair_prefix_lenth_v6 }
-
-  SF5_GN_10_RII:
-    type: OS::ContrailV2::InstanceIp
-    depends_on: [ SF5_GN_10_RVMI ]
-    properties:
-      virtual_network_refs:
-        - get_param: gn_net_fqdn
-      virtual_machine_interface_refs:
-        - get_resource: SF5_GN_10_RVMI
-      instance_ip_address: { get_param: [sf_gn_ips, 2] }
-
-  SF5_GN_10_v6_RII:
-    type: OS::ContrailV2::InstanceIp
-    depends_on: [ SF5_GN_10_RVMI ]
-    properties:
-      virtual_network_refs:
-        - get_param: gn_net_fqdn
-      virtual_machine_interface_refs:
-        - get_resource: SF5_GN_10_RVMI
-      instance_ip_address: { get_param: [sf_gn_v6_ips, 2] }
-      instance_ip_family: { get_param: instance_ip_family_v6 }
-
-  SF5_GN_10_RSHC:
-    type: OS::ContrailV2::ServiceHealthCheck
-    properties:
-      name: SF5_GN_10_RSHC
-      service_health_check_properties:
-        service_health_check_properties_enabled: { get_param: sf_shc_enabled }
-        service_health_check_properties_monitor_type: { get_param: sf_shc_monitor_type }
-        service_health_check_properties_delay: { get_param: sf_shc_delay }
-        service_health_check_properties_timeout: { get_param: sf_shc_timeout }
-        service_health_check_properties_max_retries: { get_param: sf_shc_max_retries }
-        service_health_check_properties_url_path: { get_param: sf_shc_url_path }
-
-  # Create port for Transport interface(SGi-data) in SGi Context
-  SF5_SGI_11_RVMI:
-    type: OS::ContrailV2::VirtualMachineInterface
-    properties:
-      virtual_network_refs:
-        - get_param: sgi_net_fqdn
-#      service_health_check_refs: 
-#        - { get_resource: SF5_SGI_11_RSHC }
-      virtual_machine_interface_allowed_address_pairs:
-        virtual_machine_interface_allowed_address_pairs_allowed_address_pair:
-          - virtual_machine_interface_allowed_address_pairs_allowed_address_pair_address_mode: { get_param: vmi_allowed_address_pair_address_mode }
-            virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip:
-              virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip_ip_prefix: { get_param: [bgpaas_ip_address,1] }
-              virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip_ip_prefix_len: { get_param: vmi_allowed_address_pair_prefix_lenth }
-          - virtual_machine_interface_allowed_address_pairs_allowed_address_pair_address_mode: { get_param: vmi_allowed_address_pair_address_mode }
-            virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip:
-              virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip_ip_prefix: { get_param: sf_sgi_rii_v6 }
-              virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip_ip_prefix_len: { get_param: vmi_allowed_address_pair_prefix_lenth_v6 }
-
-  SF5_SGI_11_RII:
-    type: OS::ContrailV2::InstanceIp
-    depends_on: [ SF5_SGI_11_RVMI ]
-    properties:
-      virtual_network_refs:
-        - get_param: sgi_net_fqdn
-      virtual_machine_interface_refs:
-        - get_resource: SF5_SGI_11_RVMI
-      instance_ip_address: { get_param: [sf_sgi_prot_ips, 2] }
-
-  SF5_SGI_11_v6_RII:
-    type: OS::ContrailV2::InstanceIp
-    depends_on: [ SF5_SGI_11_RVMI ]
-    properties:
-      virtual_network_refs:
-        - get_param: sgi_net_fqdn
-      virtual_machine_interface_refs:
-        - get_resource: SF5_SGI_11_RVMI
-      instance_ip_address: { get_param: [sf_sgi_prot_v6_ips, 2] }
-      instance_ip_family: { get_param: instance_ip_family_v6 }
-
-  SF5_SGI_11_RSHC:
-    type: OS::ContrailV2::ServiceHealthCheck
-    properties:
-      name: SF5_SGI_11_RSHC
-      service_health_check_properties:
-        service_health_check_properties_enabled: { get_param: sf_shc_enabled }
-        service_health_check_properties_monitor_type: { get_param: sf_shc_monitor_type }
-        service_health_check_properties_delay: { get_param: sf_shc_delay }
-        service_health_check_properties_timeout: { get_param: sf_shc_timeout }
-        service_health_check_properties_max_retries: { get_param: sf_shc_max_retries }
-        service_health_check_properties_url_path: { get_param: sf_shc_url_path }
-
-  # Create port for Transport interface(SGi-ims) in SGi Context
-  SF5_IMS_12_RVMI:
-    type: OS::ContrailV2::VirtualMachineInterface
-    properties:
-      virtual_network_refs:
-        - get_param: ims_net_fqdn
-#      service_health_check_refs: 
-#        - { get_resource: SF5_IMS_12_RSHC }
-      virtual_machine_interface_allowed_address_pairs:
-        virtual_machine_interface_allowed_address_pairs_allowed_address_pair:
-          - virtual_machine_interface_allowed_address_pairs_allowed_address_pair_address_mode: { get_param: vmi_allowed_address_pair_address_mode }
-            virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip:
-              virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip_ip_prefix: { get_param: [bgpaas_ip_address,2] }
-              virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip_ip_prefix_len: { get_param: vmi_allowed_address_pair_prefix_lenth }
-          - virtual_machine_interface_allowed_address_pairs_allowed_address_pair_address_mode: { get_param: vmi_allowed_address_pair_address_mode }
-            virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip:
-              virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip_ip_prefix: { get_param: sf_ims_rii_v6 }
-              virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip_ip_prefix_len: { get_param: vmi_allowed_address_pair_prefix_lenth_v6 }
-
-  SF5_IMS_12_RII:
-    type: OS::ContrailV2::InstanceIp
-    depends_on: [ SF5_IMS_12_RVMI ]
-    properties:
-      virtual_network_refs:
-        - get_param: ims_net_fqdn
-      virtual_machine_interface_refs:
-        - get_resource: SF5_IMS_12_RVMI
-      instance_ip_address: { get_param: [sf_sgi_ims_ips, 2] }
-
-  SF5_IMS_12_v6_RII:
-    type: OS::ContrailV2::InstanceIp
-    depends_on: [ SF5_IMS_12_RVMI ]
-    properties:
-      virtual_network_refs:
-        - get_param: ims_net_fqdn
-      virtual_machine_interface_refs:
-        - get_resource: SF5_IMS_12_RVMI
-      instance_ip_address: { get_param: [sf_sgi_ims_v6_ips, 2] }
-      instance_ip_family: { get_param: instance_ip_family_v6 }
-
-  SF5_IMS_12_RSHC:
-    type: OS::ContrailV2::ServiceHealthCheck
-    properties:
-      name: SF5_IMS_12_RSHC
-      service_health_check_properties:
-        service_health_check_properties_enabled: { get_param: sf_shc_enabled }
-        service_health_check_properties_monitor_type: { get_param: sf_shc_monitor_type }
-        service_health_check_properties_delay: { get_param: sf_shc_delay }
-        service_health_check_properties_timeout: { get_param: sf_shc_timeout }
-        service_health_check_properties_max_retries: { get_param: sf_shc_max_retries }
-        service_health_check_properties_url_path: { get_param: sf_shc_url_path }
-
-  # Create port for Transport Interface in SUPPORT Context
-  SF5_COR_13_RVMI:
-    type: OS::ContrailV2::VirtualMachineInterface
-    properties:
-      virtual_network_refs:
-        - get_param: cor_net_fqdn
-#      service_health_check_refs: 
-#        - { get_resource: SF5_COR_13_RSHC }
-      virtual_machine_interface_allowed_address_pairs:
-        virtual_machine_interface_allowed_address_pairs_allowed_address_pair:
-          - virtual_machine_interface_allowed_address_pairs_allowed_address_pair_address_mode: { get_param: vmi_allowed_address_pair_address_mode }
-            virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip:
-              virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip_ip_prefix: { get_param: [bgpaas_ip_address,3] }
-              virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip_ip_prefix_len: { get_param: vmi_allowed_address_pair_prefix_lenth }
-          - virtual_machine_interface_allowed_address_pairs_allowed_address_pair_address_mode: { get_param: vmi_allowed_address_pair_address_mode }
-            virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip:
-              virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip_ip_prefix: { get_param: sf_cor_rii_v6 }
-              virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip_ip_prefix_len: { get_param: vmi_allowed_address_pair_prefix_lenth_v6 }
-
-  SF5_COR_13_RII:
-    type: OS::ContrailV2::InstanceIp
-    depends_on: [ SF5_COR_13_RVMI ]
-    properties:
-      virtual_network_refs:
-        - get_param: cor_net_fqdn
-      virtual_machine_interface_refs:
-        - get_resource: SF5_COR_13_RVMI
-      instance_ip_address: { get_param: [sf_cor_ips, 2] }
-
-  SF5_COR_13_v6_RII:
-    type: OS::ContrailV2::InstanceIp
-    depends_on: [ SF5_COR_13_RVMI ]
-    properties:
-      virtual_network_refs:
-        - get_param: cor_net_fqdn
-      virtual_machine_interface_refs:
-        - get_resource: SF5_COR_13_RVMI
-      instance_ip_address: { get_param: [sf_cor_v6_ips, 2] }
-      instance_ip_family: { get_param: instance_ip_family_v6 }
-
-  SF5_COR_13_RSHC:
-    type: OS::ContrailV2::ServiceHealthCheck
-    properties:
-      name: SF5_COR_13_RSHC
-      service_health_check_properties:
-        service_health_check_properties_enabled: { get_param: sf_shc_enabled }
-        service_health_check_properties_monitor_type: { get_param: sf_shc_monitor_type }
-        service_health_check_properties_delay: { get_param: sf_shc_delay }
-        service_health_check_properties_timeout: { get_param: sf_shc_timeout }
-        service_health_check_properties_max_retries: { get_param: sf_shc_max_retries }
-        service_health_check_properties_url_path: { get_param: sf_shc_url_path }
-
-
-  # Create port for Transport interface in LI Context 
-  SF5_OAM_CALEA_14_PORT:
-    type: OS::Neutron::Port
-    properties:
-      network: {get_param: oam_calea_net_name}
-      fixed_ips: [{"ip_address": {get_param: [sf_oam_calea_ips, 2]}}]
-  # Create port for Transport interface in SRP Context 
-  SF5_INT_ICSR_15_PORT:
-    type: OS::Neutron::Port
-    properties:
-      network: {get_param: int_icsr_net_name}
-      fixed_ips: [{"ip_address": {get_param: [sf_int_icsr_ips, 2]}}]
-
-  # Create VPC SF 05 Instance
-  sf_server_4:
-    type: OS::Nova::Server
-    depends_on: [ SF5_GN_10_RII, SF5_GN_10_v6_RII, SF5_SGI_11_RII, SF5_SGI_11_v6_RII, SF5_IMS_12_RII, SF5_IMS_12_v6_RII, SF5_COR_13_RII, SF5_COR_13_v6_RII ]
-    properties:
-      metadata:
-          vnf_id: { get_param: vnf_id }
-          vnf_name: { get_param: vnf_name }
-          vf_module_id: { get_param: vf_module_id }
-
-#      name:
-#        str_replace:
-#          template: Z${CZ_ID}CGWY${VF_ID}${VM_TYPE}${VM_NUM}
-#          params:
-#            ${CZ_ID}: {get_param: czid}
-#            ${VF_ID}: {get_param: vf_inst_number}
-#            ${VM_TYPE}: DSF
-#            ${VM_NUM}: "005"
-      name: {get_param: [cgwy_names, 4]}
-      config_drive: True
-      image: {get_param: sf_image_name}
-      flavor: {get_param: sf_flavor_name}
-      networks:
-        - port: {get_resource: sf_int_di2_4_port}
-        - port: {get_resource: SF5_GN_10_RVMI}
-        - port: {get_resource: SF5_SGI_11_RVMI}
-        - port: {get_resource: SF5_IMS_12_RVMI}
-        - port: {get_resource: SF5_COR_13_RVMI}
-        - port: {get_resource: SF5_OAM_CALEA_14_PORT}
-        - port: {get_resource: SF5_INT_ICSR_15_PORT}
-
-      personality:
-        "staros_param.cfg":
-          str_replace:
-            template: |
-              CARDSLOT=$CARD_NUMBER
-              CARDTYPE=$CARD_TYPE
-              CPUID=$CPUID
-            params:
-              $CARD_NUMBER: 5
-              $CARD_TYPE: SFC
-              $CPUID: 0
-      availability_zone: {get_param: availability_zone_0}
-      scheduler_hints:
-        group: {get_resource: sf_vpc-servergroup}
-        
-
-  #### SF06 ######
-  # Create port for DI-Internal Network
-  sf_int_di2_5_port:
-    type: OS::Neutron::Port
-    properties:
-      network: {get_param: cgwy_int_di2_net_name}
-  # Create port for Transport Interface in SAEGW Context
-  SF6_GN_10_RVMI:
-    type: OS::ContrailV2::VirtualMachineInterface
-    properties:
-      virtual_network_refs:
-        - get_param: gn_net_fqdn
-#      service_health_check_refs: 
-#        - { get_resource: SF6_GN_10_RSHC }
-      virtual_machine_interface_allowed_address_pairs:
-        virtual_machine_interface_allowed_address_pairs_allowed_address_pair:
-          - virtual_machine_interface_allowed_address_pairs_allowed_address_pair_address_mode: { get_param: vmi_allowed_address_pair_address_mode }
-            virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip:
-              virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip_ip_prefix: { get_param: [bgpaas_ip_address,0] }
-              virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip_ip_prefix_len: { get_param: vmi_allowed_address_pair_prefix_lenth }
-          - virtual_machine_interface_allowed_address_pairs_allowed_address_pair_address_mode: { get_param: vmi_allowed_address_pair_address_mode }
-            virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip:
-              virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip_ip_prefix: { get_param: sf_gn_rii_v6 }
-              virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip_ip_prefix_len: { get_param: vmi_allowed_address_pair_prefix_lenth_v6 }
-
-  SF6_GN_10_RII:
-    type: OS::ContrailV2::InstanceIp
-    depends_on: [ SF6_GN_10_RVMI ]
-    properties:
-      virtual_network_refs:
-        - get_param: gn_net_fqdn
-      virtual_machine_interface_refs: 
-        - get_resource: SF6_GN_10_RVMI
-      instance_ip_address: { get_param: [sf_gn_ips, 3] }
-
-  SF6_GN_10_RSHC:
-    type: OS::ContrailV2::ServiceHealthCheck
-    properties:
-      name: SF6_GN_10_RSHC
-      service_health_check_properties:
-        service_health_check_properties_enabled: { get_param: sf_shc_enabled }
-        service_health_check_properties_monitor_type: { get_param: sf_shc_monitor_type }
-        service_health_check_properties_delay: { get_param: sf_shc_delay }
-        service_health_check_properties_timeout: { get_param: sf_shc_timeout }
-        service_health_check_properties_max_retries: { get_param: sf_shc_max_retries }
-        service_health_check_properties_url_path: { get_param: sf_shc_url_path }
-
-  SF6_GN_10_v6_RII:
-    type: OS::ContrailV2::InstanceIp
-    depends_on: [ SF6_GN_10_RVMI ]
-    properties:
-      virtual_network_refs:
-        - get_param: gn_net_fqdn
-      virtual_machine_interface_refs:
-        - get_resource: SF6_GN_10_RVMI
-      instance_ip_address: { get_param: [sf_gn_v6_ips, 3] }
-      instance_ip_family: { get_param: instance_ip_family_v6 }
-
-  # Create port for Transport interface(SGi-data) in SGi Context
-  SF6_SGI_11_RVMI:
-    type: OS::ContrailV2::VirtualMachineInterface
-    properties:
-      virtual_network_refs:
-        - get_param: sgi_net_fqdn
-#      service_health_check_refs: 
-#        - { get_resource: SF6_SGI_11_RSHC }
-      virtual_machine_interface_allowed_address_pairs:
-        virtual_machine_interface_allowed_address_pairs_allowed_address_pair:
-          - virtual_machine_interface_allowed_address_pairs_allowed_address_pair_address_mode: { get_param: vmi_allowed_address_pair_address_mode }
-            virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip:
-              virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip_ip_prefix: { get_param: [bgpaas_ip_address,1] }
-              virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip_ip_prefix_len: { get_param: vmi_allowed_address_pair_prefix_lenth }
-          - virtual_machine_interface_allowed_address_pairs_allowed_address_pair_address_mode: { get_param: vmi_allowed_address_pair_address_mode }
-            virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip:
-              virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip_ip_prefix: { get_param: sf_sgi_rii_v6 }
-              virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip_ip_prefix_len: { get_param: vmi_allowed_address_pair_prefix_lenth_v6 }
-
-  SF6_SGI_11_RII:
-    type: OS::ContrailV2::InstanceIp
-    depends_on: [ SF6_SGI_11_RVMI ]
-    properties:
-      virtual_network_refs:
-        - get_param: sgi_net_fqdn
-      virtual_machine_interface_refs:
-        - get_resource: SF6_SGI_11_RVMI
-      instance_ip_address: { get_param: [sf_sgi_prot_ips, 3] }
-
-  SF6_SGI_11_v6_RII:
-    type: OS::ContrailV2::InstanceIp
-    depends_on: [ SF6_SGI_11_RVMI ]
-    properties:
-      virtual_network_refs:
-        - get_param: sgi_net_fqdn
-      virtual_machine_interface_refs:
-        - get_resource: SF6_SGI_11_RVMI
-      instance_ip_address: { get_param: [sf_sgi_prot_v6_ips, 3] }
-      instance_ip_family: { get_param: instance_ip_family_v6 }
-
-  SF6_SGI_11_RSHC:
-    type: OS::ContrailV2::ServiceHealthCheck
-    properties:
-      name: SF6_SGI_11_RSHC
-      service_health_check_properties:
-        service_health_check_properties_enabled: { get_param: sf_shc_enabled }
-        service_health_check_properties_monitor_type: { get_param: sf_shc_monitor_type }
-        service_health_check_properties_delay: { get_param: sf_shc_delay }
-        service_health_check_properties_timeout: { get_param: sf_shc_timeout }
-        service_health_check_properties_max_retries: { get_param: sf_shc_max_retries }
-        service_health_check_properties_url_path: { get_param: sf_shc_url_path }
-
-  # Create port for Transport interface(SGi-ims) in SGi Context
-  SF6_IMS_12_RVMI:
-    type: OS::ContrailV2::VirtualMachineInterface
-    properties:
-      virtual_network_refs:
-        - get_param: ims_net_fqdn
-#      service_health_check_refs: 
-#        - { get_resource: SF6_IMS_12_RSHC }
-      virtual_machine_interface_allowed_address_pairs:
-        virtual_machine_interface_allowed_address_pairs_allowed_address_pair:
-          - virtual_machine_interface_allowed_address_pairs_allowed_address_pair_address_mode: { get_param: vmi_allowed_address_pair_address_mode }
-            virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip:
-              virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip_ip_prefix: { get_param: [bgpaas_ip_address,2] }
-              virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip_ip_prefix_len: { get_param: vmi_allowed_address_pair_prefix_lenth }
-          - virtual_machine_interface_allowed_address_pairs_allowed_address_pair_address_mode: { get_param: vmi_allowed_address_pair_address_mode }
-            virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip:
-              virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip_ip_prefix: { get_param: sf_ims_rii_v6 }
-              virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip_ip_prefix_len: { get_param: vmi_allowed_address_pair_prefix_lenth_v6 }
-
-  SF6_IMS_12_RII:
-    type: OS::ContrailV2::InstanceIp
-    depends_on: [ SF6_IMS_12_RVMI ]
-    properties:
-      virtual_network_refs:
-        - get_param: ims_net_fqdn
-      virtual_machine_interface_refs:
-        - get_resource: SF6_IMS_12_RVMI
-      instance_ip_address: { get_param: [sf_sgi_ims_ips, 3] }
-
-  SF6_IMS_12_v6_RII:
-    type: OS::ContrailV2::InstanceIp
-    depends_on: [ SF6_IMS_12_RVMI ]
-    properties:
-      virtual_network_refs:
-        - get_param: ims_net_fqdn
-      virtual_machine_interface_refs:
-        - get_resource: SF6_IMS_12_RVMI
-      instance_ip_address: { get_param: [sf_sgi_ims_v6_ips, 3] }
-      instance_ip_family: { get_param: instance_ip_family_v6 }
-
-  SF6_IMS_12_RSHC:
-    type: OS::ContrailV2::ServiceHealthCheck
-    properties:
-      name: SF6_IMS_12_RSHC
-      service_health_check_properties:
-        service_health_check_properties_enabled: { get_param: sf_shc_enabled }
-        service_health_check_properties_monitor_type: { get_param: sf_shc_monitor_type }
-        service_health_check_properties_delay: { get_param: sf_shc_delay }
-        service_health_check_properties_timeout: { get_param: sf_shc_timeout }
-        service_health_check_properties_max_retries: { get_param: sf_shc_max_retries }
-        service_health_check_properties_url_path: { get_param: sf_shc_url_path }
-
-  # Create port for Transport Interface in SUPPORT Context
-  SF6_COR_13_RVMI:
-    type: OS::ContrailV2::VirtualMachineInterface
-    properties:
-      virtual_network_refs:
-        - get_param: cor_net_fqdn
-#      service_health_check_refs: 
-#        - { get_resource: SF6_COR_13_RSHC }
-      virtual_machine_interface_allowed_address_pairs:
-        virtual_machine_interface_allowed_address_pairs_allowed_address_pair:
-          - virtual_machine_interface_allowed_address_pairs_allowed_address_pair_address_mode: { get_param: vmi_allowed_address_pair_address_mode }
-            virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip:
-              virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip_ip_prefix: { get_param: [bgpaas_ip_address,3] }
-              virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip_ip_prefix_len: { get_param: vmi_allowed_address_pair_prefix_lenth }
-          - virtual_machine_interface_allowed_address_pairs_allowed_address_pair_address_mode: { get_param: vmi_allowed_address_pair_address_mode }
-            virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip:
-              virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip_ip_prefix: { get_param: sf_cor_rii_v6 }
-              virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip_ip_prefix_len: { get_param: vmi_allowed_address_pair_prefix_lenth_v6 }
-
-  SF6_COR_13_RII:
-    type: OS::ContrailV2::InstanceIp
-    depends_on: [ SF6_COR_13_RVMI ]
-    properties:
-      virtual_network_refs:
-        - get_param: cor_net_fqdn
-      virtual_machine_interface_refs:
-        - get_resource: SF6_COR_13_RVMI
-      instance_ip_address: { get_param: [sf_cor_ips, 3] }
-
-  SF6_COR_13_v6_RII:
-    type: OS::ContrailV2::InstanceIp
-    depends_on: [ SF6_COR_13_RVMI ]
-    properties:
-      virtual_network_refs:
-        - get_param: cor_net_fqdn
-      virtual_machine_interface_refs:
-        - get_resource: SF6_COR_13_RVMI
-      instance_ip_address: { get_param: [sf_cor_v6_ips, 3] }
-      instance_ip_family: { get_param: instance_ip_family_v6 }
-
-  SF6_COR_13_RSHC:
-    type: OS::ContrailV2::ServiceHealthCheck
-    properties:
-      name: SF6_COR_13_RSHC
-      service_health_check_properties:
-        service_health_check_properties_enabled: { get_param: sf_shc_enabled }
-        service_health_check_properties_monitor_type: { get_param: sf_shc_monitor_type }
-        service_health_check_properties_delay: { get_param: sf_shc_delay }
-        service_health_check_properties_timeout: { get_param: sf_shc_timeout }
-        service_health_check_properties_max_retries: { get_param: sf_shc_max_retries }
-        service_health_check_properties_url_path: { get_param: sf_shc_url_path }
-
-
-  # Create port for Transport interface in LI Context 
-  SF6_OAM_CALEA_14_PORT:
-    type: OS::Neutron::Port
-    properties:
-      network: {get_param: oam_calea_net_name}
-      fixed_ips: [{"ip_address": {get_param: [sf_oam_calea_ips, 3]}}]
-  # Create port for Transport interface in SRP Context 
-  SF6_INT_ICSR_15_PORT:
-    type: OS::Neutron::Port
-    properties:
-      network: {get_param: int_icsr_net_name}
-      fixed_ips: [{"ip_address": {get_param: [sf_int_icsr_ips, 3]}}]
-
-  # Create VPC SF 06 Instance
-  sf_server_5:
-    type: OS::Nova::Server
-    depends_on: [ SF6_GN_10_RII, SF6_GN_10_v6_RII, SF6_SGI_11_RII, SF6_SGI_11_v6_RII, SF6_IMS_12_RII, SF6_IMS_12_v6_RII, SF6_COR_13_RII, SF6_COR_13_v6_RII ]
-    properties:
-      metadata:
-          vnf_id: { get_param: vnf_id }
-          vnf_name: { get_param: vnf_name }
-          vf_module_id: { get_param: vf_module_id }
-
-#      name:
-#        str_replace:
-#          template: Z${CZ_ID}CGWY${VF_ID}${VM_TYPE}${VM_NUM}
-#          params:
-#            ${CZ_ID}: {get_param: czid}
-#            ${VF_ID}: {get_param: vf_inst_number}
-#            ${VM_TYPE}: DSF
-#            ${VM_NUM}: "006"
-      name: {get_param: [cgwy_names, 5]}
-      config_drive: True
-      image: {get_param: sf_image_name}
-      flavor: {get_param: sf_flavor_name}
-      networks:
-        - port: {get_resource: sf_int_di2_5_port}
-        - port: {get_resource: SF6_GN_10_RVMI}
-        - port: {get_resource: SF6_SGI_11_RVMI}
-        - port: {get_resource: SF6_IMS_12_RVMI}
-        - port: {get_resource: SF6_COR_13_RVMI}
-        - port: {get_resource: SF6_OAM_CALEA_14_PORT}
-        - port: {get_resource: SF6_INT_ICSR_15_PORT}
-
-      personality:
-        "staros_param.cfg":
-          str_replace:
-            template: |
-              CARDSLOT=$CARD_NUMBER
-              CARDTYPE=$CARD_TYPE
-              CPUID=$CPUID
-            params:
-              $CARD_NUMBER: 6
-              $CARD_TYPE: SFC
-              $CPUID: 0
-      availability_zone: {get_param: availability_zone_0}
-      scheduler_hints:
-        group: {get_resource: sf_vpc-servergroup}
-  ### SF07 ######
-  # Create port for DI-Internal Network
-  sf_int_di2_6_port:
-    type: OS::Neutron::Port
-    properties:
-      network: {get_param: cgwy_int_di2_net_name}
-# Create port for Transport Interface in SAEGW Context
-  SF7_GN_10_RVMI:
-    type: OS::ContrailV2::VirtualMachineInterface
-    properties:
-      virtual_network_refs:
-        - get_param: gn_net_fqdn
-#      service_health_check_refs: 
-#        - { get_resource: SF7_GN_10_RSHC }
-      virtual_machine_interface_allowed_address_pairs:
-        virtual_machine_interface_allowed_address_pairs_allowed_address_pair:
-          - virtual_machine_interface_allowed_address_pairs_allowed_address_pair_address_mode: { get_param: vmi_allowed_address_pair_address_mode }
-            virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip:
-              virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip_ip_prefix: { get_param: [bgpaas_ip_address,0] }
-              virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip_ip_prefix_len: { get_param: vmi_allowed_address_pair_prefix_lenth }
-          - virtual_machine_interface_allowed_address_pairs_allowed_address_pair_address_mode: { get_param: vmi_allowed_address_pair_address_mode }
-            virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip:
-              virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip_ip_prefix: { get_param: sf_gn_rii_v6 }
-              virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip_ip_prefix_len: { get_param: vmi_allowed_address_pair_prefix_lenth_v6 }
-
-  SF7_GN_10_RII:
-    type: OS::ContrailV2::InstanceIp
-    depends_on: [ SF7_GN_10_RVMI ]
-    properties:
-      virtual_network_refs:
-        - get_param: gn_net_fqdn
-      virtual_machine_interface_refs:
-        - get_resource: SF7_GN_10_RVMI
-      instance_ip_address: { get_param: [sf_gn_ips, 4] }
-
-  SF7_GN_10_v6_RII:
-    type: OS::ContrailV2::InstanceIp
-    depends_on: [ SF7_GN_10_RVMI ]
-    properties:
-      virtual_network_refs:
-        - get_param: gn_net_fqdn
-      virtual_machine_interface_refs:
-        - get_resource: SF7_GN_10_RVMI
-      instance_ip_address: { get_param: [sf_gn_v6_ips, 4] }
-      instance_ip_family: { get_param: instance_ip_family_v6 }
-
-  SF7_GN_10_RSHC:
-    type: OS::ContrailV2::ServiceHealthCheck
-    properties:
-      name: SF7_GN_10_RSHC
-      service_health_check_properties:
-        service_health_check_properties_enabled: { get_param: sf_shc_enabled }
-        service_health_check_properties_monitor_type: { get_param: sf_shc_monitor_type }
-        service_health_check_properties_delay: { get_param: sf_shc_delay }
-        service_health_check_properties_timeout: { get_param: sf_shc_timeout }
-        service_health_check_properties_max_retries: { get_param: sf_shc_max_retries }
-        service_health_check_properties_url_path: { get_param: sf_shc_url_path }
-
-  # Create port for Transport interface(SGi-data) in SGi Context
-  SF7_SGI_11_RVMI:
-    type: OS::ContrailV2::VirtualMachineInterface
-    properties:
-      virtual_network_refs:
-        - get_param: sgi_net_fqdn
-#      service_health_check_refs: 
-#        - { get_resource: SF7_SGI_11_RSHC }
-      virtual_machine_interface_allowed_address_pairs:
-        virtual_machine_interface_allowed_address_pairs_allowed_address_pair:
-          - virtual_machine_interface_allowed_address_pairs_allowed_address_pair_address_mode: { get_param: vmi_allowed_address_pair_address_mode }
-            virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip:
-              virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip_ip_prefix: { get_param: [bgpaas_ip_address,1] }
-              virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip_ip_prefix_len: { get_param: vmi_allowed_address_pair_prefix_lenth }
-          - virtual_machine_interface_allowed_address_pairs_allowed_address_pair_address_mode: { get_param: vmi_allowed_address_pair_address_mode }
-            virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip:
-              virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip_ip_prefix: { get_param: sf_sgi_rii_v6 }
-              virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip_ip_prefix_len: { get_param: vmi_allowed_address_pair_prefix_lenth_v6 }
-
-  SF7_SGI_11_RII:
-    type: OS::ContrailV2::InstanceIp
-    depends_on: [ SF7_SGI_11_RVMI ]
-    properties:
-      virtual_network_refs:
-        - get_param: sgi_net_fqdn
-      virtual_machine_interface_refs:
-        - get_resource: SF7_SGI_11_RVMI
-      instance_ip_address: { get_param: [sf_sgi_prot_ips, 4] }
-
-  SF7_SGI_11_v6_RII:
-    type: OS::ContrailV2::InstanceIp
-    depends_on: [ SF7_SGI_11_RVMI ]
-    properties:
-      virtual_network_refs:
-        - get_param: sgi_net_fqdn
-      virtual_machine_interface_refs:
-        - get_resource: SF7_SGI_11_RVMI
-      instance_ip_address: { get_param: [sf_sgi_prot_v6_ips, 4] }
-      instance_ip_family: { get_param: instance_ip_family_v6 }
-
-  SF7_SGI_11_RSHC:
-    type: OS::ContrailV2::ServiceHealthCheck
-    properties:
-      name: SF7_SGI_11_RSHC
-      service_health_check_properties:
-        service_health_check_properties_enabled: { get_param: sf_shc_enabled }
-        service_health_check_properties_monitor_type: { get_param: sf_shc_monitor_type }
-        service_health_check_properties_delay: { get_param: sf_shc_delay }
-        service_health_check_properties_timeout: { get_param: sf_shc_timeout }
-        service_health_check_properties_max_retries: { get_param: sf_shc_max_retries }
-        service_health_check_properties_url_path: { get_param: sf_shc_url_path }
-
-  # Create port for Transport interface(SGi-ims) in SGi Context
-  SF7_IMS_12_RVMI:
-    type: OS::ContrailV2::VirtualMachineInterface
-    properties:
-      virtual_network_refs:
-        - get_param: ims_net_fqdn
-#      service_health_check_refs: 
-#        - { get_resource: SF7_IMS_12_RSHC }
-      virtual_machine_interface_allowed_address_pairs:
-        virtual_machine_interface_allowed_address_pairs_allowed_address_pair:
-          - virtual_machine_interface_allowed_address_pairs_allowed_address_pair_address_mode: { get_param: vmi_allowed_address_pair_address_mode }
-            virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip:
-              virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip_ip_prefix: { get_param: [bgpaas_ip_address,2] }
-              virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip_ip_prefix_len: { get_param: vmi_allowed_address_pair_prefix_lenth }
-          - virtual_machine_interface_allowed_address_pairs_allowed_address_pair_address_mode: { get_param: vmi_allowed_address_pair_address_mode }
-            virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip:
-              virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip_ip_prefix: { get_param: sf_ims_rii_v6 }
-              virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip_ip_prefix_len: { get_param: vmi_allowed_address_pair_prefix_lenth_v6 }
-
-  SF7_IMS_12_RII:
-    type: OS::ContrailV2::InstanceIp
-    depends_on: [ SF7_IMS_12_RVMI ]
-    properties:
-      virtual_network_refs:
-        - get_param: ims_net_fqdn
-      virtual_machine_interface_refs:
-        - get_resource: SF7_IMS_12_RVMI
-      instance_ip_address: { get_param: [sf_sgi_ims_ips, 4] }
-
-  SF7_IMS_12_v6_RII:
-    type: OS::ContrailV2::InstanceIp
-    depends_on: [ SF7_IMS_12_RVMI ]
-    properties:
-      virtual_network_refs:
-        - get_param: ims_net_fqdn
-      virtual_machine_interface_refs:
-        - get_resource: SF7_IMS_12_RVMI
-      instance_ip_address: { get_param: [sf_sgi_ims_v6_ips, 4] }
-      instance_ip_family: { get_param: instance_ip_family_v6 }
-
-  SF7_IMS_12_RSHC:
-    type: OS::ContrailV2::ServiceHealthCheck
-    properties:
-      name: SF7_IMS_12_RSHC
-      service_health_check_properties:
-        service_health_check_properties_enabled: { get_param: sf_shc_enabled }
-        service_health_check_properties_monitor_type: { get_param: sf_shc_monitor_type }
-        service_health_check_properties_delay: { get_param: sf_shc_delay }
-        service_health_check_properties_timeout: { get_param: sf_shc_timeout }
-        service_health_check_properties_max_retries: { get_param: sf_shc_max_retries }
-        service_health_check_properties_url_path: { get_param: sf_shc_url_path }
-
-  # Create port for Transport Interface in SUPPORT Context
-  SF7_COR_13_RVMI:
-    type: OS::ContrailV2::VirtualMachineInterface
-    properties:
-      virtual_network_refs:
-        - get_param: cor_net_fqdn
-#      service_health_check_refs: 
-#        - { get_resource: SF7_COR_13_RSHC }
-      virtual_machine_interface_allowed_address_pairs:
-        virtual_machine_interface_allowed_address_pairs_allowed_address_pair:
-          - virtual_machine_interface_allowed_address_pairs_allowed_address_pair_address_mode: { get_param: vmi_allowed_address_pair_address_mode }
-            virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip:
-              virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip_ip_prefix: { get_param: [bgpaas_ip_address,3] }
-              virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip_ip_prefix_len: { get_param: vmi_allowed_address_pair_prefix_lenth }
-          - virtual_machine_interface_allowed_address_pairs_allowed_address_pair_address_mode: { get_param: vmi_allowed_address_pair_address_mode }
-            virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip:
-              virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip_ip_prefix: { get_param: sf_cor_rii_v6 }
-              virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip_ip_prefix_len: { get_param: vmi_allowed_address_pair_prefix_lenth_v6 }
-
-  SF7_COR_13_RII:
-    type: OS::ContrailV2::InstanceIp
-    depends_on: [ SF7_COR_13_RVMI ]
-    properties:
-      virtual_network_refs:
-        - get_param: cor_net_fqdn
-      virtual_machine_interface_refs:
-        - get_resource: SF7_COR_13_RVMI
-      instance_ip_address: { get_param: [sf_cor_ips, 4] }
-
-  SF7_COR_13_v6_RII:
-    type: OS::ContrailV2::InstanceIp
-    depends_on: [ SF7_COR_13_RVMI ]
-    properties:
-      virtual_network_refs:
-        - get_param: cor_net_fqdn
-      virtual_machine_interface_refs:
-        - get_resource: SF7_COR_13_RVMI
-      instance_ip_address: { get_param: [sf_cor_v6_ips, 4] }
-      instance_ip_family: { get_param: instance_ip_family_v6 }
-
-  SF7_COR_13_RSHC:
-    type: OS::ContrailV2::ServiceHealthCheck
-    properties:
-      name: SF7_COR_13_RSHC
-      service_health_check_properties:
-        service_health_check_properties_enabled: { get_param: sf_shc_enabled }
-        service_health_check_properties_monitor_type: { get_param: sf_shc_monitor_type }
-        service_health_check_properties_delay: { get_param: sf_shc_delay }
-        service_health_check_properties_timeout: { get_param: sf_shc_timeout }
-        service_health_check_properties_max_retries: { get_param: sf_shc_max_retries }
-        service_health_check_properties_url_path: { get_param: sf_shc_url_path }
-
-  # Create port for Transport interface in LI Context
-  SF7_OAM_CALEA_14_PORT:
-    type: OS::Neutron::Port
-    properties:
-      network: {get_param: oam_calea_net_name}
-      fixed_ips: [{"ip_address": {get_param: [sf_oam_calea_ips, 4]}}]
-  # Create port for Transport interface in SRP Context
-  SF7_INT_ICSR_15_PORT:
-    type: OS::Neutron::Port
-    properties:
-      network: {get_param: int_icsr_net_name}
-      fixed_ips: [{"ip_address": {get_param: [sf_int_icsr_ips, 4]}}]
-
-  # Create VPC SF 07 Instance
-  sf_server_6:
-    type: OS::Nova::Server
-    depends_on: [ SF7_GN_10_RII, SF7_GN_10_v6_RII, SF7_SGI_11_RII, SF7_SGI_11_v6_RII, SF7_IMS_12_RII, SF7_IMS_12_v6_RII, SF7_COR_13_RII, SF7_COR_13_v6_RII ]
-    properties:
-      metadata:
-          vnf_id: { get_param: vnf_id }
-          vnf_name: { get_param: vnf_name }
-          vf_module_id: { get_param: vf_module_id }
-
-#      name:
-#        str_replace:
-#          template: Z${CZ_ID}CGWY${VF_ID}${VM_TYPE}${VM_NUM}
-#          params:
-#            ${CZ_ID}: {get_param: czid}
-#            ${VF_ID}: {get_param: vf_inst_number}
-#            ${VM_TYPE}: DSF
-#            ${VM_NUM}: "007"
-      name: {get_param: [cgwy_names, 6]}
-      config_drive: True
-      image: {get_param: sf_image_name}
-      flavor: {get_param: sf_flavor_name}
-      networks:
-        - port: {get_resource: sf_int_di2_6_port}
-        - port: {get_resource: SF7_GN_10_RVMI}
-        - port: {get_resource: SF7_SGI_11_RVMI}
-        - port: {get_resource: SF7_IMS_12_RVMI}
-        - port: {get_resource: SF7_COR_13_RVMI}
-        - port: {get_resource: SF7_OAM_CALEA_14_PORT}
-        - port: {get_resource: SF7_INT_ICSR_15_PORT}
-
-      personality:
-        "staros_param.cfg":
-          str_replace:
-            template: |
-              CARDSLOT=$CARD_NUMBER
-              CARDTYPE=$CARD_TYPE
-              CPUID=$CPUID
-            params:
-              $CARD_NUMBER: 7
-              $CARD_TYPE: SFC
-              $CPUID: 0
-      availability_zone: {get_param: availability_zone_0}
-      scheduler_hints:
-        group: {get_resource: sf_vpc-servergroup}
-
-  ### SF08 ######
-  # Create port for DI-Internal Network
-  sf_int_di2_7_port:
-    type: OS::Neutron::Port
-    properties:
-      network: {get_param: cgwy_int_di2_net_name}
-# Create port for Transport Interface in SAEGW Context
-  SF8_GN_10_RVMI:
-    type: OS::ContrailV2::VirtualMachineInterface
-    properties:
-      virtual_network_refs:
-        - get_param: gn_net_fqdn
-#      service_health_check_refs: 
-#        - { get_resource: SF8_GN_10_RSHC }
-      virtual_machine_interface_allowed_address_pairs:
-        virtual_machine_interface_allowed_address_pairs_allowed_address_pair:
-          - virtual_machine_interface_allowed_address_pairs_allowed_address_pair_address_mode: { get_param: vmi_allowed_address_pair_address_mode }
-            virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip:
-              virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip_ip_prefix: { get_param: [bgpaas_ip_address,0] }
-              virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip_ip_prefix_len: { get_param: vmi_allowed_address_pair_prefix_lenth }
-          - virtual_machine_interface_allowed_address_pairs_allowed_address_pair_address_mode: { get_param: vmi_allowed_address_pair_address_mode }
-            virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip:
-              virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip_ip_prefix: { get_param: sf_gn_rii_v6 }
-              virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip_ip_prefix_len: { get_param: vmi_allowed_address_pair_prefix_lenth_v6 }
-
-  SF8_GN_10_RII:
-    type: OS::ContrailV2::InstanceIp
-    depends_on: [ SF8_GN_10_RVMI ]
-    properties:
-      virtual_network_refs:
-        - get_param: gn_net_fqdn
-      virtual_machine_interface_refs:
-        - get_resource: SF8_GN_10_RVMI
-      instance_ip_address: { get_param: [sf_gn_ips, 5] }
-
-  SF8_GN_10_v6_RII:
-    type: OS::ContrailV2::InstanceIp
-    depends_on: [ SF8_GN_10_RVMI ]
-    properties:
-      virtual_network_refs:
-        - get_param: gn_net_fqdn
-      virtual_machine_interface_refs:
-        - get_resource: SF8_GN_10_RVMI
-      instance_ip_address: { get_param: [sf_gn_v6_ips, 5] }
-      instance_ip_family: { get_param: instance_ip_family_v6 }
-
-  SF8_GN_10_RSHC:
-    type: OS::ContrailV2::ServiceHealthCheck
-    properties:
-      name: SF8_GN_10_RSHC
-      service_health_check_properties:
-        service_health_check_properties_enabled: { get_param: sf_shc_enabled }
-        service_health_check_properties_monitor_type: { get_param: sf_shc_monitor_type }
-        service_health_check_properties_delay: { get_param: sf_shc_delay }
-        service_health_check_properties_timeout: { get_param: sf_shc_timeout }
-        service_health_check_properties_max_retries: { get_param: sf_shc_max_retries }
-        service_health_check_properties_url_path: { get_param: sf_shc_url_path }
-
-  # Create port for Transport interface(SGi-data) in SGi Context
-  SF8_SGI_11_RVMI:
-    type: OS::ContrailV2::VirtualMachineInterface
-    properties:
-      virtual_network_refs:
-        - get_param: sgi_net_fqdn
-#      service_health_check_refs: 
-#        - { get_resource: SF8_SGI_11_RSHC }
-      virtual_machine_interface_allowed_address_pairs:
-        virtual_machine_interface_allowed_address_pairs_allowed_address_pair:
-          - virtual_machine_interface_allowed_address_pairs_allowed_address_pair_address_mode: { get_param: vmi_allowed_address_pair_address_mode }
-            virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip:
-              virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip_ip_prefix: { get_param: [bgpaas_ip_address,1] }
-              virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip_ip_prefix_len: { get_param: vmi_allowed_address_pair_prefix_lenth }
-          - virtual_machine_interface_allowed_address_pairs_allowed_address_pair_address_mode: { get_param: vmi_allowed_address_pair_address_mode }
-            virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip:
-              virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip_ip_prefix: { get_param: sf_sgi_rii_v6 }
-              virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip_ip_prefix_len: { get_param: vmi_allowed_address_pair_prefix_lenth_v6 }
-
-  SF8_SGI_11_RII:
-    type: OS::ContrailV2::InstanceIp
-    depends_on: [ SF8_SGI_11_RVMI ]
-    properties:
-      virtual_network_refs:
-        - get_param: sgi_net_fqdn
-      virtual_machine_interface_refs:
-        - get_resource: SF8_SGI_11_RVMI
-      instance_ip_address: { get_param: [sf_sgi_prot_ips, 5] }
-
-  SF8_SGI_11_v6_RII:
-    type: OS::ContrailV2::InstanceIp
-    depends_on: [ SF8_SGI_11_RVMI ]
-    properties:
-      virtual_network_refs:
-        - get_param: sgi_net_fqdn
-      virtual_machine_interface_refs:
-        - get_resource: SF8_SGI_11_RVMI
-      instance_ip_address: { get_param: [sf_sgi_prot_v6_ips, 5] }
-      instance_ip_family: { get_param: instance_ip_family_v6 }
-
-  SF8_SGI_11_RSHC:
-    type: OS::ContrailV2::ServiceHealthCheck
-    properties:
-      name: SF8_SGI_11_RSHC
-      service_health_check_properties:
-        service_health_check_properties_enabled: { get_param: sf_shc_enabled }
-        service_health_check_properties_monitor_type: { get_param: sf_shc_monitor_type }
-        service_health_check_properties_delay: { get_param: sf_shc_delay }
-        service_health_check_properties_timeout: { get_param: sf_shc_timeout }
-        service_health_check_properties_max_retries: { get_param: sf_shc_max_retries }
-        service_health_check_properties_url_path: { get_param: sf_shc_url_path }
-
-  # Create port for Transport interface(SGi-ims) in SGi Context
-  SF8_IMS_12_RVMI:
-    type: OS::ContrailV2::VirtualMachineInterface
-    properties:
-      virtual_network_refs:
-        - get_param: ims_net_fqdn
-#      service_health_check_refs: 
-#        - { get_resource: SF8_IMS_12_RSHC }
-      virtual_machine_interface_allowed_address_pairs:
-        virtual_machine_interface_allowed_address_pairs_allowed_address_pair:
-          - virtual_machine_interface_allowed_address_pairs_allowed_address_pair_address_mode: { get_param: vmi_allowed_address_pair_address_mode }
-            virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip:
-              virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip_ip_prefix: { get_param: [bgpaas_ip_address,2] }
-              virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip_ip_prefix_len: { get_param: vmi_allowed_address_pair_prefix_lenth }
-          - virtual_machine_interface_allowed_address_pairs_allowed_address_pair_address_mode: { get_param: vmi_allowed_address_pair_address_mode }
-            virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip:
-              virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip_ip_prefix: { get_param: sf_ims_rii_v6 }
-              virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip_ip_prefix_len: { get_param: vmi_allowed_address_pair_prefix_lenth_v6 }
-
-  SF8_IMS_12_RII:
-    type: OS::ContrailV2::InstanceIp
-    depends_on: [ SF8_IMS_12_RVMI ]
-    properties:
-      virtual_network_refs:
-        - get_param: ims_net_fqdn
-      virtual_machine_interface_refs:
-        - get_resource: SF8_IMS_12_RVMI
-      instance_ip_address: { get_param: [sf_sgi_ims_ips, 5] }
-
-  SF8_IMS_12_v6_RII:
-    type: OS::ContrailV2::InstanceIp
-    depends_on: [ SF8_IMS_12_RVMI ]
-    properties:
-      virtual_network_refs:
-        - get_param: ims_net_fqdn
-      virtual_machine_interface_refs:
-        - get_resource: SF8_IMS_12_RVMI
-      instance_ip_address: { get_param: [sf_sgi_ims_v6_ips, 5] }
-      instance_ip_family: { get_param: instance_ip_family_v6 }
-
-  SF8_IMS_12_RSHC:
-    type: OS::ContrailV2::ServiceHealthCheck
-    properties:
-      name: SF8_IMS_12_RSHC
-      service_health_check_properties:
-        service_health_check_properties_enabled: { get_param: sf_shc_enabled }
-        service_health_check_properties_monitor_type: { get_param: sf_shc_monitor_type }
-        service_health_check_properties_delay: { get_param: sf_shc_delay }
-        service_health_check_properties_timeout: { get_param: sf_shc_timeout }
-        service_health_check_properties_max_retries: { get_param: sf_shc_max_retries }
-        service_health_check_properties_url_path: { get_param: sf_shc_url_path }
-
-  # Create port for Transport Interface in SUPPORT Context
-  SF8_COR_13_RVMI:
-    type: OS::ContrailV2::VirtualMachineInterface
-    properties:
-      virtual_network_refs:
-        - get_param: cor_net_fqdn
-#      service_health_check_refs: 
-#        - { get_resource: SF8_COR_13_RSHC }
-      virtual_machine_interface_allowed_address_pairs:
-        virtual_machine_interface_allowed_address_pairs_allowed_address_pair:
-          - virtual_machine_interface_allowed_address_pairs_allowed_address_pair_address_mode: { get_param: vmi_allowed_address_pair_address_mode }
-            virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip:
-              virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip_ip_prefix: { get_param: [bgpaas_ip_address,3] }
-              virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip_ip_prefix_len: { get_param: vmi_allowed_address_pair_prefix_lenth }
-          - virtual_machine_interface_allowed_address_pairs_allowed_address_pair_address_mode: { get_param: vmi_allowed_address_pair_address_mode }
-            virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip:
-              virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip_ip_prefix: { get_param: sf_cor_rii_v6 }
-              virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip_ip_prefix_len: { get_param: vmi_allowed_address_pair_prefix_lenth_v6 }
-
-  SF8_COR_13_RII:
-    type: OS::ContrailV2::InstanceIp
-    depends_on: [ SF8_COR_13_RVMI ]
-    properties:
-      virtual_network_refs:
-        - get_param: cor_net_fqdn
-      virtual_machine_interface_refs:
-        - get_resource: SF8_COR_13_RVMI
-      instance_ip_address: { get_param: [sf_cor_ips, 5] }
-
-  SF8_COR_13_v6_RII:
-    type: OS::ContrailV2::InstanceIp
-    depends_on: [ SF8_COR_13_RVMI ]
-    properties:
-      virtual_network_refs:
-        - get_param: cor_net_fqdn
-      virtual_machine_interface_refs:
-        - get_resource: SF8_COR_13_RVMI
-      instance_ip_address: { get_param: [sf_cor_v6_ips, 5] }
-      instance_ip_family: { get_param: instance_ip_family_v6 }
-
-  SF8_COR_13_RSHC:
-    type: OS::ContrailV2::ServiceHealthCheck
-    properties:
-      name: SF8_COR_13_RSHC
-      service_health_check_properties:
-        service_health_check_properties_enabled: { get_param: sf_shc_enabled }
-        service_health_check_properties_monitor_type: { get_param: sf_shc_monitor_type }
-        service_health_check_properties_delay: { get_param: sf_shc_delay }
-        service_health_check_properties_timeout: { get_param: sf_shc_timeout }
-        service_health_check_properties_max_retries: { get_param: sf_shc_max_retries }
-        service_health_check_properties_url_path: { get_param: sf_shc_url_path }
-
-
-  SF8_OAM_CALEA_14_PORT:
-    type: OS::Neutron::Port
-    properties:
-      network: {get_param: oam_calea_net_name}
-      fixed_ips: [{"ip_address": {get_param: [sf_oam_calea_ips, 5]}}]
-  # Create port for Transport interface in SRP Context
-  SF8_INT_ICSR_15_PORT:
-    type: OS::Neutron::Port
-    properties:
-      network: {get_param: int_icsr_net_name}
-      fixed_ips: [{"ip_address": {get_param: [sf_int_icsr_ips, 5]}}]
-
-  # Create VPC SF 08 Instance
-  sf_server_7:
-    type: OS::Nova::Server
-    depends_on: [ SF8_GN_10_RII, SF8_GN_10_v6_RII, SF8_SGI_11_RII, SF8_SGI_11_v6_RII, SF8_IMS_12_RII, SF8_IMS_12_v6_RII, SF8_COR_13_RII, SF8_COR_13_v6_RII ]
-    properties:
-      metadata:
-          vnf_id: { get_param: vnf_id }
-          vnf_name: { get_param: vnf_name }
-          vf_module_id: { get_param: vf_module_id }
-
-#      name:
-#        str_replace:
-#          template: Z${CZ_ID}CGWY${VF_ID}${VM_TYPE}${VM_NUM}
-#          params:
-#            ${CZ_ID}: {get_param: czid}
-#            ${VF_ID}: {get_param: vf_inst_number}
-#            ${VM_TYPE}: DSF
-#            ${VM_NUM}: "008"
-      name: {get_param: [cgwy_names, 7]}
-      config_drive: True
-      image: {get_param: sf_image_name}
-      flavor: {get_param: sf_flavor_name}
-      networks:
-        - port: {get_resource: sf_int_di2_7_port}
-        - port: {get_resource: SF8_GN_10_RVMI}
-        - port: {get_resource: SF8_SGI_11_RVMI}
-        - port: {get_resource: SF8_IMS_12_RVMI}
-        - port: {get_resource: SF8_COR_13_RVMI}
-        - port: {get_resource: SF8_OAM_CALEA_14_PORT}
-        - port: {get_resource: SF8_INT_ICSR_15_PORT}
-      personality:
-        "staros_param.cfg":
-          str_replace:
-            template: |
-              CARDSLOT=$CARD_NUMBER
-              CARDTYPE=$CARD_TYPE
-              CPUID=$CPUID
-            params:
-              $CARD_NUMBER: 8
-              $CARD_TYPE: SFC
-              $CPUID: 0
-      availability_zone: {get_param: availability_zone_0}
-      scheduler_hints:
-        group: {get_resource: sf_vpc-servergroup}
-
-  ### SF09 ######
-  # Create port for DI-Internal Network
-  sf_int_di2_8_port:
-    type: OS::Neutron::Port
-    properties:
-      network: {get_param: cgwy_int_di2_net_name}
-# Create port for Transport Interface in SAEGW Context
-  SF9_GN_10_RVMI:
-    type: OS::ContrailV2::VirtualMachineInterface
-    properties:
-      virtual_network_refs:
-        - get_param: gn_net_fqdn
-#      service_health_check_refs: 
-#        - { get_resource: SF9_GN_10_RSHC }
-      virtual_machine_interface_allowed_address_pairs:
-        virtual_machine_interface_allowed_address_pairs_allowed_address_pair:
-          - virtual_machine_interface_allowed_address_pairs_allowed_address_pair_address_mode: { get_param: vmi_allowed_address_pair_address_mode }
-            virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip:
-              virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip_ip_prefix: { get_param: [bgpaas_ip_address,0] }
-              virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip_ip_prefix_len: { get_param: vmi_allowed_address_pair_prefix_lenth }
-          - virtual_machine_interface_allowed_address_pairs_allowed_address_pair_address_mode: { get_param: vmi_allowed_address_pair_address_mode }
-            virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip:
-              virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip_ip_prefix: { get_param: sf_gn_rii_v6 }
-              virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip_ip_prefix_len: { get_param: vmi_allowed_address_pair_prefix_lenth_v6 }
-
-  SF9_GN_10_RII:
-    type: OS::ContrailV2::InstanceIp
-    depends_on: [ SF9_GN_10_RVMI ]
-    properties:
-      virtual_network_refs:
-        - get_param: gn_net_fqdn
-      virtual_machine_interface_refs:
-        - get_resource: SF9_GN_10_RVMI
-      instance_ip_address: { get_param: [sf_gn_ips, 6] }
-
-  SF9_GN_10_v6_RII:
-    type: OS::ContrailV2::InstanceIp
-    depends_on: [ SF9_GN_10_RVMI ]
-    properties:
-      virtual_network_refs:
-        - get_param: gn_net_fqdn
-      virtual_machine_interface_refs:
-        - get_resource: SF9_GN_10_RVMI
-      instance_ip_address: { get_param: [sf_gn_v6_ips, 6] }
-      instance_ip_family: { get_param: instance_ip_family_v6 }
-
-  SF9_GN_10_RSHC:
-    type: OS::ContrailV2::ServiceHealthCheck
-    properties:
-      name: SF9_GN_10_RSHC
-      service_health_check_properties:
-        service_health_check_properties_enabled: { get_param: sf_shc_enabled }
-        service_health_check_properties_monitor_type: { get_param: sf_shc_monitor_type }
-        service_health_check_properties_delay: { get_param: sf_shc_delay }
-        service_health_check_properties_timeout: { get_param: sf_shc_timeout }
-        service_health_check_properties_max_retries: { get_param: sf_shc_max_retries }
-        service_health_check_properties_url_path: { get_param: sf_shc_url_path }
-
-  # Create port for Transport interface(SGi-data) in SGi Context
-  SF9_SGI_11_RVMI:
-    type: OS::ContrailV2::VirtualMachineInterface
-    properties:
-      virtual_network_refs:
-        - get_param: sgi_net_fqdn
-#      service_health_check_refs: 
-#        - { get_resource: SF9_SGI_11_RSHC }
-      virtual_machine_interface_allowed_address_pairs:
-        virtual_machine_interface_allowed_address_pairs_allowed_address_pair:
-          - virtual_machine_interface_allowed_address_pairs_allowed_address_pair_address_mode: { get_param: vmi_allowed_address_pair_address_mode }
-            virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip:
-              virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip_ip_prefix: { get_param: [bgpaas_ip_address,1] }
-              virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip_ip_prefix_len: { get_param: vmi_allowed_address_pair_prefix_lenth }
-          - virtual_machine_interface_allowed_address_pairs_allowed_address_pair_address_mode: { get_param: vmi_allowed_address_pair_address_mode }
-            virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip:
-              virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip_ip_prefix: { get_param: sf_sgi_rii_v6 }
-              virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip_ip_prefix_len: { get_param: vmi_allowed_address_pair_prefix_lenth_v6 }
-
-  SF9_SGI_11_RII:
-    type: OS::ContrailV2::InstanceIp
-    depends_on: [ SF9_SGI_11_RVMI ]
-    properties:
-      virtual_network_refs:
-        - get_param: sgi_net_fqdn
-      virtual_machine_interface_refs:
-        - get_resource: SF9_SGI_11_RVMI
-      instance_ip_address: { get_param: [sf_sgi_prot_ips, 6] }
-
-  SF9_SGI_11_v6_RII:
-    type: OS::ContrailV2::InstanceIp
-    depends_on: [ SF9_SGI_11_RVMI ]
-    properties:
-      virtual_network_refs:
-        - get_param: sgi_net_fqdn
-      virtual_machine_interface_refs:
-        - get_resource: SF9_SGI_11_RVMI
-      instance_ip_address: { get_param: [sf_sgi_prot_v6_ips, 6] }
-      instance_ip_family: { get_param: instance_ip_family_v6 }
-
-  SF9_SGI_11_RSHC:
-    type: OS::ContrailV2::ServiceHealthCheck
-    properties:
-      name: SF9_SGI_11_RSHC
-      service_health_check_properties:
-        service_health_check_properties_enabled: { get_param: sf_shc_enabled }
-        service_health_check_properties_monitor_type: { get_param: sf_shc_monitor_type }
-        service_health_check_properties_delay: { get_param: sf_shc_delay }
-        service_health_check_properties_timeout: { get_param: sf_shc_timeout }
-        service_health_check_properties_max_retries: { get_param: sf_shc_max_retries }
-        service_health_check_properties_url_path: { get_param: sf_shc_url_path }
-
-  # Create port for Transport interface(SGi-ims) in SGi Context
-  SF9_IMS_12_RVMI:
-    type: OS::ContrailV2::VirtualMachineInterface
-    properties:
-      virtual_network_refs:
-        - get_param: ims_net_fqdn
-#      service_health_check_refs: 
-#        - { get_resource: SF9_IMS_12_RSHC }
-      virtual_machine_interface_allowed_address_pairs:
-        virtual_machine_interface_allowed_address_pairs_allowed_address_pair:
-          - virtual_machine_interface_allowed_address_pairs_allowed_address_pair_address_mode: { get_param: vmi_allowed_address_pair_address_mode }
-            virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip:
-              virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip_ip_prefix: { get_param: [bgpaas_ip_address,2] }
-              virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip_ip_prefix_len: { get_param: vmi_allowed_address_pair_prefix_lenth }
-          - virtual_machine_interface_allowed_address_pairs_allowed_address_pair_address_mode: { get_param: vmi_allowed_address_pair_address_mode }
-            virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip:
-              virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip_ip_prefix: { get_param: sf_ims_rii_v6 }
-              virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip_ip_prefix_len: { get_param: vmi_allowed_address_pair_prefix_lenth_v6 }
-
-  SF9_IMS_12_RII:
-    type: OS::ContrailV2::InstanceIp
-    depends_on: [ SF9_IMS_12_RVMI ]
-    properties:
-      virtual_network_refs:
-        - get_param: ims_net_fqdn
-      virtual_machine_interface_refs:
-        - get_resource: SF9_IMS_12_RVMI
-      instance_ip_address: { get_param: [sf_sgi_ims_ips, 6] }
-
-  SF9_IMS_12_v6_RII:
-    type: OS::ContrailV2::InstanceIp
-    depends_on: [ SF9_IMS_12_RVMI ]
-    properties:
-      virtual_network_refs:
-        - get_param: ims_net_fqdn
-      virtual_machine_interface_refs:
-        - get_resource: SF9_IMS_12_RVMI
-      instance_ip_address: { get_param: [sf_sgi_ims_v6_ips, 6] }
-      instance_ip_family: { get_param: instance_ip_family_v6 }
-
-  SF9_IMS_12_RSHC:
-    type: OS::ContrailV2::ServiceHealthCheck
-    properties:
-      name: SF9_IMS_12_RSHC
-      service_health_check_properties:
-        service_health_check_properties_enabled: { get_param: sf_shc_enabled }
-        service_health_check_properties_monitor_type: { get_param: sf_shc_monitor_type }
-        service_health_check_properties_delay: { get_param: sf_shc_delay }
-        service_health_check_properties_timeout: { get_param: sf_shc_timeout }
-        service_health_check_properties_max_retries: { get_param: sf_shc_max_retries }
-        service_health_check_properties_url_path: { get_param: sf_shc_url_path }
-
-  # Create port for Transport Interface in SUPPORT Context
-  SF9_COR_13_RVMI:
-    type: OS::ContrailV2::VirtualMachineInterface
-    properties:
-      virtual_network_refs:
-        - get_param: cor_net_fqdn
-#      service_health_check_refs: 
-#        - { get_resource: SF9_COR_13_RSHC }
-      virtual_machine_interface_allowed_address_pairs:
-        virtual_machine_interface_allowed_address_pairs_allowed_address_pair:
-          - virtual_machine_interface_allowed_address_pairs_allowed_address_pair_address_mode: { get_param: vmi_allowed_address_pair_address_mode }
-            virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip:
-              virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip_ip_prefix: { get_param: [bgpaas_ip_address,3] }
-              virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip_ip_prefix_len: { get_param: vmi_allowed_address_pair_prefix_lenth }
-          - virtual_machine_interface_allowed_address_pairs_allowed_address_pair_address_mode: { get_param: vmi_allowed_address_pair_address_mode }
-            virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip:
-              virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip_ip_prefix: { get_param: sf_cor_rii_v6 }
-              virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip_ip_prefix_len: { get_param: vmi_allowed_address_pair_prefix_lenth_v6 }
-
-  SF9_COR_13_RII:
-    type: OS::ContrailV2::InstanceIp
-    depends_on: [ SF9_COR_13_RVMI ]
-    properties:
-      virtual_network_refs:
-        - get_param: cor_net_fqdn
-      virtual_machine_interface_refs:
-        - get_resource: SF9_COR_13_RVMI
-      instance_ip_address: { get_param: [sf_cor_ips, 6] }
-
-  SF9_COR_13_v6_RII:
-    type: OS::ContrailV2::InstanceIp
-    depends_on: [ SF9_COR_13_RVMI ]
-    properties:
-      virtual_network_refs:
-        - get_param: cor_net_fqdn
-      virtual_machine_interface_refs:
-        - get_resource: SF9_COR_13_RVMI
-      instance_ip_address: { get_param: [sf_cor_v6_ips, 6] }
-      instance_ip_family: { get_param: instance_ip_family_v6 }
-
-  SF9_COR_13_RSHC:
-    type: OS::ContrailV2::ServiceHealthCheck
-    properties:
-      name: SF9_COR_13_RSHC
-      service_health_check_properties:
-        service_health_check_properties_enabled: { get_param: sf_shc_enabled }
-        service_health_check_properties_monitor_type: { get_param: sf_shc_monitor_type }
-        service_health_check_properties_delay: { get_param: sf_shc_delay }
-        service_health_check_properties_timeout: { get_param: sf_shc_timeout }
-        service_health_check_properties_max_retries: { get_param: sf_shc_max_retries }
-        service_health_check_properties_url_path: { get_param: sf_shc_url_path }
-
-  # Create port for Transport interface in LI Context
-  SF9_OAM_CALEA_14_PORT:
-    type: OS::Neutron::Port
-    properties:
-      network: {get_param: oam_calea_net_name}
-      fixed_ips: [{"ip_address": {get_param: [sf_oam_calea_ips, 6]}}]
-  # Create port for Transport interface in SRP Context
-  SF9_INT_ICSR_15_PORT:
-    type: OS::Neutron::Port
-    properties:
-      network: {get_param: int_icsr_net_name}
-      fixed_ips: [{"ip_address": {get_param: [sf_int_icsr_ips, 6]}}]
-
-  # Create VPC SF 09 Instance
-  sf_server_8:
-    type: OS::Nova::Server
-    depends_on: [ SF9_GN_10_RII, SF9_GN_10_v6_RII, SF9_SGI_11_RII, SF9_SGI_11_v6_RII, SF9_IMS_12_RII, SF9_IMS_12_v6_RII, SF9_COR_13_RII, SF9_COR_13_v6_RII ]
-    properties:
-      metadata:
-          vnf_id: { get_param: vnf_id }
-          vnf_name: { get_param: vnf_name }
-          vf_module_id: { get_param: vf_module_id }
-
-#      name:
-#        str_replace:
-#          template: Z${CZ_ID}CGWY${VF_ID}${VM_TYPE}${VM_NUM}
-#          params:
-#            ${CZ_ID}: {get_param: czid}
-#            ${VF_ID}: {get_param: vf_inst_number}
-#            ${VM_TYPE}: DSF
-#            ${VM_NUM}: "009"
-      name: {get_param: [cgwy_names, 8]}
-      config_drive: True
-      image: {get_param: sf_image_name}
-      flavor: {get_param: sf_flavor_name}
-      networks:
-        - port: {get_resource: sf_int_di2_8_port}
-        - port: {get_resource: SF9_GN_10_RVMI}
-        - port: {get_resource: SF9_SGI_11_RVMI}
-        - port: {get_resource: SF9_IMS_12_RVMI}
-        - port: {get_resource: SF9_COR_13_RVMI}
-        - port: {get_resource: SF9_OAM_CALEA_14_PORT}
-        - port: {get_resource: SF9_INT_ICSR_15_PORT}
-      personality:
-        "staros_param.cfg":
-          str_replace:
-            template: |
-              CARDSLOT=$CARD_NUMBER
-              CARDTYPE=$CARD_TYPE
-              CPUID=$CPUID
-            params:
-              $CARD_NUMBER: 9
-              $CARD_TYPE: SFC
-              $CPUID: 0
-      availability_zone: {get_param: availability_zone_0}
-      scheduler_hints:
-        group: {get_resource: sf_vpc-servergroup}
-
-  ### SF10 ######
-  # Create port for DI-Internal Network
-  sf_int_di2_9_port:
-    type: OS::Neutron::Port
-    properties:
-      network: {get_param: cgwy_int_di2_net_name}
-# Create port for Transport Interface in SAEGW Context
-  SF10_GN_10_RVMI:
-    type: OS::ContrailV2::VirtualMachineInterface
-    properties:
-      virtual_network_refs:
-        - get_param: gn_net_fqdn
-#      service_health_check_refs: 
-#        - { get_resource: SF10_GN_10_RSHC }
-      virtual_machine_interface_allowed_address_pairs:
-        virtual_machine_interface_allowed_address_pairs_allowed_address_pair:
-          - virtual_machine_interface_allowed_address_pairs_allowed_address_pair_address_mode: { get_param: vmi_allowed_address_pair_address_mode }
-            virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip:
-              virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip_ip_prefix: { get_param: [bgpaas_ip_address,0] }
-              virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip_ip_prefix_len: { get_param: vmi_allowed_address_pair_prefix_lenth }
-          - virtual_machine_interface_allowed_address_pairs_allowed_address_pair_address_mode: { get_param: vmi_allowed_address_pair_address_mode }
-            virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip:
-              virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip_ip_prefix: { get_param: sf_gn_rii_v6 }
-              virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip_ip_prefix_len: { get_param: vmi_allowed_address_pair_prefix_lenth_v6 }
-
-  SF10_GN_10_RII:
-    type: OS::ContrailV2::InstanceIp
-    depends_on: [ SF10_GN_10_RVMI ]
-    properties:
-      virtual_network_refs:
-        - get_param: gn_net_fqdn
-      virtual_machine_interface_refs:
-        - get_resource: SF10_GN_10_RVMI
-      instance_ip_address: { get_param: [sf_gn_ips, 7] }
-
-  SF10_GN_10_v6_RII:
-    type: OS::ContrailV2::InstanceIp
-    depends_on: [ SF10_GN_10_RVMI ]
-    properties:
-      virtual_network_refs:
-        - get_param: gn_net_fqdn
-      virtual_machine_interface_refs:
-        - get_resource: SF10_GN_10_RVMI
-      instance_ip_address: { get_param: [sf_gn_v6_ips, 7] }
-      instance_ip_family: { get_param: instance_ip_family_v6 }
-
-  SF10_GN_10_RSHC:
-    type: OS::ContrailV2::ServiceHealthCheck
-    properties:
-      name: SF10_GN_10_RSHC
-      service_health_check_properties:
-        service_health_check_properties_enabled: { get_param: sf_shc_enabled }
-        service_health_check_properties_monitor_type: { get_param: sf_shc_monitor_type }
-        service_health_check_properties_delay: { get_param: sf_shc_delay }
-        service_health_check_properties_timeout: { get_param: sf_shc_timeout }
-        service_health_check_properties_max_retries: { get_param: sf_shc_max_retries }
-        service_health_check_properties_url_path: { get_param: sf_shc_url_path }
-
-  # Create port for Transport interface(SGi-data) in SGi Context
-  SF10_SGI_11_RVMI:
-    type: OS::ContrailV2::VirtualMachineInterface
-    properties:
-      virtual_network_refs:
-        - get_param: sgi_net_fqdn
-#      service_health_check_refs: 
-#        - { get_resource: SF10_SGI_11_RSHC }
-      virtual_machine_interface_allowed_address_pairs:
-        virtual_machine_interface_allowed_address_pairs_allowed_address_pair:
-          - virtual_machine_interface_allowed_address_pairs_allowed_address_pair_address_mode: { get_param: vmi_allowed_address_pair_address_mode }
-            virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip:
-              virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip_ip_prefix: { get_param: [bgpaas_ip_address,1] }
-              virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip_ip_prefix_len: { get_param: vmi_allowed_address_pair_prefix_lenth }
-          - virtual_machine_interface_allowed_address_pairs_allowed_address_pair_address_mode: { get_param: vmi_allowed_address_pair_address_mode }
-            virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip:
-              virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip_ip_prefix: { get_param: sf_sgi_rii_v6 }
-              virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip_ip_prefix_len: { get_param: vmi_allowed_address_pair_prefix_lenth_v6 }
-
-  SF10_SGI_11_RII:
-    type: OS::ContrailV2::InstanceIp
-    depends_on: [ SF10_SGI_11_RVMI ]
-    properties:
-      virtual_network_refs:
-        - get_param: sgi_net_fqdn
-      virtual_machine_interface_refs:
-        - get_resource: SF10_SGI_11_RVMI
-      instance_ip_address: { get_param: [sf_sgi_prot_ips, 7] }
-
-  SF10_SGI_11_v6_RII:
-    type: OS::ContrailV2::InstanceIp
-    depends_on: [ SF10_SGI_11_RVMI ]
-    properties:
-      virtual_network_refs:
-        - get_param: sgi_net_fqdn
-      virtual_machine_interface_refs:
-        - get_resource: SF10_SGI_11_RVMI
-      instance_ip_address: { get_param: [sf_sgi_prot_v6_ips, 7] }
-      instance_ip_family: { get_param: instance_ip_family_v6 }
-
-  SF10_SGI_11_RSHC:
-    type: OS::ContrailV2::ServiceHealthCheck
-    properties:
-      name: SF10_SGI_11_RSHC
-      service_health_check_properties:
-        service_health_check_properties_enabled: { get_param: sf_shc_enabled }
-        service_health_check_properties_monitor_type: { get_param: sf_shc_monitor_type }
-        service_health_check_properties_delay: { get_param: sf_shc_delay }
-        service_health_check_properties_timeout: { get_param: sf_shc_timeout }
-        service_health_check_properties_max_retries: { get_param: sf_shc_max_retries }
-        service_health_check_properties_url_path: { get_param: sf_shc_url_path }
-
-  # Create port for Transport interface(SGi-ims) in SGi Context
-  SF10_IMS_12_RVMI:
-    type: OS::ContrailV2::VirtualMachineInterface
-    properties:
-      virtual_network_refs:
-        - get_param: ims_net_fqdn
-#      service_health_check_refs: 
-#        - { get_resource: SF10_IMS_12_RSHC }
-      virtual_machine_interface_allowed_address_pairs:
-        virtual_machine_interface_allowed_address_pairs_allowed_address_pair:
-          - virtual_machine_interface_allowed_address_pairs_allowed_address_pair_address_mode: { get_param: vmi_allowed_address_pair_address_mode }
-            virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip:
-              virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip_ip_prefix: { get_param: [bgpaas_ip_address,2] }
-              virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip_ip_prefix_len: { get_param: vmi_allowed_address_pair_prefix_lenth }
-          - virtual_machine_interface_allowed_address_pairs_allowed_address_pair_address_mode: { get_param: vmi_allowed_address_pair_address_mode }
-            virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip:
-              virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip_ip_prefix: { get_param: sf_ims_rii_v6 }
-              virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip_ip_prefix_len: { get_param: vmi_allowed_address_pair_prefix_lenth_v6 }
-
-  SF10_IMS_12_RII:
-    type: OS::ContrailV2::InstanceIp
-    depends_on: [ SF10_IMS_12_RVMI ]
-    properties:
-      virtual_network_refs:
-        - get_param: ims_net_fqdn
-      virtual_machine_interface_refs:
-        - get_resource: SF10_IMS_12_RVMI
-      instance_ip_address: { get_param: [sf_sgi_ims_ips, 7] }
-
-  SF10_IMS_12_v6_RII:
-    type: OS::ContrailV2::InstanceIp
-    depends_on: [ SF10_IMS_12_RVMI ]
-    properties:
-      virtual_network_refs:
-        - get_param: ims_net_fqdn
-      virtual_machine_interface_refs:
-        - get_resource: SF10_IMS_12_RVMI
-      instance_ip_address: { get_param: [sf_sgi_ims_v6_ips, 7] }
-      instance_ip_family: { get_param: instance_ip_family_v6 }
-
-  SF10_IMS_12_RSHC:
-    type: OS::ContrailV2::ServiceHealthCheck
-    properties:
-      name: SF10_IMS_12_RSHC
-      service_health_check_properties:
-        service_health_check_properties_enabled: { get_param: sf_shc_enabled }
-        service_health_check_properties_monitor_type: { get_param: sf_shc_monitor_type }
-        service_health_check_properties_delay: { get_param: sf_shc_delay }
-        service_health_check_properties_timeout: { get_param: sf_shc_timeout }
-        service_health_check_properties_max_retries: { get_param: sf_shc_max_retries }
-        service_health_check_properties_url_path: { get_param: sf_shc_url_path }
-
-  # Create port for Transport Interface in SUPPORT Context
-  SF10_COR_13_RVMI:
-    type: OS::ContrailV2::VirtualMachineInterface
-    properties:
-      virtual_network_refs:
-        - get_param: cor_net_fqdn
-#      service_health_check_refs: 
-#        - { get_resource: SF10_COR_13_RSHC }
-      virtual_machine_interface_allowed_address_pairs:
-        virtual_machine_interface_allowed_address_pairs_allowed_address_pair:
-          - virtual_machine_interface_allowed_address_pairs_allowed_address_pair_address_mode: { get_param: vmi_allowed_address_pair_address_mode }
-            virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip:
-              virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip_ip_prefix: { get_param: [bgpaas_ip_address,3] }
-              virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip_ip_prefix_len: { get_param: vmi_allowed_address_pair_prefix_lenth }
-          - virtual_machine_interface_allowed_address_pairs_allowed_address_pair_address_mode: { get_param: vmi_allowed_address_pair_address_mode }
-            virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip:
-              virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip_ip_prefix: { get_param: sf_cor_rii_v6 }
-              virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip_ip_prefix_len: { get_param: vmi_allowed_address_pair_prefix_lenth_v6 }
-
-  SF10_COR_13_RII:
-    type: OS::ContrailV2::InstanceIp
-    depends_on: [ SF10_COR_13_RVMI ]
-    properties:
-      virtual_network_refs:
-        - get_param: cor_net_fqdn
-      virtual_machine_interface_refs:
-        - get_resource: SF10_COR_13_RVMI
-      instance_ip_address: { get_param: [sf_cor_ips, 7] }
-
-  SF10_COR_13_v6_RII:
-    type: OS::ContrailV2::InstanceIp
-    depends_on: [ SF10_COR_13_RVMI ]
-    properties:
-      virtual_network_refs:
-        - get_param: cor_net_fqdn
-      virtual_machine_interface_refs:
-        - get_resource: SF10_COR_13_RVMI
-      instance_ip_address: { get_param: [sf_cor_v6_ips, 7] }
-      instance_ip_family: { get_param: instance_ip_family_v6 }
-
-  SF10_COR_13_RSHC:
-    type: OS::ContrailV2::ServiceHealthCheck
-    properties:
-      name: SF10_COR_13_RSHC
-      service_health_check_properties:
-        service_health_check_properties_enabled: { get_param: sf_shc_enabled }
-        service_health_check_properties_monitor_type: { get_param: sf_shc_monitor_type }
-        service_health_check_properties_delay: { get_param: sf_shc_delay }
-        service_health_check_properties_timeout: { get_param: sf_shc_timeout }
-        service_health_check_properties_max_retries: { get_param: sf_shc_max_retries }
-        service_health_check_properties_url_path: { get_param: sf_shc_url_path }
-
-  # Create port for Transport interface in LI Context
-  SF10_OAM_CALEA_14_PORT:
-    type: OS::Neutron::Port
-    properties:
-      network: {get_param: oam_calea_net_name}
-      fixed_ips: [{"ip_address": {get_param: [sf_oam_calea_ips, 7]}}]
-  # Create port for Transport interface in SRP Context
-  SF10_INT_ICSR_15_PORT:
-    type: OS::Neutron::Port
-    properties:
-      network: {get_param: int_icsr_net_name}
-      fixed_ips: [{"ip_address": {get_param: [sf_int_icsr_ips, 7]}}]
-
-  # Create VPC SF 10 Instance
-  sf_server_9:
-    type: OS::Nova::Server
-    depends_on: [ SF10_GN_10_RII, SF10_GN_10_v6_RII, SF10_SGI_11_RII, SF10_SGI_11_v6_RII, SF10_IMS_12_RII, SF10_IMS_12_v6_RII, SF10_COR_13_RII, SF10_COR_13_v6_RII ]
-    properties:
-      metadata:
-          vnf_id: { get_param: vnf_id }
-          vnf_name: { get_param: vnf_name }
-          vf_module_id: { get_param: vf_module_id }
-
-#      name:
-#        str_replace:
-#          template: Z${CZ_ID}CGWY${VF_ID}${VM_TYPE}${VM_NUM}
-#          params:
-#            ${CZ_ID}: {get_param: czid}
-#            ${VF_ID}: {get_param: vf_inst_number}
-#            ${VM_TYPE}: DSF
-#            ${VM_NUM}: "010"
-      name: {get_param: [cgwy_names, 9]}
-      config_drive: True
-      image: {get_param: sf_image_name}
-      flavor: {get_param: sf_flavor_name}
-      networks:
-        - port: {get_resource: sf_int_di2_9_port}
-        - port: {get_resource: SF10_GN_10_RVMI}
-        - port: {get_resource: SF10_SGI_11_RVMI}
-        - port: {get_resource: SF10_IMS_12_RVMI}
-        - port: {get_resource: SF10_COR_13_RVMI}
-        - port: {get_resource: SF10_OAM_CALEA_14_PORT}
-        - port: {get_resource: SF10_INT_ICSR_15_PORT}
-      personality:
-        "staros_param.cfg":
-          str_replace:
-            template: |
-              CARDSLOT=$CARD_NUMBER
-              CARDTYPE=$CARD_TYPE
-              CPUID=$CPUID
-            params:
-              $CARD_NUMBER: 10
-              $CARD_TYPE: SFC
-              $CPUID: 0
-      availability_zone: {get_param: availability_zone_0}
-      scheduler_hints:
-        group: {get_resource: sf_vpc-servergroup}
-
-  ### SF11 ######
-  # Create port for DI-Internal Network
-  sf_int_di2_10_port:
-    type: OS::Neutron::Port
-    properties:
-      network: {get_param: cgwy_int_di2_net_name}
-# Create port for Transport Interface in SAEGW Context
-  SF11_GN_10_RVMI:
-    type: OS::ContrailV2::VirtualMachineInterface
-    properties:
-      virtual_network_refs:
-        - get_param: gn_net_fqdn
-#      service_health_check_refs: 
-#        - { get_resource: SF11_GN_10_RSHC }
-      virtual_machine_interface_allowed_address_pairs:
-        virtual_machine_interface_allowed_address_pairs_allowed_address_pair:
-          - virtual_machine_interface_allowed_address_pairs_allowed_address_pair_address_mode: { get_param: vmi_allowed_address_pair_address_mode }
-            virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip:
-              virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip_ip_prefix: { get_param: [bgpaas_ip_address,0] }
-              virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip_ip_prefix_len: { get_param: vmi_allowed_address_pair_prefix_lenth }
-          - virtual_machine_interface_allowed_address_pairs_allowed_address_pair_address_mode: { get_param: vmi_allowed_address_pair_address_mode }
-            virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip:
-              virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip_ip_prefix: { get_param: sf_gn_rii_v6 }
-              virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip_ip_prefix_len: { get_param: vmi_allowed_address_pair_prefix_lenth_v6 }
-
-  SF11_GN_10_RII:
-    type: OS::ContrailV2::InstanceIp
-    depends_on: [ SF11_GN_10_RVMI ]
-    properties:
-      virtual_network_refs:
-        - get_param: gn_net_fqdn
-      virtual_machine_interface_refs:
-        - get_resource: SF11_GN_10_RVMI
-      instance_ip_address: { get_param: [sf_gn_ips, 8] }
-
-  SF11_GN_10_v6_RII:
-    type: OS::ContrailV2::InstanceIp
-    depends_on: [ SF11_GN_10_RVMI ]
-    properties:
-      virtual_network_refs:
-        - get_param: gn_net_fqdn
-      virtual_machine_interface_refs:
-        - get_resource: SF11_GN_10_RVMI
-      instance_ip_address: { get_param: [sf_gn_v6_ips, 8] }
-      instance_ip_family: { get_param: instance_ip_family_v6 }
-
-  SF11_GN_10_RSHC:
-    type: OS::ContrailV2::ServiceHealthCheck
-    properties:
-      name: SF11_GN_10_RSHC
-      service_health_check_properties:
-        service_health_check_properties_enabled: { get_param: sf_shc_enabled }
-        service_health_check_properties_monitor_type: { get_param: sf_shc_monitor_type }
-        service_health_check_properties_delay: { get_param: sf_shc_delay }
-        service_health_check_properties_timeout: { get_param: sf_shc_timeout }
-        service_health_check_properties_max_retries: { get_param: sf_shc_max_retries }
-        service_health_check_properties_url_path: { get_param: sf_shc_url_path }
-
-  # Create port for Transport interface(SGi-data) in SGi Context
-  SF11_SGI_11_RVMI:
-    type: OS::ContrailV2::VirtualMachineInterface
-    properties:
-      virtual_network_refs:
-        - get_param: sgi_net_fqdn
-#      service_health_check_refs: 
-#        - { get_resource: SF11_SGI_11_RSHC }
-      virtual_machine_interface_allowed_address_pairs:
-        virtual_machine_interface_allowed_address_pairs_allowed_address_pair:
-          - virtual_machine_interface_allowed_address_pairs_allowed_address_pair_address_mode: { get_param: vmi_allowed_address_pair_address_mode }
-            virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip:
-              virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip_ip_prefix: { get_param: [bgpaas_ip_address,1] }
-              virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip_ip_prefix_len: { get_param: vmi_allowed_address_pair_prefix_lenth }
-          - virtual_machine_interface_allowed_address_pairs_allowed_address_pair_address_mode: { get_param: vmi_allowed_address_pair_address_mode }
-            virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip:
-              virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip_ip_prefix: { get_param: sf_sgi_rii_v6 }
-              virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip_ip_prefix_len: { get_param: vmi_allowed_address_pair_prefix_lenth_v6 }
-
-  SF11_SGI_11_RII:
-    type: OS::ContrailV2::InstanceIp
-    depends_on: [ SF11_SGI_11_RVMI ]
-    properties:
-      virtual_network_refs:
-        - get_param: sgi_net_fqdn
-      virtual_machine_interface_refs:
-        - get_resource: SF11_SGI_11_RVMI
-      instance_ip_address: { get_param: [sf_sgi_prot_ips, 8] }
-
-  SF11_SGI_11_v6_RII:
-    type: OS::ContrailV2::InstanceIp
-    depends_on: [ SF11_SGI_11_RVMI ]
-    properties:
-      virtual_network_refs:
-        - get_param: sgi_net_fqdn
-      virtual_machine_interface_refs:
-        - get_resource: SF11_SGI_11_RVMI
-      instance_ip_address: { get_param: [sf_sgi_prot_v6_ips, 8] }
-      instance_ip_family: { get_param: instance_ip_family_v6 }
-
-  SF11_SGI_11_RSHC:
-    type: OS::ContrailV2::ServiceHealthCheck
-    properties:
-      name: SF11_SGI_11_RSHC
-      service_health_check_properties:
-        service_health_check_properties_enabled: { get_param: sf_shc_enabled }
-        service_health_check_properties_monitor_type: { get_param: sf_shc_monitor_type }
-        service_health_check_properties_delay: { get_param: sf_shc_delay }
-        service_health_check_properties_timeout: { get_param: sf_shc_timeout }
-        service_health_check_properties_max_retries: { get_param: sf_shc_max_retries }
-        service_health_check_properties_url_path: { get_param: sf_shc_url_path }
-
-  # Create port for Transport interface(SGi-ims) in SGi Context
-  SF11_IMS_12_RVMI:
-    type: OS::ContrailV2::VirtualMachineInterface
-    properties:
-      virtual_network_refs:
-        - get_param: ims_net_fqdn
-#      service_health_check_refs: 
-#        - { get_resource: SF11_IMS_12_RSHC }
-      virtual_machine_interface_allowed_address_pairs:
-        virtual_machine_interface_allowed_address_pairs_allowed_address_pair:
-          - virtual_machine_interface_allowed_address_pairs_allowed_address_pair_address_mode: { get_param: vmi_allowed_address_pair_address_mode }
-            virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip:
-              virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip_ip_prefix: { get_param: [bgpaas_ip_address,2] }
-              virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip_ip_prefix_len: { get_param: vmi_allowed_address_pair_prefix_lenth }
-          - virtual_machine_interface_allowed_address_pairs_allowed_address_pair_address_mode: { get_param: vmi_allowed_address_pair_address_mode }
-            virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip:
-              virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip_ip_prefix: { get_param: sf_ims_rii_v6 }
-              virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip_ip_prefix_len: { get_param: vmi_allowed_address_pair_prefix_lenth_v6 }
-
-  SF11_IMS_12_RII:
-    type: OS::ContrailV2::InstanceIp
-    depends_on: [ SF11_IMS_12_RVMI ]
-    properties:
-      virtual_network_refs:
-        - get_param: ims_net_fqdn
-      virtual_machine_interface_refs:
-        - get_resource: SF11_IMS_12_RVMI
-      instance_ip_address: { get_param: [sf_sgi_ims_ips, 8] }
-
-  SF11_IMS_12_v6_RII:
-    type: OS::ContrailV2::InstanceIp
-    depends_on: [ SF11_IMS_12_RVMI ]
-    properties:
-      virtual_network_refs:
-        - get_param: ims_net_fqdn
-      virtual_machine_interface_refs:
-        - get_resource: SF11_IMS_12_RVMI
-      instance_ip_address: { get_param: [sf_sgi_ims_v6_ips, 8] }
-      instance_ip_family: { get_param: instance_ip_family_v6 }
-
-  SF11_IMS_12_RSHC:
-    type: OS::ContrailV2::ServiceHealthCheck
-    properties:
-      name: SF11_IMS_12_RSHC
-      service_health_check_properties:
-        service_health_check_properties_enabled: { get_param: sf_shc_enabled }
-        service_health_check_properties_monitor_type: { get_param: sf_shc_monitor_type }
-        service_health_check_properties_delay: { get_param: sf_shc_delay }
-        service_health_check_properties_timeout: { get_param: sf_shc_timeout }
-        service_health_check_properties_max_retries: { get_param: sf_shc_max_retries }
-        service_health_check_properties_url_path: { get_param: sf_shc_url_path }
-
-  # Create port for Transport Interface in SUPPORT Context
-  SF11_COR_13_RVMI:
-    type: OS::ContrailV2::VirtualMachineInterface
-    properties:
-      virtual_network_refs:
-        - get_param: cor_net_fqdn
-#      service_health_check_refs: 
-#        - { get_resource: SF11_COR_13_RSHC }
-      virtual_machine_interface_allowed_address_pairs:
-        virtual_machine_interface_allowed_address_pairs_allowed_address_pair:
-          - virtual_machine_interface_allowed_address_pairs_allowed_address_pair_address_mode: { get_param: vmi_allowed_address_pair_address_mode }
-            virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip:
-              virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip_ip_prefix: { get_param: [bgpaas_ip_address,3] }
-              virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip_ip_prefix_len: { get_param: vmi_allowed_address_pair_prefix_lenth }
-          - virtual_machine_interface_allowed_address_pairs_allowed_address_pair_address_mode: { get_param: vmi_allowed_address_pair_address_mode }
-            virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip:
-              virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip_ip_prefix: { get_param: sf_cor_rii_v6 }
-              virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip_ip_prefix_len: { get_param: vmi_allowed_address_pair_prefix_lenth_v6 }
-
-  SF11_COR_13_RII:
-    type: OS::ContrailV2::InstanceIp
-    depends_on: [ SF11_COR_13_RVMI ]
-    properties:
-      virtual_network_refs:
-        - get_param: cor_net_fqdn
-      virtual_machine_interface_refs:
-        - get_resource: SF11_COR_13_RVMI
-      instance_ip_address: { get_param: [sf_cor_ips, 8] }
-
-  SF11_COR_13_v6_RII:
-    type: OS::ContrailV2::InstanceIp
-    depends_on: [ SF11_COR_13_RVMI ]
-    properties:
-      virtual_network_refs:
-        - get_param: cor_net_fqdn
-      virtual_machine_interface_refs:
-        - get_resource: SF11_COR_13_RVMI
-      instance_ip_address: { get_param: [sf_cor_v6_ips, 8] }
-      instance_ip_family: { get_param: instance_ip_family_v6 }
-
-  SF11_COR_13_RSHC:
-    type: OS::ContrailV2::ServiceHealthCheck
-    properties:
-      name: SF11_COR_13_RSHC
-      service_health_check_properties:
-        service_health_check_properties_enabled: { get_param: sf_shc_enabled }
-        service_health_check_properties_monitor_type: { get_param: sf_shc_monitor_type }
-        service_health_check_properties_delay: { get_param: sf_shc_delay }
-        service_health_check_properties_timeout: { get_param: sf_shc_timeout }
-        service_health_check_properties_max_retries: { get_param: sf_shc_max_retries }
-        service_health_check_properties_url_path: { get_param: sf_shc_url_path }
-
-  # Create port for Transport interface in LI Context
-  SF11_OAM_CALEA_14_PORT:
-    type: OS::Neutron::Port
-    properties:
-      network: {get_param: oam_calea_net_name}
-      fixed_ips: [{"ip_address": {get_param: [sf_oam_calea_ips, 8]}}]
-  # Create port for Transport interface in SRP Context
-  SF11_INT_ICSR_15_PORT:
-    type: OS::Neutron::Port
-    properties:
-      network: {get_param: int_icsr_net_name}
-      fixed_ips: [{"ip_address": {get_param: [sf_int_icsr_ips, 8]}}]
-
-  # Create VPC SF 11 Instance
-  sf_server_10:
-    type: OS::Nova::Server
-    depends_on: [ SF11_GN_10_RII, SF11_GN_10_v6_RII, SF11_SGI_11_RII, SF11_SGI_11_v6_RII, SF11_IMS_12_RII, SF11_IMS_12_v6_RII, SF11_COR_13_RII, SF11_COR_13_v6_RII ]
-    properties:
-      metadata:
-          vnf_id: { get_param: vnf_id }
-          vnf_name: { get_param: vnf_name }
-          vf_module_id: { get_param: vf_module_id }
-
-#      name:
-#        str_replace:
-#          template: Z${CZ_ID}CGWY${VF_ID}${VM_TYPE}${VM_NUM}
-#          params:
-#            ${CZ_ID}: {get_param: czid}
-#            ${VF_ID}: {get_param: vf_inst_number}
-#            ${VM_TYPE}: DSF
-#            ${VM_NUM}: "011"
-      name: {get_param: [cgwy_names, 10]}
-      config_drive: True
-      image: {get_param: sf_image_name}
-      flavor: {get_param: sf_flavor_name}
-      networks:
-        - port: {get_resource: sf_int_di2_10_port}
-        - port: {get_resource: SF11_GN_10_RVMI}
-        - port: {get_resource: SF11_SGI_11_RVMI}
-        - port: {get_resource: SF11_IMS_12_RVMI}
-        - port: {get_resource: SF11_COR_13_RVMI}
-        - port: {get_resource: SF11_OAM_CALEA_14_PORT}
-        - port: {get_resource: SF11_INT_ICSR_15_PORT}
-      personality:
-        "staros_param.cfg":
-          str_replace:
-            template: |
-              CARDSLOT=$CARD_NUMBER
-              CARDTYPE=$CARD_TYPE
-              CPUID=$CPUID
-            params:
-              $CARD_NUMBER: 11
-              $CARD_TYPE: SFC
-              $CPUID: 0
-      availability_zone: {get_param: availability_zone_0}
-      scheduler_hints:
-        group: {get_resource: sf_vpc-servergroup}
-
-
-  ### SF12 ######
-  # Create port for DI-Internal Network
-  sf_int_di2_11_port:
-    type: OS::Neutron::Port
-    properties:
-      network: {get_param: cgwy_int_di2_net_name}
-# Create port for Transport Interface in SAEGW Context
-  SF12_GN_10_RVMI:
-    type: OS::ContrailV2::VirtualMachineInterface
-    properties:
-      virtual_network_refs:
-        - get_param: gn_net_fqdn
-#      service_health_check_refs: 
-#        - { get_resource: SF12_GN_10_RSHC }
-      virtual_machine_interface_allowed_address_pairs:
-        virtual_machine_interface_allowed_address_pairs_allowed_address_pair:
-          - virtual_machine_interface_allowed_address_pairs_allowed_address_pair_address_mode: { get_param: vmi_allowed_address_pair_address_mode }
-            virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip:
-              virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip_ip_prefix: { get_param: [bgpaas_ip_address,0] }
-              virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip_ip_prefix_len: { get_param: vmi_allowed_address_pair_prefix_lenth }
-          - virtual_machine_interface_allowed_address_pairs_allowed_address_pair_address_mode: { get_param: vmi_allowed_address_pair_address_mode }
-            virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip:
-              virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip_ip_prefix: { get_param: sf_gn_rii_v6 }
-              virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip_ip_prefix_len: { get_param: vmi_allowed_address_pair_prefix_lenth_v6 }
-
-  SF12_GN_10_RII:
-    type: OS::ContrailV2::InstanceIp
-    depends_on: [ SF12_GN_10_RVMI ]
-    properties:
-      virtual_network_refs:
-        - get_param: gn_net_fqdn
-      virtual_machine_interface_refs:
-        - get_resource: SF12_GN_10_RVMI
-      instance_ip_address: { get_param: [sf_gn_ips, 9] }
-
-  SF12_GN_10_v6_RII:
-    type: OS::ContrailV2::InstanceIp
-    depends_on: [ SF12_GN_10_RVMI ]
-    properties:
-      virtual_network_refs:
-        - get_param: gn_net_fqdn
-      virtual_machine_interface_refs:
-        - get_resource: SF12_GN_10_RVMI
-      instance_ip_address: { get_param: [sf_gn_v6_ips, 9] }
-      instance_ip_family: { get_param: instance_ip_family_v6 }
-
-  SF12_GN_10_RSHC:
-    type: OS::ContrailV2::ServiceHealthCheck
-    properties:
-      name: SF12_GN_10_RSHC
-      service_health_check_properties:
-        service_health_check_properties_enabled: { get_param: sf_shc_enabled }
-        service_health_check_properties_monitor_type: { get_param: sf_shc_monitor_type }
-        service_health_check_properties_delay: { get_param: sf_shc_delay }
-        service_health_check_properties_timeout: { get_param: sf_shc_timeout }
-        service_health_check_properties_max_retries: { get_param: sf_shc_max_retries }
-        service_health_check_properties_url_path: { get_param: sf_shc_url_path }
-
-  # Create port for Transport interface(SGi-data) in SGi Context
-  SF12_SGI_11_RVMI:
-    type: OS::ContrailV2::VirtualMachineInterface
-    properties:
-      virtual_network_refs:
-        - get_param: sgi_net_fqdn
-#      service_health_check_refs: 
-#        - { get_resource: SF12_SGI_11_RSHC }
-      virtual_machine_interface_allowed_address_pairs:
-        virtual_machine_interface_allowed_address_pairs_allowed_address_pair:
-          - virtual_machine_interface_allowed_address_pairs_allowed_address_pair_address_mode: { get_param: vmi_allowed_address_pair_address_mode }
-            virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip:
-              virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip_ip_prefix: { get_param: [bgpaas_ip_address,1] }
-              virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip_ip_prefix_len: { get_param: vmi_allowed_address_pair_prefix_lenth }
-          - virtual_machine_interface_allowed_address_pairs_allowed_address_pair_address_mode: { get_param: vmi_allowed_address_pair_address_mode }
-            virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip:
-              virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip_ip_prefix: { get_param: sf_sgi_rii_v6 }
-              virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip_ip_prefix_len: { get_param: vmi_allowed_address_pair_prefix_lenth_v6 }
-
-  SF12_SGI_11_RII:
-    type: OS::ContrailV2::InstanceIp
-    depends_on: [ SF12_SGI_11_RVMI ]
-    properties:
-      virtual_network_refs:
-        - get_param: sgi_net_fqdn
-      virtual_machine_interface_refs:
-        - get_resource: SF12_SGI_11_RVMI
-      instance_ip_address: { get_param: [sf_sgi_prot_ips, 9] }
-
-  SF12_SGI_11_v6_RII:
-    type: OS::ContrailV2::InstanceIp
-    depends_on: [ SF12_SGI_11_RVMI ]
-    properties:
-      virtual_network_refs:
-        - get_param: sgi_net_fqdn
-      virtual_machine_interface_refs:
-        - get_resource: SF12_SGI_11_RVMI
-      instance_ip_address: { get_param: [sf_sgi_prot_v6_ips, 9] }
-      instance_ip_family: { get_param: instance_ip_family_v6 }
-
-  SF12_SGI_11_RSHC:
-    type: OS::ContrailV2::ServiceHealthCheck
-    properties:
-      name: SF12_SGI_11_RSHC
-      service_health_check_properties:
-        service_health_check_properties_enabled: { get_param: sf_shc_enabled }
-        service_health_check_properties_monitor_type: { get_param: sf_shc_monitor_type }
-        service_health_check_properties_delay: { get_param: sf_shc_delay }
-        service_health_check_properties_timeout: { get_param: sf_shc_timeout }
-        service_health_check_properties_max_retries: { get_param: sf_shc_max_retries }
-        service_health_check_properties_url_path: { get_param: sf_shc_url_path }
-
-  # Create port for Transport interface(SGi-ims) in SGi Context
-  SF12_IMS_12_RVMI:
-    type: OS::ContrailV2::VirtualMachineInterface
-    properties:
-      virtual_network_refs:
-        - get_param: ims_net_fqdn
-#      service_health_check_refs: 
-#        - { get_resource: SF12_IMS_12_RSHC }
-      virtual_machine_interface_allowed_address_pairs:
-        virtual_machine_interface_allowed_address_pairs_allowed_address_pair:
-          - virtual_machine_interface_allowed_address_pairs_allowed_address_pair_address_mode: { get_param: vmi_allowed_address_pair_address_mode }
-            virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip:
-              virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip_ip_prefix: { get_param: [bgpaas_ip_address,2] }
-              virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip_ip_prefix_len: { get_param: vmi_allowed_address_pair_prefix_lenth }
-          - virtual_machine_interface_allowed_address_pairs_allowed_address_pair_address_mode: { get_param: vmi_allowed_address_pair_address_mode }
-            virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip:
-              virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip_ip_prefix: { get_param: sf_ims_rii_v6 }
-              virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip_ip_prefix_len: { get_param: vmi_allowed_address_pair_prefix_lenth_v6 }
-
-  SF12_IMS_12_RII:
-    type: OS::ContrailV2::InstanceIp
-    depends_on: [ SF12_IMS_12_RVMI ]
-    properties:
-      virtual_network_refs:
-        - get_param: ims_net_fqdn
-      virtual_machine_interface_refs:
-        - get_resource: SF12_IMS_12_RVMI
-      instance_ip_address: { get_param: [sf_sgi_ims_ips, 9] }
-
-  SF12_IMS_12_v6_RII:
-    type: OS::ContrailV2::InstanceIp
-    depends_on: [ SF12_IMS_12_RVMI ]
-    properties:
-      virtual_network_refs:
-        - get_param: ims_net_fqdn
-      virtual_machine_interface_refs:
-        - get_resource: SF12_IMS_12_RVMI
-      instance_ip_address: { get_param: [sf_sgi_ims_v6_ips, 9] }
-      instance_ip_family: { get_param: instance_ip_family_v6 }
-
-  SF12_IMS_12_RSHC:
-    type: OS::ContrailV2::ServiceHealthCheck
-    properties:
-      name: SF12_IMS_12_RSHC
-      service_health_check_properties:
-        service_health_check_properties_enabled: { get_param: sf_shc_enabled }
-        service_health_check_properties_monitor_type: { get_param: sf_shc_monitor_type }
-        service_health_check_properties_delay: { get_param: sf_shc_delay }
-        service_health_check_properties_timeout: { get_param: sf_shc_timeout }
-        service_health_check_properties_max_retries: { get_param: sf_shc_max_retries }
-        service_health_check_properties_url_path: { get_param: sf_shc_url_path }
-
-  # Create port for Transport Interface in SUPPORT Context
-  SF12_COR_13_RVMI:
-    type: OS::ContrailV2::VirtualMachineInterface
-    properties:
-      virtual_network_refs:
-        - get_param: cor_net_fqdn
-#      service_health_check_refs: 
-#        - { get_resource: SF12_COR_13_RSHC }
-      virtual_machine_interface_allowed_address_pairs:
-        virtual_machine_interface_allowed_address_pairs_allowed_address_pair:
-          - virtual_machine_interface_allowed_address_pairs_allowed_address_pair_address_mode: { get_param: vmi_allowed_address_pair_address_mode }
-            virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip:
-              virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip_ip_prefix: { get_param: [bgpaas_ip_address,3] }
-              virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip_ip_prefix_len: { get_param: vmi_allowed_address_pair_prefix_lenth }
-          - virtual_machine_interface_allowed_address_pairs_allowed_address_pair_address_mode: { get_param: vmi_allowed_address_pair_address_mode }
-            virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip:
-              virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip_ip_prefix: { get_param: sf_cor_rii_v6 }
-              virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip_ip_prefix_len: { get_param: vmi_allowed_address_pair_prefix_lenth_v6 }
-
-  SF12_COR_13_RII:
-    type: OS::ContrailV2::InstanceIp
-    depends_on: [ SF12_COR_13_RVMI ]
-    properties:
-      virtual_network_refs:
-        - get_param: cor_net_fqdn
-      virtual_machine_interface_refs:
-        - get_resource: SF12_COR_13_RVMI
-      instance_ip_address: { get_param: [sf_cor_ips, 9] }
-
-  SF12_COR_13_v6_RII:
-    type: OS::ContrailV2::InstanceIp
-    depends_on: [ SF12_COR_13_RVMI ]
-    properties:
-      virtual_network_refs:
-        - get_param: cor_net_fqdn
-      virtual_machine_interface_refs:
-        - get_resource: SF12_COR_13_RVMI
-      instance_ip_address: { get_param: [sf_cor_v6_ips, 9] }
-      instance_ip_family: { get_param: instance_ip_family_v6 }
-
-  SF12_COR_13_RSHC:
-    type: OS::ContrailV2::ServiceHealthCheck
-    properties:
-      name: SF12_COR_13_RSHC
-      service_health_check_properties:
-        service_health_check_properties_enabled: { get_param: sf_shc_enabled }
-        service_health_check_properties_monitor_type: { get_param: sf_shc_monitor_type }
-        service_health_check_properties_delay: { get_param: sf_shc_delay }
-        service_health_check_properties_timeout: { get_param: sf_shc_timeout }
-        service_health_check_properties_max_retries: { get_param: sf_shc_max_retries }
-        service_health_check_properties_url_path: { get_param: sf_shc_url_path }
-
-  # Create port for Transport interface in LI Context
-  SF12_OAM_CALEA_14_PORT:
-    type: OS::Neutron::Port
-    properties:
-      network: {get_param: oam_calea_net_name}
-      fixed_ips: [{"ip_address": {get_param: [sf_oam_calea_ips, 9]}}]
-  # Create port for Transport interface in SRP Context
-  SF12_INT_ICSR_15_PORT:
-    type: OS::Neutron::Port
-    properties:
-      network: {get_param: int_icsr_net_name}
-      fixed_ips: [{"ip_address": {get_param: [sf_int_icsr_ips, 9]}}]
-
-  # Create VPC SF 12 Instance
-  sf_server_11:
-    type: OS::Nova::Server
-    depends_on: [ SF12_GN_10_RII, SF12_GN_10_v6_RII, SF12_SGI_11_RII, SF12_SGI_11_v6_RII, SF12_IMS_12_RII, SF12_IMS_12_v6_RII, SF12_COR_13_RII, SF12_COR_13_v6_RII ]
-    properties:
-      metadata:
-          vnf_id: { get_param: vnf_id }
-          vnf_name: { get_param: vnf_name }
-          vf_module_id: { get_param: vf_module_id }
-
-#      name:
-#        str_replace:
-#          template: Z${CZ_ID}CGWY${VF_ID}${VM_TYPE}${VM_NUM}
-#          params:
-#            ${CZ_ID}: {get_param: czid}
-#            ${VF_ID}: {get_param: vf_inst_number}
-#            ${VM_TYPE}: DSF
-#            ${VM_NUM}: "012"
-      name: {get_param: [cgwy_names, 11]}
-      config_drive: True
-      image: {get_param: sf_image_name}
-      flavor: {get_param: sf_flavor_name}
-      networks:
-        - port: {get_resource: sf_int_di2_11_port}
-        - port: {get_resource: SF12_GN_10_RVMI}
-        - port: {get_resource: SF12_SGI_11_RVMI}
-        - port: {get_resource: SF12_IMS_12_RVMI}
-        - port: {get_resource: SF12_COR_13_RVMI}
-        - port: {get_resource: SF12_OAM_CALEA_14_PORT}
-        - port: {get_resource: SF12_INT_ICSR_15_PORT}
-
-      personality:
-        "staros_param.cfg":
-          str_replace:
-            template: |
-              CARDSLOT=$CARD_NUMBER
-              CARDTYPE=$CARD_TYPE
-              CPUID=$CPUID
-            params:
-              $CARD_NUMBER: 12
-              $CARD_TYPE: SFC
-              $CPUID: 0
-      availability_zone: {get_param: availability_zone_0}
-      scheduler_hints:
-        group: {get_resource: sf_vpc-servergroup}
-
-  BgpAsAService_GN:
-    type: OS::ContrailV2::BgpAsAService
-    depends_on:
-      - SF3_GN_10_RVMI
-      - SF4_GN_10_RVMI
-      - SF5_GN_10_RVMI
-      - SF6_GN_10_RVMI  
-      - SF7_GN_10_RVMI
-      - SF8_GN_10_RVMI
-      - SF9_GN_10_RVMI
-      - SF10_GN_10_RVMI
-      - SF11_GN_10_RVMI
-      - SF12_GN_10_RVMI
-
-    properties:
-      name: { get_param: [bgpaas_name, 0] }
-      autonomous_system: { get_param: bgpaas_autonomous_system }
-      virtual_machine_interface_refs:
-        - { get_resource: SF3_GN_10_RVMI }
-        - { get_resource: SF4_GN_10_RVMI }
-        - { get_resource: SF5_GN_10_RVMI }
-        - { get_resource: SF6_GN_10_RVMI }
-        - { get_resource: SF7_GN_10_RVMI }
-        - { get_resource: SF8_GN_10_RVMI }
-        - { get_resource: SF9_GN_10_RVMI }
-        - { get_resource: SF10_GN_10_RVMI }
-        - { get_resource: SF11_GN_10_RVMI }
-        - { get_resource: SF12_GN_10_RVMI }
-
-      bgpaas_ip_address: { get_param: [bgpaas_ip_address,0] }
-      bgpaas_session_attributes:
-        bgpaas_session_attributes_passive: { get_param: bgpaas_session_attributes_passive }
-        bgpaas_session_attributes_hold_time: { get_param: bgpaas_session_attributes_hold_time }
-        bgpaas_session_attributes_admin_down: { get_param: bgpaas_session_attributes_admin_down }
-        bgpaas_session_attributes_address_families:
-          bgpaas_session_attributes_address_families_family:
-            - { get_param: bgpaas_session_attributes_address_families_family_4 }
-            - { get_param: bgpaas_session_attributes_address_families_family_6 }
-        bgpaas_session_attributes_family_attributes:
-          - bgpaas_session_attributes_family_attributes_address_family: { get_param: bgpaas_session_attributes_family_attributes_af_4 }
-            bgpaas_session_attributes_family_attributes_loop_count: { get_param: bgpaas_session_attributes_family_attributes_loop_count_4 }
-            bgpaas_session_attributes_family_attributes_prefix_limit:
-              bgpaas_session_attributes_family_attributes_prefix_limit_maximum: { get_param: bgpaas_session_attributes_family_attributes_prefix_limit_maximum_4 }
-          - bgpaas_session_attributes_family_attributes_address_family: { get_param: bgpaas_session_attributes_family_attributes_af_6 }
-            bgpaas_session_attributes_family_attributes_loop_count: { get_param: bgpaas_session_attributes_family_attributes_loop_count_6 }
-            bgpaas_session_attributes_family_attributes_prefix_limit:
-              bgpaas_session_attributes_family_attributes_prefix_limit_maximum: { get_param: bgpaas_session_attributes_family_attributes_prefix_limit_maximum_6 }
-
-  BgpAsAService_SGI:
-    type: OS::ContrailV2::BgpAsAService
-    depends_on:
-      - SF3_SGI_11_RVMI
-      - SF4_SGI_11_RVMI
-      - SF5_SGI_11_RVMI
-      - SF6_SGI_11_RVMI 
-      - SF7_SGI_11_RVMI
-      - SF8_SGI_11_RVMI
-      - SF9_SGI_11_RVMI
-      - SF10_SGI_11_RVMI
-      - SF11_SGI_11_RVMI
-      - SF12_SGI_11_RVMI
- 
-    properties:
-      name: { get_param: [bgpaas_name, 1] }
-      autonomous_system: { get_param: bgpaas_autonomous_system }
-      virtual_machine_interface_refs:
-        - { get_resource: SF3_SGI_11_RVMI }
-        - { get_resource: SF4_SGI_11_RVMI }
-        - { get_resource: SF5_SGI_11_RVMI }
-        - { get_resource: SF6_SGI_11_RVMI }
-        - { get_resource: SF7_SGI_11_RVMI }
-        - { get_resource: SF8_SGI_11_RVMI }
-        - { get_resource: SF9_SGI_11_RVMI }
-        - { get_resource: SF10_SGI_11_RVMI }
-        - { get_resource: SF11_SGI_11_RVMI }
-        - { get_resource: SF12_SGI_11_RVMI }
-
-      bgpaas_ip_address: { get_param: [bgpaas_ip_address,1] }
-      bgpaas_session_attributes:
-        bgpaas_session_attributes_passive: { get_param: bgpaas_session_attributes_passive }
-        bgpaas_session_attributes_hold_time: { get_param: bgpaas_session_attributes_hold_time }
-        bgpaas_session_attributes_admin_down: { get_param: bgpaas_session_attributes_admin_down }
-        bgpaas_session_attributes_address_families:
-          bgpaas_session_attributes_address_families_family:
-            - { get_param: bgpaas_session_attributes_address_families_family_4 }
-            - { get_param: bgpaas_session_attributes_address_families_family_6 }
-        bgpaas_session_attributes_family_attributes:
-          - bgpaas_session_attributes_family_attributes_address_family: { get_param: bgpaas_session_attributes_family_attributes_af_4 }
-            bgpaas_session_attributes_family_attributes_loop_count: { get_param: bgpaas_session_attributes_family_attributes_loop_count_4 }
-            bgpaas_session_attributes_family_attributes_prefix_limit:
-              bgpaas_session_attributes_family_attributes_prefix_limit_maximum: { get_param: bgpaas_session_attributes_family_attributes_prefix_limit_maximum_4 }
-          - bgpaas_session_attributes_family_attributes_address_family: { get_param: bgpaas_session_attributes_family_attributes_af_6 }
-            bgpaas_session_attributes_family_attributes_loop_count: { get_param: bgpaas_session_attributes_family_attributes_loop_count_6 }
-            bgpaas_session_attributes_family_attributes_prefix_limit:
-              bgpaas_session_attributes_family_attributes_prefix_limit_maximum: { get_param: bgpaas_session_attributes_family_attributes_prefix_limit_maximum_6 }
-
-  BgpAsAService_IMS:
-    type: OS::ContrailV2::BgpAsAService
-    depends_on:
-      - SF3_IMS_12_RVMI
-      - SF4_IMS_12_RVMI
-      - SF5_IMS_12_RVMI
-      - SF6_IMS_12_RVMI 
-      - SF7_IMS_12_RVMI
-      - SF8_IMS_12_RVMI
-      - SF9_IMS_12_RVMI
-      - SF10_IMS_12_RVMI
-      - SF11_IMS_12_RVMI
-      - SF12_IMS_12_RVMI
- 
-    properties:
-      name: { get_param: [bgpaas_name, 2] }
-      autonomous_system: { get_param: bgpaas_autonomous_system }
-      virtual_machine_interface_refs:
-        - { get_resource: SF3_IMS_12_RVMI }
-        - { get_resource: SF4_IMS_12_RVMI }
-        - { get_resource: SF5_IMS_12_RVMI }
-        - { get_resource: SF6_IMS_12_RVMI }
-        - { get_resource: SF7_IMS_12_RVMI }
-        - { get_resource: SF8_IMS_12_RVMI }
-        - { get_resource: SF9_IMS_12_RVMI }
-        - { get_resource: SF10_IMS_12_RVMI }
-        - { get_resource: SF11_IMS_12_RVMI }
-        - { get_resource: SF12_IMS_12_RVMI }
-
-      bgpaas_ip_address: { get_param: [bgpaas_ip_address,2] }
-      bgpaas_session_attributes:
-        bgpaas_session_attributes_passive: { get_param: bgpaas_session_attributes_passive }
-        bgpaas_session_attributes_hold_time: { get_param: bgpaas_session_attributes_hold_time }
-        bgpaas_session_attributes_admin_down: { get_param: bgpaas_session_attributes_admin_down }
-        bgpaas_session_attributes_address_families:
-          bgpaas_session_attributes_address_families_family:
-            - { get_param: bgpaas_session_attributes_address_families_family_4 }
-            - { get_param: bgpaas_session_attributes_address_families_family_6 }
-        bgpaas_session_attributes_family_attributes:
-          - bgpaas_session_attributes_family_attributes_address_family: { get_param: bgpaas_session_attributes_family_attributes_af_4 }
-            bgpaas_session_attributes_family_attributes_loop_count: { get_param: bgpaas_session_attributes_family_attributes_loop_count_4 }
-            bgpaas_session_attributes_family_attributes_prefix_limit:
-              bgpaas_session_attributes_family_attributes_prefix_limit_maximum: { get_param: bgpaas_session_attributes_family_attributes_prefix_limit_maximum_4 }
-          - bgpaas_session_attributes_family_attributes_address_family: { get_param: bgpaas_session_attributes_family_attributes_af_6 }
-            bgpaas_session_attributes_family_attributes_loop_count: { get_param: bgpaas_session_attributes_family_attributes_loop_count_6 }
-            bgpaas_session_attributes_family_attributes_prefix_limit:
-              bgpaas_session_attributes_family_attributes_prefix_limit_maximum: { get_param: bgpaas_session_attributes_family_attributes_prefix_limit_maximum_6 }
-
-  BgpAsAService_COR:
-    type: OS::ContrailV2::BgpAsAService
-    depends_on:
-      - SF3_COR_13_RVMI
-      - SF4_COR_13_RVMI
-      - SF5_COR_13_RVMI
-      - SF6_COR_13_RVMI
-      - SF7_COR_13_RVMI
-      - SF8_COR_13_RVMI
-      - SF9_COR_13_RVMI
-      - SF10_COR_13_RVMI
-      - SF11_COR_13_RVMI
-      - SF12_COR_13_RVMI
-
-    properties:
-      name: { get_param: [bgpaas_name, 3] }
-      autonomous_system: { get_param: bgpaas_autonomous_system }
-      virtual_machine_interface_refs:
-        - { get_resource: SF3_COR_13_RVMI }
-        - { get_resource: SF4_COR_13_RVMI }
-        - { get_resource: SF5_COR_13_RVMI }
-        - { get_resource: SF6_COR_13_RVMI }
-        - { get_resource: SF7_COR_13_RVMI }
-        - { get_resource: SF8_COR_13_RVMI }
-        - { get_resource: SF9_COR_13_RVMI }
-        - { get_resource: SF10_COR_13_RVMI }
-        - { get_resource: SF11_COR_13_RVMI }
-        - { get_resource: SF12_COR_13_RVMI }
-
-      bgpaas_ip_address: { get_param: [bgpaas_ip_address,3] }
-      bgpaas_session_attributes:
-        bgpaas_session_attributes_passive: { get_param: bgpaas_session_attributes_passive }
-        bgpaas_session_attributes_hold_time: { get_param: bgpaas_session_attributes_hold_time }
-        bgpaas_session_attributes_admin_down: { get_param: bgpaas_session_attributes_admin_down }
-        bgpaas_session_attributes_address_families:
-          bgpaas_session_attributes_address_families_family:
-            - { get_param: bgpaas_session_attributes_address_families_family_4 }
-            - { get_param: bgpaas_session_attributes_address_families_family_6 }
-        bgpaas_session_attributes_family_attributes:
-          - bgpaas_session_attributes_family_attributes_address_family: { get_param: bgpaas_session_attributes_family_attributes_af_4 }
-            bgpaas_session_attributes_family_attributes_loop_count: { get_param: bgpaas_session_attributes_family_attributes_loop_count_4 }
-            bgpaas_session_attributes_family_attributes_prefix_limit:
-              bgpaas_session_attributes_family_attributes_prefix_limit_maximum: { get_param: bgpaas_session_attributes_family_attributes_prefix_limit_maximum_4 }
-          - bgpaas_session_attributes_family_attributes_address_family: { get_param: bgpaas_session_attributes_family_attributes_af_6 }
-            bgpaas_session_attributes_family_attributes_loop_count: { get_param: bgpaas_session_attributes_family_attributes_loop_count_6 }
-            bgpaas_session_attributes_family_attributes_prefix_limit:
-              bgpaas_session_attributes_family_attributes_prefix_limit_maximum: { get_param: bgpaas_session_attributes_family_attributes_prefix_limit_maximum_6 }
-
diff --git a/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/simpleNotif-V5/artifacts/cloud-nimbus.sh b/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/simpleNotif-V5/artifacts/cloud-nimbus.sh
deleted file mode 100644
index 48485f3..0000000
--- a/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/simpleNotif-V5/artifacts/cloud-nimbus.sh
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/bin/bash
-echo "Running first-boot script"
-FLAG="first-boot.sh"
-echo "First boot run" > ${FLAG}
-echo "$vm_name" >> ${FLAG}
-touch /var/lib/cloud/instance/payload/launch-params
-chmod 644 /var/lib/cloud/instance/payload/launch-params
-#for i in $(ls /sys/class/net); do
-#  echo "Restart $i" >> ${FLAG}
-#  ifdown ${i}
-#  ifup ${i}
-#done
diff --git a/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/simpleNotif-V5/artifacts/hot-nimbus-oam-volumes_v1.0.env b/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/simpleNotif-V5/artifacts/hot-nimbus-oam-volumes_v1.0.env
deleted file mode 100644
index b494d8c..0000000
--- a/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/simpleNotif-V5/artifacts/hot-nimbus-oam-volumes_v1.0.env
+++ /dev/null
@@ -1,6 +0,0 @@
-parameters:
-  pcrf_oam_vol_size: 500
-  pcrf_oam_volume_silver-1: Silver
-  pcrf_oam_volume_silver-2: Silver
-  pcrf_oam_vol_name_1: sde1-pcrfx01-oam001-vol-1
-  pcrf_oam_vol_name_2: sde1-pcrfx01-oam001-vol-2
\ No newline at end of file
diff --git a/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/simpleNotif-V5/artifacts/hot-nimbus-oam-volumes_v1.0.yaml b/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/simpleNotif-V5/artifacts/hot-nimbus-oam-volumes_v1.0.yaml
deleted file mode 100644
index 9e12054..0000000
--- a/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/simpleNotif-V5/artifacts/hot-nimbus-oam-volumes_v1.0.yaml
+++ /dev/null
@@ -1,45 +0,0 @@
-heat_template_version:  2013-05-23
-
-parameters:
-    pcrf_oam_vol_size:
-     type: number
-     label: Cinder volume size
-     description: the size of the Cinder volume
-    pcrf_oam_vol_name_1:
-     type: string
-     label: OAM volume name 1
-     description: Assigning name to volume
-    pcrf_oam_vol_name_2:
-     type: string
-     label: OAM volume name 2
-     description: Assigning name to volume
-    pcrf_oam_volume_silver-1:
-     type: string
-     label: vm volume type
-     description: the name of the target volume backend for OAM1
-    pcrf_oam_volume_silver-2:
-     type: string
-     label: vm volume type
-     description: the name of the target volume backend for OAM2
-
-resources:
-  pcrf_oam_volume_1:
-    type: OS::Cinder::Volume
-    properties:
-      size: {get_param: pcrf_oam_vol_size}
-      volume_type: {get_param: pcrf_oam_volume_silver-1}
-      name: {get_param: pcrf_oam_vol_name_1}
-
-  pcrf_oam_volume_2:
-    type: OS::Cinder::Volume
-    properties:
-      size: {get_param: pcrf_oam_vol_size}
-      volume_type: {get_param: pcrf_oam_volume_silver-2}
-      name: {get_param: pcrf_oam_vol_name_2}
-outputs:
-  pcrf_oam_volume_id_1:
-    description: the oam 001 volume id
-    value: { get_resource: pcrf_oam_volume_1 }
-  pcrf_oam_volume_id_2:
-    description: the oam 002 volume id
-    value: { get_resource: pcrf_oam_volume_2 }
\ No newline at end of file
diff --git a/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/simpleNotif-V5/artifacts/hot-nimbus-oam_v1.0.env b/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/simpleNotif-V5/artifacts/hot-nimbus-oam_v1.0.env
deleted file mode 100644
index 7e51e67..0000000
--- a/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/simpleNotif-V5/artifacts/hot-nimbus-oam_v1.0.env
+++ /dev/null
@@ -1,18 +0,0 @@
-parameters:
-  pcrf_oam_server_names: ZRDM1PCRF01OAM001,ZRDM1PCRF01OAM002
-  pcrf_oam_image_name: PCRF_8.995-ATTM1.0.3.qcow2
-  pcrf_oam_flavor_name: lc.4xlarge4
-  availabilityzone_name: nova
-  pcrf_cps_net_name: Mobisupport-25193-I-INT1_int_pcrf_net_0
-  pcrf_cps_net_ips: 172.26.16.111,172.26.16.112
-  pcrf_arbiter_vip: 172.26.16.115
-  pcrf_cps_net_mask: 255.255.255.0
-  pcrf_oam_net_name: MNS-25180-L-01_oam_protected_net_0
-  pcrf_oam_net_ips: 107.239.64.117,107.239.64.118
-  pcrf_oam_net_gw: 107.239.64.1
-  pcrf_oam_net_mask: 255.255.248.0
-  pcrf_oam_volume_id_1: a4aa05fb-fcdc-457b-8077-6845fdfc3257
-  pcrf_oam_volume_id_2: 93d8fc1f-f1c3-4933-86b2-039881ee910f
-  pcrf_security_group_name: nimbus_security_group
-  pcrf_vnf_id: 730797234b4a40aa99335157b02871cd
-
diff --git a/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/simpleNotif-V5/artifacts/hot-nimbus-oam_v1.0.yaml b/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/simpleNotif-V5/artifacts/hot-nimbus-oam_v1.0.yaml
deleted file mode 100644
index 8f3aae9..0000000
--- a/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/simpleNotif-V5/artifacts/hot-nimbus-oam_v1.0.yaml
+++ /dev/null
@@ -1,109 +0,0 @@
-heat_template_version: 2013-05-23
-
-description: heat template that creates multiple PCRF OAM nodes stack
-
-parameters:
-  pcrf_oam_server_names:
-    type: comma_delimited_list
-    label: PCRF OAM server names
-    description: name of the PCRF OAM instance
-  pcrf_oam_image_name:
-    type: string
-    label: PCRF OAM image name
-    description: PCRF OAM image name
-  pcrf_oam_flavor_name:
-    type: string
-    label: PCRF OAM flavor name
-    description: flavor name of PCRF OAM instance
-  availabilityzone_name:
-    type: string
-    label: availabilityzone name
-    description: availabilityzone name
-  pcrf_cps_net_name:
-    type: string
-    label: CPS network name
-    description: CPS network name
-  pcrf_cps_net_ips:
-    type: comma_delimited_list
-    label: CPS network ips
-    description: CPS network ips
-  pcrf_cps_net_mask:
-    type: string
-    label: CPS network mask
-    description: CPS network mask
-  pcrf_arbiter_vip:
-    type: string
-    label: OAM Arbiter LB VIP
-    description: OAM Arbiter LB VIP
-  pcrf_oam_net_name:
-    type: string
-    label: OAM network name
-    description: OAM network name
-  pcrf_oam_net_ips:
-    type: comma_delimited_list
-    label: OAM network ips
-    description: OAM network ips
-  pcrf_oam_net_gw:
-    type: string
-    label: CPS network gateway
-    description: CPS network gateway
-  pcrf_oam_net_mask:
-    type: string
-    label: CPS network mask
-    description: CPS network mask
-  pcrf_oam_volume_id_1:
-    type: string
-    label: CPS OAM 001 Cinder Volume
-    description: CPS OAM 001 Cinder Volumes
-  pcrf_oam_volume_id_2:
-    type: string
-    label: CPS OAM 002 Cinder Volume
-    description: CPS OAM 002 Cinder Volumes
-  pcrf_security_group_name:
-    type: string
-    label: security group name
-    description: the name of security group
-  pcrf_vnf_id:
-    type: string
-    label: PCRF VNF Id
-    description: PCRF VNF Id
-
-resources:
-  server_pcrf_oam_001:
-    type: file:///nested-oam_v1.0.yaml
-    properties:
-      pcrf_oam_server_name: { get_param: [pcrf_oam_server_names, 0] }
-      pcrf_oam_image_name: { get_param: pcrf_oam_image_name }
-      pcrf_oam_flavor_name: { get_param: pcrf_oam_flavor_name }
-      availabilityzone_name: { get_param: availabilityzone_name }
-      pcrf_security_group_name: { get_param: pcrf_security_group_name }
-      pcrf_oam_volume_id: { get_param: pcrf_oam_volume_id_1 }
-      pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
-      pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 0] }
-      pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
-      pcrf_oam_net_name: { get_param: pcrf_oam_net_name }
-      pcrf_oam_net_ip: { get_param: [pcrf_oam_net_ips, 0] }
-      pcrf_oam_net_mask: { get_param: pcrf_oam_net_mask }
-      pcrf_oam_net_gw: { get_param: pcrf_oam_net_gw }
-      pcrf_arbiter_vip: { get_param: pcrf_arbiter_vip }
-      pcrf_vnf_id: {get_param: pcrf_vnf_id}
-
-  server_pcrf_oam_002:
-    type: file:///nested-oam_v1.0.yaml
-    depends_on: [server_pcrf_oam_001]
-    properties:
-      pcrf_oam_server_name: { get_param: [pcrf_oam_server_names, 1] }
-      pcrf_oam_image_name: { get_param: pcrf_oam_image_name }
-      pcrf_oam_flavor_name: { get_param: pcrf_oam_flavor_name }
-      availabilityzone_name: { get_param: availabilityzone_name }
-      pcrf_security_group_name: { get_param: pcrf_security_group_name }
-      pcrf_oam_volume_id: { get_param: pcrf_oam_volume_id_2 }
-      pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
-      pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 1] }
-      pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
-      pcrf_oam_net_name: { get_param: pcrf_oam_net_name }
-      pcrf_oam_net_ip: { get_param: [pcrf_oam_net_ips, 1] }
-      pcrf_oam_net_mask: { get_param: pcrf_oam_net_mask }
-      pcrf_oam_net_gw: { get_param: pcrf_oam_net_gw }
-      pcrf_arbiter_vip: { get_param: pcrf_arbiter_vip }
-      pcrf_vnf_id: {get_param: pcrf_vnf_id}
diff --git a/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/simpleNotif-V5/artifacts/hot-nimbus-pcm-volumes_v1.0.env b/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/simpleNotif-V5/artifacts/hot-nimbus-pcm-volumes_v1.0.env
deleted file mode 100644
index 788365d..0000000
--- a/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/simpleNotif-V5/artifacts/hot-nimbus-pcm-volumes_v1.0.env
+++ /dev/null
@@ -1,4 +0,0 @@
-parameters:
-  pcrf_pcm_vol_size: 50
-  pcrf_pcm_volume_silver: Silver
-  pcrf_pcm_vol_name_1: sde1-pcrfx01-pcm001-vol-1
diff --git a/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/simpleNotif-V5/artifacts/hot-nimbus-pcm-volumes_v1.0.yaml b/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/simpleNotif-V5/artifacts/hot-nimbus-pcm-volumes_v1.0.yaml
deleted file mode 100644
index bcc3e89..0000000
--- a/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/simpleNotif-V5/artifacts/hot-nimbus-pcm-volumes_v1.0.yaml
+++ /dev/null
@@ -1,28 +0,0 @@
-heat_template_version:  2013-05-23
-
-parameters:
-   pcrf_pcm_vol_size:
-     type: number
-     label: Cinder volume size
-     description: the size of the Cinder volume
-   pcrf_pcm_vol_name_1:
-     type: string
-     label: PCM volume name
-     description: Assigning name to volume
-   pcrf_pcm_volume_silver:
-     type: string
-     label: vm volume type
-     description: the name of the target volume backend for PCM
-
-resources: 
-  pcrf_pcm_volume_1:
-     type: OS::Cinder::Volume
-     properties:
-      size: { get_param: pcrf_pcm_vol_size }
-      volume_type: { get_param: pcrf_pcm_volume_silver }
-      name: { get_param: pcrf_pcm_vol_name_1 }
-
-outputs:
-  pcrf_pcm_volume_id_1:
-    description: the pcrf_pcm_volume_id
-    value: { get_resource: pcrf_pcm_volume_1 }
\ No newline at end of file
diff --git a/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/simpleNotif-V5/artifacts/hot-nimbus-pcm_v1.0.env b/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/simpleNotif-V5/artifacts/hot-nimbus-pcm_v1.0.env
deleted file mode 100644
index b23014d..0000000
--- a/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/simpleNotif-V5/artifacts/hot-nimbus-pcm_v1.0.env
+++ /dev/null
@@ -1,16 +0,0 @@
-parameters:
-  pcrf_pcm_server_names: ZRDM1PCRF01PCM001
-  pcrf_pcm_image_name: PCRF_8.995-ATTM1.0.3.qcow2
-  pcrf_pcm_flavor_name: lc.2xlarge4
-  availabilityzone_name: nova
-  pcrf_cps_net_name: Mobisupport-25193-I-INT1_int_pcrf_net_0
-  pcrf_cps_net_ips: 172.26.16.113
-  pcrf_cps_net_mask: 255.255.255.0
-  pcrf_oam_net_name: MNS-25180-L-01_oam_protected_net_0
-  pcrf_oam_net_ips: 107.239.64.121
-  pcrf_oam_net_gw: 107.239.64.1
-  pcrf_oam_net_mask: 255.255.248.0
-  pcrf_pcm_volume_id_1: 3438a3fe-1241-4390-80f2-d0b86238c40e
-  pcrf_security_group_name: nimbus_security_group
-  pcrf_vnf_id: 730797234b4a40aa99335157b02871cd
-
diff --git a/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/simpleNotif-V5/artifacts/hot-nimbus-pcm_v1.0.yaml b/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/simpleNotif-V5/artifacts/hot-nimbus-pcm_v1.0.yaml
deleted file mode 100644
index defb373..0000000
--- a/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/simpleNotif-V5/artifacts/hot-nimbus-pcm_v1.0.yaml
+++ /dev/null
@@ -1,80 +0,0 @@
-heat_template_version: 2013-05-23
-
-description: heat template that creates PCRF Cluman stack
-
-parameters:
-  pcrf_pcm_server_names:
-    type: comma_delimited_list
-    label: PCRF CM server names
-    description: name of the PCRF CM instance
-  pcrf_pcm_image_name:
-    type: string
-    label: PCRF CM image name
-    description: PCRF CM image name
-  pcrf_pcm_flavor_name:
-    type: string
-    label: PCRF CM flavor name
-    description: flavor name of PCRF CM instance
-  availabilityzone_name:
-    type: string
-    label: availabilityzone name
-    description: availabilityzone name
-  pcrf_cps_net_name:
-    type: string
-    label: CPS network name
-    description: CPS network name
-  pcrf_cps_net_ips:
-    type: comma_delimited_list
-    label: CPS network ips
-    description: CPS network ips
-  pcrf_cps_net_mask:
-    type: string
-    label: CPS network mask
-    description: CPS network mask
-  pcrf_oam_net_name:
-    type: string
-    label: OAM network name
-    description: OAM network name
-  pcrf_oam_net_ips:
-    type: comma_delimited_list
-    label: OAM network ips
-    description: OAM network ips
-  pcrf_oam_net_gw:
-    type: string
-    label: CPS network gateway
-    description: CPS network gateway
-  pcrf_oam_net_mask:
-    type: string
-    label: CPS network mask
-    description: CPS network mask
-  pcrf_pcm_volume_id_1:
-    type: string
-    label: CPS Cluman Cinder Volume
-    description: CPS Cluman Cinder Volume
-  pcrf_security_group_name:
-    type: string
-    label: security group name
-    description: the name of security group
-  pcrf_vnf_id:
-    type: string
-    label: PCRF VNF Id
-    description: PCRF VNF Id
-
-resources:
-  server_pcrf_pcm_001:
-    type: nested-pcm_v1.0.yaml
-    properties:
-      pcrf_pcm_server_name: { get_param: [pcrf_pcm_server_names, 0] }
-      pcrf_pcm_image_name: { get_param: pcrf_pcm_image_name }
-      pcrf_pcm_flavor_name: { get_param: pcrf_pcm_flavor_name }
-      availabilityzone_name: { get_param: availabilityzone_name }
-      pcrf_security_group_name: { get_param: pcrf_security_group_name }
-      pcrf_pcm_volume_id: { get_param: pcrf_pcm_volume_id_1 }
-      pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
-      pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 0] }
-      pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
-      pcrf_oam_net_name: { get_param: pcrf_oam_net_name }
-      pcrf_oam_net_ip: { get_param: [pcrf_oam_net_ips, 0] }
-      pcrf_oam_net_mask: { get_param: pcrf_oam_net_mask }
-      pcrf_oam_net_gw: { get_param: pcrf_oam_net_gw }
-      pcrf_vnf_id: {get_param: pcrf_vnf_id}
diff --git a/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/simpleNotif-V5/artifacts/hot-nimbus-ppd_v1.0.yaml b/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/simpleNotif-V5/artifacts/hot-nimbus-ppd_v1.0.yaml
deleted file mode 100644
index 8631592..0000000
--- a/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/simpleNotif-V5/artifacts/hot-nimbus-ppd_v1.0.yaml
+++ /dev/null
@@ -1,286 +0,0 @@
-heat_template_version: 2013-05-23
-
-description: heat template that creates PCRF Policy Director stack
-
-parameters:
-  pcrf_ppd_server_names:
-    type: comma_delimited_list
-    label: PCRF PD server names
-    description: name of the PCRF PD instance
-  pcrf_ppd_image_name:
-    type: string
-    label: PCRF PD image name
-    description: PCRF PD image name
-  pcrf_ppd_flavor_name:
-    type: string
-    label: PCRF PD flavor name
-    description: flavor name of PCRF PD instance
-  availabilityzone_name:
-    type: string
-    label: availabilityzone name
-    description: availabilityzone name
-  pcrf_cps_net_name:
-    type: string
-    label: CPS network name
-    description: CPS network name
-  pcrf_cps_net_ips:
-    type: comma_delimited_list
-    label: CPS network ips
-    description: CPS network ips
-  pcrf_cps_net_mask:
-    type: string
-    label: CPS network mask
-    description: CPS network mask
-  pcrf_lb_internal_vip:
-    type: string
-    label: CPS Internal LB VIP
-    description: CPS Internal LB VIP
-  pcrf_oam_net_name:
-    type: string
-    label: OAM network name
-    description: OAM network name
-  pcrf_oam_net_ips:
-    type: comma_delimited_list
-    label: OAM network ips
-    description: OAM network ips
-  pcrf_oam_net_gw:
-    type: string
-    label: CPS network gateway
-    description: CPS network gateway
-  pcrf_oam_net_mask:
-    type: string
-    label: CPS network mask
-    description: CPS network mask
-  pcrf_lb_management_vip:
-    type: string
-    label: CPS OAM LB VIP
-    description: CPS OAM LB VIP
-  pcrf_gx_net_name:
-    type: string
-    label: Gx network name
-    description: Gx network name
-  pcrf_gx_net_ips:
-    type: comma_delimited_list
-    label: Gx network ips
-    description: Gx network ips
-  pcrf_gx_net_mask:
-    type: string
-    label: Gx network mask
-    description: Gx network mask
-  pcrf_sp_net_name:
-    type: string
-    label: Sp network name
-    description: Sp network name
-  pcrf_sp_net_ips:
-    type: comma_delimited_list
-    label: Sp network ips
-    description: Sp network ips
-  pcrf_sp_net_mask:
-    type: string
-    label: Sp network mask
-    description: Sp network mask
-  pcrf_sy_net_name:
-    type: string
-    label: Sy network name
-    description: Sy network name
-  pcrf_sy_net_ips:
-    type: comma_delimited_list
-    label: Sy network ips
-    description: Sy network ips
-  pcrf_sy_net_mask:
-    type: string
-    label: Sy network mask
-    description: Sy network mask
-  pcrf_rx_net_name:
-    type: string
-    label: Rx network name
-    description: Rx network name
-  pcrf_rx_net_ips:
-    type: comma_delimited_list
-    label: Rx network ips
-    description: Rx network ips
-  pcrf_rx_net_mask:
-    type: string
-    label: Rx network mask
-    description: Rx network mask
-  pcrf_sd_net_name:
-    type: string
-    label: Sd network name
-    description: Sd network name
-  pcrf_sd_net_ips:
-    type: comma_delimited_list
-    label: Sd network ips
-    description: Sd network ips
-  pcrf_sd_net_mask:
-    type: string
-    label: Sd network mask
-    description: Sd network mask
-  pcrf_sgi_sy_net_name:
-    type: string
-    label: Sgi Sy network name
-    description: Sgi Sy network name
-  pcrf_sgi_sy_net_ips:
-    type: comma_delimited_list
-    label: Sgi Sy network ips
-    description: Sgi Sy network ips
-  pcrf_sgi_sy_net_mask:
-    type: string
-    label: Sgi Sy network mask
-    description: Sgi Sy network mask
-  pcrf_security_group_name:
-    type: string
-    label: security group name
-    description: the name of security group
-  pcrf_vnf_id:
-    type: string
-    label: PCRF VNF Id
-    description: PCRF VNF Id
-
-resources:
-  server_pcrf_ppd_001:
-    type: nested-ppd_v1.0.yaml
-    properties:
-      pcrf_ppd_server_name: { get_param: [pcrf_ppd_server_names, 0] }
-      pcrf_ppd_image_name: { get_param: pcrf_ppd_image_name }
-      pcrf_ppd_flavor_name: { get_param: pcrf_ppd_flavor_name }
-      availabilityzone_name: { get_param: availabilityzone_name }
-      pcrf_security_group_name: { get_param: pcrf_security_group_name }
-      pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
-      pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 0] }
-      pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
-      pcrf_lb_internal_vip: { get_param: pcrf_lb_internal_vip }
-      pcrf_oam_net_name: { get_param: pcrf_oam_net_name }
-      pcrf_oam_net_ip: { get_param: [pcrf_oam_net_ips, 0] }
-      pcrf_oam_net_mask: { get_param: pcrf_oam_net_mask }
-      pcrf_oam_net_gw: { get_param: pcrf_oam_net_gw }
-      pcrf_lb_management_vip: { get_param: pcrf_lb_management_vip }
-      pcrf_gx_net_name: { get_param: pcrf_gx_net_name }
-      pcrf_gx_net_ip: { get_param: [pcrf_gx_net_ips, 0] }
-      pcrf_gx_net_mask: { get_param: pcrf_gx_net_mask }
-      pcrf_sp_net_name: { get_param: pcrf_sp_net_name }
-      pcrf_sp_net_ip: { get_param: [pcrf_sp_net_ips, 0] }
-      pcrf_sp_net_mask: { get_param: pcrf_sp_net_mask }
-      pcrf_sy_net_name: { get_param: pcrf_sy_net_name }
-      pcrf_sy_net_ip: { get_param: [pcrf_sy_net_ips, 0] }
-      pcrf_sy_net_mask: { get_param: pcrf_sy_net_mask }
-      pcrf_rx_net_name: { get_param: pcrf_rx_net_name }
-      pcrf_rx_net_ip: { get_param: [pcrf_rx_net_ips, 0] }
-      pcrf_rx_net_mask: { get_param: pcrf_rx_net_mask }
-      pcrf_sd_net_name: { get_param: pcrf_sd_net_name }
-      pcrf_sd_net_ip: { get_param: [pcrf_sd_net_ips, 0] }
-      pcrf_sd_net_mask: { get_param: pcrf_sd_net_mask }
-      pcrf_sgi_sy_net_name: { get_param: pcrf_sgi_sy_net_name }
-      pcrf_sgi_sy_net_ip: { get_param: [pcrf_sgi_sy_net_ips, 0] }
-      pcrf_sgi_sy_net_mask: { get_param: pcrf_sgi_sy_net_mask }
-      pcrf_vnf_id: {get_param: pcrf_vnf_id}
-
-  server_pcrf_ppd_002:
-    type: nested-ppd_v1.0.yaml
-    properties:
-      pcrf_ppd_server_name: { get_param: [pcrf_ppd_server_names, 1] }
-      pcrf_ppd_image_name: { get_param: pcrf_ppd_image_name }
-      pcrf_ppd_flavor_name: { get_param: pcrf_ppd_flavor_name }
-      availabilityzone_name: { get_param: availabilityzone_name }
-      pcrf_security_group_name: { get_param: pcrf_security_group_name }
-      pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
-      pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 1] }
-      pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
-      pcrf_lb_internal_vip: { get_param: pcrf_lb_internal_vip }
-      pcrf_oam_net_name: { get_param: pcrf_oam_net_name }
-      pcrf_oam_net_ip: { get_param: [pcrf_oam_net_ips, 1] }
-      pcrf_oam_net_mask: { get_param: pcrf_oam_net_mask }
-      pcrf_oam_net_gw: { get_param: pcrf_oam_net_gw }
-      pcrf_lb_management_vip: { get_param: pcrf_lb_management_vip }
-      pcrf_gx_net_name: { get_param: pcrf_gx_net_name }
-      pcrf_gx_net_ip: { get_param: [pcrf_gx_net_ips, 1] }
-      pcrf_gx_net_mask: { get_param: pcrf_gx_net_mask }
-      pcrf_sp_net_name: { get_param: pcrf_sp_net_name }
-      pcrf_sp_net_ip: { get_param: [pcrf_sp_net_ips, 1] }
-      pcrf_sp_net_mask: { get_param: pcrf_sp_net_mask }
-      pcrf_sy_net_name: { get_param: pcrf_sy_net_name }
-      pcrf_sy_net_ip: { get_param: [pcrf_sy_net_ips, 1] }
-      pcrf_sy_net_mask: { get_param: pcrf_sy_net_mask }
-      pcrf_rx_net_name: { get_param: pcrf_rx_net_name }
-      pcrf_rx_net_ip: { get_param: [pcrf_rx_net_ips, 1] }
-      pcrf_rx_net_mask: { get_param: pcrf_rx_net_mask }
-      pcrf_sd_net_name: { get_param: pcrf_sd_net_name }
-      pcrf_sd_net_ip: { get_param: [pcrf_sd_net_ips, 1] }
-      pcrf_sd_net_mask: { get_param: pcrf_sd_net_mask }
-      pcrf_sgi_sy_net_name: { get_param: pcrf_sgi_sy_net_name }
-      pcrf_sgi_sy_net_ip: { get_param: [pcrf_sgi_sy_net_ips, 1] }
-      pcrf_sgi_sy_net_mask: { get_param: pcrf_sgi_sy_net_mask }
-      pcrf_vnf_id: {get_param: pcrf_vnf_id}
-
-  server_pcrf_ppd_003:
-    type: nested-ppd_v1.0.yaml
-    properties:
-      pcrf_ppd_server_name: { get_param: [pcrf_ppd_server_names, 2] }
-      pcrf_ppd_image_name: { get_param: pcrf_ppd_image_name }
-      pcrf_ppd_flavor_name: { get_param: pcrf_ppd_flavor_name }
-      availabilityzone_name: { get_param: availabilityzone_name }
-      pcrf_security_group_name: { get_param: pcrf_security_group_name }
-      pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
-      pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 2] }
-      pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
-      pcrf_lb_internal_vip: { get_param: pcrf_lb_internal_vip }
-      pcrf_oam_net_name: { get_param: pcrf_oam_net_name }
-      pcrf_oam_net_ip: { get_param: [pcrf_oam_net_ips, 2] }
-      pcrf_oam_net_mask: { get_param: pcrf_oam_net_mask }
-      pcrf_oam_net_gw: { get_param: pcrf_oam_net_gw }
-      pcrf_lb_management_vip: { get_param: pcrf_lb_management_vip }
-      pcrf_gx_net_name: { get_param: pcrf_gx_net_name }
-      pcrf_gx_net_ip: { get_param: [pcrf_gx_net_ips, 2] }
-      pcrf_gx_net_mask: { get_param: pcrf_gx_net_mask }
-      pcrf_sp_net_name: { get_param: pcrf_sp_net_name }
-      pcrf_sp_net_ip: { get_param: [pcrf_sp_net_ips, 2] }
-      pcrf_sp_net_mask: { get_param: pcrf_sp_net_mask }
-      pcrf_sy_net_name: { get_param: pcrf_sy_net_name }
-      pcrf_sy_net_ip: { get_param: [pcrf_sy_net_ips, 2] }
-      pcrf_sy_net_mask: { get_param: pcrf_sy_net_mask }
-      pcrf_rx_net_name: { get_param: pcrf_rx_net_name }
-      pcrf_rx_net_ip: { get_param: [pcrf_rx_net_ips, 2] }
-      pcrf_rx_net_mask: { get_param: pcrf_rx_net_mask }
-      pcrf_sd_net_name: { get_param: pcrf_sd_net_name }
-      pcrf_sd_net_ip: { get_param: [pcrf_sd_net_ips, 2] }
-      pcrf_sd_net_mask: { get_param: pcrf_sd_net_mask }
-      pcrf_sgi_sy_net_name: { get_param: pcrf_sgi_sy_net_name }
-      pcrf_sgi_sy_net_ip: { get_param: [pcrf_sgi_sy_net_ips, 2] }
-      pcrf_sgi_sy_net_mask: { get_param: pcrf_sgi_sy_net_mask }
-      pcrf_vnf_id: {get_param: pcrf_vnf_id}
-
-  server_pcrf_ppd_004:
-    type: nested-ppd_v1.0.yaml
-    properties:
-      pcrf_ppd_server_name: { get_param: [pcrf_ppd_server_names, 3] }
-      pcrf_ppd_image_name: { get_param: pcrf_ppd_image_name }
-      pcrf_ppd_flavor_name: { get_param: pcrf_ppd_flavor_name }
-      availabilityzone_name: { get_param: availabilityzone_name }
-      pcrf_security_group_name: { get_param: pcrf_security_group_name }
-      pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
-      pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 3] }
-      pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
-      pcrf_lb_internal_vip: { get_param: pcrf_lb_internal_vip }
-      pcrf_oam_net_name: { get_param: pcrf_oam_net_name }
-      pcrf_oam_net_ip: { get_param: [pcrf_oam_net_ips, 3] }
-      pcrf_oam_net_mask: { get_param: pcrf_oam_net_mask }
-      pcrf_oam_net_gw: { get_param: pcrf_oam_net_gw }
-      pcrf_lb_management_vip: { get_param: pcrf_lb_management_vip }
-      pcrf_gx_net_name: { get_param: pcrf_gx_net_name }
-      pcrf_gx_net_ip: { get_param: [pcrf_gx_net_ips, 3] }
-      pcrf_gx_net_mask: { get_param: pcrf_gx_net_mask }
-      pcrf_sp_net_name: { get_param: pcrf_sp_net_name }
-      pcrf_sp_net_ip: { get_param: [pcrf_sp_net_ips, 3] }
-      pcrf_sp_net_mask: { get_param: pcrf_sp_net_mask }
-      pcrf_sy_net_name: { get_param: pcrf_sy_net_name }
-      pcrf_sy_net_ip: { get_param: [pcrf_sy_net_ips, 3] }
-      pcrf_sy_net_mask: { get_param: pcrf_sy_net_mask }
-      pcrf_rx_net_name: { get_param: pcrf_rx_net_name }
-      pcrf_rx_net_ip: { get_param: [pcrf_rx_net_ips, 3] }
-      pcrf_rx_net_mask: { get_param: pcrf_rx_net_mask }
-      pcrf_sd_net_name: { get_param: pcrf_sd_net_name }
-      pcrf_sd_net_ip: { get_param: [pcrf_sd_net_ips, 3] }
-      pcrf_sd_net_mask: { get_param: pcrf_sd_net_mask }
-      pcrf_sgi_sy_net_name: { get_param: pcrf_sgi_sy_net_name }
-      pcrf_sgi_sy_net_ip: { get_param: [pcrf_sgi_sy_net_ips, 3] }
-      pcrf_sgi_sy_net_mask: { get_param: pcrf_sgi_sy_net_mask }
-      pcrf_vnf_id: {get_param: pcrf_vnf_id}
diff --git a/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/simpleNotif-V5/artifacts/hot-nimbus-ppd_v1.1.env b/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/simpleNotif-V5/artifacts/hot-nimbus-ppd_v1.1.env
deleted file mode 100644
index 10697bc..0000000
--- a/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/simpleNotif-V5/artifacts/hot-nimbus-ppd_v1.1.env
+++ /dev/null
@@ -1,35 +0,0 @@
-parameters:
-  pcrf_ppd_server_names: ZRDM1PCRF01PPD001,ZRDM1PCRF01PPD002,ZRDM1PCRF01PPD003,ZRDM1PCRF01PPD004
-  pcrf_ppd_image_name: PCRF_8.995-ATTM1.0.3.qcow2
-  pcrf_ppd_flavor_name: lc.4xlarge4
-  availabilityzone_name: nova
-  pcrf_cps_net_name: Mobisupport-25193-I-INT1_int_pcrf_net_0
-  pcrf_cps_net_ips: 172.26.16.3,172.26.16.4,172.26.16.5,172.26.16.6
-  pcrf_lb_internal_vip: 172.26.16.114
-  pcrf_cps_net_mask: 255.255.255.0
-  pcrf_oam_net_name: MNS-25180-L-01_oam_protected_net_0
-  pcrf_oam_net_ips: 107.239.64.113,107.239.64.114,107.239.64.115,107.239.64.116
-  pcrf_lb_management_vip: 107.239.64.123
-  pcrf_oam_net_gw: 107.239.64.1
-  pcrf_oam_net_mask: 255.255.248.0
-  pcrf_gx_net_name: Mobisupport-25193-I-INT1_cor_pcrf_gx_net_0
-  pcrf_gx_net_ips: 107.239.24.67,107.239.24.68,107.239.24.69,107.239.24.70
-  pcrf_gx_net_mask: 255.255.255.248
-  pcrf_sp_net_name: Mobisupport-25193-I-INT1_cor_pcrf_sp_net_0
-  pcrf_sp_net_ips: 107.239.24.75,107.239.24.76,107.239.24.77,107.239.24.78
-  pcrf_sp_net_mask: 255.255.255.248
-  pcrf_sy_net_name: Mobisupport-25193-I-INT1_cor_pcrf_sy_net_0
-  pcrf_sy_net_ips: 107.239.24.83,107.239.24.84,107.239.24.85,107.239.24.86
-  pcrf_sy_net_mask: 255.255.255.248
-  pcrf_rx_net_name: Mobisupport-25193-I-INT1_cor_pcrf_rx_net_0
-  pcrf_rx_net_ips: 107.239.24.91,107.239.24.92,107.239.24.93,107.239.24.94
-  pcrf_rx_net_mask: 255.255.255.248
-  pcrf_sd_net_name: Mobisupport-25193-I-INT1_cor_pcrf_sd_net_0
-  pcrf_sd_net_ips: 107.239.24.99,107.239.24.100,107.239.24.101,107.239.24.102
-  pcrf_sd_net_mask: 255.255.255.248
-  pcrf_sgi_sy_net_name: Mobisupport-25193-I-INT1_sgi_pcrf_sy_net_0
-  pcrf_sgi_sy_net_ips: 107.239.26.131,107.239.26.132,107.239.26.133,107.239.26.134
-  pcrf_sgi_sy_net_mask: 255.255.255.248
-  pcrf_security_group_name: nimbus_security_group
-  pcrf_vnf_id: 730797234b4a40aa99335157b02871cd
-
diff --git a/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/simpleNotif-V5/artifacts/hot-nimbus-pps_v1.0.env b/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/simpleNotif-V5/artifacts/hot-nimbus-pps_v1.0.env
deleted file mode 100644
index 18c064c..0000000
--- a/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/simpleNotif-V5/artifacts/hot-nimbus-pps_v1.0.env
+++ /dev/null
@@ -1,11 +0,0 @@
-parameters:
-  pcrf_pps_server_names: ZRDM1PCRF01PPS001,ZRDM1PCRF01PPS002,ZRDM1PCRF01PPS003,ZRDM1PCRF01PPS004,ZRDM1PCRF01PPS005,ZRDM1PCRF01PPS006
-  pcrf_pps_image_name: PCRF_8.995-ATTM1.0.3.qcow2
-  pcrf_pps_flavor_name: lc.3xlarge
-  availabilityzone_name: nova
-  pcrf_cps_net_name: Mobisupport-25193-I-INT1_int_pcrf_net_0
-  pcrf_cps_net_ips: 172.26.16.7,172.26.16.8,172.26.16.9,172.26.16.10,172.26.16.11,172.26.16.12
-  pcrf_cps_net_mask: 255.255.255.0
-  pcrf_security_group_name: nimbus_security_group
-  pcrf_vnf_id: 730797234b4a40aa99335157b02871cd
-
diff --git a/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/simpleNotif-V5/artifacts/hot-nimbus-pps_v1.0.yaml b/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/simpleNotif-V5/artifacts/hot-nimbus-pps_v1.0.yaml
deleted file mode 100644
index 0fadd00..0000000
--- a/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/simpleNotif-V5/artifacts/hot-nimbus-pps_v1.0.yaml
+++ /dev/null
@@ -1,121 +0,0 @@
-heat_template_version: 2013-05-23
-
-description: heat template that creates PCRF Policy Server stack
-
-parameters:
-  pcrf_pps_server_names:
-    type: comma_delimited_list
-    label: PCRF PS server names
-    description: PCRF PS server names
-  pcrf_pps_image_name:
-    type: string
-    label: PCRF PS image name
-    description: PCRF PS image name
-  pcrf_pps_flavor_name:
-    type: string
-    label: PCRF PS flavor name
-    description: flavor name of PCRF PS instance
-  availabilityzone_name:
-    type: string
-    label: availabilityzone name
-    description: availabilityzone name
-  pcrf_cps_net_name:
-    type: string
-    label: CPS network name
-    description: CPS network name
-  pcrf_cps_net_ips:
-    type: comma_delimited_list
-    label: CPS network ips
-    description: CPS network ips
-  pcrf_cps_net_mask:
-    type: string
-    label: CPS network mask
-    description: CPS network mask
-  pcrf_security_group_name:
-    type: string
-    label: security group name
-    description: the name of security group
-  pcrf_vnf_id:
-    type: string
-    label: PCRF VNF Id
-    description: PCRF VNF Id
-
-resources:
-  server_pcrf_pps_001:
-    type: nested-pps_v1.0.yaml
-    properties:
-      pcrf_pps_server_name: { get_param: [pcrf_pps_server_names, 0] }
-      pcrf_pps_image_name: { get_param: pcrf_pps_image_name }
-      pcrf_pps_flavor_name: { get_param: pcrf_pps_flavor_name }
-      availabilityzone_name: { get_param: availabilityzone_name }
-      pcrf_security_group_name: { get_param: pcrf_security_group_name }
-      pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
-      pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 0] }
-      pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
-      pcrf_vnf_id: {get_param: pcrf_vnf_id}
-
-  server_pcrf_pps_002:
-    type: nested-pps_v1.0.yaml
-    properties:
-      pcrf_pps_server_name: { get_param: [pcrf_pps_server_names, 1] }
-      pcrf_pps_image_name: { get_param: pcrf_pps_image_name }
-      pcrf_pps_flavor_name: { get_param: pcrf_pps_flavor_name }
-      availabilityzone_name: { get_param: availabilityzone_name }
-      pcrf_security_group_name: { get_param: pcrf_security_group_name }
-      pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
-      pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 1] }
-      pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
-      pcrf_vnf_id: {get_param: pcrf_vnf_id}
-
-  server_pcrf_pps_003:
-    type: nested-pps_v1.0.yaml
-    properties:
-      pcrf_pps_server_name: { get_param: [pcrf_pps_server_names, 2] }
-      pcrf_pps_image_name: { get_param: pcrf_pps_image_name }
-      pcrf_pps_flavor_name: { get_param: pcrf_pps_flavor_name }
-      availabilityzone_name: { get_param: availabilityzone_name }
-      pcrf_security_group_name: { get_param: pcrf_security_group_name }
-      pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
-      pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 2] }
-      pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
-      pcrf_vnf_id: {get_param: pcrf_vnf_id}
-
-  server_pcrf_pps_004:
-    type: nested-pps_v1.0.yaml
-    properties:
-      pcrf_pps_server_name: { get_param: [pcrf_pps_server_names, 3] }
-      pcrf_pps_image_name: { get_param: pcrf_pps_image_name }
-      pcrf_pps_flavor_name: { get_param: pcrf_pps_flavor_name }
-      availabilityzone_name: { get_param: availabilityzone_name }
-      pcrf_security_group_name: { get_param: pcrf_security_group_name }
-      pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
-      pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 3] }
-      pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
-      pcrf_vnf_id: {get_param: pcrf_vnf_id}
-
-  server_pcrf_pps_005:
-    type: nested-pps_v1.0.yaml
-    properties:
-      pcrf_pps_server_name: { get_param: [pcrf_pps_server_names, 4] }
-      pcrf_pps_image_name: { get_param: pcrf_pps_image_name }
-      pcrf_pps_flavor_name: { get_param: pcrf_pps_flavor_name }
-      availabilityzone_name: { get_param: availabilityzone_name }
-      pcrf_security_group_name: { get_param: pcrf_security_group_name }
-      pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
-      pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 4] }
-      pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
-      pcrf_vnf_id: {get_param: pcrf_vnf_id}
-
-  server_pcrf_pps_006:
-    type: nested-pps_v1.0.yaml
-    properties:
-      pcrf_pps_server_name: { get_param: [pcrf_pps_server_names, 5] }
-      pcrf_pps_image_name: { get_param: pcrf_pps_image_name }
-      pcrf_pps_flavor_name: { get_param: pcrf_pps_flavor_name }
-      availabilityzone_name: { get_param: availabilityzone_name }
-      pcrf_security_group_name: { get_param: pcrf_security_group_name }
-      pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
-      pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 5] }
-      pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
-      pcrf_vnf_id: {get_param: pcrf_vnf_id}
-
diff --git a/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/simpleNotif-V5/artifacts/hot-nimbus-psm_v1.0.env b/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/simpleNotif-V5/artifacts/hot-nimbus-psm_v1.0.env
deleted file mode 100644
index 95e450e..0000000
--- a/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/simpleNotif-V5/artifacts/hot-nimbus-psm_v1.0.env
+++ /dev/null
@@ -1,10 +0,0 @@
-parameters:
-  pcrf_psm_server_names: ZRDM1PCRF01PSM001,ZRDM1PCRF01PSM002,ZRDM1PCRF01PSM003,ZRDM1PCRF01PSM004,ZRDM1PCRF01PSM005,ZRDM1PCRF01PSM006,ZRDM1PCRF01PSM007,ZRDM1PCRF01PSM008,ZRDM1PCRF01PSM009,ZRDM1PCRF01PSM010,ZRDM1PCRF01PSM011,ZRDM1PCRF01PSM012
-  pcrf_psm_image_name: PCRF_8.995-ATTM1.0.3.qcow2
-  pcrf_psm_flavor_name: lc.4xlarge4
-  availabilityzone_name: nova
-  pcrf_cps_net_name: Mobisupport-25193-I-INT1_int_pcrf_net_0
-  pcrf_cps_net_ips: 172.26.16.63,172.26.16.64,172.26.16.65,172.26.16.66,172.26.16.67,172.26.16.68,172.26.16.69,172.26.16.70,172.26.16.71,172.26.16.72,172.26.16.73,172.26.16.74
-  pcrf_cps_net_mask: 255.255.255.0
-  pcrf_security_group_name: nimbus_security_group
-  pcrf_vnf_id: 730797234b4a40aa99335157b02871cd
diff --git a/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/simpleNotif-V5/artifacts/hot-nimbus-psm_v1.0.yaml b/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/simpleNotif-V5/artifacts/hot-nimbus-psm_v1.0.yaml
deleted file mode 100644
index 217b0fe..0000000
--- a/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/simpleNotif-V5/artifacts/hot-nimbus-psm_v1.0.yaml
+++ /dev/null
@@ -1,199 +0,0 @@
-heat_template_version: 2013-05-23
-
-description: heat template that creates PCRF Session Manager stack
-
-parameters:
-  pcrf_psm_server_names:
-    type: comma_delimited_list
-    label: PCRF SM server names
-    description: name of the PCRF SM instance
-  pcrf_psm_image_name:
-    type: string
-    label: PCRF SM image name
-    description: PCRF SM image name
-  pcrf_psm_flavor_name:
-    type: string
-    label: PCRF SM flavor name
-    description: flavor name of PCRF SM instance 
-  availabilityzone_name:
-    type: string
-    label: availabilityzone name
-    description: availabilityzone name
-  pcrf_cps_net_name:
-    type: string
-    label: CPS network name
-    description: CPS network name
-  pcrf_cps_net_ips:
-    type: comma_delimited_list
-    label: CPS network ips
-    description: CPS network ips
-  pcrf_cps_net_mask:
-    type: string
-    label: CPS network mask
-    description: CPS network mask
-  pcrf_security_group_name:
-    type: string
-    label: security group name
-    description: the name of security group
-  pcrf_vnf_id:
-    type: string
-    label: PCRF VNF Id
-    description: PCRF VNF Id
-
-resources:
-  server_pcrf_psm_001:
-    type: nested-psm_v1.0.yaml
-    properties:
-      pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 0] }
-      pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
-      pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
-      availabilityzone_name: { get_param: availabilityzone_name }
-      pcrf_security_group_name: { get_param: pcrf_security_group_name }
-      pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
-      pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 0] }
-      pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
-      pcrf_vnf_id: {get_param: pcrf_vnf_id}
-
-  server_pcrf_psm_002:
-    type: nested-psm_v1.0.yaml
-    properties:
-      pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 1] }
-      pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
-      pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
-      availabilityzone_name: { get_param: availabilityzone_name }
-      pcrf_security_group_name: { get_param: pcrf_security_group_name }
-      pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
-      pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 1] }
-      pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
-      pcrf_vnf_id: {get_param: pcrf_vnf_id}
-
-  server_pcrf_psm_003:
-    type: nested-psm_v1.0.yaml
-    properties:
-      pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 2] }
-      pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
-      pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
-      availabilityzone_name: { get_param: availabilityzone_name }
-      pcrf_security_group_name: { get_param: pcrf_security_group_name }
-      pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
-      pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 2] }
-      pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
-      pcrf_vnf_id: {get_param: pcrf_vnf_id}
-
-  server_pcrf_psm_004:
-    type: nested-psm_v1.0.yaml
-    properties:
-      pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 3] }
-      pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
-      pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
-      availabilityzone_name: { get_param: availabilityzone_name }
-      pcrf_security_group_name: { get_param: pcrf_security_group_name }
-      pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
-      pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 3] }
-      pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
-      pcrf_vnf_id: {get_param: pcrf_vnf_id}
-
-  server_pcrf_psm_005:
-    type: nested-psm_v1.0.yaml
-    properties:
-      pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 4] }
-      pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
-      pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
-      availabilityzone_name: { get_param: availabilityzone_name }
-      pcrf_security_group_name: { get_param: pcrf_security_group_name }
-      pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
-      pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 4] }
-      pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
-      pcrf_vnf_id: {get_param: pcrf_vnf_id}
-
-  server_pcrf_psm_006:
-    type: nested-psm_v1.0.yaml
-    properties:
-      pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 5] }
-      pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
-      pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
-      availabilityzone_name: { get_param: availabilityzone_name }
-      pcrf_security_group_name: { get_param: pcrf_security_group_name }
-      pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
-      pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 5] }
-      pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
-      pcrf_vnf_id: {get_param: pcrf_vnf_id}
-
-  server_pcrf_psm_007:
-    type: nested-psm_v1.0.yaml
-    properties:
-      pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 6] }
-      pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
-      pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
-      availabilityzone_name: { get_param: availabilityzone_name }
-      pcrf_security_group_name: { get_param: pcrf_security_group_name }
-      pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
-      pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 6] }
-      pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
-      pcrf_vnf_id: {get_param: pcrf_vnf_id}
-
-  server_pcrf_psm_008:
-    type: nested-psm_v1.0.yaml
-    properties:
-      pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 7] }
-      pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
-      pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
-      availabilityzone_name: { get_param: availabilityzone_name }
-      pcrf_security_group_name: { get_param: pcrf_security_group_name }
-      pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
-      pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 7] }
-      pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
-      pcrf_vnf_id: {get_param: pcrf_vnf_id}
-
-  server_pcrf_psm_009:
-    type: nested-psm_v1.0.yaml
-    properties:
-      pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 8] }
-      pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
-      pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
-      availabilityzone_name: { get_param: availabilityzone_name }
-      pcrf_security_group_name: { get_param: pcrf_security_group_name }
-      pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
-      pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 8] }
-      pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
-      pcrf_vnf_id: {get_param: pcrf_vnf_id}
-
-  server_pcrf_psm_010:
-    type: nested-psm_v1.0.yaml
-    properties:
-      pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 9] }
-      pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
-      pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
-      availabilityzone_name: { get_param: availabilityzone_name }
-      pcrf_security_group_name: { get_param: pcrf_security_group_name }
-      pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
-      pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 9] }
-      pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
-      pcrf_vnf_id: {get_param: pcrf_vnf_id}
-
-  server_pcrf_psm_011:
-    type: nested-psm_v1.0.yaml
-    properties:
-      pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 10] }
-      pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
-      pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
-      availabilityzone_name: { get_param: availabilityzone_name }
-      pcrf_security_group_name: { get_param: pcrf_security_group_name }
-      pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
-      pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 10] }
-      pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
-      pcrf_vnf_id: {get_param: pcrf_vnf_id}
-
-  server_pcrf_psm_012:
-    type: nested-psm_v1.0.yaml
-    properties:
-      pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 11] }
-      pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
-      pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
-      availabilityzone_name: { get_param: availabilityzone_name }
-      pcrf_security_group_name: { get_param: pcrf_security_group_name }
-      pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
-      pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 11] }
-      pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
-      pcrf_vnf_id: {get_param: pcrf_vnf_id}
- 
diff --git a/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/simpleNotif-V5/artifacts/hot-nimbus-swift-container_v1.0.env b/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/simpleNotif-V5/artifacts/hot-nimbus-swift-container_v1.0.env
deleted file mode 100644
index 5267ee4..0000000
--- a/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/simpleNotif-V5/artifacts/hot-nimbus-swift-container_v1.0.env
+++ /dev/null
@@ -1,3 +0,0 @@
-parameters:
-  pcrf_swift_container_name_1: PCRF_Config_Container_1
-  pcrf_swift_container_purge_on_delete_flag_1: false
diff --git a/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/simpleNotif-V5/artifacts/hot-nimbus-swift-container_v1.0.yaml b/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/simpleNotif-V5/artifacts/hot-nimbus-swift-container_v1.0.yaml
deleted file mode 100644
index ab427bb..0000000
--- a/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/simpleNotif-V5/artifacts/hot-nimbus-swift-container_v1.0.yaml
+++ /dev/null
@@ -1,30 +0,0 @@
-heat_template_version: 2013-05-23
-
-description: heat template that creates PCRF Session Manager stack
-
-parameters:
-   pcrf_swift_container_name_1:
-     type: string
-     label: Swift Container name
-     description: Swift Container Name
-   pcrf_swift_container_purge_on_delete_flag_1:
-     type: boolean
-     label: Purge on Delete Flag
-     description: Purge on Delete Flag
-
-resources:
-  pcrf_swift_container_1:
-    type: OS::Swift::Container
-    properties:
-      name: { get_param: pcrf_swift_container_name_1 }
-      PurgeOnDelete: { get_param: pcrf_swift_container_purge_on_delete_flag_1 }
-      X-Container-Read: ".r:*"
-     
-outputs:
-  pcrf_swift_container_id_1:
-    description: the pcrf_swift_container_1 id
-    value: { get_resource: pcrf_swift_container_1 }
-  pcrf_swift_container_url_1:
-    description: the pcrf_swift_container_1 url
-    value: { get_attr: [ pcrf_swift_container_1, WebsiteURL ] }
-    
\ No newline at end of file
diff --git a/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/simpleNotif-V5/artifacts/mount_iso_script.sh b/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/simpleNotif-V5/artifacts/mount_iso_script.sh
deleted file mode 100644
index 91df598..0000000
--- a/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/simpleNotif-V5/artifacts/mount_iso_script.sh
+++ /dev/null
@@ -1,34 +0,0 @@
-#!/bin/bash
-
-#. .config 
-#following would be in the .config file
- device_name="/dev/vde"
- install_script="install_nimbus.sh"
- enable_logic_flag_file=".flag"
-#end of config file
-
-#get the semaphore, 0 - disbaled, 1- enabled
-flag=$(cat ${enable_logic_flag_file})
-
-#check if device is mounted already
-test=$(mount | grep ${device_name})
-if [ "$flag" == "1" ]; then
-	if [ -e ${device_name} ] && [ ! "${test}" ]; then
-		#mount the iso image
-		mount -t iso9660 -v -o loop /dev/vde/ /mnt/iso
-		#if availabe run the install script (it contains the install.sh steps)
-		if [ -e "${install_script}" ] && [ -f "${install_script}" ]; then
-			${install_script}
-		fi
-		#disable the script from attempting to 
-		#  mount and run install again until needed;
-		echo "0" > ${enable_logic_flag_file}
-		#if nedeed add step to comment out the crontab line here;
-	fi
-else
-	echo "Auto mounting ISO & run install logic disabled!"
-fi
-
-#cron job
-# * * * * * /mount_iso_script.sh
-
diff --git a/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/simpleNotif-V5/artifacts/nested-oam_v1.0.yaml b/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/simpleNotif-V5/artifacts/nested-oam_v1.0.yaml
deleted file mode 100644
index fa3b04e..0000000
--- a/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/simpleNotif-V5/artifacts/nested-oam_v1.0.yaml
+++ /dev/null
@@ -1,156 +0,0 @@
-heat_template_version: 2013-05-23
-
-description: nested heat template that creates a PCRF OAM node stack
-
-parameters:
-  pcrf_oam_server_name:
-    type: string
-    label: PCRF OAM server name
-    description: PCRF OAM server name
-  pcrf_oam_image_name:
-    type: string
-    label: image name
-    description: PCRF OAM image name
-  pcrf_oam_flavor_name:
-    type: string
-    label: PCRF OAM flavor name
-    description: flavor name of PCRF OAM instance
-  availabilityzone_name:
-    type: string
-    label: availabilityzone name
-    description: availabilityzone name
-  pcrf_cps_net_name:
-    type: string
-    label: CPS network name
-    description: CPS network name
-  pcrf_cps_net_ip:
-    type: string
-    label: CPS network ip
-    description: CPS network ip
-  pcrf_cps_net_mask:
-    type: string
-    label: CPS network mask
-    description: CPS network mask
-  pcrf_arbiter_vip:
-    type: string
-    label: OAM Arbiter LB VIP
-    description: OAM Arbiter LB VIP
-  pcrf_oam_net_name:
-    type: string
-    label: OAM network name
-    description: OAM network name
-  pcrf_oam_net_ip:
-    type: string
-    label: OAM network ip
-    description: OAM network ip
-  pcrf_oam_net_gw:
-    type: string
-    label: CPS network gateway
-    description: CPS network gateway
-  pcrf_oam_net_mask:
-    type: string
-    label: CPS network mask
-    description: CPS network mask
-  pcrf_oam_volume_id:
-    type: string
-    label: CPS OAM Cinder Volume
-    description: CPS OAM Cinder Volume
-  pcrf_security_group_name:
-    type: string
-    label: security group name
-    description: the name of security group
-  pcrf_vnf_id:
-    type: string
-    label: PCRF VNF Id
-    description: PCRF VNF Id
-
-resources:
-  network:
-    type: OS::Heat::CloudConfig
-    properties:
-      cloud_config:
-        write_files:
-          - path: /etc/sysconfig/network-scripts/ifcfg-eth0
-            permissions: "0644"
-            content:
-              str_replace:
-                template: { get_file: nimbus-ethernet }
-                params:
-                  $dev: eth0
-                  $ip: { get_param: pcrf_cps_net_ip }
-                  $netmask: { get_param: pcrf_cps_net_mask }
-          - path: /etc/sysconfig/network-scripts/ifcfg-eth1
-            permissions: "0644"
-            content:
-              str_replace:
-                template: { get_file: nimbus-ethernet-gw }
-                params:
-                  $dev: eth1
-                  $ip: { get_param: pcrf_oam_net_ip }
-                  $netmask: { get_param: pcrf_oam_net_mask }
-                  $gateway: { get_param: pcrf_oam_net_gw }
-        runcmd:
-          - ifdown eth0 && ifup eth0
-          - ifdown eth1 && ifup eth1
-  script_init:
-    type: OS::Heat::SoftwareConfig
-    properties:
-      group: ungrouped
-      config:
-        str_replace:
-          template: { get_file: cloud-nimbus.sh }
-          params:
-            $vm_name: { get_param: pcrf_oam_server_name }
-  pcrf_server_init:
-    type: OS::Heat::MultipartMime
-    properties:
-      parts:
-      - config: { get_resource: network}
-      - config: { get_resource: script_init}
-
-  pcrf_server_oam:
-    type: OS::Nova::Server
-    properties:
-      config_drive: "True"
-      name: { get_param: pcrf_oam_server_name }
-      image: { get_param: pcrf_oam_image_name }
-      flavor: { get_param: pcrf_oam_flavor_name }
-      availability_zone: { get_param: availabilityzone_name }
-      networks:
-        - port: { get_resource: pcrf_oam_port_0}
-        - port: { get_resource: pcrf_oam_port_1}
-      user_data_format: RAW
-      user_data:
-        get_resource: pcrf_server_init
-      metadata:
-        vnf_id: {get_param: pcrf_vnf_id}
-  
-  pcrf_oam_port_0:
-    type: OS::Neutron::Port
-    properties:
-      network: { get_param: pcrf_cps_net_name }
-      fixed_ips:
-        - ip_address: { get_param: pcrf_cps_net_ip }
-      allowed_address_pairs:
-        - ip_address: { get_param: pcrf_arbiter_vip }
-      security_groups: [{ get_param: pcrf_security_group_name }]
-
-  pcrf_oam_port_1:
-    type: OS::Neutron::Port
-    properties:
-      network: { get_param: pcrf_oam_net_name }
-      fixed_ips:
-        - ip_address: { get_param: pcrf_oam_net_ip }
-      security_groups: [{ get_param: pcrf_security_group_name }]
-
-  pcrf_oam_vol_attachment:
-    type: OS::Cinder::VolumeAttachment
-    properties:
-      volume_id: { get_param: pcrf_oam_volume_id }
-      mountpoint: /dev/vdd
-      instance_uuid: { get_resource: pcrf_server_oam }
-
-outputs:
-  pcrf_oam_vol_attachment_id:
-    description: the pcrf_oam_vol_attachment_id id
-    value: { get_resource: pcrf_oam_vol_attachment }
diff --git a/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/simpleNotif-V5/artifacts/nested-pcm_v1.0.yaml b/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/simpleNotif-V5/artifacts/nested-pcm_v1.0.yaml
deleted file mode 100644
index a3129bb..0000000
--- a/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/simpleNotif-V5/artifacts/nested-pcm_v1.0.yaml
+++ /dev/null
@@ -1,150 +0,0 @@
-heat_template_version: 2013-05-23
-
-description: heat template that creates PCRF Cluman stack
-
-parameters:
-  pcrf_pcm_server_name:
-    type: string
-    label: PCRF CM server name
-    description: PCRF CM server name
-  pcrf_pcm_image_name:
-    type: string
-    label: image name
-    description: PCRF CM image name
-  pcrf_pcm_flavor_name:
-    type: string
-    label: PCRF CM flavor name
-    description: flavor name of PCRF CM instance
-  availabilityzone_name:
-    type: string
-    label: availabilityzone name
-    description: availabilityzone name
-  pcrf_cps_net_name:
-    type: string
-    label: CPS network name
-    description: CPS network name
-  pcrf_cps_net_ip:
-    type: string
-    label: CPS network ip
-    description: CPS network ip
-  pcrf_cps_net_mask:
-    type: string
-    label: CPS network mask
-    description: CPS network mask
-  pcrf_oam_net_name:
-    type: string
-    label: OAM network name
-    description: OAM network name
-  pcrf_oam_net_ip:
-    type: string
-    label: OAM network ip
-    description: OAM network ip
-  pcrf_oam_net_gw:
-    type: string
-    label: CPS network gateway
-    description: CPS network gateway
-  pcrf_oam_net_mask:
-    type: string
-    label: CPS network mask
-    description: CPS network mask
-  pcrf_pcm_volume_id:
-    type: string
-    label: CPS Cluman Cinder Volume
-    description: CPS Cluman Cinder Volume
-  pcrf_security_group_name:
-    type: string
-    label: security group name
-    description: the name of security group
-  pcrf_vnf_id:
-    type: string
-    label: PCRF VNF Id
-    description: PCRF VNF Id
-
-resources:
-  network:
-    type: OS::Heat::CloudConfig
-    properties:
-      cloud_config:
-        write_files:
-          - path: /etc/sysconfig/network-scripts/ifcfg-eth0
-            permissions: "0644"
-            content:
-              str_replace:
-                template: { get_file: nimbus-ethernet }
-                params:
-                  $dev: eth0
-                  $ip: { get_param: pcrf_cps_net_ip }
-                  $netmask: { get_param: pcrf_cps_net_mask }
-          - path: /etc/sysconfig/network-scripts/ifcfg-eth1
-            permissions: "0644"
-            content:
-              str_replace:
-                template: { get_file: nimbus-ethernet-gw }
-                params:
-                  $dev: eth1
-                  $ip: { get_param: pcrf_oam_net_ip }
-                  $netmask: { get_param: pcrf_oam_net_mask }
-                  $gateway: { get_param: pcrf_oam_net_gw }
-        runcmd:
-          - ifdown eth0 && ifup eth0
-          - ifdown eth1 && ifup eth1
-  script_init:
-    type: OS::Heat::SoftwareConfig
-    properties:
-      group: ungrouped
-      config:
-        str_replace:
-          template: { get_file: cloud-nimbus.sh }
-          params:
-            $vm_name: { get_param: pcrf_pcm_server_name }
-  pcrf_server_init:
-    type: OS::Heat::MultipartMime
-    properties:
-      parts:
-      - config: { get_resource: network}
-      - config: { get_resource: script_init}
-
-  pcrf_server_pcm:
-    type: OS::Nova::Server
-    properties:
-      config_drive: "True"
-      name: { get_param: pcrf_pcm_server_name }
-      image: { get_param: pcrf_pcm_image_name }
-      flavor: { get_param: pcrf_pcm_flavor_name }
-      availability_zone: { get_param: availabilityzone_name }
-      networks:
-        - port: { get_resource: pcrf_pcm_port_0}
-        - port: { get_resource: pcrf_pcm_port_1}
-      user_data_format: RAW
-      user_data:
-        get_resource: pcrf_server_init
-      metadata:
-        vnf_id: {get_param: pcrf_vnf_id}
-
-  pcrf_pcm_port_0:
-    type: OS::Neutron::Port
-    properties:
-      network: { get_param: pcrf_cps_net_name }
-      fixed_ips:
-        - ip_address: { get_param: pcrf_cps_net_ip }
-      security_groups: [{ get_param: pcrf_security_group_name }]
-
-  pcrf_pcm_port_1:
-    type: OS::Neutron::Port
-    properties:
-      network: { get_param: pcrf_oam_net_name }
-      fixed_ips:
-        - ip_address: { get_param: pcrf_oam_net_ip }
-      security_groups: [{ get_param: pcrf_security_group_name }]
-
-  volume_attachment:
-    type: OS::Cinder::VolumeAttachment
-    properties:
-      volume_id: { get_param: pcrf_pcm_volume_id }
-      mountpoint: /dev/vdd
-      instance_uuid: { get_resource: pcrf_server_pcm }
-
-outputs:
-  pcrf_server_pcm_id:
-    description: the pcm server id
-    value: { get_resource: pcrf_server_pcm }
\ No newline at end of file
diff --git a/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/simpleNotif-V5/artifacts/nested-ppd_v1.0.yaml b/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/simpleNotif-V5/artifacts/nested-ppd_v1.0.yaml
deleted file mode 100644
index 169522b..0000000
--- a/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/simpleNotif-V5/artifacts/nested-ppd_v1.0.yaml
+++ /dev/null
@@ -1,333 +0,0 @@
-heat_template_version: 2013-05-23
-
-description: heat template that creates PCRF Policy Director stack
-
-parameters:
-  pcrf_ppd_server_name:
-    type: string
-    label: PCRF PD server name
-    description: PCRF PD server name
-  pcrf_ppd_image_name:
-    type: string
-    label: image name
-    description: PCRF PD image name
-  pcrf_ppd_flavor_name:
-    type: string
-    label: PCRF PD flavor name
-    description: flavor name of PCRF PD instance
-  availabilityzone_name:
-    type: string
-    label: availabilityzone name
-    description: availabilityzone name
-  pcrf_cps_net_name:
-    type: string
-    label: CPS network name
-    description: CPS network name
-  pcrf_cps_net_ip:
-    type: string
-    label: CPS network ip
-    description: CPS network ip
-  pcrf_cps_net_mask:
-    type: string
-    label: CPS network mask
-    description: CPS network mask
-  pcrf_lb_internal_vip:
-    type: string
-    label: CPS Internal LB VIP
-    description: CPS Internal LB VIP
-  pcrf_oam_net_name:
-    type: string
-    label: OAM network name
-    description: OAM network name
-  pcrf_oam_net_ip:
-    type: string
-    label: OAM network ip
-    description: OAM network ip
-  pcrf_oam_net_gw:
-    type: string
-    label: CPS network gateway
-    description: CPS network gateway
-  pcrf_oam_net_mask:
-    type: string
-    label: CPS network mask
-    description: CPS network mask
-  pcrf_lb_management_vip:
-    type: string
-    label: CPS OAM LB VIP
-    description: CPS OAM LB VIP
-  pcrf_gx_net_name:
-    type: string
-    label: Gx network name
-    description: Gx network name
-  pcrf_gx_net_ip:
-    type: string
-    label: Gx network ip
-    description: Gx network ip
-  pcrf_gx_net_mask:
-    type: string
-    label: Gx network mask
-    description: Gx network mask
-  pcrf_sp_net_name:
-    type: string
-    label: Sp network name
-    description: Sp network name
-  pcrf_sp_net_ip:
-    type: string
-    label: Sp network ip
-    description: Sp network ip
-  pcrf_sp_net_mask:
-    type: string
-    label: Sp network mask
-    description: Sp network mask
-  pcrf_sy_net_name:
-    type: string
-    label: Sy network name
-    description: Sy network name
-  pcrf_sy_net_ip:
-    type: string
-    label: Sy network ip
-    description: Sy network ip
-  pcrf_sy_net_mask:
-    type: string
-    label: Sy network mask
-    description: Sy network mask
-  pcrf_rx_net_name:
-    type: string
-    label: Rx network name
-    description: Rx network name
-  pcrf_rx_net_ip:
-    type: string
-    label: Rx network ip
-    description: Rx network ip
-  pcrf_rx_net_mask:
-    type: string
-    label: Rx network mask
-    description: Rx network mask
-  pcrf_sd_net_name:
-    type: string
-    label: Sd network name
-    description: Sd network name
-  pcrf_sd_net_ip:
-    type: string
-    label: Sd network ip
-    description: Sd network ip
-  pcrf_sd_net_mask:
-    type: string
-    label: Sd network mask
-    description: Sd network mask
-  pcrf_sgi_sy_net_name:
-    type: string
-    label: Sgi Sy network name
-    description: Sgi Sy network name
-  pcrf_sgi_sy_net_ip:
-    type: string
-    label: Sgi Sy network ip
-    description: Sgi Sy network ip
-  pcrf_sgi_sy_net_mask:
-    type: string
-    label: Sgi Sy network mask
-    description: Sgi Sy network mask
-  pcrf_security_group_name:
-    type: string
-    label: security group name
-    description: the name of security group
-  pcrf_vnf_id:
-    type: string
-    label: PCRF VNF Id
-    description: PCRF VNF Id
-
-resources:
-  network:
-    type: OS::Heat::CloudConfig
-    properties:
-      cloud_config:
-        write_files:
-          - path: /etc/sysconfig/network-scripts/ifcfg-eth0
-            permissions: "0644"
-            content:
-              str_replace:
-                template: { get_file: nimbus-ethernet }
-                params:
-                  $dev: eth0
-                  $ip: { get_param: pcrf_cps_net_ip }
-                  $netmask: { get_param: pcrf_cps_net_mask }
-          - path: /etc/sysconfig/network-scripts/ifcfg-eth1
-            permissions: "0644"
-            content:
-              str_replace:
-                template: { get_file: nimbus-ethernet-gw }
-                params:
-                  $dev: eth1
-                  $ip: { get_param: pcrf_oam_net_ip }
-                  $netmask: { get_param: pcrf_oam_net_mask }
-                  $gateway: { get_param: pcrf_oam_net_gw }
-          - path: /etc/sysconfig/network-scripts/ifcfg-eth2
-            permissions: "0644"
-            content:
-              str_replace:
-                template: { get_file: nimbus-ethernet }
-                params:
-                  $dev: eth2
-                  $ip: { get_param: pcrf_gx_net_ip }
-                  $netmask: { get_param: pcrf_gx_net_mask }
-          - path: /etc/sysconfig/network-scripts/ifcfg-eth3
-            permissions: "0644"
-            content:
-              str_replace:
-                template: { get_file: nimbus-ethernet }
-                params:
-                  $dev: eth3
-                  $ip: { get_param: pcrf_sp_net_ip }
-                  $netmask: { get_param: pcrf_sp_net_mask }
-          - path: /etc/sysconfig/network-scripts/ifcfg-eth4
-            permissions: "0644"
-            content:
-              str_replace:
-                template: { get_file: nimbus-ethernet }
-                params:
-                  $dev: eth4
-                  $ip: { get_param: pcrf_sy_net_ip }
-                  $netmask: { get_param: pcrf_sy_net_mask }
-          - path: /etc/sysconfig/network-scripts/ifcfg-eth5
-            permissions: "0644"
-            content:
-              str_replace:
-                template: { get_file: nimbus-ethernet }
-                params:
-                  $dev: eth5
-                  $ip: { get_param: pcrf_rx_net_ip }
-                  $netmask: { get_param: pcrf_rx_net_mask }
-          - path: /etc/sysconfig/network-scripts/ifcfg-eth6
-            permissions: "0644"
-            content:
-              str_replace:
-                template: { get_file: nimbus-ethernet }
-                params:
-                  $dev: eth6
-                  $ip: { get_param: pcrf_sd_net_ip }
-                  $netmask: { get_param: pcrf_sd_net_mask }
-          - path: /etc/sysconfig/network-scripts/ifcfg-eth7
-            permissions: "0644"
-            content:
-              str_replace:
-                template: { get_file: nimbus-ethernet }
-                params:
-                  $dev: eth7
-                  $ip: { get_param: pcrf_sgi_sy_net_ip }
-                  $netmask: { get_param: pcrf_sgi_sy_net_mask }
-        runcmd:
-          - ifdown eth0 && ifup eth0
-          - ifdown eth1 && ifup eth1
-          - ifdown eth2 && ifup eth2
-          - ifdown eth3 && ifup eth3
-          - ifdown eth4 && ifup eth4
-          - ifdown eth5 && ifup eth5
-          - ifdown eth6 && ifup eth6
-          - ifdown eth7 && ifup eth7
-  script_init:
-    type: OS::Heat::SoftwareConfig
-    properties:
-      group: ungrouped
-      config:
-        str_replace:
-          template: { get_file: cloud-nimbus.sh }
-          params:
-            $vm_name: { get_param: pcrf_ppd_server_name }
-  pcrf_server_init:
-    type: OS::Heat::MultipartMime
-    properties:
-      parts:
-      - config: { get_resource: network}
-      - config: { get_resource: script_init}
-
-  pcrf_server_ppd: 
-    type: OS::Nova::Server
-    properties:
-      config_drive: "True"
-      name: { get_param: pcrf_ppd_server_name }
-      image: { get_param: pcrf_ppd_image_name }
-      flavor: { get_param: pcrf_ppd_flavor_name }
-      availability_zone: { get_param: availabilityzone_name }
-      networks:
-        - port: { get_resource: pcrf_ppd_port_0}
-        - port: { get_resource: pcrf_ppd_port_1}
-        - port: { get_resource: pcrf_ppd_port_2}
-        - port: { get_resource: pcrf_ppd_port_3}
-        - port: { get_resource: pcrf_ppd_port_4}
-        - port: { get_resource: pcrf_ppd_port_5}
-        - port: { get_resource: pcrf_ppd_port_6}
-        - port: { get_resource: pcrf_ppd_port_7}
-      user_data_format: RAW
-      user_data:
-        get_resource: pcrf_server_init
-      metadata:
-        vnf_id: {get_param: pcrf_vnf_id}
-
-  pcrf_ppd_port_0:
-    type: OS::Neutron::Port
-    properties:
-      network: { get_param: pcrf_cps_net_name }
-      fixed_ips:
-        - ip_address: { get_param: pcrf_cps_net_ip }
-      security_groups: [{ get_param: pcrf_security_group_name }]
-      allowed_address_pairs:
-        - ip_address: { get_param: pcrf_lb_internal_vip }
-
-  pcrf_ppd_port_1:
-    type: OS::Neutron::Port
-    properties:
-      network: { get_param: pcrf_oam_net_name }
-      fixed_ips:
-        - ip_address: { get_param: pcrf_oam_net_ip }
-      security_groups: [{ get_param: pcrf_security_group_name }]
-      allowed_address_pairs:
-        - ip_address: { get_param: pcrf_lb_management_vip } 
- 
-  pcrf_ppd_port_2:
-    type: OS::Neutron::Port
-    properties:
-      network: { get_param: pcrf_gx_net_name }
-      fixed_ips:
-        - ip_address: { get_param: pcrf_gx_net_ip }
-      security_groups: [{ get_param: pcrf_security_group_name }]
-
-  pcrf_ppd_port_3:
-    type: OS::Neutron::Port
-    properties:
-      network: { get_param: pcrf_sp_net_name }
-      fixed_ips:
-        - ip_address: { get_param: pcrf_sp_net_ip }
-      security_groups: [{ get_param: pcrf_security_group_name }]
-
-  pcrf_ppd_port_4:
-    type: OS::Neutron::Port
-    properties:
-      network: { get_param: pcrf_sy_net_name }
-      fixed_ips:
-        - ip_address: { get_param: pcrf_sy_net_ip }
-      security_groups: [{ get_param: pcrf_security_group_name }]
-
-  pcrf_ppd_port_5:
-    type: OS::Neutron::Port
-    properties:
-      network: { get_param: pcrf_rx_net_name }
-      fixed_ips:
-        - ip_address: { get_param: pcrf_rx_net_ip }
-      security_groups: [{ get_param: pcrf_security_group_name }]
-  
-  pcrf_ppd_port_6:
-    type: OS::Neutron::Port
-    properties:
-      network: { get_param: pcrf_sd_net_name }
-      fixed_ips:
-        - ip_address: { get_param: pcrf_sd_net_ip }
-      security_groups: [{ get_param: pcrf_security_group_name }]
-
-  pcrf_ppd_port_7:
-    type: OS::Neutron::Port
-    properties:
-      network: { get_param: pcrf_sgi_sy_net_name }
-      fixed_ips:
-        - ip_address: { get_param: pcrf_sgi_sy_net_ip }
-      security_groups: [{ get_param: pcrf_security_group_name }]
-
diff --git a/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/simpleNotif-V5/artifacts/nested-pps_v1.0.yaml b/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/simpleNotif-V5/artifacts/nested-pps_v1.0.yaml
deleted file mode 100644
index 8cb6e15..0000000
--- a/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/simpleNotif-V5/artifacts/nested-pps_v1.0.yaml
+++ /dev/null
@@ -1,99 +0,0 @@
-heat_template_version: 2013-05-23
-
-description: heat template that creates PCRF Policy Server stack
-
-parameters:
-  pcrf_pps_server_name:
-    type: string
-    label: PCRF PS server name
-    description: PCRF PS server name
-  pcrf_pps_image_name:
-    type: string
-    label: PCRF PS image name
-    description: PCRF PS image name
-  pcrf_pps_flavor_name:
-    type: string
-    label: PCRF PS flavor name
-    description: flavor name of PCRF PS instance
-  availabilityzone_name:
-    type: string
-    label: availabilityzone name
-    description: availabilityzone name
-  pcrf_cps_net_name:
-    type: string
-    label: CPS network name
-    description: CPS network name
-  pcrf_cps_net_ip:
-    type: string
-    label: CPS network ip
-    description: CPS network ip
-  pcrf_cps_net_mask:
-    type: string
-    label: CPS network mask
-    description: CPS network mask
-  pcrf_security_group_name:
-    type: string
-    label: security group name
-    description: the name of security group
-  pcrf_vnf_id:
-    type: string
-    label: PCRF VNF Id
-    description: PCRF VNF Id
-
-resources:
-  script_init:
-    type: OS::Heat::SoftwareConfig
-    properties:
-      group: ungrouped
-      config:
-        str_replace:
-          template: { get_file: cloud-nimbus.sh }
-          params:
-            $vm_name: { get_param: pcrf_pps_server_name }
-  network:
-    type: OS::Heat::CloudConfig
-    properties:
-      cloud_config:
-        write_files:
-          - path: /etc/sysconfig/network-scripts/ifcfg-eth0
-            permissions: "0644"
-            content:
-              str_replace:
-                template: { get_file: nimbus-ethernet }
-                params:
-                  $dev: eth0
-                  $ip: { get_param: pcrf_cps_net_ip }
-                  $netmask: { get_param: pcrf_cps_net_mask }
-        runcmd:
-          - ifdown eth0 && ifup eth0
-
-  pcrf_server_init:
-    type: OS::Heat::MultipartMime
-    properties:
-      parts:
-      - config: { get_resource: network}
-      - config: { get_resource: script_init}
-
-  pcrf_server_pps:
-    type: OS::Nova::Server
-    properties:
-      config_drive: "True"
-      name: { get_param: pcrf_pps_server_name }
-      image: { get_param: pcrf_pps_image_name }
-      flavor: { get_param: pcrf_pps_flavor_name }
-      availability_zone: { get_param: availabilityzone_name }
-      networks:
-        - port: { get_resource: pcrf_pps_port_0}
-      user_data_format: RAW
-      user_data:
-        get_resource: pcrf_server_init
-      metadata:
-        vnf_id: {get_param: pcrf_vnf_id}
-
-  pcrf_pps_port_0:
-    type: OS::Neutron::Port
-    properties:
-      network: { get_param: pcrf_cps_net_name }
-      fixed_ips:
-        - ip_address: { get_param: pcrf_cps_net_ip }
-      security_groups: [{ get_param: pcrf_security_group_name }]
diff --git a/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/simpleNotif-V5/artifacts/nested-psm_v1.0.yaml b/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/simpleNotif-V5/artifacts/nested-psm_v1.0.yaml
deleted file mode 100644
index 64c7484..0000000
--- a/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/simpleNotif-V5/artifacts/nested-psm_v1.0.yaml
+++ /dev/null
@@ -1,99 +0,0 @@
-heat_template_version: 2013-05-23
-
-description: heat template that creates PCRF Session Manager stack
-
-parameters:
-  pcrf_psm_server_name:
-    type: string
-    label: PCRF SM server name
-    description: PCRF SM server name
-  pcrf_psm_image_name:
-    type: string
-    label: image name
-    description: PCRF SM image name
-  pcrf_psm_flavor_name:
-    type: string
-    label: PCRF SM flavor name
-    description: flavor name of PCRF SM instance 
-  availabilityzone_name:
-    type: string
-    label: availabilityzone name
-    description: availabilityzone name
-  pcrf_cps_net_name:
-    type: string
-    label: CPS network name
-    description: CPS network name
-  pcrf_cps_net_ip:
-    type: string
-    label: CPS network ip
-    description: CPS network ip
-  pcrf_cps_net_mask:
-    type: string
-    label: CPS network mask
-    description: CPS network mask
-  pcrf_security_group_name:
-    type: string
-    label: security group name
-    description: the name of security group
-  pcrf_vnf_id:
-    type: string
-    label: PCRF VNF Id
-    description: PCRF VNF Id
-
-resources:
-  network:
-    type: OS::Heat::CloudConfig
-    properties:
-      cloud_config:
-        write_files:
-          - path: /etc/sysconfig/network-scripts/ifcfg-eth0
-            permissions: "0644"
-            content:
-              str_replace:
-                template: { get_file: nimbus-ethernet }
-                params:
-                  $dev: eth0
-                  $ip: { get_param: pcrf_cps_net_ip }
-                  $netmask: { get_param: pcrf_cps_net_mask }
-        runcmd:
-          - ifdown eth0 && ifup eth0
-  script_init:
-    type: OS::Heat::SoftwareConfig
-    properties:
-      group: ungrouped
-      config:
-        str_replace:
-          template: { get_file: cloud-nimbus.sh }
-          params:
-            $vm_name: { get_param: pcrf_psm_server_name }
-  pcrf_server_init:
-    type: OS::Heat::MultipartMime
-    properties:
-      parts:
-      - config: { get_resource: network}
-      - config: { get_resource: script_init}
-
-  pcrf_server_psm:
-    type: OS::Nova::Server
-    properties:
-      config_drive: "True"
-      name: { get_param: pcrf_psm_server_name }
-      image: { get_param: pcrf_psm_image_name }
-      flavor: { get_param: pcrf_psm_flavor_name }
-      availability_zone: { get_param: availabilityzone_name }
-      networks:
-        - port: { get_resource: psm01_port_0}
-      user_data_format: RAW
-      user_data:
-        get_resource: pcrf_server_init
-      metadata:
-        vnf_id: {get_param: pcrf_vnf_id}
-      #scheduler_hints: {group: { get_resource: servergroup_nimbus }}
-  
-  psm01_port_0:
-    type: OS::Neutron::Port
-    properties:
-      network: { get_param: pcrf_cps_net_name }
-      fixed_ips:
-        - ip_address: { get_param: pcrf_cps_net_ip }
-      security_groups: [{ get_param: pcrf_security_group_name }]
\ No newline at end of file
diff --git a/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/simpleNotif-V5/artifacts/vnf-module-artifact.json b/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/simpleNotif-V5/artifacts/vnf-module-artifact.json
deleted file mode 100644
index 70483dc..0000000
--- a/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/simpleNotif-V5/artifacts/vnf-module-artifact.json
+++ /dev/null
@@ -1,35 +0,0 @@
-[
-  {
-    "vfModuleModelName": "VF_RI2_G6_withArtifacts::module-1",
-    "vfModuleModelInvariantUUID": "585822c7-4027-4f84-ba50-e9248606f132",
-    "vfModuleModelVersion": "1.0",
-    "vfModuleModelUUID": "1e34774e-715e-4fd5-bd08-7b654622f33e.VF_RI2_G6_withArtifacts::module-1.group",
-    "vfModuleModelDescription": "vf Module Description",
-    "vfModuleModelCustomizationUUID": "585822c7-4027-4f84-ba50-e9248606f132",
-    "isBase": true,
-    "artifacts": [
-      "Artifact-UUID1",
-      "EnvArtifact-UUID2",
-      "NestedArtifact-UUID3",
-      "NestedArtifact-UUID4",
-      "ScriptArtifact-UUID1",
-      "VolumeArtifact-UUID1",
-      "VolumeEnvArtifact-UUID1"
-    ],
-    "properties": {"test":"test"}
-  },
-  {
-    "vfModuleModelName": "VF_RI2_G91_withArtifacts::module-1",
-    "vfModuleModelInvariantUUID": "585822c7-4027-4f84-ba50-e9248606f169",
-    "vfModuleModelVersion": "1.0",
-    "vfModuleModelUUID": "1e34774e-715e-4fd5-bd08-7b654622f63g.VF_RI2_G9_withArtifacts::module-1.group",
-    "vfModuleModelDescription": "vf Module Description",
-    "vfModuleModelCustomizationUUID": "585822c7-4027-4f84-ba50-e9248606f169",
-    "isBase": true,
-    "artifacts": [
-      "HeatArtifactE2E-UUIDTest"
-
-    ],
-    "properties": {"test":"test"}
-  }
-]
\ No newline at end of file
diff --git a/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/simpleNotif-V5/notif-structure.json b/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/simpleNotif-V5/notif-structure.json
deleted file mode 100644
index 4d4cb97..0000000
--- a/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/simpleNotif-V5/notif-structure.json
+++ /dev/null
@@ -1,156 +0,0 @@
-{
-    "serviceName": "test-service",
-    "serviceInvariantUUID": "585822c7-4027-4f84-ba50-e9248606f134",
-    "serviceUUID": "1e34774e-715e-4fd5-bd09-7b654622f35i",
-    "serviceVersion": "5.0",
-    "serviceArtifacts":
-    [
-
-    ],
-
-    "resources":
-    [
-        {
-            "resourceInstanceName": "resource-1",
-            "resourceInvariantUUID": "585822c7-4027-4f84-ba50-e9248606f134",
-            "resourceName": "resourceName-1",
-            "resourceType": "VF",
-            "resourceUUID": "585822c7-4027-4f84-ba50-e9248606f136",
-            "resourceVersion": "3.0",
-            "category":  "category",
-            "artifacts":
-            [
-                {
-                    "artifactChecksum": "CheckSum",
-                    "artifactDescription": "Meta data for VFModule",
-                    "artifactName": "vnf-module-artifact.json",
-
-                    "artifactType": "VF_MODULES_METADATA",
-                    "artifactURL": "vnf-module-artifact.json",
-                    "artifactUUID": "VfArtifact-UUID2",
-                    "artifactVersion": "1.0"
-
-                },
-                {
-                    "artifactChecksum": "CheckSum",
-                    "artifactDescription": "Nimbus Heat OAM",
-                    "artifactName": "hot-nimbus-oam_v1.0.yaml",
-                    "artifactTimeout": 100,
-                    "artifactType": "HEAT",
-                    "artifactURL": "hot-nimbus-oam_v1.0.yaml",
-                    "artifactUUID": "Artifact-UUID1",
-                    "artifactVersion": "1.0",
-                    "generatedArtifact": "EnvArtifact-UUID2",
-                    "relatedArtifact":
-                    [
-                        "NestedArtifact-UUID3",
-                        "ScriptArtifact-UUID1"
-                    ]
-                },
-
-                {
-                    "artifactChecksum": "CheckSum",
-                    "artifactDescription": "Nimbus Heat ENV OAM",
-                    "artifactName": "hot-nimbus-oam_v1.0.env",
-
-                    "artifactType": "HEAT_ENV",
-                    "artifactURL": "hot-nimbus-oam_v1.0.env",
-                    "artifactUUID": "EnvArtifact-UUID2",
-                    "artifactVersion": "1.0"
-
-                },
-
-                {
-                    "artifactChecksum": "CheckSum",
-                    "artifactDescription": "Nested OAM",
-                    "artifactName": "nested-oam_v1.0.yaml",
-                    "artifactTimeout": 10,
-                    "artifactType": "HEAT_NESTED",
-                    "artifactURL": "nested-oam_v1.0.yaml",
-                    "artifactUUID": "NestedArtifact-UUID3",
-                    "artifactVersion": "1.0"
-
-                },
-
-                {
-                    "artifactChecksum": "CheckSum",
-                    "artifactDescription": "Nested PSM",
-                    "artifactName": "nested-psm_v1.0.yaml",
-                    "artifactTimeout": 10,
-                    "artifactType": "HEAT_NESTED",
-                    "artifactURL": "nested-psm_v1.0.yaml",
-                    "artifactUUID": "NestedArtifact-UUID4",
-                    "artifactVersion": "1.0"
-
-                },
-
-                {
-                    "artifactChecksum": "CheckSum",
-                    "artifactDescription": "Script for Nimbus",
-                    "artifactName": "cloud-nimbus.sh",
-
-                    "artifactType": "HEAT_ARTIFACT",
-                    "artifactURL": "cloud-nimbus.sh",
-                    "artifactUUID": "ScriptNimbusArtifact-UUID1",
-                    "artifactVersion": "1.0"
-
-                },
-
-                {
-                    "artifactChecksum": "CheckSum",
-                    "artifactDescription": "Script for OAM",
-                    "artifactName": "mount_iso_script.sh",
-
-                    "artifactType": "HEAT_ARTIFACT",
-                    "artifactURL": "mount_iso_script.sh",
-                    "artifactUUID": "ScriptArtifact-UUID1",
-                    "artifactVersion": "1.0"
-
-                },
-
-                {
-                    "artifactChecksum": "CheckSum",
-                    "artifactDescription": "Heat Vol for OAM",
-                    "artifactName": "hot-nimbus-oam-volumes_v1.0.yaml",
-                    "artifactTimeout": 10,
-                    "artifactType": "HEAT_VOL",
-                    "artifactURL": "hot-nimbus-oam-volumes_v1.0.yaml",
-                    "artifactUUID": "VolumeArtifact-UUID1",
-                    "artifactVersion": "1.0",
-                    "generatedArtifact": "VolumeEnvArtifact-UUID1",
-                    "relatedArtifact":
-                    [
-                        "NestedArtifact-UUID4"
-                    ]
-
-                },
-
-                {
-                    "artifactChecksum": "CheckSum",
-                    "artifactDescription": "Heat Env Vol for OAM",
-                    "artifactName": "hot-nimbus-oam-volumes_v1.0.env",
-
-                    "artifactType": "HEAT_ENV",
-                    "artifactURL": "hot-nimbus-oam-volumes_v1.0.env",
-                    "artifactUUID": "VolumeEnvArtifact-UUID1",
-                    "artifactVersion": "1.0"
-
-                },
-                {
-                    "artifactChecksum": "CheckSum",
-                    "artifactDescription": "Meta data for VFModule",
-                    "artifactName": "att_nimbus_vsaegw_ht_base_v13_0728v1.yaml",
-                    "artifactTimeout": 100,
-                    "artifactType": "HEAT",
-                    "artifactURL": "att_nimbus_vsaegw_ht_base_v13_0728v1.yaml",
-                    "artifactUUID": "HeatArtifactE2E-UUIDTest",
-                    "artifactVersion": "1.0"
-
-                }
-            ]
-        }
-    ],
-
-    "serviceDescription": "test service for unit testing",
-    "distributionID": "35120a87-1f82-4276-9735-f6de5a244d66"
-}
\ No newline at end of file
diff --git a/packages/deliveries/pom.xml b/packages/deliveries/pom.xml
index 2951059..f61348b 100644
--- a/packages/deliveries/pom.xml
+++ b/packages/deliveries/pom.xml
@@ -4,11 +4,11 @@
 	<parent>
 		<groupId>org.onap.so</groupId>
 		<artifactId>packages</artifactId>
-		<version>1.2.0-SNAPSHOT</version>
+		<version>1.3.0-SNAPSHOT</version>
 	</parent>
 
-	<groupId>org.onap.so.packages</groupId>
-	<artifactId>mso-deliveries</artifactId>
+	<groupId>org.onap.packages</groupId>
+	<artifactId>so-deliveries</artifactId>
 	<packaging>pom</packaging>
 
 	<name>MsoDeliveries</name>
@@ -48,26 +48,7 @@
                             <goal>single</goal>
                         </goals>
 
-                    </execution>
-					<!-- WAR PACKS -->
-					<execution>
-						<configuration>
-							<tarLongFileMode>posix</tarLongFileMode>
-
-							<descriptors>
-								<descriptor>src/main/assembly/war-pack/mso-wars.xml</descriptor>
-							</descriptors>
-							<finalName>war-pack/mso-${project.version}</finalName>
-							<appendAssemblyId>false</appendAssemblyId>
-							<attach>false</attach>
-						</configuration>
-
-						<id>war-pack-mso</id>
-						<phase>package</phase>
-						<goals>
-							<goal>single</goal>
-						</goals>
-					</execution>
+                    </execution>		
 
 
 				</executions>
diff --git a/packages/deliveries/src/main/assembly/war-pack/mso-wars.xml b/packages/deliveries/src/main/assembly/war-pack/mso-wars.xml
index e909b11..2b09451 100644
--- a/packages/deliveries/src/main/assembly/war-pack/mso-wars.xml
+++ b/packages/deliveries/src/main/assembly/war-pack/mso-wars.xml
@@ -115,14 +115,6 @@
  			<directory>../../bpmn/MSOCockpit/target/</directory>
  			<outputDirectory>artifacts</outputDirectory>
  		</fileSet>
-		<fileSet>
-			<includes>
-				<include>mso-workflow-message-adapter*.war</include>
-			</includes>
-			<directory>../../adapters/mso-workflow-message-adapter/target/</directory>
-			<outputDirectory>artifacts</outputDirectory>
-		</fileSet>
-
 	</fileSets>
 
 </assembly>
diff --git a/packages/docker/pom.xml b/packages/docker/pom.xml
index 8ea96e9..c84902a 100644
--- a/packages/docker/pom.xml
+++ b/packages/docker/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.onap.so</groupId>
 		<artifactId>packages</artifactId>
-		<version>1.2.0-SNAPSHOT</version>
+		<version>1.3.0-SNAPSHOT</version>
 	</parent>
 
 	<packaging>pom</packaging>
@@ -144,23 +144,9 @@
 							</build>
 						</image>
 						<image>
-							<name>openecomp/mso-arquillian:%l</name>
-							<alias>mso-arquillian</alias>
-							<build>
-								<tags>
-								    <tag>${project.docker.latesttag.version}</tag>
-									<tag>${project.version}-STAGING-${maven.build.timestamp}</tag>
-								</tags>
-								<cleanup>try</cleanup>
-								<dockerFileDir>docker-files</dockerFileDir>
-								<dockerFile>Dockerfile.mso-arquillian</dockerFile>
-
-							</build>
-						</image>
-						<image>
-							<name>onap/so:%l</name>
+							<name>openecomp/mso:%l</name>
+							<alias>onap/so:%1</alias>
 							<alias>openecomp/mso:%l</alias>
-							<alias>mso</alias>
 							<alias>so</alias>
 							<build>
 								<tags>
@@ -191,7 +177,7 @@
 						</goals>
 						<configuration>
 							<removeAll>true</removeAll>
-							<image>openecomp/mso-arquillian:%l,openecomp/mso:%l</image>
+							<image>openecomp/mso:%l</image>
 						</configuration>
 					</execution>
 
@@ -211,7 +197,7 @@
 							<goal>push</goal>
 						</goals>
 						<configuration>
-							<image>openecomp/mso-arquillian:%l,openecomp/mso:%l,openecomp/jacoco:1.0</image>
+							<image>openecomp/mso:%l,openecomp/jacoco:1.0</image>
 						</configuration>
 					</execution>
 				</executions>
diff --git a/packages/docker/src/main/docker/docker-files/jboss-configs/configuration/standalone-full-ha.xml b/packages/docker/src/main/docker/docker-files/jboss-configs/configuration/standalone-full-ha.xml
index cface7f..5a1b522 100644
--- a/packages/docker/src/main/docker/docker-files/jboss-configs/configuration/standalone-full-ha.xml
+++ b/packages/docker/src/main/docker/docker-files/jboss-configs/configuration/standalone-full-ha.xml
@@ -598,7 +598,7 @@
         <socket-binding name="jgroups-tcp-fd" interface="private" port="57600"/>
         <socket-binding name="jgroups-udp" interface="private" port="55200" multicast-address="${jboss.default.multicast.address:230.0.0.4}" multicast-port="45688"/>
         <socket-binding name="jgroups-udp-fd" interface="private" port="54200"/>
-        <socket-binding name="modcluster" port="0" multicast-address="224.0.1.105" multicast-port="23364"/>
+        <socket-binding name="modcluster" port="0" multicast-address="192.168.1.105" multicast-port="23364"/>
         <socket-binding name="txn-recovery-environment" port="4712"/>
         <socket-binding name="txn-status-manager" port="4713"/>
         <outbound-socket-binding name="mail-smtp">
diff --git a/packages/pom.xml b/packages/pom.xml
index c298501..578127d 100644
--- a/packages/pom.xml
+++ b/packages/pom.xml
@@ -1,55 +1,54 @@
-<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.onap.so</groupId>
-		<artifactId>so</artifactId>
-		<version>1.2.0-SNAPSHOT</version>
-	</parent>
-
-	<artifactId>packages</artifactId>
-	<packaging>pom</packaging>
-	<name>MSO Packages</name>
-
-
-	<profiles>
-		<!-- DO NOT CHANGE THE *ORDER* IN WHICH THESE PROFILES ARE DEFINED! -->
-
-		<profile>
-			<id>default</id>
-			<activation>
-				<activeByDefault>true</activeByDefault>
-			</activation>
-			<modules>
-				<module>deliveries</module>
-			</modules>
-		</profile>
-
-    <!-- Those profile are exclusive, choose docker or with-integration-tests -->
-		<profile>
-			<id>docker</id>
-			<modules>
-				<module>deliveries</module>
-				<module>docker</module>
-			</modules>
-			<properties>
-					<!-- For this profile we probably don't want to skip the docker push (if deploy goal is specified) -->
-					<docker.skip.push>false</docker.skip.push>
-			</properties>
-		</profile>
-
-		<profile>
-			<id>with-integration-tests</id>
-			<modules>
-				<module>deliveries</module>
-				<module>docker</module>
-				<module>arquillian-unit-tests</module>
-			</modules>
-			<properties>
-					<!-- For this profile we want to skip the docker push (if deploy goal is specified) -->
-					<docker.skip.push>true</docker.skip.push>
-			</properties>
-		</profile>
-
-	</profiles>
-</project>
+<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.onap.so</groupId>
+		<artifactId>so</artifactId>
+		<version>1.3.0-SNAPSHOT</version>
+	</parent>
+
+	<artifactId>packages</artifactId>
+	<packaging>pom</packaging>
+	<name>MSO Packages</name>
+
+
+	<profiles>
+		<!-- DO NOT CHANGE THE *ORDER* IN WHICH THESE PROFILES ARE DEFINED! -->
+
+		<profile>
+			<id>default</id>
+			<activation>
+				<activeByDefault>true</activeByDefault>
+			</activation>
+			<modules>
+				<module>deliveries</module>
+			</modules>
+		</profile>
+
+    <!-- Those profile are exclusive, choose docker or with-integration-tests -->
+		<profile>
+			<id>docker</id>
+			<modules>
+				<module>deliveries</module>
+				<module>docker</module>
+			</modules>
+			<properties>
+					<!-- For this profile we probably don't want to skip the docker push (if deploy goal is specified) -->
+					<docker.skip.push>false</docker.skip.push>
+			</properties>
+		</profile>
+
+		<profile>
+			<id>with-integration-tests</id>
+			<modules>
+				<module>deliveries</module>
+				<module>docker</module>
+			</modules>
+			<properties>
+					<!-- For this profile we want to skip the docker push (if deploy goal is specified) -->
+					<docker.skip.push>true</docker.skip.push>
+			</properties>
+		</profile>
+
+	</profiles>
+</project>
diff --git a/packages/root-pack-extras/config-resources/mariadb/db-sql-scripts/.gitignore b/packages/root-pack-extras/config-resources/mariadb/db-sql-scripts/.gitignore
new file mode 100644
index 0000000..568f8e9
--- /dev/null
+++ b/packages/root-pack-extras/config-resources/mariadb/db-sql-scripts/.gitignore
@@ -0,0 +1 @@
+/main-schemas/
diff --git a/packages/root-pack-extras/config-resources/mariadb/db-sql-scripts/camunda/mariadb_engine_7.8.0-ee.sql b/packages/root-pack-extras/config-resources/mariadb/db-sql-scripts/camunda/mariadb_engine_7.8.0-ee.sql
new file mode 100644
index 0000000..712b588
--- /dev/null
+++ b/packages/root-pack-extras/config-resources/mariadb/db-sql-scripts/camunda/mariadb_engine_7.8.0-ee.sql
@@ -0,0 +1,1226 @@
+# Start of Statements added for MSO
+DROP DATABASE IF EXISTS `camundabpmn`;
+
+CREATE DATABASE /*!32312 IF NOT EXISTS*/ `camundabpmn` /*!40100 DEFAULT CHARACTER SET latin1 */;
+
+USE `camundabpmn`;
+
+# DROP USER IF EXISTS 'camunda';
+#delete from mysql.user where User='camunda';
+#CREATE USER 'camunda';
+#GRANT ALL on camundabpmn.* to 'camunda' identified by 'camunda123' with GRANT OPTION;
+FLUSH PRIVILEGES;
+# End of Statements added for MSO
+
+
+create table ACT_GE_PROPERTY (
+    NAME_ varchar(64),
+    VALUE_ varchar(300),
+    REV_ integer,
+    primary key (NAME_)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin;
+
+insert into ACT_GE_PROPERTY
+values ('schema.version', 'fox', 1);
+
+insert into ACT_GE_PROPERTY
+values ('schema.history', 'create(fox)', 1);
+
+insert into ACT_GE_PROPERTY
+values ('next.dbid', '1', 1);
+
+insert into ACT_GE_PROPERTY
+values ('deployment.lock', '0', 1);
+
+insert into ACT_GE_PROPERTY
+values ('history.cleanup.job.lock', '0', 1);
+
+insert into ACT_GE_PROPERTY
+values ('startup.lock', '0', 1);
+
+create table ACT_GE_BYTEARRAY (
+    ID_ varchar(64),
+    REV_ integer,
+    NAME_ varchar(255),
+    DEPLOYMENT_ID_ varchar(64),
+    BYTES_ LONGBLOB,
+    GENERATED_ TINYINT,
+    TENANT_ID_ varchar(64),
+    primary key (ID_)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin;
+
+create table ACT_RE_DEPLOYMENT (
+    ID_ varchar(64),
+    NAME_ varchar(255),
+    DEPLOY_TIME_ timestamp(3),
+    SOURCE_ varchar(255),
+    TENANT_ID_ varchar(64),
+    primary key (ID_)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin;
+
+create table ACT_RU_EXECUTION (
+    ID_ varchar(64),
+    REV_ integer,
+    PROC_INST_ID_ varchar(64),
+    BUSINESS_KEY_ varchar(255),
+    PARENT_ID_ varchar(64),
+    PROC_DEF_ID_ varchar(64),
+    SUPER_EXEC_ varchar(64),
+    SUPER_CASE_EXEC_ varchar(64),
+    CASE_INST_ID_ varchar(64),
+    ACT_ID_ varchar(255),
+    ACT_INST_ID_ varchar(64),
+    IS_ACTIVE_ TINYINT,
+    IS_CONCURRENT_ TINYINT,
+    IS_SCOPE_ TINYINT,
+    IS_EVENT_SCOPE_ TINYINT,
+    SUSPENSION_STATE_ integer,
+    CACHED_ENT_STATE_ integer,
+    SEQUENCE_COUNTER_ bigint,
+    TENANT_ID_ varchar(64),
+    primary key (ID_)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin;
+
+create table ACT_RU_JOB (
+    ID_ varchar(64) NOT NULL,
+    REV_ integer,
+    TYPE_ varchar(255) NOT NULL,
+    LOCK_EXP_TIME_ timestamp(3) NULL,
+    LOCK_OWNER_ varchar(255),
+    EXCLUSIVE_ boolean,
+    EXECUTION_ID_ varchar(64),
+    PROCESS_INSTANCE_ID_ varchar(64),
+    PROCESS_DEF_ID_ varchar(64),
+    PROCESS_DEF_KEY_ varchar(255),
+    RETRIES_ integer,
+    EXCEPTION_STACK_ID_ varchar(64),
+    EXCEPTION_MSG_ varchar(4000),
+    DUEDATE_ timestamp(3) NULL,
+    REPEAT_ varchar(255),
+    HANDLER_TYPE_ varchar(255),
+    HANDLER_CFG_ varchar(4000),
+    DEPLOYMENT_ID_ varchar(64),
+    SUSPENSION_STATE_ integer NOT NULL DEFAULT 1,
+    JOB_DEF_ID_ varchar(64),
+    PRIORITY_ bigint NOT NULL DEFAULT 0,
+    SEQUENCE_COUNTER_ bigint,
+    TENANT_ID_ varchar(64),
+    primary key (ID_)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin;
+
+create table ACT_RU_JOBDEF (
+    ID_ varchar(64) NOT NULL,
+    REV_ integer,
+    PROC_DEF_ID_ varchar(64),
+    PROC_DEF_KEY_ varchar(255),
+    ACT_ID_ varchar(255),
+    JOB_TYPE_ varchar(255) NOT NULL,
+    JOB_CONFIGURATION_ varchar(255),
+    SUSPENSION_STATE_ integer,
+    JOB_PRIORITY_ bigint,
+    TENANT_ID_ varchar(64),
+    primary key (ID_)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin;
+
+create table ACT_RE_PROCDEF (
+    ID_ varchar(64) not null,
+    REV_ integer,
+    CATEGORY_ varchar(255),
+    NAME_ varchar(255),
+    KEY_ varchar(255) not null,
+    VERSION_ integer not null,
+    DEPLOYMENT_ID_ varchar(64),
+    RESOURCE_NAME_ varchar(4000),
+    DGRM_RESOURCE_NAME_ varchar(4000),
+    HAS_START_FORM_KEY_ TINYINT,
+    SUSPENSION_STATE_ integer,
+    TENANT_ID_ varchar(64),
+    VERSION_TAG_ varchar(64),
+    HISTORY_TTL_ integer,
+    primary key (ID_)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin;
+
+create table ACT_RU_TASK (
+    ID_ varchar(64),
+    REV_ integer,
+    EXECUTION_ID_ varchar(64),
+    PROC_INST_ID_ varchar(64),
+    PROC_DEF_ID_ varchar(64),
+    CASE_EXECUTION_ID_ varchar(64),
+    CASE_INST_ID_ varchar(64),
+    CASE_DEF_ID_ varchar(64),
+    NAME_ varchar(255),
+    PARENT_TASK_ID_ varchar(64),
+    DESCRIPTION_ varchar(4000),
+    TASK_DEF_KEY_ varchar(255),
+    OWNER_ varchar(255),
+    ASSIGNEE_ varchar(255),
+    DELEGATION_ varchar(64),
+    PRIORITY_ integer,
+    CREATE_TIME_ timestamp(3),
+    DUE_DATE_ datetime(3),
+    FOLLOW_UP_DATE_ datetime(3),
+    SUSPENSION_STATE_ integer,
+    TENANT_ID_ varchar(64),
+    primary key (ID_)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin;
+
+create table ACT_RU_IDENTITYLINK (
+    ID_ varchar(64),
+    REV_ integer,
+    GROUP_ID_ varchar(255),
+    TYPE_ varchar(255),
+    USER_ID_ varchar(255),
+    TASK_ID_ varchar(64),
+    PROC_DEF_ID_ varchar(64),
+    TENANT_ID_ varchar(64),
+    primary key (ID_)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin;
+
+create table ACT_RU_VARIABLE (
+    ID_ varchar(64) not null,
+    REV_ integer,
+    TYPE_ varchar(255) not null,
+    NAME_ varchar(255) not null,
+    EXECUTION_ID_ varchar(64),
+    PROC_INST_ID_ varchar(64),
+    CASE_EXECUTION_ID_ varchar(64),
+    CASE_INST_ID_ varchar(64),
+    TASK_ID_ varchar(64),
+    BYTEARRAY_ID_ varchar(64),
+    DOUBLE_ double,
+    LONG_ bigint,
+    TEXT_ LONGBLOB,
+    TEXT2_ LONGBLOB,
+    VAR_SCOPE_ varchar(64) not null,
+    SEQUENCE_COUNTER_ bigint,
+    IS_CONCURRENT_LOCAL_ TINYINT,
+    TENANT_ID_ varchar(64),
+    primary key (ID_)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin;
+
+create table ACT_RU_EVENT_SUBSCR (
+    ID_ varchar(64) not null,
+    REV_ integer,
+    EVENT_TYPE_ varchar(255) not null,
+    EVENT_NAME_ varchar(255),
+    EXECUTION_ID_ varchar(64),
+    PROC_INST_ID_ varchar(64),
+    ACTIVITY_ID_ varchar(255),
+    CONFIGURATION_ varchar(255),
+    CREATED_ timestamp(3) not null,
+    TENANT_ID_ varchar(64),
+    primary key (ID_)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin;
+
+create table ACT_RU_INCIDENT (
+  ID_ varchar(64) not null,
+  REV_ integer not null,
+  INCIDENT_TIMESTAMP_ timestamp(3) not null,
+  INCIDENT_MSG_ varchar(4000),
+  INCIDENT_TYPE_ varchar(255) not null,
+  EXECUTION_ID_ varchar(64),
+  ACTIVITY_ID_ varchar(255),
+  PROC_INST_ID_ varchar(64),
+  PROC_DEF_ID_ varchar(64),
+  CAUSE_INCIDENT_ID_ varchar(64),
+  ROOT_CAUSE_INCIDENT_ID_ varchar(64),
+  CONFIGURATION_ varchar(255),
+  TENANT_ID_ varchar(64),
+  JOB_DEF_ID_ varchar(64),
+  primary key (ID_)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin;
+
+create table ACT_RU_AUTHORIZATION (
+  ID_ varchar(64) not null,
+  REV_ integer not null,
+  TYPE_ integer not null,
+  GROUP_ID_ varchar(255),
+  USER_ID_ varchar(255),
+  RESOURCE_TYPE_ integer not null,
+  RESOURCE_ID_ varchar(255),
+  PERMS_ integer,
+  primary key (ID_)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin;
+
+create table ACT_RU_FILTER (
+  ID_ varchar(64) not null,
+  REV_ integer not null,
+  RESOURCE_TYPE_ varchar(255) not null,
+  NAME_ varchar(255) not null,
+  OWNER_ varchar(255),
+  QUERY_ LONGTEXT not null,
+  PROPERTIES_ LONGTEXT,
+  primary key (ID_)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin;
+
+create table ACT_RU_METER_LOG (
+  ID_ varchar(64) not null,
+  NAME_ varchar(64) not null,
+  REPORTER_ varchar(255),
+  VALUE_ bigint,
+  TIMESTAMP_ timestamp(3),
+  MILLISECONDS_ bigint DEFAULT 0,
+  primary key (ID_)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin;
+
+create table ACT_RU_EXT_TASK (
+  ID_ varchar(64) not null,
+  REV_ integer not null,
+  WORKER_ID_ varchar(255),
+  TOPIC_NAME_ varchar(255),
+  RETRIES_ integer,
+  ERROR_MSG_ varchar(4000),
+  ERROR_DETAILS_ID_ varchar(64),
+  LOCK_EXP_TIME_ timestamp(3) NULL,
+  SUSPENSION_STATE_ integer,
+  EXECUTION_ID_ varchar(64),
+  PROC_INST_ID_ varchar(64),
+  PROC_DEF_ID_ varchar(64),
+  PROC_DEF_KEY_ varchar(255),
+  ACT_ID_ varchar(255),
+  ACT_INST_ID_ varchar(64),
+  TENANT_ID_ varchar(64),
+  PRIORITY_ bigint NOT NULL DEFAULT 0,
+  primary key (ID_)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin;
+
+create table ACT_RU_BATCH (
+  ID_ varchar(64) not null,
+  REV_ integer not null,
+  TYPE_ varchar(255),
+  TOTAL_JOBS_ integer,
+  JOBS_CREATED_ integer,
+  JOBS_PER_SEED_ integer,
+  INVOCATIONS_PER_JOB_ integer,
+  SEED_JOB_DEF_ID_ varchar(64),
+  BATCH_JOB_DEF_ID_ varchar(64),
+  MONITOR_JOB_DEF_ID_ varchar(64),
+  SUSPENSION_STATE_ integer,
+  CONFIGURATION_ varchar(255),
+  TENANT_ID_ varchar(64),
+  primary key (ID_)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin;
+
+create index ACT_IDX_EXEC_BUSKEY on ACT_RU_EXECUTION(BUSINESS_KEY_);
+create index ACT_IDX_EXEC_TENANT_ID on ACT_RU_EXECUTION(TENANT_ID_);
+create index ACT_IDX_TASK_CREATE on ACT_RU_TASK(CREATE_TIME_);
+create index ACT_IDX_TASK_ASSIGNEE on ACT_RU_TASK(ASSIGNEE_);
+create index ACT_IDX_TASK_TENANT_ID on ACT_RU_TASK(TENANT_ID_);
+create index ACT_IDX_IDENT_LNK_USER on ACT_RU_IDENTITYLINK(USER_ID_);
+create index ACT_IDX_IDENT_LNK_GROUP on ACT_RU_IDENTITYLINK(GROUP_ID_);
+create index ACT_IDX_EVENT_SUBSCR_CONFIG_ on ACT_RU_EVENT_SUBSCR(CONFIGURATION_);
+create index ACT_IDX_EVENT_SUBSCR_TENANT_ID on ACT_RU_EVENT_SUBSCR(TENANT_ID_);
+create index ACT_IDX_VARIABLE_TASK_ID on ACT_RU_VARIABLE(TASK_ID_);
+create index ACT_IDX_VARIABLE_TENANT_ID on ACT_RU_VARIABLE(TENANT_ID_);
+create index ACT_IDX_ATHRZ_PROCEDEF on ACT_RU_IDENTITYLINK(PROC_DEF_ID_);
+create index ACT_IDX_INC_CONFIGURATION on ACT_RU_INCIDENT(CONFIGURATION_);
+create index ACT_IDX_INC_TENANT_ID on ACT_RU_INCIDENT(TENANT_ID_);
+-- CAM-5914
+create index ACT_IDX_JOB_EXECUTION_ID on ACT_RU_JOB(EXECUTION_ID_);
+-- this index needs to be limited in mariadb see CAM-6938
+create index ACT_IDX_JOB_HANDLER on ACT_RU_JOB(HANDLER_TYPE_(100),HANDLER_CFG_(155));
+create index ACT_IDX_JOB_PROCINST on ACT_RU_JOB(PROCESS_INSTANCE_ID_);
+create index ACT_IDX_JOB_TENANT_ID on ACT_RU_JOB(TENANT_ID_);
+create index ACT_IDX_JOBDEF_TENANT_ID on ACT_RU_JOBDEF(TENANT_ID_);
+
+-- new metric milliseconds column
+CREATE INDEX ACT_IDX_METER_LOG_MS ON ACT_RU_METER_LOG(MILLISECONDS_);
+CREATE INDEX ACT_IDX_METER_LOG_NAME_MS ON ACT_RU_METER_LOG(NAME_, MILLISECONDS_);
+CREATE INDEX ACT_IDX_METER_LOG_REPORT ON ACT_RU_METER_LOG(NAME_, REPORTER_, MILLISECONDS_);
+
+-- old metric timestamp column
+CREATE INDEX ACT_IDX_METER_LOG_TIME ON ACT_RU_METER_LOG(TIMESTAMP_);
+CREATE INDEX ACT_IDX_METER_LOG ON ACT_RU_METER_LOG(NAME_, TIMESTAMP_);
+
+create index ACT_IDX_EXT_TASK_TOPIC on ACT_RU_EXT_TASK(TOPIC_NAME_);
+create index ACT_IDX_EXT_TASK_TENANT_ID on ACT_RU_EXT_TASK(TENANT_ID_);
+create index ACT_IDX_EXT_TASK_PRIORITY ON ACT_RU_EXT_TASK(PRIORITY_);
+create index ACT_IDX_EXT_TASK_ERR_DETAILS ON ACT_RU_EXT_TASK(ERROR_DETAILS_ID_);
+create index ACT_IDX_AUTH_GROUP_ID ON ACT_RU_AUTHORIZATION(GROUP_ID_);
+create index ACT_IDX_JOB_JOB_DEF_ID on ACT_RU_JOB(JOB_DEF_ID_);
+
+alter table ACT_GE_BYTEARRAY
+    add constraint ACT_FK_BYTEARR_DEPL
+    foreign key (DEPLOYMENT_ID_)
+    references ACT_RE_DEPLOYMENT (ID_);
+
+alter table ACT_RU_EXECUTION
+    add constraint ACT_FK_EXE_PROCINST
+    foreign key (PROC_INST_ID_)
+    references ACT_RU_EXECUTION (ID_) on delete cascade on update cascade;
+
+alter table ACT_RU_EXECUTION
+    add constraint ACT_FK_EXE_PARENT
+    foreign key (PARENT_ID_)
+    references ACT_RU_EXECUTION (ID_);
+
+alter table ACT_RU_EXECUTION
+    add constraint ACT_FK_EXE_SUPER
+    foreign key (SUPER_EXEC_)
+    references ACT_RU_EXECUTION (ID_);
+
+alter table ACT_RU_EXECUTION
+    add constraint ACT_FK_EXE_PROCDEF
+    foreign key (PROC_DEF_ID_)
+    references ACT_RE_PROCDEF (ID_);
+
+alter table ACT_RU_IDENTITYLINK
+    add constraint ACT_FK_TSKASS_TASK
+    foreign key (TASK_ID_)
+    references ACT_RU_TASK (ID_);
+
+alter table ACT_RU_IDENTITYLINK
+    add constraint ACT_FK_ATHRZ_PROCEDEF
+    foreign key (PROC_DEF_ID_)
+    references ACT_RE_PROCDEF(ID_);
+
+alter table ACT_RU_TASK
+    add constraint ACT_FK_TASK_EXE
+    foreign key (EXECUTION_ID_)
+    references ACT_RU_EXECUTION (ID_);
+
+alter table ACT_RU_TASK
+    add constraint ACT_FK_TASK_PROCINST
+    foreign key (PROC_INST_ID_)
+    references ACT_RU_EXECUTION (ID_);
+
+alter table ACT_RU_TASK
+  add constraint ACT_FK_TASK_PROCDEF
+  foreign key (PROC_DEF_ID_)
+  references ACT_RE_PROCDEF (ID_);
+
+alter table ACT_RU_VARIABLE
+    add constraint ACT_FK_VAR_EXE
+    foreign key (EXECUTION_ID_)
+    references ACT_RU_EXECUTION (ID_);
+
+alter table ACT_RU_VARIABLE
+    add constraint ACT_FK_VAR_PROCINST
+    foreign key (PROC_INST_ID_)
+    references ACT_RU_EXECUTION(ID_);
+
+alter table ACT_RU_VARIABLE
+    add constraint ACT_FK_VAR_BYTEARRAY
+    foreign key (BYTEARRAY_ID_)
+    references ACT_GE_BYTEARRAY (ID_);
+
+alter table ACT_RU_JOB
+    add constraint ACT_FK_JOB_EXCEPTION
+    foreign key (EXCEPTION_STACK_ID_)
+    references ACT_GE_BYTEARRAY (ID_);
+
+alter table ACT_RU_EVENT_SUBSCR
+    add constraint ACT_FK_EVENT_EXEC
+    foreign key (EXECUTION_ID_)
+    references ACT_RU_EXECUTION(ID_);
+
+alter table ACT_RU_INCIDENT
+    add constraint ACT_FK_INC_EXE
+    foreign key (EXECUTION_ID_)
+    references ACT_RU_EXECUTION (ID_);
+
+alter table ACT_RU_INCIDENT
+    add constraint ACT_FK_INC_PROCINST
+    foreign key (PROC_INST_ID_)
+    references ACT_RU_EXECUTION (ID_);
+
+alter table ACT_RU_INCIDENT
+    add constraint ACT_FK_INC_PROCDEF
+    foreign key (PROC_DEF_ID_)
+    references ACT_RE_PROCDEF (ID_);
+
+alter table ACT_RU_INCIDENT
+    add constraint ACT_FK_INC_CAUSE
+    foreign key (CAUSE_INCIDENT_ID_)
+    references ACT_RU_INCIDENT (ID_) on delete cascade on update cascade;
+
+alter table ACT_RU_INCIDENT
+    add constraint ACT_FK_INC_RCAUSE
+    foreign key (ROOT_CAUSE_INCIDENT_ID_)
+    references ACT_RU_INCIDENT (ID_) on delete cascade on update cascade;
+
+alter table ACT_RU_EXT_TASK
+    add constraint ACT_FK_EXT_TASK_ERROR_DETAILS
+    foreign key (ERROR_DETAILS_ID_)
+    references ACT_GE_BYTEARRAY (ID_);
+
+create index ACT_IDX_INC_JOB_DEF on ACT_RU_INCIDENT(JOB_DEF_ID_);
+alter table ACT_RU_INCIDENT
+    add constraint ACT_FK_INC_JOB_DEF
+    foreign key (JOB_DEF_ID_)
+    references ACT_RU_JOBDEF (ID_);
+
+alter table ACT_RU_AUTHORIZATION
+    add constraint ACT_UNIQ_AUTH_USER
+    unique (USER_ID_,TYPE_,RESOURCE_TYPE_,RESOURCE_ID_);
+
+alter table ACT_RU_AUTHORIZATION
+    add constraint ACT_UNIQ_AUTH_GROUP
+    unique (GROUP_ID_,TYPE_,RESOURCE_TYPE_,RESOURCE_ID_);
+
+alter table ACT_RU_VARIABLE
+    add constraint ACT_UNIQ_VARIABLE
+    unique (VAR_SCOPE_, NAME_);
+
+alter table ACT_RU_EXT_TASK
+    add constraint ACT_FK_EXT_TASK_EXE
+    foreign key (EXECUTION_ID_)
+    references ACT_RU_EXECUTION (ID_);
+
+create index ACT_IDX_BATCH_SEED_JOB_DEF ON ACT_RU_BATCH(SEED_JOB_DEF_ID_);
+alter table ACT_RU_BATCH
+    add constraint ACT_FK_BATCH_SEED_JOB_DEF
+    foreign key (SEED_JOB_DEF_ID_)
+    references ACT_RU_JOBDEF (ID_);
+
+create index ACT_IDX_BATCH_MONITOR_JOB_DEF ON ACT_RU_BATCH(MONITOR_JOB_DEF_ID_);
+alter table ACT_RU_BATCH
+    add constraint ACT_FK_BATCH_MONITOR_JOB_DEF
+    foreign key (MONITOR_JOB_DEF_ID_)
+    references ACT_RU_JOBDEF (ID_);
+
+create index ACT_IDX_BATCH_JOB_DEF ON ACT_RU_BATCH(BATCH_JOB_DEF_ID_);
+alter table ACT_RU_BATCH
+    add constraint ACT_FK_BATCH_JOB_DEF
+    foreign key (BATCH_JOB_DEF_ID_)
+    references ACT_RU_JOBDEF (ID_);
+
+-- indexes for deadlock problems - https://app.camunda.com/jira/browse/CAM-2567 --
+create index ACT_IDX_INC_CAUSEINCID on ACT_RU_INCIDENT(CAUSE_INCIDENT_ID_);
+create index ACT_IDX_INC_EXID on ACT_RU_INCIDENT(EXECUTION_ID_);
+create index ACT_IDX_INC_PROCDEFID on ACT_RU_INCIDENT(PROC_DEF_ID_);
+create index ACT_IDX_INC_PROCINSTID on ACT_RU_INCIDENT(PROC_INST_ID_);
+create index ACT_IDX_INC_ROOTCAUSEINCID on ACT_RU_INCIDENT(ROOT_CAUSE_INCIDENT_ID_);
+-- index for deadlock problem - https://app.camunda.com/jira/browse/CAM-4440 --
+create index ACT_IDX_AUTH_RESOURCE_ID on ACT_RU_AUTHORIZATION(RESOURCE_ID_);
+-- index to prevent deadlock on fk constraint - https://app.camunda.com/jira/browse/CAM-5440 --
+create index ACT_IDX_EXT_TASK_EXEC on ACT_RU_EXT_TASK(EXECUTION_ID_);
+
+-- indexes to improve deployment
+create index ACT_IDX_BYTEARRAY_NAME on ACT_GE_BYTEARRAY(NAME_);
+create index ACT_IDX_DEPLOYMENT_NAME on ACT_RE_DEPLOYMENT(NAME_);
+create index ACT_IDX_DEPLOYMENT_TENANT_ID on ACT_RE_DEPLOYMENT(TENANT_ID_);
+create index ACT_IDX_JOBDEF_PROC_DEF_ID ON ACT_RU_JOBDEF(PROC_DEF_ID_);
+create index ACT_IDX_JOB_HANDLER_TYPE ON ACT_RU_JOB(HANDLER_TYPE_);
+create index ACT_IDX_EVENT_SUBSCR_EVT_NAME ON ACT_RU_EVENT_SUBSCR(EVENT_NAME_);
+create index ACT_IDX_PROCDEF_DEPLOYMENT_ID ON ACT_RE_PROCDEF(DEPLOYMENT_ID_);
+create index ACT_IDX_PROCDEF_TENANT_ID ON ACT_RE_PROCDEF(TENANT_ID_);
+create index ACT_IDX_PROCDEF_VER_TAG ON ACT_RE_PROCDEF(VERSION_TAG_);
+-- create case definition table --
+create table ACT_RE_CASE_DEF (
+    ID_ varchar(64) not null,
+    REV_ integer,
+    CATEGORY_ varchar(255),
+    NAME_ varchar(255),
+    KEY_ varchar(255) not null,
+    VERSION_ integer not null,
+    DEPLOYMENT_ID_ varchar(64),
+    RESOURCE_NAME_ varchar(4000),
+    DGRM_RESOURCE_NAME_ varchar(4000),
+    TENANT_ID_ varchar(64),
+    HISTORY_TTL_ integer,
+    primary key (ID_)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin;
+
+-- create case execution table --
+create table ACT_RU_CASE_EXECUTION (
+    ID_ varchar(64) NOT NULL,
+    REV_ integer,
+    CASE_INST_ID_ varchar(64),
+    SUPER_CASE_EXEC_ varchar(64),
+    SUPER_EXEC_ varchar(64),
+    BUSINESS_KEY_ varchar(255),
+    PARENT_ID_ varchar(64),
+    CASE_DEF_ID_ varchar(64),
+    ACT_ID_ varchar(255),
+    PREV_STATE_ integer,
+    CURRENT_STATE_ integer,
+    REQUIRED_ boolean,
+    TENANT_ID_ varchar(64),
+    primary key (ID_)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin;
+
+-- create case sentry part table --
+
+create table ACT_RU_CASE_SENTRY_PART (
+    ID_ varchar(64) NOT NULL,
+    REV_ integer,
+    CASE_INST_ID_ varchar(64),
+    CASE_EXEC_ID_ varchar(64),
+    SENTRY_ID_ varchar(255),
+    TYPE_ varchar(255),
+    SOURCE_CASE_EXEC_ID_ varchar(64),
+    STANDARD_EVENT_ varchar(255),
+    SOURCE_ varchar(255),
+    VARIABLE_EVENT_ varchar(255),
+    VARIABLE_NAME_ varchar(255),
+    SATISFIED_ boolean,
+    TENANT_ID_ varchar(64),
+    primary key (ID_)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin;
+
+-- create index on business key --
+create index ACT_IDX_CASE_EXEC_BUSKEY on ACT_RU_CASE_EXECUTION(BUSINESS_KEY_);
+
+-- create foreign key constraints on ACT_RU_CASE_EXECUTION --
+alter table ACT_RU_CASE_EXECUTION
+    add constraint ACT_FK_CASE_EXE_CASE_INST
+    foreign key (CASE_INST_ID_)
+    references ACT_RU_CASE_EXECUTION(ID_) on delete cascade on update cascade;
+
+alter table ACT_RU_CASE_EXECUTION
+    add constraint ACT_FK_CASE_EXE_PARENT
+    foreign key (PARENT_ID_)
+    references ACT_RU_CASE_EXECUTION(ID_);
+
+alter table ACT_RU_CASE_EXECUTION
+    add constraint ACT_FK_CASE_EXE_CASE_DEF
+    foreign key (CASE_DEF_ID_)
+    references ACT_RE_CASE_DEF(ID_);
+
+-- create foreign key constraints on ACT_RU_VARIABLE --
+alter table ACT_RU_VARIABLE
+    add constraint ACT_FK_VAR_CASE_EXE
+    foreign key (CASE_EXECUTION_ID_)
+    references ACT_RU_CASE_EXECUTION(ID_);
+
+alter table ACT_RU_VARIABLE
+    add constraint ACT_FK_VAR_CASE_INST
+    foreign key (CASE_INST_ID_)
+    references ACT_RU_CASE_EXECUTION(ID_);
+
+-- create foreign key constraints on ACT_RU_TASK --
+alter table ACT_RU_TASK
+    add constraint ACT_FK_TASK_CASE_EXE
+    foreign key (CASE_EXECUTION_ID_)
+    references ACT_RU_CASE_EXECUTION(ID_);
+
+alter table ACT_RU_TASK
+  add constraint ACT_FK_TASK_CASE_DEF
+  foreign key (CASE_DEF_ID_)
+  references ACT_RE_CASE_DEF(ID_);
+
+-- create foreign key constraints on ACT_RU_CASE_SENTRY_PART --
+alter table ACT_RU_CASE_SENTRY_PART
+    add constraint ACT_FK_CASE_SENTRY_CASE_INST
+    foreign key (CASE_INST_ID_)
+    references ACT_RU_CASE_EXECUTION(ID_);
+
+alter table ACT_RU_CASE_SENTRY_PART
+    add constraint ACT_FK_CASE_SENTRY_CASE_EXEC
+    foreign key (CASE_EXEC_ID_)
+    references ACT_RU_CASE_EXECUTION(ID_);
+
+create index ACT_IDX_CASE_DEF_TENANT_ID on ACT_RE_CASE_DEF(TENANT_ID_);
+create index ACT_IDX_CASE_EXEC_TENANT_ID on ACT_RU_CASE_EXECUTION(TENANT_ID_);
+-- create decision definition table --
+create table ACT_RE_DECISION_DEF (
+    ID_ varchar(64) not null,
+    REV_ integer,
+    CATEGORY_ varchar(255),
+    NAME_ varchar(255),
+    KEY_ varchar(255) not null,
+    VERSION_ integer not null,
+    DEPLOYMENT_ID_ varchar(64),
+    RESOURCE_NAME_ varchar(4000),
+    DGRM_RESOURCE_NAME_ varchar(4000),
+    DEC_REQ_ID_ varchar(64),
+    DEC_REQ_KEY_ varchar(255),
+    TENANT_ID_ varchar(64),
+    HISTORY_TTL_ integer,
+    VERSION_TAG_ varchar(64),
+    primary key (ID_)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin;
+
+-- create decision requirements definition table --
+create table ACT_RE_DECISION_REQ_DEF (
+    ID_ varchar(64) NOT NULL,
+    REV_ integer,
+    CATEGORY_ varchar(255),
+    NAME_ varchar(255),
+    KEY_ varchar(255) NOT NULL,
+    VERSION_ integer NOT NULL,
+    DEPLOYMENT_ID_ varchar(64),
+    RESOURCE_NAME_ varchar(4000),
+    DGRM_RESOURCE_NAME_ varchar(4000),
+    TENANT_ID_ varchar(64),
+    primary key (ID_)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin;
+
+alter table ACT_RE_DECISION_DEF
+    add constraint ACT_FK_DEC_REQ
+    foreign key (DEC_REQ_ID_)
+    references ACT_RE_DECISION_REQ_DEF(ID_);
+
+create index ACT_IDX_DEC_DEF_TENANT_ID on ACT_RE_DECISION_DEF(TENANT_ID_);
+create index ACT_IDX_DEC_DEF_REQ_ID on ACT_RE_DECISION_DEF(DEC_REQ_ID_);
+create index ACT_IDX_DEC_REQ_DEF_TENANT_ID on ACT_RE_DECISION_REQ_DEF(TENANT_ID_);
+create table ACT_HI_PROCINST (
+    ID_ varchar(64) not null,
+    PROC_INST_ID_ varchar(64) not null,
+    BUSINESS_KEY_ varchar(255),
+    PROC_DEF_KEY_ varchar(255),
+    PROC_DEF_ID_ varchar(64) not null,
+    START_TIME_ datetime(3) not null,
+    END_TIME_ datetime(3),
+    DURATION_ bigint,
+    START_USER_ID_ varchar(255),
+    START_ACT_ID_ varchar(255),
+    END_ACT_ID_ varchar(255),
+    SUPER_PROCESS_INSTANCE_ID_ varchar(64),
+    SUPER_CASE_INSTANCE_ID_ varchar(64),
+    CASE_INST_ID_ varchar(64),
+    DELETE_REASON_ varchar(4000),
+    TENANT_ID_ varchar(64),
+    STATE_ varchar(255),
+    primary key (ID_),
+    unique (PROC_INST_ID_)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin;
+
+create table ACT_HI_ACTINST (
+    ID_ varchar(64) not null,
+    PARENT_ACT_INST_ID_ varchar(64),
+    PROC_DEF_KEY_ varchar(255),
+    PROC_DEF_ID_ varchar(64) not null,
+    PROC_INST_ID_ varchar(64) not null,
+    EXECUTION_ID_ varchar(64) not null,
+    ACT_ID_ varchar(255) not null,
+    TASK_ID_ varchar(64),
+    CALL_PROC_INST_ID_ varchar(64),
+    CALL_CASE_INST_ID_ varchar(64),
+    ACT_NAME_ varchar(255),
+    ACT_TYPE_ varchar(255) not null,
+    ASSIGNEE_ varchar(64),
+    START_TIME_ datetime(3) not null,
+    END_TIME_ datetime(3),
+    DURATION_ bigint,
+    ACT_INST_STATE_ integer,
+    SEQUENCE_COUNTER_ bigint,
+    TENANT_ID_ varchar(64),
+    primary key (ID_)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin;
+
+create table ACT_HI_TASKINST (
+    ID_ varchar(64) not null,
+    TASK_DEF_KEY_ varchar(255),
+    PROC_DEF_KEY_ varchar(255),
+    PROC_DEF_ID_ varchar(64),
+    PROC_INST_ID_ varchar(64),
+    EXECUTION_ID_ varchar(64),
+    CASE_DEF_KEY_ varchar(255),
+    CASE_DEF_ID_ varchar(64),
+    CASE_INST_ID_ varchar(64),
+    CASE_EXECUTION_ID_ varchar(64),
+    ACT_INST_ID_ varchar(64),
+    NAME_ varchar(255),
+    PARENT_TASK_ID_ varchar(64),
+    DESCRIPTION_ varchar(4000),
+    OWNER_ varchar(255),
+    ASSIGNEE_ varchar(255),
+    START_TIME_ datetime(3) not null,
+    END_TIME_ datetime(3),
+    DURATION_ bigint,
+    DELETE_REASON_ varchar(4000),
+    PRIORITY_ integer,
+    DUE_DATE_ datetime(3),
+    FOLLOW_UP_DATE_ datetime(3),
+    TENANT_ID_ varchar(64),
+    primary key (ID_)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin;
+
+create table ACT_HI_VARINST (
+    ID_ varchar(64) not null,
+    PROC_DEF_KEY_ varchar(255),
+    PROC_DEF_ID_ varchar(64),
+    PROC_INST_ID_ varchar(64),
+    EXECUTION_ID_ varchar(64),
+    ACT_INST_ID_ varchar(64),
+    CASE_DEF_KEY_ varchar(255),
+    CASE_DEF_ID_ varchar(64),
+    CASE_INST_ID_ varchar(64),
+    CASE_EXECUTION_ID_ varchar(64),
+    TASK_ID_ varchar(64),
+    NAME_ varchar(255) not null,
+    VAR_TYPE_ varchar(100),
+    REV_ integer,
+    BYTEARRAY_ID_ varchar(64),
+    DOUBLE_ double,
+    LONG_ bigint,
+    TEXT_ LONGBLOB,
+    TEXT2_ LONGBLOB,
+    TENANT_ID_ varchar(64),
+    STATE_ varchar(20),
+    primary key (ID_)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin;
+
+create table ACT_HI_DETAIL (
+    ID_ varchar(64) not null,
+    TYPE_ varchar(255) not null,
+    PROC_DEF_KEY_ varchar(255),
+    PROC_DEF_ID_ varchar(64),
+    PROC_INST_ID_ varchar(64),
+    EXECUTION_ID_ varchar(64),
+    CASE_DEF_KEY_ varchar(255),
+    CASE_DEF_ID_ varchar(64),
+    CASE_INST_ID_ varchar(64),
+    CASE_EXECUTION_ID_ varchar(64),
+    TASK_ID_ varchar(64),
+    ACT_INST_ID_ varchar(64),
+    VAR_INST_ID_ varchar(64),
+    NAME_ varchar(255) not null,
+    VAR_TYPE_ varchar(255),
+    REV_ integer,
+    TIME_ datetime(3) not null,
+    BYTEARRAY_ID_ varchar(64),
+    DOUBLE_ double,
+    LONG_ bigint,
+    TEXT_ LONGBLOB,
+    TEXT2_ LONGBLOB,
+    SEQUENCE_COUNTER_ bigint,
+    TENANT_ID_ varchar(64),
+    OPERATION_ID_ varchar(64),
+    primary key (ID_)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin;
+
+create table ACT_HI_IDENTITYLINK (
+    ID_ varchar(64) not null,
+    TIMESTAMP_ timestamp(3) not null,
+    TYPE_ varchar(255),
+    USER_ID_ varchar(255),
+    GROUP_ID_ varchar(255),
+    TASK_ID_ varchar(64),
+    PROC_DEF_ID_ varchar(64),
+    OPERATION_TYPE_ varchar(64),
+    ASSIGNER_ID_ varchar(64),
+    PROC_DEF_KEY_ varchar(255),
+    TENANT_ID_ varchar(64),
+    primary key (ID_)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin;
+
+create table ACT_HI_COMMENT (
+    ID_ varchar(64) not null,
+    TYPE_ varchar(255),
+    TIME_ datetime(3) not null,
+    USER_ID_ varchar(255),
+    TASK_ID_ varchar(64),
+    PROC_INST_ID_ varchar(64),
+    ACTION_ varchar(255),
+    MESSAGE_ varchar(4000),
+    FULL_MSG_ LONGBLOB,
+    TENANT_ID_ varchar(64),
+    primary key (ID_)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin;
+
+create table ACT_HI_ATTACHMENT (
+    ID_ varchar(64) not null,
+    REV_ integer,
+    USER_ID_ varchar(255),
+    NAME_ varchar(255),
+    DESCRIPTION_ varchar(4000),
+    TYPE_ varchar(255),
+    TASK_ID_ varchar(64),
+    PROC_INST_ID_ varchar(64),
+    URL_ varchar(4000),
+    CONTENT_ID_ varchar(64),
+    TENANT_ID_ varchar(64),
+    primary key (ID_)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin;
+
+create table ACT_HI_OP_LOG (
+    ID_ varchar(64) not null,
+    DEPLOYMENT_ID_ varchar(64),
+    PROC_DEF_ID_ varchar(64),
+    PROC_DEF_KEY_ varchar(255),
+    PROC_INST_ID_ varchar(64),
+    EXECUTION_ID_ varchar(64),
+    CASE_DEF_ID_ varchar(64),
+    CASE_INST_ID_ varchar(64),
+    CASE_EXECUTION_ID_ varchar(64),
+    TASK_ID_ varchar(64),
+    JOB_ID_ varchar(64),
+    JOB_DEF_ID_ varchar(64),
+    BATCH_ID_ varchar(64),
+    USER_ID_ varchar(255),
+    TIMESTAMP_ timestamp(3) not null,
+    OPERATION_TYPE_ varchar(64),
+    OPERATION_ID_ varchar(64),
+    ENTITY_TYPE_ varchar(30),
+    PROPERTY_ varchar(64),
+    ORG_VALUE_ varchar(4000),
+    NEW_VALUE_ varchar(4000),
+    TENANT_ID_ varchar(64),
+    primary key (ID_)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin;
+
+create table ACT_HI_INCIDENT (
+  ID_ varchar(64) not null,
+  PROC_DEF_KEY_ varchar(255),
+  PROC_DEF_ID_ varchar(64),
+  PROC_INST_ID_ varchar(64),
+  EXECUTION_ID_ varchar(64),
+  CREATE_TIME_ timestamp(3) not null,
+  END_TIME_ timestamp(3) null,
+  INCIDENT_MSG_ varchar(4000),
+  INCIDENT_TYPE_ varchar(255) not null,
+  ACTIVITY_ID_ varchar(255),
+  CAUSE_INCIDENT_ID_ varchar(64),
+  ROOT_CAUSE_INCIDENT_ID_ varchar(64),
+  CONFIGURATION_ varchar(255),
+  INCIDENT_STATE_ integer,
+  TENANT_ID_ varchar(64),
+  JOB_DEF_ID_ varchar(64),
+  primary key (ID_)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin;
+
+create table ACT_HI_JOB_LOG (
+    ID_ varchar(64) not null,
+    TIMESTAMP_ timestamp(3) not null,
+    JOB_ID_ varchar(64) not null,
+    JOB_DUEDATE_ timestamp(3) NULL,
+    JOB_RETRIES_ integer,
+    JOB_PRIORITY_ bigint NOT NULL DEFAULT 0,
+    JOB_EXCEPTION_MSG_ varchar(4000),
+    JOB_EXCEPTION_STACK_ID_ varchar(64),
+    JOB_STATE_ integer,
+    JOB_DEF_ID_ varchar(64),
+    JOB_DEF_TYPE_ varchar(255),
+    JOB_DEF_CONFIGURATION_ varchar(255),
+    ACT_ID_ varchar(255),
+    EXECUTION_ID_ varchar(64),
+    PROCESS_INSTANCE_ID_ varchar(64),
+    PROCESS_DEF_ID_ varchar(64),
+    PROCESS_DEF_KEY_ varchar(255),
+    DEPLOYMENT_ID_ varchar(64),
+    SEQUENCE_COUNTER_ bigint,
+    TENANT_ID_ varchar(64),
+    primary key (ID_)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin;
+
+create table ACT_HI_BATCH (
+    ID_ varchar(64) not null,
+    TYPE_ varchar(255),
+    TOTAL_JOBS_ integer,
+    JOBS_PER_SEED_ integer,
+    INVOCATIONS_PER_JOB_ integer,
+    SEED_JOB_DEF_ID_ varchar(64),
+    MONITOR_JOB_DEF_ID_ varchar(64),
+    BATCH_JOB_DEF_ID_ varchar(64),
+    TENANT_ID_  varchar(64),
+    START_TIME_ datetime(3) not null,
+    END_TIME_ datetime(3),
+    primary key (ID_)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin;
+
+create table ACT_HI_EXT_TASK_LOG (
+    ID_ varchar(64) not null,
+    TIMESTAMP_ timestamp(3) not null,
+    EXT_TASK_ID_ varchar(64) not null,
+    RETRIES_ integer,
+    TOPIC_NAME_ varchar(255),
+    WORKER_ID_ varchar(255),
+    PRIORITY_ bigint NOT NULL DEFAULT 0,
+    ERROR_MSG_ varchar(4000),
+    ERROR_DETAILS_ID_ varchar(64),
+    ACT_ID_ varchar(255),
+    ACT_INST_ID_ varchar(64),
+    EXECUTION_ID_ varchar(64),
+    PROC_INST_ID_ varchar(64),
+    PROC_DEF_ID_ varchar(64),
+    PROC_DEF_KEY_ varchar(255),
+    TENANT_ID_ varchar(64),
+    STATE_ integer,
+    primary key (ID_)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin;
+
+create index ACT_IDX_HI_PRO_INST_END on ACT_HI_PROCINST(END_TIME_);
+create index ACT_IDX_HI_PRO_I_BUSKEY on ACT_HI_PROCINST(BUSINESS_KEY_);
+create index ACT_IDX_HI_PRO_INST_TENANT_ID on ACT_HI_PROCINST(TENANT_ID_);
+create index ACT_IDX_HI_PRO_INST_PROC_DEF_KEY on ACT_HI_PROCINST(PROC_DEF_KEY_);
+
+create index ACT_IDX_HI_ACT_INST_START on ACT_HI_ACTINST(START_TIME_);
+create index ACT_IDX_HI_ACT_INST_END on ACT_HI_ACTINST(END_TIME_);
+create index ACT_IDX_HI_ACT_INST_PROCINST on ACT_HI_ACTINST(PROC_INST_ID_, ACT_ID_);
+create index ACT_IDX_HI_ACT_INST_COMP on ACT_HI_ACTINST(EXECUTION_ID_, ACT_ID_, END_TIME_, ID_);
+create index ACT_IDX_HI_ACT_INST_STATS on ACT_HI_ACTINST(PROC_DEF_ID_, ACT_ID_, END_TIME_, ACT_INST_STATE_);
+create index ACT_IDX_HI_ACT_INST_TENANT_ID on ACT_HI_ACTINST(TENANT_ID_);
+create index ACT_IDX_HI_ACT_INST_PROC_DEF_KEY on ACT_HI_ACTINST(PROC_DEF_KEY_);
+
+create index ACT_IDX_HI_TASK_INST_TENANT_ID on ACT_HI_TASKINST(TENANT_ID_);
+create index ACT_IDX_HI_TASK_INST_PROC_DEF_KEY on ACT_HI_TASKINST(PROC_DEF_KEY_);
+create index ACT_IDX_HI_TASKINST_PROCINST on ACT_HI_TASKINST(PROC_INST_ID_);
+create index ACT_IDX_HI_TASKINSTID_PROCINST on ACT_HI_TASKINST(ID_,PROC_INST_ID_);
+
+create index ACT_IDX_HI_DETAIL_PROC_INST on ACT_HI_DETAIL(PROC_INST_ID_);
+create index ACT_IDX_HI_DETAIL_ACT_INST on ACT_HI_DETAIL(ACT_INST_ID_);
+create index ACT_IDX_HI_DETAIL_CASE_INST on ACT_HI_DETAIL(CASE_INST_ID_);
+create index ACT_IDX_HI_DETAIL_CASE_EXEC on ACT_HI_DETAIL(CASE_EXECUTION_ID_);
+create index ACT_IDX_HI_DETAIL_TIME on ACT_HI_DETAIL(TIME_);
+create index ACT_IDX_HI_DETAIL_NAME on ACT_HI_DETAIL(NAME_);
+create index ACT_IDX_HI_DETAIL_TASK_ID on ACT_HI_DETAIL(TASK_ID_);
+create index ACT_IDX_HI_DETAIL_TENANT_ID on ACT_HI_DETAIL(TENANT_ID_);
+create index ACT_IDX_HI_DETAIL_PROC_DEF_KEY on ACT_HI_DETAIL(PROC_DEF_KEY_);
+create index ACT_IDX_HI_DETAIL_BYTEAR on ACT_HI_DETAIL(BYTEARRAY_ID_);
+
+create index ACT_IDX_HI_IDENT_LNK_USER on ACT_HI_IDENTITYLINK(USER_ID_);
+create index ACT_IDX_HI_IDENT_LNK_GROUP on ACT_HI_IDENTITYLINK(GROUP_ID_);
+create index ACT_IDX_HI_IDENT_LNK_TENANT_ID on ACT_HI_IDENTITYLINK(TENANT_ID_);
+create index ACT_IDX_HI_IDENT_LNK_PROC_DEF_KEY on ACT_HI_IDENTITYLINK(PROC_DEF_KEY_);
+create index ACT_IDX_HI_IDENT_LINK_TASK on ACT_HI_IDENTITYLINK(TASK_ID_);
+
+create index ACT_IDX_HI_PROCVAR_PROC_INST on ACT_HI_VARINST(PROC_INST_ID_);
+create index ACT_IDX_HI_PROCVAR_NAME_TYPE on ACT_HI_VARINST(NAME_, VAR_TYPE_);
+create index ACT_IDX_HI_CASEVAR_CASE_INST on ACT_HI_VARINST(CASE_INST_ID_);
+create index ACT_IDX_HI_VAR_INST_TENANT_ID on ACT_HI_VARINST(TENANT_ID_);
+create index ACT_IDX_HI_VAR_INST_PROC_DEF_KEY on ACT_HI_VARINST(PROC_DEF_KEY_);
+create index ACT_IDX_HI_VARINST_BYTEAR on ACT_HI_VARINST(BYTEARRAY_ID_);
+
+create index ACT_IDX_HI_INCIDENT_TENANT_ID on ACT_HI_INCIDENT(TENANT_ID_);
+create index ACT_IDX_HI_INCIDENT_PROC_DEF_KEY on ACT_HI_INCIDENT(PROC_DEF_KEY_);
+create index ACT_IDX_HI_INCIDENT_PROCINST on ACT_HI_INCIDENT(PROC_INST_ID_);
+
+create index ACT_IDX_HI_JOB_LOG_PROCINST on ACT_HI_JOB_LOG(PROCESS_INSTANCE_ID_);
+create index ACT_IDX_HI_JOB_LOG_PROCDEF on ACT_HI_JOB_LOG(PROCESS_DEF_ID_);
+create index ACT_IDX_HI_JOB_LOG_TENANT_ID on ACT_HI_JOB_LOG(TENANT_ID_);
+create index ACT_IDX_HI_JOB_LOG_JOB_DEF_ID on ACT_HI_JOB_LOG(JOB_DEF_ID_);
+create index ACT_IDX_HI_JOB_LOG_PROC_DEF_KEY on ACT_HI_JOB_LOG(PROCESS_DEF_KEY_);
+create index ACT_IDX_HI_JOB_LOG_EX_STACK on ACT_HI_JOB_LOG(JOB_EXCEPTION_STACK_ID_);
+
+create index ACT_HI_EXT_TASK_LOG_PROCINST on ACT_HI_EXT_TASK_LOG(PROC_INST_ID_);
+create index ACT_HI_EXT_TASK_LOG_PROCDEF on ACT_HI_EXT_TASK_LOG(PROC_DEF_ID_);
+create index ACT_HI_EXT_TASK_LOG_PROC_DEF_KEY on ACT_HI_EXT_TASK_LOG(PROC_DEF_KEY_);
+create index ACT_HI_EXT_TASK_LOG_TENANT_ID on ACT_HI_EXT_TASK_LOG(TENANT_ID_);
+create index ACT_IDX_HI_EXTTASKLOG_ERRORDET on ACT_HI_EXT_TASK_LOG(ERROR_DETAILS_ID_);
+
+create index ACT_IDX_HI_OP_LOG_PROCINST on ACT_HI_OP_LOG(PROC_INST_ID_);
+create index ACT_IDX_HI_OP_LOG_PROCDEF on ACT_HI_OP_LOG(PROC_DEF_ID_);
+
+create index ACT_IDX_HI_COMMENT_TASK on ACT_HI_COMMENT(TASK_ID_);
+create index ACT_IDX_HI_COMMENT_PROCINST on ACT_HI_COMMENT(PROC_INST_ID_);
+
+create index ACT_IDX_HI_ATTACHMENT_CONTENT on ACT_HI_ATTACHMENT(CONTENT_ID_);
+create index ACT_IDX_HI_ATTACHMENT_PROCINST on ACT_HI_ATTACHMENT(PROC_INST_ID_);
+create index ACT_IDX_HI_ATTACHMENT_TASK on ACT_HI_ATTACHMENT(TASK_ID_);
+create table ACT_HI_CASEINST (
+    ID_ varchar(64) not null,
+    CASE_INST_ID_ varchar(64) not null,
+    BUSINESS_KEY_ varchar(255),
+    CASE_DEF_ID_ varchar(64) not null,
+    CREATE_TIME_ datetime(3) not null,
+    CLOSE_TIME_ datetime(3),
+    DURATION_ bigint,
+    STATE_ integer,
+    CREATE_USER_ID_ varchar(255),
+    SUPER_CASE_INSTANCE_ID_ varchar(64),
+    SUPER_PROCESS_INSTANCE_ID_ varchar(64),
+    TENANT_ID_ varchar(64),
+    primary key (ID_),
+    unique (CASE_INST_ID_)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin;
+
+create table ACT_HI_CASEACTINST (
+    ID_ varchar(64) not null,
+    PARENT_ACT_INST_ID_ varchar(64),
+    CASE_DEF_ID_ varchar(64) not null,
+    CASE_INST_ID_ varchar(64) not null,
+    CASE_ACT_ID_ varchar(255) not null,
+    TASK_ID_ varchar(64),
+    CALL_PROC_INST_ID_ varchar(64),
+    CALL_CASE_INST_ID_ varchar(64),
+    CASE_ACT_NAME_ varchar(255),
+    CASE_ACT_TYPE_ varchar(255),
+    CREATE_TIME_ datetime(3) not null,
+    END_TIME_ datetime(3),
+    DURATION_ bigint,
+    STATE_ integer,
+    REQUIRED_ boolean,
+    TENANT_ID_ varchar(64),
+    primary key (ID_)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin;
+
+create index ACT_IDX_HI_CAS_I_CLOSE on ACT_HI_CASEINST(CLOSE_TIME_);
+create index ACT_IDX_HI_CAS_I_BUSKEY on ACT_HI_CASEINST(BUSINESS_KEY_);
+create index ACT_IDX_HI_CAS_I_TENANT_ID on ACT_HI_CASEINST(TENANT_ID_);
+create index ACT_IDX_HI_CAS_A_I_CREATE on ACT_HI_CASEACTINST(CREATE_TIME_);
+create index ACT_IDX_HI_CAS_A_I_END on ACT_HI_CASEACTINST(END_TIME_);
+create index ACT_IDX_HI_CAS_A_I_COMP on ACT_HI_CASEACTINST(CASE_ACT_ID_, END_TIME_, ID_);
+create index ACT_IDX_HI_CAS_A_I_CASEINST on ACT_HI_CASEACTINST(CASE_INST_ID_, CASE_ACT_ID_);
+create index ACT_IDX_HI_CAS_A_I_TENANT_ID on ACT_HI_CASEACTINST(TENANT_ID_);
+-- create history decision instance table --
+create table ACT_HI_DECINST (
+    ID_ varchar(64) NOT NULL,
+    DEC_DEF_ID_ varchar(64) NOT NULL,
+    DEC_DEF_KEY_ varchar(255) NOT NULL,
+    DEC_DEF_NAME_ varchar(255),
+    PROC_DEF_KEY_ varchar(255),
+    PROC_DEF_ID_ varchar(64),
+    PROC_INST_ID_ varchar(64),
+    CASE_DEF_KEY_ varchar(255),
+    CASE_DEF_ID_ varchar(64),
+    CASE_INST_ID_ varchar(64),
+    ACT_INST_ID_ varchar(64),
+    ACT_ID_ varchar(255),
+    EVAL_TIME_ datetime(3) not null,
+    COLLECT_VALUE_ double,
+    USER_ID_ varchar(255),
+    ROOT_DEC_INST_ID_ varchar(64),
+    DEC_REQ_ID_ varchar(64),
+    DEC_REQ_KEY_ varchar(255),
+    TENANT_ID_ varchar(64),
+    primary key (ID_)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin;
+
+-- create history decision input table --
+create table ACT_HI_DEC_IN (
+    ID_ varchar(64) NOT NULL,
+    DEC_INST_ID_ varchar(64) NOT NULL,
+    CLAUSE_ID_ varchar(64),
+    CLAUSE_NAME_ varchar(255),
+    VAR_TYPE_ varchar(100),
+    BYTEARRAY_ID_ varchar(64),
+    DOUBLE_ double,
+    LONG_ bigint,
+    TEXT_ LONGBLOB,
+    TEXT2_ LONGBLOB,
+    TENANT_ID_ varchar(64),
+    primary key (ID_)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin;
+
+-- create history decision output table --
+create table ACT_HI_DEC_OUT (
+    ID_ varchar(64) NOT NULL,
+    DEC_INST_ID_ varchar(64) NOT NULL,
+    CLAUSE_ID_ varchar(64),
+    CLAUSE_NAME_ varchar(255),
+    RULE_ID_ varchar(64),
+    RULE_ORDER_ integer,
+    VAR_NAME_ varchar(255),
+    VAR_TYPE_ varchar(100),
+    BYTEARRAY_ID_ varchar(64),
+    DOUBLE_ double,
+    LONG_ bigint,
+    TEXT_ LONGBLOB,
+    TEXT2_ LONGBLOB,
+    TENANT_ID_ varchar(64),
+    primary key (ID_)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin;
+
+
+create index ACT_IDX_HI_DEC_INST_ID on ACT_HI_DECINST(DEC_DEF_ID_);
+create index ACT_IDX_HI_DEC_INST_KEY on ACT_HI_DECINST(DEC_DEF_KEY_);
+create index ACT_IDX_HI_DEC_INST_PI on ACT_HI_DECINST(PROC_INST_ID_);
+create index ACT_IDX_HI_DEC_INST_CI on ACT_HI_DECINST(CASE_INST_ID_);
+create index ACT_IDX_HI_DEC_INST_ACT on ACT_HI_DECINST(ACT_ID_);
+create index ACT_IDX_HI_DEC_INST_ACT_INST on ACT_HI_DECINST(ACT_INST_ID_);
+create index ACT_IDX_HI_DEC_INST_TIME on ACT_HI_DECINST(EVAL_TIME_);
+create index ACT_IDX_HI_DEC_INST_TENANT_ID on ACT_HI_DECINST(TENANT_ID_);
+create index ACT_IDX_HI_DEC_INST_ROOT_ID on ACT_HI_DECINST(ROOT_DEC_INST_ID_);
+create index ACT_IDX_HI_DEC_INST_REQ_ID on ACT_HI_DECINST(DEC_REQ_ID_);
+create index ACT_IDX_HI_DEC_INST_REQ_KEY on ACT_HI_DECINST(DEC_REQ_KEY_);
+
+
+create index ACT_IDX_HI_DEC_IN_INST on ACT_HI_DEC_IN(DEC_INST_ID_);
+create index ACT_IDX_HI_DEC_IN_CLAUSE on ACT_HI_DEC_IN(DEC_INST_ID_, CLAUSE_ID_);
+
+create index ACT_IDX_HI_DEC_OUT_INST on ACT_HI_DEC_OUT(DEC_INST_ID_);
+create index ACT_IDX_HI_DEC_OUT_RULE on ACT_HI_DEC_OUT(RULE_ORDER_, CLAUSE_ID_);
+
+-- mariadb_identity_7.8.0-ee
+
+create table ACT_ID_GROUP (
+    ID_ varchar(64),
+    REV_ integer,
+    NAME_ varchar(255),
+    TYPE_ varchar(255),
+    primary key (ID_)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin;
+
+create table ACT_ID_MEMBERSHIP (
+    USER_ID_ varchar(64),
+    GROUP_ID_ varchar(64),
+    primary key (USER_ID_, GROUP_ID_)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin;
+
+create table ACT_ID_USER (
+    ID_ varchar(64),
+    REV_ integer,
+    FIRST_ varchar(255),
+    LAST_ varchar(255),
+    EMAIL_ varchar(255),
+    PWD_ varchar(255),
+    SALT_ varchar(255),
+    PICTURE_ID_ varchar(64),
+    primary key (ID_)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin;
+
+create table ACT_ID_INFO (
+    ID_ varchar(64),
+    REV_ integer,
+    USER_ID_ varchar(64),
+    TYPE_ varchar(64),
+    KEY_ varchar(255),
+    VALUE_ varchar(255),
+    PASSWORD_ LONGBLOB,
+    PARENT_ID_ varchar(255),
+    primary key (ID_)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin;
+
+create table ACT_ID_TENANT (
+    ID_ varchar(64),
+    REV_ integer,
+    NAME_ varchar(255),
+    primary key (ID_)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin;
+
+create table ACT_ID_TENANT_MEMBER (
+    ID_ varchar(64) not null,
+    TENANT_ID_ varchar(64) not null,
+    USER_ID_ varchar(64),
+    GROUP_ID_ varchar(64),
+    primary key (ID_)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin;
+
+alter table ACT_ID_MEMBERSHIP
+    add constraint ACT_FK_MEMB_GROUP
+    foreign key (GROUP_ID_)
+    references ACT_ID_GROUP (ID_);
+
+alter table ACT_ID_MEMBERSHIP
+    add constraint ACT_FK_MEMB_USER
+    foreign key (USER_ID_)
+    references ACT_ID_USER (ID_);
+
+alter table ACT_ID_TENANT_MEMBER
+    add constraint ACT_UNIQ_TENANT_MEMB_USER
+    unique (TENANT_ID_, USER_ID_);
+
+alter table ACT_ID_TENANT_MEMBER
+    add constraint ACT_UNIQ_TENANT_MEMB_GROUP
+    unique (TENANT_ID_, GROUP_ID_);
+
+alter table ACT_ID_TENANT_MEMBER
+    add constraint ACT_FK_TENANT_MEMB
+    foreign key (TENANT_ID_)
+    references ACT_ID_TENANT (ID_);
+
+alter table ACT_ID_TENANT_MEMBER
+    add constraint ACT_FK_TENANT_MEMB_USER
+    foreign key (USER_ID_)
+    references ACT_ID_USER (ID_);
+
+alter table ACT_ID_TENANT_MEMBER
+    add constraint ACT_FK_TENANT_MEMB_GROUP
+    foreign key (GROUP_ID_)
+    references ACT_ID_GROUP (ID_);
+
+-- additional changes for MSO
+
+-- Table for the urn mapping entries
+CREATE TABLE `mso_urn_mapping` (
+`NAME_` VARCHAR(64) NOT NULL COLLATE 'utf8_bin',
+`VALUE_` VARCHAR(300) NULL DEFAULT NULL COLLATE 'utf8_bin',
+`REV_` INT(11) NULL DEFAULT NULL
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin;
+
+-- setting history level from full (id=3) to audit (id=2)
+update act_ge_property set value_='2' where name_='historyLevel';
\ No newline at end of file
diff --git a/packages/root-pack-extras/config-resources/mariadb/db-sql-scripts/camunda/mariadb_engine_7.8_patch_7.8.0_to_7.8.2.sql b/packages/root-pack-extras/config-resources/mariadb/db-sql-scripts/camunda/mariadb_engine_7.8_patch_7.8.0_to_7.8.2.sql
new file mode 100644
index 0000000..7836957
--- /dev/null
+++ b/packages/root-pack-extras/config-resources/mariadb/db-sql-scripts/camunda/mariadb_engine_7.8_patch_7.8.0_to_7.8.2.sql
@@ -0,0 +1,7 @@
+-- 7.8.0 to 7.8.2 upgrade
+
+USE `camundabpmn`;
+-- https://app.camunda.com/jira/browse/CAM-8485
+drop index ACT_IDX_HI_ACT_INST_STATS on ACT_HI_ACTINST;
+create index ACT_IDX_HI_ACT_INST_STATS on ACT_HI_ACTINST(PROC_DEF_ID_, PROC_INST_ID_, ACT_ID_, END_TIME_, ACT_INST_STATE_);
+create index ACT_IDX_HI_PRO_INST_PROC_TIME on ACT_HI_PROCINST(START_TIME_, END_TIME_);
diff --git a/packages/root-pack-extras/config-resources/mariadb/db-sql-scripts/camunda/mysql_create_camunda_admin.sql b/packages/root-pack-extras/config-resources/mariadb/db-sql-scripts/camunda/mysql_create_camunda_admin.sql
index 3beeaf1..4472fbe 100644
--- a/packages/root-pack-extras/config-resources/mariadb/db-sql-scripts/camunda/mysql_create_camunda_admin.sql
+++ b/packages/root-pack-extras/config-resources/mariadb/db-sql-scripts/camunda/mysql_create_camunda_admin.sql
@@ -1,9 +1,9 @@
-USE camundabpmn;
-
-INSERT INTO `act_id_user` VALUES ('admin',1,'admin','user','camundaadmin@openecomp.org','{SHA}Y7MVubSDgzJeaulJRLN2dFyNCyc=',NULL);
-
-INSERT INTO `act_id_group` VALUES ('camunda-admin',1,'camunda BPM Administrators','SYSTEM');
-
-INSERT INTO `act_id_membership` VALUES ('admin','camunda-admin');
-
-INSERT INTO `act_ru_authorization` VALUES ('4ca68335-b7c5-11e6-b411-0242ac110003',1,1,NULL,'admin',1,'admin',2147483647),('4ca91b46-b7c5-11e6-b411-0242ac110003',1,1,'camunda-admin',NULL,2,'camunda-admin',2),('4cab3e27-b7c5-11e6-b411-0242ac110003',1,1,'camunda-admin',NULL,0,'*',2147483647),('4cadd638-b7c5-11e6-b411-0242ac110003',1,1,'camunda-admin',NULL,1,'*',2147483647),('4caf0eb9-b7c5-11e6-b411-0242ac110003',1,1,'camunda-admin',NULL,2,'*',2147483647),('4caff91a-b7c5-11e6-b411-0242ac110003',1,1,'camunda-admin',NULL,3,'*',2147483647),('4cb10a8b-b7c5-11e6-b411-0242ac110003',1,1,'camunda-admin',NULL,4,'*',2147483647),('4cb2430c-b7c5-11e6-b411-0242ac110003',1,1,'camunda-admin',NULL,5,'*',2147483647),('4cb32d6d-b7c5-11e6-b411-0242ac110003',1,1,'camunda-admin',NULL,6,'*',2147483647),('4cb43ede-b7c5-11e6-b411-0242ac110003',1,1,'camunda-admin',NULL,7,'*',2147483647),('4cb5293f-b7c5-11e6-b411-0242ac110003',1,1,'camunda-admin',NULL,8,'*',2147483647),('4cb5ec90-b7c5-11e6-b411-0242ac110003',1,1,'camunda-admin',NULL,9,'*',2147483647);
+USE camundabpmn;
+
+INSERT INTO `act_id_user` VALUES ('admin',1,'admin','user','camundaadmin@openecomp.org','{SHA}Y7MVubSDgzJeaulJRLN2dFyNCyc=',NULL);
+
+INSERT INTO `act_id_group` VALUES ('camunda-admin',1,'camunda BPM Administrators','SYSTEM');
+
+INSERT INTO `act_id_membership` VALUES ('admin','camunda-admin');
+
+INSERT INTO `act_ru_authorization` VALUES ('4ca68335-b7c5-11e6-b411-0242ac110003',1,1,NULL,'admin',1,'admin',2147483647),('4ca91b46-b7c5-11e6-b411-0242ac110003',1,1,'camunda-admin',NULL,2,'camunda-admin',2),('4cab3e27-b7c5-11e6-b411-0242ac110003',1,1,'camunda-admin',NULL,0,'*',2147483647),('4cadd638-b7c5-11e6-b411-0242ac110003',1,1,'camunda-admin',NULL,1,'*',2147483647),('4caf0eb9-b7c5-11e6-b411-0242ac110003',1,1,'camunda-admin',NULL,2,'*',2147483647),('4caff91a-b7c5-11e6-b411-0242ac110003',1,1,'camunda-admin',NULL,3,'*',2147483647),('4cb10a8b-b7c5-11e6-b411-0242ac110003',1,1,'camunda-admin',NULL,4,'*',2147483647),('4cb2430c-b7c5-11e6-b411-0242ac110003',1,1,'camunda-admin',NULL,5,'*',2147483647),('4cb32d6d-b7c5-11e6-b411-0242ac110003',1,1,'camunda-admin',NULL,6,'*',2147483647),('4cb43ede-b7c5-11e6-b411-0242ac110003',1,1,'camunda-admin',NULL,7,'*',2147483647),('4cb5293f-b7c5-11e6-b411-0242ac110003',1,1,'camunda-admin',NULL,8,'*',2147483647),('4cb5ec90-b7c5-11e6-b411-0242ac110003',1,1,'camunda-admin',NULL,9,'*',2147483647);
diff --git a/packages/root-pack-extras/config-resources/mariadb/db-sql-scripts/sub-sql-files/catalog_add_constraints.sql b/packages/root-pack-extras/config-resources/mariadb/db-sql-scripts/old-scripts/catalog_add_constraints.sql
similarity index 100%
rename from packages/root-pack-extras/config-resources/mariadb/db-sql-scripts/sub-sql-files/catalog_add_constraints.sql
rename to packages/root-pack-extras/config-resources/mariadb/db-sql-scripts/old-scripts/catalog_add_constraints.sql
diff --git a/packages/root-pack-extras/config-resources/mariadb/db-sql-scripts/sub-sql-files/catalog_timestamp_mso_db.sql b/packages/root-pack-extras/config-resources/mariadb/db-sql-scripts/old-scripts/catalog_timestamp_mso_db.sql
similarity index 100%
rename from packages/root-pack-extras/config-resources/mariadb/db-sql-scripts/sub-sql-files/catalog_timestamp_mso_db.sql
rename to packages/root-pack-extras/config-resources/mariadb/db-sql-scripts/old-scripts/catalog_timestamp_mso_db.sql
diff --git a/packages/root-pack-extras/config-resources/mariadb/db-sql-scripts/sub-sql-files/site_status_updated_timestamp.sql b/packages/root-pack-extras/config-resources/mariadb/db-sql-scripts/old-scripts/site_status_updated_timestamp.sql
similarity index 100%
rename from packages/root-pack-extras/config-resources/mariadb/db-sql-scripts/sub-sql-files/site_status_updated_timestamp.sql
rename to packages/root-pack-extras/config-resources/mariadb/db-sql-scripts/old-scripts/site_status_updated_timestamp.sql
diff --git a/packages/root-pack-extras/config-resources/mariadb/db-sql-scripts/sub-sql-files/catalogdb/V2.10__UpdateNorthboundRequestToUseInstance.sql b/packages/root-pack-extras/config-resources/mariadb/db-sql-scripts/sub-sql-files/catalogdb/V2.10__UpdateNorthboundRequestToUseInstance.sql
new file mode 100644
index 0000000..5ee4deb
--- /dev/null
+++ b/packages/root-pack-extras/config-resources/mariadb/db-sql-scripts/sub-sql-files/catalogdb/V2.10__UpdateNorthboundRequestToUseInstance.sql
@@ -0,0 +1,24 @@
+USE catalogdb;
+
+
+  
+UPDATE northbound_request_ref_lookup SET ACTION = 'createInstance' WHERE MACRO_ACTION = 'Service-Create';
+UPDATE northbound_request_ref_lookup SET ACTION = 'deleteInstance' WHERE MACRO_ACTION = 'Service-Delete';
+UPDATE northbound_request_ref_lookup SET ACTION = 'assignInstance' WHERE MACRO_ACTION = 'Service-Macro-Assign';
+UPDATE northbound_request_ref_lookup SET ACTION = 'activateInstance' WHERE MACRO_ACTION = 'Service-Macro-Activate';
+UPDATE northbound_request_ref_lookup SET ACTION = 'unassignInstance' WHERE MACRO_ACTION = 'Service-Macro-Unassign';
+UPDATE northbound_request_ref_lookup SET ACTION = 'createInstance' WHERE MACRO_ACTION = 'Service-Macro-Create';
+UPDATE northbound_request_ref_lookup SET ACTION = 'deleteInstance' WHERE MACRO_ACTION = 'Service-Macro-Delete';
+UPDATE northbound_request_ref_lookup SET ACTION = 'createInstance' WHERE MACRO_ACTION = 'Network-Create';
+UPDATE northbound_request_ref_lookup SET ACTION = 'deleteInstance' WHERE MACRO_ACTION = 'Network-Delete';
+UPDATE northbound_request_ref_lookup SET ACTION = 'replaceInstance' WHERE MACRO_ACTION = 'VNF-Macro-Replace';
+UPDATE northbound_request_ref_lookup SET ACTION = 'createInstance' WHERE MACRO_ACTION = 'VNF-Create';
+UPDATE northbound_request_ref_lookup SET ACTION = 'deleteInstance' WHERE MACRO_ACTION = 'VNF-Delete';
+UPDATE northbound_request_ref_lookup SET ACTION = 'createInstance' WHERE MACRO_ACTION = 'VolumeGroup-Create';
+UPDATE northbound_request_ref_lookup SET ACTION = 'deleteInstance' WHERE MACRO_ACTION = 'VolumeGroup-Delete';
+UPDATE northbound_request_ref_lookup SET ACTION = 'createInstance' WHERE MACRO_ACTION = 'VFModule-Create';
+UPDATE northbound_request_ref_lookup SET ACTION = 'deleteInstance' WHERE MACRO_ACTION = 'VFModule-Delete';
+UPDATE northbound_request_ref_lookup SET ACTION = 'createInstance' WHERE MACRO_ACTION = 'NetworkCollection-Macro-Create';
+UPDATE northbound_request_ref_lookup SET ACTION = 'deleteInstance' WHERE MACRO_ACTION = 'NetworkCollection-Macro-Delete';
+UPDATE northbound_request_ref_lookup SET ACTION = 'deleteInstance' WHERE MACRO_ACTION = 'AVPNBonding-Macro-Delete';
+UPDATE northbound_request_ref_lookup SET ACTION = 'createInstance' WHERE MACRO_ACTION = 'AVPNBonding-Macro-Create';
\ No newline at end of file
diff --git a/packages/root-pack-extras/config-resources/mariadb/db-sql-scripts/sub-sql-files/catalogdb/V3.0__UpdateOrchFlowTableWithATTFlows.sql b/packages/root-pack-extras/config-resources/mariadb/db-sql-scripts/sub-sql-files/catalogdb/V3.0__UpdateOrchFlowTableWithATTFlows.sql
new file mode 100644
index 0000000..ec98485
--- /dev/null
+++ b/packages/root-pack-extras/config-resources/mariadb/db-sql-scripts/sub-sql-files/catalogdb/V3.0__UpdateOrchFlowTableWithATTFlows.sql
@@ -0,0 +1,16 @@
+USE catalogdb;
+
+UPDATE orchestration_flow_reference SET FLOW_NAME = 'AssignServiceInstanceATTBB' WHERE FLOW_NAME = 'AssignServiceInstanceBB';
+UPDATE orchestration_flow_reference SET FLOW_NAME = 'ActivateServiceInstanceATTBB' WHERE FLOW_NAME = 'ActivateServiceInstanceBB';
+UPDATE orchestration_flow_reference SET FLOW_NAME = 'DeactivateServiceInstanceATTBB' WHERE FLOW_NAME = 'DeactivateServiceInstanceBB';
+UPDATE orchestration_flow_reference SET FLOW_NAME = 'UnassignServiceInstanceATTBB' WHERE FLOW_NAME = 'UnassignServiceInstanceBB';
+
+UPDATE rainy_day_handler_macro SET FLOW_NAME = 'AssignServiceInstanceATTBB' WHERE FLOW_NAME = 'AssignServiceInstanceBB';
+UPDATE rainy_day_handler_macro SET FLOW_NAME = 'ActivateServiceInstanceATTBB' WHERE FLOW_NAME = 'ActivateServiceInstanceBB';
+UPDATE rainy_day_handler_macro SET FLOW_NAME = 'DeactivateServiceInstanceATTBB' WHERE FLOW_NAME = 'DeactivateServiceInstanceBB';
+UPDATE rainy_day_handler_macro SET FLOW_NAME = 'UnassignServiceInstanceATTBB' WHERE FLOW_NAME = 'UnassignServiceInstanceBB';
+
+UPDATE building_block_detail SET BUILDING_BLOCK_NAME = 'AssignServiceInstanceATTBB' WHERE BUILDING_BLOCK_NAME = 'AssignServiceInstanceBB';
+UPDATE building_block_detail SET BUILDING_BLOCK_NAME = 'ActivateServiceInstanceATTBB' WHERE BUILDING_BLOCK_NAME = 'ActivateServiceInstanceBB';
+UPDATE building_block_detail SET BUILDING_BLOCK_NAME = 'DeactivateServiceInstanceATTBB' WHERE BUILDING_BLOCK_NAME = 'DeactivateServiceInstanceBB';
+UPDATE building_block_detail SET BUILDING_BLOCK_NAME = 'UnassignServiceInstanceATTBB' WHERE BUILDING_BLOCK_NAME = 'UnassignServiceInstanceBB';
\ No newline at end of file
diff --git a/packages/root-pack-extras/config-resources/mysql/db-sql-scripts/camunda/archive_mariadb_camunda_tables.sql b/packages/root-pack-extras/config-resources/mysql/db-sql-scripts/camunda/archive_mariadb_camunda_tables.sql
index fe5ec22..43a8791 100644
--- a/packages/root-pack-extras/config-resources/mysql/db-sql-scripts/camunda/archive_mariadb_camunda_tables.sql
+++ b/packages/root-pack-extras/config-resources/mysql/db-sql-scripts/camunda/archive_mariadb_camunda_tables.sql
@@ -1,665 +1,665 @@
--- Fix for https://itrack.web.att.com/browse/AJSCCMDA-90 --
-use camundabpmn;
-
-/* uncomment below statement and run for your db, e.g. : use camundabpmn;
- */
--- use <db_name>;
-
-/* 
-Drop a archive tables
-*/
-/*-- TMP_ARCHIVING_PROCINST */
-DROP TABLE IF EXISTS TMP_ARCHIVING_PROCINST;
-
-/*-- TMP_ARCHIVING_BYTEARRAY */
-DROP TABLE IF EXISTS TMP_ARCHIVING_BYTEARRAY;
-
-/*-- TMP LOG TABLE */
-DROP TABLE IF EXISTS TMPLOGTABLE;
-
-/* -- Camunda Hi Tables --*/
-DROP TABLE IF EXISTS Camunda_Hi_Tables;
-
-/* drop own extentions columns:
-alter table  ARCHIVE_ACT_HI_PROCINST DROP (STAT_EXECUTION_ID, STAT_EXECUTION_TS);
-alter table  ARCHIVE_ACT_HI_ACTINST DROP (STAT_EXECUTION_ID, STAT_EXECUTION_TS);
-alter table  ARCHIVE_ACT_HI_TASKINST DROP (STAT_EXECUTION_ID, STAT_EXECUTION_TS);
-alter table  ARCHIVE_ACT_HI_VARINST DROP (STAT_EXECUTION_ID, STAT_EXECUTION_TS);
-alter table  ARCHIVE_ACT_HI_DETAIL DROP (STAT_EXECUTION_ID, STAT_EXECUTION_TS);
-alter table  ARCHIVE_ACT_HI_COMMENT DROP (STAT_EXECUTION_ID, STAT_EXECUTION_TS);
-alter table  ARCHIVE_ACT_HI_ATTACHMENT DROP (STAT_EXECUTION_ID, STAT_EXECUTION_TS);
-alter table  ARCHIVE_ACT_HI_OP_LOG DROP (STAT_EXECUTION_ID, STAT_EXECUTION_TS);
-alter table  ARCHIVE_ACT_HI_INCIDENT DROP (STAT_EXECUTION_ID, STAT_EXECUTION_TS);
-*/
-
-/*--#1 */
-DROP TABLE IF EXISTS ARCHIVE_ACT_HI_PROCINST;
-/*--#2 */
-DROP TABLE IF EXISTS ARCHIVE_ACT_HI_ACTINST;
-/*--#3 */
-DROP TABLE IF EXISTS ARCHIVE_ACT_HI_TASKINST;
-/*--#4 */
-DROP TABLE IF EXISTS ARCHIVE_ACT_HI_VARINST;
-/*--#5 */
-DROP TABLE IF EXISTS ARCHIVE_ACT_HI_DETAIL;
-/*--#6 */
-DROP TABLE IF EXISTS ARCHIVE_ACT_HI_COMMENT;
-/*--#7 */
-DROP TABLE IF EXISTS ARCHIVE_ACT_HI_ATTACHMENT;
-/*--#8 */
-DROP TABLE IF EXISTS ARCHIVE_ACT_HI_OP_LOG;
-/*--#9 */
-DROP TABLE IF EXISTS ARCHIVE_ACT_HI_INCIDENT;
-/*--#10 */
-DROP TABLE IF EXISTS ARCHIVE_ACT_GE_BYTEARRAY;
-
-/* drop PL SQL procedures: */
-DROP PROCEDURE IF EXISTS ARCHIVE_CAMUNDA_HISTORY;
-DROP PROCEDURE IF EXISTS ROLLB_ARCHIVE_CAMUNDA_HISTORY;
- 
-/*-- Sequence */
--- as sequence drop doesn't work automatically in MariaDB, use this procedure to drop sequence
- DROP PROCEDURE IF EXISTS DropSequence;
- 
-/*-- To Drop the MariaDB specific user defined procedures and functions */
-DROP FUNCTION IF EXISTS NextVal;
-DROP PROCEDURE IF EXISTS CreateSequence;
-DROP PROCEDURE IF EXISTS DropSequence; 
-DROP TABLE IF EXISTS _sequences;
-
-/* -- If only the sequence: STAT_EXECUTION_SEQ needs to be removed, uncomment and use below statements --*/
-/*
-  DELIMITER //
-  CREATE PROCEDURE DropSequence (vname VARCHAR(30))
-  BEGIN
-     -- Drop the sequence
-     DELETE FROM _sequences WHERE name = vname;  
-  END
-  //
-  DELIMITER ;
-
--- use the above procedure to drop sequence 
-CALL DropSequence('STAT_EXECUTION_SEQ');
-*/
-
-
-
-
-
-/*
- 1. Create starts - Add some Camunda Indexes to history schema part (for Archiving)
-*/
-create INDEX IF NOT EXISTS IDX_ACT_HI_TASKINST_PIID ON ACT_HI_TASKINST (PROC_INST_ID_); 
-create INDEX IF NOT EXISTS IDX_ACT_HI_COMMENT_PIID ON ACT_HI_COMMENT (PROC_INST_ID_);
-create INDEX IF NOT EXISTS IDX_ACT_HI_ATTACHMENT_PIID ON ACT_HI_ATTACHMENT (PROC_INST_ID_);
-create INDEX IF NOT EXISTS IDX_ACT_HI_OP_LOG_PIID ON ACT_HI_OP_LOG (PROC_INST_ID_);
-create INDEX IF NOT EXISTS IDX_ACT_HI_INCIDENT_PIID ON ACT_HI_INCIDENT (PROC_INST_ID_);
-create INDEX IF NOT EXISTS IDX_ACT_HI_ACTINST_PIID ON ACT_HI_ACTINST(PROC_INST_ID_); 
-
-
-/*
- 2.  Create Archiving Tables in current schema 
-*/
-
-/*-- TMP_ARCHIVING_PROCINST */
-CREATE TABLE TMP_ARCHIVING_PROCINST
-( PROC_INST_ID_ varchar(64) not null,
-  END_TIME_ datetime(3)
-);
-CREATE INDEX AI_TMP_ARCH_PROCINST_PI_ID ON TMP_ARCHIVING_PROCINST(PROC_INST_ID_);
-
-/*-- TMP_ARCHIVING_BYTEARRAY */
-CREATE TABLE TMP_ARCHIVING_BYTEARRAY
-( BYTEARRAY_ID_ varchar(64) not null,
-  PROC_INST_ID_ varchar(64)
-);
-CREATE INDEX AI_TMP_ARCH_BYTEARRAY_BAID ON TMP_ARCHIVING_BYTEARRAY(BYTEARRAY_ID_);
-
-
-/*--#1 ARCHIVE_ACT_HI_PROCINST; */
-create TABLE ARCHIVE_ACT_HI_PROCINST
-AS ( select * from ACT_HI_PROCINST where 1=0);
-
-create index AI_HI_PROCINST_END_TIME on ARCHIVE_ACT_HI_PROCINST(END_TIME_);
-ALTER TABLE ARCHIVE_ACT_HI_PROCINST ADD CONSTRAINT  ARCHIVE_ACT_HI_PROCINST_UQ UNIQUE ( PROC_INST_ID_);
-
-/*--#2   ARCHIVE_ACT_HI_ACTINST; */
-create TABLE ARCHIVE_ACT_HI_ACTINST
-AS ( select * from ACT_HI_ACTINST where 1=0);
-
-create index AI_HI_ACTINST_PROC_INST_ID on ARCHIVE_ACT_HI_ACTINST(PROC_INST_ID_);
-create index AI_HI_ACTINST_END_TIME on ARCHIVE_ACT_HI_ACTINST(END_TIME_);
-
-/*--#3  ARCHIVE_ACT_HI_TASKINST; */
-create TABLE ARCHIVE_ACT_HI_TASKINST
-AS ( select * from ACT_HI_TASKINST where 1=0);
-
-create index AI_HI_TASKINST_PROC_INST_ID on ARCHIVE_ACT_HI_TASKINST(PROC_INST_ID_);
-create index AI_HI_TASKINST_END_TIME on ARCHIVE_ACT_HI_TASKINST(END_TIME_);
-
-/*--#4 ARCHIVE_ACT_HI_VARINST; */
-create TABLE ARCHIVE_ACT_HI_VARINST
-AS ( select * from ACT_HI_VARINST where 1=0);
-
-create index AI_HI_VARINST_PROC_INST_ID on ARCHIVE_ACT_HI_VARINST(PROC_INST_ID_);
-
-/*--#5 ARCHIVE_ACT_HI_DETAIL; */
-create TABLE ARCHIVE_ACT_HI_DETAIL
-AS ( select * from ACT_HI_DETAIL where 1=0);
-
-create index AI_HI_DETAIL_PROC_INST_ID on ARCHIVE_ACT_HI_DETAIL(PROC_INST_ID_);
-create index AI_HI_DETAIL_TIME on ARCHIVE_ACT_HI_DETAIL(TIME_);
-
-/*--#6 ARCHIVE_ACT_HI_COMMENT; */
-create TABLE ARCHIVE_ACT_HI_COMMENT
-AS ( select * from ACT_HI_COMMENT where 1=0);
-
-create index AI_HI_COMMENT_PROC_INST_ID on ARCHIVE_ACT_HI_COMMENT(PROC_INST_ID_);
-create index AI_HI_COMMENT_TIME on ARCHIVE_ACT_HI_COMMENT(TIME_);
-
-/*--#7 ARCHIVE_ACT_HI_ATTACHMENT; */
-create TABLE ARCHIVE_ACT_HI_ATTACHMENT
-AS ( select * from ACT_HI_ATTACHMENT where 1=0);
-
-create index AI_HI_ATTACHMENT_PROC_INST_ID on ARCHIVE_ACT_HI_ATTACHMENT(PROC_INST_ID_);
-
-/*--#8 ARCHIVE_ACT_HI_OP_LOG; */
-create TABLE ARCHIVE_ACT_HI_OP_LOG
-AS ( select * from ACT_HI_OP_LOG where 1=0);
-
-create index AI_HI_OP_LOG_PROC_INST_ID on ARCHIVE_ACT_HI_OP_LOG(PROC_INST_ID_);
-create index AI_HI_OP_LOG_TIMESTAMP on ARCHIVE_ACT_HI_OP_LOG(TIMESTAMP_);
-
-/*--#9 ARCHIVE_ACT_HI_INCIDENT; */
-create TABLE ARCHIVE_ACT_HI_INCIDENT
-AS ( select * from ACT_HI_INCIDENT where 1=0);
-
-create index AI_HI_INCIDENT_PROC_INST_ID on ARCHIVE_ACT_HI_INCIDENT(PROC_INST_ID_);
-
-/*--#10 ARCHIVE_ACT_GE_BYTEARRAY; */
-create TABLE ARCHIVE_ACT_GE_BYTEARRAY
-AS ( select * from ACT_GE_BYTEARRAY where 1=0);
-
-create index AI_GE_BYTEARRAY_ID_ on ARCHIVE_ACT_GE_BYTEARRAY(ID_);
-
-/* -----------------------------------------------------------------------------
-Extend a ARCHIVE: Table by two attributes: STAT_EXECUTION_ID, STAT_EXECUTION_TS 
-*/
- 
-/*
---TEMPLATE:
-alter table ARCHIVE_%TableName%
-    add (STAT_EXECUTION_ID bigint, STAT_EXECUTION_TS timestamp(0) DEFAULT CURRENT_TIMESTAMP );
-CREATE INDEX AI_%TableName%_EXE_ID ON ARCHIVE_%TableName%(STAT_EXECUTION_ID);
-*/
-
-
-/*--#1 ACT_HI_PROCINST */
-alter table ARCHIVE_ACT_HI_PROCINST
-    add (STAT_EXECUTION_ID bigint, STAT_EXECUTION_TS timestamp(0) DEFAULT CURRENT_TIMESTAMP );
-CREATE INDEX AI_ACT_HI_PROCINST_EXE_ID ON ARCHIVE_ACT_HI_PROCINST(STAT_EXECUTION_ID);
-
-/*--#2 ACT_HI_ACTINST */
-alter table ARCHIVE_ACT_HI_ACTINST
-    add (STAT_EXECUTION_ID bigint, STAT_EXECUTION_TS timestamp(0) DEFAULT CURRENT_TIMESTAMP );
-CREATE INDEX AI_ACT_HI_ACTINST_EXE_ID ON ARCHIVE_ACT_HI_ACTINST(STAT_EXECUTION_ID);
-
-/*--#3 ACT_HI_TASKINST */
-alter table ARCHIVE_ACT_HI_TASKINST
-    add (STAT_EXECUTION_ID bigint, STAT_EXECUTION_TS timestamp(0) DEFAULT CURRENT_TIMESTAMP );
-CREATE INDEX AI_ACT_HI_TASKINST_EXE_ID ON ARCHIVE_ACT_HI_TASKINST(STAT_EXECUTION_ID);
-
-/*--#4 ACT_HI_VARINST */
-alter table ARCHIVE_ACT_HI_VARINST
-    add (STAT_EXECUTION_ID bigint, STAT_EXECUTION_TS timestamp(0) DEFAULT CURRENT_TIMESTAMP );
-CREATE INDEX AI_ACT_HI_VARINST_EXE_ID ON ARCHIVE_ACT_HI_VARINST(STAT_EXECUTION_ID);
-
-/*--#5 ACT_HI_DETAIL */
-alter table ARCHIVE_ACT_HI_DETAIL
-    add (STAT_EXECUTION_ID bigint, STAT_EXECUTION_TS timestamp(0) DEFAULT CURRENT_TIMESTAMP );
-CREATE INDEX AI_ACT_HI_DETAIL_EXE_ID ON ARCHIVE_ACT_HI_DETAIL(STAT_EXECUTION_ID);
-
-/*--#6 ACT_HI_COMMENT */
-alter table ARCHIVE_ACT_HI_COMMENT
-    add (STAT_EXECUTION_ID bigint, STAT_EXECUTION_TS timestamp(0) DEFAULT CURRENT_TIMESTAMP );
-CREATE INDEX AI_ACT_HI_COMMENT_EXE_ID ON ARCHIVE_ACT_HI_COMMENT(STAT_EXECUTION_ID);
-
-/*--#7 ACT_HI_ATTACHMENT */
-alter table ARCHIVE_ACT_HI_ATTACHMENT
-    add (STAT_EXECUTION_ID bigint, STAT_EXECUTION_TS timestamp(0) DEFAULT CURRENT_TIMESTAMP );
-CREATE INDEX AI_ACT_HI_ATTACHMENT_EXE_ID ON ARCHIVE_ACT_HI_ATTACHMENT(STAT_EXECUTION_ID);
-
-/*--#8 ACT_HI_OP_LOG */
-alter table ARCHIVE_ACT_HI_OP_LOG
-    add (STAT_EXECUTION_ID bigint, STAT_EXECUTION_TS timestamp(0) DEFAULT CURRENT_TIMESTAMP );
-CREATE INDEX AI_ACT_HI_OP_LOG_EXE_ID ON ARCHIVE_ACT_HI_OP_LOG(STAT_EXECUTION_ID);
-
-/*--#9 ACT_HI_INCIDENT */
-alter table ARCHIVE_ACT_HI_INCIDENT
-    add (STAT_EXECUTION_ID bigint, STAT_EXECUTION_TS timestamp(0) DEFAULT CURRENT_TIMESTAMP );
-CREATE INDEX AI_ACT_HI_INCIDENT_EXE_ID ON ARCHIVE_ACT_HI_INCIDENT(STAT_EXECUTION_ID);
-
-/*--#10 ACT_GE_BYTEARRAY */
-alter table ARCHIVE_ACT_GE_BYTEARRAY
-    add (STAT_EXECUTION_ID bigint, STAT_EXECUTION_TS timestamp(0) DEFAULT CURRENT_TIMESTAMP );
-CREATE INDEX AI_ACT_GE_BYTEARRAY_EXE_ID ON ARCHIVE_ACT_GE_BYTEARRAY(STAT_EXECUTION_ID);
-
-
-/* -- Next Val as a user defined function needed only in MariaDB--*/
-DROP FUNCTION IF EXISTS NextVal;
-  DELIMITER //
-  CREATE FUNCTION NextVal (vname VARCHAR(30))
-    RETURNS INT
-  BEGIN
-     -- Retrieve and update in single statement
-     UPDATE _sequences
-       SET next = next + 1
-       WHERE name = vname;
- 
-     RETURN (SELECT next FROM _sequences LIMIT 1);
-  END
-  //
-  DELIMITER ;
-  
-/* -- History tables for use in archive procedure, there is no array type in MariaDB --*/
-
-Create Table Camunda_Hi_Tables (id_ INT NOT NULL,
-TableName_ varchar(80) NOT NULL);
-
-Insert Into Camunda_Hi_Tables Values (1,'ACT_HI_PROCINST');
-Insert Into Camunda_Hi_Tables Values (2,'ACT_HI_ACTINST');
-Insert Into Camunda_Hi_Tables Values (3,'ACT_HI_TASKINST');
-Insert Into Camunda_Hi_Tables Values (4,'ACT_HI_VARINST');
-Insert Into Camunda_Hi_Tables Values (5,'ACT_HI_DETAIL');
-Insert Into Camunda_Hi_Tables Values (6,'ACT_HI_COMMENT');
-Insert Into Camunda_Hi_Tables Values (7,'ACT_HI_ATTACHMENT');
-Insert Into Camunda_Hi_Tables Values (8,'ACT_HI_OP_LOG');
-Insert Into Camunda_Hi_Tables Values (9,'ACT_HI_INCIDENT');
-
-/*-- log table --*/
-CREATE TABLE TMPLOGTABLE (LogMessage Varchar(700));
-
-
-/* -- Below user defined functions and procedures needed only in MariaDB, they are in-built in Oracle --*/
-/*-- Create a sequence SP */
-DROP PROCEDURE IF EXISTS CreateSequence;
-  DELIMITER //
-  CREATE PROCEDURE CreateSequence (name VARCHAR(30), start INT, inc INT)
-  BEGIN
-     -- Create a table to store sequences
-     CREATE TABLE IF NOT EXISTS _sequences
-     (
-         name VARCHAR(70) NOT NULL UNIQUE,
-         next INT NOT NULL,
-         inc INT NOT NULL
-     );
- 
-     -- Add the new sequence
-     INSERT INTO _sequences VALUES (name, start, inc);  
-  END
-  //
-  DELIMITER ;
-
-/*--------------------------------------------------------------------------------------------------
- Add Meta to Archive
- -------------------------------------------------------------------------------------------------- */
-
-/* Create STAT_EXECUTION_SEQ: each Archive Entry has a same Execution ID during one Archiving Run */
-CALL CreateSequence('STAT_EXECUTION_SEQ', 1, 1);
-
-
-
-/* 
-ARCHIVE_CAMUNDA_HISTORY-Default Store Procedure starts
-Camunda Version: 7.5.4-ee; MariaDB tested
-Date: 11.30.2016 
-Balaji Mudipalli, AJSC Camunda Team
-
-DOC.:
---------------------------------------------------------------------------------------
-Create  ARCHIVE_CAMUNDA_HISTORY StoreProcedure -function for archiving of history camunda tables.
-*/
-
-/* uncomment below statement and run for your db, e.g. : use camundabpmn;
- */
-
-DROP PROCEDURE IF EXISTS ARCHIVE_CAMUNDA_HISTORY;
-
-DELIMITER //
-
-CREATE PROCEDURE ARCHIVE_CAMUNDA_HISTORY(IN IN_periodInDays INT, IN IN_maxProcessInstances INT)
-MODIFIES SQL DATA 
-
-BEGIN
- DECLARE P_hiTableCount INT;
- DECLARE P_executionId BIGINT;   
- DECLARE P_piProcessed DOUBLE;        
- DECLARE P_baProcessed DOUBLE;     
- DECLARE P_startDate DATE;          
- DECLARE P_executionDuration double;
- 
- DECLARE not_found INT DEFAULT 0;     
-    DECLARE CONTINUE HANDLER FOR NOT FOUND SET not_found = 1; 
-
-    /* START TRANSACTION */
-    set P_startDate = sysdate();
-    set P_executionId = NextVal('STAT_EXECUTION_SEQ');
-    
-   INSERT INTO TMPLOGTABLE SELECT CONCAT('P_executionId value is ',P_executionId);
-    
-   DELETE FROM TMP_ARCHIVING_PROCINST;
-   DELETE FROM TMP_ARCHIVING_BYTEARRAY;
-   -- temp table --
-	DELETE FROM TMPLOGTABLE;  
-	
-		
-	/* 1. Set Default Value for Max Pi's  */
-	IF IN_maxProcessInstances = 0 THEN SET IN_maxProcessInstances = 1000; END IF;
-	IF IN_maxProcessInstances > 1000 THEN SET IN_maxProcessInstances = 1000; END IF;
-	
-	INSERT INTO TMPLOGTABLE SELECT CONCAT('IN_maxProcessInstances value is: ',IN_maxProcessInstances);
-
-    /* 2. Fill TMP_ARCHIVING_PROCINST with candidates: */
-    IF IN_maxProcessInstances = 0 THEN /* all */
-        INSERT INTO TMP_ARCHIVING_PROCINST
-              SELECT hi.PROC_INST_ID_, hi.END_TIME_ 
-                FROM ACT_HI_PROCINST hi 
-                               WHERE hi.END_TIME_ IS NOT NULL  
-                                     AND hi.END_TIME_ <= ( DATE_SUB(SYSDATE(), INTERVAL IN_periodInDays DAY));
-                                    
-		ELSE /* limit: IN_maxProcessInstances */
-			INSERT INTO TMP_ARCHIVING_PROCINST
-				(PROC_INST_ID_, END_TIME_) ( 
-				  SELECT hi2.PROC_INST_ID_, hi2.END_TIME_ 
-					FROM ACT_HI_PROCINST hi2 
-								   WHERE hi2.END_TIME_ IS NOT NULL  
-										 AND hi2.END_TIME_ <= ( DATE_SUB(SYSDATE(), INTERVAL IN_periodInDays DAY))  
-				) LIMIT IN_maxProcessInstances;
-    END IF;
-    
-    /* 3. Check PI's im TEMP if any found, ready for ACHIVING */
-    select count(*) INTO P_piProcessed FROM TMP_ARCHIVING_PROCINST;
-    
-    IF P_piProcessed = 0 THEN 
-    	INSERT INTO TMPLOGTABLE SELECT CONCAT('P_piProcessed value is: ',P_piProcessed);
-        ROLLBACK;   
-		/* 4. Move data from history to archive (insert to archive and delete in history) */ 
-		ELSE
-			SELECT COUNT(*)+1 INTO P_hiTableCount FROM camunda_hi_tables;
-				INSERT INTO TMPLOGTABLE SELECT CONCAT('P_hiTableCount value is ',P_hiTableCount);
-			SET @i = 1;
-			WHILE @i < P_hiTableCount 
-				DO 
-					SELECT TableName_ INTO @P_tableName FROM camunda_hi_tables WHERE id_ = @i;
-					INSERT INTO TMPLOGTABLE SELECT CONCAT('P_tableName: ', @P_tableName);
-				
-				   Set @P_archiveTableName = Concat('ARCHIVE_',IFNULL(@P_tableName, ''));
-				   INSERT INTO TMPLOGTABLE SELECT CONCAT('@P_archiveTableName: ', @P_archiveTableName);
-				   
-				   SET @query1 = CONCAT('INSERT INTO ', @P_archiveTableName , 
-						' SELECT hi3.*, ',P_executionId, ', NOW() FROM ', @P_tableName,' hi3 
-						WHERE hi3.PROC_INST_ID_ in ( SELECT PROC_INST_ID_ FROM TMP_ARCHIVING_PROCINST)');
-					INSERT INTO TMPLOGTABLE SELECT CONCAT('@query1: ', @query1);
-						
-					PREPARE stmt1 FROM @query1;		   
-					EXECUTE stmt1; 
-					DEALLOCATE PREPARE stmt1; 
-					
-					SET @query2 = CONCAT ('DELETE ACT FROM ',@P_tableName,' ACT INNER JOIN TMP_ARCHIVING_PROCINST TMP ON ACT.PROC_INST_ID_ = TMP.PROC_INST_ID_');
-					INSERT INTO TMPLOGTABLE SELECT CONCAT('@query2: ', @query2);
-						
-					PREPARE stmt2 FROM @query2;		   
-					EXECUTE stmt2; 
-					DEALLOCATE PREPARE stmt2; 
-					
-        		SET @i = @i+1;
-        	END WHILE;		
-			/* select bytearray_ids */
-			INSERT INTO TMP_ARCHIVING_BYTEARRAY
-				SELECT BYTEARRAY_ID_, PROC_INST_ID_ FROM ARCHIVE_ACT_HI_VARINST archvar
-				where archvar.PROC_INST_ID_ in (SELECT PROC_INST_ID_ FROM TMP_ARCHIVING_PROCINST)
-				AND archvar.BYTEARRAY_ID_ is not null;
-			
-			INSERT INTO TMP_ARCHIVING_BYTEARRAY
-				SELECT BYTEARRAY_ID_, PROC_INST_ID_ FROM ARCHIVE_ACT_HI_DETAIL archvar
-				where archvar.PROC_INST_ID_ in (SELECT PROC_INST_ID_ FROM TMP_ARCHIVING_PROCINST)
-				AND archvar.BYTEARRAY_ID_ is not null;  
-        
-			/* 5. Check Bytearrays im TEMP if any found, ready for ACHIVING */
-			select count(*) INTO P_baProcessed FROM TMP_ARCHIVING_BYTEARRAY;
-			
-			/* INSERT */
-			INSERT INTO ARCHIVE_ACT_GE_BYTEARRAY  
-				SELECT hi4.*, P_executionId, NOW() FROM ACT_GE_BYTEARRAY hi4 
-				WHERE hi4.ID_ in ( SELECT BYTEARRAY_ID_ FROM TMP_ARCHIVING_BYTEARRAY);
-			
-			/* DELETE */
-			DELETE FROM ACT_GE_BYTEARRAY WHERE ID_ in (select BYTEARRAY_ID_ FROM TMP_ARCHIVING_BYTEARRAY);
-			
-			/* COMMIT TRANSACTION */
-			COMMIT;
-			INSERT INTO TMPLOGTABLE SELECT CONCAT('P_executionId is ', P_executionId);	
-			
-		set P_executionDuration = DATEDIFF(sysdate(), P_startDate);
-		
-		INSERT INTO TMPLOGTABLE SELECT CONCAT('SP success and P_executionDuration is ', ifnull((round(P_executionDuration*24*60*60, 1)), ''), ' sec.');
-    END IF;
-   
- END;
-//
-
-DELIMITER ;
-
-
-
-/* 
-ROLLB_ARCHIVE_CAMUNDA_HISTORY-StoreProcedure starts
-Camunda Version: 7.5.4-ee; MariaDB tested
-Date: 11.30.2016 
-Balaji Mudipalli, AJSC Camunda Team
-
-DOC.:
---------------------------------------------------------------------------------------
-Create  ROLLB_ARCHIVE_CAMUNDA_HISTORY StoreProcedure for ROLLBACK (RESTORE)
-of archived Camunda history tables.
-*/
-
-/* uncomment below statement and run for your db, e.g. : use camundabpmn;
- */
--- use <db_name>;
-
-
-DROP PROCEDURE IF EXISTS ROLLB_ARCHIVE_CAMUNDA_HISTORY;
-
-DELIMITER //
-CREATE PROCEDURE ROLLB_ARCHIVE_CAMUNDA_HISTORY(IN IN_executionId_from INT, 
-                                                            IN IN_executionId_til INT,
-                                                            IN IN_maxProcessInstances INT)
-MODIFIES SQL DATA
-
-BEGIN
- DECLARE P_hiTableCount INT;
- DECLARE P_piProcessed DOUBLE;        
- DECLARE P_baProcessed DOUBLE;        
- DECLARE P_query VARCHAR(600);         
- DECLARE P_startDate DATETIME;             
- DECLARE P_executionDuration DOUBLE;
- DECLARE P_result NVARCHAR(400);
-DECLARE not_found INT DEFAULT 0;       
-      DECLARE CONTINUE HANDLER FOR NOT FOUND SET not_found = 1;
- 
-                      
-    /* START TRANSACTION */
-    SET P_startDate = sysdate();
-	DELETE FROM TMPLOGTABLE;  
-    
-	INSERT INTO TMPLOGTABLE SELECT CONCAT('[ROLLB_ARCHIVE_CAMUNDA_HISTORY]:  START EXECUTION: ' , ifnull(date_format(current_timestamp, '%d.%m.%Y %H:%i:%s ..FF3'), '') ,
-                           '; PARAMS: IN_executionId_from: ' , IFNULL(IN_executionId_from, '') , 
-                           '; IN_executionId_til: ' , IFNULL(IN_executionId_til, '') ,
-                           '; IN_maxProcessInstances: ' , IFNULL(IN_maxProcessInstances, ''));
-                                                            
-    /* 1. Truncate TMP_ARCHIVING_PROCINST */
-    
-    DELETE FROM TMP_ARCHIVING_PROCINST;
-    DELETE FROM TMP_ARCHIVING_BYTEARRAY;
-    
-    /* 2. Fill TMP_ARCHIVING_PROCINST with candidates: */
-    IF IN_executionId_til = -1 THEN /* IN_executionId_from only */
-        SET P_query= CONCAT(' WHERE STAT_EXECUTION_ID = ' , IFNULL(IN_executionId_from, ''));
-    
-    ELSEIF IN_executionId_til = 0 THEN /* all from IN_executionId_from */
-        SET P_query= CONCAT(' WHERE STAT_EXECUTION_ID >= ' , IFNULL(IN_executionId_from, ''));
-    
-    ELSE /* between IN_executionId_from AND IN_executionId_til */
-        SET P_query= CONCAT(' WHERE STAT_EXECUTION_ID between ', IFNULL(IN_executionId_from, '') , ' AND ' , IFNULL(IN_executionId_til, ''));
-    END IF;
-    
-    IF IN_maxProcessInstances = 0 THEN /* all */
-    
-        SET @P_query1 = CONCAT('INSERT INTO TMP_ARCHIVING_PROCINST ', ifnull(char(13 using ascii), ''),ifnull(char(10 using ascii), ''),
-                   '   SELECT PROC_INST_ID_, END_TIME_ FROM ARCHIVE_ACT_HI_PROCINST ', ifnull(char(13 using ascii), ''),ifnull(char(10 using ascii), ''),
-                   '   ',  Ifnull(P_query, ''));
-                   
-    ELSE /* limit: IN_maxProcessInstances */
-        SET @P_query1 = CONCAT('INSERT INTO TMP_ARCHIVING_PROCINST ' ,ifnull(char(13 using ascii), ''),ifnull(char(10 using ascii), ''),
-                   ' (PROC_INST_ID_, END_TIME_ ) ( ' ,ifnull(char(13 using ascii), ''),ifnull(char(10 using ascii), ''),
-                   '   SELECT PROC_INST_ID_, END_TIME_ FROM ARCHIVE_ACT_HI_PROCINST ' ,ifnull(char(13 using ascii), ''),ifnull(char(10 using ascii), ''),
-                   '   ',  Ifnull(P_query, '') , ifnull(char(13 using ascii), ''),ifnull(char(10 using ascii), ''),
-                   ') LIMIT ', IFNULL(IN_maxProcessInstances, ''));   
-    END IF;
-    
-    INSERT INTO TMPLOGTABLE SELECT CONCAT('QUERY (before execute): /fill temp table with PI candidates/ ' , Ifnull(P_query, ''));
-	
-	PREPARE stmt1 FROM @P_query1;		   
-	EXECUTE stmt1; 
-	DEALLOCATE PREPARE stmt1; 
-	
-    INSERT INTO TMPLOGTABLE SELECT CONCAT('.... rows inserted into TMP_ARCHIVING_PROCINST: ' , IFNULL((ROW_COUNT()), ''));
-    
-    /* 3. Fill TMP_ARCHIVING_BYTEARRAYS with candidates:  */
-    INSERT INTO TMP_ARCHIVING_BYTEARRAY
-        SELECT BYTEARRAY_ID_, PROC_INST_ID_ FROM ARCHIVE_ACT_HI_VARINST archvar
-        where archvar.PROC_INST_ID_ in (SELECT PROC_INST_ID_ FROM TMP_ARCHIVING_PROCINST)
-        AND archvar.BYTEARRAY_ID_ is not null;
-        
-    INSERT INTO TMP_ARCHIVING_BYTEARRAY
-        SELECT BYTEARRAY_ID_, PROC_INST_ID_ FROM ARCHIVE_ACT_HI_DETAIL archvar
-        where archvar.PROC_INST_ID_ in (SELECT PROC_INST_ID_ FROM TMP_ARCHIVING_PROCINST)
-        AND archvar.BYTEARRAY_ID_ is not null;  
-        
-    select count(*) INTO P_baProcessed FROM TMP_ARCHIVING_BYTEARRAY;
-    INSERT INTO TMPLOGTABLE SELECT CONCAT('[ROLLB_ARCHIVE_CAMUNDA_HISTORY]: ', IFNULL(P_baProcessed, '') ,' ByteArray candidates for rollback found!' , ifnull(char(13 using ascii), ''),ifnull(char(10 using ascii), ''));
-    
-               
-    /* 4. Check PI's im TEMP ready for ROLLBACK */
-    select count(*) INTO P_piProcessed FROM TMP_ARCHIVING_PROCINST;
-    
-    IF P_piProcessed = 0 THEN /* no candidates found */
-        INSERT INTO TMPLOGTABLE SELECT CONCAT('[ROLLB_ARCHIVE_CAMUNDA_HISTORY]: NO ProcessInstance-Candidates for archive-Rollback found! ');
-        INSERT INTO TMPLOGTABLE SELECT CONCAT('Try TA-ROLLBACK ...');
-        ROLLBACK;  /*-- TMP_ARCHIVING_PROCINST un-Delete */
-        INSERT INTO TMPLOGTABLE SELECT CONCAT('TA-ROLLBACK DONE! ...' ,ifnull(char(13 using ascii), ''),ifnull(char(10 using ascii), ''));
-        
-        SET P_result = CONCAT('[ROLLB_ARCHIVE_CAMUNDA_HISTORY]:  NO ProcessInstance candidates for archive-Rollback found!', ifnull(char(13 using ascii), ''),ifnull(char(10 using ascii), ''),
-                    ifnull(date_format(current_timestamp, '%d.%m.%Y %H:%i:%s ..FF3'), '') , ifnull(char(13 using ascii), ''),ifnull(char(10 using ascii), ''),
-                    ' Used PARAMS: IN_executionId_from: ' , IFNULL(IN_executionId_from, '') , 
-                           '; IN_executionId_til: ' , IFNULL(IN_executionId_til, '') ,
-                           '; IN_maxProcessInstances: ' , IFNULL(IN_maxProcessInstances, ''));
-        
-        INSERT INTO TMPLOGTABLE SELECT CONCAT(P_result);
-    
-    ELSE
-        INSERT INTO TMPLOGTABLE SELECT CONCAT('[ROLLB_ARCHIVE_CAMUNDA_HISTORY]: ', IFNULL(P_piProcessed, '') ,' ProcessInstance candidates for Rollback found!');
-    
-        /* LOOP over tables */
-        SELECT COUNT(*)+1 INTO P_hiTableCount FROM camunda_hi_tables;
-			
-			INSERT INTO TMPLOGTABLE SELECT CONCAT('P_hiTableCount value is ',P_hiTableCount);
-				
-			SET @i = 1;
-			
-			WHILE @i < P_hiTableCount 
-				DO 
-					SELECT TableName_ INTO @P_tableName FROM camunda_hi_tables WHERE id_ = @i;
-					
-					INSERT INTO TMPLOGTABLE SELECT CONCAT('[ROLLB_ARCHIVE_CAMUNDA_HISTORY]: #######  Start restore from:  ARCHIVE_' , IFNULL(@P_tableName, '') ,'  ...');
-					
-					SET @P_tableFields = CONCAT(''); 
-					
-					select GROUP_CONCAT(column_name order by ordinal_position) 
-						INTO @P_tableFields 
-						from information_schema.columns  
-						where table_schema = (select DATABASE()) AND TABLE_NAME = @P_tableName;
-
-					/* INSERT */
-					SET @P_query2 = CONCAT('INSERT INTO ', IFNULL(@P_tableName, '') ,
-							   ' SELECT ' , @P_tableFields, 
-							   '  FROM ARCHIVE_' , IFNULL(@P_tableName, '') ,
-							   '  WHERE PROC_INST_ID_ in ( SELECT tmp.PROC_INST_ID_ FROM TMP_ARCHIVING_PROCINST tmp)');
-							   
-					INSERT INTO TMPLOGTABLE SELECT CONCAT('QUERY (before execute): /copy back to history table/ ' , Ifnull(@P_query2, ''));
-
-						PREPARE stmt2 FROM @P_query2;		   
-						EXECUTE stmt2; 
-						DEALLOCATE PREPARE stmt2; 
-						
-					INSERT INTO TMPLOGTABLE SELECT Concat('.... rows inserted: ' , IFNULL((ROW_COUNT()), ''));
-					
-					/* DELETE */
-					INSERT INTO TMPLOGTABLE SELECT CONCAT('[ROLLB_ARCHIVE_CAMUNDA_HISTORY]:         Delete in Archive: ARCHIVE_' , IFNULL(@P_tableName, '') ,'  ...');          
-					/* SET @P_query3 = CONCAT(' DELETE FROM ARCHIVE_' , IFNULL(@P_tableName, '') , ' WHERE PROC_INST_ID_ in (select PROC_INST_ID_ FROM TMP_ARCHIVING_PROCINST)'); */
-					SET @P_query3 = CONCAT('DELETE ARCH FROM ARCHIVE_' , IFNULL(@P_tableName, '') , 
-									' ARCH INNER JOIN TMP_ARCHIVING_PROCINST TMP ON ARCH.PROC_INST_ID_ = TMP.PROC_INST_ID_');
-					INSERT INTO TMPLOGTABLE SELECT CONCAT('QUERY (before execute): ' , Ifnull(@P_query3, ''));
-						PREPARE stmt3 FROM @P_query3;		   
-						EXECUTE stmt3; 
-						DEALLOCATE PREPARE stmt3; 
-						
-					INSERT INTO TMPLOGTABLE SELECT Concat('.... rows deleted: ' , IFNULL((ROW_COUNT()), '') , ifnull(char(13 using ascii), ''),ifnull(char(10 using ascii), ''));
-					
-				SET @i = @i+1;
-			END WHILE;
-        
-        /* INSERT */
-        SET @P_tableFields2 = CONCAT(''); /* reset, becouse had some problems with double columns  */
-        /* fetch table column names into P_tableFields : */
-        select GROUP_CONCAT(COLUMN_NAME order by ordinal_position) 
-			INTO @P_tableFields2 
-            from information_schema.columns  
-            where table_schema = (select DATABASE()) AND TABLE_NAME = 'ACT_GE_BYTEARRAY';
-            
-        SET @P_query4 = CONCAT('INSERT INTO ACT_GE_BYTEARRAY ' ,ifnull(char(13 using ascii), ''),ifnull(char(10 using ascii), ''),
-                   ' SELECT ' , IFNULL(@P_tableFields2, '') ,ifnull(char(13 using ascii), ''),ifnull(char(10 using ascii), ''),
-                   '  FROM ARCHIVE_ACT_GE_BYTEARRAY' ,ifnull(char(13 using ascii), ''),ifnull(char(10 using ascii), ''), 
-                   '  WHERE ID_ in ( SELECT tmp.BYTEARRAY_ID_ FROM TMP_ARCHIVING_BYTEARRAY tmp)');
-        INSERT INTO TMPLOGTABLE SELECT CONCAT('QUERY (before execute): /copy back to history table/ ' , Ifnull(@P_query4, ''));
-		PREPARE stmt4 FROM @P_query4;		   
-		EXECUTE stmt4; 
-		DEALLOCATE PREPARE stmt4; 
-        INSERT INTO TMPLOGTABLE SELECT Concat('.... rows inserted: ' , IFNULL((ROW_COUNT()), ''));
-        
-        /* DELETE */
-        /* DELETE FROM ARCHIVE_ACT_GE_BYTEARRAY WHERE ID_ in (select BYTEARRAY_ID_ FROM TMP_ARCHIVING_BYTEARRAY); */
-		DELETE AAGB FROM ARCHIVE_ACT_GE_BYTEARRAY AAGB INNER JOIN TMP_ARCHIVING_BYTEARRAY TMP_B ON AAGB.ID_ = TMP_B.BYTEARRAY_ID_;
-        INSERT INTO TMPLOGTABLE SELECT Concat('.... rows deleted: ' , IFNULL((ROW_COUNT()), '') , ifnull(char(13 using ascii), ''),ifnull(char(10 using ascii), '')); 
-        
-        /* COMMIT TRANSACTION */
-        INSERT INTO TMPLOGTABLE SELECT CONCAT('[ROLLB_ARCHIVE_CAMUNDA_HISTORY]: PIs processed: ' , IFNULL(P_piProcessed, '')) ;
-        COMMIT;
-        INSERT INTO TMPLOGTABLE SELECT CONCAT('TA-COMMIT DONE!' ,ifnull(char(13 using ascii), ''),ifnull(char(10 using ascii), ''));
-        
-        SET P_executionDuration = DATEDIFF(sysdate(), P_startDate);
-        
-        SET P_result = CONCAT('[ROLLB_ARCHIVE_CAMUNDA_HISTORY]:  EXECUTED (commited) successfully! ' , ifnull(char(13 using ascii), ''),ifnull(char(10 using ascii), ''),
-                ifnull(date_format(current_timestamp, '%d.%m.%Y %H:%i:%s ..FF3'), '') , '; Duration: ' , ifnull((round(P_executionDuration*24*60*60, 1)), ''), ' sec.' ,  ifnull(char(13 using ascii), ''),ifnull(char(10 using ascii), '') ,
-                ' PIs processed: ' , IFNULL(P_piProcessed, '') , ifnull(char(13 using ascii), ''),ifnull(char(10 using ascii), ''),
-                ' Used PARAMS: IN_executionId_from: ' , IFNULL(IN_executionId_from, '') , 
-                           '; IN_executionId_til: ' , IFNULL(IN_executionId_til, '') ,
-                           '; IN_maxProcessInstances: ' , IFNULL(IN_maxProcessInstances, ''));
-                           
-        INSERT INTO TMPLOGTABLE SELECT CONCAT(P_result);                        
-    END IF;
- END;
-//
-
-DELIMITER ;
+-- Fix for https://itrack.web.att.com/browse/AJSCCMDA-90 --
+use camundabpmn;
+
+/* uncomment below statement and run for your db, e.g. : use camundabpmn;
+ */
+-- use <db_name>;
+
+/* 
+Drop a archive tables
+*/
+/*-- TMP_ARCHIVING_PROCINST */
+DROP TABLE IF EXISTS TMP_ARCHIVING_PROCINST;
+
+/*-- TMP_ARCHIVING_BYTEARRAY */
+DROP TABLE IF EXISTS TMP_ARCHIVING_BYTEARRAY;
+
+/*-- TMP LOG TABLE */
+DROP TABLE IF EXISTS TMPLOGTABLE;
+
+/* -- Camunda Hi Tables --*/
+DROP TABLE IF EXISTS Camunda_Hi_Tables;
+
+/* drop own extentions columns:
+alter table  ARCHIVE_ACT_HI_PROCINST DROP (STAT_EXECUTION_ID, STAT_EXECUTION_TS);
+alter table  ARCHIVE_ACT_HI_ACTINST DROP (STAT_EXECUTION_ID, STAT_EXECUTION_TS);
+alter table  ARCHIVE_ACT_HI_TASKINST DROP (STAT_EXECUTION_ID, STAT_EXECUTION_TS);
+alter table  ARCHIVE_ACT_HI_VARINST DROP (STAT_EXECUTION_ID, STAT_EXECUTION_TS);
+alter table  ARCHIVE_ACT_HI_DETAIL DROP (STAT_EXECUTION_ID, STAT_EXECUTION_TS);
+alter table  ARCHIVE_ACT_HI_COMMENT DROP (STAT_EXECUTION_ID, STAT_EXECUTION_TS);
+alter table  ARCHIVE_ACT_HI_ATTACHMENT DROP (STAT_EXECUTION_ID, STAT_EXECUTION_TS);
+alter table  ARCHIVE_ACT_HI_OP_LOG DROP (STAT_EXECUTION_ID, STAT_EXECUTION_TS);
+alter table  ARCHIVE_ACT_HI_INCIDENT DROP (STAT_EXECUTION_ID, STAT_EXECUTION_TS);
+*/
+
+/*--#1 */
+DROP TABLE IF EXISTS ARCHIVE_ACT_HI_PROCINST;
+/*--#2 */
+DROP TABLE IF EXISTS ARCHIVE_ACT_HI_ACTINST;
+/*--#3 */
+DROP TABLE IF EXISTS ARCHIVE_ACT_HI_TASKINST;
+/*--#4 */
+DROP TABLE IF EXISTS ARCHIVE_ACT_HI_VARINST;
+/*--#5 */
+DROP TABLE IF EXISTS ARCHIVE_ACT_HI_DETAIL;
+/*--#6 */
+DROP TABLE IF EXISTS ARCHIVE_ACT_HI_COMMENT;
+/*--#7 */
+DROP TABLE IF EXISTS ARCHIVE_ACT_HI_ATTACHMENT;
+/*--#8 */
+DROP TABLE IF EXISTS ARCHIVE_ACT_HI_OP_LOG;
+/*--#9 */
+DROP TABLE IF EXISTS ARCHIVE_ACT_HI_INCIDENT;
+/*--#10 */
+DROP TABLE IF EXISTS ARCHIVE_ACT_GE_BYTEARRAY;
+
+/* drop PL SQL procedures: */
+DROP PROCEDURE IF EXISTS ARCHIVE_CAMUNDA_HISTORY;
+DROP PROCEDURE IF EXISTS ROLLB_ARCHIVE_CAMUNDA_HISTORY;
+ 
+/*-- Sequence */
+-- as sequence drop doesn't work automatically in MariaDB, use this procedure to drop sequence
+ DROP PROCEDURE IF EXISTS DropSequence;
+ 
+/*-- To Drop the MariaDB specific user defined procedures and functions */
+DROP FUNCTION IF EXISTS NextVal;
+DROP PROCEDURE IF EXISTS CreateSequence;
+DROP PROCEDURE IF EXISTS DropSequence; 
+DROP TABLE IF EXISTS _sequences;
+
+/* -- If only the sequence: STAT_EXECUTION_SEQ needs to be removed, uncomment and use below statements --*/
+/*
+  DELIMITER //
+  CREATE PROCEDURE DropSequence (vname VARCHAR(30))
+  BEGIN
+     -- Drop the sequence
+     DELETE FROM _sequences WHERE name = vname;  
+  END
+  //
+  DELIMITER ;
+
+-- use the above procedure to drop sequence 
+CALL DropSequence('STAT_EXECUTION_SEQ');
+*/
+
+
+
+
+
+/*
+ 1. Create starts - Add some Camunda Indexes to history schema part (for Archiving)
+*/
+create INDEX IF NOT EXISTS IDX_ACT_HI_TASKINST_PIID ON ACT_HI_TASKINST (PROC_INST_ID_); 
+create INDEX IF NOT EXISTS IDX_ACT_HI_COMMENT_PIID ON ACT_HI_COMMENT (PROC_INST_ID_);
+create INDEX IF NOT EXISTS IDX_ACT_HI_ATTACHMENT_PIID ON ACT_HI_ATTACHMENT (PROC_INST_ID_);
+create INDEX IF NOT EXISTS IDX_ACT_HI_OP_LOG_PIID ON ACT_HI_OP_LOG (PROC_INST_ID_);
+create INDEX IF NOT EXISTS IDX_ACT_HI_INCIDENT_PIID ON ACT_HI_INCIDENT (PROC_INST_ID_);
+create INDEX IF NOT EXISTS IDX_ACT_HI_ACTINST_PIID ON ACT_HI_ACTINST(PROC_INST_ID_); 
+
+
+/*
+ 2.  Create Archiving Tables in current schema 
+*/
+
+/*-- TMP_ARCHIVING_PROCINST */
+CREATE TABLE TMP_ARCHIVING_PROCINST
+( PROC_INST_ID_ varchar(64) not null,
+  END_TIME_ datetime(3)
+);
+CREATE INDEX AI_TMP_ARCH_PROCINST_PI_ID ON TMP_ARCHIVING_PROCINST(PROC_INST_ID_);
+
+/*-- TMP_ARCHIVING_BYTEARRAY */
+CREATE TABLE TMP_ARCHIVING_BYTEARRAY
+( BYTEARRAY_ID_ varchar(64) not null,
+  PROC_INST_ID_ varchar(64)
+);
+CREATE INDEX AI_TMP_ARCH_BYTEARRAY_BAID ON TMP_ARCHIVING_BYTEARRAY(BYTEARRAY_ID_);
+
+
+/*--#1 ARCHIVE_ACT_HI_PROCINST; */
+create TABLE ARCHIVE_ACT_HI_PROCINST
+AS ( select * from ACT_HI_PROCINST where 1=0);
+
+create index AI_HI_PROCINST_END_TIME on ARCHIVE_ACT_HI_PROCINST(END_TIME_);
+ALTER TABLE ARCHIVE_ACT_HI_PROCINST ADD CONSTRAINT  ARCHIVE_ACT_HI_PROCINST_UQ UNIQUE ( PROC_INST_ID_);
+
+/*--#2   ARCHIVE_ACT_HI_ACTINST; */
+create TABLE ARCHIVE_ACT_HI_ACTINST
+AS ( select * from ACT_HI_ACTINST where 1=0);
+
+create index AI_HI_ACTINST_PROC_INST_ID on ARCHIVE_ACT_HI_ACTINST(PROC_INST_ID_);
+create index AI_HI_ACTINST_END_TIME on ARCHIVE_ACT_HI_ACTINST(END_TIME_);
+
+/*--#3  ARCHIVE_ACT_HI_TASKINST; */
+create TABLE ARCHIVE_ACT_HI_TASKINST
+AS ( select * from ACT_HI_TASKINST where 1=0);
+
+create index AI_HI_TASKINST_PROC_INST_ID on ARCHIVE_ACT_HI_TASKINST(PROC_INST_ID_);
+create index AI_HI_TASKINST_END_TIME on ARCHIVE_ACT_HI_TASKINST(END_TIME_);
+
+/*--#4 ARCHIVE_ACT_HI_VARINST; */
+create TABLE ARCHIVE_ACT_HI_VARINST
+AS ( select * from ACT_HI_VARINST where 1=0);
+
+create index AI_HI_VARINST_PROC_INST_ID on ARCHIVE_ACT_HI_VARINST(PROC_INST_ID_);
+
+/*--#5 ARCHIVE_ACT_HI_DETAIL; */
+create TABLE ARCHIVE_ACT_HI_DETAIL
+AS ( select * from ACT_HI_DETAIL where 1=0);
+
+create index AI_HI_DETAIL_PROC_INST_ID on ARCHIVE_ACT_HI_DETAIL(PROC_INST_ID_);
+create index AI_HI_DETAIL_TIME on ARCHIVE_ACT_HI_DETAIL(TIME_);
+
+/*--#6 ARCHIVE_ACT_HI_COMMENT; */
+create TABLE ARCHIVE_ACT_HI_COMMENT
+AS ( select * from ACT_HI_COMMENT where 1=0);
+
+create index AI_HI_COMMENT_PROC_INST_ID on ARCHIVE_ACT_HI_COMMENT(PROC_INST_ID_);
+create index AI_HI_COMMENT_TIME on ARCHIVE_ACT_HI_COMMENT(TIME_);
+
+/*--#7 ARCHIVE_ACT_HI_ATTACHMENT; */
+create TABLE ARCHIVE_ACT_HI_ATTACHMENT
+AS ( select * from ACT_HI_ATTACHMENT where 1=0);
+
+create index AI_HI_ATTACHMENT_PROC_INST_ID on ARCHIVE_ACT_HI_ATTACHMENT(PROC_INST_ID_);
+
+/*--#8 ARCHIVE_ACT_HI_OP_LOG; */
+create TABLE ARCHIVE_ACT_HI_OP_LOG
+AS ( select * from ACT_HI_OP_LOG where 1=0);
+
+create index AI_HI_OP_LOG_PROC_INST_ID on ARCHIVE_ACT_HI_OP_LOG(PROC_INST_ID_);
+create index AI_HI_OP_LOG_TIMESTAMP on ARCHIVE_ACT_HI_OP_LOG(TIMESTAMP_);
+
+/*--#9 ARCHIVE_ACT_HI_INCIDENT; */
+create TABLE ARCHIVE_ACT_HI_INCIDENT
+AS ( select * from ACT_HI_INCIDENT where 1=0);
+
+create index AI_HI_INCIDENT_PROC_INST_ID on ARCHIVE_ACT_HI_INCIDENT(PROC_INST_ID_);
+
+/*--#10 ARCHIVE_ACT_GE_BYTEARRAY; */
+create TABLE ARCHIVE_ACT_GE_BYTEARRAY
+AS ( select * from ACT_GE_BYTEARRAY where 1=0);
+
+create index AI_GE_BYTEARRAY_ID_ on ARCHIVE_ACT_GE_BYTEARRAY(ID_);
+
+/* -----------------------------------------------------------------------------
+Extend a ARCHIVE: Table by two attributes: STAT_EXECUTION_ID, STAT_EXECUTION_TS 
+*/
+ 
+/*
+--TEMPLATE:
+alter table ARCHIVE_%TableName%
+    add (STAT_EXECUTION_ID bigint, STAT_EXECUTION_TS timestamp(0) DEFAULT CURRENT_TIMESTAMP );
+CREATE INDEX AI_%TableName%_EXE_ID ON ARCHIVE_%TableName%(STAT_EXECUTION_ID);
+*/
+
+
+/*--#1 ACT_HI_PROCINST */
+alter table ARCHIVE_ACT_HI_PROCINST
+    add (STAT_EXECUTION_ID bigint, STAT_EXECUTION_TS timestamp(0) DEFAULT CURRENT_TIMESTAMP );
+CREATE INDEX AI_ACT_HI_PROCINST_EXE_ID ON ARCHIVE_ACT_HI_PROCINST(STAT_EXECUTION_ID);
+
+/*--#2 ACT_HI_ACTINST */
+alter table ARCHIVE_ACT_HI_ACTINST
+    add (STAT_EXECUTION_ID bigint, STAT_EXECUTION_TS timestamp(0) DEFAULT CURRENT_TIMESTAMP );
+CREATE INDEX AI_ACT_HI_ACTINST_EXE_ID ON ARCHIVE_ACT_HI_ACTINST(STAT_EXECUTION_ID);
+
+/*--#3 ACT_HI_TASKINST */
+alter table ARCHIVE_ACT_HI_TASKINST
+    add (STAT_EXECUTION_ID bigint, STAT_EXECUTION_TS timestamp(0) DEFAULT CURRENT_TIMESTAMP );
+CREATE INDEX AI_ACT_HI_TASKINST_EXE_ID ON ARCHIVE_ACT_HI_TASKINST(STAT_EXECUTION_ID);
+
+/*--#4 ACT_HI_VARINST */
+alter table ARCHIVE_ACT_HI_VARINST
+    add (STAT_EXECUTION_ID bigint, STAT_EXECUTION_TS timestamp(0) DEFAULT CURRENT_TIMESTAMP );
+CREATE INDEX AI_ACT_HI_VARINST_EXE_ID ON ARCHIVE_ACT_HI_VARINST(STAT_EXECUTION_ID);
+
+/*--#5 ACT_HI_DETAIL */
+alter table ARCHIVE_ACT_HI_DETAIL
+    add (STAT_EXECUTION_ID bigint, STAT_EXECUTION_TS timestamp(0) DEFAULT CURRENT_TIMESTAMP );
+CREATE INDEX AI_ACT_HI_DETAIL_EXE_ID ON ARCHIVE_ACT_HI_DETAIL(STAT_EXECUTION_ID);
+
+/*--#6 ACT_HI_COMMENT */
+alter table ARCHIVE_ACT_HI_COMMENT
+    add (STAT_EXECUTION_ID bigint, STAT_EXECUTION_TS timestamp(0) DEFAULT CURRENT_TIMESTAMP );
+CREATE INDEX AI_ACT_HI_COMMENT_EXE_ID ON ARCHIVE_ACT_HI_COMMENT(STAT_EXECUTION_ID);
+
+/*--#7 ACT_HI_ATTACHMENT */
+alter table ARCHIVE_ACT_HI_ATTACHMENT
+    add (STAT_EXECUTION_ID bigint, STAT_EXECUTION_TS timestamp(0) DEFAULT CURRENT_TIMESTAMP );
+CREATE INDEX AI_ACT_HI_ATTACHMENT_EXE_ID ON ARCHIVE_ACT_HI_ATTACHMENT(STAT_EXECUTION_ID);
+
+/*--#8 ACT_HI_OP_LOG */
+alter table ARCHIVE_ACT_HI_OP_LOG
+    add (STAT_EXECUTION_ID bigint, STAT_EXECUTION_TS timestamp(0) DEFAULT CURRENT_TIMESTAMP );
+CREATE INDEX AI_ACT_HI_OP_LOG_EXE_ID ON ARCHIVE_ACT_HI_OP_LOG(STAT_EXECUTION_ID);
+
+/*--#9 ACT_HI_INCIDENT */
+alter table ARCHIVE_ACT_HI_INCIDENT
+    add (STAT_EXECUTION_ID bigint, STAT_EXECUTION_TS timestamp(0) DEFAULT CURRENT_TIMESTAMP );
+CREATE INDEX AI_ACT_HI_INCIDENT_EXE_ID ON ARCHIVE_ACT_HI_INCIDENT(STAT_EXECUTION_ID);
+
+/*--#10 ACT_GE_BYTEARRAY */
+alter table ARCHIVE_ACT_GE_BYTEARRAY
+    add (STAT_EXECUTION_ID bigint, STAT_EXECUTION_TS timestamp(0) DEFAULT CURRENT_TIMESTAMP );
+CREATE INDEX AI_ACT_GE_BYTEARRAY_EXE_ID ON ARCHIVE_ACT_GE_BYTEARRAY(STAT_EXECUTION_ID);
+
+
+/* -- Next Val as a user defined function needed only in MariaDB--*/
+DROP FUNCTION IF EXISTS NextVal;
+  DELIMITER //
+  CREATE FUNCTION NextVal (vname VARCHAR(30))
+    RETURNS INT
+  BEGIN
+     -- Retrieve and update in single statement
+     UPDATE _sequences
+       SET next = next + 1
+       WHERE name = vname;
+ 
+     RETURN (SELECT next FROM _sequences LIMIT 1);
+  END
+  //
+  DELIMITER ;
+  
+/* -- History tables for use in archive procedure, there is no array type in MariaDB --*/
+
+Create Table Camunda_Hi_Tables (id_ INT NOT NULL,
+TableName_ varchar(80) NOT NULL);
+
+Insert Into Camunda_Hi_Tables Values (1,'ACT_HI_PROCINST');
+Insert Into Camunda_Hi_Tables Values (2,'ACT_HI_ACTINST');
+Insert Into Camunda_Hi_Tables Values (3,'ACT_HI_TASKINST');
+Insert Into Camunda_Hi_Tables Values (4,'ACT_HI_VARINST');
+Insert Into Camunda_Hi_Tables Values (5,'ACT_HI_DETAIL');
+Insert Into Camunda_Hi_Tables Values (6,'ACT_HI_COMMENT');
+Insert Into Camunda_Hi_Tables Values (7,'ACT_HI_ATTACHMENT');
+Insert Into Camunda_Hi_Tables Values (8,'ACT_HI_OP_LOG');
+Insert Into Camunda_Hi_Tables Values (9,'ACT_HI_INCIDENT');
+
+/*-- log table --*/
+CREATE TABLE TMPLOGTABLE (LogMessage Varchar(700));
+
+
+/* -- Below user defined functions and procedures needed only in MariaDB, they are in-built in Oracle --*/
+/*-- Create a sequence SP */
+DROP PROCEDURE IF EXISTS CreateSequence;
+  DELIMITER //
+  CREATE PROCEDURE CreateSequence (name VARCHAR(30), start INT, inc INT)
+  BEGIN
+     -- Create a table to store sequences
+     CREATE TABLE IF NOT EXISTS _sequences
+     (
+         name VARCHAR(70) NOT NULL UNIQUE,
+         next INT NOT NULL,
+         inc INT NOT NULL
+     );
+ 
+     -- Add the new sequence
+     INSERT INTO _sequences VALUES (name, start, inc);  
+  END
+  //
+  DELIMITER ;
+
+/*--------------------------------------------------------------------------------------------------
+ Add Meta to Archive
+ -------------------------------------------------------------------------------------------------- */
+
+/* Create STAT_EXECUTION_SEQ: each Archive Entry has a same Execution ID during one Archiving Run */
+CALL CreateSequence('STAT_EXECUTION_SEQ', 1, 1);
+
+
+
+/* 
+ARCHIVE_CAMUNDA_HISTORY-Default Store Procedure starts
+Camunda Version: 7.5.4-ee; MariaDB tested
+Date: 11.30.2016 
+Balaji Mudipalli, AJSC Camunda Team
+
+DOC.:
+--------------------------------------------------------------------------------------
+Create  ARCHIVE_CAMUNDA_HISTORY StoreProcedure -function for archiving of history camunda tables.
+*/
+
+/* uncomment below statement and run for your db, e.g. : use camundabpmn;
+ */
+
+DROP PROCEDURE IF EXISTS ARCHIVE_CAMUNDA_HISTORY;
+
+DELIMITER //
+
+CREATE PROCEDURE ARCHIVE_CAMUNDA_HISTORY(IN IN_periodInDays INT, IN IN_maxProcessInstances INT)
+MODIFIES SQL DATA 
+
+BEGIN
+ DECLARE P_hiTableCount INT;
+ DECLARE P_executionId BIGINT;   
+ DECLARE P_piProcessed DOUBLE;        
+ DECLARE P_baProcessed DOUBLE;     
+ DECLARE P_startDate DATE;          
+ DECLARE P_executionDuration double;
+ 
+ DECLARE not_found INT DEFAULT 0;     
+    DECLARE CONTINUE HANDLER FOR NOT FOUND SET not_found = 1; 
+
+    /* START TRANSACTION */
+    set P_startDate = sysdate();
+    set P_executionId = NextVal('STAT_EXECUTION_SEQ');
+    
+   INSERT INTO TMPLOGTABLE SELECT CONCAT('P_executionId value is ',P_executionId);
+    
+   DELETE FROM TMP_ARCHIVING_PROCINST;
+   DELETE FROM TMP_ARCHIVING_BYTEARRAY;
+   -- temp table --
+	DELETE FROM TMPLOGTABLE;  
+	
+		
+	/* 1. Set Default Value for Max Pi's  */
+	IF IN_maxProcessInstances = 0 THEN SET IN_maxProcessInstances = 1000; END IF;
+	IF IN_maxProcessInstances > 1000 THEN SET IN_maxProcessInstances = 1000; END IF;
+	
+	INSERT INTO TMPLOGTABLE SELECT CONCAT('IN_maxProcessInstances value is: ',IN_maxProcessInstances);
+
+    /* 2. Fill TMP_ARCHIVING_PROCINST with candidates: */
+    IF IN_maxProcessInstances = 0 THEN /* all */
+        INSERT INTO TMP_ARCHIVING_PROCINST
+              SELECT hi.PROC_INST_ID_, hi.END_TIME_ 
+                FROM ACT_HI_PROCINST hi 
+                               WHERE hi.END_TIME_ IS NOT NULL  
+                                     AND hi.END_TIME_ <= ( DATE_SUB(SYSDATE(), INTERVAL IN_periodInDays DAY));
+                                    
+		ELSE /* limit: IN_maxProcessInstances */
+			INSERT INTO TMP_ARCHIVING_PROCINST
+				(PROC_INST_ID_, END_TIME_) ( 
+				  SELECT hi2.PROC_INST_ID_, hi2.END_TIME_ 
+					FROM ACT_HI_PROCINST hi2 
+								   WHERE hi2.END_TIME_ IS NOT NULL  
+										 AND hi2.END_TIME_ <= ( DATE_SUB(SYSDATE(), INTERVAL IN_periodInDays DAY))  
+				) LIMIT IN_maxProcessInstances;
+    END IF;
+    
+    /* 3. Check PI's im TEMP if any found, ready for ACHIVING */
+    select count(*) INTO P_piProcessed FROM TMP_ARCHIVING_PROCINST;
+    
+    IF P_piProcessed = 0 THEN 
+    	INSERT INTO TMPLOGTABLE SELECT CONCAT('P_piProcessed value is: ',P_piProcessed);
+        ROLLBACK;   
+		/* 4. Move data from history to archive (insert to archive and delete in history) */ 
+		ELSE
+			SELECT COUNT(*)+1 INTO P_hiTableCount FROM camunda_hi_tables;
+				INSERT INTO TMPLOGTABLE SELECT CONCAT('P_hiTableCount value is ',P_hiTableCount);
+			SET @i = 1;
+			WHILE @i < P_hiTableCount 
+				DO 
+					SELECT TableName_ INTO @P_tableName FROM camunda_hi_tables WHERE id_ = @i;
+					INSERT INTO TMPLOGTABLE SELECT CONCAT('P_tableName: ', @P_tableName);
+				
+				   Set @P_archiveTableName = Concat('ARCHIVE_',IFNULL(@P_tableName, ''));
+				   INSERT INTO TMPLOGTABLE SELECT CONCAT('@P_archiveTableName: ', @P_archiveTableName);
+				   
+				   SET @query1 = CONCAT('INSERT INTO ', @P_archiveTableName , 
+						' SELECT hi3.*, ',P_executionId, ', NOW() FROM ', @P_tableName,' hi3 
+						WHERE hi3.PROC_INST_ID_ in ( SELECT PROC_INST_ID_ FROM TMP_ARCHIVING_PROCINST)');
+					INSERT INTO TMPLOGTABLE SELECT CONCAT('@query1: ', @query1);
+						
+					PREPARE stmt1 FROM @query1;		   
+					EXECUTE stmt1; 
+					DEALLOCATE PREPARE stmt1; 
+					
+					SET @query2 = CONCAT ('DELETE ACT FROM ',@P_tableName,' ACT INNER JOIN TMP_ARCHIVING_PROCINST TMP ON ACT.PROC_INST_ID_ = TMP.PROC_INST_ID_');
+					INSERT INTO TMPLOGTABLE SELECT CONCAT('@query2: ', @query2);
+						
+					PREPARE stmt2 FROM @query2;		   
+					EXECUTE stmt2; 
+					DEALLOCATE PREPARE stmt2; 
+					
+        		SET @i = @i+1;
+        	END WHILE;		
+			/* select bytearray_ids */
+			INSERT INTO TMP_ARCHIVING_BYTEARRAY
+				SELECT BYTEARRAY_ID_, PROC_INST_ID_ FROM ARCHIVE_ACT_HI_VARINST archvar
+				where archvar.PROC_INST_ID_ in (SELECT PROC_INST_ID_ FROM TMP_ARCHIVING_PROCINST)
+				AND archvar.BYTEARRAY_ID_ is not null;
+			
+			INSERT INTO TMP_ARCHIVING_BYTEARRAY
+				SELECT BYTEARRAY_ID_, PROC_INST_ID_ FROM ARCHIVE_ACT_HI_DETAIL archvar
+				where archvar.PROC_INST_ID_ in (SELECT PROC_INST_ID_ FROM TMP_ARCHIVING_PROCINST)
+				AND archvar.BYTEARRAY_ID_ is not null;  
+        
+			/* 5. Check Bytearrays im TEMP if any found, ready for ACHIVING */
+			select count(*) INTO P_baProcessed FROM TMP_ARCHIVING_BYTEARRAY;
+			
+			/* INSERT */
+			INSERT INTO ARCHIVE_ACT_GE_BYTEARRAY  
+				SELECT hi4.*, P_executionId, NOW() FROM ACT_GE_BYTEARRAY hi4 
+				WHERE hi4.ID_ in ( SELECT BYTEARRAY_ID_ FROM TMP_ARCHIVING_BYTEARRAY);
+			
+			/* DELETE */
+			DELETE FROM ACT_GE_BYTEARRAY WHERE ID_ in (select BYTEARRAY_ID_ FROM TMP_ARCHIVING_BYTEARRAY);
+			
+			/* COMMIT TRANSACTION */
+			COMMIT;
+			INSERT INTO TMPLOGTABLE SELECT CONCAT('P_executionId is ', P_executionId);	
+			
+		set P_executionDuration = DATEDIFF(sysdate(), P_startDate);
+		
+		INSERT INTO TMPLOGTABLE SELECT CONCAT('SP success and P_executionDuration is ', ifnull((round(P_executionDuration*24*60*60, 1)), ''), ' sec.');
+    END IF;
+   
+ END;
+//
+
+DELIMITER ;
+
+
+
+/* 
+ROLLB_ARCHIVE_CAMUNDA_HISTORY-StoreProcedure starts
+Camunda Version: 7.5.4-ee; MariaDB tested
+Date: 11.30.2016 
+Balaji Mudipalli, AJSC Camunda Team
+
+DOC.:
+--------------------------------------------------------------------------------------
+Create  ROLLB_ARCHIVE_CAMUNDA_HISTORY StoreProcedure for ROLLBACK (RESTORE)
+of archived Camunda history tables.
+*/
+
+/* uncomment below statement and run for your db, e.g. : use camundabpmn;
+ */
+-- use <db_name>;
+
+
+DROP PROCEDURE IF EXISTS ROLLB_ARCHIVE_CAMUNDA_HISTORY;
+
+DELIMITER //
+CREATE PROCEDURE ROLLB_ARCHIVE_CAMUNDA_HISTORY(IN IN_executionId_from INT, 
+                                                            IN IN_executionId_til INT,
+                                                            IN IN_maxProcessInstances INT)
+MODIFIES SQL DATA
+
+BEGIN
+ DECLARE P_hiTableCount INT;
+ DECLARE P_piProcessed DOUBLE;        
+ DECLARE P_baProcessed DOUBLE;        
+ DECLARE P_query VARCHAR(600);         
+ DECLARE P_startDate DATETIME;             
+ DECLARE P_executionDuration DOUBLE;
+ DECLARE P_result NVARCHAR(400);
+DECLARE not_found INT DEFAULT 0;       
+      DECLARE CONTINUE HANDLER FOR NOT FOUND SET not_found = 1;
+ 
+                      
+    /* START TRANSACTION */
+    SET P_startDate = sysdate();
+	DELETE FROM TMPLOGTABLE;  
+    
+	INSERT INTO TMPLOGTABLE SELECT CONCAT('[ROLLB_ARCHIVE_CAMUNDA_HISTORY]:  START EXECUTION: ' , ifnull(date_format(current_timestamp, '%d.%m.%Y %H:%i:%s ..FF3'), '') ,
+                           '; PARAMS: IN_executionId_from: ' , IFNULL(IN_executionId_from, '') , 
+                           '; IN_executionId_til: ' , IFNULL(IN_executionId_til, '') ,
+                           '; IN_maxProcessInstances: ' , IFNULL(IN_maxProcessInstances, ''));
+                                                            
+    /* 1. Truncate TMP_ARCHIVING_PROCINST */
+    
+    DELETE FROM TMP_ARCHIVING_PROCINST;
+    DELETE FROM TMP_ARCHIVING_BYTEARRAY;
+    
+    /* 2. Fill TMP_ARCHIVING_PROCINST with candidates: */
+    IF IN_executionId_til = -1 THEN /* IN_executionId_from only */
+        SET P_query= CONCAT(' WHERE STAT_EXECUTION_ID = ' , IFNULL(IN_executionId_from, ''));
+    
+    ELSEIF IN_executionId_til = 0 THEN /* all from IN_executionId_from */
+        SET P_query= CONCAT(' WHERE STAT_EXECUTION_ID >= ' , IFNULL(IN_executionId_from, ''));
+    
+    ELSE /* between IN_executionId_from AND IN_executionId_til */
+        SET P_query= CONCAT(' WHERE STAT_EXECUTION_ID between ', IFNULL(IN_executionId_from, '') , ' AND ' , IFNULL(IN_executionId_til, ''));
+    END IF;
+    
+    IF IN_maxProcessInstances = 0 THEN /* all */
+    
+        SET @P_query1 = CONCAT('INSERT INTO TMP_ARCHIVING_PROCINST ', ifnull(char(13 using ascii), ''),ifnull(char(10 using ascii), ''),
+                   '   SELECT PROC_INST_ID_, END_TIME_ FROM ARCHIVE_ACT_HI_PROCINST ', ifnull(char(13 using ascii), ''),ifnull(char(10 using ascii), ''),
+                   '   ',  Ifnull(P_query, ''));
+                   
+    ELSE /* limit: IN_maxProcessInstances */
+        SET @P_query1 = CONCAT('INSERT INTO TMP_ARCHIVING_PROCINST ' ,ifnull(char(13 using ascii), ''),ifnull(char(10 using ascii), ''),
+                   ' (PROC_INST_ID_, END_TIME_ ) ( ' ,ifnull(char(13 using ascii), ''),ifnull(char(10 using ascii), ''),
+                   '   SELECT PROC_INST_ID_, END_TIME_ FROM ARCHIVE_ACT_HI_PROCINST ' ,ifnull(char(13 using ascii), ''),ifnull(char(10 using ascii), ''),
+                   '   ',  Ifnull(P_query, '') , ifnull(char(13 using ascii), ''),ifnull(char(10 using ascii), ''),
+                   ') LIMIT ', IFNULL(IN_maxProcessInstances, ''));   
+    END IF;
+    
+    INSERT INTO TMPLOGTABLE SELECT CONCAT('QUERY (before execute): /fill temp table with PI candidates/ ' , Ifnull(P_query, ''));
+	
+	PREPARE stmt1 FROM @P_query1;		   
+	EXECUTE stmt1; 
+	DEALLOCATE PREPARE stmt1; 
+	
+    INSERT INTO TMPLOGTABLE SELECT CONCAT('.... rows inserted into TMP_ARCHIVING_PROCINST: ' , IFNULL((ROW_COUNT()), ''));
+    
+    /* 3. Fill TMP_ARCHIVING_BYTEARRAYS with candidates:  */
+    INSERT INTO TMP_ARCHIVING_BYTEARRAY
+        SELECT BYTEARRAY_ID_, PROC_INST_ID_ FROM ARCHIVE_ACT_HI_VARINST archvar
+        where archvar.PROC_INST_ID_ in (SELECT PROC_INST_ID_ FROM TMP_ARCHIVING_PROCINST)
+        AND archvar.BYTEARRAY_ID_ is not null;
+        
+    INSERT INTO TMP_ARCHIVING_BYTEARRAY
+        SELECT BYTEARRAY_ID_, PROC_INST_ID_ FROM ARCHIVE_ACT_HI_DETAIL archvar
+        where archvar.PROC_INST_ID_ in (SELECT PROC_INST_ID_ FROM TMP_ARCHIVING_PROCINST)
+        AND archvar.BYTEARRAY_ID_ is not null;  
+        
+    select count(*) INTO P_baProcessed FROM TMP_ARCHIVING_BYTEARRAY;
+    INSERT INTO TMPLOGTABLE SELECT CONCAT('[ROLLB_ARCHIVE_CAMUNDA_HISTORY]: ', IFNULL(P_baProcessed, '') ,' ByteArray candidates for rollback found!' , ifnull(char(13 using ascii), ''),ifnull(char(10 using ascii), ''));
+    
+               
+    /* 4. Check PI's im TEMP ready for ROLLBACK */
+    select count(*) INTO P_piProcessed FROM TMP_ARCHIVING_PROCINST;
+    
+    IF P_piProcessed = 0 THEN /* no candidates found */
+        INSERT INTO TMPLOGTABLE SELECT CONCAT('[ROLLB_ARCHIVE_CAMUNDA_HISTORY]: NO ProcessInstance-Candidates for archive-Rollback found! ');
+        INSERT INTO TMPLOGTABLE SELECT CONCAT('Try TA-ROLLBACK ...');
+        ROLLBACK;  /*-- TMP_ARCHIVING_PROCINST un-Delete */
+        INSERT INTO TMPLOGTABLE SELECT CONCAT('TA-ROLLBACK DONE! ...' ,ifnull(char(13 using ascii), ''),ifnull(char(10 using ascii), ''));
+        
+        SET P_result = CONCAT('[ROLLB_ARCHIVE_CAMUNDA_HISTORY]:  NO ProcessInstance candidates for archive-Rollback found!', ifnull(char(13 using ascii), ''),ifnull(char(10 using ascii), ''),
+                    ifnull(date_format(current_timestamp, '%d.%m.%Y %H:%i:%s ..FF3'), '') , ifnull(char(13 using ascii), ''),ifnull(char(10 using ascii), ''),
+                    ' Used PARAMS: IN_executionId_from: ' , IFNULL(IN_executionId_from, '') , 
+                           '; IN_executionId_til: ' , IFNULL(IN_executionId_til, '') ,
+                           '; IN_maxProcessInstances: ' , IFNULL(IN_maxProcessInstances, ''));
+        
+        INSERT INTO TMPLOGTABLE SELECT CONCAT(P_result);
+    
+    ELSE
+        INSERT INTO TMPLOGTABLE SELECT CONCAT('[ROLLB_ARCHIVE_CAMUNDA_HISTORY]: ', IFNULL(P_piProcessed, '') ,' ProcessInstance candidates for Rollback found!');
+    
+        /* LOOP over tables */
+        SELECT COUNT(*)+1 INTO P_hiTableCount FROM camunda_hi_tables;
+			
+			INSERT INTO TMPLOGTABLE SELECT CONCAT('P_hiTableCount value is ',P_hiTableCount);
+				
+			SET @i = 1;
+			
+			WHILE @i < P_hiTableCount 
+				DO 
+					SELECT TableName_ INTO @P_tableName FROM camunda_hi_tables WHERE id_ = @i;
+					
+					INSERT INTO TMPLOGTABLE SELECT CONCAT('[ROLLB_ARCHIVE_CAMUNDA_HISTORY]: #######  Start restore from:  ARCHIVE_' , IFNULL(@P_tableName, '') ,'  ...');
+					
+					SET @P_tableFields = CONCAT(''); 
+					
+					select GROUP_CONCAT(column_name order by ordinal_position) 
+						INTO @P_tableFields 
+						from information_schema.columns  
+						where table_schema = (select DATABASE()) AND TABLE_NAME = @P_tableName;
+
+					/* INSERT */
+					SET @P_query2 = CONCAT('INSERT INTO ', IFNULL(@P_tableName, '') ,
+							   ' SELECT ' , @P_tableFields, 
+							   '  FROM ARCHIVE_' , IFNULL(@P_tableName, '') ,
+							   '  WHERE PROC_INST_ID_ in ( SELECT tmp.PROC_INST_ID_ FROM TMP_ARCHIVING_PROCINST tmp)');
+							   
+					INSERT INTO TMPLOGTABLE SELECT CONCAT('QUERY (before execute): /copy back to history table/ ' , Ifnull(@P_query2, ''));
+
+						PREPARE stmt2 FROM @P_query2;		   
+						EXECUTE stmt2; 
+						DEALLOCATE PREPARE stmt2; 
+						
+					INSERT INTO TMPLOGTABLE SELECT Concat('.... rows inserted: ' , IFNULL((ROW_COUNT()), ''));
+					
+					/* DELETE */
+					INSERT INTO TMPLOGTABLE SELECT CONCAT('[ROLLB_ARCHIVE_CAMUNDA_HISTORY]:         Delete in Archive: ARCHIVE_' , IFNULL(@P_tableName, '') ,'  ...');          
+					/* SET @P_query3 = CONCAT(' DELETE FROM ARCHIVE_' , IFNULL(@P_tableName, '') , ' WHERE PROC_INST_ID_ in (select PROC_INST_ID_ FROM TMP_ARCHIVING_PROCINST)'); */
+					SET @P_query3 = CONCAT('DELETE ARCH FROM ARCHIVE_' , IFNULL(@P_tableName, '') , 
+									' ARCH INNER JOIN TMP_ARCHIVING_PROCINST TMP ON ARCH.PROC_INST_ID_ = TMP.PROC_INST_ID_');
+					INSERT INTO TMPLOGTABLE SELECT CONCAT('QUERY (before execute): ' , Ifnull(@P_query3, ''));
+						PREPARE stmt3 FROM @P_query3;		   
+						EXECUTE stmt3; 
+						DEALLOCATE PREPARE stmt3; 
+						
+					INSERT INTO TMPLOGTABLE SELECT Concat('.... rows deleted: ' , IFNULL((ROW_COUNT()), '') , ifnull(char(13 using ascii), ''),ifnull(char(10 using ascii), ''));
+					
+				SET @i = @i+1;
+			END WHILE;
+        
+        /* INSERT */
+        SET @P_tableFields2 = CONCAT(''); /* reset, becouse had some problems with double columns  */
+        /* fetch table column names into P_tableFields : */
+        select GROUP_CONCAT(COLUMN_NAME order by ordinal_position) 
+			INTO @P_tableFields2 
+            from information_schema.columns  
+            where table_schema = (select DATABASE()) AND TABLE_NAME = 'ACT_GE_BYTEARRAY';
+            
+        SET @P_query4 = CONCAT('INSERT INTO ACT_GE_BYTEARRAY ' ,ifnull(char(13 using ascii), ''),ifnull(char(10 using ascii), ''),
+                   ' SELECT ' , IFNULL(@P_tableFields2, '') ,ifnull(char(13 using ascii), ''),ifnull(char(10 using ascii), ''),
+                   '  FROM ARCHIVE_ACT_GE_BYTEARRAY' ,ifnull(char(13 using ascii), ''),ifnull(char(10 using ascii), ''), 
+                   '  WHERE ID_ in ( SELECT tmp.BYTEARRAY_ID_ FROM TMP_ARCHIVING_BYTEARRAY tmp)');
+        INSERT INTO TMPLOGTABLE SELECT CONCAT('QUERY (before execute): /copy back to history table/ ' , Ifnull(@P_query4, ''));
+		PREPARE stmt4 FROM @P_query4;		   
+		EXECUTE stmt4; 
+		DEALLOCATE PREPARE stmt4; 
+        INSERT INTO TMPLOGTABLE SELECT Concat('.... rows inserted: ' , IFNULL((ROW_COUNT()), ''));
+        
+        /* DELETE */
+        /* DELETE FROM ARCHIVE_ACT_GE_BYTEARRAY WHERE ID_ in (select BYTEARRAY_ID_ FROM TMP_ARCHIVING_BYTEARRAY); */
+		DELETE AAGB FROM ARCHIVE_ACT_GE_BYTEARRAY AAGB INNER JOIN TMP_ARCHIVING_BYTEARRAY TMP_B ON AAGB.ID_ = TMP_B.BYTEARRAY_ID_;
+        INSERT INTO TMPLOGTABLE SELECT Concat('.... rows deleted: ' , IFNULL((ROW_COUNT()), '') , ifnull(char(13 using ascii), ''),ifnull(char(10 using ascii), '')); 
+        
+        /* COMMIT TRANSACTION */
+        INSERT INTO TMPLOGTABLE SELECT CONCAT('[ROLLB_ARCHIVE_CAMUNDA_HISTORY]: PIs processed: ' , IFNULL(P_piProcessed, '')) ;
+        COMMIT;
+        INSERT INTO TMPLOGTABLE SELECT CONCAT('TA-COMMIT DONE!' ,ifnull(char(13 using ascii), ''),ifnull(char(10 using ascii), ''));
+        
+        SET P_executionDuration = DATEDIFF(sysdate(), P_startDate);
+        
+        SET P_result = CONCAT('[ROLLB_ARCHIVE_CAMUNDA_HISTORY]:  EXECUTED (commited) successfully! ' , ifnull(char(13 using ascii), ''),ifnull(char(10 using ascii), ''),
+                ifnull(date_format(current_timestamp, '%d.%m.%Y %H:%i:%s ..FF3'), '') , '; Duration: ' , ifnull((round(P_executionDuration*24*60*60, 1)), ''), ' sec.' ,  ifnull(char(13 using ascii), ''),ifnull(char(10 using ascii), '') ,
+                ' PIs processed: ' , IFNULL(P_piProcessed, '') , ifnull(char(13 using ascii), ''),ifnull(char(10 using ascii), ''),
+                ' Used PARAMS: IN_executionId_from: ' , IFNULL(IN_executionId_from, '') , 
+                           '; IN_executionId_til: ' , IFNULL(IN_executionId_til, '') ,
+                           '; IN_maxProcessInstances: ' , IFNULL(IN_maxProcessInstances, ''));
+                           
+        INSERT INTO TMPLOGTABLE SELECT CONCAT(P_result);                        
+    END IF;
+ END;
+//
+
+DELIMITER ;
diff --git a/packages/root-pack-extras/config-resources/mysql/db-sql-scripts/upgrade/MariaDB-upgrade-1702.37_drop1_to_1707.40_drop1.sql b/packages/root-pack-extras/config-resources/mysql/db-sql-scripts/upgrade/MariaDB-upgrade-1702.37_drop1_to_1707.40_drop1.sql
index b5d8622..1cadb75 100644
--- a/packages/root-pack-extras/config-resources/mysql/db-sql-scripts/upgrade/MariaDB-upgrade-1702.37_drop1_to_1707.40_drop1.sql
+++ b/packages/root-pack-extras/config-resources/mysql/db-sql-scripts/upgrade/MariaDB-upgrade-1702.37_drop1_to_1707.40_drop1.sql
@@ -1,30 +1,30 @@
--- MSO Catalog DB: table 'service-recipe' ----
--- should update a row for create instance
-UPDATE mso_catalog.service_recipe
-SET ORCHESTRATION_URI = "/mso/async/services/CreateGenericALaCarteServiceInstance"
-WHERE SERVICE_ID = 4
-  AND ACTION = 'createInstance';
-  
--- should update a row for delete instance
-UPDATE mso_catalog.service_recipe
-SET ORCHESTRATION_URI = "/mso/async/services/DeleteGenericALaCarteServiceInstance"
-WHERE SERVICE_ID = 4
-  AND ACTION = 'deleteInstance';  
-  
-SET SQL_SAFE_UPDATES = 0;
-
--- 1 coordinate this change with Dmitry when updating labs 
-UPDATE mso_catalog.service_recipe
-SET orchestration_uri = "/mso/async/services/CreateGenericMacroServiceNetworkVnf"
-WHERE orchestration_uri = "/mso/async/services/CreateViprAtmService";
-
-UPDATE mso_catalog.service_recipe
-SET orchestration_uri = "/mso/async/services/DeleteGenericMacroServiceNetworkVnf"
-WHERE orchestration_uri = "/mso/async/services/DeleteViprAtmService";
-
--- 2 network_recipe
-UPDATE mso_catalog.network_recipe
-SET orchestration_uri = '/mso/async/services/UpdateNetworkInstance'
-WHERE network_type = 'VID_DEFAULT' AND action = 'updateInstance';
-
+-- MSO Catalog DB: table 'service-recipe' ----
+-- should update a row for create instance
+UPDATE mso_catalog.service_recipe
+SET ORCHESTRATION_URI = "/mso/async/services/CreateGenericALaCarteServiceInstance"
+WHERE SERVICE_ID = 4
+  AND ACTION = 'createInstance';
+  
+-- should update a row for delete instance
+UPDATE mso_catalog.service_recipe
+SET ORCHESTRATION_URI = "/mso/async/services/DeleteGenericALaCarteServiceInstance"
+WHERE SERVICE_ID = 4
+  AND ACTION = 'deleteInstance';  
+  
+SET SQL_SAFE_UPDATES = 0;
+
+-- 1 coordinate this change with Dmitry when updating labs 
+UPDATE mso_catalog.service_recipe
+SET orchestration_uri = "/mso/async/services/CreateGenericMacroServiceNetworkVnf"
+WHERE orchestration_uri = "/mso/async/services/CreateViprAtmService";
+
+UPDATE mso_catalog.service_recipe
+SET orchestration_uri = "/mso/async/services/DeleteGenericMacroServiceNetworkVnf"
+WHERE orchestration_uri = "/mso/async/services/DeleteViprAtmService";
+
+-- 2 network_recipe
+UPDATE mso_catalog.network_recipe
+SET orchestration_uri = '/mso/async/services/UpdateNetworkInstance'
+WHERE network_type = 'VID_DEFAULT' AND action = 'updateInstance';
+
 SET SQL_SAFE_UPDATES = 1;
\ No newline at end of file
diff --git a/packages/root-pack-extras/config-resources/mysql/db-sql-scripts/upgrade/MariaDB-upgrade-1707.40_drop1_to_1707.41_drop1.sql b/packages/root-pack-extras/config-resources/mysql/db-sql-scripts/upgrade/MariaDB-upgrade-1707.40_drop1_to_1707.41_drop1.sql
index 30da15f..add114d 100644
--- a/packages/root-pack-extras/config-resources/mysql/db-sql-scripts/upgrade/MariaDB-upgrade-1707.40_drop1_to_1707.41_drop1.sql
+++ b/packages/root-pack-extras/config-resources/mysql/db-sql-scripts/upgrade/MariaDB-upgrade-1707.40_drop1_to_1707.41_drop1.sql
@@ -1,1350 +1,1350 @@
--- MySQL Workbench Synchronization <<<1
--- Generated: April 2017
--- MariaDB-upgrade-1707.40_drop1_to_1707.41_drop1.sql
-
--- Turn off validation and alter schema <<<1
-BEGIN;
-
-SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0;
-SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0;
-SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='TRADITIONAL,ALLOW_INVALID_DATES';
-
-ALTER SCHEMA `mso_catalog`  DEFAULT CHARACTER SET latin1  DEFAULT COLLATE latin1_swedish_ci ;
--- >>>1
-
--- FOREIGN KEYS <<<1
-ALTER TABLE `mso_catalog`.`heat_template`  --                                      K <<<2
-DROP FOREIGN KEY `FK_ek5sot1q07taorbdmkvnveu98`;
-
-ALTER TABLE `mso_catalog`.`heat_template_params`  --                               K <<<2
-DROP FOREIGN KEY `FK_8sxvm215cw3tjfh3wni2y3myx`;
-
-ALTER TABLE `mso_catalog`.`service_recipe`  --                                     K <<<2
-DROP FOREIGN KEY `FK_kv13yx013qtqkn94d5gkwbu3s`;
-
-ALTER TABLE `mso_catalog`.`network_resource_customization`  --                     K <<<2
-DROP FOREIGN KEY `fk_network_resource_customization__network_resource__id`;
--- >>>1
-
-UPDATE mso_catalog.heat_environment -- 7 UUID()                                    * <<<1
-SET
-	description = CONCAT(description, '1707MIGRATED'),
-	asdc_uuid = (SELECT UUID())
-WHERE
-	asdc_uuid LIKE "MAN%" OR asdc_uuid is NULL OR asdc_uuid = '';
-
--- DEBUGGING E2E <<<1
--- ERROR 1062 (23000) at line 40: Duplicate entry '53a70d06-f598-4375-9c3c-fcca1dea3f51' for key 'PRIMARY'
-DELETE FROM `mso_catalog`.`heat_environment` where `ASDC_UUID` IN ('53a70d06-f598-4375-9c3c-fcca1dea3f51', 'adc9f8d5-e9d2-4180-994d-cbd59d6eb405');
--- >>>1
-
--- heat_environment -                                                              * <<<1
-CREATE TABLE `mso_catalog`.`hetemp` ( -- <<<2
-	`id` int(11),
-	`ARTIFACT_UUID` VARCHAR(200)
-   ) ENGINE = InnoDB DEFAULT CHARACTER SET = latin1;
-
-INSERT INTO mso_catalog.hetemp SELECT id, asdc_uuid artifact_uuid FROM mso_catalog.heat_environment; -- <<<2
-
-ALTER TABLE `mso_catalog`.`heat_environment`  -- <<<2
-DROP COLUMN `ASDC_LABEL`,
-DROP COLUMN `ASDC_RESOURCE_NAME`,
-DROP COLUMN `id`,
-CHANGE COLUMN `ASDC_UUID` `ARTIFACT_UUID` VARCHAR(200) NOT NULL FIRST,
-CHANGE COLUMN `ARTIFACT_CHECKSUM` `ARTIFACT_CHECKSUM` VARCHAR(200) NOT NULL DEFAULT 'MANUAL RECORD' AFTER `BODY`,
-CHANGE COLUMN `ENVIRONMENT` `BODY` LONGTEXT NOT NULL ,
-DROP PRIMARY KEY,
-ADD PRIMARY KEY (`ARTIFACT_UUID`),
-DROP INDEX `UK_a4jkta7hgpa99brceaxasnfqp` ;
--- >>>1
-
-UPDATE mso_catalog.heat_files -- 7 UUID()                                          * <<<1
-SET
-	description = CONCAT(description, '1707MIGRATED'),
-	asdc_uuid = (SELECT UUID())
-WHERE
-	asdc_uuid LIKE "MAN%" OR asdc_uuid is NULL OR asdc_uuid = '';
-
-ALTER TABLE `mso_catalog`.`heat_files`  --                                         ^ <<<1
-MODIFY `id` INT,
-DROP COLUMN `ASDC_RESOURCE_NAME`,
-DROP COLUMN `ASDC_LABEL`,
-DROP COLUMN `VNF_RESOURCE_ID`,
-CHANGE COLUMN `ASDC_UUID` `ARTIFACT_UUID` VARCHAR(200) NOT NULL FIRST,
-CHANGE COLUMN `FILE_NAME` `NAME` VARCHAR(200) NOT NULL AFTER `ARTIFACT_UUID`,
-CHANGE COLUMN `VERSION` `VERSION` VARCHAR(20) NOT NULL AFTER `NAME`,
-CHANGE COLUMN `ARTIFACT_CHECKSUM` `ARTIFACT_CHECKSUM` VARCHAR(200) NOT NULL DEFAULT 'MANUAL RECORD' AFTER `BODY`,
-CHANGE COLUMN `FILE_BODY` `BODY` LONGTEXT NOT NULL ,
-DROP PRIMARY KEY,
-ADD PRIMARY KEY (`ARTIFACT_UUID`),
-DROP INDEX `UK_m23vfqc1tdvj7d6f0jjo4cl7e` ;
-
-CREATE TABLE IF NOT EXISTS `mso_catalog`.`temp_network_heat_template_lookup` ( --  V <<<1
-  `NETWORK_RESOURCE_MODEL_NAME` VARCHAR(200) NOT NULL,
-  `HEAT_TEMPLATE_ARTIFACT_UUID` VARCHAR(200) NOT NULL,
-  `AIC_VERSION_MIN` VARCHAR(20) NOT NULL,
-  `AIC_VERSION_MAX` VARCHAR(20) NULL DEFAULT NULL,
-  PRIMARY KEY (`NETWORK_RESOURCE_MODEL_NAME`),
-  INDEX `fk_temp_network_heat_template_lookup__heat_template1_idx` (`HEAT_TEMPLATE_ARTIFACT_UUID` ASC)
-) ENGINE = InnoDB DEFAULT CHARACTER SET = latin1;
-
-UPDATE mso_catalog.heat_template -- 7 UUID()                                       V <<<1
-SET
-	description = CONCAT(description, '1707MIGRATED'),
-	asdc_uuid = (SELECT UUID())
-WHERE
-	asdc_uuid LIKE "MAN%" OR asdc_uuid is NULL OR asdc_uuid = ''; 
-
--- delete where network_resource_model_name is CONTRAIL_EXTERNAL or CONTRAIL_SHARED. Q spec 5/25
-INSERT INTO mso_catalog.temp_network_heat_template_lookup ( -- 3sc                 * b4 heat_template network_resource <<<1
-	network_resource_model_name,
-	heat_template_artifact_uuid,
-	aic_version_min,
-	aic_version_max
-)
-	SELECT 
-		a.network_type,
-		b.asdc_uuid,
-		a.aic_version_min,
-		a.aic_version_max
-	FROM
-		mso_catalog.network_resource a,
-		mso_catalog.heat_template b
-	WHERE
-		a.template_id = b.id
-		AND a.network_type NOT IN ('CONTRAIL_EXTERNAL', 'CONTRAIL_SHARED');
-
-ALTER TABLE `mso_catalog`.`heat_template`  --                                      ^ <<<1
-MODIFY `id` INT,
-DROP COLUMN `ASDC_LABEL`,
-DROP COLUMN `CHILD_TEMPLATE_ID`,
-DROP COLUMN `TEMPLATE_PATH`,
-DROP COLUMN `ASDC_RESOURCE_NAME`,
-CHANGE COLUMN `ASDC_UUID` `ARTIFACT_UUID` VARCHAR(200) NOT NULL FIRST,
-CHANGE COLUMN `DESCRIPTION` `DESCRIPTION` VARCHAR(1200) NULL DEFAULT NULL AFTER `VERSION`,
-CHANGE COLUMN `ARTIFACT_CHECKSUM` `ARTIFACT_CHECKSUM` VARCHAR(200) NOT NULL DEFAULT 'MANUAL RECORD' AFTER `TIMEOUT_MINUTES`,
-CHANGE COLUMN `TEMPLATE_NAME` `NAME` VARCHAR(200) NOT NULL ,
-CHANGE COLUMN `TEMPLATE_BODY` `BODY` LONGTEXT NOT NULL ,
-DROP PRIMARY KEY,
-ADD PRIMARY KEY (`ARTIFACT_UUID`),
-DROP INDEX `FK_ek5sot1q07taorbdmkvnveu98` ,
-DROP INDEX `UK_k1tq7vblss8ykiwhiltnkg6no` ;
-
-ALTER TABLE `mso_catalog`.`temp_network_heat_template_lookup`  -- after alter heat_template            ^ <<<1
-  ADD CONSTRAINT `fk_temp_network_heat_template_lookup__heat_template1`
-    FOREIGN KEY (`HEAT_TEMPLATE_ARTIFACT_UUID`)
-    REFERENCES `mso_catalog`.`heat_template` (`ARTIFACT_UUID`)
-    ON DELETE RESTRICT
-    ON UPDATE CASCADE;
--- >>>1
-
--- heat_nested_template AFTER heat_template                                        * <<<1
-CREATE TABLE `mso_catalog`.`hnttemp` ( -- <<<2
-  `PARENT_HEAT_TEMPLATE_UUID` VARCHAR(200) NOT NULL ,
-  `CHILD_HEAT_TEMPLATE_UUID` VARCHAR(200) NOT NULL,
-  `PROVIDER_RESOURCE_FILE` varchar(100) DEFAULT NULL
-   )    
-ENGINE = InnoDB
-DEFAULT CHARACTER SET = latin1;
-        
-INSERT INTO mso_catalog.hnttemp ( -- <<<2
-    PARENT_HEAT_TEMPLATE_UUID,
-    CHILD_HEAT_TEMPLATE_UUID,
-    PROVIDER_RESOURCE_FILE
-)       
-    SELECT
-        ht1.artifact_uuid PARENT_HEAT_TEMPLATE_UUID,
-        ht2.artifact_uuid CHILD_HEAT_TEMPLATE_UUID,
-        a.PROVIDER_RESOURCE_FILE
-        FROM 
-        (SELECT * FROM mso_catalog.heat_nested_template) AS a
-        JOIN (SELECT * FROM mso_catalog.heat_template) AS ht1 ON a.parent_template_id = ht1.id
-        JOIN (SELECT * FROM mso_catalog.heat_template) AS ht2 ON a.child_template_id = ht2.id;
-
-DELETE FROM mso_catalog.heat_nested_template; -- <<<2
-
-ALTER TABLE `mso_catalog`.`heat_nested_template`  -- <<<2
-CHANGE COLUMN `PARENT_TEMPLATE_ID` `PARENT_HEAT_TEMPLATE_UUID` VARCHAR(200) NOT NULL ,
-CHANGE COLUMN `CHILD_TEMPLATE_ID` `CHILD_HEAT_TEMPLATE_UUID` VARCHAR(200) NOT NULL ,
-ADD INDEX `fk_heat_nested_template__heat_template2_idx` (`CHILD_HEAT_TEMPLATE_UUID` ASC);
-
-INSERT INTO mso_catalog.heat_nested_template SELECT * FROM mso_catalog.hnttemp; -- <<<2
-
-DROP TABLE IF EXISTS mso_catalog.hnttemp; -- <<<2
-
--- heat_template_params  AFTER heat_template                                       ^ <<<1
-CREATE TABLE IF NOT EXISTS `mso_catalog`.`htptemp` ( -- <<<2
-  `PARAM_NAME` varchar(100) NOT NULL,
-  `IS_REQUIRED` bit(1) NOT NULL,
-  `PARAM_TYPE` varchar(20) DEFAULT NULL,
-  `PARAM_ALIAS` varchar(45) DEFAULT NULL,
-  `HEAT_TEMPLATE_ARTIFACT_UUID` VARCHAR(200) NOT NULL
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-
-INSERT INTO mso_catalog.htptemp ( -- <<<2
-  PARAM_NAME,
-  IS_REQUIRED,
-  PARAM_TYPE,
-  PARAM_ALIAS,
-  HEAT_TEMPLATE_ARTIFACT_UUID
-)
-	SELECT
-		a.PARAM_NAME,
-		a.IS_REQUIRED,
-		a.PARAM_TYPE,
-		a.PARAM_ALIAS,
-		ht1.artifact_uuid HEAT_TEMPLATE_ARTIFACT_UUID
-		FROM
-		(SELECT * FROM mso_catalog.heat_template_params) AS a
-		JOIN (SELECT * FROM mso_catalog.heat_template) AS ht1 ON a.heat_template_id = ht1.id;
-
-DELETE FROM mso_catalog.heat_template_params; -- <<<2
-
-ALTER TABLE `mso_catalog`.`heat_template_params`  -- <<<2
-DROP COLUMN `id`,
-CHANGE COLUMN `HEAT_TEMPLATE_ID` `HEAT_TEMPLATE_ARTIFACT_UUID` VARCHAR(200) NOT NULL ,
-DROP PRIMARY KEY,
-ADD PRIMARY KEY (`HEAT_TEMPLATE_ARTIFACT_UUID`, `PARAM_NAME`),
-DROP INDEX `UK_pj3cwbmewecf0joqv2mvmbvw3` ;
-
-INSERT INTO mso_catalog.heat_template_params ( -- <<<2
-  PARAM_NAME,
-  IS_REQUIRED,
-  PARAM_TYPE,
-  PARAM_ALIAS,
-  HEAT_TEMPLATE_ARTIFACT_UUID
-)
-	SELECT
-		a.PARAM_NAME,
-		a.IS_REQUIRED,
-		a.PARAM_TYPE,
-		a.PARAM_ALIAS,
-		a.HEAT_TEMPLATE_ARTIFACT_UUID
-		FROM mso_catalog.htptemp a;
-
-DROP TABLE IF EXISTS mso_catalog.htptemp; -- <<<2
-
--- >>>1
-
-ALTER TABLE `mso_catalog`.`network_recipe`  -- <<<1
-CHANGE COLUMN `NETWORK_TYPE` `MODEL_NAME` VARCHAR(20) NOT NULL ;
-
--- 1, 2 UPDATE SERVICE Before SERVICE                                              * <<<1
-UPDATE `mso_catalog`.`service_recipe`
-JOIN (
-	SELECT 
-		MAX(CAST((COALESCE(NULLIF(version_str, ''), '1.0')) AS DECIMAL(5,2))),
-		id,
-		service_name
-	FROM mso_catalog.service
-	WHERE service_name = "WAN Bonding" 
-) a 
-ON a.service_name = "WAN Bonding"
-SET
-	`service_id` = a.id, 
-	`action` = CASE
-		WHEN action = 'Layer3AddBonding' then 'createInstance'
-		WHEN action = 'Layer3DeleteBonding' then 'deleteInstance'
-	END
-WHERE
-	`action` IN ('Layer3AddBonding', 'Layer3DeleteBonding');
-
-UPDATE mso_catalog.service -- 2 <<<2
-SET
-	service_name_version_id = (SELECT UUID()),
-	description = CONCAT(description, '1707MIGRATED')
-WHERE
-	service_name_version_id LIKE "MAN%" OR service_name_version_id is NULL OR service_name_version_id = '';
-
-UPDATE mso_catalog.service
-SET
-	model_invariant_uuid = (SELECT UUID()),
-	description = CONCAT(description, '1707MIGRATED')
-WHERE
-	model_invariant_uuid LIKE 'MAN%' OR model_invariant_uuid is NULL OR model_invariant_uuid = '';
-
--- service - from temporary table servtemp                                         ^ <<<1
-CREATE TABLE `mso_catalog`.`servtemp` ( -- <<<2
-	`id` int(11),
-	`MODEL_NAME` varchar(40) DEFAULT NULL,
-	`MODEL_VERSION` varchar(20) NOT NULL,
-	`DESCRIPTION` varchar(1200) DEFAULT NULL,
-	`CREATION_TIMESTAMP` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP,
-	`MODEL_UUID` varchar(50) NOT NULL DEFAULT 'MANUAL_RECORD',
-	`MODEL_INVARIANT_UUID` varchar(200) NOT NULL DEFAULT 'MANUAL_RECORD'
-   ) ENGINE = InnoDB DEFAULT CHARACTER SET = latin1;
-
-INSERT INTO mso_catalog.servtemp ( -- <<<2
-  id,
-  MODEL_NAME,
-  MODEL_VERSION,
-  DESCRIPTION,
-  CREATION_TIMESTAMP,
-  MODEL_UUID,
-  MODEL_INVARIANT_UUID
-)
-	SELECT
-	  id,
-	  SERVICE_NAME,
-	  VERSION_STR,
-	  DESCRIPTION,
-	  CREATION_TIMESTAMP,
-	  SERVICE_NAME_VERSION_ID,
-	  MODEL_INVARIANT_UUID
-	FROM mso_catalog.service 
-	WHERE SERVICE_NAME NOT IN ('Layer3AddBonding', 'Layer3DeleteBonding');
-	
-DELETE FROM mso_catalog.service; -- <<<2
-
-ALTER  TABLE `mso_catalog`.`service_to_allotted_resources` -- <<<2
-	DROP FOREIGN KEY `fk_service_to_allotted_resources__service__service_name_ver_id`;
-
-ALTER  TABLE `mso_catalog`.`service_to_networks` -- <<<2
-	DROP FOREIGN KEY `fk_service_to_networks__service__service_name_version_id`;
-
-ALTER TABLE `mso_catalog`.`service`  --                                            ^ <<<2
-MODIFY `id` INT,
-DROP COLUMN `SERVICE_ID`,
-DROP COLUMN `HTTP_METHOD`,
-DROP COLUMN `SERVICE_NAME_VERSION_ID`,
-ADD COLUMN `MODEL_UUID` VARCHAR(200) NOT NULL FIRST,
-CHANGE COLUMN `MODEL_INVARIANT_UUID` `MODEL_INVARIANT_UUID` VARCHAR(200) NOT NULL AFTER `MODEL_NAME`,
-CHANGE COLUMN `SERVICE_NAME` `MODEL_NAME` VARCHAR(200) NOT NULL ,
-CHANGE COLUMN `VERSION_STR` `MODEL_VERSION` VARCHAR(20) NOT NULL ,
-ADD COLUMN `TOSCA_CSAR_ARTIFACT_UUID` VARCHAR(200) NULL DEFAULT NULL AFTER `CREATION_TIMESTAMP`,
-DROP PRIMARY KEY,
-ADD PRIMARY KEY (`MODEL_UUID`),
-ADD INDEX `fk_service__tosca_csar1_idx` (`TOSCA_CSAR_ARTIFACT_UUID` ASC),
-DROP INDEX `UK_service_name__service_name_version_id` ;
-
-INSERT INTO mso_catalog.service (
-	id, CREATION_TIMESTAMP, DESCRIPTION, MODEL_INVARIANT_UUID, MODEL_NAME, MODEL_UUID, MODEL_VERSION
-)
-SELECT 
-	id, CREATION_TIMESTAMP, DESCRIPTION, MODEL_INVARIANT_UUID, MODEL_NAME, MODEL_UUID, MODEL_VERSION
-FROM mso_catalog.servtemp; -- >>>2 
-
-DROP TABLE IF EXISTS mso_catalog.servtemp; -- <<<2
-
--- service_recipe - from temporary table srtemp - AFTER service                    ^ <<<1
-CREATE TABLE `mso_catalog`.`srtemp` ( -- <<<2
-  `id` int(11) NOT NULL ,
-  `SERVICE_MODEL_UUID` VARCHAR(200) NOT NULL,
-  `ACTION` varchar(40) NOT NULL,
-  `VERSION_STR` varchar(20) DEFAULT NULL,
-  `DESCRIPTION` varchar(1200) DEFAULT NULL,
-  `ORCHESTRATION_URI` varchar(256) NOT NULL,
-  `SERVICE_PARAM_XSD` varchar(2048) DEFAULT NULL,
-  `RECIPE_TIMEOUT` int(11) DEFAULT NULL,
-  `SERVICE_TIMEOUT_INTERIM` int(11) DEFAULT NULL,
-  `CREATION_TIMESTAMP` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP
-   )
-ENGINE = InnoDB
-DEFAULT CHARACTER SET = latin1;
-
--- ST-CreationTimestamp <<<2
--- ERROR 1292 (22007) at line 331: Incorrect datetime value: '0000-00-00 00:00:00' for column 'CREATION_TIMESTAMP' at row 1
-UPDATE `mso_catalog`.`service_recipe` set CREATION_TIMESTAMP = now() where cast(`CREATION_TIMESTAMP` as char(20)) = '0000-00-00 00:00:00';
--- >>>2
-
-INSERT INTO mso_catalog.srtemp ( -- <<<2
-  id,
-  SERVICE_MODEL_UUID,
-  ACTION,
-  VERSION_STR,
-  DESCRIPTION,
-  ORCHESTRATION_URI,
-  SERVICE_PARAM_XSD,
-  RECIPE_TIMEOUT,
-  SERVICE_TIMEOUT_INTERIM,
-  CREATION_TIMESTAMP
-)
-	SELECT
-		a.id,
-		ht1.MODEL_UUID SERVICE_MODEL_UUID,
-		a.ACTION,
-		a.VERSION_STR,
-		a.DESCRIPTION,
-		a.ORCHESTRATION_URI,
-		a.SERVICE_PARAM_XSD,
-		a.RECIPE_TIMEOUT,
-		a.SERVICE_TIMEOUT_INTERIM,
-		a.CREATION_TIMESTAMP
-		FROM mso_catalog.service_recipe a
-		JOIN mso_catalog.service AS ht1 ON a.service_id = ht1.id;
-
-DELETE FROM mso_catalog.service_recipe; -- <<<2
-
-ALTER TABLE `mso_catalog`.`service_recipe`  -- <<<2
-CHANGE COLUMN `SERVICE_ID` `SERVICE_MODEL_UUID` VARCHAR(200) NOT NULL AFTER `CREATION_TIMESTAMP`,
-ADD INDEX `fk_service_recipe__service1_idx` (`SERVICE_MODEL_UUID` ASC);
-
-INSERT INTO mso_catalog.service_recipe ( -- <<<2
-  id,
-  SERVICE_MODEL_UUID,
-  ACTION,
-  VERSION_STR,
-  DESCRIPTION,
-  ORCHESTRATION_URI,
-  SERVICE_PARAM_XSD,
-  RECIPE_TIMEOUT,
-  SERVICE_TIMEOUT_INTERIM,
-  CREATION_TIMESTAMP
-)
-SELECT 
-  id,
-  SERVICE_MODEL_UUID,
-  ACTION,
-  VERSION_STR,
-  DESCRIPTION,
-  ORCHESTRATION_URI,
-  SERVICE_PARAM_XSD,
-  RECIPE_TIMEOUT,
-  SERVICE_TIMEOUT_INTERIM,
-  CREATION_TIMESTAMP
- FROM mso_catalog.srtemp;
-
-DROP TABLE IF EXISTS mso_catalog.srtemp; -- <<<2
-
--- >>>1
-
-DELETE FROM mso_catalog.vnf_components_recipe WHERE vnf_component_type = 'VOLUME_GROUP' and vnf_type != '*'; -- Q spec 5/25 <<<1
--- >>>1
-
-DELETE FROM mso_catalog.vnf_resource WHERE id IN (2,3,4); -- 3                     * <<<1
-
-UPDATE mso_catalog.vnf_resource -- 4                                               * <<<1
-SET
-	model_name = model_customization_name,
-	asdc_uuid = '09cb25b0-f2f6-40ed-96bc-71ad43e42fc8',
-	model_invariant_uuid = '9fdda511-ffe3-4117-b3cc-cff9c1fc3fff'
-WHERE
-	id=5;
-
-UPDATE mso_catalog.vnf_resource -- 6 set model_name                                * <<<1
-SET
-	model_name = vnf_type
-WHERE
-	service_model_invariant_uuid IS NULL OR model_invariant_uuid = '';
-
-UPDATE mso_catalog.vnf_resource -- 7 UUID() asdc_uuid                              * <<<1
-SET
-	asdc_uuid = (SELECT UUID()),
-	description = CONCAT(description, '1707MIGRATED')
-WHERE
-	asdc_uuid LIKE "MAN%" OR asdc_uuid is NULL OR asdc_uuid = '';
-
-UPDATE mso_catalog.vnf_resource -- 8 UUID() model_customization_uuid               * <<<1
-SET
-	description = CONCAT(description, '1707MIGRATED'),
-	model_customization_uuid = (SELECT UUID())
-WHERE
-	model_customization_uuid LIKE "MAN%" OR model_customization_uuid is NULL OR model_customization_uuid = ''; 
-
--- >>>1
-UPDATE mso_catalog.vnf_resource -- NOT IN SPEC                                     * <<<1
-SET
-	model_customization_name = CONCAT('1707MIGRATED_', model_name)
-WHERE
-	model_customization_name is NULL OR model_customization_name = ''; 
-
--- 5 aka 8d delete each asdc_uuid except highest ASDC_SERVICE_MODEL_VERSION vnf_resource and cascade vf_module * <<<1
-CREATE TABLE mso_catalog.req5temp (`vnfs` INT(11) NOT NULL, `vfs` INT(11));
-
--- delete VR and cascade VMs what have null/empty VR.service_model_invariant_uuid where vnf_name is NOT "BrocadeVce"
-INSERT INTO mso_catalog.req5temp (vnfs, vfs) -- <<<2
-	SELECT a.id, m.id
-		FROM    mso_catalog.vnf_resource a
-		LEFT JOIN mso_catalog.vf_module m ON a.id = m.vnf_resource_id
-		WHERE (a.vnf_name != "BrocadeVce" OR a.vnf_name IS NULL) 
-			AND (a.service_model_invariant_uuid is NULL OR a.service_model_invariant_uuid = '');
-
-DELETE FROM mso_catalog.vnf_resource WHERE id = ANY(SELECT vnfs FROM mso_catalog.req5temp);
-DELETE FROM mso_catalog.vf_module WHERE id = ANY(SELECT vfs FROM mso_catalog.req5temp);
-
-DELETE FROM mso_catalog.req5temp; -- <<<2
-
-INSERT INTO mso_catalog.req5temp (vnfs, vfs) -- <<<2
-	SELECT a.id, m.id
-		FROM mso_catalog.vnf_resource a
-		LEFT JOIN mso_catalog.vf_module m ON a.id = m.vnf_resource_id
-		JOIN (
-			SELECT
-				MAX(CAST((COALESCE(NULLIF(asdc_service_model_version, ''), '1.0')) AS DECIMAL(5,2))) AS v,
-				asdc_uuid
-			FROM mso_catalog.vnf_resource
-			GROUP BY asdc_uuid
-			) b
-		ON
-			a.asdc_uuid = b.asdc_uuid AND
-			CAST((COALESCE(NULLIF(a.asdc_service_model_version, ''), '1.0')) AS DECIMAL(5,2)) != b.v;
--- >>>1 
-
-UPDATE mso_catalog.vf_module --    7 UUID() asdc_uuid                              * <<<1
-SET
-	asdc_uuid = (SELECT UUID()),
-	description = CONCAT(description, '1707MIGRATED')
-WHERE
-	asdc_uuid LIKE "MAN%" OR asdc_uuid is NULL OR asdc_uuid = '';
-
-UPDATE mso_catalog.vf_module --    8 UUID() model_customization_uuid               * <<<1
-SET
-	description = CONCAT(description, '1707MIGRATED'),
-	model_customization_uuid = (SELECT UUID())
-WHERE
-	model_customization_uuid LIKE "MAN%" OR model_customization_uuid is NULL OR model_customization_uuid = '';
-
---  VMC vf_module_customization                                                                           * <<<1
-CREATE TABLE IF NOT EXISTS `mso_catalog`.`vf_module_customization` ( --            V <<<2
-  `MODEL_CUSTOMIZATION_UUID` VARCHAR(200) NOT NULL,
-  `LABEL` VARCHAR(200) NULL DEFAULT NULL,
-  `INITIAL_COUNT` INT(11) NULL DEFAULT 0,
-  `MIN_INSTANCES` INT(11) NULL DEFAULT 0,
-  `MAX_INSTANCES` INT(11) NULL DEFAULT NULL,
-  `AVAILABILITY_ZONE_COUNT` INT(11) NULL DEFAULT NULL,
-  `HEAT_ENVIRONMENT_ARTIFACT_UUID` VARCHAR(200) NULL DEFAULT NULL,
-  `VOL_ENVIRONMENT_ARTIFACT_UUID` VARCHAR(200) NULL DEFAULT NULL,
-  `CREATION_TIMESTAMP` DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP,
-  `VF_MODULE_MODEL_UUID` VARCHAR(200) NOT NULL,
-  PRIMARY KEY (`MODEL_CUSTOMIZATION_UUID`),
-  INDEX `fk_vf_module_customization__vf_module1_idx` (`VF_MODULE_MODEL_UUID` ASC),
-  INDEX `fk_vf_module_customization__heat_env__heat_environment1_idx` (`HEAT_ENVIRONMENT_ARTIFACT_UUID` ASC),
-  INDEX `fk_vf_module_customization__vol_env__heat_environment2_idx` (`VOL_ENVIRONMENT_ARTIFACT_UUID` ASC),
-  CONSTRAINT `fk_vf_module_customization__heat_env__heat_environment1`
-    FOREIGN KEY (`HEAT_ENVIRONMENT_ARTIFACT_UUID`)
-    REFERENCES `mso_catalog`.`heat_environment` (`ARTIFACT_UUID`)
-    ON DELETE CASCADE
-    ON UPDATE CASCADE,
-  CONSTRAINT `fk_vf_module_customization__vol_env__heat_environment2`
-    FOREIGN KEY (`VOL_ENVIRONMENT_ARTIFACT_UUID`)
-    REFERENCES `mso_catalog`.`heat_environment` (`ARTIFACT_UUID`)
-    ON DELETE CASCADE
-    ON UPDATE CASCADE
-) ENGINE = InnoDB DEFAULT CHARACTER SET = latin1;
-
-CREATE TABLE mso_catalog.vfduptemp (`id` INT(11) NOT NULL); -- <<<2
-
-INSERT INTO mso_catalog.vfduptemp (id) -- <<<2
-SELECT a.id
-FROM mso_catalog.vf_module a
-JOIN (
-		SELECT
-			MAX(CAST((COALESCE(NULLIF(asdc_service_model_version, ''), '1.0')) AS DECIMAL(5,2))) AS ver,
-			model_customization_uuid mcu,
-			id vid
-		FROM mso_catalog.vf_module
-		GROUP BY model_customization_uuid
-		) b
-ON
-		a.model_customization_uuid = mcu
-		AND CAST((COALESCE(NULLIF(a.asdc_service_model_version, ''), '1.0')) AS DECIMAL(5,2)) != b.ver
-ORDER BY a.model_customization_uuid;
-
-INSERT INTO mso_catalog.vf_module_customization ( -- <<<2
-		model_customization_uuid, -- <<<3
-		label,
-		initial_count,
-		min_instances,
-		max_instances,
-		heat_environment_artifact_uuid,
-		vol_environment_artifact_uuid,
-		vf_module_model_uuid -- >>>3
-)
-SELECT 
-		a.model_customization_uuid,
-		a.label,
-		a.initial_count,
-		a.min_instances,
-		a.max_instances,
-		ht1.artifact_uuid,
-		ht2.artifact_uuid,
-		a.asdc_uuid
-FROM mso_catalog.vf_module a
-LEFT JOIN mso_catalog.hetemp AS ht1 ON a.environment_id = ht1.id
-LEFT JOIN mso_catalog.hetemp AS ht2 ON a.vol_environment_id = ht2.id
-WHERE NOT EXISTS (
-		SELECT 1 FROM mso_catalog.vfduptemp vdt
-		WHERE
-		a.id = vdt.id
-);
-
-DROP TABLE IF EXISTS mso_catalog.vfduptemp; -- <<<2
-
-DROP TABLE IF EXISTS mso_catalog.hetemp; -- <<<2
-
--- >>>1
-
--- AR ALLOTTED_RESOURCE <<<1
-CREATE TABLE IF NOT EXISTS `mso_catalog`.`allotted_resource` ( --                  V <<<2
-  `MODEL_UUID` VARCHAR(200) NOT NULL,
-  `MODEL_INVARIANT_UUID` VARCHAR(200) NOT NULL,
-  `MODEL_VERSION` VARCHAR(20) NOT NULL,
-  `MODEL_NAME` VARCHAR(200) NOT NULL,
-  `TOSCA_NODE_TYPE` VARCHAR(200) NULL DEFAULT NULL,
-  `SUBCATEGORY` VARCHAR(200) NULL DEFAULT NULL,
-  `DESCRIPTION` VARCHAR(1200) NULL DEFAULT NULL,
-  `CREATION_TIMESTAMP` DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP,
-  PRIMARY KEY (`MODEL_UUID`))
-ENGINE = InnoDB
-DEFAULT CHARACTER SET = latin1;
-
- INSERT INTO `mso_catalog`.`allotted_resource`  ( -- 2sc                            * <<<2
- 		model_uuid,
- 		model_invariant_uuid,
- 		model_version,
- 		model_name,
- 		description
- )
-	SELECT DISTINCT
-		model_uuid,
-		model_invariant_uuid,
-		model_version,
-		model_name,
-		description
- 	FROM
- 		mso_catalog.allotted_resource_customization;
--- >>>1
-
-ALTER TABLE `mso_catalog`.`allotted_resource_customization`  --                    ^ <<<1
-DROP COLUMN `DESCRIPTION`,
-DROP COLUMN `MODEL_NAME`,
-DROP COLUMN `MODEL_VERSION`,
-DROP COLUMN `MODEL_INVARIANT_UUID`,
-CHANGE COLUMN `MODEL_UUID` `AR_MODEL_UUID` VARCHAR(200) NOT NULL, -- ARC
-CHANGE COLUMN `MODEL_INSTANCE_NAME` `MODEL_INSTANCE_NAME` VARCHAR(200) NOT NULL AFTER `MODEL_CUSTOMIZATION_UUID`,
-ADD COLUMN `PROVIDING_SERVICE_MODEL_INVARIANT_UUID` VARCHAR(200) NULL DEFAULT NULL AFTER `MODEL_INSTANCE_NAME`,
-ADD COLUMN `TARGET_NETWORK_ROLE` VARCHAR(200) NULL DEFAULT NULL AFTER `PROVIDING_SERVICE_MODEL_INVARIANT_UUID`,
-ADD COLUMN `NF_TYPE` VARCHAR(200) NULL DEFAULT NULL AFTER `TARGET_NETWORK_ROLE`,
-ADD COLUMN `NF_ROLE` VARCHAR(200) NULL DEFAULT NULL AFTER `NF_TYPE`,
-ADD COLUMN `NF_FUNCTION` VARCHAR(200) NULL DEFAULT NULL AFTER `NF_ROLE`,
-ADD COLUMN `NF_NAMING_CODE` VARCHAR(200) NULL DEFAULT NULL AFTER `NF_FUNCTION`,
-ADD COLUMN `MIN_INSTANCES` INT(11) NULL DEFAULT NULL AFTER `NF_NAMING_CODE`,
-ADD COLUMN `MAX_INSTANCES` INT(11) NULL DEFAULT NULL AFTER `MIN_INSTANCES`,
-ADD INDEX `fk_allotted_resource_customization__allotted_resource1_idx` (`AR_MODEL_UUID` ASC);
--- >>>1
-
--- VRC  vnf_resource_customization <<<1
--- vnftemp table <<<2
-CREATE TABLE `mso_catalog`.`vnftemp` AS
-	SELECT model_customization_uuid, service_model_invariant_uuid, asdc_service_model_version
-	FROM `mso_catalog`.`vnf_resource`;
-
-DROP TABLE IF EXISTS `mso_catalog`.`vnf_resource_customization`; -- <<<2
-
-CREATE TABLE `mso_catalog`.`vnf_resource_customization` ( -- <<<2
-  `MODEL_CUSTOMIZATION_UUID` VARCHAR(200) NOT NULL,
-  `MODEL_INSTANCE_NAME` VARCHAR(200) NOT NULL,
-  `MIN_INSTANCES` INT(11) NULL DEFAULT NULL,
-  `MAX_INSTANCES` INT(11) NULL DEFAULT NULL,
-  `AVAILABILITY_ZONE_MAX_COUNT` INT(11) NULL DEFAULT NULL,
-  `NF_TYPE` VARCHAR(200) NULL DEFAULT NULL,
-  `NF_ROLE` VARCHAR(200) NULL DEFAULT NULL,
-  `NF_FUNCTION` VARCHAR(200) NULL DEFAULT NULL,
-  `NF_NAMING_CODE` VARCHAR(200) NULL DEFAULT NULL,
-  `CREATION_TIMESTAMP` DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP,
-  `VNF_RESOURCE_MODEL_UUID` VARCHAR(200) NOT NULL,
-  PRIMARY KEY (`MODEL_CUSTOMIZATION_UUID`),
-  INDEX `fk_vnf_resource_customization__vnf_resource1_idx` (`VNF_RESOURCE_MODEL_UUID` ASC)
-) ENGINE = InnoDB DEFAULT CHARACTER SET = latin1;
-
-INSERT INTO mso_catalog.vnf_resource_customization ( -- <<<2
-	model_customization_uuid,
-	model_instance_name,
-	vnf_resource_model_uuid
-)
-	SELECT DISTINCT
-		a.model_customization_uuid,
-		ht1.model_customization_name,
-		ht1.asdc_uuid
-	FROM mso_catalog.vnftemp a
-	JOIN mso_catalog.vnf_resource AS ht1 ON
-		a.model_customization_uuid = ht1.model_customization_uuid AND
-		a.asdc_service_model_version = ht1.asdc_service_model_version;
--- >>>1
-
--- network_resource_customization                                                  * <<<1
-CREATE TABLE `mso_catalog`.`nrctemp` ( -- <<<2
-  `MODEL_UUID` varchar(200) NOT NULL,
-  `MODEL_NAME` varchar(200) NOT NULL,
-  `MODEL_INVARIANT_UUID` varchar(200) NOT NULL,
-  `NETWORK_RESOURCE_ID` int(11) NOT NULL,
-  `MODEL_CUSTOMIZATION_UUID` VARCHAR(200) NOT NULL,
-  `MODEL_INSTANCE_NAME` VARCHAR(200) NOT NULL,
-  `NETWORK_TECHNOLOGY` VARCHAR(45) NULL,
-  `NETWORK_TYPE` VARCHAR(45) NULL,
-  `NETWORK_ROLE` VARCHAR(200) NULL,
-  `NETWORK_SCOPE` VARCHAR(45) NULL,
-  `MODEL_VERSION` VARCHAR(20) NULL,
-  `CREATION_TIMESTAMP` DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP,
-  `NETWORK_RESOURCE_MODEL_UUID` VARCHAR(200) NOT NULL
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-
-INSERT INTO mso_catalog.nrctemp ( -- <<<2
-	model_customization_uuid,
-	model_uuid,
-	model_invariant_uuid,
-	model_instance_name,
-	model_name,
-	network_resource_id,
-	model_version,
-	creation_timestamp,
-	network_resource_model_uuid
-)
-	SELECT 
-		model_customization_uuid,
-		model_uuid,
-		model_invariant_uuid,
-		model_instance_name,
-		model_name,
-		network_resource_id,
-		model_version,
-		creation_timestamp,
-		model_uuid
-	FROM mso_catalog.network_resource_customization;
-
-DELETE FROM mso_catalog.network_resource_customization; -- <<<2
-
-ALTER TABLE `mso_catalog`.`network_resource_customization`  -- <<<2
-DROP COLUMN `NETWORK_RESOURCE_ID`,
-DROP COLUMN `MODEL_VERSION`,
-DROP COLUMN `MODEL_INVARIANT_UUID`,
-DROP COLUMN `MODEL_NAME`,
-DROP COLUMN `MODEL_UUID`,
-ADD COLUMN `NETWORK_TECHNOLOGY` VARCHAR(45) NULL DEFAULT NULL AFTER `MODEL_INSTANCE_NAME`,
-ADD COLUMN `NETWORK_TYPE` VARCHAR(45) NULL DEFAULT NULL AFTER `NETWORK_TECHNOLOGY`,
-ADD COLUMN `NETWORK_ROLE` VARCHAR(200) NULL DEFAULT NULL AFTER `NETWORK_TYPE`,
-ADD COLUMN `NETWORK_SCOPE` VARCHAR(45) NULL DEFAULT NULL AFTER `NETWORK_ROLE`,
-ADD COLUMN `NETWORK_RESOURCE_MODEL_UUID` VARCHAR(200) NOT NULL AFTER `CREATION_TIMESTAMP`,
-DROP PRIMARY KEY,
-ADD PRIMARY KEY (`MODEL_CUSTOMIZATION_UUID`),
-ADD INDEX `fk_network_resource_customization__network_resource1_idx` (`NETWORK_RESOURCE_MODEL_UUID` ASC),
-DROP INDEX `fk_network_resource_customization__network_resource_id_idx`;
--- >>>2
-
-INSERT INTO mso_catalog.network_resource_customization ( -- <<<2
-	model_customization_uuid,
-	model_instance_name,
-	creation_timestamp,
-	network_resource_model_uuid,
-	network_type
-)
-	SELECT 
-		a.model_customization_uuid,
-		a.model_instance_name,
-		a.creation_timestamp,
-		a.model_uuid,
-		a.network_type
-	FROM mso_catalog.nrctemp a;
-
--- DROP temp table later, after network_resource uses it <<<2
-
--- >>>1
-
--- network_resource                                                                * <<<1
-CREATE TABLE `mso_catalog`.`nrtemp` ( -- <<<2
-  `MODEL_NAME` VARCHAR(200) NOT NULL,
-  `ORCHESTRATION_MODE` varchar(20) DEFAULT NULL,
-  `DESCRIPTION` varchar(1200) DEFAULT NULL,
-  `NEUTRON_NETWORK_TYPE` varchar(20) DEFAULT NULL,
-  `CREATION_TIMESTAMP` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP,
-  `MODEL_VERSION` VARCHAR(20) NULL DEFAULT NULL,
-  `AIC_VERSION_MIN` varchar(20) NOT NULL,
-  `AIC_VERSION_MAX` varchar(20) DEFAULT NULL,
-  `MODEL_INVARIANT_UUID` VARCHAR(200) NULL DEFAULT NULL,
-  `TOSCA_NODE_TYPE` VARCHAR(200) NULL DEFAULT NULL,
-  `TEMPLATE_ID` VARCHAR(200)
-   )
-ENGINE = InnoDB
-DEFAULT CHARACTER SET = latin1;
-
--- E2E-CreationTimestamp <<<2
--- ERROR 1292 (22007) at line 675: Incorrect datetime value: '0000-00-00 00:00:00' for column 'CREATION_TIMESTAMP' at row 1
-UPDATE `mso_catalog`.`network_resource` set CREATION_TIMESTAMP = now() where cast(`CREATION_TIMESTAMP` as char(20)) = '0000-00-00 00:00:00';
--- >>>2
-
-INSERT INTO mso_catalog.nrtemp ( -- <<<2
-  MODEL_NAME,
-  ORCHESTRATION_MODE,
-  DESCRIPTION,
-  NEUTRON_NETWORK_TYPE,
-  CREATION_TIMESTAMP,
-  MODEL_VERSION,
-  AIC_VERSION_MIN,
-  AIC_VERSION_MAX,
-  TEMPLATE_ID
-)
-	SELECT
-		NETWORK_TYPE,
-		ORCHESTRATION_MODE,
-		DESCRIPTION,
-		NEUTRON_NETWORK_TYPE,
-		CREATION_TIMESTAMP,
-		VERSION_STR,
-		AIC_VERSION_MIN,
-		AIC_VERSION_MAX,
-		TEMPLATE_ID
-	FROM mso_catalog.network_resource;
-
-DELETE FROM mso_catalog.network_resource; -- <<<2
-
-ALTER TABLE `mso_catalog`.`network_resource`  -- <<<2
-DROP COLUMN `id`,
-CHANGE COLUMN `VERSION_STR` `MODEL_VERSION` VARCHAR(20) NULL DEFAULT NULL,
-CHANGE COLUMN `TEMPLATE_ID` `HEAT_TEMPLATE_ARTIFACT_UUID` VARCHAR(200) NOT NULL,
-CHANGE COLUMN `NETWORK_TYPE` `MODEL_NAME` VARCHAR(200) NOT NULL,
-CHANGE COLUMN `NEUTRON_NETWORK_TYPE` `NEUTRON_NETWORK_TYPE` VARCHAR(20) NULL DEFAULT NULL,
-CHANGE COLUMN `ORCHESTRATION_MODE` `ORCHESTRATION_MODE` VARCHAR(20) NULL DEFAULT 'HEAT' AFTER `AIC_VERSION_MAX`,
-CHANGE COLUMN `CREATION_TIMESTAMP` `CREATION_TIMESTAMP` DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP AFTER `ORCHESTRATION_MODE`,
-ADD COLUMN `MODEL_UUID` VARCHAR(200) NOT NULL FIRST,
-ADD COLUMN `MODEL_INVARIANT_UUID` VARCHAR(200) NULL DEFAULT NULL AFTER `MODEL_NAME`,
-ADD COLUMN `TOSCA_NODE_TYPE` VARCHAR(200) NULL DEFAULT NULL AFTER `MODEL_VERSION`,
-DROP PRIMARY KEY,
-ADD PRIMARY KEY (`MODEL_UUID`),
-ADD INDEX `fk_network_resource__temp_network_heat_template_lookup1_idx` (`MODEL_NAME` ASC),
-ADD INDEX `fk_network_resource__heat_template1_idx` (`HEAT_TEMPLATE_ARTIFACT_UUID` ASC),
-DROP INDEX `UK_e5vlpk2xorqk7ogtg6wgw2eo6` ;
-
-INSERT INTO mso_catalog.network_resource ( -- <<<2
-  model_name,
-  orchestration_mode,
-  description,
-  heat_template_artifact_uuid,
-  neutron_network_type,
-  creation_timestamp,
-  model_version,
-  aic_version_min,
-  aic_version_max,
-  model_uuid,
-  model_invariant_uuid
-)
-	SELECT DISTINCT
-		ht2.model_name,
-		a.ORCHESTRATION_MODE,
-		a.DESCRIPTION,
-		ht1.ARTIFACT_UUID,
-		a.NEUTRON_NETWORK_TYPE,
-		a.CREATION_TIMESTAMP,
-		ht2.model_version,
-		a.AIC_VERSION_MIN,
-		a.AIC_VERSION_MAX,
-		ht2.model_uuid,
-		ht2.model_invariant_uuid
-	FROM mso_catalog.nrtemp a
-		JOIN mso_catalog.heat_template ht1 ON a.template_id = ht1.id
-		JOIN mso_catalog.nrctemp ht2 ON a.model_name = ht2.model_name
-		GROUP BY a.model_name;
-
-DROP TABLE IF EXISTS mso_catalog.nrtemp; -- <<<2
-
-DROP TABLE IF EXISTS mso_catalog.nrctemp; -- <<<2
-
--- >>>1
-
--- VRC2VMC vnf_res_custom_to_vf_module_custom <<<1
-CREATE TABLE IF NOT EXISTS `mso_catalog`.`vnf_res_custom_to_vf_module_custom` ( -- <<<2
-  `VNF_RESOURCE_CUST_MODEL_CUSTOMIZATION_UUID` VARCHAR(200) NOT NULL,
-  `VF_MODULE_CUST_MODEL_CUSTOMIZATION_UUID` VARCHAR(200) NOT NULL,
-  `CREATION_TIMESTAMP` DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP,
-  PRIMARY KEY (`VNF_RESOURCE_CUST_MODEL_CUSTOMIZATION_UUID`, `VF_MODULE_CUST_MODEL_CUSTOMIZATION_UUID`),
-  INDEX `fk_vnf_res_custom_to_vf_module_custom__vf_module_customizat_idx` (`VF_MODULE_CUST_MODEL_CUSTOMIZATION_UUID` ASC),
-  CONSTRAINT `fk_vnf_res_custom_to_vf_module_custom__vf_module_customization1`
-    FOREIGN KEY (`VF_MODULE_CUST_MODEL_CUSTOMIZATION_UUID`)
-    REFERENCES `mso_catalog`.`vf_module_customization` (`MODEL_CUSTOMIZATION_UUID`)
-    ON DELETE CASCADE
-    ON UPDATE CASCADE,
-  CONSTRAINT `fk_vnf_res_custom_to_vf_module_custom__vnf_resource_customiza1`
-    FOREIGN KEY (`VNF_RESOURCE_CUST_MODEL_CUSTOMIZATION_UUID`)
-    REFERENCES `mso_catalog`.`vnf_resource_customization` (`MODEL_CUSTOMIZATION_UUID`)
-    ON DELETE CASCADE
-    ON UPDATE CASCADE)
-ENGINE = InnoDB
-DEFAULT CHARACTER SET = latin1;
-
-INSERT INTO mso_catalog.vnf_res_custom_to_vf_module_custom ( -- 6sc aka 8c         <<<2
-	vnf_resource_cust_model_customization_uuid,
-	vf_module_cust_model_customization_uuid,
-	creation_timestamp
-)
-	SELECT DISTINCT
-		a.model_customization_uuid,
-		b.model_customization_uuid,
-		now()
-	FROM
-		mso_catalog.vnf_resource a,
-		mso_catalog.vf_module b
-	WHERE a.id = b.vnf_resource_id;
--- >>>1
-
--- VR vnf_resource After vrc2vmc and vrc                                              ^ <<<1
--- ERROR 1292 (22007) : Incorrect datetime value: '0000-00-00 00:00:00' for column 'CREATION_TIMESTAMP' <<<2
-UPDATE `mso_catalog`.`vnf_resource` set CREATION_TIMESTAMP = now() where cast(`CREATION_TIMESTAMP` as char(20)) = '0000-00-00 00:00:00';
-
-ALTER TABLE `mso_catalog`.`vnf_resource`  -- after vrc2vmc and vrc                 ^ <<<2
-MODIFY `id` INT,
-DROP COLUMN `MODEL_CUSTOMIZATION_UUID`,
-DROP COLUMN `SERVICE_MODEL_INVARIANT_UUID`,
-DROP COLUMN `MODEL_CUSTOMIZATION_NAME`,
-DROP COLUMN `VNF_TYPE`,
-DROP COLUMN `ASDC_SERVICE_MODEL_VERSION`,
-DROP COLUMN `ENVIRONMENT_ID`,
-DROP COLUMN `VERSION`,
-DROP COLUMN `VNF_NAME`,
-CHANGE COLUMN `DESCRIPTION` `DESCRIPTION` VARCHAR(1200) NULL DEFAULT NULL,
-CHANGE COLUMN `ORCHESTRATION_MODE` `ORCHESTRATION_MODE` VARCHAR(20) NOT NULL DEFAULT 'HEAT',
-CHANGE COLUMN `AIC_VERSION_MIN` `AIC_VERSION_MIN` VARCHAR(20) NULL DEFAULT NULL,
-CHANGE COLUMN `AIC_VERSION_MAX` `AIC_VERSION_MAX` VARCHAR(20) NULL DEFAULT NULL,
-CHANGE COLUMN `CREATION_TIMESTAMP` `CREATION_TIMESTAMP` DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP,
-CHANGE COLUMN `ASDC_UUID` `MODEL_UUID` VARCHAR(200) NOT NULL ,
-ADD COLUMN `TOSCA_NODE_TYPE` VARCHAR(200) NULL DEFAULT NULL,
-ADD COLUMN `HEAT_TEMPLATE_ARTIFACT_UUID` VARCHAR(200) NULL DEFAULT NULL,
-DROP PRIMARY KEY,
-ADD INDEX `fk_vnf_resource__heat_template1_idx` (`HEAT_TEMPLATE_ARTIFACT_UUID` ASC),
-DROP INDEX `UK_model_customization_uuid__asdc_service_model_version`,
-DROP INDEX `UK_k10a0w7h4t0lnbynd3inkg67k`;
-
-UPDATE mso_catalog.vnf_resource a --                                              * <<<2
-	LEFT JOIN mso_catalog.heat_template ht1 ON a.template_id = ht1.id
-SET
-	heat_template_artifact_uuid = ht1.artifact_uuid;
-
--- Eliminate duplicates <<<2
-CREATE TABLE `mso_catalog`.`vrtemp` AS
-
-SELECT vr.* FROM `mso_catalog`.`vnf_resource` vr
-WHERE vr.id NOT IN (SELECT vnfs FROM mso_catalog.req5temp)
-GROUP BY MODEL_UUID;
-
-DROP TABLE `mso_catalog`.`vnf_resource`;  
-RENAME TABLE `mso_catalog`.`vrtemp` TO `mso_catalog`.`vnf_resource`;  
--- >>>1
-
--- VF vf_module  after VRC2VMC and VMC                                                ^ <<<1
-CREATE TABLE IF NOT EXISTS `mso_catalog`.`vftemp` ( -- <<<2
-  `id` int(11) NOT NULL,
-  `MODEL_UUID` VARCHAR(200) NOT NULL,
-  `MODEL_INVARIANT_UUID` VARCHAR(200) NULL DEFAULT NULL,
-  `MODEL_VERSION` VARCHAR(20) NOT NULL,
-  `MODEL_NAME` VARCHAR(200) NOT NULL,
-  `DESCRIPTION` VARCHAR(1200) NULL DEFAULT NULL,
-  `IS_BASE` INT(11) NOT NULL,
-  `HEAT_TEMPLATE_ARTIFACT_UUID` VARCHAR(200),
-  `VOL_HEAT_TEMPLATE_ARTIFACT_UUID` VARCHAR(200) NULL DEFAULT NULL,
-  `CREATION_TIMESTAMP` DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP,
-  `VNF_RESOURCE_MODEL_UUID` VARCHAR(200)
-   ) ENGINE = InnoDB DEFAULT CHARACTER SET = latin1;
-
-INSERT INTO mso_catalog.vftemp ( -- <<<2
-	id, -- <<<3
-	model_uuid,
-	is_base,
-	model_name,
-	model_version,
-	creation_timestamp,
-	description,
-	heat_template_artifact_uuid,
-	vol_heat_template_artifact_uuid,
-	vnf_resource_model_uuid,
-	model_invariant_uuid -- >>>3
-)
-	SELECT
-		a.id, -- <<<3
-		a.asdc_uuid,
-		a.is_base,
-		a.model_name,
-		a.model_version,
-		a.creation_timestamp,
-		a.description,
-		ht1.artifact_uuid heat_template_artifact_uuid,
-		ht2.artifact_uuid vol_heat_template_artifact_uuid,
-		vr1.model_uuid vnf_resource_model_uuid,
-		a.model_invariant_uuid -- >>>3
-		FROM
-		(SELECT * FROM mso_catalog.vf_module) AS a
-		LEFT JOIN (SELECT * FROM mso_catalog.heat_template) AS ht1 ON a.template_id = ht1.id
-		LEFT JOIN (SELECT * FROM mso_catalog.heat_template) AS ht2 ON a.vol_template_id = ht2.id
-		JOIN (SELECT * FROM mso_catalog.vnf_resource) AS vr1 ON a.vnf_resource_id = vr1.id;
-
-DELETE FROM mso_catalog.vf_module; -- <<<2
-
-ALTER TABLE `mso_catalog`.`vf_module`  -- after vftemp vrc2vmc and vmc <<<2
-DROP COLUMN `LABEL`,
-DROP COLUMN `INITIAL_COUNT`,
-DROP COLUMN `MAX_INSTANCES`,
-DROP COLUMN `MIN_INSTANCES`,
-DROP COLUMN `MODEL_CUSTOMIZATION_UUID`,
-DROP COLUMN `TYPE`,
-DROP COLUMN `ASDC_SERVICE_MODEL_VERSION`,
-DROP COLUMN `ENVIRONMENT_ID`,
-DROP COLUMN `VNF_RESOURCE_ID`,
-DROP COLUMN `VOL_ENVIRONMENT_ID`,
-CHANGE COLUMN `id` `id` INT(11),
-CHANGE COLUMN `MODEL_INVARIANT_UUID` `MODEL_INVARIANT_UUID` VARCHAR(200) NULL DEFAULT NULL AFTER `MODEL_UUID`,
-CHANGE COLUMN `MODEL_VERSION` `MODEL_VERSION` VARCHAR(20) NOT NULL AFTER `MODEL_INVARIANT_UUID`,
-CHANGE COLUMN `IS_BASE` `IS_BASE` INT(11) NOT NULL AFTER `DESCRIPTION`,
-CHANGE COLUMN `TEMPLATE_ID` `HEAT_TEMPLATE_ARTIFACT_UUID` VARCHAR(200) NULL DEFAULT NULL AFTER `IS_BASE`,
-CHANGE COLUMN `CREATION_TIMESTAMP` `CREATION_TIMESTAMP` DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP AFTER `VOL_HEAT_TEMPLATE_ARTIFACT_UUID`,
-CHANGE COLUMN `ASDC_UUID` `MODEL_UUID` VARCHAR(200) NOT NULL ,
-CHANGE COLUMN `DESCRIPTION` `DESCRIPTION` VARCHAR(1200) NULL DEFAULT NULL ,
-CHANGE COLUMN `VOL_TEMPLATE_ID` `VOL_HEAT_TEMPLATE_ARTIFACT_UUID` VARCHAR(200) NULL DEFAULT NULL ,
-ADD COLUMN `VNF_RESOURCE_MODEL_UUID` VARCHAR(200) NOT NULL AFTER `CREATION_TIMESTAMP`,
-DROP PRIMARY KEY,
-ADD INDEX `fk_vf_module__vnf_resource1_idx` (`VNF_RESOURCE_MODEL_UUID` ASC),
-ADD INDEX `fk_vf_module__heat_template_art_uuid__heat_template1_idx` (`HEAT_TEMPLATE_ARTIFACT_UUID` ASC),
-ADD INDEX `fk_vf_module__vol_heat_template_art_uuid__heat_template2_idx` (`VOL_HEAT_TEMPLATE_ARTIFACT_UUID` ASC),
-DROP INDEX `UK_model_customization_uuid__asdc_service_model_version` ,
-DROP INDEX `UK_o3bvdqspginaxlp4gxqohd44l` ;
-
-INSERT INTO mso_catalog.vf_module ( -- <<<2
-	id, -- <<<3
-	model_uuid,
-	is_base,
-	model_name,
-	model_version,
-	creation_timestamp,
-	description,
-	heat_template_artifact_uuid,
-	vol_heat_template_artifact_uuid,
-	vnf_resource_model_uuid,
-	model_invariant_uuid -- >>>3
-)
-	SELECT
-		id, -- <<<3
-		model_uuid,
-		is_base,
-		model_name,
-		model_version,
-		creation_timestamp,
-		description,
-		heat_template_artifact_uuid,
-		vol_heat_template_artifact_uuid,
-		vnf_resource_model_uuid,
-		model_invariant_uuid -- >>>3
-	FROM
-		mso_catalog.vftemp;
-
--- DROP vftemp later <<<2
-
--- >>>1
-
--- vnf_components_recipe   AFTER vf_module                                         ^ <<<1
-CREATE TABLE `mso_catalog`.`vcrtemp` ( -- <<<2
-  `id` int(11) NOT NULL,
-  `VNF_TYPE` varchar(200) DEFAULT NULL,
-  `VNF_COMPONENT_TYPE` varchar(45) NOT NULL,
-  `ACTION` varchar(20) NOT NULL,
-  `SERVICE_TYPE` varchar(45) DEFAULT NULL,
-  `VERSION` varchar(20) DEFAULT NULL,
-  `DESCRIPTION` varchar(1200) DEFAULT NULL,
-  `ORCHESTRATION_URI` varchar(256) NOT NULL,
-  `VNF_COMPONENT_PARAM_XSD` varchar(2048) DEFAULT NULL,
-  `RECIPE_TIMEOUT` int(11) DEFAULT NULL,
-  `CREATION_TIMESTAMP` datetime DEFAULT CURRENT_TIMESTAMP,
-  `VF_MODULE_MODEL_UUID` VARCHAR(200) NULL DEFAULT NULL
-   ) ENGINE = InnoDB DEFAULT CHARACTER SET = latin1;
-
-INSERT INTO mso_catalog.vcrtemp ( -- <<<2
-  id, -- <<<3
-  VNF_TYPE,
-  VNF_COMPONENT_TYPE,
-  ACTION,
-  SERVICE_TYPE,
-  VERSION,
-  DESCRIPTION,
-  ORCHESTRATION_URI,
-  VNF_COMPONENT_PARAM_XSD,
-  RECIPE_TIMEOUT,
-  CREATION_TIMESTAMP,
-  VF_MODULE_MODEL_UUID -- >>>3
-)
-	SELECT
-		a.id, -- <<<3
-		a.VNF_TYPE,
-		a.VNF_COMPONENT_TYPE,
-		a.ACTION,
-		a.SERVICE_TYPE,
-		a.VERSION,
-		a.DESCRIPTION,
-		a.ORCHESTRATION_URI,
-		a.VNF_COMPONENT_PARAM_XSD,
-		a.RECIPE_TIMEOUT,
-		a.CREATION_TIMESTAMP,
-		COALESCE(ht1.model_uuid, a.vf_module_id)  VF_MODULE_MODEL_UUID -- >>>3
-		FROM mso_catalog.vnf_components_recipe a
-		LEFT JOIN mso_catalog.vftemp ht1 ON a.vf_module_id = CONVERT(ht1.id, CHAR(100));
-
--- DROP vftemp later <<<2
-
-DELETE FROM mso_catalog.vnf_components_recipe; -- <<<2
-
-ALTER TABLE `mso_catalog`.`vnf_components_recipe`  -- <<<2
-CHANGE COLUMN `VF_MODULE_ID` `VF_MODULE_MODEL_UUID` VARCHAR(200) NULL DEFAULT NULL;
-
-INSERT INTO mso_catalog.vnf_components_recipe SELECT * FROM mso_catalog.vcrtemp; -- <<<2
-
-DROP TABLE IF EXISTS mso_catalog.vcrtemp; -- <<<2
-
--- >>>1
-
--- vf_module_to_heat_files  AFTER vf_module heat_files                             ^ <<<1
-CREATE TABLE `mso_catalog`.`vmthftemp` ( -- <<<2
-	VF_MODULE_MODEL_UUID VARCHAR(200) NOT NULL,
-	HEAT_FILES_ARTIFACT_UUID VARCHAR(200) NOT NULL
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-
-INSERT INTO mso_catalog.vmthftemp ( -- <<<2
-    VF_MODULE_MODEL_UUID,
-    HEAT_FILES_ARTIFACT_UUID
-)
-	SELECT DISTINCT
-		ht1.model_uuid,
-		ht2.artifact_uuid
-		FROM mso_catalog.vf_module_to_heat_files a
-		JOIN mso_catalog.vftemp ht1 ON a.vf_module_id = CONVERT(ht1.id, CHAR(100))
-		JOIN  mso_catalog.heat_files ht2 ON a.HEAT_FILES_ID = ht2.id;
-
-DROP TABLE IF EXISTS mso_catalog.vftemp; -- <<<2
-
-DELETE FROM mso_catalog.vf_module_to_heat_files; -- <<<2
-
-ALTER TABLE `mso_catalog`.`vf_module_to_heat_files`  -- <<<2
-CHANGE COLUMN `VF_MODULE_ID` `VF_MODULE_MODEL_UUID` VARCHAR(200) NOT NULL ,
-CHANGE COLUMN `HEAT_FILES_ID` `HEAT_FILES_ARTIFACT_UUID` VARCHAR(200) NOT NULL ,
-ADD INDEX `fk_vf_module_to_heat_files__heat_files__artifact_uuid1_idx` (`HEAT_FILES_ARTIFACT_UUID` ASC);
-
-INSERT INTO mso_catalog.vf_module_to_heat_files SELECT * FROM mso_catalog.vmthftemp; -- <<<2
-
-DROP TABLE IF EXISTS mso_catalog.vmthftemp; -- <<<2
-
--- >>>1
-
--- S2RC service_to_resource_customizations` <<<1
-CREATE TABLE IF NOT EXISTS `mso_catalog`.`service_to_resource_customizations` ( -- V <<<2
-  `SERVICE_MODEL_UUID` VARCHAR(200) NOT NULL,
-  `RESOURCE_MODEL_CUSTOMIZATION_UUID` VARCHAR(200) NOT NULL,
-  `MODEL_TYPE` VARCHAR(20) NOT NULL,
-  `CREATION_TIMESTAMP` DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP,
-  INDEX `fk_service_to_resource_cust__service_model_uuid_idx` (`SERVICE_MODEL_UUID` ASC),
-  PRIMARY KEY (`SERVICE_MODEL_UUID`, `RESOURCE_MODEL_CUSTOMIZATION_UUID`, `MODEL_TYPE`),
-  INDEX `fk_service_to_resource_cust__resource_model_customiz_uuid_idx` (`RESOURCE_MODEL_CUSTOMIZATION_UUID` ASC),
-  CONSTRAINT `fk_service_to_resource_cust__service__model_uuid0`
-    FOREIGN KEY (`SERVICE_MODEL_UUID`)
-    REFERENCES `mso_catalog`.`service` (`MODEL_UUID`)
-    ON DELETE CASCADE
-    ON UPDATE CASCADE
-	) ENGINE = InnoDB DEFAULT CHARACTER SET = latin1;
-
-INSERT INTO mso_catalog.service_to_resource_customizations ( -- 4sc                * <<<2
-	service_model_uuid,
-	resource_model_customization_uuid,
-	model_type
-)
-	SELECT 
-		a.service_model_uuid,
-		a.network_model_customization_uuid,
-		"network"
-	FROM
-		mso_catalog.service_to_networks a;
-
-INSERT INTO mso_catalog.service_to_resource_customizations ( -- 5sc                * <<<2
-	service_model_uuid,
-	resource_model_customization_uuid,
-	model_type
-)
-	SELECT 
-		a.service_model_uuid,
-		a.ar_model_customization_uuid,
-		"allottedResource"
-	FROM
-		mso_catalog.service_to_allotted_resources a;
-
-INSERT INTO mso_catalog.service_to_resource_customizations ( -- 8a                 * <<<2
-    service_model_uuid,
-    resource_model_customization_uuid,
-    model_type
-)
-    SELECT  
-        ht1.model_uuid,
-        a.model_customization_uuid,
-        "vnf"
-    FROM mso_catalog.vnftemp a
-	JOIN mso_catalog.service AS ht1 ON
-		a.service_model_invariant_uuid = ht1.model_invariant_uuid AND
-		a.asdc_service_model_version = ht1.model_version;
-
-ALTER TABLE `mso_catalog`.`service`  --                                            * <<<2
-DROP COLUMN `SERVICE_VERSION`;
-
-DROP TABLE IF EXISTS mso_catalog.vnftemp; -- <<<2
-
--- >>>1
-
-CREATE TABLE IF NOT EXISTS `mso_catalog`.`tosca_csar` ( --                         C <<<1
-  `ARTIFACT_UUID` VARCHAR(200) NOT NULL,
-  `NAME` VARCHAR(200) NOT NULL,
-  `VERSION` VARCHAR(20) NOT NULL,
-  `DESCRIPTION` VARCHAR(1200) NULL DEFAULT NULL,
-  `ARTIFACT_CHECKSUM` VARCHAR(200) NOT NULL,
-  `URL` VARCHAR(200) NOT NULL,
-  `CREATION_TIMESTAMP` DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP,
-  PRIMARY KEY (`ARTIFACT_UUID`))
-ENGINE = InnoDB
-DEFAULT CHARACTER SET = latin1;
--- >>>1
-
--- 5 aka 8d delete each asdc_uuid except highest ASDC_SERVICE_MODEL_VERSION vnf_resource and cascade vf_module * <<<1
--- DELETE FROM mso_catalog.vnf_resource WHERE id = ANY(SELECT vnfs FROM mso_catalog.req5temp);
-DELETE FROM mso_catalog.vf_module WHERE id = ANY(SELECT vfs FROM mso_catalog.req5temp);
-DROP TABLE mso_catalog.req5temp;
--- >>>1
-
-DROP TABLE IF EXISTS `mso_catalog`.`service_to_networks` ; --                      D <<<1
-
-DROP TABLE IF EXISTS `mso_catalog`.`service_to_allotted_resources` ; --            D <<<1
-
--- >>>1
-
--- Drop ID's <<<1
-ALTER TABLE `mso_catalog`.`heat_template` DROP COLUMN `id`;
-ALTER TABLE `mso_catalog`.`heat_files`    DROP COLUMN `id`;
-ALTER TABLE `mso_catalog`.`service`       DROP COLUMN `id`;
-ALTER TABLE `mso_catalog`.`vnf_resource`  DROP COLUMN `id`;
-ALTER TABLE `mso_catalog`.`vf_module`     DROP COLUMN `id`;
--- >>>1
-
--- FOREIGN KEYS <<<1
-ALTER TABLE `mso_catalog`.`heat_nested_template`  --                               K <<<2
-ADD CONSTRAINT `fk_heat_nested_template__parent_heat_temp_uuid__heat_template1`
-  FOREIGN KEY (`PARENT_HEAT_TEMPLATE_UUID`)
-  REFERENCES `mso_catalog`.`heat_template` (`ARTIFACT_UUID`)
-  ON DELETE CASCADE
-  ON UPDATE CASCADE,
-ADD CONSTRAINT `fk_heat_nested_template__child_heat_temp_uuid__heat_template1`
-  FOREIGN KEY (`CHILD_HEAT_TEMPLATE_UUID`)
-  REFERENCES `mso_catalog`.`heat_template` (`ARTIFACT_UUID`)
-  ON DELETE CASCADE
-  ON UPDATE CASCADE;
-
-ALTER TABLE `mso_catalog`.`heat_template_params`  --                               K <<<2
-ADD CONSTRAINT `fk_heat_template_params__heat_template1`
-  FOREIGN KEY (`HEAT_TEMPLATE_ARTIFACT_UUID`)
-  REFERENCES `mso_catalog`.`heat_template` (`ARTIFACT_UUID`)
-  ON DELETE CASCADE
-  ON UPDATE CASCADE;
-
-ALTER TABLE `mso_catalog`.`service`  --                                            K <<<2
-ADD CONSTRAINT `fk_service__tosca_csar1`
-  FOREIGN KEY (`TOSCA_CSAR_ARTIFACT_UUID`)
-  REFERENCES `mso_catalog`.`tosca_csar` (`ARTIFACT_UUID`)
-  ON DELETE CASCADE
-  ON UPDATE CASCADE;
-
-ALTER TABLE `mso_catalog`.`service_recipe`  --                                     K <<<2
-ADD CONSTRAINT `fk_service_recipe__service1`
-  FOREIGN KEY (`SERVICE_MODEL_UUID`)
-  REFERENCES `mso_catalog`.`service` (`MODEL_UUID`)
-  ON DELETE CASCADE
-  ON UPDATE CASCADE;
-
-ALTER TABLE `mso_catalog`.`vnf_resource` --                                        K <<<2
-	ADD PRIMARY KEY (`MODEL_UUID`),
-	DROP COLUMN `TEMPLATE_ID`,
-ADD CONSTRAINT `fk_vnf_resource__heat_template1`
-  FOREIGN KEY (`HEAT_TEMPLATE_ARTIFACT_UUID`)
-  REFERENCES `mso_catalog`.`heat_template` (`ARTIFACT_UUID`)
-  ON DELETE CASCADE
-  ON UPDATE CASCADE;
-
-ALTER TABLE `mso_catalog`.`vf_module`  --                                          K <<<2
-ADD PRIMARY KEY (`MODEL_UUID`, `VNF_RESOURCE_MODEL_UUID`),
-ADD CONSTRAINT `fk_vf_module__vnf_resource1`
-  FOREIGN KEY (`VNF_RESOURCE_MODEL_UUID`)
-  REFERENCES `mso_catalog`.`vnf_resource` (`MODEL_UUID`)
-  ON DELETE CASCADE
-  ON UPDATE CASCADE,
-ADD CONSTRAINT `fk_vf_module__heat_template_art_uuid__heat_template1`
-  FOREIGN KEY (`HEAT_TEMPLATE_ARTIFACT_UUID`)
-  REFERENCES `mso_catalog`.`heat_template` (`ARTIFACT_UUID`)
-  ON DELETE CASCADE
-  ON UPDATE CASCADE,
-ADD CONSTRAINT `fk_vf_module__vol_heat_template_art_uuid__heat_template2`
-  FOREIGN KEY (`VOL_HEAT_TEMPLATE_ARTIFACT_UUID`)
-  REFERENCES `mso_catalog`.`heat_template` (`ARTIFACT_UUID`)
-  ON DELETE CASCADE
-  ON UPDATE CASCADE;
-
-ALTER TABLE `mso_catalog`.`vf_module_customization` -- after vf_module             K <<<2
-  ADD CONSTRAINT `fk_vf_module_customization__vf_module1`
-    FOREIGN KEY (`VF_MODULE_MODEL_UUID`)
-    REFERENCES `mso_catalog`.`vf_module` (`MODEL_UUID`)
-    ON DELETE CASCADE
-    ON UPDATE CASCADE;
-
-ALTER TABLE `mso_catalog`.`vf_module_to_heat_files`  --                            K <<<2
-ADD CONSTRAINT `fk_vf_module_to_heat_files__heat_files__artifact_uuid1`
-  FOREIGN KEY (`HEAT_FILES_ARTIFACT_UUID`)
-  REFERENCES `mso_catalog`.`heat_files` (`ARTIFACT_UUID`)
-  ON DELETE CASCADE
-  ON UPDATE CASCADE,
-ADD CONSTRAINT `fk_vf_module_to_heat_files__vf_module__model_uuid1`
-  FOREIGN KEY (`VF_MODULE_MODEL_UUID`)
-  REFERENCES `mso_catalog`.`vf_module` (`MODEL_UUID`)
-  ON DELETE CASCADE
-  ON UPDATE CASCADE;
-
-ALTER TABLE `mso_catalog`.`allotted_resource_customization`  --                    K <<<2
-ADD CONSTRAINT `fk_allotted_resource_customization__allotted_resource1`
-  FOREIGN KEY (`AR_MODEL_UUID`)
-  REFERENCES `mso_catalog`.`allotted_resource` (`MODEL_UUID`)
-  ON DELETE CASCADE
-  ON UPDATE CASCADE;
-
-ALTER TABLE `mso_catalog`.`network_resource`  --                                   K <<<2
-ADD CONSTRAINT `fk_network_resource__temp_network_heat_template_lookup__mod_nm1`
-  FOREIGN KEY (`MODEL_NAME`)
-  REFERENCES `mso_catalog`.`temp_network_heat_template_lookup` (`NETWORK_RESOURCE_MODEL_NAME`)
-  ON DELETE NO ACTION
-  ON UPDATE NO ACTION,
-ADD CONSTRAINT `fk_network_resource__heat_template1`
-  FOREIGN KEY (`HEAT_TEMPLATE_ARTIFACT_UUID`)
-  REFERENCES `mso_catalog`.`heat_template` (`ARTIFACT_UUID`)
-  ON DELETE RESTRICT
-  ON UPDATE CASCADE;
-
-ALTER TABLE `mso_catalog`.`network_resource_customization`  --                     K <<<2
-ADD CONSTRAINT `fk_network_resource_customization__network_resource1`
-  FOREIGN KEY (`NETWORK_RESOURCE_MODEL_UUID`)
-  REFERENCES `mso_catalog`.`network_resource` (`MODEL_UUID`)
-  ON DELETE CASCADE
-  ON UPDATE CASCADE;
-
-ALTER TABLE `mso_catalog`.`vnf_resource_customization`  --                         K <<<2
-ADD CONSTRAINT `fk_vnf_resource_customization__vnf_resource1`
-    FOREIGN KEY (`VNF_RESOURCE_MODEL_UUID`)
-    REFERENCES `mso_catalog`.`vnf_resource` (`MODEL_UUID`)
-    ON DELETE CASCADE
-    ON UPDATE CASCADE;
--- >>>1
-
--- turn validation back on <<<1
-SET SQL_MODE=@OLD_SQL_MODE;
-SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS;
-SET UNIQUE_CHECKS=@OLD_UNIQUE_CHECKS;
-
-COMMIT;
--- >>>1
-
-/*
-This file uses folds, set by last line.
-
-While reading this file, lines with the + are folded.
-	To unfold all:     zR
-	To fold all:       zM
-
-Move cursor to folded line: type in commands...
-	Toggle folding:    za
-    Recursively:       zA
-
-Vim help about folding
-:help fold
-*/
---  vim:foldmarker=<<<,>>>:foldenable:foldmethod=marker
+-- MySQL Workbench Synchronization <<<1
+-- Generated: April 2017
+-- MariaDB-upgrade-1707.40_drop1_to_1707.41_drop1.sql
+
+-- Turn off validation and alter schema <<<1
+BEGIN;
+
+SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0;
+SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0;
+SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='TRADITIONAL,ALLOW_INVALID_DATES';
+
+ALTER SCHEMA `mso_catalog`  DEFAULT CHARACTER SET latin1  DEFAULT COLLATE latin1_swedish_ci ;
+-- >>>1
+
+-- FOREIGN KEYS <<<1
+ALTER TABLE `mso_catalog`.`heat_template`  --                                      K <<<2
+DROP FOREIGN KEY `FK_ek5sot1q07taorbdmkvnveu98`;
+
+ALTER TABLE `mso_catalog`.`heat_template_params`  --                               K <<<2
+DROP FOREIGN KEY `FK_8sxvm215cw3tjfh3wni2y3myx`;
+
+ALTER TABLE `mso_catalog`.`service_recipe`  --                                     K <<<2
+DROP FOREIGN KEY `FK_kv13yx013qtqkn94d5gkwbu3s`;
+
+ALTER TABLE `mso_catalog`.`network_resource_customization`  --                     K <<<2
+DROP FOREIGN KEY `fk_network_resource_customization__network_resource__id`;
+-- >>>1
+
+UPDATE mso_catalog.heat_environment -- 7 UUID()                                    * <<<1
+SET
+	description = CONCAT(description, '1707MIGRATED'),
+	asdc_uuid = (SELECT UUID())
+WHERE
+	asdc_uuid LIKE "MAN%" OR asdc_uuid is NULL OR asdc_uuid = '';
+
+-- DEBUGGING E2E <<<1
+-- ERROR 1062 (23000) at line 40: Duplicate entry '53a70d06-f598-4375-9c3c-fcca1dea3f51' for key 'PRIMARY'
+DELETE FROM `mso_catalog`.`heat_environment` where `ASDC_UUID` IN ('53a70d06-f598-4375-9c3c-fcca1dea3f51', 'adc9f8d5-e9d2-4180-994d-cbd59d6eb405');
+-- >>>1
+
+-- heat_environment -                                                              * <<<1
+CREATE TABLE `mso_catalog`.`hetemp` ( -- <<<2
+	`id` int(11),
+	`ARTIFACT_UUID` VARCHAR(200)
+   ) ENGINE = InnoDB DEFAULT CHARACTER SET = latin1;
+
+INSERT INTO mso_catalog.hetemp SELECT id, asdc_uuid artifact_uuid FROM mso_catalog.heat_environment; -- <<<2
+
+ALTER TABLE `mso_catalog`.`heat_environment`  -- <<<2
+DROP COLUMN `ASDC_LABEL`,
+DROP COLUMN `ASDC_RESOURCE_NAME`,
+DROP COLUMN `id`,
+CHANGE COLUMN `ASDC_UUID` `ARTIFACT_UUID` VARCHAR(200) NOT NULL FIRST,
+CHANGE COLUMN `ARTIFACT_CHECKSUM` `ARTIFACT_CHECKSUM` VARCHAR(200) NOT NULL DEFAULT 'MANUAL RECORD' AFTER `BODY`,
+CHANGE COLUMN `ENVIRONMENT` `BODY` LONGTEXT NOT NULL ,
+DROP PRIMARY KEY,
+ADD PRIMARY KEY (`ARTIFACT_UUID`),
+DROP INDEX `UK_a4jkta7hgpa99brceaxasnfqp` ;
+-- >>>1
+
+UPDATE mso_catalog.heat_files -- 7 UUID()                                          * <<<1
+SET
+	description = CONCAT(description, '1707MIGRATED'),
+	asdc_uuid = (SELECT UUID())
+WHERE
+	asdc_uuid LIKE "MAN%" OR asdc_uuid is NULL OR asdc_uuid = '';
+
+ALTER TABLE `mso_catalog`.`heat_files`  --                                         ^ <<<1
+MODIFY `id` INT,
+DROP COLUMN `ASDC_RESOURCE_NAME`,
+DROP COLUMN `ASDC_LABEL`,
+DROP COLUMN `VNF_RESOURCE_ID`,
+CHANGE COLUMN `ASDC_UUID` `ARTIFACT_UUID` VARCHAR(200) NOT NULL FIRST,
+CHANGE COLUMN `FILE_NAME` `NAME` VARCHAR(200) NOT NULL AFTER `ARTIFACT_UUID`,
+CHANGE COLUMN `VERSION` `VERSION` VARCHAR(20) NOT NULL AFTER `NAME`,
+CHANGE COLUMN `ARTIFACT_CHECKSUM` `ARTIFACT_CHECKSUM` VARCHAR(200) NOT NULL DEFAULT 'MANUAL RECORD' AFTER `BODY`,
+CHANGE COLUMN `FILE_BODY` `BODY` LONGTEXT NOT NULL ,
+DROP PRIMARY KEY,
+ADD PRIMARY KEY (`ARTIFACT_UUID`),
+DROP INDEX `UK_m23vfqc1tdvj7d6f0jjo4cl7e` ;
+
+CREATE TABLE IF NOT EXISTS `mso_catalog`.`temp_network_heat_template_lookup` ( --  V <<<1
+  `NETWORK_RESOURCE_MODEL_NAME` VARCHAR(200) NOT NULL,
+  `HEAT_TEMPLATE_ARTIFACT_UUID` VARCHAR(200) NOT NULL,
+  `AIC_VERSION_MIN` VARCHAR(20) NOT NULL,
+  `AIC_VERSION_MAX` VARCHAR(20) NULL DEFAULT NULL,
+  PRIMARY KEY (`NETWORK_RESOURCE_MODEL_NAME`),
+  INDEX `fk_temp_network_heat_template_lookup__heat_template1_idx` (`HEAT_TEMPLATE_ARTIFACT_UUID` ASC)
+) ENGINE = InnoDB DEFAULT CHARACTER SET = latin1;
+
+UPDATE mso_catalog.heat_template -- 7 UUID()                                       V <<<1
+SET
+	description = CONCAT(description, '1707MIGRATED'),
+	asdc_uuid = (SELECT UUID())
+WHERE
+	asdc_uuid LIKE "MAN%" OR asdc_uuid is NULL OR asdc_uuid = ''; 
+
+-- delete where network_resource_model_name is CONTRAIL_EXTERNAL or CONTRAIL_SHARED. Q spec 5/25
+INSERT INTO mso_catalog.temp_network_heat_template_lookup ( -- 3sc                 * b4 heat_template network_resource <<<1
+	network_resource_model_name,
+	heat_template_artifact_uuid,
+	aic_version_min,
+	aic_version_max
+)
+	SELECT 
+		a.network_type,
+		b.asdc_uuid,
+		a.aic_version_min,
+		a.aic_version_max
+	FROM
+		mso_catalog.network_resource a,
+		mso_catalog.heat_template b
+	WHERE
+		a.template_id = b.id
+		AND a.network_type NOT IN ('CONTRAIL_EXTERNAL', 'CONTRAIL_SHARED');
+
+ALTER TABLE `mso_catalog`.`heat_template`  --                                      ^ <<<1
+MODIFY `id` INT,
+DROP COLUMN `ASDC_LABEL`,
+DROP COLUMN `CHILD_TEMPLATE_ID`,
+DROP COLUMN `TEMPLATE_PATH`,
+DROP COLUMN `ASDC_RESOURCE_NAME`,
+CHANGE COLUMN `ASDC_UUID` `ARTIFACT_UUID` VARCHAR(200) NOT NULL FIRST,
+CHANGE COLUMN `DESCRIPTION` `DESCRIPTION` VARCHAR(1200) NULL DEFAULT NULL AFTER `VERSION`,
+CHANGE COLUMN `ARTIFACT_CHECKSUM` `ARTIFACT_CHECKSUM` VARCHAR(200) NOT NULL DEFAULT 'MANUAL RECORD' AFTER `TIMEOUT_MINUTES`,
+CHANGE COLUMN `TEMPLATE_NAME` `NAME` VARCHAR(200) NOT NULL ,
+CHANGE COLUMN `TEMPLATE_BODY` `BODY` LONGTEXT NOT NULL ,
+DROP PRIMARY KEY,
+ADD PRIMARY KEY (`ARTIFACT_UUID`),
+DROP INDEX `FK_ek5sot1q07taorbdmkvnveu98` ,
+DROP INDEX `UK_k1tq7vblss8ykiwhiltnkg6no` ;
+
+ALTER TABLE `mso_catalog`.`temp_network_heat_template_lookup`  -- after alter heat_template            ^ <<<1
+  ADD CONSTRAINT `fk_temp_network_heat_template_lookup__heat_template1`
+    FOREIGN KEY (`HEAT_TEMPLATE_ARTIFACT_UUID`)
+    REFERENCES `mso_catalog`.`heat_template` (`ARTIFACT_UUID`)
+    ON DELETE RESTRICT
+    ON UPDATE CASCADE;
+-- >>>1
+
+-- heat_nested_template AFTER heat_template                                        * <<<1
+CREATE TABLE `mso_catalog`.`hnttemp` ( -- <<<2
+  `PARENT_HEAT_TEMPLATE_UUID` VARCHAR(200) NOT NULL ,
+  `CHILD_HEAT_TEMPLATE_UUID` VARCHAR(200) NOT NULL,
+  `PROVIDER_RESOURCE_FILE` varchar(100) DEFAULT NULL
+   )    
+ENGINE = InnoDB
+DEFAULT CHARACTER SET = latin1;
+        
+INSERT INTO mso_catalog.hnttemp ( -- <<<2
+    PARENT_HEAT_TEMPLATE_UUID,
+    CHILD_HEAT_TEMPLATE_UUID,
+    PROVIDER_RESOURCE_FILE
+)       
+    SELECT
+        ht1.artifact_uuid PARENT_HEAT_TEMPLATE_UUID,
+        ht2.artifact_uuid CHILD_HEAT_TEMPLATE_UUID,
+        a.PROVIDER_RESOURCE_FILE
+        FROM 
+        (SELECT * FROM mso_catalog.heat_nested_template) AS a
+        JOIN (SELECT * FROM mso_catalog.heat_template) AS ht1 ON a.parent_template_id = ht1.id
+        JOIN (SELECT * FROM mso_catalog.heat_template) AS ht2 ON a.child_template_id = ht2.id;
+
+DELETE FROM mso_catalog.heat_nested_template; -- <<<2
+
+ALTER TABLE `mso_catalog`.`heat_nested_template`  -- <<<2
+CHANGE COLUMN `PARENT_TEMPLATE_ID` `PARENT_HEAT_TEMPLATE_UUID` VARCHAR(200) NOT NULL ,
+CHANGE COLUMN `CHILD_TEMPLATE_ID` `CHILD_HEAT_TEMPLATE_UUID` VARCHAR(200) NOT NULL ,
+ADD INDEX `fk_heat_nested_template__heat_template2_idx` (`CHILD_HEAT_TEMPLATE_UUID` ASC);
+
+INSERT INTO mso_catalog.heat_nested_template SELECT * FROM mso_catalog.hnttemp; -- <<<2
+
+DROP TABLE IF EXISTS mso_catalog.hnttemp; -- <<<2
+
+-- heat_template_params  AFTER heat_template                                       ^ <<<1
+CREATE TABLE IF NOT EXISTS `mso_catalog`.`htptemp` ( -- <<<2
+  `PARAM_NAME` varchar(100) NOT NULL,
+  `IS_REQUIRED` bit(1) NOT NULL,
+  `PARAM_TYPE` varchar(20) DEFAULT NULL,
+  `PARAM_ALIAS` varchar(45) DEFAULT NULL,
+  `HEAT_TEMPLATE_ARTIFACT_UUID` VARCHAR(200) NOT NULL
+) ENGINE=InnoDB DEFAULT CHARSET=latin1;
+
+INSERT INTO mso_catalog.htptemp ( -- <<<2
+  PARAM_NAME,
+  IS_REQUIRED,
+  PARAM_TYPE,
+  PARAM_ALIAS,
+  HEAT_TEMPLATE_ARTIFACT_UUID
+)
+	SELECT
+		a.PARAM_NAME,
+		a.IS_REQUIRED,
+		a.PARAM_TYPE,
+		a.PARAM_ALIAS,
+		ht1.artifact_uuid HEAT_TEMPLATE_ARTIFACT_UUID
+		FROM
+		(SELECT * FROM mso_catalog.heat_template_params) AS a
+		JOIN (SELECT * FROM mso_catalog.heat_template) AS ht1 ON a.heat_template_id = ht1.id;
+
+DELETE FROM mso_catalog.heat_template_params; -- <<<2
+
+ALTER TABLE `mso_catalog`.`heat_template_params`  -- <<<2
+DROP COLUMN `id`,
+CHANGE COLUMN `HEAT_TEMPLATE_ID` `HEAT_TEMPLATE_ARTIFACT_UUID` VARCHAR(200) NOT NULL ,
+DROP PRIMARY KEY,
+ADD PRIMARY KEY (`HEAT_TEMPLATE_ARTIFACT_UUID`, `PARAM_NAME`),
+DROP INDEX `UK_pj3cwbmewecf0joqv2mvmbvw3` ;
+
+INSERT INTO mso_catalog.heat_template_params ( -- <<<2
+  PARAM_NAME,
+  IS_REQUIRED,
+  PARAM_TYPE,
+  PARAM_ALIAS,
+  HEAT_TEMPLATE_ARTIFACT_UUID
+)
+	SELECT
+		a.PARAM_NAME,
+		a.IS_REQUIRED,
+		a.PARAM_TYPE,
+		a.PARAM_ALIAS,
+		a.HEAT_TEMPLATE_ARTIFACT_UUID
+		FROM mso_catalog.htptemp a;
+
+DROP TABLE IF EXISTS mso_catalog.htptemp; -- <<<2
+
+-- >>>1
+
+ALTER TABLE `mso_catalog`.`network_recipe`  -- <<<1
+CHANGE COLUMN `NETWORK_TYPE` `MODEL_NAME` VARCHAR(20) NOT NULL ;
+
+-- 1, 2 UPDATE SERVICE Before SERVICE                                              * <<<1
+UPDATE `mso_catalog`.`service_recipe`
+JOIN (
+	SELECT 
+		MAX(CAST((COALESCE(NULLIF(version_str, ''), '1.0')) AS DECIMAL(5,2))),
+		id,
+		service_name
+	FROM mso_catalog.service
+	WHERE service_name = "WAN Bonding" 
+) a 
+ON a.service_name = "WAN Bonding"
+SET
+	`service_id` = a.id, 
+	`action` = CASE
+		WHEN action = 'Layer3AddBonding' then 'createInstance'
+		WHEN action = 'Layer3DeleteBonding' then 'deleteInstance'
+	END
+WHERE
+	`action` IN ('Layer3AddBonding', 'Layer3DeleteBonding');
+
+UPDATE mso_catalog.service -- 2 <<<2
+SET
+	service_name_version_id = (SELECT UUID()),
+	description = CONCAT(description, '1707MIGRATED')
+WHERE
+	service_name_version_id LIKE "MAN%" OR service_name_version_id is NULL OR service_name_version_id = '';
+
+UPDATE mso_catalog.service
+SET
+	model_invariant_uuid = (SELECT UUID()),
+	description = CONCAT(description, '1707MIGRATED')
+WHERE
+	model_invariant_uuid LIKE 'MAN%' OR model_invariant_uuid is NULL OR model_invariant_uuid = '';
+
+-- service - from temporary table servtemp                                         ^ <<<1
+CREATE TABLE `mso_catalog`.`servtemp` ( -- <<<2
+	`id` int(11),
+	`MODEL_NAME` varchar(40) DEFAULT NULL,
+	`MODEL_VERSION` varchar(20) NOT NULL,
+	`DESCRIPTION` varchar(1200) DEFAULT NULL,
+	`CREATION_TIMESTAMP` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP,
+	`MODEL_UUID` varchar(50) NOT NULL DEFAULT 'MANUAL_RECORD',
+	`MODEL_INVARIANT_UUID` varchar(200) NOT NULL DEFAULT 'MANUAL_RECORD'
+   ) ENGINE = InnoDB DEFAULT CHARACTER SET = latin1;
+
+INSERT INTO mso_catalog.servtemp ( -- <<<2
+  id,
+  MODEL_NAME,
+  MODEL_VERSION,
+  DESCRIPTION,
+  CREATION_TIMESTAMP,
+  MODEL_UUID,
+  MODEL_INVARIANT_UUID
+)
+	SELECT
+	  id,
+	  SERVICE_NAME,
+	  VERSION_STR,
+	  DESCRIPTION,
+	  CREATION_TIMESTAMP,
+	  SERVICE_NAME_VERSION_ID,
+	  MODEL_INVARIANT_UUID
+	FROM mso_catalog.service 
+	WHERE SERVICE_NAME NOT IN ('Layer3AddBonding', 'Layer3DeleteBonding');
+	
+DELETE FROM mso_catalog.service; -- <<<2
+
+ALTER  TABLE `mso_catalog`.`service_to_allotted_resources` -- <<<2
+	DROP FOREIGN KEY `fk_service_to_allotted_resources__service__service_name_ver_id`;
+
+ALTER  TABLE `mso_catalog`.`service_to_networks` -- <<<2
+	DROP FOREIGN KEY `fk_service_to_networks__service__service_name_version_id`;
+
+ALTER TABLE `mso_catalog`.`service`  --                                            ^ <<<2
+MODIFY `id` INT,
+DROP COLUMN `SERVICE_ID`,
+DROP COLUMN `HTTP_METHOD`,
+DROP COLUMN `SERVICE_NAME_VERSION_ID`,
+ADD COLUMN `MODEL_UUID` VARCHAR(200) NOT NULL FIRST,
+CHANGE COLUMN `MODEL_INVARIANT_UUID` `MODEL_INVARIANT_UUID` VARCHAR(200) NOT NULL AFTER `MODEL_NAME`,
+CHANGE COLUMN `SERVICE_NAME` `MODEL_NAME` VARCHAR(200) NOT NULL ,
+CHANGE COLUMN `VERSION_STR` `MODEL_VERSION` VARCHAR(20) NOT NULL ,
+ADD COLUMN `TOSCA_CSAR_ARTIFACT_UUID` VARCHAR(200) NULL DEFAULT NULL AFTER `CREATION_TIMESTAMP`,
+DROP PRIMARY KEY,
+ADD PRIMARY KEY (`MODEL_UUID`),
+ADD INDEX `fk_service__tosca_csar1_idx` (`TOSCA_CSAR_ARTIFACT_UUID` ASC),
+DROP INDEX `UK_service_name__service_name_version_id` ;
+
+INSERT INTO mso_catalog.service (
+	id, CREATION_TIMESTAMP, DESCRIPTION, MODEL_INVARIANT_UUID, MODEL_NAME, MODEL_UUID, MODEL_VERSION
+)
+SELECT 
+	id, CREATION_TIMESTAMP, DESCRIPTION, MODEL_INVARIANT_UUID, MODEL_NAME, MODEL_UUID, MODEL_VERSION
+FROM mso_catalog.servtemp; -- >>>2 
+
+DROP TABLE IF EXISTS mso_catalog.servtemp; -- <<<2
+
+-- service_recipe - from temporary table srtemp - AFTER service                    ^ <<<1
+CREATE TABLE `mso_catalog`.`srtemp` ( -- <<<2
+  `id` int(11) NOT NULL ,
+  `SERVICE_MODEL_UUID` VARCHAR(200) NOT NULL,
+  `ACTION` varchar(40) NOT NULL,
+  `VERSION_STR` varchar(20) DEFAULT NULL,
+  `DESCRIPTION` varchar(1200) DEFAULT NULL,
+  `ORCHESTRATION_URI` varchar(256) NOT NULL,
+  `SERVICE_PARAM_XSD` varchar(2048) DEFAULT NULL,
+  `RECIPE_TIMEOUT` int(11) DEFAULT NULL,
+  `SERVICE_TIMEOUT_INTERIM` int(11) DEFAULT NULL,
+  `CREATION_TIMESTAMP` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP
+   )
+ENGINE = InnoDB
+DEFAULT CHARACTER SET = latin1;
+
+-- ST-CreationTimestamp <<<2
+-- ERROR 1292 (22007) at line 331: Incorrect datetime value: '0000-00-00 00:00:00' for column 'CREATION_TIMESTAMP' at row 1
+UPDATE `mso_catalog`.`service_recipe` set CREATION_TIMESTAMP = now() where cast(`CREATION_TIMESTAMP` as char(20)) = '0000-00-00 00:00:00';
+-- >>>2
+
+INSERT INTO mso_catalog.srtemp ( -- <<<2
+  id,
+  SERVICE_MODEL_UUID,
+  ACTION,
+  VERSION_STR,
+  DESCRIPTION,
+  ORCHESTRATION_URI,
+  SERVICE_PARAM_XSD,
+  RECIPE_TIMEOUT,
+  SERVICE_TIMEOUT_INTERIM,
+  CREATION_TIMESTAMP
+)
+	SELECT
+		a.id,
+		ht1.MODEL_UUID SERVICE_MODEL_UUID,
+		a.ACTION,
+		a.VERSION_STR,
+		a.DESCRIPTION,
+		a.ORCHESTRATION_URI,
+		a.SERVICE_PARAM_XSD,
+		a.RECIPE_TIMEOUT,
+		a.SERVICE_TIMEOUT_INTERIM,
+		a.CREATION_TIMESTAMP
+		FROM mso_catalog.service_recipe a
+		JOIN mso_catalog.service AS ht1 ON a.service_id = ht1.id;
+
+DELETE FROM mso_catalog.service_recipe; -- <<<2
+
+ALTER TABLE `mso_catalog`.`service_recipe`  -- <<<2
+CHANGE COLUMN `SERVICE_ID` `SERVICE_MODEL_UUID` VARCHAR(200) NOT NULL AFTER `CREATION_TIMESTAMP`,
+ADD INDEX `fk_service_recipe__service1_idx` (`SERVICE_MODEL_UUID` ASC);
+
+INSERT INTO mso_catalog.service_recipe ( -- <<<2
+  id,
+  SERVICE_MODEL_UUID,
+  ACTION,
+  VERSION_STR,
+  DESCRIPTION,
+  ORCHESTRATION_URI,
+  SERVICE_PARAM_XSD,
+  RECIPE_TIMEOUT,
+  SERVICE_TIMEOUT_INTERIM,
+  CREATION_TIMESTAMP
+)
+SELECT 
+  id,
+  SERVICE_MODEL_UUID,
+  ACTION,
+  VERSION_STR,
+  DESCRIPTION,
+  ORCHESTRATION_URI,
+  SERVICE_PARAM_XSD,
+  RECIPE_TIMEOUT,
+  SERVICE_TIMEOUT_INTERIM,
+  CREATION_TIMESTAMP
+ FROM mso_catalog.srtemp;
+
+DROP TABLE IF EXISTS mso_catalog.srtemp; -- <<<2
+
+-- >>>1
+
+DELETE FROM mso_catalog.vnf_components_recipe WHERE vnf_component_type = 'VOLUME_GROUP' and vnf_type != '*'; -- Q spec 5/25 <<<1
+-- >>>1
+
+DELETE FROM mso_catalog.vnf_resource WHERE id IN (2,3,4); -- 3                     * <<<1
+
+UPDATE mso_catalog.vnf_resource -- 4                                               * <<<1
+SET
+	model_name = model_customization_name,
+	asdc_uuid = '09cb25b0-f2f6-40ed-96bc-71ad43e42fc8',
+	model_invariant_uuid = '9fdda511-ffe3-4117-b3cc-cff9c1fc3fff'
+WHERE
+	id=5;
+
+UPDATE mso_catalog.vnf_resource -- 6 set model_name                                * <<<1
+SET
+	model_name = vnf_type
+WHERE
+	service_model_invariant_uuid IS NULL OR model_invariant_uuid = '';
+
+UPDATE mso_catalog.vnf_resource -- 7 UUID() asdc_uuid                              * <<<1
+SET
+	asdc_uuid = (SELECT UUID()),
+	description = CONCAT(description, '1707MIGRATED')
+WHERE
+	asdc_uuid LIKE "MAN%" OR asdc_uuid is NULL OR asdc_uuid = '';
+
+UPDATE mso_catalog.vnf_resource -- 8 UUID() model_customization_uuid               * <<<1
+SET
+	description = CONCAT(description, '1707MIGRATED'),
+	model_customization_uuid = (SELECT UUID())
+WHERE
+	model_customization_uuid LIKE "MAN%" OR model_customization_uuid is NULL OR model_customization_uuid = ''; 
+
+-- >>>1
+UPDATE mso_catalog.vnf_resource -- NOT IN SPEC                                     * <<<1
+SET
+	model_customization_name = CONCAT('1707MIGRATED_', model_name)
+WHERE
+	model_customization_name is NULL OR model_customization_name = ''; 
+
+-- 5 aka 8d delete each asdc_uuid except highest ASDC_SERVICE_MODEL_VERSION vnf_resource and cascade vf_module * <<<1
+CREATE TABLE mso_catalog.req5temp (`vnfs` INT(11) NOT NULL, `vfs` INT(11));
+
+-- delete VR and cascade VMs what have null/empty VR.service_model_invariant_uuid where vnf_name is NOT "BrocadeVce"
+INSERT INTO mso_catalog.req5temp (vnfs, vfs) -- <<<2
+	SELECT a.id, m.id
+		FROM    mso_catalog.vnf_resource a
+		LEFT JOIN mso_catalog.vf_module m ON a.id = m.vnf_resource_id
+		WHERE (a.vnf_name != "BrocadeVce" OR a.vnf_name IS NULL) 
+			AND (a.service_model_invariant_uuid is NULL OR a.service_model_invariant_uuid = '');
+
+DELETE FROM mso_catalog.vnf_resource WHERE id = ANY(SELECT vnfs FROM mso_catalog.req5temp);
+DELETE FROM mso_catalog.vf_module WHERE id = ANY(SELECT vfs FROM mso_catalog.req5temp);
+
+DELETE FROM mso_catalog.req5temp; -- <<<2
+
+INSERT INTO mso_catalog.req5temp (vnfs, vfs) -- <<<2
+	SELECT a.id, m.id
+		FROM mso_catalog.vnf_resource a
+		LEFT JOIN mso_catalog.vf_module m ON a.id = m.vnf_resource_id
+		JOIN (
+			SELECT
+				MAX(CAST((COALESCE(NULLIF(asdc_service_model_version, ''), '1.0')) AS DECIMAL(5,2))) AS v,
+				asdc_uuid
+			FROM mso_catalog.vnf_resource
+			GROUP BY asdc_uuid
+			) b
+		ON
+			a.asdc_uuid = b.asdc_uuid AND
+			CAST((COALESCE(NULLIF(a.asdc_service_model_version, ''), '1.0')) AS DECIMAL(5,2)) != b.v;
+-- >>>1 
+
+UPDATE mso_catalog.vf_module --    7 UUID() asdc_uuid                              * <<<1
+SET
+	asdc_uuid = (SELECT UUID()),
+	description = CONCAT(description, '1707MIGRATED')
+WHERE
+	asdc_uuid LIKE "MAN%" OR asdc_uuid is NULL OR asdc_uuid = '';
+
+UPDATE mso_catalog.vf_module --    8 UUID() model_customization_uuid               * <<<1
+SET
+	description = CONCAT(description, '1707MIGRATED'),
+	model_customization_uuid = (SELECT UUID())
+WHERE
+	model_customization_uuid LIKE "MAN%" OR model_customization_uuid is NULL OR model_customization_uuid = '';
+
+--  VMC vf_module_customization                                                                           * <<<1
+CREATE TABLE IF NOT EXISTS `mso_catalog`.`vf_module_customization` ( --            V <<<2
+  `MODEL_CUSTOMIZATION_UUID` VARCHAR(200) NOT NULL,
+  `LABEL` VARCHAR(200) NULL DEFAULT NULL,
+  `INITIAL_COUNT` INT(11) NULL DEFAULT 0,
+  `MIN_INSTANCES` INT(11) NULL DEFAULT 0,
+  `MAX_INSTANCES` INT(11) NULL DEFAULT NULL,
+  `AVAILABILITY_ZONE_COUNT` INT(11) NULL DEFAULT NULL,
+  `HEAT_ENVIRONMENT_ARTIFACT_UUID` VARCHAR(200) NULL DEFAULT NULL,
+  `VOL_ENVIRONMENT_ARTIFACT_UUID` VARCHAR(200) NULL DEFAULT NULL,
+  `CREATION_TIMESTAMP` DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP,
+  `VF_MODULE_MODEL_UUID` VARCHAR(200) NOT NULL,
+  PRIMARY KEY (`MODEL_CUSTOMIZATION_UUID`),
+  INDEX `fk_vf_module_customization__vf_module1_idx` (`VF_MODULE_MODEL_UUID` ASC),
+  INDEX `fk_vf_module_customization__heat_env__heat_environment1_idx` (`HEAT_ENVIRONMENT_ARTIFACT_UUID` ASC),
+  INDEX `fk_vf_module_customization__vol_env__heat_environment2_idx` (`VOL_ENVIRONMENT_ARTIFACT_UUID` ASC),
+  CONSTRAINT `fk_vf_module_customization__heat_env__heat_environment1`
+    FOREIGN KEY (`HEAT_ENVIRONMENT_ARTIFACT_UUID`)
+    REFERENCES `mso_catalog`.`heat_environment` (`ARTIFACT_UUID`)
+    ON DELETE CASCADE
+    ON UPDATE CASCADE,
+  CONSTRAINT `fk_vf_module_customization__vol_env__heat_environment2`
+    FOREIGN KEY (`VOL_ENVIRONMENT_ARTIFACT_UUID`)
+    REFERENCES `mso_catalog`.`heat_environment` (`ARTIFACT_UUID`)
+    ON DELETE CASCADE
+    ON UPDATE CASCADE
+) ENGINE = InnoDB DEFAULT CHARACTER SET = latin1;
+
+CREATE TABLE mso_catalog.vfduptemp (`id` INT(11) NOT NULL); -- <<<2
+
+INSERT INTO mso_catalog.vfduptemp (id) -- <<<2
+SELECT a.id
+FROM mso_catalog.vf_module a
+JOIN (
+		SELECT
+			MAX(CAST((COALESCE(NULLIF(asdc_service_model_version, ''), '1.0')) AS DECIMAL(5,2))) AS ver,
+			model_customization_uuid mcu,
+			id vid
+		FROM mso_catalog.vf_module
+		GROUP BY model_customization_uuid
+		) b
+ON
+		a.model_customization_uuid = mcu
+		AND CAST((COALESCE(NULLIF(a.asdc_service_model_version, ''), '1.0')) AS DECIMAL(5,2)) != b.ver
+ORDER BY a.model_customization_uuid;
+
+INSERT INTO mso_catalog.vf_module_customization ( -- <<<2
+		model_customization_uuid, -- <<<3
+		label,
+		initial_count,
+		min_instances,
+		max_instances,
+		heat_environment_artifact_uuid,
+		vol_environment_artifact_uuid,
+		vf_module_model_uuid -- >>>3
+)
+SELECT 
+		a.model_customization_uuid,
+		a.label,
+		a.initial_count,
+		a.min_instances,
+		a.max_instances,
+		ht1.artifact_uuid,
+		ht2.artifact_uuid,
+		a.asdc_uuid
+FROM mso_catalog.vf_module a
+LEFT JOIN mso_catalog.hetemp AS ht1 ON a.environment_id = ht1.id
+LEFT JOIN mso_catalog.hetemp AS ht2 ON a.vol_environment_id = ht2.id
+WHERE NOT EXISTS (
+		SELECT 1 FROM mso_catalog.vfduptemp vdt
+		WHERE
+		a.id = vdt.id
+);
+
+DROP TABLE IF EXISTS mso_catalog.vfduptemp; -- <<<2
+
+DROP TABLE IF EXISTS mso_catalog.hetemp; -- <<<2
+
+-- >>>1
+
+-- AR ALLOTTED_RESOURCE <<<1
+CREATE TABLE IF NOT EXISTS `mso_catalog`.`allotted_resource` ( --                  V <<<2
+  `MODEL_UUID` VARCHAR(200) NOT NULL,
+  `MODEL_INVARIANT_UUID` VARCHAR(200) NOT NULL,
+  `MODEL_VERSION` VARCHAR(20) NOT NULL,
+  `MODEL_NAME` VARCHAR(200) NOT NULL,
+  `TOSCA_NODE_TYPE` VARCHAR(200) NULL DEFAULT NULL,
+  `SUBCATEGORY` VARCHAR(200) NULL DEFAULT NULL,
+  `DESCRIPTION` VARCHAR(1200) NULL DEFAULT NULL,
+  `CREATION_TIMESTAMP` DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP,
+  PRIMARY KEY (`MODEL_UUID`))
+ENGINE = InnoDB
+DEFAULT CHARACTER SET = latin1;
+
+ INSERT INTO `mso_catalog`.`allotted_resource`  ( -- 2sc                            * <<<2
+ 		model_uuid,
+ 		model_invariant_uuid,
+ 		model_version,
+ 		model_name,
+ 		description
+ )
+	SELECT DISTINCT
+		model_uuid,
+		model_invariant_uuid,
+		model_version,
+		model_name,
+		description
+ 	FROM
+ 		mso_catalog.allotted_resource_customization;
+-- >>>1
+
+ALTER TABLE `mso_catalog`.`allotted_resource_customization`  --                    ^ <<<1
+DROP COLUMN `DESCRIPTION`,
+DROP COLUMN `MODEL_NAME`,
+DROP COLUMN `MODEL_VERSION`,
+DROP COLUMN `MODEL_INVARIANT_UUID`,
+CHANGE COLUMN `MODEL_UUID` `AR_MODEL_UUID` VARCHAR(200) NOT NULL, -- ARC
+CHANGE COLUMN `MODEL_INSTANCE_NAME` `MODEL_INSTANCE_NAME` VARCHAR(200) NOT NULL AFTER `MODEL_CUSTOMIZATION_UUID`,
+ADD COLUMN `PROVIDING_SERVICE_MODEL_INVARIANT_UUID` VARCHAR(200) NULL DEFAULT NULL AFTER `MODEL_INSTANCE_NAME`,
+ADD COLUMN `TARGET_NETWORK_ROLE` VARCHAR(200) NULL DEFAULT NULL AFTER `PROVIDING_SERVICE_MODEL_INVARIANT_UUID`,
+ADD COLUMN `NF_TYPE` VARCHAR(200) NULL DEFAULT NULL AFTER `TARGET_NETWORK_ROLE`,
+ADD COLUMN `NF_ROLE` VARCHAR(200) NULL DEFAULT NULL AFTER `NF_TYPE`,
+ADD COLUMN `NF_FUNCTION` VARCHAR(200) NULL DEFAULT NULL AFTER `NF_ROLE`,
+ADD COLUMN `NF_NAMING_CODE` VARCHAR(200) NULL DEFAULT NULL AFTER `NF_FUNCTION`,
+ADD COLUMN `MIN_INSTANCES` INT(11) NULL DEFAULT NULL AFTER `NF_NAMING_CODE`,
+ADD COLUMN `MAX_INSTANCES` INT(11) NULL DEFAULT NULL AFTER `MIN_INSTANCES`,
+ADD INDEX `fk_allotted_resource_customization__allotted_resource1_idx` (`AR_MODEL_UUID` ASC);
+-- >>>1
+
+-- VRC  vnf_resource_customization <<<1
+-- vnftemp table <<<2
+CREATE TABLE `mso_catalog`.`vnftemp` AS
+	SELECT model_customization_uuid, service_model_invariant_uuid, asdc_service_model_version
+	FROM `mso_catalog`.`vnf_resource`;
+
+DROP TABLE IF EXISTS `mso_catalog`.`vnf_resource_customization`; -- <<<2
+
+CREATE TABLE `mso_catalog`.`vnf_resource_customization` ( -- <<<2
+  `MODEL_CUSTOMIZATION_UUID` VARCHAR(200) NOT NULL,
+  `MODEL_INSTANCE_NAME` VARCHAR(200) NOT NULL,
+  `MIN_INSTANCES` INT(11) NULL DEFAULT NULL,
+  `MAX_INSTANCES` INT(11) NULL DEFAULT NULL,
+  `AVAILABILITY_ZONE_MAX_COUNT` INT(11) NULL DEFAULT NULL,
+  `NF_TYPE` VARCHAR(200) NULL DEFAULT NULL,
+  `NF_ROLE` VARCHAR(200) NULL DEFAULT NULL,
+  `NF_FUNCTION` VARCHAR(200) NULL DEFAULT NULL,
+  `NF_NAMING_CODE` VARCHAR(200) NULL DEFAULT NULL,
+  `CREATION_TIMESTAMP` DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP,
+  `VNF_RESOURCE_MODEL_UUID` VARCHAR(200) NOT NULL,
+  PRIMARY KEY (`MODEL_CUSTOMIZATION_UUID`),
+  INDEX `fk_vnf_resource_customization__vnf_resource1_idx` (`VNF_RESOURCE_MODEL_UUID` ASC)
+) ENGINE = InnoDB DEFAULT CHARACTER SET = latin1;
+
+INSERT INTO mso_catalog.vnf_resource_customization ( -- <<<2
+	model_customization_uuid,
+	model_instance_name,
+	vnf_resource_model_uuid
+)
+	SELECT DISTINCT
+		a.model_customization_uuid,
+		ht1.model_customization_name,
+		ht1.asdc_uuid
+	FROM mso_catalog.vnftemp a
+	JOIN mso_catalog.vnf_resource AS ht1 ON
+		a.model_customization_uuid = ht1.model_customization_uuid AND
+		a.asdc_service_model_version = ht1.asdc_service_model_version;
+-- >>>1
+
+-- network_resource_customization                                                  * <<<1
+CREATE TABLE `mso_catalog`.`nrctemp` ( -- <<<2
+  `MODEL_UUID` varchar(200) NOT NULL,
+  `MODEL_NAME` varchar(200) NOT NULL,
+  `MODEL_INVARIANT_UUID` varchar(200) NOT NULL,
+  `NETWORK_RESOURCE_ID` int(11) NOT NULL,
+  `MODEL_CUSTOMIZATION_UUID` VARCHAR(200) NOT NULL,
+  `MODEL_INSTANCE_NAME` VARCHAR(200) NOT NULL,
+  `NETWORK_TECHNOLOGY` VARCHAR(45) NULL,
+  `NETWORK_TYPE` VARCHAR(45) NULL,
+  `NETWORK_ROLE` VARCHAR(200) NULL,
+  `NETWORK_SCOPE` VARCHAR(45) NULL,
+  `MODEL_VERSION` VARCHAR(20) NULL,
+  `CREATION_TIMESTAMP` DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP,
+  `NETWORK_RESOURCE_MODEL_UUID` VARCHAR(200) NOT NULL
+) ENGINE=InnoDB DEFAULT CHARSET=latin1;
+
+INSERT INTO mso_catalog.nrctemp ( -- <<<2
+	model_customization_uuid,
+	model_uuid,
+	model_invariant_uuid,
+	model_instance_name,
+	model_name,
+	network_resource_id,
+	model_version,
+	creation_timestamp,
+	network_resource_model_uuid
+)
+	SELECT 
+		model_customization_uuid,
+		model_uuid,
+		model_invariant_uuid,
+		model_instance_name,
+		model_name,
+		network_resource_id,
+		model_version,
+		creation_timestamp,
+		model_uuid
+	FROM mso_catalog.network_resource_customization;
+
+DELETE FROM mso_catalog.network_resource_customization; -- <<<2
+
+ALTER TABLE `mso_catalog`.`network_resource_customization`  -- <<<2
+DROP COLUMN `NETWORK_RESOURCE_ID`,
+DROP COLUMN `MODEL_VERSION`,
+DROP COLUMN `MODEL_INVARIANT_UUID`,
+DROP COLUMN `MODEL_NAME`,
+DROP COLUMN `MODEL_UUID`,
+ADD COLUMN `NETWORK_TECHNOLOGY` VARCHAR(45) NULL DEFAULT NULL AFTER `MODEL_INSTANCE_NAME`,
+ADD COLUMN `NETWORK_TYPE` VARCHAR(45) NULL DEFAULT NULL AFTER `NETWORK_TECHNOLOGY`,
+ADD COLUMN `NETWORK_ROLE` VARCHAR(200) NULL DEFAULT NULL AFTER `NETWORK_TYPE`,
+ADD COLUMN `NETWORK_SCOPE` VARCHAR(45) NULL DEFAULT NULL AFTER `NETWORK_ROLE`,
+ADD COLUMN `NETWORK_RESOURCE_MODEL_UUID` VARCHAR(200) NOT NULL AFTER `CREATION_TIMESTAMP`,
+DROP PRIMARY KEY,
+ADD PRIMARY KEY (`MODEL_CUSTOMIZATION_UUID`),
+ADD INDEX `fk_network_resource_customization__network_resource1_idx` (`NETWORK_RESOURCE_MODEL_UUID` ASC),
+DROP INDEX `fk_network_resource_customization__network_resource_id_idx`;
+-- >>>2
+
+INSERT INTO mso_catalog.network_resource_customization ( -- <<<2
+	model_customization_uuid,
+	model_instance_name,
+	creation_timestamp,
+	network_resource_model_uuid,
+	network_type
+)
+	SELECT 
+		a.model_customization_uuid,
+		a.model_instance_name,
+		a.creation_timestamp,
+		a.model_uuid,
+		a.network_type
+	FROM mso_catalog.nrctemp a;
+
+-- DROP temp table later, after network_resource uses it <<<2
+
+-- >>>1
+
+-- network_resource                                                                * <<<1
+CREATE TABLE `mso_catalog`.`nrtemp` ( -- <<<2
+  `MODEL_NAME` VARCHAR(200) NOT NULL,
+  `ORCHESTRATION_MODE` varchar(20) DEFAULT NULL,
+  `DESCRIPTION` varchar(1200) DEFAULT NULL,
+  `NEUTRON_NETWORK_TYPE` varchar(20) DEFAULT NULL,
+  `CREATION_TIMESTAMP` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP,
+  `MODEL_VERSION` VARCHAR(20) NULL DEFAULT NULL,
+  `AIC_VERSION_MIN` varchar(20) NOT NULL,
+  `AIC_VERSION_MAX` varchar(20) DEFAULT NULL,
+  `MODEL_INVARIANT_UUID` VARCHAR(200) NULL DEFAULT NULL,
+  `TOSCA_NODE_TYPE` VARCHAR(200) NULL DEFAULT NULL,
+  `TEMPLATE_ID` VARCHAR(200)
+   )
+ENGINE = InnoDB
+DEFAULT CHARACTER SET = latin1;
+
+-- E2E-CreationTimestamp <<<2
+-- ERROR 1292 (22007) at line 675: Incorrect datetime value: '0000-00-00 00:00:00' for column 'CREATION_TIMESTAMP' at row 1
+UPDATE `mso_catalog`.`network_resource` set CREATION_TIMESTAMP = now() where cast(`CREATION_TIMESTAMP` as char(20)) = '0000-00-00 00:00:00';
+-- >>>2
+
+INSERT INTO mso_catalog.nrtemp ( -- <<<2
+  MODEL_NAME,
+  ORCHESTRATION_MODE,
+  DESCRIPTION,
+  NEUTRON_NETWORK_TYPE,
+  CREATION_TIMESTAMP,
+  MODEL_VERSION,
+  AIC_VERSION_MIN,
+  AIC_VERSION_MAX,
+  TEMPLATE_ID
+)
+	SELECT
+		NETWORK_TYPE,
+		ORCHESTRATION_MODE,
+		DESCRIPTION,
+		NEUTRON_NETWORK_TYPE,
+		CREATION_TIMESTAMP,
+		VERSION_STR,
+		AIC_VERSION_MIN,
+		AIC_VERSION_MAX,
+		TEMPLATE_ID
+	FROM mso_catalog.network_resource;
+
+DELETE FROM mso_catalog.network_resource; -- <<<2
+
+ALTER TABLE `mso_catalog`.`network_resource`  -- <<<2
+DROP COLUMN `id`,
+CHANGE COLUMN `VERSION_STR` `MODEL_VERSION` VARCHAR(20) NULL DEFAULT NULL,
+CHANGE COLUMN `TEMPLATE_ID` `HEAT_TEMPLATE_ARTIFACT_UUID` VARCHAR(200) NOT NULL,
+CHANGE COLUMN `NETWORK_TYPE` `MODEL_NAME` VARCHAR(200) NOT NULL,
+CHANGE COLUMN `NEUTRON_NETWORK_TYPE` `NEUTRON_NETWORK_TYPE` VARCHAR(20) NULL DEFAULT NULL,
+CHANGE COLUMN `ORCHESTRATION_MODE` `ORCHESTRATION_MODE` VARCHAR(20) NULL DEFAULT 'HEAT' AFTER `AIC_VERSION_MAX`,
+CHANGE COLUMN `CREATION_TIMESTAMP` `CREATION_TIMESTAMP` DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP AFTER `ORCHESTRATION_MODE`,
+ADD COLUMN `MODEL_UUID` VARCHAR(200) NOT NULL FIRST,
+ADD COLUMN `MODEL_INVARIANT_UUID` VARCHAR(200) NULL DEFAULT NULL AFTER `MODEL_NAME`,
+ADD COLUMN `TOSCA_NODE_TYPE` VARCHAR(200) NULL DEFAULT NULL AFTER `MODEL_VERSION`,
+DROP PRIMARY KEY,
+ADD PRIMARY KEY (`MODEL_UUID`),
+ADD INDEX `fk_network_resource__temp_network_heat_template_lookup1_idx` (`MODEL_NAME` ASC),
+ADD INDEX `fk_network_resource__heat_template1_idx` (`HEAT_TEMPLATE_ARTIFACT_UUID` ASC),
+DROP INDEX `UK_e5vlpk2xorqk7ogtg6wgw2eo6` ;
+
+INSERT INTO mso_catalog.network_resource ( -- <<<2
+  model_name,
+  orchestration_mode,
+  description,
+  heat_template_artifact_uuid,
+  neutron_network_type,
+  creation_timestamp,
+  model_version,
+  aic_version_min,
+  aic_version_max,
+  model_uuid,
+  model_invariant_uuid
+)
+	SELECT DISTINCT
+		ht2.model_name,
+		a.ORCHESTRATION_MODE,
+		a.DESCRIPTION,
+		ht1.ARTIFACT_UUID,
+		a.NEUTRON_NETWORK_TYPE,
+		a.CREATION_TIMESTAMP,
+		ht2.model_version,
+		a.AIC_VERSION_MIN,
+		a.AIC_VERSION_MAX,
+		ht2.model_uuid,
+		ht2.model_invariant_uuid
+	FROM mso_catalog.nrtemp a
+		JOIN mso_catalog.heat_template ht1 ON a.template_id = ht1.id
+		JOIN mso_catalog.nrctemp ht2 ON a.model_name = ht2.model_name
+		GROUP BY a.model_name;
+
+DROP TABLE IF EXISTS mso_catalog.nrtemp; -- <<<2
+
+DROP TABLE IF EXISTS mso_catalog.nrctemp; -- <<<2
+
+-- >>>1
+
+-- VRC2VMC vnf_res_custom_to_vf_module_custom <<<1
+CREATE TABLE IF NOT EXISTS `mso_catalog`.`vnf_res_custom_to_vf_module_custom` ( -- <<<2
+  `VNF_RESOURCE_CUST_MODEL_CUSTOMIZATION_UUID` VARCHAR(200) NOT NULL,
+  `VF_MODULE_CUST_MODEL_CUSTOMIZATION_UUID` VARCHAR(200) NOT NULL,
+  `CREATION_TIMESTAMP` DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP,
+  PRIMARY KEY (`VNF_RESOURCE_CUST_MODEL_CUSTOMIZATION_UUID`, `VF_MODULE_CUST_MODEL_CUSTOMIZATION_UUID`),
+  INDEX `fk_vnf_res_custom_to_vf_module_custom__vf_module_customizat_idx` (`VF_MODULE_CUST_MODEL_CUSTOMIZATION_UUID` ASC),
+  CONSTRAINT `fk_vnf_res_custom_to_vf_module_custom__vf_module_customization1`
+    FOREIGN KEY (`VF_MODULE_CUST_MODEL_CUSTOMIZATION_UUID`)
+    REFERENCES `mso_catalog`.`vf_module_customization` (`MODEL_CUSTOMIZATION_UUID`)
+    ON DELETE CASCADE
+    ON UPDATE CASCADE,
+  CONSTRAINT `fk_vnf_res_custom_to_vf_module_custom__vnf_resource_customiza1`
+    FOREIGN KEY (`VNF_RESOURCE_CUST_MODEL_CUSTOMIZATION_UUID`)
+    REFERENCES `mso_catalog`.`vnf_resource_customization` (`MODEL_CUSTOMIZATION_UUID`)
+    ON DELETE CASCADE
+    ON UPDATE CASCADE)
+ENGINE = InnoDB
+DEFAULT CHARACTER SET = latin1;
+
+INSERT INTO mso_catalog.vnf_res_custom_to_vf_module_custom ( -- 6sc aka 8c         <<<2
+	vnf_resource_cust_model_customization_uuid,
+	vf_module_cust_model_customization_uuid,
+	creation_timestamp
+)
+	SELECT DISTINCT
+		a.model_customization_uuid,
+		b.model_customization_uuid,
+		now()
+	FROM
+		mso_catalog.vnf_resource a,
+		mso_catalog.vf_module b
+	WHERE a.id = b.vnf_resource_id;
+-- >>>1
+
+-- VR vnf_resource After vrc2vmc and vrc                                              ^ <<<1
+-- ERROR 1292 (22007) : Incorrect datetime value: '0000-00-00 00:00:00' for column 'CREATION_TIMESTAMP' <<<2
+UPDATE `mso_catalog`.`vnf_resource` set CREATION_TIMESTAMP = now() where cast(`CREATION_TIMESTAMP` as char(20)) = '0000-00-00 00:00:00';
+
+ALTER TABLE `mso_catalog`.`vnf_resource`  -- after vrc2vmc and vrc                 ^ <<<2
+MODIFY `id` INT,
+DROP COLUMN `MODEL_CUSTOMIZATION_UUID`,
+DROP COLUMN `SERVICE_MODEL_INVARIANT_UUID`,
+DROP COLUMN `MODEL_CUSTOMIZATION_NAME`,
+DROP COLUMN `VNF_TYPE`,
+DROP COLUMN `ASDC_SERVICE_MODEL_VERSION`,
+DROP COLUMN `ENVIRONMENT_ID`,
+DROP COLUMN `VERSION`,
+DROP COLUMN `VNF_NAME`,
+CHANGE COLUMN `DESCRIPTION` `DESCRIPTION` VARCHAR(1200) NULL DEFAULT NULL,
+CHANGE COLUMN `ORCHESTRATION_MODE` `ORCHESTRATION_MODE` VARCHAR(20) NOT NULL DEFAULT 'HEAT',
+CHANGE COLUMN `AIC_VERSION_MIN` `AIC_VERSION_MIN` VARCHAR(20) NULL DEFAULT NULL,
+CHANGE COLUMN `AIC_VERSION_MAX` `AIC_VERSION_MAX` VARCHAR(20) NULL DEFAULT NULL,
+CHANGE COLUMN `CREATION_TIMESTAMP` `CREATION_TIMESTAMP` DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP,
+CHANGE COLUMN `ASDC_UUID` `MODEL_UUID` VARCHAR(200) NOT NULL ,
+ADD COLUMN `TOSCA_NODE_TYPE` VARCHAR(200) NULL DEFAULT NULL,
+ADD COLUMN `HEAT_TEMPLATE_ARTIFACT_UUID` VARCHAR(200) NULL DEFAULT NULL,
+DROP PRIMARY KEY,
+ADD INDEX `fk_vnf_resource__heat_template1_idx` (`HEAT_TEMPLATE_ARTIFACT_UUID` ASC),
+DROP INDEX `UK_model_customization_uuid__asdc_service_model_version`,
+DROP INDEX `UK_k10a0w7h4t0lnbynd3inkg67k`;
+
+UPDATE mso_catalog.vnf_resource a --                                              * <<<2
+	LEFT JOIN mso_catalog.heat_template ht1 ON a.template_id = ht1.id
+SET
+	heat_template_artifact_uuid = ht1.artifact_uuid;
+
+-- Eliminate duplicates <<<2
+CREATE TABLE `mso_catalog`.`vrtemp` AS
+
+SELECT vr.* FROM `mso_catalog`.`vnf_resource` vr
+WHERE vr.id NOT IN (SELECT vnfs FROM mso_catalog.req5temp)
+GROUP BY MODEL_UUID;
+
+DROP TABLE `mso_catalog`.`vnf_resource`;  
+RENAME TABLE `mso_catalog`.`vrtemp` TO `mso_catalog`.`vnf_resource`;  
+-- >>>1
+
+-- VF vf_module  after VRC2VMC and VMC                                                ^ <<<1
+CREATE TABLE IF NOT EXISTS `mso_catalog`.`vftemp` ( -- <<<2
+  `id` int(11) NOT NULL,
+  `MODEL_UUID` VARCHAR(200) NOT NULL,
+  `MODEL_INVARIANT_UUID` VARCHAR(200) NULL DEFAULT NULL,
+  `MODEL_VERSION` VARCHAR(20) NOT NULL,
+  `MODEL_NAME` VARCHAR(200) NOT NULL,
+  `DESCRIPTION` VARCHAR(1200) NULL DEFAULT NULL,
+  `IS_BASE` INT(11) NOT NULL,
+  `HEAT_TEMPLATE_ARTIFACT_UUID` VARCHAR(200),
+  `VOL_HEAT_TEMPLATE_ARTIFACT_UUID` VARCHAR(200) NULL DEFAULT NULL,
+  `CREATION_TIMESTAMP` DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP,
+  `VNF_RESOURCE_MODEL_UUID` VARCHAR(200)
+   ) ENGINE = InnoDB DEFAULT CHARACTER SET = latin1;
+
+INSERT INTO mso_catalog.vftemp ( -- <<<2
+	id, -- <<<3
+	model_uuid,
+	is_base,
+	model_name,
+	model_version,
+	creation_timestamp,
+	description,
+	heat_template_artifact_uuid,
+	vol_heat_template_artifact_uuid,
+	vnf_resource_model_uuid,
+	model_invariant_uuid -- >>>3
+)
+	SELECT
+		a.id, -- <<<3
+		a.asdc_uuid,
+		a.is_base,
+		a.model_name,
+		a.model_version,
+		a.creation_timestamp,
+		a.description,
+		ht1.artifact_uuid heat_template_artifact_uuid,
+		ht2.artifact_uuid vol_heat_template_artifact_uuid,
+		vr1.model_uuid vnf_resource_model_uuid,
+		a.model_invariant_uuid -- >>>3
+		FROM
+		(SELECT * FROM mso_catalog.vf_module) AS a
+		LEFT JOIN (SELECT * FROM mso_catalog.heat_template) AS ht1 ON a.template_id = ht1.id
+		LEFT JOIN (SELECT * FROM mso_catalog.heat_template) AS ht2 ON a.vol_template_id = ht2.id
+		JOIN (SELECT * FROM mso_catalog.vnf_resource) AS vr1 ON a.vnf_resource_id = vr1.id;
+
+DELETE FROM mso_catalog.vf_module; -- <<<2
+
+ALTER TABLE `mso_catalog`.`vf_module`  -- after vftemp vrc2vmc and vmc <<<2
+DROP COLUMN `LABEL`,
+DROP COLUMN `INITIAL_COUNT`,
+DROP COLUMN `MAX_INSTANCES`,
+DROP COLUMN `MIN_INSTANCES`,
+DROP COLUMN `MODEL_CUSTOMIZATION_UUID`,
+DROP COLUMN `TYPE`,
+DROP COLUMN `ASDC_SERVICE_MODEL_VERSION`,
+DROP COLUMN `ENVIRONMENT_ID`,
+DROP COLUMN `VNF_RESOURCE_ID`,
+DROP COLUMN `VOL_ENVIRONMENT_ID`,
+CHANGE COLUMN `id` `id` INT(11),
+CHANGE COLUMN `MODEL_INVARIANT_UUID` `MODEL_INVARIANT_UUID` VARCHAR(200) NULL DEFAULT NULL AFTER `MODEL_UUID`,
+CHANGE COLUMN `MODEL_VERSION` `MODEL_VERSION` VARCHAR(20) NOT NULL AFTER `MODEL_INVARIANT_UUID`,
+CHANGE COLUMN `IS_BASE` `IS_BASE` INT(11) NOT NULL AFTER `DESCRIPTION`,
+CHANGE COLUMN `TEMPLATE_ID` `HEAT_TEMPLATE_ARTIFACT_UUID` VARCHAR(200) NULL DEFAULT NULL AFTER `IS_BASE`,
+CHANGE COLUMN `CREATION_TIMESTAMP` `CREATION_TIMESTAMP` DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP AFTER `VOL_HEAT_TEMPLATE_ARTIFACT_UUID`,
+CHANGE COLUMN `ASDC_UUID` `MODEL_UUID` VARCHAR(200) NOT NULL ,
+CHANGE COLUMN `DESCRIPTION` `DESCRIPTION` VARCHAR(1200) NULL DEFAULT NULL ,
+CHANGE COLUMN `VOL_TEMPLATE_ID` `VOL_HEAT_TEMPLATE_ARTIFACT_UUID` VARCHAR(200) NULL DEFAULT NULL ,
+ADD COLUMN `VNF_RESOURCE_MODEL_UUID` VARCHAR(200) NOT NULL AFTER `CREATION_TIMESTAMP`,
+DROP PRIMARY KEY,
+ADD INDEX `fk_vf_module__vnf_resource1_idx` (`VNF_RESOURCE_MODEL_UUID` ASC),
+ADD INDEX `fk_vf_module__heat_template_art_uuid__heat_template1_idx` (`HEAT_TEMPLATE_ARTIFACT_UUID` ASC),
+ADD INDEX `fk_vf_module__vol_heat_template_art_uuid__heat_template2_idx` (`VOL_HEAT_TEMPLATE_ARTIFACT_UUID` ASC),
+DROP INDEX `UK_model_customization_uuid__asdc_service_model_version` ,
+DROP INDEX `UK_o3bvdqspginaxlp4gxqohd44l` ;
+
+INSERT INTO mso_catalog.vf_module ( -- <<<2
+	id, -- <<<3
+	model_uuid,
+	is_base,
+	model_name,
+	model_version,
+	creation_timestamp,
+	description,
+	heat_template_artifact_uuid,
+	vol_heat_template_artifact_uuid,
+	vnf_resource_model_uuid,
+	model_invariant_uuid -- >>>3
+)
+	SELECT
+		id, -- <<<3
+		model_uuid,
+		is_base,
+		model_name,
+		model_version,
+		creation_timestamp,
+		description,
+		heat_template_artifact_uuid,
+		vol_heat_template_artifact_uuid,
+		vnf_resource_model_uuid,
+		model_invariant_uuid -- >>>3
+	FROM
+		mso_catalog.vftemp;
+
+-- DROP vftemp later <<<2
+
+-- >>>1
+
+-- vnf_components_recipe   AFTER vf_module                                         ^ <<<1
+CREATE TABLE `mso_catalog`.`vcrtemp` ( -- <<<2
+  `id` int(11) NOT NULL,
+  `VNF_TYPE` varchar(200) DEFAULT NULL,
+  `VNF_COMPONENT_TYPE` varchar(45) NOT NULL,
+  `ACTION` varchar(20) NOT NULL,
+  `SERVICE_TYPE` varchar(45) DEFAULT NULL,
+  `VERSION` varchar(20) DEFAULT NULL,
+  `DESCRIPTION` varchar(1200) DEFAULT NULL,
+  `ORCHESTRATION_URI` varchar(256) NOT NULL,
+  `VNF_COMPONENT_PARAM_XSD` varchar(2048) DEFAULT NULL,
+  `RECIPE_TIMEOUT` int(11) DEFAULT NULL,
+  `CREATION_TIMESTAMP` datetime DEFAULT CURRENT_TIMESTAMP,
+  `VF_MODULE_MODEL_UUID` VARCHAR(200) NULL DEFAULT NULL
+   ) ENGINE = InnoDB DEFAULT CHARACTER SET = latin1;
+
+INSERT INTO mso_catalog.vcrtemp ( -- <<<2
+  id, -- <<<3
+  VNF_TYPE,
+  VNF_COMPONENT_TYPE,
+  ACTION,
+  SERVICE_TYPE,
+  VERSION,
+  DESCRIPTION,
+  ORCHESTRATION_URI,
+  VNF_COMPONENT_PARAM_XSD,
+  RECIPE_TIMEOUT,
+  CREATION_TIMESTAMP,
+  VF_MODULE_MODEL_UUID -- >>>3
+)
+	SELECT
+		a.id, -- <<<3
+		a.VNF_TYPE,
+		a.VNF_COMPONENT_TYPE,
+		a.ACTION,
+		a.SERVICE_TYPE,
+		a.VERSION,
+		a.DESCRIPTION,
+		a.ORCHESTRATION_URI,
+		a.VNF_COMPONENT_PARAM_XSD,
+		a.RECIPE_TIMEOUT,
+		a.CREATION_TIMESTAMP,
+		COALESCE(ht1.model_uuid, a.vf_module_id)  VF_MODULE_MODEL_UUID -- >>>3
+		FROM mso_catalog.vnf_components_recipe a
+		LEFT JOIN mso_catalog.vftemp ht1 ON a.vf_module_id = CONVERT(ht1.id, CHAR(100));
+
+-- DROP vftemp later <<<2
+
+DELETE FROM mso_catalog.vnf_components_recipe; -- <<<2
+
+ALTER TABLE `mso_catalog`.`vnf_components_recipe`  -- <<<2
+CHANGE COLUMN `VF_MODULE_ID` `VF_MODULE_MODEL_UUID` VARCHAR(200) NULL DEFAULT NULL;
+
+INSERT INTO mso_catalog.vnf_components_recipe SELECT * FROM mso_catalog.vcrtemp; -- <<<2
+
+DROP TABLE IF EXISTS mso_catalog.vcrtemp; -- <<<2
+
+-- >>>1
+
+-- vf_module_to_heat_files  AFTER vf_module heat_files                             ^ <<<1
+CREATE TABLE `mso_catalog`.`vmthftemp` ( -- <<<2
+	VF_MODULE_MODEL_UUID VARCHAR(200) NOT NULL,
+	HEAT_FILES_ARTIFACT_UUID VARCHAR(200) NOT NULL
+) ENGINE=InnoDB DEFAULT CHARSET=latin1;
+
+INSERT INTO mso_catalog.vmthftemp ( -- <<<2
+    VF_MODULE_MODEL_UUID,
+    HEAT_FILES_ARTIFACT_UUID
+)
+	SELECT DISTINCT
+		ht1.model_uuid,
+		ht2.artifact_uuid
+		FROM mso_catalog.vf_module_to_heat_files a
+		JOIN mso_catalog.vftemp ht1 ON a.vf_module_id = CONVERT(ht1.id, CHAR(100))
+		JOIN  mso_catalog.heat_files ht2 ON a.HEAT_FILES_ID = ht2.id;
+
+DROP TABLE IF EXISTS mso_catalog.vftemp; -- <<<2
+
+DELETE FROM mso_catalog.vf_module_to_heat_files; -- <<<2
+
+ALTER TABLE `mso_catalog`.`vf_module_to_heat_files`  -- <<<2
+CHANGE COLUMN `VF_MODULE_ID` `VF_MODULE_MODEL_UUID` VARCHAR(200) NOT NULL ,
+CHANGE COLUMN `HEAT_FILES_ID` `HEAT_FILES_ARTIFACT_UUID` VARCHAR(200) NOT NULL ,
+ADD INDEX `fk_vf_module_to_heat_files__heat_files__artifact_uuid1_idx` (`HEAT_FILES_ARTIFACT_UUID` ASC);
+
+INSERT INTO mso_catalog.vf_module_to_heat_files SELECT * FROM mso_catalog.vmthftemp; -- <<<2
+
+DROP TABLE IF EXISTS mso_catalog.vmthftemp; -- <<<2
+
+-- >>>1
+
+-- S2RC service_to_resource_customizations` <<<1
+CREATE TABLE IF NOT EXISTS `mso_catalog`.`service_to_resource_customizations` ( -- V <<<2
+  `SERVICE_MODEL_UUID` VARCHAR(200) NOT NULL,
+  `RESOURCE_MODEL_CUSTOMIZATION_UUID` VARCHAR(200) NOT NULL,
+  `MODEL_TYPE` VARCHAR(20) NOT NULL,
+  `CREATION_TIMESTAMP` DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP,
+  INDEX `fk_service_to_resource_cust__service_model_uuid_idx` (`SERVICE_MODEL_UUID` ASC),
+  PRIMARY KEY (`SERVICE_MODEL_UUID`, `RESOURCE_MODEL_CUSTOMIZATION_UUID`, `MODEL_TYPE`),
+  INDEX `fk_service_to_resource_cust__resource_model_customiz_uuid_idx` (`RESOURCE_MODEL_CUSTOMIZATION_UUID` ASC),
+  CONSTRAINT `fk_service_to_resource_cust__service__model_uuid0`
+    FOREIGN KEY (`SERVICE_MODEL_UUID`)
+    REFERENCES `mso_catalog`.`service` (`MODEL_UUID`)
+    ON DELETE CASCADE
+    ON UPDATE CASCADE
+	) ENGINE = InnoDB DEFAULT CHARACTER SET = latin1;
+
+INSERT INTO mso_catalog.service_to_resource_customizations ( -- 4sc                * <<<2
+	service_model_uuid,
+	resource_model_customization_uuid,
+	model_type
+)
+	SELECT 
+		a.service_model_uuid,
+		a.network_model_customization_uuid,
+		"network"
+	FROM
+		mso_catalog.service_to_networks a;
+
+INSERT INTO mso_catalog.service_to_resource_customizations ( -- 5sc                * <<<2
+	service_model_uuid,
+	resource_model_customization_uuid,
+	model_type
+)
+	SELECT 
+		a.service_model_uuid,
+		a.ar_model_customization_uuid,
+		"allottedResource"
+	FROM
+		mso_catalog.service_to_allotted_resources a;
+
+INSERT INTO mso_catalog.service_to_resource_customizations ( -- 8a                 * <<<2
+    service_model_uuid,
+    resource_model_customization_uuid,
+    model_type
+)
+    SELECT  
+        ht1.model_uuid,
+        a.model_customization_uuid,
+        "vnf"
+    FROM mso_catalog.vnftemp a
+	JOIN mso_catalog.service AS ht1 ON
+		a.service_model_invariant_uuid = ht1.model_invariant_uuid AND
+		a.asdc_service_model_version = ht1.model_version;
+
+ALTER TABLE `mso_catalog`.`service`  --                                            * <<<2
+DROP COLUMN `SERVICE_VERSION`;
+
+DROP TABLE IF EXISTS mso_catalog.vnftemp; -- <<<2
+
+-- >>>1
+
+CREATE TABLE IF NOT EXISTS `mso_catalog`.`tosca_csar` ( --                         C <<<1
+  `ARTIFACT_UUID` VARCHAR(200) NOT NULL,
+  `NAME` VARCHAR(200) NOT NULL,
+  `VERSION` VARCHAR(20) NOT NULL,
+  `DESCRIPTION` VARCHAR(1200) NULL DEFAULT NULL,
+  `ARTIFACT_CHECKSUM` VARCHAR(200) NOT NULL,
+  `URL` VARCHAR(200) NOT NULL,
+  `CREATION_TIMESTAMP` DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP,
+  PRIMARY KEY (`ARTIFACT_UUID`))
+ENGINE = InnoDB
+DEFAULT CHARACTER SET = latin1;
+-- >>>1
+
+-- 5 aka 8d delete each asdc_uuid except highest ASDC_SERVICE_MODEL_VERSION vnf_resource and cascade vf_module * <<<1
+-- DELETE FROM mso_catalog.vnf_resource WHERE id = ANY(SELECT vnfs FROM mso_catalog.req5temp);
+DELETE FROM mso_catalog.vf_module WHERE id = ANY(SELECT vfs FROM mso_catalog.req5temp);
+DROP TABLE mso_catalog.req5temp;
+-- >>>1
+
+DROP TABLE IF EXISTS `mso_catalog`.`service_to_networks` ; --                      D <<<1
+
+DROP TABLE IF EXISTS `mso_catalog`.`service_to_allotted_resources` ; --            D <<<1
+
+-- >>>1
+
+-- Drop ID's <<<1
+ALTER TABLE `mso_catalog`.`heat_template` DROP COLUMN `id`;
+ALTER TABLE `mso_catalog`.`heat_files`    DROP COLUMN `id`;
+ALTER TABLE `mso_catalog`.`service`       DROP COLUMN `id`;
+ALTER TABLE `mso_catalog`.`vnf_resource`  DROP COLUMN `id`;
+ALTER TABLE `mso_catalog`.`vf_module`     DROP COLUMN `id`;
+-- >>>1
+
+-- FOREIGN KEYS <<<1
+ALTER TABLE `mso_catalog`.`heat_nested_template`  --                               K <<<2
+ADD CONSTRAINT `fk_heat_nested_template__parent_heat_temp_uuid__heat_template1`
+  FOREIGN KEY (`PARENT_HEAT_TEMPLATE_UUID`)
+  REFERENCES `mso_catalog`.`heat_template` (`ARTIFACT_UUID`)
+  ON DELETE CASCADE
+  ON UPDATE CASCADE,
+ADD CONSTRAINT `fk_heat_nested_template__child_heat_temp_uuid__heat_template1`
+  FOREIGN KEY (`CHILD_HEAT_TEMPLATE_UUID`)
+  REFERENCES `mso_catalog`.`heat_template` (`ARTIFACT_UUID`)
+  ON DELETE CASCADE
+  ON UPDATE CASCADE;
+
+ALTER TABLE `mso_catalog`.`heat_template_params`  --                               K <<<2
+ADD CONSTRAINT `fk_heat_template_params__heat_template1`
+  FOREIGN KEY (`HEAT_TEMPLATE_ARTIFACT_UUID`)
+  REFERENCES `mso_catalog`.`heat_template` (`ARTIFACT_UUID`)
+  ON DELETE CASCADE
+  ON UPDATE CASCADE;
+
+ALTER TABLE `mso_catalog`.`service`  --                                            K <<<2
+ADD CONSTRAINT `fk_service__tosca_csar1`
+  FOREIGN KEY (`TOSCA_CSAR_ARTIFACT_UUID`)
+  REFERENCES `mso_catalog`.`tosca_csar` (`ARTIFACT_UUID`)
+  ON DELETE CASCADE
+  ON UPDATE CASCADE;
+
+ALTER TABLE `mso_catalog`.`service_recipe`  --                                     K <<<2
+ADD CONSTRAINT `fk_service_recipe__service1`
+  FOREIGN KEY (`SERVICE_MODEL_UUID`)
+  REFERENCES `mso_catalog`.`service` (`MODEL_UUID`)
+  ON DELETE CASCADE
+  ON UPDATE CASCADE;
+
+ALTER TABLE `mso_catalog`.`vnf_resource` --                                        K <<<2
+	ADD PRIMARY KEY (`MODEL_UUID`),
+	DROP COLUMN `TEMPLATE_ID`,
+ADD CONSTRAINT `fk_vnf_resource__heat_template1`
+  FOREIGN KEY (`HEAT_TEMPLATE_ARTIFACT_UUID`)
+  REFERENCES `mso_catalog`.`heat_template` (`ARTIFACT_UUID`)
+  ON DELETE CASCADE
+  ON UPDATE CASCADE;
+
+ALTER TABLE `mso_catalog`.`vf_module`  --                                          K <<<2
+ADD PRIMARY KEY (`MODEL_UUID`, `VNF_RESOURCE_MODEL_UUID`),
+ADD CONSTRAINT `fk_vf_module__vnf_resource1`
+  FOREIGN KEY (`VNF_RESOURCE_MODEL_UUID`)
+  REFERENCES `mso_catalog`.`vnf_resource` (`MODEL_UUID`)
+  ON DELETE CASCADE
+  ON UPDATE CASCADE,
+ADD CONSTRAINT `fk_vf_module__heat_template_art_uuid__heat_template1`
+  FOREIGN KEY (`HEAT_TEMPLATE_ARTIFACT_UUID`)
+  REFERENCES `mso_catalog`.`heat_template` (`ARTIFACT_UUID`)
+  ON DELETE CASCADE
+  ON UPDATE CASCADE,
+ADD CONSTRAINT `fk_vf_module__vol_heat_template_art_uuid__heat_template2`
+  FOREIGN KEY (`VOL_HEAT_TEMPLATE_ARTIFACT_UUID`)
+  REFERENCES `mso_catalog`.`heat_template` (`ARTIFACT_UUID`)
+  ON DELETE CASCADE
+  ON UPDATE CASCADE;
+
+ALTER TABLE `mso_catalog`.`vf_module_customization` -- after vf_module             K <<<2
+  ADD CONSTRAINT `fk_vf_module_customization__vf_module1`
+    FOREIGN KEY (`VF_MODULE_MODEL_UUID`)
+    REFERENCES `mso_catalog`.`vf_module` (`MODEL_UUID`)
+    ON DELETE CASCADE
+    ON UPDATE CASCADE;
+
+ALTER TABLE `mso_catalog`.`vf_module_to_heat_files`  --                            K <<<2
+ADD CONSTRAINT `fk_vf_module_to_heat_files__heat_files__artifact_uuid1`
+  FOREIGN KEY (`HEAT_FILES_ARTIFACT_UUID`)
+  REFERENCES `mso_catalog`.`heat_files` (`ARTIFACT_UUID`)
+  ON DELETE CASCADE
+  ON UPDATE CASCADE,
+ADD CONSTRAINT `fk_vf_module_to_heat_files__vf_module__model_uuid1`
+  FOREIGN KEY (`VF_MODULE_MODEL_UUID`)
+  REFERENCES `mso_catalog`.`vf_module` (`MODEL_UUID`)
+  ON DELETE CASCADE
+  ON UPDATE CASCADE;
+
+ALTER TABLE `mso_catalog`.`allotted_resource_customization`  --                    K <<<2
+ADD CONSTRAINT `fk_allotted_resource_customization__allotted_resource1`
+  FOREIGN KEY (`AR_MODEL_UUID`)
+  REFERENCES `mso_catalog`.`allotted_resource` (`MODEL_UUID`)
+  ON DELETE CASCADE
+  ON UPDATE CASCADE;
+
+ALTER TABLE `mso_catalog`.`network_resource`  --                                   K <<<2
+ADD CONSTRAINT `fk_network_resource__temp_network_heat_template_lookup__mod_nm1`
+  FOREIGN KEY (`MODEL_NAME`)
+  REFERENCES `mso_catalog`.`temp_network_heat_template_lookup` (`NETWORK_RESOURCE_MODEL_NAME`)
+  ON DELETE NO ACTION
+  ON UPDATE NO ACTION,
+ADD CONSTRAINT `fk_network_resource__heat_template1`
+  FOREIGN KEY (`HEAT_TEMPLATE_ARTIFACT_UUID`)
+  REFERENCES `mso_catalog`.`heat_template` (`ARTIFACT_UUID`)
+  ON DELETE RESTRICT
+  ON UPDATE CASCADE;
+
+ALTER TABLE `mso_catalog`.`network_resource_customization`  --                     K <<<2
+ADD CONSTRAINT `fk_network_resource_customization__network_resource1`
+  FOREIGN KEY (`NETWORK_RESOURCE_MODEL_UUID`)
+  REFERENCES `mso_catalog`.`network_resource` (`MODEL_UUID`)
+  ON DELETE CASCADE
+  ON UPDATE CASCADE;
+
+ALTER TABLE `mso_catalog`.`vnf_resource_customization`  --                         K <<<2
+ADD CONSTRAINT `fk_vnf_resource_customization__vnf_resource1`
+    FOREIGN KEY (`VNF_RESOURCE_MODEL_UUID`)
+    REFERENCES `mso_catalog`.`vnf_resource` (`MODEL_UUID`)
+    ON DELETE CASCADE
+    ON UPDATE CASCADE;
+-- >>>1
+
+-- turn validation back on <<<1
+SET SQL_MODE=@OLD_SQL_MODE;
+SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS;
+SET UNIQUE_CHECKS=@OLD_UNIQUE_CHECKS;
+
+COMMIT;
+-- >>>1
+
+/*
+This file uses folds, set by last line.
+
+While reading this file, lines with the + are folded.
+	To unfold all:     zR
+	To fold all:       zM
+
+Move cursor to folded line: type in commands...
+	Toggle folding:    za
+    Recursively:       zA
+
+Vim help about folding
+:help fold
+*/
+--  vim:foldmarker=<<<,>>>:foldenable:foldmethod=marker
diff --git a/packages/root-pack-extras/config-resources/mysql/db-sql-scripts/upgrade/MariaDB-upgradeScript-1707.41.1_to_1710.44.1.sql b/packages/root-pack-extras/config-resources/mysql/db-sql-scripts/upgrade/MariaDB-upgradeScript-1707.41.1_to_1710.44.1.sql
index 1501cbf..0c1bc81 100644
--- a/packages/root-pack-extras/config-resources/mysql/db-sql-scripts/upgrade/MariaDB-upgradeScript-1707.41.1_to_1710.44.1.sql
+++ b/packages/root-pack-extras/config-resources/mysql/db-sql-scripts/upgrade/MariaDB-upgradeScript-1707.41.1_to_1710.44.1.sql
@@ -1,261 +1,261 @@
--- MySQL Workbench Synchronization
--- Generated: 2017-07-10 12:52
--- Model: New Model
--- Version: 1.0
--- Project: Name of the project
--- Author: mz1936
-
-SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0;
-SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0;
-SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='TRADITIONAL,ALLOW_INVALID_DATES';
-
-ALTER SCHEMA `mso_catalog`  DEFAULT CHARACTER SET latin1  DEFAULT COLLATE latin1_swedish_ci ;
-
-ALTER TABLE `mso_catalog`.`heat_nested_template`
-    DROP FOREIGN KEY `fk_heat_nested_template__child_heat_temp_uuid__heat_template1`;
-
-ALTER TABLE `mso_catalog`.`heat_template_params`
-    DROP FOREIGN KEY `fk_heat_template_params__heat_template1`;
-
-ALTER TABLE `mso_catalog`.`service_recipe`
-    DROP FOREIGN KEY `fk_service_recipe__service1`;
-
-ALTER TABLE `mso_catalog`.`vf_module`
-    DROP FOREIGN KEY `fk_vf_module__vol_heat_template_art_uuid__heat_template2`,
-    DROP FOREIGN KEY `fk_vf_module__heat_template_art_uuid__heat_template1`;
-
-ALTER TABLE `mso_catalog`.`vf_module_to_heat_files`
-    DROP FOREIGN KEY `fk_vf_module_to_heat_files__heat_files__artifact_uuid1`,
-    DROP FOREIGN KEY `fk_vf_module_to_heat_files__vf_module__model_uuid1`;
-
-ALTER TABLE `mso_catalog`.`network_resource`
-    DROP FOREIGN KEY `fk_network_resource__heat_template1`;
-
-ALTER TABLE `mso_catalog`.`temp_network_heat_template_lookup`
-    DROP FOREIGN KEY `fk_temp_network_heat_template_lookup__heat_template1`;
-
-ALTER TABLE `mso_catalog`.`vf_module_customization`
-    DROP FOREIGN KEY `fk_vf_module_customization__vol_env__heat_environment2`,
-    DROP FOREIGN KEY `fk_vf_module_customization__heat_env__heat_environment1`;
-
-ALTER TABLE `mso_catalog`.`heat_environment`
-    MODIFY COLUMN `ARTIFACT_UUID` VARCHAR(200) NOT NULL FIRST,
-    MODIFY COLUMN `BODY` LONGTEXT NOT NULL AFTER `DESCRIPTION`,
-    DROP PRIMARY KEY,
-    ADD PRIMARY KEY (`ARTIFACT_UUID`);
-
-ALTER TABLE `mso_catalog`.`heat_files`
-    MODIFY COLUMN `ARTIFACT_UUID` VARCHAR(200) NOT NULL FIRST,
-    MODIFY COLUMN `NAME` VARCHAR(200) NOT NULL AFTER `ARTIFACT_UUID`,
-    MODIFY COLUMN `BODY` LONGTEXT NOT NULL AFTER `DESCRIPTION`,
-    DROP PRIMARY KEY,
-    ADD PRIMARY KEY (`ARTIFACT_UUID`);
-
-ALTER TABLE `mso_catalog`.`heat_nested_template`
-    MODIFY COLUMN `PARENT_HEAT_TEMPLATE_UUID` VARCHAR(200) NOT NULL FIRST,
-    MODIFY COLUMN `CHILD_HEAT_TEMPLATE_UUID` VARCHAR(200) NOT NULL AFTER `PARENT_HEAT_TEMPLATE_UUID`,
-    DROP PRIMARY KEY,
-    ADD PRIMARY KEY (`PARENT_HEAT_TEMPLATE_UUID`, `CHILD_HEAT_TEMPLATE_UUID`),
-    DROP INDEX `fk_heat_nested_template__heat_template2_idx`,
-    ADD INDEX `fk_heat_nested_template__heat_template2_idx` (`CHILD_HEAT_TEMPLATE_UUID` ASC);
-
-ALTER TABLE `mso_catalog`.`heat_template`
-    MODIFY COLUMN `ARTIFACT_UUID` VARCHAR(200) NOT NULL FIRST,
-    MODIFY COLUMN `NAME` VARCHAR(200) NOT NULL AFTER `ARTIFACT_UUID`,
-    MODIFY COLUMN `BODY` LONGTEXT NOT NULL AFTER `DESCRIPTION`,
-    DROP PRIMARY KEY,
-    ADD PRIMARY KEY (`ARTIFACT_UUID`);
-
-ALTER TABLE `mso_catalog`.`heat_template_params`
-    MODIFY COLUMN `HEAT_TEMPLATE_ARTIFACT_UUID` VARCHAR(200) NOT NULL FIRST,
-    DROP PRIMARY KEY,
-    ADD PRIMARY KEY (`HEAT_TEMPLATE_ARTIFACT_UUID`, `PARAM_NAME`);
-
-ALTER TABLE `mso_catalog`.`network_recipe`
-    MODIFY COLUMN `MODEL_NAME` VARCHAR(20) NOT NULL AFTER `id`,
-    DROP INDEX `UK_rl4f296i0p8lyokxveaiwkayi`,
-    ADD UNIQUE INDEX `UK_rl4f296i0p8lyokxveaiwkayi` (`MODEL_NAME` ASC, `ACTION` ASC, `VERSION_STR` ASC);
-
-ALTER TABLE `mso_catalog`.`service`
-    ADD COLUMN `SERVICE_TYPE` VARCHAR(200) NULL DEFAULT NULL AFTER `DESCRIPTION`,
-    ADD COLUMN `SERVICE_ROLE` VARCHAR(200) NULL DEFAULT NULL AFTER `SERVICE_TYPE`,
-    MODIFY COLUMN `MODEL_UUID` VARCHAR(200) NOT NULL FIRST,
-    MODIFY COLUMN `MODEL_NAME` VARCHAR(200) NOT NULL AFTER `MODEL_UUID`,
-    MODIFY COLUMN `MODEL_VERSION` VARCHAR(20) NOT NULL AFTER `MODEL_INVARIANT_UUID`,
-    DROP PRIMARY KEY,
-    ADD PRIMARY KEY (`MODEL_UUID`),
-    ADD INDEX `fk_service__tosca_csar1_idx` (`TOSCA_CSAR_ARTIFACT_UUID` ASC),
-    DROP INDEX `fk_service__tosca_csar1_idx`;
-
-ALTER TABLE `mso_catalog`.`service_recipe`
-    MODIFY COLUMN `SERVICE_MODEL_UUID` VARCHAR(200) NOT NULL AFTER `CREATION_TIMESTAMP`,
-    DROP INDEX `fk_service_recipe__service1_idx`,
-    ADD INDEX `fk_service_recipe__service1_idx` (`SERVICE_MODEL_UUID` ASC),
-    DROP INDEX `UK_7fav5dkux2v8g9d2i5ymudlgc`,
-    ADD UNIQUE INDEX `UK_7fav5dkux2v8g9d2i5ymudlgc` (`SERVICE_MODEL_UUID` ASC, `ACTION` ASC);
-
-ALTER TABLE `mso_catalog`.`vf_module`
-    MODIFY COLUMN `MODEL_UUID` VARCHAR(200) NOT NULL FIRST,
-    MODIFY COLUMN `HEAT_TEMPLATE_ARTIFACT_UUID` VARCHAR(200) NULL DEFAULT NULL AFTER `IS_BASE`,
-    MODIFY COLUMN `VOL_HEAT_TEMPLATE_ARTIFACT_UUID` VARCHAR(200) NULL DEFAULT NULL AFTER `HEAT_TEMPLATE_ARTIFACT_UUID`,
-    DROP PRIMARY KEY,
-    ADD PRIMARY KEY (`MODEL_UUID`, `VNF_RESOURCE_MODEL_UUID`),
-    ADD INDEX `fk_vf_module__heat_template_art_uuid__heat_template1_idx` (`HEAT_TEMPLATE_ARTIFACT_UUID` ASC),
-    ADD INDEX `fk_vf_module__vol_heat_template_art_uuid__heat_template2_idx` (`VOL_HEAT_TEMPLATE_ARTIFACT_UUID` ASC),
-    DROP INDEX `fk_vf_module__vol_heat_template_art_uuid__heat_template2_idx`,
-    DROP INDEX `fk_vf_module__heat_template_art_uuid__heat_template1_idx`;
-
-ALTER TABLE `mso_catalog`.`vf_module_to_heat_files`
-    MODIFY COLUMN `VF_MODULE_MODEL_UUID` VARCHAR(200) NOT NULL FIRST,
-    MODIFY COLUMN `HEAT_FILES_ARTIFACT_UUID` VARCHAR(200) NOT NULL AFTER `VF_MODULE_MODEL_UUID`,
-    DROP PRIMARY KEY,
-    ADD PRIMARY KEY (`VF_MODULE_MODEL_UUID`, `HEAT_FILES_ARTIFACT_UUID`),
-    DROP INDEX `fk_vf_module_to_heat_files__heat_files__artifact_uuid1_idx`,
-    ADD INDEX `fk_vf_module_to_heat_files__heat_files__artifact_uuid1_idx` (`HEAT_FILES_ARTIFACT_UUID` ASC),
-    COMMENT = '';
-
-ALTER TABLE `mso_catalog`.`vnf_components_recipe`
-    MODIFY COLUMN `VF_MODULE_MODEL_UUID` VARCHAR(200) NULL DEFAULT NULL AFTER `CREATION_TIMESTAMP`,
-    CHANGE COLUMN `VERSION` `VERSION` VARCHAR(20) NOT NULL,
-    DROP INDEX `UK_4dpdwddaaclhc11wxsb7h59ma`,
-    ADD UNIQUE INDEX `UK_4dpdwddaaclhc11wxsb7h59ma` (`VF_MODULE_MODEL_UUID` ASC, `VNF_COMPONENT_TYPE` ASC, `ACTION` ASC, `VERSION` ASC);
-
-ALTER TABLE `mso_catalog`.`vnf_resource`
-    MODIFY COLUMN `MODEL_UUID` VARCHAR(200) NOT NULL FIRST,
-    CHANGE COLUMN `DESCRIPTION` `DESCRIPTION` VARCHAR(1200) NULL DEFAULT NULL AFTER `TOSCA_NODE_TYPE`,
-    CHANGE COLUMN `ORCHESTRATION_MODE` `ORCHESTRATION_MODE` VARCHAR(20) NOT NULL DEFAULT 'HEAT' AFTER `DESCRIPTION`,
-    CHANGE COLUMN `AIC_VERSION_MIN` `AIC_VERSION_MIN` VARCHAR(20) NULL DEFAULT NULL AFTER `ORCHESTRATION_MODE`,
-    CHANGE COLUMN `AIC_VERSION_MAX` `AIC_VERSION_MAX` VARCHAR(20) NULL DEFAULT NULL AFTER `AIC_VERSION_MIN`,
-    CHANGE COLUMN `CREATION_TIMESTAMP` `CREATION_TIMESTAMP` DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP AFTER `AIC_VERSION_MAX`,
-    DROP PRIMARY KEY,
-    ADD PRIMARY KEY (`MODEL_UUID`),
-    DROP INDEX `fk_vnf_resource__heat_template1`,
-    ADD INDEX `fk_vnf_resource__heat_template1_idx` (`HEAT_TEMPLATE_ARTIFACT_UUID` ASC);
-
-ALTER TABLE `mso_catalog`.`allotted_resource_customization`
-    MODIFY COLUMN `PROVIDING_SERVICE_MODEL_INVARIANT_UUID` VARCHAR(200) NULL DEFAULT NULL AFTER `MODEL_INSTANCE_NAME`,
-    MODIFY COLUMN `TARGET_NETWORK_ROLE` VARCHAR(200) NULL DEFAULT NULL AFTER `PROVIDING_SERVICE_MODEL_INVARIANT_UUID`,
-    MODIFY COLUMN `NF_NAMING_CODE` VARCHAR(200) NULL DEFAULT NULL AFTER `NF_FUNCTION`,
-    CHANGE COLUMN `CREATION_TIMESTAMP` `CREATION_TIMESTAMP` DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP AFTER `MAX_INSTANCES`;
-
-ALTER TABLE `mso_catalog`.`vnf_resource_customization`
-    MODIFY COLUMN `NF_NAMING_CODE` VARCHAR(200) NULL DEFAULT NULL AFTER `NF_FUNCTION`;
-
-ALTER TABLE `mso_catalog`.`network_resource`
-    CHANGE COLUMN `NEUTRON_NETWORK_TYPE` `NEUTRON_NETWORK_TYPE` VARCHAR(20) NULL DEFAULT NULL AFTER `TOSCA_NODE_TYPE`,
-    CHANGE COLUMN `DESCRIPTION` `DESCRIPTION` VARCHAR(1200) NULL DEFAULT NULL AFTER `NEUTRON_NETWORK_TYPE`,
-    CHANGE COLUMN `HEAT_TEMPLATE_ARTIFACT_UUID` `HEAT_TEMPLATE_ARTIFACT_UUID` VARCHAR(200) NOT NULL AFTER `CREATION_TIMESTAMP`,
-    CHANGE COLUMN `MODEL_INVARIANT_UUID` `MODEL_INVARIANT_UUID` VARCHAR(200) NULL DEFAULT NULL;
-
-ALTER TABLE `mso_catalog`.`temp_network_heat_template_lookup`
-    ADD INDEX `fk_temp_network_heat_template_lookup__heat_template1_idx` (`HEAT_TEMPLATE_ARTIFACT_UUID` ASC),
-    DROP INDEX `fk_temp_network_heat_template_lookup__heat_template1_idx`;
-
-ALTER TABLE `mso_catalog`.`vf_module_customization`
-    ADD INDEX `fk_vf_module_customization__heat_env__heat_environment1_idx` (`HEAT_ENVIRONMENT_ARTIFACT_UUID` ASC),
-    ADD INDEX `fk_vf_module_customization__vol_env__heat_environment2_idx` (`VOL_ENVIRONMENT_ARTIFACT_UUID` ASC),
-    DROP INDEX `fk_vf_module_customization__vol_env__heat_environment2_idx`,
-    DROP INDEX `fk_vf_module_customization__heat_env__heat_environment1_idx`;
-
-ALTER TABLE `mso_catalog`.`service_to_resource_customizations`
-    DROP INDEX `fk_service_to_resource_cust__resource_model_customiz_uuid_idx`;
-
-ALTER TABLE `mso_catalog`.`heat_nested_template`
-    DROP FOREIGN KEY `fk_heat_nested_template__parent_heat_temp_uuid__heat_template1`;
-
-ALTER TABLE `mso_catalog`.`heat_nested_template`
-    ADD CONSTRAINT `fk_heat_nested_template__parent_heat_temp_uuid__heat_template1`
-  FOREIGN KEY (`PARENT_HEAT_TEMPLATE_UUID`)
-  REFERENCES `mso_catalog`.`heat_template` (`ARTIFACT_UUID`)
-  ON DELETE CASCADE
-  ON UPDATE CASCADE,
-    ADD CONSTRAINT `fk_heat_nested_template__child_heat_temp_uuid__heat_template1`
-  FOREIGN KEY (`CHILD_HEAT_TEMPLATE_UUID`)
-  REFERENCES `mso_catalog`.`heat_template` (`ARTIFACT_UUID`)
-  ON DELETE CASCADE
-  ON UPDATE CASCADE;
-
-ALTER TABLE `mso_catalog`.`heat_template_params`
-    ADD CONSTRAINT `fk_heat_template_params__heat_template1`
-  FOREIGN KEY (`HEAT_TEMPLATE_ARTIFACT_UUID`)
-  REFERENCES `mso_catalog`.`heat_template` (`ARTIFACT_UUID`)
-  ON DELETE CASCADE
-  ON UPDATE CASCADE;
-
-ALTER TABLE `mso_catalog`.`service_recipe`
-    ADD CONSTRAINT `fk_service_recipe__service1`
-  FOREIGN KEY (`SERVICE_MODEL_UUID`)
-  REFERENCES `mso_catalog`.`service` (`MODEL_UUID`)
-  ON DELETE CASCADE
-  ON UPDATE CASCADE;
-
-ALTER TABLE `mso_catalog`.`vf_module`
-    ADD CONSTRAINT `fk_vf_module__heat_template_art_uuid__heat_template1`
-  FOREIGN KEY (`HEAT_TEMPLATE_ARTIFACT_UUID`)
-  REFERENCES `mso_catalog`.`heat_template` (`ARTIFACT_UUID`)
-  ON DELETE CASCADE
-  ON UPDATE CASCADE,
-    ADD CONSTRAINT `fk_vf_module__vol_heat_template_art_uuid__heat_template2`
-  FOREIGN KEY (`VOL_HEAT_TEMPLATE_ARTIFACT_UUID`)
-  REFERENCES `mso_catalog`.`heat_template` (`ARTIFACT_UUID`)
-  ON DELETE CASCADE
-  ON UPDATE CASCADE;
-
-ALTER TABLE `mso_catalog`.`vf_module_to_heat_files`
-    ADD CONSTRAINT `fk_vf_module_to_heat_files__heat_files__artifact_uuid1`
-  FOREIGN KEY (`HEAT_FILES_ARTIFACT_UUID`)
-  REFERENCES `mso_catalog`.`heat_files` (`ARTIFACT_UUID`)
-  ON DELETE CASCADE
-  ON UPDATE CASCADE,
-    ADD CONSTRAINT `fk_vf_module_to_heat_files__vf_module__model_uuid1`
-  FOREIGN KEY (`VF_MODULE_MODEL_UUID`)
-  REFERENCES `mso_catalog`.`vf_module` (`MODEL_UUID`)
-  ON DELETE CASCADE
-  ON UPDATE CASCADE;
-
-ALTER TABLE `mso_catalog`.`network_resource`
-    ADD CONSTRAINT `fk_network_resource__heat_template1`
-  FOREIGN KEY (`HEAT_TEMPLATE_ARTIFACT_UUID`)
-  REFERENCES `mso_catalog`.`heat_template` (`ARTIFACT_UUID`)
-  ON DELETE RESTRICT
-  ON UPDATE CASCADE;
-
-ALTER TABLE `mso_catalog`.`temp_network_heat_template_lookup`
-    ADD CONSTRAINT `fk_temp_network_heat_template_lookup__heat_template1`
-  FOREIGN KEY (`HEAT_TEMPLATE_ARTIFACT_UUID`)
-  REFERENCES `mso_catalog`.`heat_template` (`ARTIFACT_UUID`)
-  ON DELETE RESTRICT
-  ON UPDATE CASCADE;
-
-ALTER TABLE `mso_catalog`.`vf_module_customization`
-    ADD CONSTRAINT `fk_vf_module_customization__heat_env__heat_environment1`
-  FOREIGN KEY (`HEAT_ENVIRONMENT_ARTIFACT_UUID`)
-  REFERENCES `mso_catalog`.`heat_environment` (`ARTIFACT_UUID`)
-  ON DELETE CASCADE
-  ON UPDATE CASCADE,
-    ADD CONSTRAINT `fk_vf_module_customization__vol_env__heat_environment2`
-  FOREIGN KEY (`VOL_ENVIRONMENT_ARTIFACT_UUID`)
-  REFERENCES `mso_catalog`.`heat_environment` (`ARTIFACT_UUID`)
-  ON DELETE CASCADE
-  ON UPDATE CASCADE;
-
-INSERT INTO mso_catalog.SERVICE_RECIPE (ACTION, VERSION_STR, DESCRIPTION, ORCHESTRATION_URI, RECIPE_TIMEOUT, SERVICE_MODEL_UUID)
-VALUES ('activateInstance', '1.0', 'VID_DEFAULT activate', '/mso/async/services/ActivateGenericMacroService', 180, (SELECT model_uuid from mso_catalog.SERVICE where MODEL_NAME = 'VID_DEFAULT'));
-
-INSERT INTO mso_catalog.SERVICE_RECIPE (ACTION, VERSION_STR, DESCRIPTION, ORCHESTRATION_URI, RECIPE_TIMEOUT, SERVICE_MODEL_UUID)
-VALUES ('deactivateInstance', '1.0', 'VID_DEFAULT deactivate', '/mso/async/services/DeactivateGenericMacroService', 180, (SELECT model_uuid from mso_catalog.SERVICE where MODEL_NAME = 'VID_DEFAULT'));
-
-INSERT INTO mso_catalog.VNF_RECIPE(VNF_TYPE, ACTION, VERSION_STR, DESCRIPTION, ORCHESTRATION_URI, RECIPE_TIMEOUT)
-VALUES ('VID_DEFAULT', 'updateInstance', '1', 'VID_DEFAULT update', '/mso/async/services/UpdateVnfInfra', 180);
-
-INSERT INTO mso_catalog.VNF_RECIPE(VNF_TYPE, ACTION, VERSION_STR, DESCRIPTION, ORCHESTRATION_URI, RECIPE_TIMEOUT)
-VALUES ('VID_DEFAULT', 'replaceInstance', '1', 'VID_DEFAULT replace', '/mso/async/services/ReplaceVnfInfra', 180);
-
-INSERT INTO mso_catalog.VNF_COMPONENTS_RECIPE(VNF_COMPONENT_TYPE, ACTION, VERSION, DESCRIPTION, ORCHESTRATION_URI, RECIPE_TIMEOUT, VF_MODULE_MODEL_UUID)
-VALUES ('vfModule', 'replaceInstance', '1', 'VID_DEFAULT vfModule replace', '/mso/async/services/ReplaceVfModuleInfra', 180, 'VID_DEFAULT');
-
-ALTER TABLE mso_requests.infra_active_requests modify LAST_MODIFIED_BY VARCHAR(100);
-
-SET SQL_MODE=@OLD_SQL_MODE;
-SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS;
-SET UNIQUE_CHECKS=@OLD_UNIQUE_CHECKS;
+-- MySQL Workbench Synchronization
+-- Generated: 2017-07-10 12:52
+-- Model: New Model
+-- Version: 1.0
+-- Project: Name of the project
+-- Author: mz1936
+
+SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0;
+SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0;
+SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='TRADITIONAL,ALLOW_INVALID_DATES';
+
+ALTER SCHEMA `mso_catalog`  DEFAULT CHARACTER SET latin1  DEFAULT COLLATE latin1_swedish_ci ;
+
+ALTER TABLE `mso_catalog`.`heat_nested_template`
+    DROP FOREIGN KEY `fk_heat_nested_template__child_heat_temp_uuid__heat_template1`;
+
+ALTER TABLE `mso_catalog`.`heat_template_params`
+    DROP FOREIGN KEY `fk_heat_template_params__heat_template1`;
+
+ALTER TABLE `mso_catalog`.`service_recipe`
+    DROP FOREIGN KEY `fk_service_recipe__service1`;
+
+ALTER TABLE `mso_catalog`.`vf_module`
+    DROP FOREIGN KEY `fk_vf_module__vol_heat_template_art_uuid__heat_template2`,
+    DROP FOREIGN KEY `fk_vf_module__heat_template_art_uuid__heat_template1`;
+
+ALTER TABLE `mso_catalog`.`vf_module_to_heat_files`
+    DROP FOREIGN KEY `fk_vf_module_to_heat_files__heat_files__artifact_uuid1`,
+    DROP FOREIGN KEY `fk_vf_module_to_heat_files__vf_module__model_uuid1`;
+
+ALTER TABLE `mso_catalog`.`network_resource`
+    DROP FOREIGN KEY `fk_network_resource__heat_template1`;
+
+ALTER TABLE `mso_catalog`.`temp_network_heat_template_lookup`
+    DROP FOREIGN KEY `fk_temp_network_heat_template_lookup__heat_template1`;
+
+ALTER TABLE `mso_catalog`.`vf_module_customization`
+    DROP FOREIGN KEY `fk_vf_module_customization__vol_env__heat_environment2`,
+    DROP FOREIGN KEY `fk_vf_module_customization__heat_env__heat_environment1`;
+
+ALTER TABLE `mso_catalog`.`heat_environment`
+    MODIFY COLUMN `ARTIFACT_UUID` VARCHAR(200) NOT NULL FIRST,
+    MODIFY COLUMN `BODY` LONGTEXT NOT NULL AFTER `DESCRIPTION`,
+    DROP PRIMARY KEY,
+    ADD PRIMARY KEY (`ARTIFACT_UUID`);
+
+ALTER TABLE `mso_catalog`.`heat_files`
+    MODIFY COLUMN `ARTIFACT_UUID` VARCHAR(200) NOT NULL FIRST,
+    MODIFY COLUMN `NAME` VARCHAR(200) NOT NULL AFTER `ARTIFACT_UUID`,
+    MODIFY COLUMN `BODY` LONGTEXT NOT NULL AFTER `DESCRIPTION`,
+    DROP PRIMARY KEY,
+    ADD PRIMARY KEY (`ARTIFACT_UUID`);
+
+ALTER TABLE `mso_catalog`.`heat_nested_template`
+    MODIFY COLUMN `PARENT_HEAT_TEMPLATE_UUID` VARCHAR(200) NOT NULL FIRST,
+    MODIFY COLUMN `CHILD_HEAT_TEMPLATE_UUID` VARCHAR(200) NOT NULL AFTER `PARENT_HEAT_TEMPLATE_UUID`,
+    DROP PRIMARY KEY,
+    ADD PRIMARY KEY (`PARENT_HEAT_TEMPLATE_UUID`, `CHILD_HEAT_TEMPLATE_UUID`),
+    DROP INDEX `fk_heat_nested_template__heat_template2_idx`,
+    ADD INDEX `fk_heat_nested_template__heat_template2_idx` (`CHILD_HEAT_TEMPLATE_UUID` ASC);
+
+ALTER TABLE `mso_catalog`.`heat_template`
+    MODIFY COLUMN `ARTIFACT_UUID` VARCHAR(200) NOT NULL FIRST,
+    MODIFY COLUMN `NAME` VARCHAR(200) NOT NULL AFTER `ARTIFACT_UUID`,
+    MODIFY COLUMN `BODY` LONGTEXT NOT NULL AFTER `DESCRIPTION`,
+    DROP PRIMARY KEY,
+    ADD PRIMARY KEY (`ARTIFACT_UUID`);
+
+ALTER TABLE `mso_catalog`.`heat_template_params`
+    MODIFY COLUMN `HEAT_TEMPLATE_ARTIFACT_UUID` VARCHAR(200) NOT NULL FIRST,
+    DROP PRIMARY KEY,
+    ADD PRIMARY KEY (`HEAT_TEMPLATE_ARTIFACT_UUID`, `PARAM_NAME`);
+
+ALTER TABLE `mso_catalog`.`network_recipe`
+    MODIFY COLUMN `MODEL_NAME` VARCHAR(20) NOT NULL AFTER `id`,
+    DROP INDEX `UK_rl4f296i0p8lyokxveaiwkayi`,
+    ADD UNIQUE INDEX `UK_rl4f296i0p8lyokxveaiwkayi` (`MODEL_NAME` ASC, `ACTION` ASC, `VERSION_STR` ASC);
+
+ALTER TABLE `mso_catalog`.`service`
+    ADD COLUMN `SERVICE_TYPE` VARCHAR(200) NULL DEFAULT NULL AFTER `DESCRIPTION`,
+    ADD COLUMN `SERVICE_ROLE` VARCHAR(200) NULL DEFAULT NULL AFTER `SERVICE_TYPE`,
+    MODIFY COLUMN `MODEL_UUID` VARCHAR(200) NOT NULL FIRST,
+    MODIFY COLUMN `MODEL_NAME` VARCHAR(200) NOT NULL AFTER `MODEL_UUID`,
+    MODIFY COLUMN `MODEL_VERSION` VARCHAR(20) NOT NULL AFTER `MODEL_INVARIANT_UUID`,
+    DROP PRIMARY KEY,
+    ADD PRIMARY KEY (`MODEL_UUID`),
+    ADD INDEX `fk_service__tosca_csar1_idx` (`TOSCA_CSAR_ARTIFACT_UUID` ASC),
+    DROP INDEX `fk_service__tosca_csar1_idx`;
+
+ALTER TABLE `mso_catalog`.`service_recipe`
+    MODIFY COLUMN `SERVICE_MODEL_UUID` VARCHAR(200) NOT NULL AFTER `CREATION_TIMESTAMP`,
+    DROP INDEX `fk_service_recipe__service1_idx`,
+    ADD INDEX `fk_service_recipe__service1_idx` (`SERVICE_MODEL_UUID` ASC),
+    DROP INDEX `UK_7fav5dkux2v8g9d2i5ymudlgc`,
+    ADD UNIQUE INDEX `UK_7fav5dkux2v8g9d2i5ymudlgc` (`SERVICE_MODEL_UUID` ASC, `ACTION` ASC);
+
+ALTER TABLE `mso_catalog`.`vf_module`
+    MODIFY COLUMN `MODEL_UUID` VARCHAR(200) NOT NULL FIRST,
+    MODIFY COLUMN `HEAT_TEMPLATE_ARTIFACT_UUID` VARCHAR(200) NULL DEFAULT NULL AFTER `IS_BASE`,
+    MODIFY COLUMN `VOL_HEAT_TEMPLATE_ARTIFACT_UUID` VARCHAR(200) NULL DEFAULT NULL AFTER `HEAT_TEMPLATE_ARTIFACT_UUID`,
+    DROP PRIMARY KEY,
+    ADD PRIMARY KEY (`MODEL_UUID`, `VNF_RESOURCE_MODEL_UUID`),
+    ADD INDEX `fk_vf_module__heat_template_art_uuid__heat_template1_idx` (`HEAT_TEMPLATE_ARTIFACT_UUID` ASC),
+    ADD INDEX `fk_vf_module__vol_heat_template_art_uuid__heat_template2_idx` (`VOL_HEAT_TEMPLATE_ARTIFACT_UUID` ASC),
+    DROP INDEX `fk_vf_module__vol_heat_template_art_uuid__heat_template2_idx`,
+    DROP INDEX `fk_vf_module__heat_template_art_uuid__heat_template1_idx`;
+
+ALTER TABLE `mso_catalog`.`vf_module_to_heat_files`
+    MODIFY COLUMN `VF_MODULE_MODEL_UUID` VARCHAR(200) NOT NULL FIRST,
+    MODIFY COLUMN `HEAT_FILES_ARTIFACT_UUID` VARCHAR(200) NOT NULL AFTER `VF_MODULE_MODEL_UUID`,
+    DROP PRIMARY KEY,
+    ADD PRIMARY KEY (`VF_MODULE_MODEL_UUID`, `HEAT_FILES_ARTIFACT_UUID`),
+    DROP INDEX `fk_vf_module_to_heat_files__heat_files__artifact_uuid1_idx`,
+    ADD INDEX `fk_vf_module_to_heat_files__heat_files__artifact_uuid1_idx` (`HEAT_FILES_ARTIFACT_UUID` ASC),
+    COMMENT = '';
+
+ALTER TABLE `mso_catalog`.`vnf_components_recipe`
+    MODIFY COLUMN `VF_MODULE_MODEL_UUID` VARCHAR(200) NULL DEFAULT NULL AFTER `CREATION_TIMESTAMP`,
+    CHANGE COLUMN `VERSION` `VERSION` VARCHAR(20) NOT NULL,
+    DROP INDEX `UK_4dpdwddaaclhc11wxsb7h59ma`,
+    ADD UNIQUE INDEX `UK_4dpdwddaaclhc11wxsb7h59ma` (`VF_MODULE_MODEL_UUID` ASC, `VNF_COMPONENT_TYPE` ASC, `ACTION` ASC, `VERSION` ASC);
+
+ALTER TABLE `mso_catalog`.`vnf_resource`
+    MODIFY COLUMN `MODEL_UUID` VARCHAR(200) NOT NULL FIRST,
+    CHANGE COLUMN `DESCRIPTION` `DESCRIPTION` VARCHAR(1200) NULL DEFAULT NULL AFTER `TOSCA_NODE_TYPE`,
+    CHANGE COLUMN `ORCHESTRATION_MODE` `ORCHESTRATION_MODE` VARCHAR(20) NOT NULL DEFAULT 'HEAT' AFTER `DESCRIPTION`,
+    CHANGE COLUMN `AIC_VERSION_MIN` `AIC_VERSION_MIN` VARCHAR(20) NULL DEFAULT NULL AFTER `ORCHESTRATION_MODE`,
+    CHANGE COLUMN `AIC_VERSION_MAX` `AIC_VERSION_MAX` VARCHAR(20) NULL DEFAULT NULL AFTER `AIC_VERSION_MIN`,
+    CHANGE COLUMN `CREATION_TIMESTAMP` `CREATION_TIMESTAMP` DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP AFTER `AIC_VERSION_MAX`,
+    DROP PRIMARY KEY,
+    ADD PRIMARY KEY (`MODEL_UUID`),
+    DROP INDEX `fk_vnf_resource__heat_template1`,
+    ADD INDEX `fk_vnf_resource__heat_template1_idx` (`HEAT_TEMPLATE_ARTIFACT_UUID` ASC);
+
+ALTER TABLE `mso_catalog`.`allotted_resource_customization`
+    MODIFY COLUMN `PROVIDING_SERVICE_MODEL_INVARIANT_UUID` VARCHAR(200) NULL DEFAULT NULL AFTER `MODEL_INSTANCE_NAME`,
+    MODIFY COLUMN `TARGET_NETWORK_ROLE` VARCHAR(200) NULL DEFAULT NULL AFTER `PROVIDING_SERVICE_MODEL_INVARIANT_UUID`,
+    MODIFY COLUMN `NF_NAMING_CODE` VARCHAR(200) NULL DEFAULT NULL AFTER `NF_FUNCTION`,
+    CHANGE COLUMN `CREATION_TIMESTAMP` `CREATION_TIMESTAMP` DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP AFTER `MAX_INSTANCES`;
+
+ALTER TABLE `mso_catalog`.`vnf_resource_customization`
+    MODIFY COLUMN `NF_NAMING_CODE` VARCHAR(200) NULL DEFAULT NULL AFTER `NF_FUNCTION`;
+
+ALTER TABLE `mso_catalog`.`network_resource`
+    CHANGE COLUMN `NEUTRON_NETWORK_TYPE` `NEUTRON_NETWORK_TYPE` VARCHAR(20) NULL DEFAULT NULL AFTER `TOSCA_NODE_TYPE`,
+    CHANGE COLUMN `DESCRIPTION` `DESCRIPTION` VARCHAR(1200) NULL DEFAULT NULL AFTER `NEUTRON_NETWORK_TYPE`,
+    CHANGE COLUMN `HEAT_TEMPLATE_ARTIFACT_UUID` `HEAT_TEMPLATE_ARTIFACT_UUID` VARCHAR(200) NOT NULL AFTER `CREATION_TIMESTAMP`,
+    CHANGE COLUMN `MODEL_INVARIANT_UUID` `MODEL_INVARIANT_UUID` VARCHAR(200) NULL DEFAULT NULL;
+
+ALTER TABLE `mso_catalog`.`temp_network_heat_template_lookup`
+    ADD INDEX `fk_temp_network_heat_template_lookup__heat_template1_idx` (`HEAT_TEMPLATE_ARTIFACT_UUID` ASC),
+    DROP INDEX `fk_temp_network_heat_template_lookup__heat_template1_idx`;
+
+ALTER TABLE `mso_catalog`.`vf_module_customization`
+    ADD INDEX `fk_vf_module_customization__heat_env__heat_environment1_idx` (`HEAT_ENVIRONMENT_ARTIFACT_UUID` ASC),
+    ADD INDEX `fk_vf_module_customization__vol_env__heat_environment2_idx` (`VOL_ENVIRONMENT_ARTIFACT_UUID` ASC),
+    DROP INDEX `fk_vf_module_customization__vol_env__heat_environment2_idx`,
+    DROP INDEX `fk_vf_module_customization__heat_env__heat_environment1_idx`;
+
+ALTER TABLE `mso_catalog`.`service_to_resource_customizations`
+    DROP INDEX `fk_service_to_resource_cust__resource_model_customiz_uuid_idx`;
+
+ALTER TABLE `mso_catalog`.`heat_nested_template`
+    DROP FOREIGN KEY `fk_heat_nested_template__parent_heat_temp_uuid__heat_template1`;
+
+ALTER TABLE `mso_catalog`.`heat_nested_template`
+    ADD CONSTRAINT `fk_heat_nested_template__parent_heat_temp_uuid__heat_template1`
+  FOREIGN KEY (`PARENT_HEAT_TEMPLATE_UUID`)
+  REFERENCES `mso_catalog`.`heat_template` (`ARTIFACT_UUID`)
+  ON DELETE CASCADE
+  ON UPDATE CASCADE,
+    ADD CONSTRAINT `fk_heat_nested_template__child_heat_temp_uuid__heat_template1`
+  FOREIGN KEY (`CHILD_HEAT_TEMPLATE_UUID`)
+  REFERENCES `mso_catalog`.`heat_template` (`ARTIFACT_UUID`)
+  ON DELETE CASCADE
+  ON UPDATE CASCADE;
+
+ALTER TABLE `mso_catalog`.`heat_template_params`
+    ADD CONSTRAINT `fk_heat_template_params__heat_template1`
+  FOREIGN KEY (`HEAT_TEMPLATE_ARTIFACT_UUID`)
+  REFERENCES `mso_catalog`.`heat_template` (`ARTIFACT_UUID`)
+  ON DELETE CASCADE
+  ON UPDATE CASCADE;
+
+ALTER TABLE `mso_catalog`.`service_recipe`
+    ADD CONSTRAINT `fk_service_recipe__service1`
+  FOREIGN KEY (`SERVICE_MODEL_UUID`)
+  REFERENCES `mso_catalog`.`service` (`MODEL_UUID`)
+  ON DELETE CASCADE
+  ON UPDATE CASCADE;
+
+ALTER TABLE `mso_catalog`.`vf_module`
+    ADD CONSTRAINT `fk_vf_module__heat_template_art_uuid__heat_template1`
+  FOREIGN KEY (`HEAT_TEMPLATE_ARTIFACT_UUID`)
+  REFERENCES `mso_catalog`.`heat_template` (`ARTIFACT_UUID`)
+  ON DELETE CASCADE
+  ON UPDATE CASCADE,
+    ADD CONSTRAINT `fk_vf_module__vol_heat_template_art_uuid__heat_template2`
+  FOREIGN KEY (`VOL_HEAT_TEMPLATE_ARTIFACT_UUID`)
+  REFERENCES `mso_catalog`.`heat_template` (`ARTIFACT_UUID`)
+  ON DELETE CASCADE
+  ON UPDATE CASCADE;
+
+ALTER TABLE `mso_catalog`.`vf_module_to_heat_files`
+    ADD CONSTRAINT `fk_vf_module_to_heat_files__heat_files__artifact_uuid1`
+  FOREIGN KEY (`HEAT_FILES_ARTIFACT_UUID`)
+  REFERENCES `mso_catalog`.`heat_files` (`ARTIFACT_UUID`)
+  ON DELETE CASCADE
+  ON UPDATE CASCADE,
+    ADD CONSTRAINT `fk_vf_module_to_heat_files__vf_module__model_uuid1`
+  FOREIGN KEY (`VF_MODULE_MODEL_UUID`)
+  REFERENCES `mso_catalog`.`vf_module` (`MODEL_UUID`)
+  ON DELETE CASCADE
+  ON UPDATE CASCADE;
+
+ALTER TABLE `mso_catalog`.`network_resource`
+    ADD CONSTRAINT `fk_network_resource__heat_template1`
+  FOREIGN KEY (`HEAT_TEMPLATE_ARTIFACT_UUID`)
+  REFERENCES `mso_catalog`.`heat_template` (`ARTIFACT_UUID`)
+  ON DELETE RESTRICT
+  ON UPDATE CASCADE;
+
+ALTER TABLE `mso_catalog`.`temp_network_heat_template_lookup`
+    ADD CONSTRAINT `fk_temp_network_heat_template_lookup__heat_template1`
+  FOREIGN KEY (`HEAT_TEMPLATE_ARTIFACT_UUID`)
+  REFERENCES `mso_catalog`.`heat_template` (`ARTIFACT_UUID`)
+  ON DELETE RESTRICT
+  ON UPDATE CASCADE;
+
+ALTER TABLE `mso_catalog`.`vf_module_customization`
+    ADD CONSTRAINT `fk_vf_module_customization__heat_env__heat_environment1`
+  FOREIGN KEY (`HEAT_ENVIRONMENT_ARTIFACT_UUID`)
+  REFERENCES `mso_catalog`.`heat_environment` (`ARTIFACT_UUID`)
+  ON DELETE CASCADE
+  ON UPDATE CASCADE,
+    ADD CONSTRAINT `fk_vf_module_customization__vol_env__heat_environment2`
+  FOREIGN KEY (`VOL_ENVIRONMENT_ARTIFACT_UUID`)
+  REFERENCES `mso_catalog`.`heat_environment` (`ARTIFACT_UUID`)
+  ON DELETE CASCADE
+  ON UPDATE CASCADE;
+
+INSERT INTO mso_catalog.SERVICE_RECIPE (ACTION, VERSION_STR, DESCRIPTION, ORCHESTRATION_URI, RECIPE_TIMEOUT, SERVICE_MODEL_UUID)
+VALUES ('activateInstance', '1.0', 'VID_DEFAULT activate', '/mso/async/services/ActivateGenericMacroService', 180, (SELECT model_uuid from mso_catalog.SERVICE where MODEL_NAME = 'VID_DEFAULT'));
+
+INSERT INTO mso_catalog.SERVICE_RECIPE (ACTION, VERSION_STR, DESCRIPTION, ORCHESTRATION_URI, RECIPE_TIMEOUT, SERVICE_MODEL_UUID)
+VALUES ('deactivateInstance', '1.0', 'VID_DEFAULT deactivate', '/mso/async/services/DeactivateGenericMacroService', 180, (SELECT model_uuid from mso_catalog.SERVICE where MODEL_NAME = 'VID_DEFAULT'));
+
+INSERT INTO mso_catalog.VNF_RECIPE(VNF_TYPE, ACTION, VERSION_STR, DESCRIPTION, ORCHESTRATION_URI, RECIPE_TIMEOUT)
+VALUES ('VID_DEFAULT', 'updateInstance', '1', 'VID_DEFAULT update', '/mso/async/services/UpdateVnfInfra', 180);
+
+INSERT INTO mso_catalog.VNF_RECIPE(VNF_TYPE, ACTION, VERSION_STR, DESCRIPTION, ORCHESTRATION_URI, RECIPE_TIMEOUT)
+VALUES ('VID_DEFAULT', 'replaceInstance', '1', 'VID_DEFAULT replace', '/mso/async/services/ReplaceVnfInfra', 180);
+
+INSERT INTO mso_catalog.VNF_COMPONENTS_RECIPE(VNF_COMPONENT_TYPE, ACTION, VERSION, DESCRIPTION, ORCHESTRATION_URI, RECIPE_TIMEOUT, VF_MODULE_MODEL_UUID)
+VALUES ('vfModule', 'replaceInstance', '1', 'VID_DEFAULT vfModule replace', '/mso/async/services/ReplaceVfModuleInfra', 180, 'VID_DEFAULT');
+
+ALTER TABLE mso_requests.infra_active_requests modify LAST_MODIFIED_BY VARCHAR(100);
+
+SET SQL_MODE=@OLD_SQL_MODE;
+SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS;
+SET UNIQUE_CHECKS=@OLD_UNIQUE_CHECKS;
diff --git a/packages/root-pack-extras/config-resources/mysql/db-sql-scripts/upgrade/MariaDB_onap_mso_catalog_data_load_1710.46.1_to_1802.48.1.sql b/packages/root-pack-extras/config-resources/mysql/db-sql-scripts/upgrade/MariaDB_onap_mso_catalog_data_load_1710.46.1_to_1802.48.1.sql
index d15d254..d89795b 100644
--- a/packages/root-pack-extras/config-resources/mysql/db-sql-scripts/upgrade/MariaDB_onap_mso_catalog_data_load_1710.46.1_to_1802.48.1.sql
+++ b/packages/root-pack-extras/config-resources/mysql/db-sql-scripts/upgrade/MariaDB_onap_mso_catalog_data_load_1710.46.1_to_1802.48.1.sql
@@ -1,18 +1,18 @@
--- MSO-817 Insert new vnf_recipe records for "inPlaceSoftwareUpdate" and "applyUpdatedConfig" actions for VID_DEFAULT
--- -----------------------------------------------------------
-SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0;
-SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0;
-SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='TRADITIONAL,ALLOW_INVALID_DATES';
---
-
-INSERT INTO mso_catalog.VNF_RECIPE (
-    VNF_TYPE, ACTION, VERSION_STR, DESCRIPTION, ORCHESTRATION_URI, RECIPE_TIMEOUT
-) VALUES
-    ('VID_DEFAULT', 'inPlaceSoftwareUpdate', '1', 'VID_DEFAULT inPlaceSoftwareUpdate', '/mso/async/services/VnfInPlaceUpdate', 180),
-    ('VID_DEFAULT', 'applyUpdatedConfig', '1', 'VID_DEFAULT applyUpdatedConfig', '/mso/async/services/VnfConfigUpdate', 180);
-
---
-SET SQL_MODE=@OLD_SQL_MODE;
-SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS;
-SET UNIQUE_CHECKS=@OLD_UNIQUE_CHECKS;
+-- MSO-817 Insert new vnf_recipe records for "inPlaceSoftwareUpdate" and "applyUpdatedConfig" actions for VID_DEFAULT
+-- -----------------------------------------------------------
+SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0;
+SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0;
+SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='TRADITIONAL,ALLOW_INVALID_DATES';
+--
+
+INSERT INTO mso_catalog.VNF_RECIPE (
+    VNF_TYPE, ACTION, VERSION_STR, DESCRIPTION, ORCHESTRATION_URI, RECIPE_TIMEOUT
+) VALUES
+    ('VID_DEFAULT', 'inPlaceSoftwareUpdate', '1', 'VID_DEFAULT inPlaceSoftwareUpdate', '/mso/async/services/VnfInPlaceUpdate', 180),
+    ('VID_DEFAULT', 'applyUpdatedConfig', '1', 'VID_DEFAULT applyUpdatedConfig', '/mso/async/services/VnfConfigUpdate', 180);
+
+--
+SET SQL_MODE=@OLD_SQL_MODE;
+SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS;
+SET UNIQUE_CHECKS=@OLD_UNIQUE_CHECKS;
 --
\ No newline at end of file
diff --git a/packages/root-pack-extras/config-resources/mysql/db-sql-scripts/upgrade/MariaDB_onap_mso_catalog_schema_upgrade_1710.46.1_to_1802.48.1.sql b/packages/root-pack-extras/config-resources/mysql/db-sql-scripts/upgrade/MariaDB_onap_mso_catalog_schema_upgrade_1710.46.1_to_1802.48.1.sql
index 26650bc..ef6ec9e 100644
--- a/packages/root-pack-extras/config-resources/mysql/db-sql-scripts/upgrade/MariaDB_onap_mso_catalog_schema_upgrade_1710.46.1_to_1802.48.1.sql
+++ b/packages/root-pack-extras/config-resources/mysql/db-sql-scripts/upgrade/MariaDB_onap_mso_catalog_schema_upgrade_1710.46.1_to_1802.48.1.sql
@@ -1,22 +1,22 @@
--- MSO-1224 Add 2 new allottedResource columns in Catalog DB and return in catalog db adapter - AND -
--- MSO-670 To support new ACTION value of "inPlaceSoftwareUpdate"
--- increase ACTION column length to varchar(50) in all *_RECIPE tables in catalog db.
--- ------------------------------------------------------------- 
-SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0;
-SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0;
-SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='TRADITIONAL,ALLOW_INVALID_DATES';
---  
-    
-ALTER TABLE `mso_catalog`.`network_recipe`          CHANGE COLUMN `ACTION` `ACTION` VARCHAR(50) NOT NULL ;
-ALTER TABLE `mso_catalog`.`service_recipe`          CHANGE COLUMN `ACTION` `ACTION` VARCHAR(50) NOT NULL ;
-ALTER TABLE `mso_catalog`.`vnf_components_recipe`   CHANGE COLUMN `ACTION` `ACTION` VARCHAR(50) NOT NULL ;
-ALTER TABLE `mso_catalog`.`vnf_recipe`              CHANGE COLUMN `ACTION` `ACTION` VARCHAR(50) NOT NULL ;
-
-ALTER TABLE `mso_catalog`.`allotted_resource_customization`
-    ADD COLUMN `PROVIDING_SERVICE_MODEL_UUID` VARCHAR(200) NULL DEFAULT NULL AFTER `MODEL_INSTANCE_NAME`,
-    ADD COLUMN `PROVIDING_SERVICE_MODEL_NAME` VARCHAR(200) NULL DEFAULT NULL AFTER `PROVIDING_SERVICE_MODEL_INVARIANT_UUID`;
-
---
-SET SQL_MODE=@OLD_SQL_MODE;
-SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS;
+-- MSO-1224 Add 2 new allottedResource columns in Catalog DB and return in catalog db adapter - AND -
+-- MSO-670 To support new ACTION value of "inPlaceSoftwareUpdate"
+-- increase ACTION column length to varchar(50) in all *_RECIPE tables in catalog db.
+-- ------------------------------------------------------------- 
+SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0;
+SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0;
+SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='TRADITIONAL,ALLOW_INVALID_DATES';
+--  
+    
+ALTER TABLE `mso_catalog`.`network_recipe`          CHANGE COLUMN `ACTION` `ACTION` VARCHAR(50) NOT NULL ;
+ALTER TABLE `mso_catalog`.`service_recipe`          CHANGE COLUMN `ACTION` `ACTION` VARCHAR(50) NOT NULL ;
+ALTER TABLE `mso_catalog`.`vnf_components_recipe`   CHANGE COLUMN `ACTION` `ACTION` VARCHAR(50) NOT NULL ;
+ALTER TABLE `mso_catalog`.`vnf_recipe`              CHANGE COLUMN `ACTION` `ACTION` VARCHAR(50) NOT NULL ;
+
+ALTER TABLE `mso_catalog`.`allotted_resource_customization`
+    ADD COLUMN `PROVIDING_SERVICE_MODEL_UUID` VARCHAR(200) NULL DEFAULT NULL AFTER `MODEL_INSTANCE_NAME`,
+    ADD COLUMN `PROVIDING_SERVICE_MODEL_NAME` VARCHAR(200) NULL DEFAULT NULL AFTER `PROVIDING_SERVICE_MODEL_INVARIANT_UUID`;
+
+--
+SET SQL_MODE=@OLD_SQL_MODE;
+SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS;
 SET UNIQUE_CHECKS=@OLD_UNIQUE_CHECKS;
\ No newline at end of file
diff --git a/packages/root-pack-extras/config-resources/mysql/db-sql-scripts/upgrade/MariaDB_onap_mso_requests_schema_upgrade_1710.46.1_to_1802.48.1.sql b/packages/root-pack-extras/config-resources/mysql/db-sql-scripts/upgrade/MariaDB_onap_mso_requests_schema_upgrade_1710.46.1_to_1802.48.1.sql
index 6ac3fdf..a467fba 100644
--- a/packages/root-pack-extras/config-resources/mysql/db-sql-scripts/upgrade/MariaDB_onap_mso_requests_schema_upgrade_1710.46.1_to_1802.48.1.sql
+++ b/packages/root-pack-extras/config-resources/mysql/db-sql-scripts/upgrade/MariaDB_onap_mso_requests_schema_upgrade_1710.46.1_to_1802.48.1.sql
@@ -1,100 +1,100 @@
--- MSO-816 mso_requests DB changes to support tenant isolation
--- -----------------------------------------------------------
-SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0;
-SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0;
-SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='TRADITIONAL,ALLOW_INVALID_DATES';
---
-
-ALTER TABLE `mso_requests`.`infra_active_requests`
-   ADD COLUMN `OPERATIONAL_ENV_ID` VARCHAR(45) NULL DEFAULT NULL AFTER `CONFIGURATION_NAME`,
-   ADD COLUMN `OPERATIONAL_ENV_NAME` VARCHAR(200) NULL DEFAULT NULL AFTER `OPERATIONAL_ENV_ID`,
-   CHANGE COLUMN `REQUEST_SCOPE` `REQUEST_SCOPE` VARCHAR(50) NOT NULL;
-
---
-
-DROP TABLE IF EXISTS `mso_requests`.`activate_operational_env_per_distributionid_status`;
-DROP TABLE IF EXISTS `mso_requests`.`activate_operational_env_service_model_distribution_status`;
-DROP TABLE IF EXISTS `mso_requests`.`watchdog_distributionid_status`;
-DROP TABLE IF EXISTS `mso_requests`.`watchdog_per_component_distribution_status`;
-DROP TABLE IF EXISTS `mso_requests`.`watchdog_service_mod_ver_id_lookup`;
-
--- -----------------------------------------------------
--- Table `mso_requests`.`activate_operational_env_service_model_distribution_status`
--- -----------------------------------------------------
-CREATE TABLE `mso_requests`.`activate_operational_env_service_model_distribution_status` (
-  `OPERATIONAL_ENV_ID` VARCHAR(45) NOT NULL,
-  `SERVICE_MODEL_VERSION_ID` VARCHAR(45) NOT NULL,
-  `REQUEST_ID` VARCHAR(45) NOT NULL,
-  `SERVICE_MOD_VER_FINAL_DISTR_STATUS` VARCHAR(45) NULL,
-  `RECOVERY_ACTION` VARCHAR(30) NULL,
-  `RETRY_COUNT_LEFT` INT(11) NULL,
-  `WORKLOAD_CONTEXT` VARCHAR(80) NOT NULL,
-  `CREATE_TIME` DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP,
-  `MODIFY_TIME` DATETIME NULL DEFAULT NULL ON UPDATE CURRENT_TIMESTAMP,
-  PRIMARY KEY (`OPERATIONAL_ENV_ID`, `SERVICE_MODEL_VERSION_ID`, `REQUEST_ID`))
-ENGINE = InnoDB;
-
--- -----------------------------------------------------
--- Table `mso_requests`.`activate_operational_env_per_distributionid_status`
--- -----------------------------------------------------
-CREATE TABLE `mso_requests`.`activate_operational_env_per_distributionid_status` (
-  `DISTRIBUTION_ID` VARCHAR(45) NOT NULL,
-  `DISTRIBUTION_ID_STATUS` VARCHAR(45) NULL,
-  `DISTRIBUTION_ID_ERROR_REASON` VARCHAR(250) NULL,
-  `CREATE_TIME` DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP,
-  `MODIFY_TIME` DATETIME NULL DEFAULT NULL ON UPDATE CURRENT_TIMESTAMP,
-  `OPERATIONAL_ENV_ID` VARCHAR(45) NOT NULL,
-  `SERVICE_MODEL_VERSION_ID` VARCHAR(45) NOT NULL,
-  `REQUEST_ID` VARCHAR(45) NOT NULL,
-  PRIMARY KEY (`DISTRIBUTION_ID`),
-  INDEX `fk_activate_op_env_per_distributionid_status__aoesmds1_idx` (`OPERATIONAL_ENV_ID` ASC, `SERVICE_MODEL_VERSION_ID` ASC, `REQUEST_ID` ASC),
-  CONSTRAINT `fk_activate_op_env_per_distributionid_status__aoesmds1`
-    FOREIGN KEY (`OPERATIONAL_ENV_ID` , `SERVICE_MODEL_VERSION_ID` , `REQUEST_ID`)
-    REFERENCES `mso_requests`.`activate_operational_env_service_model_distribution_status` (`OPERATIONAL_ENV_ID` , `SERVICE_MODEL_VERSION_ID` , `REQUEST_ID`)
-    ON DELETE CASCADE
-    ON UPDATE CASCADE)
-ENGINE = InnoDB; 
-
--- -----------------------------------------------------
--- Table `mso_requests`.`watchdog_distributionid_status`
--- -----------------------------------------------------
-CREATE TABLE `mso_requests`.`watchdog_distributionid_status` (
-  `DISTRIBUTION_ID` VARCHAR(45) NOT NULL,
-  `DISTRIBUTION_ID_STATUS` VARCHAR(45) NULL,
-  `CREATE_TIME` DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP,
-  `MODIFY_TIME` DATETIME NULL DEFAULT NULL ON UPDATE CURRENT_TIMESTAMP,
-  PRIMARY KEY (`DISTRIBUTION_ID`))
-ENGINE = InnoDB; 
-
--- -----------------------------------------------------
--- Table `mso_requests`.`watchdog_per_component_distribution_status`
--- -----------------------------------------------------
-CREATE TABLE `mso_requests`.`watchdog_per_component_distribution_status` (
-  `DISTRIBUTION_ID` VARCHAR(45) NOT NULL,
-  `COMPONENT_NAME` VARCHAR(45) NOT NULL,
-  `COMPONENT_DISTRIBUTION_STATUS` VARCHAR(45) NULL,
-  `CREATE_TIME` DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP,
-  `MODIFY_TIME` DATETIME NULL DEFAULT NULL ON UPDATE CURRENT_TIMESTAMP,
-  PRIMARY KEY (`DISTRIBUTION_ID`, `COMPONENT_NAME`),
-  CONSTRAINT `fk_watchdog_component_distribution_status_watchdog_distributi1`
-    FOREIGN KEY (`DISTRIBUTION_ID`)
-    REFERENCES `mso_requests`.`watchdog_distributionid_status` (`DISTRIBUTION_ID`)
-    ON DELETE CASCADE
-    ON UPDATE CASCADE)
-ENGINE = InnoDB; 
-
--- -----------------------------------------------------
--- Table `mso_requests`.`watchdog_service_mod_ver_id_lookup`
--- -----------------------------------------------------
-CREATE TABLE `mso_requests`.`watchdog_service_mod_ver_id_lookup` (
-  `DISTRIBUTION_ID` VARCHAR(45) NOT NULL,
-  `SERVICE_MODEL_VERSION_ID` VARCHAR(45) NOT NULL,
-  `CREATE_TIME` DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP,
-  PRIMARY KEY (`DISTRIBUTION_ID`))
-ENGINE = InnoDB; 
-
---
-SET SQL_MODE=@OLD_SQL_MODE;
-SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS;
-SET UNIQUE_CHECKS=@OLD_UNIQUE_CHECKS;
+-- MSO-816 mso_requests DB changes to support tenant isolation
+-- -----------------------------------------------------------
+SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0;
+SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0;
+SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='TRADITIONAL,ALLOW_INVALID_DATES';
+--
+
+ALTER TABLE `mso_requests`.`infra_active_requests`
+   ADD COLUMN `OPERATIONAL_ENV_ID` VARCHAR(45) NULL DEFAULT NULL AFTER `CONFIGURATION_NAME`,
+   ADD COLUMN `OPERATIONAL_ENV_NAME` VARCHAR(200) NULL DEFAULT NULL AFTER `OPERATIONAL_ENV_ID`,
+   CHANGE COLUMN `REQUEST_SCOPE` `REQUEST_SCOPE` VARCHAR(50) NOT NULL;
+
+--
+
+DROP TABLE IF EXISTS `mso_requests`.`activate_operational_env_per_distributionid_status`;
+DROP TABLE IF EXISTS `mso_requests`.`activate_operational_env_service_model_distribution_status`;
+DROP TABLE IF EXISTS `mso_requests`.`watchdog_distributionid_status`;
+DROP TABLE IF EXISTS `mso_requests`.`watchdog_per_component_distribution_status`;
+DROP TABLE IF EXISTS `mso_requests`.`watchdog_service_mod_ver_id_lookup`;
+
+-- -----------------------------------------------------
+-- Table `mso_requests`.`activate_operational_env_service_model_distribution_status`
+-- -----------------------------------------------------
+CREATE TABLE `mso_requests`.`activate_operational_env_service_model_distribution_status` (
+  `OPERATIONAL_ENV_ID` VARCHAR(45) NOT NULL,
+  `SERVICE_MODEL_VERSION_ID` VARCHAR(45) NOT NULL,
+  `REQUEST_ID` VARCHAR(45) NOT NULL,
+  `SERVICE_MOD_VER_FINAL_DISTR_STATUS` VARCHAR(45) NULL,
+  `RECOVERY_ACTION` VARCHAR(30) NULL,
+  `RETRY_COUNT_LEFT` INT(11) NULL,
+  `WORKLOAD_CONTEXT` VARCHAR(80) NOT NULL,
+  `CREATE_TIME` DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP,
+  `MODIFY_TIME` DATETIME NULL DEFAULT NULL ON UPDATE CURRENT_TIMESTAMP,
+  PRIMARY KEY (`OPERATIONAL_ENV_ID`, `SERVICE_MODEL_VERSION_ID`, `REQUEST_ID`))
+ENGINE = InnoDB;
+
+-- -----------------------------------------------------
+-- Table `mso_requests`.`activate_operational_env_per_distributionid_status`
+-- -----------------------------------------------------
+CREATE TABLE `mso_requests`.`activate_operational_env_per_distributionid_status` (
+  `DISTRIBUTION_ID` VARCHAR(45) NOT NULL,
+  `DISTRIBUTION_ID_STATUS` VARCHAR(45) NULL,
+  `DISTRIBUTION_ID_ERROR_REASON` VARCHAR(250) NULL,
+  `CREATE_TIME` DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP,
+  `MODIFY_TIME` DATETIME NULL DEFAULT NULL ON UPDATE CURRENT_TIMESTAMP,
+  `OPERATIONAL_ENV_ID` VARCHAR(45) NOT NULL,
+  `SERVICE_MODEL_VERSION_ID` VARCHAR(45) NOT NULL,
+  `REQUEST_ID` VARCHAR(45) NOT NULL,
+  PRIMARY KEY (`DISTRIBUTION_ID`),
+  INDEX `fk_activate_op_env_per_distributionid_status__aoesmds1_idx` (`OPERATIONAL_ENV_ID` ASC, `SERVICE_MODEL_VERSION_ID` ASC, `REQUEST_ID` ASC),
+  CONSTRAINT `fk_activate_op_env_per_distributionid_status__aoesmds1`
+    FOREIGN KEY (`OPERATIONAL_ENV_ID` , `SERVICE_MODEL_VERSION_ID` , `REQUEST_ID`)
+    REFERENCES `mso_requests`.`activate_operational_env_service_model_distribution_status` (`OPERATIONAL_ENV_ID` , `SERVICE_MODEL_VERSION_ID` , `REQUEST_ID`)
+    ON DELETE CASCADE
+    ON UPDATE CASCADE)
+ENGINE = InnoDB; 
+
+-- -----------------------------------------------------
+-- Table `mso_requests`.`watchdog_distributionid_status`
+-- -----------------------------------------------------
+CREATE TABLE `mso_requests`.`watchdog_distributionid_status` (
+  `DISTRIBUTION_ID` VARCHAR(45) NOT NULL,
+  `DISTRIBUTION_ID_STATUS` VARCHAR(45) NULL,
+  `CREATE_TIME` DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP,
+  `MODIFY_TIME` DATETIME NULL DEFAULT NULL ON UPDATE CURRENT_TIMESTAMP,
+  PRIMARY KEY (`DISTRIBUTION_ID`))
+ENGINE = InnoDB; 
+
+-- -----------------------------------------------------
+-- Table `mso_requests`.`watchdog_per_component_distribution_status`
+-- -----------------------------------------------------
+CREATE TABLE `mso_requests`.`watchdog_per_component_distribution_status` (
+  `DISTRIBUTION_ID` VARCHAR(45) NOT NULL,
+  `COMPONENT_NAME` VARCHAR(45) NOT NULL,
+  `COMPONENT_DISTRIBUTION_STATUS` VARCHAR(45) NULL,
+  `CREATE_TIME` DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP,
+  `MODIFY_TIME` DATETIME NULL DEFAULT NULL ON UPDATE CURRENT_TIMESTAMP,
+  PRIMARY KEY (`DISTRIBUTION_ID`, `COMPONENT_NAME`),
+  CONSTRAINT `fk_watchdog_component_distribution_status_watchdog_distributi1`
+    FOREIGN KEY (`DISTRIBUTION_ID`)
+    REFERENCES `mso_requests`.`watchdog_distributionid_status` (`DISTRIBUTION_ID`)
+    ON DELETE CASCADE
+    ON UPDATE CASCADE)
+ENGINE = InnoDB; 
+
+-- -----------------------------------------------------
+-- Table `mso_requests`.`watchdog_service_mod_ver_id_lookup`
+-- -----------------------------------------------------
+CREATE TABLE `mso_requests`.`watchdog_service_mod_ver_id_lookup` (
+  `DISTRIBUTION_ID` VARCHAR(45) NOT NULL,
+  `SERVICE_MODEL_VERSION_ID` VARCHAR(45) NOT NULL,
+  `CREATE_TIME` DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP,
+  PRIMARY KEY (`DISTRIBUTION_ID`))
+ENGINE = InnoDB; 
+
+--
+SET SQL_MODE=@OLD_SQL_MODE;
+SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS;
+SET UNIQUE_CHECKS=@OLD_UNIQUE_CHECKS;
 --
\ No newline at end of file