Changes directory structure of S3P Tests
Changes Include:
a) Moving performance and stability tests into two separate directories.
Change-Id: Ib98713b2c37658de16c5eb6ee8918b867bdf5b8a
Issue-ID: POLICY-1462
Signed-off-by: Bilal A <bilal@research.att.com>
diff --git a/pom.xml b/pom.xml
index acd7337..f29e342 100644
--- a/pom.xml
+++ b/pom.xml
@@ -59,6 +59,7 @@
<module>forwarding</module>
<module>plugins</module>
<module>packages</module>
+ <module>testsuites</module>
</modules>
<dependencies>
diff --git a/testsuites/performance/pom.xml b/testsuites/performance/pom.xml
new file mode 100644
index 0000000..57e9bd8
--- /dev/null
+++ b/testsuites/performance/pom.xml
@@ -0,0 +1,50 @@
+<!--
+ ============LICENSE_START=======================================================
+ ONAP Policy Distribution
+ ================================================================================
+ Copyright (C) 2019 AT&T Intellectual Property. All rights reserved.
+ ================================================================================
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ ============LICENSE_END=========================================================
+ -->
+<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.policy.distribution</groupId>
+ <artifactId>testsuites</artifactId>
+ <version>2.1.0-SNAPSHOT</version>
+ </parent>
+ <artifactId>performance</artifactId>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>create-distribution</id>
+ <phase>package</phase>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ <configuration>
+ <descriptors>
+ <descriptor>src/assembly/assembly.xml</descriptor>
+ </descriptors>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+</project>
\ No newline at end of file
diff --git a/testsuites/performance/src/assembly/assembly.xml b/testsuites/performance/src/assembly/assembly.xml
new file mode 100644
index 0000000..7ff8550
--- /dev/null
+++ b/testsuites/performance/src/assembly/assembly.xml
@@ -0,0 +1,42 @@
+<!--
+ ============LICENSE_START=======================================================
+ ONAP Policy Distribution Stability
+ ================================================================================
+ Copyright (C) 2019 AT&T Intellectual Property. All rights reserved.
+ ================================================================================
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ ============LICENSE_END=========================================================
+ -->
+<assembly
+ xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0 http://maven.apache.org/xsd/assembly-1.1.0.xsd">
+ <id>performance</id>
+ <formats>
+ <format>zip</format>
+ </formats>
+ <baseDirectory>/policy-distribution/performance</baseDirectory>
+ <fileSets>
+ <fileSet>
+ <directory>${project.basedir}/src/main/resources/testplans/</directory>
+ <outputDirectory>tests/testplans</outputDirectory>
+ <!-- <includes>
+ <include>*.jmx</include>
+ <include>*.sh</include>
+ </includes> -->
+ <lineEnding>unix</lineEnding>
+ <fileMode>0644</fileMode>
+ <filtered>true</filtered>
+ </fileSet>
+ </fileSets>
+</assembly>
diff --git a/s3p/README.perf.md b/testsuites/performance/src/main/resources/testplans/README.perf.md
similarity index 100%
rename from s3p/README.perf.md
rename to testsuites/performance/src/main/resources/testplans/README.perf.md
diff --git a/s3p/clean_policy.sh b/testsuites/performance/src/main/resources/testplans/clean_policy.sh
similarity index 100%
rename from s3p/clean_policy.sh
rename to testsuites/performance/src/main/resources/testplans/clean_policy.sh
diff --git a/s3p/generate.sh b/testsuites/performance/src/main/resources/testplans/generate.sh
similarity index 100%
rename from s3p/generate.sh
rename to testsuites/performance/src/main/resources/testplans/generate.sh
diff --git a/s3p/generate_perf.py b/testsuites/performance/src/main/resources/testplans/generate_perf.py
similarity index 100%
rename from s3p/generate_perf.py
rename to testsuites/performance/src/main/resources/testplans/generate_perf.py
diff --git a/s3p/generate_perf.sh b/testsuites/performance/src/main/resources/testplans/generate_perf.sh
similarity index 100%
rename from s3p/generate_perf.sh
rename to testsuites/performance/src/main/resources/testplans/generate_perf.sh
diff --git a/s3p/list_failed_policy.sh b/testsuites/performance/src/main/resources/testplans/list_failed_policy.sh
similarity index 100%
rename from s3p/list_failed_policy.sh
rename to testsuites/performance/src/main/resources/testplans/list_failed_policy.sh
diff --git a/s3p/perf.jmx b/testsuites/performance/src/main/resources/testplans/perf.jmx
similarity index 100%
rename from s3p/perf.jmx
rename to testsuites/performance/src/main/resources/testplans/perf.jmx
diff --git a/s3p/templates/interfaceType/Artifacts/org.openecomp.resource.vf.Vgw1181049_v1.0/Deployment/OTHER/authorized_keys b/testsuites/performance/src/main/resources/testplans/templates/interfaceType/Artifacts/org.openecomp.resource.vf.Vgw1181049_v1.0/Deployment/OTHER/authorized_keys
similarity index 100%
rename from s3p/templates/interfaceType/Artifacts/org.openecomp.resource.vf.Vgw1181049_v1.0/Deployment/OTHER/authorized_keys
rename to testsuites/performance/src/main/resources/testplans/templates/interfaceType/Artifacts/org.openecomp.resource.vf.Vgw1181049_v1.0/Deployment/OTHER/authorized_keys
diff --git a/s3p/templates/interfaceType/Artifacts/org.openecomp.resource.vf.Vgw1181049_v1.0/Deployment/OTHER/id_rsa b/testsuites/performance/src/main/resources/testplans/templates/interfaceType/Artifacts/org.openecomp.resource.vf.Vgw1181049_v1.0/Deployment/OTHER/id_rsa
similarity index 100%
rename from s3p/templates/interfaceType/Artifacts/org.openecomp.resource.vf.Vgw1181049_v1.0/Deployment/OTHER/id_rsa
rename to testsuites/performance/src/main/resources/testplans/templates/interfaceType/Artifacts/org.openecomp.resource.vf.Vgw1181049_v1.0/Deployment/OTHER/id_rsa
diff --git a/s3p/templates/interfaceType/Artifacts/org.openecomp.resource.vf.Vgw1181049_v1.0/Deployment/OTHER/id_rsa.pub b/testsuites/performance/src/main/resources/testplans/templates/interfaceType/Artifacts/org.openecomp.resource.vf.Vgw1181049_v1.0/Deployment/OTHER/id_rsa.pub
similarity index 100%
rename from s3p/templates/interfaceType/Artifacts/org.openecomp.resource.vf.Vgw1181049_v1.0/Deployment/OTHER/id_rsa.pub
rename to testsuites/performance/src/main/resources/testplans/templates/interfaceType/Artifacts/org.openecomp.resource.vf.Vgw1181049_v1.0/Deployment/OTHER/id_rsa.pub
diff --git a/s3p/templates/interfaceType/Artifacts/org.openecomp.resource.vf.Vgw1181049_v1.0/Deployment/OTHER/image b/testsuites/performance/src/main/resources/testplans/templates/interfaceType/Artifacts/org.openecomp.resource.vf.Vgw1181049_v1.0/Deployment/OTHER/image
similarity index 100%
rename from s3p/templates/interfaceType/Artifacts/org.openecomp.resource.vf.Vgw1181049_v1.0/Deployment/OTHER/image
rename to testsuites/performance/src/main/resources/testplans/templates/interfaceType/Artifacts/org.openecomp.resource.vf.Vgw1181049_v1.0/Deployment/OTHER/image
diff --git a/s3p/templates/interfaceType/Artifacts/org.openecomp.resource.vf.Vgw1181049_v1.0/Deployment/VENDOR_LICENSE/vendor-license-model.xml b/testsuites/performance/src/main/resources/testplans/templates/interfaceType/Artifacts/org.openecomp.resource.vf.Vgw1181049_v1.0/Deployment/VENDOR_LICENSE/vendor-license-model.xml
similarity index 100%
rename from s3p/templates/interfaceType/Artifacts/org.openecomp.resource.vf.Vgw1181049_v1.0/Deployment/VENDOR_LICENSE/vendor-license-model.xml
rename to testsuites/performance/src/main/resources/testplans/templates/interfaceType/Artifacts/org.openecomp.resource.vf.Vgw1181049_v1.0/Deployment/VENDOR_LICENSE/vendor-license-model.xml
diff --git a/s3p/templates/interfaceType/Artifacts/org.openecomp.resource.vf.Vgw1181049_v1.0/Deployment/VF_LICENSE/vf-license-model.xml b/testsuites/performance/src/main/resources/testplans/templates/interfaceType/Artifacts/org.openecomp.resource.vf.Vgw1181049_v1.0/Deployment/VF_LICENSE/vf-license-model.xml
similarity index 100%
rename from s3p/templates/interfaceType/Artifacts/org.openecomp.resource.vf.Vgw1181049_v1.0/Deployment/VF_LICENSE/vf-license-model.xml
rename to testsuites/performance/src/main/resources/testplans/templates/interfaceType/Artifacts/org.openecomp.resource.vf.Vgw1181049_v1.0/Deployment/VF_LICENSE/vf-license-model.xml
diff --git a/s3p/templates/interfaceType/Definitions/annotations.yml b/testsuites/performance/src/main/resources/testplans/templates/interfaceType/Definitions/annotations.yml
similarity index 100%
rename from s3p/templates/interfaceType/Definitions/annotations.yml
rename to testsuites/performance/src/main/resources/testplans/templates/interfaceType/Definitions/annotations.yml
diff --git a/s3p/templates/interfaceType/Definitions/artifacts.yml b/testsuites/performance/src/main/resources/testplans/templates/interfaceType/Definitions/artifacts.yml
similarity index 100%
rename from s3p/templates/interfaceType/Definitions/artifacts.yml
rename to testsuites/performance/src/main/resources/testplans/templates/interfaceType/Definitions/artifacts.yml
diff --git a/s3p/templates/interfaceType/Definitions/capabilities.yml b/testsuites/performance/src/main/resources/testplans/templates/interfaceType/Definitions/capabilities.yml
similarity index 100%
rename from s3p/templates/interfaceType/Definitions/capabilities.yml
rename to testsuites/performance/src/main/resources/testplans/templates/interfaceType/Definitions/capabilities.yml
diff --git a/s3p/templates/interfaceType/Definitions/data.yml b/testsuites/performance/src/main/resources/testplans/templates/interfaceType/Definitions/data.yml
similarity index 100%
rename from s3p/templates/interfaceType/Definitions/data.yml
rename to testsuites/performance/src/main/resources/testplans/templates/interfaceType/Definitions/data.yml
diff --git a/s3p/templates/interfaceType/Definitions/groups.yml b/testsuites/performance/src/main/resources/testplans/templates/interfaceType/Definitions/groups.yml
similarity index 100%
rename from s3p/templates/interfaceType/Definitions/groups.yml
rename to testsuites/performance/src/main/resources/testplans/templates/interfaceType/Definitions/groups.yml
diff --git a/s3p/templates/interfaceType/Definitions/interfaces.yml b/testsuites/performance/src/main/resources/testplans/templates/interfaceType/Definitions/interfaces.yml
similarity index 100%
rename from s3p/templates/interfaceType/Definitions/interfaces.yml
rename to testsuites/performance/src/main/resources/testplans/templates/interfaceType/Definitions/interfaces.yml
diff --git a/s3p/templates/interfaceType/Definitions/nodes.yml b/testsuites/performance/src/main/resources/testplans/templates/interfaceType/Definitions/nodes.yml
similarity index 100%
rename from s3p/templates/interfaceType/Definitions/nodes.yml
rename to testsuites/performance/src/main/resources/testplans/templates/interfaceType/Definitions/nodes.yml
diff --git a/s3p/templates/interfaceType/Definitions/policies.yml b/testsuites/performance/src/main/resources/testplans/templates/interfaceType/Definitions/policies.yml
similarity index 100%
rename from s3p/templates/interfaceType/Definitions/policies.yml
rename to testsuites/performance/src/main/resources/testplans/templates/interfaceType/Definitions/policies.yml
diff --git a/s3p/templates/interfaceType/Definitions/relationships.yml b/testsuites/performance/src/main/resources/testplans/templates/interfaceType/Definitions/relationships.yml
similarity index 100%
rename from s3p/templates/interfaceType/Definitions/relationships.yml
rename to testsuites/performance/src/main/resources/testplans/templates/interfaceType/Definitions/relationships.yml
diff --git a/s3p/templates/interfaceType/Definitions/resource-VduCompute-template.yml b/testsuites/performance/src/main/resources/testplans/templates/interfaceType/Definitions/resource-VduCompute-template.yml
similarity index 100%
rename from s3p/templates/interfaceType/Definitions/resource-VduCompute-template.yml
rename to testsuites/performance/src/main/resources/testplans/templates/interfaceType/Definitions/resource-VduCompute-template.yml
diff --git a/s3p/templates/interfaceType/Definitions/resource-VduCp-template.yml b/testsuites/performance/src/main/resources/testplans/templates/interfaceType/Definitions/resource-VduCp-template.yml
similarity index 100%
rename from s3p/templates/interfaceType/Definitions/resource-VduCp-template.yml
rename to testsuites/performance/src/main/resources/testplans/templates/interfaceType/Definitions/resource-VduCp-template.yml
diff --git a/s3p/templates/interfaceType/Definitions/resource-VduVirtualstorage-template.yml b/testsuites/performance/src/main/resources/testplans/templates/interfaceType/Definitions/resource-VduVirtualstorage-template.yml
similarity index 100%
rename from s3p/templates/interfaceType/Definitions/resource-VduVirtualstorage-template.yml
rename to testsuites/performance/src/main/resources/testplans/templates/interfaceType/Definitions/resource-VduVirtualstorage-template.yml
diff --git a/s3p/templates/interfaceType/Definitions/resource-Vgw1181049-template-interface.yml b/testsuites/performance/src/main/resources/testplans/templates/interfaceType/Definitions/resource-Vgw1181049-template-interface.yml
similarity index 100%
rename from s3p/templates/interfaceType/Definitions/resource-Vgw1181049-template-interface.yml
rename to testsuites/performance/src/main/resources/testplans/templates/interfaceType/Definitions/resource-Vgw1181049-template-interface.yml
diff --git a/s3p/templates/interfaceType/Definitions/resource-Vgw1181049-template.yml b/testsuites/performance/src/main/resources/testplans/templates/interfaceType/Definitions/resource-Vgw1181049-template.yml
similarity index 100%
rename from s3p/templates/interfaceType/Definitions/resource-Vgw1181049-template.yml
rename to testsuites/performance/src/main/resources/testplans/templates/interfaceType/Definitions/resource-Vgw1181049-template.yml
diff --git a/s3p/templates/interfaceType/Definitions/resource-Vnf-template.yml b/testsuites/performance/src/main/resources/testplans/templates/interfaceType/Definitions/resource-Vnf-template.yml
similarity index 100%
rename from s3p/templates/interfaceType/Definitions/resource-Vnf-template.yml
rename to testsuites/performance/src/main/resources/testplans/templates/interfaceType/Definitions/resource-Vnf-template.yml
diff --git a/s3p/templates/interfaceType/Definitions/resource-Vnfvirtuallink-template.yml b/testsuites/performance/src/main/resources/testplans/templates/interfaceType/Definitions/resource-Vnfvirtuallink-template.yml
similarity index 100%
rename from s3p/templates/interfaceType/Definitions/resource-Vnfvirtuallink-template.yml
rename to testsuites/performance/src/main/resources/testplans/templates/interfaceType/Definitions/resource-Vnfvirtuallink-template.yml
diff --git a/s3p/templates/interfaceType/Definitions/service-Testns8-template-interface.yml b/testsuites/performance/src/main/resources/testplans/templates/interfaceType/Definitions/service-Testns8-template-interface.yml
similarity index 100%
rename from s3p/templates/interfaceType/Definitions/service-Testns8-template-interface.yml
rename to testsuites/performance/src/main/resources/testplans/templates/interfaceType/Definitions/service-Testns8-template-interface.yml
diff --git a/s3p/templates/interfaceType/Definitions/service-Testns8-template.yml b/testsuites/performance/src/main/resources/testplans/templates/interfaceType/Definitions/service-Testns8-template.yml
similarity index 100%
rename from s3p/templates/interfaceType/Definitions/service-Testns8-template.yml
rename to testsuites/performance/src/main/resources/testplans/templates/interfaceType/Definitions/service-Testns8-template.yml
diff --git a/s3p/templates/interfaceType/TOSCA-Metadata/TOSCA.meta b/testsuites/performance/src/main/resources/testplans/templates/interfaceType/TOSCA-Metadata/TOSCA.meta
similarity index 100%
copy from s3p/templates/interfaceType/TOSCA-Metadata/TOSCA.meta
copy to testsuites/performance/src/main/resources/testplans/templates/interfaceType/TOSCA-Metadata/TOSCA.meta
diff --git a/s3p/templates/interfaceType/csar.meta b/testsuites/performance/src/main/resources/testplans/templates/interfaceType/csar.meta
similarity index 100%
rename from s3p/templates/interfaceType/csar.meta
rename to testsuites/performance/src/main/resources/testplans/templates/interfaceType/csar.meta
diff --git a/s3p/templates/memoryPageSize/Artifacts/org.openecomp.resource.vf.Vgw1181049_v1.0/Deployment/OTHER/authorized_keys b/testsuites/performance/src/main/resources/testplans/templates/memoryPageSize/Artifacts/org.openecomp.resource.vf.Vgw1181049_v1.0/Deployment/OTHER/authorized_keys
similarity index 100%
rename from s3p/templates/memoryPageSize/Artifacts/org.openecomp.resource.vf.Vgw1181049_v1.0/Deployment/OTHER/authorized_keys
rename to testsuites/performance/src/main/resources/testplans/templates/memoryPageSize/Artifacts/org.openecomp.resource.vf.Vgw1181049_v1.0/Deployment/OTHER/authorized_keys
diff --git a/s3p/templates/memoryPageSize/Artifacts/org.openecomp.resource.vf.Vgw1181049_v1.0/Deployment/OTHER/id_rsa b/testsuites/performance/src/main/resources/testplans/templates/memoryPageSize/Artifacts/org.openecomp.resource.vf.Vgw1181049_v1.0/Deployment/OTHER/id_rsa
similarity index 100%
rename from s3p/templates/memoryPageSize/Artifacts/org.openecomp.resource.vf.Vgw1181049_v1.0/Deployment/OTHER/id_rsa
rename to testsuites/performance/src/main/resources/testplans/templates/memoryPageSize/Artifacts/org.openecomp.resource.vf.Vgw1181049_v1.0/Deployment/OTHER/id_rsa
diff --git a/s3p/templates/memoryPageSize/Artifacts/org.openecomp.resource.vf.Vgw1181049_v1.0/Deployment/OTHER/id_rsa.pub b/testsuites/performance/src/main/resources/testplans/templates/memoryPageSize/Artifacts/org.openecomp.resource.vf.Vgw1181049_v1.0/Deployment/OTHER/id_rsa.pub
similarity index 100%
rename from s3p/templates/memoryPageSize/Artifacts/org.openecomp.resource.vf.Vgw1181049_v1.0/Deployment/OTHER/id_rsa.pub
rename to testsuites/performance/src/main/resources/testplans/templates/memoryPageSize/Artifacts/org.openecomp.resource.vf.Vgw1181049_v1.0/Deployment/OTHER/id_rsa.pub
diff --git a/s3p/templates/memoryPageSize/Artifacts/org.openecomp.resource.vf.Vgw1181049_v1.0/Deployment/OTHER/image b/testsuites/performance/src/main/resources/testplans/templates/memoryPageSize/Artifacts/org.openecomp.resource.vf.Vgw1181049_v1.0/Deployment/OTHER/image
similarity index 100%
rename from s3p/templates/memoryPageSize/Artifacts/org.openecomp.resource.vf.Vgw1181049_v1.0/Deployment/OTHER/image
rename to testsuites/performance/src/main/resources/testplans/templates/memoryPageSize/Artifacts/org.openecomp.resource.vf.Vgw1181049_v1.0/Deployment/OTHER/image
diff --git a/s3p/templates/memoryPageSize/Artifacts/org.openecomp.resource.vf.Vgw1181049_v1.0/Deployment/VENDOR_LICENSE/vendor-license-model.xml b/testsuites/performance/src/main/resources/testplans/templates/memoryPageSize/Artifacts/org.openecomp.resource.vf.Vgw1181049_v1.0/Deployment/VENDOR_LICENSE/vendor-license-model.xml
similarity index 100%
rename from s3p/templates/memoryPageSize/Artifacts/org.openecomp.resource.vf.Vgw1181049_v1.0/Deployment/VENDOR_LICENSE/vendor-license-model.xml
rename to testsuites/performance/src/main/resources/testplans/templates/memoryPageSize/Artifacts/org.openecomp.resource.vf.Vgw1181049_v1.0/Deployment/VENDOR_LICENSE/vendor-license-model.xml
diff --git a/s3p/templates/memoryPageSize/Artifacts/org.openecomp.resource.vf.Vgw1181049_v1.0/Deployment/VF_LICENSE/vf-license-model.xml b/testsuites/performance/src/main/resources/testplans/templates/memoryPageSize/Artifacts/org.openecomp.resource.vf.Vgw1181049_v1.0/Deployment/VF_LICENSE/vf-license-model.xml
similarity index 100%
rename from s3p/templates/memoryPageSize/Artifacts/org.openecomp.resource.vf.Vgw1181049_v1.0/Deployment/VF_LICENSE/vf-license-model.xml
rename to testsuites/performance/src/main/resources/testplans/templates/memoryPageSize/Artifacts/org.openecomp.resource.vf.Vgw1181049_v1.0/Deployment/VF_LICENSE/vf-license-model.xml
diff --git a/s3p/templates/memoryPageSize/Definitions/annotations.yml b/testsuites/performance/src/main/resources/testplans/templates/memoryPageSize/Definitions/annotations.yml
similarity index 100%
rename from s3p/templates/memoryPageSize/Definitions/annotations.yml
rename to testsuites/performance/src/main/resources/testplans/templates/memoryPageSize/Definitions/annotations.yml
diff --git a/s3p/templates/memoryPageSize/Definitions/artifacts.yml b/testsuites/performance/src/main/resources/testplans/templates/memoryPageSize/Definitions/artifacts.yml
similarity index 100%
rename from s3p/templates/memoryPageSize/Definitions/artifacts.yml
rename to testsuites/performance/src/main/resources/testplans/templates/memoryPageSize/Definitions/artifacts.yml
diff --git a/s3p/templates/memoryPageSize/Definitions/capabilities.yml b/testsuites/performance/src/main/resources/testplans/templates/memoryPageSize/Definitions/capabilities.yml
similarity index 100%
rename from s3p/templates/memoryPageSize/Definitions/capabilities.yml
rename to testsuites/performance/src/main/resources/testplans/templates/memoryPageSize/Definitions/capabilities.yml
diff --git a/s3p/templates/memoryPageSize/Definitions/data.yml b/testsuites/performance/src/main/resources/testplans/templates/memoryPageSize/Definitions/data.yml
similarity index 100%
rename from s3p/templates/memoryPageSize/Definitions/data.yml
rename to testsuites/performance/src/main/resources/testplans/templates/memoryPageSize/Definitions/data.yml
diff --git a/s3p/templates/memoryPageSize/Definitions/groups.yml b/testsuites/performance/src/main/resources/testplans/templates/memoryPageSize/Definitions/groups.yml
similarity index 100%
rename from s3p/templates/memoryPageSize/Definitions/groups.yml
rename to testsuites/performance/src/main/resources/testplans/templates/memoryPageSize/Definitions/groups.yml
diff --git a/s3p/templates/memoryPageSize/Definitions/interfaces.yml b/testsuites/performance/src/main/resources/testplans/templates/memoryPageSize/Definitions/interfaces.yml
similarity index 100%
rename from s3p/templates/memoryPageSize/Definitions/interfaces.yml
rename to testsuites/performance/src/main/resources/testplans/templates/memoryPageSize/Definitions/interfaces.yml
diff --git a/s3p/templates/memoryPageSize/Definitions/nodes.yml b/testsuites/performance/src/main/resources/testplans/templates/memoryPageSize/Definitions/nodes.yml
similarity index 100%
rename from s3p/templates/memoryPageSize/Definitions/nodes.yml
rename to testsuites/performance/src/main/resources/testplans/templates/memoryPageSize/Definitions/nodes.yml
diff --git a/s3p/templates/memoryPageSize/Definitions/policies.yml b/testsuites/performance/src/main/resources/testplans/templates/memoryPageSize/Definitions/policies.yml
similarity index 100%
rename from s3p/templates/memoryPageSize/Definitions/policies.yml
rename to testsuites/performance/src/main/resources/testplans/templates/memoryPageSize/Definitions/policies.yml
diff --git a/s3p/templates/memoryPageSize/Definitions/relationships.yml b/testsuites/performance/src/main/resources/testplans/templates/memoryPageSize/Definitions/relationships.yml
similarity index 100%
rename from s3p/templates/memoryPageSize/Definitions/relationships.yml
rename to testsuites/performance/src/main/resources/testplans/templates/memoryPageSize/Definitions/relationships.yml
diff --git a/s3p/templates/memoryPageSize/Definitions/resource-VduCompute-template.yml b/testsuites/performance/src/main/resources/testplans/templates/memoryPageSize/Definitions/resource-VduCompute-template.yml
similarity index 100%
rename from s3p/templates/memoryPageSize/Definitions/resource-VduCompute-template.yml
rename to testsuites/performance/src/main/resources/testplans/templates/memoryPageSize/Definitions/resource-VduCompute-template.yml
diff --git a/s3p/templates/memoryPageSize/Definitions/resource-VduCp-template.yml b/testsuites/performance/src/main/resources/testplans/templates/memoryPageSize/Definitions/resource-VduCp-template.yml
similarity index 100%
rename from s3p/templates/memoryPageSize/Definitions/resource-VduCp-template.yml
rename to testsuites/performance/src/main/resources/testplans/templates/memoryPageSize/Definitions/resource-VduCp-template.yml
diff --git a/s3p/templates/memoryPageSize/Definitions/resource-VduVirtualstorage-template.yml b/testsuites/performance/src/main/resources/testplans/templates/memoryPageSize/Definitions/resource-VduVirtualstorage-template.yml
similarity index 100%
rename from s3p/templates/memoryPageSize/Definitions/resource-VduVirtualstorage-template.yml
rename to testsuites/performance/src/main/resources/testplans/templates/memoryPageSize/Definitions/resource-VduVirtualstorage-template.yml
diff --git a/s3p/templates/memoryPageSize/Definitions/resource-Vgw1181049-template-interface.yml b/testsuites/performance/src/main/resources/testplans/templates/memoryPageSize/Definitions/resource-Vgw1181049-template-interface.yml
similarity index 100%
rename from s3p/templates/memoryPageSize/Definitions/resource-Vgw1181049-template-interface.yml
rename to testsuites/performance/src/main/resources/testplans/templates/memoryPageSize/Definitions/resource-Vgw1181049-template-interface.yml
diff --git a/s3p/templates/memoryPageSize/Definitions/resource-Vgw1181049-template.yml b/testsuites/performance/src/main/resources/testplans/templates/memoryPageSize/Definitions/resource-Vgw1181049-template.yml
similarity index 100%
rename from s3p/templates/memoryPageSize/Definitions/resource-Vgw1181049-template.yml
rename to testsuites/performance/src/main/resources/testplans/templates/memoryPageSize/Definitions/resource-Vgw1181049-template.yml
diff --git a/s3p/templates/memoryPageSize/Definitions/resource-Vnf-template.yml b/testsuites/performance/src/main/resources/testplans/templates/memoryPageSize/Definitions/resource-Vnf-template.yml
similarity index 100%
rename from s3p/templates/memoryPageSize/Definitions/resource-Vnf-template.yml
rename to testsuites/performance/src/main/resources/testplans/templates/memoryPageSize/Definitions/resource-Vnf-template.yml
diff --git a/s3p/templates/memoryPageSize/Definitions/resource-Vnfvirtuallink-template.yml b/testsuites/performance/src/main/resources/testplans/templates/memoryPageSize/Definitions/resource-Vnfvirtuallink-template.yml
similarity index 100%
rename from s3p/templates/memoryPageSize/Definitions/resource-Vnfvirtuallink-template.yml
rename to testsuites/performance/src/main/resources/testplans/templates/memoryPageSize/Definitions/resource-Vnfvirtuallink-template.yml
diff --git a/s3p/templates/memoryPageSize/Definitions/service-Testns8-template-interface.yml b/testsuites/performance/src/main/resources/testplans/templates/memoryPageSize/Definitions/service-Testns8-template-interface.yml
similarity index 100%
rename from s3p/templates/memoryPageSize/Definitions/service-Testns8-template-interface.yml
rename to testsuites/performance/src/main/resources/testplans/templates/memoryPageSize/Definitions/service-Testns8-template-interface.yml
diff --git a/s3p/templates/memoryPageSize/Definitions/service-Testns8-template.yml b/testsuites/performance/src/main/resources/testplans/templates/memoryPageSize/Definitions/service-Testns8-template.yml
similarity index 100%
rename from s3p/templates/memoryPageSize/Definitions/service-Testns8-template.yml
rename to testsuites/performance/src/main/resources/testplans/templates/memoryPageSize/Definitions/service-Testns8-template.yml
diff --git a/s3p/templates/memoryPageSize/TOSCA-Metadata/TOSCA.meta b/testsuites/performance/src/main/resources/testplans/templates/memoryPageSize/TOSCA-Metadata/TOSCA.meta
similarity index 100%
rename from s3p/templates/memoryPageSize/TOSCA-Metadata/TOSCA.meta
rename to testsuites/performance/src/main/resources/testplans/templates/memoryPageSize/TOSCA-Metadata/TOSCA.meta
diff --git a/s3p/templates/memoryPageSize/csar.meta b/testsuites/performance/src/main/resources/testplans/templates/memoryPageSize/csar.meta
similarity index 100%
rename from s3p/templates/memoryPageSize/csar.meta
rename to testsuites/performance/src/main/resources/testplans/templates/memoryPageSize/csar.meta
diff --git a/s3p/templates/numberOfPages/Artifacts/org.openecomp.resource.vf.Vgw1181049_v1.0/Deployment/OTHER/authorized_keys b/testsuites/performance/src/main/resources/testplans/templates/numberOfPages/Artifacts/org.openecomp.resource.vf.Vgw1181049_v1.0/Deployment/OTHER/authorized_keys
similarity index 100%
rename from s3p/templates/numberOfPages/Artifacts/org.openecomp.resource.vf.Vgw1181049_v1.0/Deployment/OTHER/authorized_keys
rename to testsuites/performance/src/main/resources/testplans/templates/numberOfPages/Artifacts/org.openecomp.resource.vf.Vgw1181049_v1.0/Deployment/OTHER/authorized_keys
diff --git a/s3p/templates/numberOfPages/Artifacts/org.openecomp.resource.vf.Vgw1181049_v1.0/Deployment/OTHER/id_rsa b/testsuites/performance/src/main/resources/testplans/templates/numberOfPages/Artifacts/org.openecomp.resource.vf.Vgw1181049_v1.0/Deployment/OTHER/id_rsa
similarity index 100%
rename from s3p/templates/numberOfPages/Artifacts/org.openecomp.resource.vf.Vgw1181049_v1.0/Deployment/OTHER/id_rsa
rename to testsuites/performance/src/main/resources/testplans/templates/numberOfPages/Artifacts/org.openecomp.resource.vf.Vgw1181049_v1.0/Deployment/OTHER/id_rsa
diff --git a/s3p/templates/numberOfPages/Artifacts/org.openecomp.resource.vf.Vgw1181049_v1.0/Deployment/OTHER/id_rsa.pub b/testsuites/performance/src/main/resources/testplans/templates/numberOfPages/Artifacts/org.openecomp.resource.vf.Vgw1181049_v1.0/Deployment/OTHER/id_rsa.pub
similarity index 100%
rename from s3p/templates/numberOfPages/Artifacts/org.openecomp.resource.vf.Vgw1181049_v1.0/Deployment/OTHER/id_rsa.pub
rename to testsuites/performance/src/main/resources/testplans/templates/numberOfPages/Artifacts/org.openecomp.resource.vf.Vgw1181049_v1.0/Deployment/OTHER/id_rsa.pub
diff --git a/s3p/templates/numberOfPages/Artifacts/org.openecomp.resource.vf.Vgw1181049_v1.0/Deployment/OTHER/image b/testsuites/performance/src/main/resources/testplans/templates/numberOfPages/Artifacts/org.openecomp.resource.vf.Vgw1181049_v1.0/Deployment/OTHER/image
similarity index 100%
rename from s3p/templates/numberOfPages/Artifacts/org.openecomp.resource.vf.Vgw1181049_v1.0/Deployment/OTHER/image
rename to testsuites/performance/src/main/resources/testplans/templates/numberOfPages/Artifacts/org.openecomp.resource.vf.Vgw1181049_v1.0/Deployment/OTHER/image
diff --git a/s3p/templates/numberOfPages/Artifacts/org.openecomp.resource.vf.Vgw1181049_v1.0/Deployment/VENDOR_LICENSE/vendor-license-model.xml b/testsuites/performance/src/main/resources/testplans/templates/numberOfPages/Artifacts/org.openecomp.resource.vf.Vgw1181049_v1.0/Deployment/VENDOR_LICENSE/vendor-license-model.xml
similarity index 100%
rename from s3p/templates/numberOfPages/Artifacts/org.openecomp.resource.vf.Vgw1181049_v1.0/Deployment/VENDOR_LICENSE/vendor-license-model.xml
rename to testsuites/performance/src/main/resources/testplans/templates/numberOfPages/Artifacts/org.openecomp.resource.vf.Vgw1181049_v1.0/Deployment/VENDOR_LICENSE/vendor-license-model.xml
diff --git a/s3p/templates/numberOfPages/Artifacts/org.openecomp.resource.vf.Vgw1181049_v1.0/Deployment/VF_LICENSE/vf-license-model.xml b/testsuites/performance/src/main/resources/testplans/templates/numberOfPages/Artifacts/org.openecomp.resource.vf.Vgw1181049_v1.0/Deployment/VF_LICENSE/vf-license-model.xml
similarity index 100%
rename from s3p/templates/numberOfPages/Artifacts/org.openecomp.resource.vf.Vgw1181049_v1.0/Deployment/VF_LICENSE/vf-license-model.xml
rename to testsuites/performance/src/main/resources/testplans/templates/numberOfPages/Artifacts/org.openecomp.resource.vf.Vgw1181049_v1.0/Deployment/VF_LICENSE/vf-license-model.xml
diff --git a/s3p/templates/numberOfPages/Definitions/annotations.yml b/testsuites/performance/src/main/resources/testplans/templates/numberOfPages/Definitions/annotations.yml
similarity index 100%
rename from s3p/templates/numberOfPages/Definitions/annotations.yml
rename to testsuites/performance/src/main/resources/testplans/templates/numberOfPages/Definitions/annotations.yml
diff --git a/s3p/templates/numberOfPages/Definitions/artifacts.yml b/testsuites/performance/src/main/resources/testplans/templates/numberOfPages/Definitions/artifacts.yml
similarity index 100%
rename from s3p/templates/numberOfPages/Definitions/artifacts.yml
rename to testsuites/performance/src/main/resources/testplans/templates/numberOfPages/Definitions/artifacts.yml
diff --git a/s3p/templates/numberOfPages/Definitions/capabilities.yml b/testsuites/performance/src/main/resources/testplans/templates/numberOfPages/Definitions/capabilities.yml
similarity index 100%
rename from s3p/templates/numberOfPages/Definitions/capabilities.yml
rename to testsuites/performance/src/main/resources/testplans/templates/numberOfPages/Definitions/capabilities.yml
diff --git a/s3p/templates/numberOfPages/Definitions/data.yml b/testsuites/performance/src/main/resources/testplans/templates/numberOfPages/Definitions/data.yml
similarity index 100%
rename from s3p/templates/numberOfPages/Definitions/data.yml
rename to testsuites/performance/src/main/resources/testplans/templates/numberOfPages/Definitions/data.yml
diff --git a/s3p/templates/numberOfPages/Definitions/groups.yml b/testsuites/performance/src/main/resources/testplans/templates/numberOfPages/Definitions/groups.yml
similarity index 100%
rename from s3p/templates/numberOfPages/Definitions/groups.yml
rename to testsuites/performance/src/main/resources/testplans/templates/numberOfPages/Definitions/groups.yml
diff --git a/s3p/templates/numberOfPages/Definitions/interfaces.yml b/testsuites/performance/src/main/resources/testplans/templates/numberOfPages/Definitions/interfaces.yml
similarity index 100%
rename from s3p/templates/numberOfPages/Definitions/interfaces.yml
rename to testsuites/performance/src/main/resources/testplans/templates/numberOfPages/Definitions/interfaces.yml
diff --git a/s3p/templates/numberOfPages/Definitions/nodes.yml b/testsuites/performance/src/main/resources/testplans/templates/numberOfPages/Definitions/nodes.yml
similarity index 100%
rename from s3p/templates/numberOfPages/Definitions/nodes.yml
rename to testsuites/performance/src/main/resources/testplans/templates/numberOfPages/Definitions/nodes.yml
diff --git a/s3p/templates/numberOfPages/Definitions/policies.yml b/testsuites/performance/src/main/resources/testplans/templates/numberOfPages/Definitions/policies.yml
similarity index 100%
rename from s3p/templates/numberOfPages/Definitions/policies.yml
rename to testsuites/performance/src/main/resources/testplans/templates/numberOfPages/Definitions/policies.yml
diff --git a/s3p/templates/numberOfPages/Definitions/relationships.yml b/testsuites/performance/src/main/resources/testplans/templates/numberOfPages/Definitions/relationships.yml
similarity index 100%
rename from s3p/templates/numberOfPages/Definitions/relationships.yml
rename to testsuites/performance/src/main/resources/testplans/templates/numberOfPages/Definitions/relationships.yml
diff --git a/s3p/templates/numberOfPages/Definitions/resource-VduCompute-template.yml b/testsuites/performance/src/main/resources/testplans/templates/numberOfPages/Definitions/resource-VduCompute-template.yml
similarity index 100%
rename from s3p/templates/numberOfPages/Definitions/resource-VduCompute-template.yml
rename to testsuites/performance/src/main/resources/testplans/templates/numberOfPages/Definitions/resource-VduCompute-template.yml
diff --git a/s3p/templates/numberOfPages/Definitions/resource-VduCp-template.yml b/testsuites/performance/src/main/resources/testplans/templates/numberOfPages/Definitions/resource-VduCp-template.yml
similarity index 100%
rename from s3p/templates/numberOfPages/Definitions/resource-VduCp-template.yml
rename to testsuites/performance/src/main/resources/testplans/templates/numberOfPages/Definitions/resource-VduCp-template.yml
diff --git a/s3p/templates/numberOfPages/Definitions/resource-VduVirtualstorage-template.yml b/testsuites/performance/src/main/resources/testplans/templates/numberOfPages/Definitions/resource-VduVirtualstorage-template.yml
similarity index 100%
rename from s3p/templates/numberOfPages/Definitions/resource-VduVirtualstorage-template.yml
rename to testsuites/performance/src/main/resources/testplans/templates/numberOfPages/Definitions/resource-VduVirtualstorage-template.yml
diff --git a/s3p/templates/numberOfPages/Definitions/resource-Vgw1181049-template-interface.yml b/testsuites/performance/src/main/resources/testplans/templates/numberOfPages/Definitions/resource-Vgw1181049-template-interface.yml
similarity index 100%
rename from s3p/templates/numberOfPages/Definitions/resource-Vgw1181049-template-interface.yml
rename to testsuites/performance/src/main/resources/testplans/templates/numberOfPages/Definitions/resource-Vgw1181049-template-interface.yml
diff --git a/s3p/templates/numberOfPages/Definitions/resource-Vgw1181049-template.yml b/testsuites/performance/src/main/resources/testplans/templates/numberOfPages/Definitions/resource-Vgw1181049-template.yml
similarity index 100%
rename from s3p/templates/numberOfPages/Definitions/resource-Vgw1181049-template.yml
rename to testsuites/performance/src/main/resources/testplans/templates/numberOfPages/Definitions/resource-Vgw1181049-template.yml
diff --git a/s3p/templates/numberOfPages/Definitions/resource-Vnf-template.yml b/testsuites/performance/src/main/resources/testplans/templates/numberOfPages/Definitions/resource-Vnf-template.yml
similarity index 100%
rename from s3p/templates/numberOfPages/Definitions/resource-Vnf-template.yml
rename to testsuites/performance/src/main/resources/testplans/templates/numberOfPages/Definitions/resource-Vnf-template.yml
diff --git a/s3p/templates/numberOfPages/Definitions/resource-Vnfvirtuallink-template.yml b/testsuites/performance/src/main/resources/testplans/templates/numberOfPages/Definitions/resource-Vnfvirtuallink-template.yml
similarity index 100%
rename from s3p/templates/numberOfPages/Definitions/resource-Vnfvirtuallink-template.yml
rename to testsuites/performance/src/main/resources/testplans/templates/numberOfPages/Definitions/resource-Vnfvirtuallink-template.yml
diff --git a/s3p/templates/numberOfPages/Definitions/service-Testns8-template-interface.yml b/testsuites/performance/src/main/resources/testplans/templates/numberOfPages/Definitions/service-Testns8-template-interface.yml
similarity index 100%
rename from s3p/templates/numberOfPages/Definitions/service-Testns8-template-interface.yml
rename to testsuites/performance/src/main/resources/testplans/templates/numberOfPages/Definitions/service-Testns8-template-interface.yml
diff --git a/s3p/templates/numberOfPages/Definitions/service-Testns8-template.yml b/testsuites/performance/src/main/resources/testplans/templates/numberOfPages/Definitions/service-Testns8-template.yml
similarity index 100%
rename from s3p/templates/numberOfPages/Definitions/service-Testns8-template.yml
rename to testsuites/performance/src/main/resources/testplans/templates/numberOfPages/Definitions/service-Testns8-template.yml
diff --git a/s3p/templates/numberOfPages/TOSCA-Metadata/TOSCA.meta b/testsuites/performance/src/main/resources/testplans/templates/numberOfPages/TOSCA-Metadata/TOSCA.meta
similarity index 100%
copy from s3p/templates/numberOfPages/TOSCA-Metadata/TOSCA.meta
copy to testsuites/performance/src/main/resources/testplans/templates/numberOfPages/TOSCA-Metadata/TOSCA.meta
diff --git a/s3p/templates/numberOfPages/csar.meta b/testsuites/performance/src/main/resources/testplans/templates/numberOfPages/csar.meta
similarity index 100%
rename from s3p/templates/numberOfPages/csar.meta
rename to testsuites/performance/src/main/resources/testplans/templates/numberOfPages/csar.meta
diff --git a/s3p/templates/pciDeviceId/Artifacts/org.openecomp.resource.vf.Vgw1181049_v1.0/Deployment/OTHER/authorized_keys b/testsuites/performance/src/main/resources/testplans/templates/pciDeviceId/Artifacts/org.openecomp.resource.vf.Vgw1181049_v1.0/Deployment/OTHER/authorized_keys
similarity index 100%
rename from s3p/templates/pciDeviceId/Artifacts/org.openecomp.resource.vf.Vgw1181049_v1.0/Deployment/OTHER/authorized_keys
rename to testsuites/performance/src/main/resources/testplans/templates/pciDeviceId/Artifacts/org.openecomp.resource.vf.Vgw1181049_v1.0/Deployment/OTHER/authorized_keys
diff --git a/s3p/templates/pciDeviceId/Artifacts/org.openecomp.resource.vf.Vgw1181049_v1.0/Deployment/OTHER/id_rsa b/testsuites/performance/src/main/resources/testplans/templates/pciDeviceId/Artifacts/org.openecomp.resource.vf.Vgw1181049_v1.0/Deployment/OTHER/id_rsa
similarity index 100%
rename from s3p/templates/pciDeviceId/Artifacts/org.openecomp.resource.vf.Vgw1181049_v1.0/Deployment/OTHER/id_rsa
rename to testsuites/performance/src/main/resources/testplans/templates/pciDeviceId/Artifacts/org.openecomp.resource.vf.Vgw1181049_v1.0/Deployment/OTHER/id_rsa
diff --git a/s3p/templates/pciDeviceId/Artifacts/org.openecomp.resource.vf.Vgw1181049_v1.0/Deployment/OTHER/id_rsa.pub b/testsuites/performance/src/main/resources/testplans/templates/pciDeviceId/Artifacts/org.openecomp.resource.vf.Vgw1181049_v1.0/Deployment/OTHER/id_rsa.pub
similarity index 100%
rename from s3p/templates/pciDeviceId/Artifacts/org.openecomp.resource.vf.Vgw1181049_v1.0/Deployment/OTHER/id_rsa.pub
rename to testsuites/performance/src/main/resources/testplans/templates/pciDeviceId/Artifacts/org.openecomp.resource.vf.Vgw1181049_v1.0/Deployment/OTHER/id_rsa.pub
diff --git a/s3p/templates/pciDeviceId/Artifacts/org.openecomp.resource.vf.Vgw1181049_v1.0/Deployment/OTHER/image b/testsuites/performance/src/main/resources/testplans/templates/pciDeviceId/Artifacts/org.openecomp.resource.vf.Vgw1181049_v1.0/Deployment/OTHER/image
similarity index 100%
rename from s3p/templates/pciDeviceId/Artifacts/org.openecomp.resource.vf.Vgw1181049_v1.0/Deployment/OTHER/image
rename to testsuites/performance/src/main/resources/testplans/templates/pciDeviceId/Artifacts/org.openecomp.resource.vf.Vgw1181049_v1.0/Deployment/OTHER/image
diff --git a/s3p/templates/pciDeviceId/Artifacts/org.openecomp.resource.vf.Vgw1181049_v1.0/Deployment/VENDOR_LICENSE/vendor-license-model.xml b/testsuites/performance/src/main/resources/testplans/templates/pciDeviceId/Artifacts/org.openecomp.resource.vf.Vgw1181049_v1.0/Deployment/VENDOR_LICENSE/vendor-license-model.xml
similarity index 100%
rename from s3p/templates/pciDeviceId/Artifacts/org.openecomp.resource.vf.Vgw1181049_v1.0/Deployment/VENDOR_LICENSE/vendor-license-model.xml
rename to testsuites/performance/src/main/resources/testplans/templates/pciDeviceId/Artifacts/org.openecomp.resource.vf.Vgw1181049_v1.0/Deployment/VENDOR_LICENSE/vendor-license-model.xml
diff --git a/s3p/templates/pciDeviceId/Artifacts/org.openecomp.resource.vf.Vgw1181049_v1.0/Deployment/VF_LICENSE/vf-license-model.xml b/testsuites/performance/src/main/resources/testplans/templates/pciDeviceId/Artifacts/org.openecomp.resource.vf.Vgw1181049_v1.0/Deployment/VF_LICENSE/vf-license-model.xml
similarity index 100%
rename from s3p/templates/pciDeviceId/Artifacts/org.openecomp.resource.vf.Vgw1181049_v1.0/Deployment/VF_LICENSE/vf-license-model.xml
rename to testsuites/performance/src/main/resources/testplans/templates/pciDeviceId/Artifacts/org.openecomp.resource.vf.Vgw1181049_v1.0/Deployment/VF_LICENSE/vf-license-model.xml
diff --git a/s3p/templates/pciDeviceId/Definitions/annotations.yml b/testsuites/performance/src/main/resources/testplans/templates/pciDeviceId/Definitions/annotations.yml
similarity index 100%
rename from s3p/templates/pciDeviceId/Definitions/annotations.yml
rename to testsuites/performance/src/main/resources/testplans/templates/pciDeviceId/Definitions/annotations.yml
diff --git a/s3p/templates/pciDeviceId/Definitions/artifacts.yml b/testsuites/performance/src/main/resources/testplans/templates/pciDeviceId/Definitions/artifacts.yml
similarity index 100%
rename from s3p/templates/pciDeviceId/Definitions/artifacts.yml
rename to testsuites/performance/src/main/resources/testplans/templates/pciDeviceId/Definitions/artifacts.yml
diff --git a/s3p/templates/pciDeviceId/Definitions/capabilities.yml b/testsuites/performance/src/main/resources/testplans/templates/pciDeviceId/Definitions/capabilities.yml
similarity index 100%
rename from s3p/templates/pciDeviceId/Definitions/capabilities.yml
rename to testsuites/performance/src/main/resources/testplans/templates/pciDeviceId/Definitions/capabilities.yml
diff --git a/s3p/templates/pciDeviceId/Definitions/data.yml b/testsuites/performance/src/main/resources/testplans/templates/pciDeviceId/Definitions/data.yml
similarity index 100%
rename from s3p/templates/pciDeviceId/Definitions/data.yml
rename to testsuites/performance/src/main/resources/testplans/templates/pciDeviceId/Definitions/data.yml
diff --git a/s3p/templates/pciDeviceId/Definitions/groups.yml b/testsuites/performance/src/main/resources/testplans/templates/pciDeviceId/Definitions/groups.yml
similarity index 100%
rename from s3p/templates/pciDeviceId/Definitions/groups.yml
rename to testsuites/performance/src/main/resources/testplans/templates/pciDeviceId/Definitions/groups.yml
diff --git a/s3p/templates/pciDeviceId/Definitions/interfaces.yml b/testsuites/performance/src/main/resources/testplans/templates/pciDeviceId/Definitions/interfaces.yml
similarity index 100%
rename from s3p/templates/pciDeviceId/Definitions/interfaces.yml
rename to testsuites/performance/src/main/resources/testplans/templates/pciDeviceId/Definitions/interfaces.yml
diff --git a/s3p/templates/pciDeviceId/Definitions/nodes.yml b/testsuites/performance/src/main/resources/testplans/templates/pciDeviceId/Definitions/nodes.yml
similarity index 100%
rename from s3p/templates/pciDeviceId/Definitions/nodes.yml
rename to testsuites/performance/src/main/resources/testplans/templates/pciDeviceId/Definitions/nodes.yml
diff --git a/s3p/templates/pciDeviceId/Definitions/policies.yml b/testsuites/performance/src/main/resources/testplans/templates/pciDeviceId/Definitions/policies.yml
similarity index 100%
rename from s3p/templates/pciDeviceId/Definitions/policies.yml
rename to testsuites/performance/src/main/resources/testplans/templates/pciDeviceId/Definitions/policies.yml
diff --git a/s3p/templates/pciDeviceId/Definitions/relationships.yml b/testsuites/performance/src/main/resources/testplans/templates/pciDeviceId/Definitions/relationships.yml
similarity index 100%
rename from s3p/templates/pciDeviceId/Definitions/relationships.yml
rename to testsuites/performance/src/main/resources/testplans/templates/pciDeviceId/Definitions/relationships.yml
diff --git a/s3p/templates/pciDeviceId/Definitions/resource-VduCompute-template.yml b/testsuites/performance/src/main/resources/testplans/templates/pciDeviceId/Definitions/resource-VduCompute-template.yml
similarity index 100%
rename from s3p/templates/pciDeviceId/Definitions/resource-VduCompute-template.yml
rename to testsuites/performance/src/main/resources/testplans/templates/pciDeviceId/Definitions/resource-VduCompute-template.yml
diff --git a/s3p/templates/pciDeviceId/Definitions/resource-VduCp-template.yml b/testsuites/performance/src/main/resources/testplans/templates/pciDeviceId/Definitions/resource-VduCp-template.yml
similarity index 100%
rename from s3p/templates/pciDeviceId/Definitions/resource-VduCp-template.yml
rename to testsuites/performance/src/main/resources/testplans/templates/pciDeviceId/Definitions/resource-VduCp-template.yml
diff --git a/s3p/templates/pciDeviceId/Definitions/resource-VduVirtualstorage-template.yml b/testsuites/performance/src/main/resources/testplans/templates/pciDeviceId/Definitions/resource-VduVirtualstorage-template.yml
similarity index 100%
rename from s3p/templates/pciDeviceId/Definitions/resource-VduVirtualstorage-template.yml
rename to testsuites/performance/src/main/resources/testplans/templates/pciDeviceId/Definitions/resource-VduVirtualstorage-template.yml
diff --git a/s3p/templates/pciDeviceId/Definitions/resource-Vgw1181049-template-interface.yml b/testsuites/performance/src/main/resources/testplans/templates/pciDeviceId/Definitions/resource-Vgw1181049-template-interface.yml
similarity index 100%
rename from s3p/templates/pciDeviceId/Definitions/resource-Vgw1181049-template-interface.yml
rename to testsuites/performance/src/main/resources/testplans/templates/pciDeviceId/Definitions/resource-Vgw1181049-template-interface.yml
diff --git a/s3p/templates/pciDeviceId/Definitions/resource-Vgw1181049-template.yml b/testsuites/performance/src/main/resources/testplans/templates/pciDeviceId/Definitions/resource-Vgw1181049-template.yml
similarity index 100%
rename from s3p/templates/pciDeviceId/Definitions/resource-Vgw1181049-template.yml
rename to testsuites/performance/src/main/resources/testplans/templates/pciDeviceId/Definitions/resource-Vgw1181049-template.yml
diff --git a/s3p/templates/pciDeviceId/Definitions/resource-Vnf-template.yml b/testsuites/performance/src/main/resources/testplans/templates/pciDeviceId/Definitions/resource-Vnf-template.yml
similarity index 100%
rename from s3p/templates/pciDeviceId/Definitions/resource-Vnf-template.yml
rename to testsuites/performance/src/main/resources/testplans/templates/pciDeviceId/Definitions/resource-Vnf-template.yml
diff --git a/s3p/templates/pciDeviceId/Definitions/resource-Vnfvirtuallink-template.yml b/testsuites/performance/src/main/resources/testplans/templates/pciDeviceId/Definitions/resource-Vnfvirtuallink-template.yml
similarity index 100%
rename from s3p/templates/pciDeviceId/Definitions/resource-Vnfvirtuallink-template.yml
rename to testsuites/performance/src/main/resources/testplans/templates/pciDeviceId/Definitions/resource-Vnfvirtuallink-template.yml
diff --git a/s3p/templates/pciDeviceId/Definitions/service-Testns8-template-interface.yml b/testsuites/performance/src/main/resources/testplans/templates/pciDeviceId/Definitions/service-Testns8-template-interface.yml
similarity index 100%
rename from s3p/templates/pciDeviceId/Definitions/service-Testns8-template-interface.yml
rename to testsuites/performance/src/main/resources/testplans/templates/pciDeviceId/Definitions/service-Testns8-template-interface.yml
diff --git a/s3p/templates/pciDeviceId/Definitions/service-Testns8-template.yml b/testsuites/performance/src/main/resources/testplans/templates/pciDeviceId/Definitions/service-Testns8-template.yml
similarity index 100%
rename from s3p/templates/pciDeviceId/Definitions/service-Testns8-template.yml
rename to testsuites/performance/src/main/resources/testplans/templates/pciDeviceId/Definitions/service-Testns8-template.yml
diff --git a/s3p/templates/pciDeviceId/TOSCA-Metadata/TOSCA.meta b/testsuites/performance/src/main/resources/testplans/templates/pciDeviceId/TOSCA-Metadata/TOSCA.meta
similarity index 100%
rename from s3p/templates/pciDeviceId/TOSCA-Metadata/TOSCA.meta
rename to testsuites/performance/src/main/resources/testplans/templates/pciDeviceId/TOSCA-Metadata/TOSCA.meta
diff --git a/s3p/templates/pciDeviceId/csar.meta b/testsuites/performance/src/main/resources/testplans/templates/pciDeviceId/csar.meta
similarity index 100%
rename from s3p/templates/pciDeviceId/csar.meta
rename to testsuites/performance/src/main/resources/testplans/templates/pciDeviceId/csar.meta
diff --git a/s3p/templates/pciNumDevices/Artifacts/org.openecomp.resource.vf.Vgw1181049_v1.0/Deployment/OTHER/authorized_keys b/testsuites/performance/src/main/resources/testplans/templates/pciNumDevices/Artifacts/org.openecomp.resource.vf.Vgw1181049_v1.0/Deployment/OTHER/authorized_keys
similarity index 100%
rename from s3p/templates/pciNumDevices/Artifacts/org.openecomp.resource.vf.Vgw1181049_v1.0/Deployment/OTHER/authorized_keys
rename to testsuites/performance/src/main/resources/testplans/templates/pciNumDevices/Artifacts/org.openecomp.resource.vf.Vgw1181049_v1.0/Deployment/OTHER/authorized_keys
diff --git a/s3p/templates/pciNumDevices/Artifacts/org.openecomp.resource.vf.Vgw1181049_v1.0/Deployment/OTHER/id_rsa b/testsuites/performance/src/main/resources/testplans/templates/pciNumDevices/Artifacts/org.openecomp.resource.vf.Vgw1181049_v1.0/Deployment/OTHER/id_rsa
similarity index 100%
rename from s3p/templates/pciNumDevices/Artifacts/org.openecomp.resource.vf.Vgw1181049_v1.0/Deployment/OTHER/id_rsa
rename to testsuites/performance/src/main/resources/testplans/templates/pciNumDevices/Artifacts/org.openecomp.resource.vf.Vgw1181049_v1.0/Deployment/OTHER/id_rsa
diff --git a/s3p/templates/pciNumDevices/Artifacts/org.openecomp.resource.vf.Vgw1181049_v1.0/Deployment/OTHER/id_rsa.pub b/testsuites/performance/src/main/resources/testplans/templates/pciNumDevices/Artifacts/org.openecomp.resource.vf.Vgw1181049_v1.0/Deployment/OTHER/id_rsa.pub
similarity index 100%
rename from s3p/templates/pciNumDevices/Artifacts/org.openecomp.resource.vf.Vgw1181049_v1.0/Deployment/OTHER/id_rsa.pub
rename to testsuites/performance/src/main/resources/testplans/templates/pciNumDevices/Artifacts/org.openecomp.resource.vf.Vgw1181049_v1.0/Deployment/OTHER/id_rsa.pub
diff --git a/s3p/templates/pciNumDevices/Artifacts/org.openecomp.resource.vf.Vgw1181049_v1.0/Deployment/OTHER/image b/testsuites/performance/src/main/resources/testplans/templates/pciNumDevices/Artifacts/org.openecomp.resource.vf.Vgw1181049_v1.0/Deployment/OTHER/image
similarity index 100%
rename from s3p/templates/pciNumDevices/Artifacts/org.openecomp.resource.vf.Vgw1181049_v1.0/Deployment/OTHER/image
rename to testsuites/performance/src/main/resources/testplans/templates/pciNumDevices/Artifacts/org.openecomp.resource.vf.Vgw1181049_v1.0/Deployment/OTHER/image
diff --git a/s3p/templates/pciNumDevices/Artifacts/org.openecomp.resource.vf.Vgw1181049_v1.0/Deployment/VENDOR_LICENSE/vendor-license-model.xml b/testsuites/performance/src/main/resources/testplans/templates/pciNumDevices/Artifacts/org.openecomp.resource.vf.Vgw1181049_v1.0/Deployment/VENDOR_LICENSE/vendor-license-model.xml
similarity index 100%
rename from s3p/templates/pciNumDevices/Artifacts/org.openecomp.resource.vf.Vgw1181049_v1.0/Deployment/VENDOR_LICENSE/vendor-license-model.xml
rename to testsuites/performance/src/main/resources/testplans/templates/pciNumDevices/Artifacts/org.openecomp.resource.vf.Vgw1181049_v1.0/Deployment/VENDOR_LICENSE/vendor-license-model.xml
diff --git a/s3p/templates/pciNumDevices/Artifacts/org.openecomp.resource.vf.Vgw1181049_v1.0/Deployment/VF_LICENSE/vf-license-model.xml b/testsuites/performance/src/main/resources/testplans/templates/pciNumDevices/Artifacts/org.openecomp.resource.vf.Vgw1181049_v1.0/Deployment/VF_LICENSE/vf-license-model.xml
similarity index 100%
rename from s3p/templates/pciNumDevices/Artifacts/org.openecomp.resource.vf.Vgw1181049_v1.0/Deployment/VF_LICENSE/vf-license-model.xml
rename to testsuites/performance/src/main/resources/testplans/templates/pciNumDevices/Artifacts/org.openecomp.resource.vf.Vgw1181049_v1.0/Deployment/VF_LICENSE/vf-license-model.xml
diff --git a/s3p/templates/pciNumDevices/Definitions/annotations.yml b/testsuites/performance/src/main/resources/testplans/templates/pciNumDevices/Definitions/annotations.yml
similarity index 100%
rename from s3p/templates/pciNumDevices/Definitions/annotations.yml
rename to testsuites/performance/src/main/resources/testplans/templates/pciNumDevices/Definitions/annotations.yml
diff --git a/s3p/templates/pciNumDevices/Definitions/artifacts.yml b/testsuites/performance/src/main/resources/testplans/templates/pciNumDevices/Definitions/artifacts.yml
similarity index 100%
rename from s3p/templates/pciNumDevices/Definitions/artifacts.yml
rename to testsuites/performance/src/main/resources/testplans/templates/pciNumDevices/Definitions/artifacts.yml
diff --git a/s3p/templates/pciNumDevices/Definitions/capabilities.yml b/testsuites/performance/src/main/resources/testplans/templates/pciNumDevices/Definitions/capabilities.yml
similarity index 100%
rename from s3p/templates/pciNumDevices/Definitions/capabilities.yml
rename to testsuites/performance/src/main/resources/testplans/templates/pciNumDevices/Definitions/capabilities.yml
diff --git a/s3p/templates/pciNumDevices/Definitions/data.yml b/testsuites/performance/src/main/resources/testplans/templates/pciNumDevices/Definitions/data.yml
similarity index 100%
rename from s3p/templates/pciNumDevices/Definitions/data.yml
rename to testsuites/performance/src/main/resources/testplans/templates/pciNumDevices/Definitions/data.yml
diff --git a/s3p/templates/pciNumDevices/Definitions/groups.yml b/testsuites/performance/src/main/resources/testplans/templates/pciNumDevices/Definitions/groups.yml
similarity index 100%
rename from s3p/templates/pciNumDevices/Definitions/groups.yml
rename to testsuites/performance/src/main/resources/testplans/templates/pciNumDevices/Definitions/groups.yml
diff --git a/s3p/templates/pciNumDevices/Definitions/interfaces.yml b/testsuites/performance/src/main/resources/testplans/templates/pciNumDevices/Definitions/interfaces.yml
similarity index 100%
rename from s3p/templates/pciNumDevices/Definitions/interfaces.yml
rename to testsuites/performance/src/main/resources/testplans/templates/pciNumDevices/Definitions/interfaces.yml
diff --git a/s3p/templates/pciNumDevices/Definitions/nodes.yml b/testsuites/performance/src/main/resources/testplans/templates/pciNumDevices/Definitions/nodes.yml
similarity index 100%
rename from s3p/templates/pciNumDevices/Definitions/nodes.yml
rename to testsuites/performance/src/main/resources/testplans/templates/pciNumDevices/Definitions/nodes.yml
diff --git a/s3p/templates/pciNumDevices/Definitions/policies.yml b/testsuites/performance/src/main/resources/testplans/templates/pciNumDevices/Definitions/policies.yml
similarity index 100%
rename from s3p/templates/pciNumDevices/Definitions/policies.yml
rename to testsuites/performance/src/main/resources/testplans/templates/pciNumDevices/Definitions/policies.yml
diff --git a/s3p/templates/pciNumDevices/Definitions/relationships.yml b/testsuites/performance/src/main/resources/testplans/templates/pciNumDevices/Definitions/relationships.yml
similarity index 100%
rename from s3p/templates/pciNumDevices/Definitions/relationships.yml
rename to testsuites/performance/src/main/resources/testplans/templates/pciNumDevices/Definitions/relationships.yml
diff --git a/s3p/templates/pciNumDevices/Definitions/resource-VduCompute-template.yml b/testsuites/performance/src/main/resources/testplans/templates/pciNumDevices/Definitions/resource-VduCompute-template.yml
similarity index 100%
rename from s3p/templates/pciNumDevices/Definitions/resource-VduCompute-template.yml
rename to testsuites/performance/src/main/resources/testplans/templates/pciNumDevices/Definitions/resource-VduCompute-template.yml
diff --git a/s3p/templates/pciNumDevices/Definitions/resource-VduCp-template.yml b/testsuites/performance/src/main/resources/testplans/templates/pciNumDevices/Definitions/resource-VduCp-template.yml
similarity index 100%
rename from s3p/templates/pciNumDevices/Definitions/resource-VduCp-template.yml
rename to testsuites/performance/src/main/resources/testplans/templates/pciNumDevices/Definitions/resource-VduCp-template.yml
diff --git a/s3p/templates/pciNumDevices/Definitions/resource-VduVirtualstorage-template.yml b/testsuites/performance/src/main/resources/testplans/templates/pciNumDevices/Definitions/resource-VduVirtualstorage-template.yml
similarity index 100%
rename from s3p/templates/pciNumDevices/Definitions/resource-VduVirtualstorage-template.yml
rename to testsuites/performance/src/main/resources/testplans/templates/pciNumDevices/Definitions/resource-VduVirtualstorage-template.yml
diff --git a/s3p/templates/pciNumDevices/Definitions/resource-Vgw1181049-template-interface.yml b/testsuites/performance/src/main/resources/testplans/templates/pciNumDevices/Definitions/resource-Vgw1181049-template-interface.yml
similarity index 100%
rename from s3p/templates/pciNumDevices/Definitions/resource-Vgw1181049-template-interface.yml
rename to testsuites/performance/src/main/resources/testplans/templates/pciNumDevices/Definitions/resource-Vgw1181049-template-interface.yml
diff --git a/s3p/templates/pciNumDevices/Definitions/resource-Vgw1181049-template.yml b/testsuites/performance/src/main/resources/testplans/templates/pciNumDevices/Definitions/resource-Vgw1181049-template.yml
similarity index 100%
rename from s3p/templates/pciNumDevices/Definitions/resource-Vgw1181049-template.yml
rename to testsuites/performance/src/main/resources/testplans/templates/pciNumDevices/Definitions/resource-Vgw1181049-template.yml
diff --git a/s3p/templates/pciNumDevices/Definitions/resource-Vnf-template.yml b/testsuites/performance/src/main/resources/testplans/templates/pciNumDevices/Definitions/resource-Vnf-template.yml
similarity index 100%
rename from s3p/templates/pciNumDevices/Definitions/resource-Vnf-template.yml
rename to testsuites/performance/src/main/resources/testplans/templates/pciNumDevices/Definitions/resource-Vnf-template.yml
diff --git a/s3p/templates/pciNumDevices/Definitions/resource-Vnfvirtuallink-template.yml b/testsuites/performance/src/main/resources/testplans/templates/pciNumDevices/Definitions/resource-Vnfvirtuallink-template.yml
similarity index 100%
rename from s3p/templates/pciNumDevices/Definitions/resource-Vnfvirtuallink-template.yml
rename to testsuites/performance/src/main/resources/testplans/templates/pciNumDevices/Definitions/resource-Vnfvirtuallink-template.yml
diff --git a/s3p/templates/pciNumDevices/Definitions/service-Testns8-template-interface.yml b/testsuites/performance/src/main/resources/testplans/templates/pciNumDevices/Definitions/service-Testns8-template-interface.yml
similarity index 100%
rename from s3p/templates/pciNumDevices/Definitions/service-Testns8-template-interface.yml
rename to testsuites/performance/src/main/resources/testplans/templates/pciNumDevices/Definitions/service-Testns8-template-interface.yml
diff --git a/s3p/templates/pciNumDevices/Definitions/service-Testns8-template.yml b/testsuites/performance/src/main/resources/testplans/templates/pciNumDevices/Definitions/service-Testns8-template.yml
similarity index 100%
rename from s3p/templates/pciNumDevices/Definitions/service-Testns8-template.yml
rename to testsuites/performance/src/main/resources/testplans/templates/pciNumDevices/Definitions/service-Testns8-template.yml
diff --git a/s3p/templates/pciNumDevices/TOSCA-Metadata/TOSCA.meta b/testsuites/performance/src/main/resources/testplans/templates/pciNumDevices/TOSCA-Metadata/TOSCA.meta
similarity index 100%
copy from s3p/templates/pciNumDevices/TOSCA-Metadata/TOSCA.meta
copy to testsuites/performance/src/main/resources/testplans/templates/pciNumDevices/TOSCA-Metadata/TOSCA.meta
diff --git a/s3p/templates/pciNumDevices/csar.meta b/testsuites/performance/src/main/resources/testplans/templates/pciNumDevices/csar.meta
similarity index 100%
rename from s3p/templates/pciNumDevices/csar.meta
rename to testsuites/performance/src/main/resources/testplans/templates/pciNumDevices/csar.meta
diff --git a/s3p/templates/pciVendorId/Artifacts/org.openecomp.resource.vf.Vgw1181049_v1.0/Deployment/OTHER/authorized_keys b/testsuites/performance/src/main/resources/testplans/templates/pciVendorId/Artifacts/org.openecomp.resource.vf.Vgw1181049_v1.0/Deployment/OTHER/authorized_keys
similarity index 100%
rename from s3p/templates/pciVendorId/Artifacts/org.openecomp.resource.vf.Vgw1181049_v1.0/Deployment/OTHER/authorized_keys
rename to testsuites/performance/src/main/resources/testplans/templates/pciVendorId/Artifacts/org.openecomp.resource.vf.Vgw1181049_v1.0/Deployment/OTHER/authorized_keys
diff --git a/s3p/templates/pciVendorId/Artifacts/org.openecomp.resource.vf.Vgw1181049_v1.0/Deployment/OTHER/id_rsa b/testsuites/performance/src/main/resources/testplans/templates/pciVendorId/Artifacts/org.openecomp.resource.vf.Vgw1181049_v1.0/Deployment/OTHER/id_rsa
similarity index 100%
rename from s3p/templates/pciVendorId/Artifacts/org.openecomp.resource.vf.Vgw1181049_v1.0/Deployment/OTHER/id_rsa
rename to testsuites/performance/src/main/resources/testplans/templates/pciVendorId/Artifacts/org.openecomp.resource.vf.Vgw1181049_v1.0/Deployment/OTHER/id_rsa
diff --git a/s3p/templates/pciVendorId/Artifacts/org.openecomp.resource.vf.Vgw1181049_v1.0/Deployment/OTHER/id_rsa.pub b/testsuites/performance/src/main/resources/testplans/templates/pciVendorId/Artifacts/org.openecomp.resource.vf.Vgw1181049_v1.0/Deployment/OTHER/id_rsa.pub
similarity index 100%
rename from s3p/templates/pciVendorId/Artifacts/org.openecomp.resource.vf.Vgw1181049_v1.0/Deployment/OTHER/id_rsa.pub
rename to testsuites/performance/src/main/resources/testplans/templates/pciVendorId/Artifacts/org.openecomp.resource.vf.Vgw1181049_v1.0/Deployment/OTHER/id_rsa.pub
diff --git a/s3p/templates/pciVendorId/Artifacts/org.openecomp.resource.vf.Vgw1181049_v1.0/Deployment/OTHER/image b/testsuites/performance/src/main/resources/testplans/templates/pciVendorId/Artifacts/org.openecomp.resource.vf.Vgw1181049_v1.0/Deployment/OTHER/image
similarity index 100%
rename from s3p/templates/pciVendorId/Artifacts/org.openecomp.resource.vf.Vgw1181049_v1.0/Deployment/OTHER/image
rename to testsuites/performance/src/main/resources/testplans/templates/pciVendorId/Artifacts/org.openecomp.resource.vf.Vgw1181049_v1.0/Deployment/OTHER/image
diff --git a/s3p/templates/pciVendorId/Artifacts/org.openecomp.resource.vf.Vgw1181049_v1.0/Deployment/VENDOR_LICENSE/vendor-license-model.xml b/testsuites/performance/src/main/resources/testplans/templates/pciVendorId/Artifacts/org.openecomp.resource.vf.Vgw1181049_v1.0/Deployment/VENDOR_LICENSE/vendor-license-model.xml
similarity index 100%
rename from s3p/templates/pciVendorId/Artifacts/org.openecomp.resource.vf.Vgw1181049_v1.0/Deployment/VENDOR_LICENSE/vendor-license-model.xml
rename to testsuites/performance/src/main/resources/testplans/templates/pciVendorId/Artifacts/org.openecomp.resource.vf.Vgw1181049_v1.0/Deployment/VENDOR_LICENSE/vendor-license-model.xml
diff --git a/s3p/templates/pciVendorId/Artifacts/org.openecomp.resource.vf.Vgw1181049_v1.0/Deployment/VF_LICENSE/vf-license-model.xml b/testsuites/performance/src/main/resources/testplans/templates/pciVendorId/Artifacts/org.openecomp.resource.vf.Vgw1181049_v1.0/Deployment/VF_LICENSE/vf-license-model.xml
similarity index 100%
rename from s3p/templates/pciVendorId/Artifacts/org.openecomp.resource.vf.Vgw1181049_v1.0/Deployment/VF_LICENSE/vf-license-model.xml
rename to testsuites/performance/src/main/resources/testplans/templates/pciVendorId/Artifacts/org.openecomp.resource.vf.Vgw1181049_v1.0/Deployment/VF_LICENSE/vf-license-model.xml
diff --git a/s3p/templates/pciVendorId/Definitions/annotations.yml b/testsuites/performance/src/main/resources/testplans/templates/pciVendorId/Definitions/annotations.yml
similarity index 100%
rename from s3p/templates/pciVendorId/Definitions/annotations.yml
rename to testsuites/performance/src/main/resources/testplans/templates/pciVendorId/Definitions/annotations.yml
diff --git a/s3p/templates/pciVendorId/Definitions/artifacts.yml b/testsuites/performance/src/main/resources/testplans/templates/pciVendorId/Definitions/artifacts.yml
similarity index 100%
rename from s3p/templates/pciVendorId/Definitions/artifacts.yml
rename to testsuites/performance/src/main/resources/testplans/templates/pciVendorId/Definitions/artifacts.yml
diff --git a/s3p/templates/pciVendorId/Definitions/capabilities.yml b/testsuites/performance/src/main/resources/testplans/templates/pciVendorId/Definitions/capabilities.yml
similarity index 100%
rename from s3p/templates/pciVendorId/Definitions/capabilities.yml
rename to testsuites/performance/src/main/resources/testplans/templates/pciVendorId/Definitions/capabilities.yml
diff --git a/s3p/templates/pciVendorId/Definitions/data.yml b/testsuites/performance/src/main/resources/testplans/templates/pciVendorId/Definitions/data.yml
similarity index 100%
rename from s3p/templates/pciVendorId/Definitions/data.yml
rename to testsuites/performance/src/main/resources/testplans/templates/pciVendorId/Definitions/data.yml
diff --git a/s3p/templates/pciVendorId/Definitions/groups.yml b/testsuites/performance/src/main/resources/testplans/templates/pciVendorId/Definitions/groups.yml
similarity index 100%
rename from s3p/templates/pciVendorId/Definitions/groups.yml
rename to testsuites/performance/src/main/resources/testplans/templates/pciVendorId/Definitions/groups.yml
diff --git a/s3p/templates/pciVendorId/Definitions/interfaces.yml b/testsuites/performance/src/main/resources/testplans/templates/pciVendorId/Definitions/interfaces.yml
similarity index 100%
rename from s3p/templates/pciVendorId/Definitions/interfaces.yml
rename to testsuites/performance/src/main/resources/testplans/templates/pciVendorId/Definitions/interfaces.yml
diff --git a/s3p/templates/pciVendorId/Definitions/nodes.yml b/testsuites/performance/src/main/resources/testplans/templates/pciVendorId/Definitions/nodes.yml
similarity index 100%
rename from s3p/templates/pciVendorId/Definitions/nodes.yml
rename to testsuites/performance/src/main/resources/testplans/templates/pciVendorId/Definitions/nodes.yml
diff --git a/s3p/templates/pciVendorId/Definitions/policies.yml b/testsuites/performance/src/main/resources/testplans/templates/pciVendorId/Definitions/policies.yml
similarity index 100%
rename from s3p/templates/pciVendorId/Definitions/policies.yml
rename to testsuites/performance/src/main/resources/testplans/templates/pciVendorId/Definitions/policies.yml
diff --git a/s3p/templates/pciVendorId/Definitions/relationships.yml b/testsuites/performance/src/main/resources/testplans/templates/pciVendorId/Definitions/relationships.yml
similarity index 100%
rename from s3p/templates/pciVendorId/Definitions/relationships.yml
rename to testsuites/performance/src/main/resources/testplans/templates/pciVendorId/Definitions/relationships.yml
diff --git a/s3p/templates/pciVendorId/Definitions/resource-VduCompute-template.yml b/testsuites/performance/src/main/resources/testplans/templates/pciVendorId/Definitions/resource-VduCompute-template.yml
similarity index 100%
rename from s3p/templates/pciVendorId/Definitions/resource-VduCompute-template.yml
rename to testsuites/performance/src/main/resources/testplans/templates/pciVendorId/Definitions/resource-VduCompute-template.yml
diff --git a/s3p/templates/pciVendorId/Definitions/resource-VduCp-template.yml b/testsuites/performance/src/main/resources/testplans/templates/pciVendorId/Definitions/resource-VduCp-template.yml
similarity index 100%
rename from s3p/templates/pciVendorId/Definitions/resource-VduCp-template.yml
rename to testsuites/performance/src/main/resources/testplans/templates/pciVendorId/Definitions/resource-VduCp-template.yml
diff --git a/s3p/templates/pciVendorId/Definitions/resource-VduVirtualstorage-template.yml b/testsuites/performance/src/main/resources/testplans/templates/pciVendorId/Definitions/resource-VduVirtualstorage-template.yml
similarity index 100%
rename from s3p/templates/pciVendorId/Definitions/resource-VduVirtualstorage-template.yml
rename to testsuites/performance/src/main/resources/testplans/templates/pciVendorId/Definitions/resource-VduVirtualstorage-template.yml
diff --git a/s3p/templates/pciVendorId/Definitions/resource-Vgw1181049-template-interface.yml b/testsuites/performance/src/main/resources/testplans/templates/pciVendorId/Definitions/resource-Vgw1181049-template-interface.yml
similarity index 100%
rename from s3p/templates/pciVendorId/Definitions/resource-Vgw1181049-template-interface.yml
rename to testsuites/performance/src/main/resources/testplans/templates/pciVendorId/Definitions/resource-Vgw1181049-template-interface.yml
diff --git a/s3p/templates/pciVendorId/Definitions/resource-Vgw1181049-template.yml b/testsuites/performance/src/main/resources/testplans/templates/pciVendorId/Definitions/resource-Vgw1181049-template.yml
similarity index 100%
rename from s3p/templates/pciVendorId/Definitions/resource-Vgw1181049-template.yml
rename to testsuites/performance/src/main/resources/testplans/templates/pciVendorId/Definitions/resource-Vgw1181049-template.yml
diff --git a/s3p/templates/pciVendorId/Definitions/resource-Vnf-template.yml b/testsuites/performance/src/main/resources/testplans/templates/pciVendorId/Definitions/resource-Vnf-template.yml
similarity index 100%
rename from s3p/templates/pciVendorId/Definitions/resource-Vnf-template.yml
rename to testsuites/performance/src/main/resources/testplans/templates/pciVendorId/Definitions/resource-Vnf-template.yml
diff --git a/s3p/templates/pciVendorId/Definitions/resource-Vnfvirtuallink-template.yml b/testsuites/performance/src/main/resources/testplans/templates/pciVendorId/Definitions/resource-Vnfvirtuallink-template.yml
similarity index 100%
rename from s3p/templates/pciVendorId/Definitions/resource-Vnfvirtuallink-template.yml
rename to testsuites/performance/src/main/resources/testplans/templates/pciVendorId/Definitions/resource-Vnfvirtuallink-template.yml
diff --git a/s3p/templates/pciVendorId/Definitions/service-Testns8-template-interface.yml b/testsuites/performance/src/main/resources/testplans/templates/pciVendorId/Definitions/service-Testns8-template-interface.yml
similarity index 100%
rename from s3p/templates/pciVendorId/Definitions/service-Testns8-template-interface.yml
rename to testsuites/performance/src/main/resources/testplans/templates/pciVendorId/Definitions/service-Testns8-template-interface.yml
diff --git a/s3p/templates/pciVendorId/Definitions/service-Testns8-template.yml b/testsuites/performance/src/main/resources/testplans/templates/pciVendorId/Definitions/service-Testns8-template.yml
similarity index 100%
rename from s3p/templates/pciVendorId/Definitions/service-Testns8-template.yml
rename to testsuites/performance/src/main/resources/testplans/templates/pciVendorId/Definitions/service-Testns8-template.yml
diff --git a/s3p/templates/pciVendorId/TOSCA-Metadata/TOSCA.meta b/testsuites/performance/src/main/resources/testplans/templates/pciVendorId/TOSCA-Metadata/TOSCA.meta
similarity index 100%
rename from s3p/templates/pciVendorId/TOSCA-Metadata/TOSCA.meta
rename to testsuites/performance/src/main/resources/testplans/templates/pciVendorId/TOSCA-Metadata/TOSCA.meta
diff --git a/s3p/templates/pciVendorId/csar.meta b/testsuites/performance/src/main/resources/testplans/templates/pciVendorId/csar.meta
similarity index 100%
rename from s3p/templates/pciVendorId/csar.meta
rename to testsuites/performance/src/main/resources/testplans/templates/pciVendorId/csar.meta
diff --git a/testsuites/pom.xml b/testsuites/pom.xml
new file mode 100644
index 0000000..62dcc41
--- /dev/null
+++ b/testsuites/pom.xml
@@ -0,0 +1,33 @@
+<!--
+ ============LICENSE_START=======================================================
+ ONAP Policy Distribution
+ ================================================================================
+ Copyright (C) 2019 AT&T Intellectual Property. All rights reserved.
+ ================================================================================
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ ============LICENSE_END=========================================================
+ -->
+<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.policy.distribution</groupId>
+ <artifactId>policy-distribution</artifactId>
+ <version>2.1.0-SNAPSHOT</version>
+ </parent>
+ <artifactId>testsuites</artifactId>
+ <packaging>pom</packaging>
+ <modules>
+ <module>stability</module>
+ <module>performance</module>
+ </modules>
+</project>
\ No newline at end of file
diff --git a/testsuites/stability/pom.xml b/testsuites/stability/pom.xml
new file mode 100644
index 0000000..c53b69f
--- /dev/null
+++ b/testsuites/stability/pom.xml
@@ -0,0 +1,50 @@
+<!--
+ ============LICENSE_START=======================================================
+ ONAP Policy Distribution
+ ================================================================================
+ Copyright (C) 2019 AT&T Intellectual Property. All rights reserved.
+ ================================================================================
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ ============LICENSE_END=========================================================
+ -->
+<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.policy.distribution</groupId>
+ <artifactId>testsuites</artifactId>
+ <version>2.1.0-SNAPSHOT</version>
+ </parent>
+ <artifactId>stability</artifactId>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>create-distribution</id>
+ <phase>package</phase>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ <configuration>
+ <descriptors>
+ <descriptor>src/assembly/assembly.xml</descriptor>
+ </descriptors>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+</project>
\ No newline at end of file
diff --git a/testsuites/stability/src/assembly/assembly.xml b/testsuites/stability/src/assembly/assembly.xml
new file mode 100644
index 0000000..f53000a
--- /dev/null
+++ b/testsuites/stability/src/assembly/assembly.xml
@@ -0,0 +1,42 @@
+<!--
+ ============LICENSE_START=======================================================
+ ONAP Policy Distribution Stability
+ ================================================================================
+ Copyright (C) 2019 AT&T Intellectual Property. All rights reserved.
+ ================================================================================
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ ============LICENSE_END=========================================================
+ -->
+<assembly
+ xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0 http://maven.apache.org/xsd/assembly-1.1.0.xsd">
+ <id>stability</id>
+ <formats>
+ <format>zip</format>
+ </formats>
+ <baseDirectory>/policy-distribution/stability</baseDirectory>
+ <fileSets>
+ <fileSet>
+ <directory>${project.basedir}/src/main/resources/testplans/</directory>
+ <outputDirectory>tests/testplans</outputDirectory>
+ <!-- <includes>
+ <include>*.jmx</include>
+ <include>*.sh</include>
+ </includes> -->
+ <lineEnding>unix</lineEnding>
+ <fileMode>0644</fileMode>
+ <filtered>true</filtered>
+ </fileSet>
+ </fileSets>
+</assembly>
diff --git a/s3p/README.stability.md b/testsuites/stability/src/main/resources/testplans/README.stability.md
similarity index 100%
rename from s3p/README.stability.md
rename to testsuites/stability/src/main/resources/testplans/README.stability.md
diff --git a/s3p/clean_policy.sh b/testsuites/stability/src/main/resources/testplans/clean_policy.sh
similarity index 100%
copy from s3p/clean_policy.sh
copy to testsuites/stability/src/main/resources/testplans/clean_policy.sh
diff --git a/s3p/generate.sh b/testsuites/stability/src/main/resources/testplans/generate.sh
similarity index 100%
copy from s3p/generate.sh
copy to testsuites/stability/src/main/resources/testplans/generate.sh
diff --git a/s3p/list_failed_policy.sh b/testsuites/stability/src/main/resources/testplans/list_failed_policy.sh
similarity index 100%
copy from s3p/list_failed_policy.sh
copy to testsuites/stability/src/main/resources/testplans/list_failed_policy.sh
diff --git a/s3p/stability.jmx b/testsuites/stability/src/main/resources/testplans/stability.jmx
similarity index 100%
rename from s3p/stability.jmx
rename to testsuites/stability/src/main/resources/testplans/stability.jmx
diff --git a/s3p/templates/interfaceType/Artifacts/org.openecomp.resource.vf.Vgw1181049_v1.0/Deployment/OTHER/authorized_keys b/testsuites/stability/src/main/resources/testplans/templates/interfaceType/Artifacts/org.openecomp.resource.vf.Vgw1181049_v1.0/Deployment/OTHER/authorized_keys
similarity index 100%
copy from s3p/templates/interfaceType/Artifacts/org.openecomp.resource.vf.Vgw1181049_v1.0/Deployment/OTHER/authorized_keys
copy to testsuites/stability/src/main/resources/testplans/templates/interfaceType/Artifacts/org.openecomp.resource.vf.Vgw1181049_v1.0/Deployment/OTHER/authorized_keys
diff --git a/s3p/templates/interfaceType/Artifacts/org.openecomp.resource.vf.Vgw1181049_v1.0/Deployment/OTHER/id_rsa b/testsuites/stability/src/main/resources/testplans/templates/interfaceType/Artifacts/org.openecomp.resource.vf.Vgw1181049_v1.0/Deployment/OTHER/id_rsa
similarity index 100%
copy from s3p/templates/interfaceType/Artifacts/org.openecomp.resource.vf.Vgw1181049_v1.0/Deployment/OTHER/id_rsa
copy to testsuites/stability/src/main/resources/testplans/templates/interfaceType/Artifacts/org.openecomp.resource.vf.Vgw1181049_v1.0/Deployment/OTHER/id_rsa
diff --git a/s3p/templates/interfaceType/Artifacts/org.openecomp.resource.vf.Vgw1181049_v1.0/Deployment/OTHER/id_rsa.pub b/testsuites/stability/src/main/resources/testplans/templates/interfaceType/Artifacts/org.openecomp.resource.vf.Vgw1181049_v1.0/Deployment/OTHER/id_rsa.pub
similarity index 100%
copy from s3p/templates/interfaceType/Artifacts/org.openecomp.resource.vf.Vgw1181049_v1.0/Deployment/OTHER/id_rsa.pub
copy to testsuites/stability/src/main/resources/testplans/templates/interfaceType/Artifacts/org.openecomp.resource.vf.Vgw1181049_v1.0/Deployment/OTHER/id_rsa.pub
diff --git a/s3p/templates/interfaceType/Artifacts/org.openecomp.resource.vf.Vgw1181049_v1.0/Deployment/OTHER/image b/testsuites/stability/src/main/resources/testplans/templates/interfaceType/Artifacts/org.openecomp.resource.vf.Vgw1181049_v1.0/Deployment/OTHER/image
similarity index 100%
copy from s3p/templates/interfaceType/Artifacts/org.openecomp.resource.vf.Vgw1181049_v1.0/Deployment/OTHER/image
copy to testsuites/stability/src/main/resources/testplans/templates/interfaceType/Artifacts/org.openecomp.resource.vf.Vgw1181049_v1.0/Deployment/OTHER/image
diff --git a/s3p/templates/interfaceType/Artifacts/org.openecomp.resource.vf.Vgw1181049_v1.0/Deployment/VENDOR_LICENSE/vendor-license-model.xml b/testsuites/stability/src/main/resources/testplans/templates/interfaceType/Artifacts/org.openecomp.resource.vf.Vgw1181049_v1.0/Deployment/VENDOR_LICENSE/vendor-license-model.xml
similarity index 100%
copy from s3p/templates/interfaceType/Artifacts/org.openecomp.resource.vf.Vgw1181049_v1.0/Deployment/VENDOR_LICENSE/vendor-license-model.xml
copy to testsuites/stability/src/main/resources/testplans/templates/interfaceType/Artifacts/org.openecomp.resource.vf.Vgw1181049_v1.0/Deployment/VENDOR_LICENSE/vendor-license-model.xml
diff --git a/s3p/templates/interfaceType/Artifacts/org.openecomp.resource.vf.Vgw1181049_v1.0/Deployment/VF_LICENSE/vf-license-model.xml b/testsuites/stability/src/main/resources/testplans/templates/interfaceType/Artifacts/org.openecomp.resource.vf.Vgw1181049_v1.0/Deployment/VF_LICENSE/vf-license-model.xml
similarity index 100%
copy from s3p/templates/interfaceType/Artifacts/org.openecomp.resource.vf.Vgw1181049_v1.0/Deployment/VF_LICENSE/vf-license-model.xml
copy to testsuites/stability/src/main/resources/testplans/templates/interfaceType/Artifacts/org.openecomp.resource.vf.Vgw1181049_v1.0/Deployment/VF_LICENSE/vf-license-model.xml
diff --git a/s3p/templates/interfaceType/Definitions/annotations.yml b/testsuites/stability/src/main/resources/testplans/templates/interfaceType/Definitions/annotations.yml
similarity index 100%
copy from s3p/templates/interfaceType/Definitions/annotations.yml
copy to testsuites/stability/src/main/resources/testplans/templates/interfaceType/Definitions/annotations.yml
diff --git a/s3p/templates/interfaceType/Definitions/artifacts.yml b/testsuites/stability/src/main/resources/testplans/templates/interfaceType/Definitions/artifacts.yml
similarity index 100%
copy from s3p/templates/interfaceType/Definitions/artifacts.yml
copy to testsuites/stability/src/main/resources/testplans/templates/interfaceType/Definitions/artifacts.yml
diff --git a/s3p/templates/interfaceType/Definitions/capabilities.yml b/testsuites/stability/src/main/resources/testplans/templates/interfaceType/Definitions/capabilities.yml
similarity index 100%
copy from s3p/templates/interfaceType/Definitions/capabilities.yml
copy to testsuites/stability/src/main/resources/testplans/templates/interfaceType/Definitions/capabilities.yml
diff --git a/s3p/templates/interfaceType/Definitions/data.yml b/testsuites/stability/src/main/resources/testplans/templates/interfaceType/Definitions/data.yml
similarity index 100%
copy from s3p/templates/interfaceType/Definitions/data.yml
copy to testsuites/stability/src/main/resources/testplans/templates/interfaceType/Definitions/data.yml
diff --git a/s3p/templates/interfaceType/Definitions/groups.yml b/testsuites/stability/src/main/resources/testplans/templates/interfaceType/Definitions/groups.yml
similarity index 100%
copy from s3p/templates/interfaceType/Definitions/groups.yml
copy to testsuites/stability/src/main/resources/testplans/templates/interfaceType/Definitions/groups.yml
diff --git a/s3p/templates/interfaceType/Definitions/interfaces.yml b/testsuites/stability/src/main/resources/testplans/templates/interfaceType/Definitions/interfaces.yml
similarity index 100%
copy from s3p/templates/interfaceType/Definitions/interfaces.yml
copy to testsuites/stability/src/main/resources/testplans/templates/interfaceType/Definitions/interfaces.yml
diff --git a/s3p/templates/interfaceType/Definitions/nodes.yml b/testsuites/stability/src/main/resources/testplans/templates/interfaceType/Definitions/nodes.yml
similarity index 100%
copy from s3p/templates/interfaceType/Definitions/nodes.yml
copy to testsuites/stability/src/main/resources/testplans/templates/interfaceType/Definitions/nodes.yml
diff --git a/s3p/templates/interfaceType/Definitions/policies.yml b/testsuites/stability/src/main/resources/testplans/templates/interfaceType/Definitions/policies.yml
similarity index 100%
copy from s3p/templates/interfaceType/Definitions/policies.yml
copy to testsuites/stability/src/main/resources/testplans/templates/interfaceType/Definitions/policies.yml
diff --git a/s3p/templates/interfaceType/Definitions/relationships.yml b/testsuites/stability/src/main/resources/testplans/templates/interfaceType/Definitions/relationships.yml
similarity index 100%
copy from s3p/templates/interfaceType/Definitions/relationships.yml
copy to testsuites/stability/src/main/resources/testplans/templates/interfaceType/Definitions/relationships.yml
diff --git a/s3p/templates/interfaceType/Definitions/resource-VduCompute-template.yml b/testsuites/stability/src/main/resources/testplans/templates/interfaceType/Definitions/resource-VduCompute-template.yml
similarity index 100%
copy from s3p/templates/interfaceType/Definitions/resource-VduCompute-template.yml
copy to testsuites/stability/src/main/resources/testplans/templates/interfaceType/Definitions/resource-VduCompute-template.yml
diff --git a/s3p/templates/interfaceType/Definitions/resource-VduCp-template.yml b/testsuites/stability/src/main/resources/testplans/templates/interfaceType/Definitions/resource-VduCp-template.yml
similarity index 100%
copy from s3p/templates/interfaceType/Definitions/resource-VduCp-template.yml
copy to testsuites/stability/src/main/resources/testplans/templates/interfaceType/Definitions/resource-VduCp-template.yml
diff --git a/s3p/templates/interfaceType/Definitions/resource-VduVirtualstorage-template.yml b/testsuites/stability/src/main/resources/testplans/templates/interfaceType/Definitions/resource-VduVirtualstorage-template.yml
similarity index 100%
copy from s3p/templates/interfaceType/Definitions/resource-VduVirtualstorage-template.yml
copy to testsuites/stability/src/main/resources/testplans/templates/interfaceType/Definitions/resource-VduVirtualstorage-template.yml
diff --git a/s3p/templates/interfaceType/Definitions/resource-Vgw1181049-template-interface.yml b/testsuites/stability/src/main/resources/testplans/templates/interfaceType/Definitions/resource-Vgw1181049-template-interface.yml
similarity index 100%
copy from s3p/templates/interfaceType/Definitions/resource-Vgw1181049-template-interface.yml
copy to testsuites/stability/src/main/resources/testplans/templates/interfaceType/Definitions/resource-Vgw1181049-template-interface.yml
diff --git a/s3p/templates/interfaceType/Definitions/resource-Vgw1181049-template.yml b/testsuites/stability/src/main/resources/testplans/templates/interfaceType/Definitions/resource-Vgw1181049-template.yml
similarity index 100%
copy from s3p/templates/interfaceType/Definitions/resource-Vgw1181049-template.yml
copy to testsuites/stability/src/main/resources/testplans/templates/interfaceType/Definitions/resource-Vgw1181049-template.yml
diff --git a/s3p/templates/interfaceType/Definitions/resource-Vnf-template.yml b/testsuites/stability/src/main/resources/testplans/templates/interfaceType/Definitions/resource-Vnf-template.yml
similarity index 100%
copy from s3p/templates/interfaceType/Definitions/resource-Vnf-template.yml
copy to testsuites/stability/src/main/resources/testplans/templates/interfaceType/Definitions/resource-Vnf-template.yml
diff --git a/s3p/templates/interfaceType/Definitions/resource-Vnfvirtuallink-template.yml b/testsuites/stability/src/main/resources/testplans/templates/interfaceType/Definitions/resource-Vnfvirtuallink-template.yml
similarity index 100%
copy from s3p/templates/interfaceType/Definitions/resource-Vnfvirtuallink-template.yml
copy to testsuites/stability/src/main/resources/testplans/templates/interfaceType/Definitions/resource-Vnfvirtuallink-template.yml
diff --git a/s3p/templates/interfaceType/Definitions/service-Testns8-template-interface.yml b/testsuites/stability/src/main/resources/testplans/templates/interfaceType/Definitions/service-Testns8-template-interface.yml
similarity index 100%
copy from s3p/templates/interfaceType/Definitions/service-Testns8-template-interface.yml
copy to testsuites/stability/src/main/resources/testplans/templates/interfaceType/Definitions/service-Testns8-template-interface.yml
diff --git a/s3p/templates/interfaceType/Definitions/service-Testns8-template.yml b/testsuites/stability/src/main/resources/testplans/templates/interfaceType/Definitions/service-Testns8-template.yml
similarity index 100%
copy from s3p/templates/interfaceType/Definitions/service-Testns8-template.yml
copy to testsuites/stability/src/main/resources/testplans/templates/interfaceType/Definitions/service-Testns8-template.yml
diff --git a/s3p/templates/interfaceType/TOSCA-Metadata/TOSCA.meta b/testsuites/stability/src/main/resources/testplans/templates/interfaceType/TOSCA-Metadata/TOSCA.meta
similarity index 100%
rename from s3p/templates/interfaceType/TOSCA-Metadata/TOSCA.meta
rename to testsuites/stability/src/main/resources/testplans/templates/interfaceType/TOSCA-Metadata/TOSCA.meta
diff --git a/s3p/templates/interfaceType/csar.meta b/testsuites/stability/src/main/resources/testplans/templates/interfaceType/csar.meta
similarity index 100%
copy from s3p/templates/interfaceType/csar.meta
copy to testsuites/stability/src/main/resources/testplans/templates/interfaceType/csar.meta
diff --git a/s3p/templates/memoryPageSize/Artifacts/org.openecomp.resource.vf.Vgw1181049_v1.0/Deployment/OTHER/authorized_keys b/testsuites/stability/src/main/resources/testplans/templates/memoryPageSize/Artifacts/org.openecomp.resource.vf.Vgw1181049_v1.0/Deployment/OTHER/authorized_keys
similarity index 100%
copy from s3p/templates/memoryPageSize/Artifacts/org.openecomp.resource.vf.Vgw1181049_v1.0/Deployment/OTHER/authorized_keys
copy to testsuites/stability/src/main/resources/testplans/templates/memoryPageSize/Artifacts/org.openecomp.resource.vf.Vgw1181049_v1.0/Deployment/OTHER/authorized_keys
diff --git a/s3p/templates/memoryPageSize/Artifacts/org.openecomp.resource.vf.Vgw1181049_v1.0/Deployment/OTHER/id_rsa b/testsuites/stability/src/main/resources/testplans/templates/memoryPageSize/Artifacts/org.openecomp.resource.vf.Vgw1181049_v1.0/Deployment/OTHER/id_rsa
similarity index 100%
copy from s3p/templates/memoryPageSize/Artifacts/org.openecomp.resource.vf.Vgw1181049_v1.0/Deployment/OTHER/id_rsa
copy to testsuites/stability/src/main/resources/testplans/templates/memoryPageSize/Artifacts/org.openecomp.resource.vf.Vgw1181049_v1.0/Deployment/OTHER/id_rsa
diff --git a/s3p/templates/memoryPageSize/Artifacts/org.openecomp.resource.vf.Vgw1181049_v1.0/Deployment/OTHER/id_rsa.pub b/testsuites/stability/src/main/resources/testplans/templates/memoryPageSize/Artifacts/org.openecomp.resource.vf.Vgw1181049_v1.0/Deployment/OTHER/id_rsa.pub
similarity index 100%
copy from s3p/templates/memoryPageSize/Artifacts/org.openecomp.resource.vf.Vgw1181049_v1.0/Deployment/OTHER/id_rsa.pub
copy to testsuites/stability/src/main/resources/testplans/templates/memoryPageSize/Artifacts/org.openecomp.resource.vf.Vgw1181049_v1.0/Deployment/OTHER/id_rsa.pub
diff --git a/s3p/templates/memoryPageSize/Artifacts/org.openecomp.resource.vf.Vgw1181049_v1.0/Deployment/OTHER/image b/testsuites/stability/src/main/resources/testplans/templates/memoryPageSize/Artifacts/org.openecomp.resource.vf.Vgw1181049_v1.0/Deployment/OTHER/image
similarity index 100%
copy from s3p/templates/memoryPageSize/Artifacts/org.openecomp.resource.vf.Vgw1181049_v1.0/Deployment/OTHER/image
copy to testsuites/stability/src/main/resources/testplans/templates/memoryPageSize/Artifacts/org.openecomp.resource.vf.Vgw1181049_v1.0/Deployment/OTHER/image
diff --git a/s3p/templates/memoryPageSize/Artifacts/org.openecomp.resource.vf.Vgw1181049_v1.0/Deployment/VENDOR_LICENSE/vendor-license-model.xml b/testsuites/stability/src/main/resources/testplans/templates/memoryPageSize/Artifacts/org.openecomp.resource.vf.Vgw1181049_v1.0/Deployment/VENDOR_LICENSE/vendor-license-model.xml
similarity index 100%
copy from s3p/templates/memoryPageSize/Artifacts/org.openecomp.resource.vf.Vgw1181049_v1.0/Deployment/VENDOR_LICENSE/vendor-license-model.xml
copy to testsuites/stability/src/main/resources/testplans/templates/memoryPageSize/Artifacts/org.openecomp.resource.vf.Vgw1181049_v1.0/Deployment/VENDOR_LICENSE/vendor-license-model.xml
diff --git a/s3p/templates/memoryPageSize/Artifacts/org.openecomp.resource.vf.Vgw1181049_v1.0/Deployment/VF_LICENSE/vf-license-model.xml b/testsuites/stability/src/main/resources/testplans/templates/memoryPageSize/Artifacts/org.openecomp.resource.vf.Vgw1181049_v1.0/Deployment/VF_LICENSE/vf-license-model.xml
similarity index 100%
copy from s3p/templates/memoryPageSize/Artifacts/org.openecomp.resource.vf.Vgw1181049_v1.0/Deployment/VF_LICENSE/vf-license-model.xml
copy to testsuites/stability/src/main/resources/testplans/templates/memoryPageSize/Artifacts/org.openecomp.resource.vf.Vgw1181049_v1.0/Deployment/VF_LICENSE/vf-license-model.xml
diff --git a/s3p/templates/memoryPageSize/Definitions/annotations.yml b/testsuites/stability/src/main/resources/testplans/templates/memoryPageSize/Definitions/annotations.yml
similarity index 100%
copy from s3p/templates/memoryPageSize/Definitions/annotations.yml
copy to testsuites/stability/src/main/resources/testplans/templates/memoryPageSize/Definitions/annotations.yml
diff --git a/s3p/templates/memoryPageSize/Definitions/artifacts.yml b/testsuites/stability/src/main/resources/testplans/templates/memoryPageSize/Definitions/artifacts.yml
similarity index 100%
copy from s3p/templates/memoryPageSize/Definitions/artifacts.yml
copy to testsuites/stability/src/main/resources/testplans/templates/memoryPageSize/Definitions/artifacts.yml
diff --git a/s3p/templates/memoryPageSize/Definitions/capabilities.yml b/testsuites/stability/src/main/resources/testplans/templates/memoryPageSize/Definitions/capabilities.yml
similarity index 100%
copy from s3p/templates/memoryPageSize/Definitions/capabilities.yml
copy to testsuites/stability/src/main/resources/testplans/templates/memoryPageSize/Definitions/capabilities.yml
diff --git a/s3p/templates/memoryPageSize/Definitions/data.yml b/testsuites/stability/src/main/resources/testplans/templates/memoryPageSize/Definitions/data.yml
similarity index 100%
copy from s3p/templates/memoryPageSize/Definitions/data.yml
copy to testsuites/stability/src/main/resources/testplans/templates/memoryPageSize/Definitions/data.yml
diff --git a/s3p/templates/memoryPageSize/Definitions/groups.yml b/testsuites/stability/src/main/resources/testplans/templates/memoryPageSize/Definitions/groups.yml
similarity index 100%
copy from s3p/templates/memoryPageSize/Definitions/groups.yml
copy to testsuites/stability/src/main/resources/testplans/templates/memoryPageSize/Definitions/groups.yml
diff --git a/s3p/templates/memoryPageSize/Definitions/interfaces.yml b/testsuites/stability/src/main/resources/testplans/templates/memoryPageSize/Definitions/interfaces.yml
similarity index 100%
copy from s3p/templates/memoryPageSize/Definitions/interfaces.yml
copy to testsuites/stability/src/main/resources/testplans/templates/memoryPageSize/Definitions/interfaces.yml
diff --git a/s3p/templates/memoryPageSize/Definitions/nodes.yml b/testsuites/stability/src/main/resources/testplans/templates/memoryPageSize/Definitions/nodes.yml
similarity index 100%
copy from s3p/templates/memoryPageSize/Definitions/nodes.yml
copy to testsuites/stability/src/main/resources/testplans/templates/memoryPageSize/Definitions/nodes.yml
diff --git a/s3p/templates/memoryPageSize/Definitions/policies.yml b/testsuites/stability/src/main/resources/testplans/templates/memoryPageSize/Definitions/policies.yml
similarity index 100%
copy from s3p/templates/memoryPageSize/Definitions/policies.yml
copy to testsuites/stability/src/main/resources/testplans/templates/memoryPageSize/Definitions/policies.yml
diff --git a/s3p/templates/memoryPageSize/Definitions/relationships.yml b/testsuites/stability/src/main/resources/testplans/templates/memoryPageSize/Definitions/relationships.yml
similarity index 100%
copy from s3p/templates/memoryPageSize/Definitions/relationships.yml
copy to testsuites/stability/src/main/resources/testplans/templates/memoryPageSize/Definitions/relationships.yml
diff --git a/s3p/templates/memoryPageSize/Definitions/resource-VduCompute-template.yml b/testsuites/stability/src/main/resources/testplans/templates/memoryPageSize/Definitions/resource-VduCompute-template.yml
similarity index 100%
copy from s3p/templates/memoryPageSize/Definitions/resource-VduCompute-template.yml
copy to testsuites/stability/src/main/resources/testplans/templates/memoryPageSize/Definitions/resource-VduCompute-template.yml
diff --git a/s3p/templates/memoryPageSize/Definitions/resource-VduCp-template.yml b/testsuites/stability/src/main/resources/testplans/templates/memoryPageSize/Definitions/resource-VduCp-template.yml
similarity index 100%
copy from s3p/templates/memoryPageSize/Definitions/resource-VduCp-template.yml
copy to testsuites/stability/src/main/resources/testplans/templates/memoryPageSize/Definitions/resource-VduCp-template.yml
diff --git a/s3p/templates/memoryPageSize/Definitions/resource-VduVirtualstorage-template.yml b/testsuites/stability/src/main/resources/testplans/templates/memoryPageSize/Definitions/resource-VduVirtualstorage-template.yml
similarity index 100%
copy from s3p/templates/memoryPageSize/Definitions/resource-VduVirtualstorage-template.yml
copy to testsuites/stability/src/main/resources/testplans/templates/memoryPageSize/Definitions/resource-VduVirtualstorage-template.yml
diff --git a/s3p/templates/memoryPageSize/Definitions/resource-Vgw1181049-template-interface.yml b/testsuites/stability/src/main/resources/testplans/templates/memoryPageSize/Definitions/resource-Vgw1181049-template-interface.yml
similarity index 100%
copy from s3p/templates/memoryPageSize/Definitions/resource-Vgw1181049-template-interface.yml
copy to testsuites/stability/src/main/resources/testplans/templates/memoryPageSize/Definitions/resource-Vgw1181049-template-interface.yml
diff --git a/s3p/templates/memoryPageSize/Definitions/resource-Vgw1181049-template.yml b/testsuites/stability/src/main/resources/testplans/templates/memoryPageSize/Definitions/resource-Vgw1181049-template.yml
similarity index 100%
copy from s3p/templates/memoryPageSize/Definitions/resource-Vgw1181049-template.yml
copy to testsuites/stability/src/main/resources/testplans/templates/memoryPageSize/Definitions/resource-Vgw1181049-template.yml
diff --git a/s3p/templates/memoryPageSize/Definitions/resource-Vnf-template.yml b/testsuites/stability/src/main/resources/testplans/templates/memoryPageSize/Definitions/resource-Vnf-template.yml
similarity index 100%
copy from s3p/templates/memoryPageSize/Definitions/resource-Vnf-template.yml
copy to testsuites/stability/src/main/resources/testplans/templates/memoryPageSize/Definitions/resource-Vnf-template.yml
diff --git a/s3p/templates/memoryPageSize/Definitions/resource-Vnfvirtuallink-template.yml b/testsuites/stability/src/main/resources/testplans/templates/memoryPageSize/Definitions/resource-Vnfvirtuallink-template.yml
similarity index 100%
copy from s3p/templates/memoryPageSize/Definitions/resource-Vnfvirtuallink-template.yml
copy to testsuites/stability/src/main/resources/testplans/templates/memoryPageSize/Definitions/resource-Vnfvirtuallink-template.yml
diff --git a/s3p/templates/memoryPageSize/Definitions/service-Testns8-template-interface.yml b/testsuites/stability/src/main/resources/testplans/templates/memoryPageSize/Definitions/service-Testns8-template-interface.yml
similarity index 100%
copy from s3p/templates/memoryPageSize/Definitions/service-Testns8-template-interface.yml
copy to testsuites/stability/src/main/resources/testplans/templates/memoryPageSize/Definitions/service-Testns8-template-interface.yml
diff --git a/s3p/templates/memoryPageSize/Definitions/service-Testns8-template.yml b/testsuites/stability/src/main/resources/testplans/templates/memoryPageSize/Definitions/service-Testns8-template.yml
similarity index 100%
copy from s3p/templates/memoryPageSize/Definitions/service-Testns8-template.yml
copy to testsuites/stability/src/main/resources/testplans/templates/memoryPageSize/Definitions/service-Testns8-template.yml
diff --git a/s3p/templates/memoryPageSize/TOSCA-Metadata/TOSCA.meta b/testsuites/stability/src/main/resources/testplans/templates/memoryPageSize/TOSCA-Metadata/TOSCA.meta
similarity index 100%
copy from s3p/templates/memoryPageSize/TOSCA-Metadata/TOSCA.meta
copy to testsuites/stability/src/main/resources/testplans/templates/memoryPageSize/TOSCA-Metadata/TOSCA.meta
diff --git a/s3p/templates/memoryPageSize/csar.meta b/testsuites/stability/src/main/resources/testplans/templates/memoryPageSize/csar.meta
similarity index 100%
copy from s3p/templates/memoryPageSize/csar.meta
copy to testsuites/stability/src/main/resources/testplans/templates/memoryPageSize/csar.meta
diff --git a/s3p/templates/numberOfPages/Artifacts/org.openecomp.resource.vf.Vgw1181049_v1.0/Deployment/OTHER/authorized_keys b/testsuites/stability/src/main/resources/testplans/templates/numberOfPages/Artifacts/org.openecomp.resource.vf.Vgw1181049_v1.0/Deployment/OTHER/authorized_keys
similarity index 100%
copy from s3p/templates/numberOfPages/Artifacts/org.openecomp.resource.vf.Vgw1181049_v1.0/Deployment/OTHER/authorized_keys
copy to testsuites/stability/src/main/resources/testplans/templates/numberOfPages/Artifacts/org.openecomp.resource.vf.Vgw1181049_v1.0/Deployment/OTHER/authorized_keys
diff --git a/s3p/templates/numberOfPages/Artifacts/org.openecomp.resource.vf.Vgw1181049_v1.0/Deployment/OTHER/id_rsa b/testsuites/stability/src/main/resources/testplans/templates/numberOfPages/Artifacts/org.openecomp.resource.vf.Vgw1181049_v1.0/Deployment/OTHER/id_rsa
similarity index 100%
copy from s3p/templates/numberOfPages/Artifacts/org.openecomp.resource.vf.Vgw1181049_v1.0/Deployment/OTHER/id_rsa
copy to testsuites/stability/src/main/resources/testplans/templates/numberOfPages/Artifacts/org.openecomp.resource.vf.Vgw1181049_v1.0/Deployment/OTHER/id_rsa
diff --git a/s3p/templates/numberOfPages/Artifacts/org.openecomp.resource.vf.Vgw1181049_v1.0/Deployment/OTHER/id_rsa.pub b/testsuites/stability/src/main/resources/testplans/templates/numberOfPages/Artifacts/org.openecomp.resource.vf.Vgw1181049_v1.0/Deployment/OTHER/id_rsa.pub
similarity index 100%
copy from s3p/templates/numberOfPages/Artifacts/org.openecomp.resource.vf.Vgw1181049_v1.0/Deployment/OTHER/id_rsa.pub
copy to testsuites/stability/src/main/resources/testplans/templates/numberOfPages/Artifacts/org.openecomp.resource.vf.Vgw1181049_v1.0/Deployment/OTHER/id_rsa.pub
diff --git a/s3p/templates/numberOfPages/Artifacts/org.openecomp.resource.vf.Vgw1181049_v1.0/Deployment/OTHER/image b/testsuites/stability/src/main/resources/testplans/templates/numberOfPages/Artifacts/org.openecomp.resource.vf.Vgw1181049_v1.0/Deployment/OTHER/image
similarity index 100%
copy from s3p/templates/numberOfPages/Artifacts/org.openecomp.resource.vf.Vgw1181049_v1.0/Deployment/OTHER/image
copy to testsuites/stability/src/main/resources/testplans/templates/numberOfPages/Artifacts/org.openecomp.resource.vf.Vgw1181049_v1.0/Deployment/OTHER/image
diff --git a/s3p/templates/numberOfPages/Artifacts/org.openecomp.resource.vf.Vgw1181049_v1.0/Deployment/VENDOR_LICENSE/vendor-license-model.xml b/testsuites/stability/src/main/resources/testplans/templates/numberOfPages/Artifacts/org.openecomp.resource.vf.Vgw1181049_v1.0/Deployment/VENDOR_LICENSE/vendor-license-model.xml
similarity index 100%
copy from s3p/templates/numberOfPages/Artifacts/org.openecomp.resource.vf.Vgw1181049_v1.0/Deployment/VENDOR_LICENSE/vendor-license-model.xml
copy to testsuites/stability/src/main/resources/testplans/templates/numberOfPages/Artifacts/org.openecomp.resource.vf.Vgw1181049_v1.0/Deployment/VENDOR_LICENSE/vendor-license-model.xml
diff --git a/s3p/templates/numberOfPages/Artifacts/org.openecomp.resource.vf.Vgw1181049_v1.0/Deployment/VF_LICENSE/vf-license-model.xml b/testsuites/stability/src/main/resources/testplans/templates/numberOfPages/Artifacts/org.openecomp.resource.vf.Vgw1181049_v1.0/Deployment/VF_LICENSE/vf-license-model.xml
similarity index 100%
copy from s3p/templates/numberOfPages/Artifacts/org.openecomp.resource.vf.Vgw1181049_v1.0/Deployment/VF_LICENSE/vf-license-model.xml
copy to testsuites/stability/src/main/resources/testplans/templates/numberOfPages/Artifacts/org.openecomp.resource.vf.Vgw1181049_v1.0/Deployment/VF_LICENSE/vf-license-model.xml
diff --git a/s3p/templates/numberOfPages/Definitions/annotations.yml b/testsuites/stability/src/main/resources/testplans/templates/numberOfPages/Definitions/annotations.yml
similarity index 100%
copy from s3p/templates/numberOfPages/Definitions/annotations.yml
copy to testsuites/stability/src/main/resources/testplans/templates/numberOfPages/Definitions/annotations.yml
diff --git a/s3p/templates/numberOfPages/Definitions/artifacts.yml b/testsuites/stability/src/main/resources/testplans/templates/numberOfPages/Definitions/artifacts.yml
similarity index 100%
copy from s3p/templates/numberOfPages/Definitions/artifacts.yml
copy to testsuites/stability/src/main/resources/testplans/templates/numberOfPages/Definitions/artifacts.yml
diff --git a/s3p/templates/numberOfPages/Definitions/capabilities.yml b/testsuites/stability/src/main/resources/testplans/templates/numberOfPages/Definitions/capabilities.yml
similarity index 100%
copy from s3p/templates/numberOfPages/Definitions/capabilities.yml
copy to testsuites/stability/src/main/resources/testplans/templates/numberOfPages/Definitions/capabilities.yml
diff --git a/s3p/templates/numberOfPages/Definitions/data.yml b/testsuites/stability/src/main/resources/testplans/templates/numberOfPages/Definitions/data.yml
similarity index 100%
copy from s3p/templates/numberOfPages/Definitions/data.yml
copy to testsuites/stability/src/main/resources/testplans/templates/numberOfPages/Definitions/data.yml
diff --git a/s3p/templates/numberOfPages/Definitions/groups.yml b/testsuites/stability/src/main/resources/testplans/templates/numberOfPages/Definitions/groups.yml
similarity index 100%
copy from s3p/templates/numberOfPages/Definitions/groups.yml
copy to testsuites/stability/src/main/resources/testplans/templates/numberOfPages/Definitions/groups.yml
diff --git a/s3p/templates/numberOfPages/Definitions/interfaces.yml b/testsuites/stability/src/main/resources/testplans/templates/numberOfPages/Definitions/interfaces.yml
similarity index 100%
copy from s3p/templates/numberOfPages/Definitions/interfaces.yml
copy to testsuites/stability/src/main/resources/testplans/templates/numberOfPages/Definitions/interfaces.yml
diff --git a/s3p/templates/numberOfPages/Definitions/nodes.yml b/testsuites/stability/src/main/resources/testplans/templates/numberOfPages/Definitions/nodes.yml
similarity index 100%
copy from s3p/templates/numberOfPages/Definitions/nodes.yml
copy to testsuites/stability/src/main/resources/testplans/templates/numberOfPages/Definitions/nodes.yml
diff --git a/s3p/templates/numberOfPages/Definitions/policies.yml b/testsuites/stability/src/main/resources/testplans/templates/numberOfPages/Definitions/policies.yml
similarity index 100%
copy from s3p/templates/numberOfPages/Definitions/policies.yml
copy to testsuites/stability/src/main/resources/testplans/templates/numberOfPages/Definitions/policies.yml
diff --git a/s3p/templates/numberOfPages/Definitions/relationships.yml b/testsuites/stability/src/main/resources/testplans/templates/numberOfPages/Definitions/relationships.yml
similarity index 100%
copy from s3p/templates/numberOfPages/Definitions/relationships.yml
copy to testsuites/stability/src/main/resources/testplans/templates/numberOfPages/Definitions/relationships.yml
diff --git a/s3p/templates/numberOfPages/Definitions/resource-VduCompute-template.yml b/testsuites/stability/src/main/resources/testplans/templates/numberOfPages/Definitions/resource-VduCompute-template.yml
similarity index 100%
copy from s3p/templates/numberOfPages/Definitions/resource-VduCompute-template.yml
copy to testsuites/stability/src/main/resources/testplans/templates/numberOfPages/Definitions/resource-VduCompute-template.yml
diff --git a/s3p/templates/numberOfPages/Definitions/resource-VduCp-template.yml b/testsuites/stability/src/main/resources/testplans/templates/numberOfPages/Definitions/resource-VduCp-template.yml
similarity index 100%
copy from s3p/templates/numberOfPages/Definitions/resource-VduCp-template.yml
copy to testsuites/stability/src/main/resources/testplans/templates/numberOfPages/Definitions/resource-VduCp-template.yml
diff --git a/s3p/templates/numberOfPages/Definitions/resource-VduVirtualstorage-template.yml b/testsuites/stability/src/main/resources/testplans/templates/numberOfPages/Definitions/resource-VduVirtualstorage-template.yml
similarity index 100%
copy from s3p/templates/numberOfPages/Definitions/resource-VduVirtualstorage-template.yml
copy to testsuites/stability/src/main/resources/testplans/templates/numberOfPages/Definitions/resource-VduVirtualstorage-template.yml
diff --git a/s3p/templates/numberOfPages/Definitions/resource-Vgw1181049-template-interface.yml b/testsuites/stability/src/main/resources/testplans/templates/numberOfPages/Definitions/resource-Vgw1181049-template-interface.yml
similarity index 100%
copy from s3p/templates/numberOfPages/Definitions/resource-Vgw1181049-template-interface.yml
copy to testsuites/stability/src/main/resources/testplans/templates/numberOfPages/Definitions/resource-Vgw1181049-template-interface.yml
diff --git a/s3p/templates/numberOfPages/Definitions/resource-Vgw1181049-template.yml b/testsuites/stability/src/main/resources/testplans/templates/numberOfPages/Definitions/resource-Vgw1181049-template.yml
similarity index 100%
copy from s3p/templates/numberOfPages/Definitions/resource-Vgw1181049-template.yml
copy to testsuites/stability/src/main/resources/testplans/templates/numberOfPages/Definitions/resource-Vgw1181049-template.yml
diff --git a/s3p/templates/numberOfPages/Definitions/resource-Vnf-template.yml b/testsuites/stability/src/main/resources/testplans/templates/numberOfPages/Definitions/resource-Vnf-template.yml
similarity index 100%
copy from s3p/templates/numberOfPages/Definitions/resource-Vnf-template.yml
copy to testsuites/stability/src/main/resources/testplans/templates/numberOfPages/Definitions/resource-Vnf-template.yml
diff --git a/s3p/templates/numberOfPages/Definitions/resource-Vnfvirtuallink-template.yml b/testsuites/stability/src/main/resources/testplans/templates/numberOfPages/Definitions/resource-Vnfvirtuallink-template.yml
similarity index 100%
copy from s3p/templates/numberOfPages/Definitions/resource-Vnfvirtuallink-template.yml
copy to testsuites/stability/src/main/resources/testplans/templates/numberOfPages/Definitions/resource-Vnfvirtuallink-template.yml
diff --git a/s3p/templates/numberOfPages/Definitions/service-Testns8-template-interface.yml b/testsuites/stability/src/main/resources/testplans/templates/numberOfPages/Definitions/service-Testns8-template-interface.yml
similarity index 100%
copy from s3p/templates/numberOfPages/Definitions/service-Testns8-template-interface.yml
copy to testsuites/stability/src/main/resources/testplans/templates/numberOfPages/Definitions/service-Testns8-template-interface.yml
diff --git a/s3p/templates/numberOfPages/Definitions/service-Testns8-template.yml b/testsuites/stability/src/main/resources/testplans/templates/numberOfPages/Definitions/service-Testns8-template.yml
similarity index 100%
copy from s3p/templates/numberOfPages/Definitions/service-Testns8-template.yml
copy to testsuites/stability/src/main/resources/testplans/templates/numberOfPages/Definitions/service-Testns8-template.yml
diff --git a/s3p/templates/numberOfPages/TOSCA-Metadata/TOSCA.meta b/testsuites/stability/src/main/resources/testplans/templates/numberOfPages/TOSCA-Metadata/TOSCA.meta
similarity index 100%
rename from s3p/templates/numberOfPages/TOSCA-Metadata/TOSCA.meta
rename to testsuites/stability/src/main/resources/testplans/templates/numberOfPages/TOSCA-Metadata/TOSCA.meta
diff --git a/s3p/templates/numberOfPages/csar.meta b/testsuites/stability/src/main/resources/testplans/templates/numberOfPages/csar.meta
similarity index 100%
copy from s3p/templates/numberOfPages/csar.meta
copy to testsuites/stability/src/main/resources/testplans/templates/numberOfPages/csar.meta
diff --git a/s3p/templates/pciDeviceId/Artifacts/org.openecomp.resource.vf.Vgw1181049_v1.0/Deployment/OTHER/authorized_keys b/testsuites/stability/src/main/resources/testplans/templates/pciDeviceId/Artifacts/org.openecomp.resource.vf.Vgw1181049_v1.0/Deployment/OTHER/authorized_keys
similarity index 100%
copy from s3p/templates/pciDeviceId/Artifacts/org.openecomp.resource.vf.Vgw1181049_v1.0/Deployment/OTHER/authorized_keys
copy to testsuites/stability/src/main/resources/testplans/templates/pciDeviceId/Artifacts/org.openecomp.resource.vf.Vgw1181049_v1.0/Deployment/OTHER/authorized_keys
diff --git a/s3p/templates/pciDeviceId/Artifacts/org.openecomp.resource.vf.Vgw1181049_v1.0/Deployment/OTHER/id_rsa b/testsuites/stability/src/main/resources/testplans/templates/pciDeviceId/Artifacts/org.openecomp.resource.vf.Vgw1181049_v1.0/Deployment/OTHER/id_rsa
similarity index 100%
copy from s3p/templates/pciDeviceId/Artifacts/org.openecomp.resource.vf.Vgw1181049_v1.0/Deployment/OTHER/id_rsa
copy to testsuites/stability/src/main/resources/testplans/templates/pciDeviceId/Artifacts/org.openecomp.resource.vf.Vgw1181049_v1.0/Deployment/OTHER/id_rsa
diff --git a/s3p/templates/pciDeviceId/Artifacts/org.openecomp.resource.vf.Vgw1181049_v1.0/Deployment/OTHER/id_rsa.pub b/testsuites/stability/src/main/resources/testplans/templates/pciDeviceId/Artifacts/org.openecomp.resource.vf.Vgw1181049_v1.0/Deployment/OTHER/id_rsa.pub
similarity index 100%
copy from s3p/templates/pciDeviceId/Artifacts/org.openecomp.resource.vf.Vgw1181049_v1.0/Deployment/OTHER/id_rsa.pub
copy to testsuites/stability/src/main/resources/testplans/templates/pciDeviceId/Artifacts/org.openecomp.resource.vf.Vgw1181049_v1.0/Deployment/OTHER/id_rsa.pub
diff --git a/s3p/templates/pciDeviceId/Artifacts/org.openecomp.resource.vf.Vgw1181049_v1.0/Deployment/OTHER/image b/testsuites/stability/src/main/resources/testplans/templates/pciDeviceId/Artifacts/org.openecomp.resource.vf.Vgw1181049_v1.0/Deployment/OTHER/image
similarity index 100%
copy from s3p/templates/pciDeviceId/Artifacts/org.openecomp.resource.vf.Vgw1181049_v1.0/Deployment/OTHER/image
copy to testsuites/stability/src/main/resources/testplans/templates/pciDeviceId/Artifacts/org.openecomp.resource.vf.Vgw1181049_v1.0/Deployment/OTHER/image
diff --git a/s3p/templates/pciDeviceId/Artifacts/org.openecomp.resource.vf.Vgw1181049_v1.0/Deployment/VENDOR_LICENSE/vendor-license-model.xml b/testsuites/stability/src/main/resources/testplans/templates/pciDeviceId/Artifacts/org.openecomp.resource.vf.Vgw1181049_v1.0/Deployment/VENDOR_LICENSE/vendor-license-model.xml
similarity index 100%
copy from s3p/templates/pciDeviceId/Artifacts/org.openecomp.resource.vf.Vgw1181049_v1.0/Deployment/VENDOR_LICENSE/vendor-license-model.xml
copy to testsuites/stability/src/main/resources/testplans/templates/pciDeviceId/Artifacts/org.openecomp.resource.vf.Vgw1181049_v1.0/Deployment/VENDOR_LICENSE/vendor-license-model.xml
diff --git a/s3p/templates/pciDeviceId/Artifacts/org.openecomp.resource.vf.Vgw1181049_v1.0/Deployment/VF_LICENSE/vf-license-model.xml b/testsuites/stability/src/main/resources/testplans/templates/pciDeviceId/Artifacts/org.openecomp.resource.vf.Vgw1181049_v1.0/Deployment/VF_LICENSE/vf-license-model.xml
similarity index 100%
copy from s3p/templates/pciDeviceId/Artifacts/org.openecomp.resource.vf.Vgw1181049_v1.0/Deployment/VF_LICENSE/vf-license-model.xml
copy to testsuites/stability/src/main/resources/testplans/templates/pciDeviceId/Artifacts/org.openecomp.resource.vf.Vgw1181049_v1.0/Deployment/VF_LICENSE/vf-license-model.xml
diff --git a/s3p/templates/pciDeviceId/Definitions/annotations.yml b/testsuites/stability/src/main/resources/testplans/templates/pciDeviceId/Definitions/annotations.yml
similarity index 100%
copy from s3p/templates/pciDeviceId/Definitions/annotations.yml
copy to testsuites/stability/src/main/resources/testplans/templates/pciDeviceId/Definitions/annotations.yml
diff --git a/s3p/templates/pciDeviceId/Definitions/artifacts.yml b/testsuites/stability/src/main/resources/testplans/templates/pciDeviceId/Definitions/artifacts.yml
similarity index 100%
copy from s3p/templates/pciDeviceId/Definitions/artifacts.yml
copy to testsuites/stability/src/main/resources/testplans/templates/pciDeviceId/Definitions/artifacts.yml
diff --git a/s3p/templates/pciDeviceId/Definitions/capabilities.yml b/testsuites/stability/src/main/resources/testplans/templates/pciDeviceId/Definitions/capabilities.yml
similarity index 100%
copy from s3p/templates/pciDeviceId/Definitions/capabilities.yml
copy to testsuites/stability/src/main/resources/testplans/templates/pciDeviceId/Definitions/capabilities.yml
diff --git a/s3p/templates/pciDeviceId/Definitions/data.yml b/testsuites/stability/src/main/resources/testplans/templates/pciDeviceId/Definitions/data.yml
similarity index 100%
copy from s3p/templates/pciDeviceId/Definitions/data.yml
copy to testsuites/stability/src/main/resources/testplans/templates/pciDeviceId/Definitions/data.yml
diff --git a/s3p/templates/pciDeviceId/Definitions/groups.yml b/testsuites/stability/src/main/resources/testplans/templates/pciDeviceId/Definitions/groups.yml
similarity index 100%
copy from s3p/templates/pciDeviceId/Definitions/groups.yml
copy to testsuites/stability/src/main/resources/testplans/templates/pciDeviceId/Definitions/groups.yml
diff --git a/s3p/templates/pciDeviceId/Definitions/interfaces.yml b/testsuites/stability/src/main/resources/testplans/templates/pciDeviceId/Definitions/interfaces.yml
similarity index 100%
copy from s3p/templates/pciDeviceId/Definitions/interfaces.yml
copy to testsuites/stability/src/main/resources/testplans/templates/pciDeviceId/Definitions/interfaces.yml
diff --git a/s3p/templates/pciDeviceId/Definitions/nodes.yml b/testsuites/stability/src/main/resources/testplans/templates/pciDeviceId/Definitions/nodes.yml
similarity index 100%
copy from s3p/templates/pciDeviceId/Definitions/nodes.yml
copy to testsuites/stability/src/main/resources/testplans/templates/pciDeviceId/Definitions/nodes.yml
diff --git a/s3p/templates/pciDeviceId/Definitions/policies.yml b/testsuites/stability/src/main/resources/testplans/templates/pciDeviceId/Definitions/policies.yml
similarity index 100%
copy from s3p/templates/pciDeviceId/Definitions/policies.yml
copy to testsuites/stability/src/main/resources/testplans/templates/pciDeviceId/Definitions/policies.yml
diff --git a/s3p/templates/pciDeviceId/Definitions/relationships.yml b/testsuites/stability/src/main/resources/testplans/templates/pciDeviceId/Definitions/relationships.yml
similarity index 100%
copy from s3p/templates/pciDeviceId/Definitions/relationships.yml
copy to testsuites/stability/src/main/resources/testplans/templates/pciDeviceId/Definitions/relationships.yml
diff --git a/s3p/templates/pciDeviceId/Definitions/resource-VduCompute-template.yml b/testsuites/stability/src/main/resources/testplans/templates/pciDeviceId/Definitions/resource-VduCompute-template.yml
similarity index 100%
copy from s3p/templates/pciDeviceId/Definitions/resource-VduCompute-template.yml
copy to testsuites/stability/src/main/resources/testplans/templates/pciDeviceId/Definitions/resource-VduCompute-template.yml
diff --git a/s3p/templates/pciDeviceId/Definitions/resource-VduCp-template.yml b/testsuites/stability/src/main/resources/testplans/templates/pciDeviceId/Definitions/resource-VduCp-template.yml
similarity index 100%
copy from s3p/templates/pciDeviceId/Definitions/resource-VduCp-template.yml
copy to testsuites/stability/src/main/resources/testplans/templates/pciDeviceId/Definitions/resource-VduCp-template.yml
diff --git a/s3p/templates/pciDeviceId/Definitions/resource-VduVirtualstorage-template.yml b/testsuites/stability/src/main/resources/testplans/templates/pciDeviceId/Definitions/resource-VduVirtualstorage-template.yml
similarity index 100%
copy from s3p/templates/pciDeviceId/Definitions/resource-VduVirtualstorage-template.yml
copy to testsuites/stability/src/main/resources/testplans/templates/pciDeviceId/Definitions/resource-VduVirtualstorage-template.yml
diff --git a/s3p/templates/pciDeviceId/Definitions/resource-Vgw1181049-template-interface.yml b/testsuites/stability/src/main/resources/testplans/templates/pciDeviceId/Definitions/resource-Vgw1181049-template-interface.yml
similarity index 100%
copy from s3p/templates/pciDeviceId/Definitions/resource-Vgw1181049-template-interface.yml
copy to testsuites/stability/src/main/resources/testplans/templates/pciDeviceId/Definitions/resource-Vgw1181049-template-interface.yml
diff --git a/s3p/templates/pciDeviceId/Definitions/resource-Vgw1181049-template.yml b/testsuites/stability/src/main/resources/testplans/templates/pciDeviceId/Definitions/resource-Vgw1181049-template.yml
similarity index 100%
copy from s3p/templates/pciDeviceId/Definitions/resource-Vgw1181049-template.yml
copy to testsuites/stability/src/main/resources/testplans/templates/pciDeviceId/Definitions/resource-Vgw1181049-template.yml
diff --git a/s3p/templates/pciDeviceId/Definitions/resource-Vnf-template.yml b/testsuites/stability/src/main/resources/testplans/templates/pciDeviceId/Definitions/resource-Vnf-template.yml
similarity index 100%
copy from s3p/templates/pciDeviceId/Definitions/resource-Vnf-template.yml
copy to testsuites/stability/src/main/resources/testplans/templates/pciDeviceId/Definitions/resource-Vnf-template.yml
diff --git a/s3p/templates/pciDeviceId/Definitions/resource-Vnfvirtuallink-template.yml b/testsuites/stability/src/main/resources/testplans/templates/pciDeviceId/Definitions/resource-Vnfvirtuallink-template.yml
similarity index 100%
copy from s3p/templates/pciDeviceId/Definitions/resource-Vnfvirtuallink-template.yml
copy to testsuites/stability/src/main/resources/testplans/templates/pciDeviceId/Definitions/resource-Vnfvirtuallink-template.yml
diff --git a/s3p/templates/pciDeviceId/Definitions/service-Testns8-template-interface.yml b/testsuites/stability/src/main/resources/testplans/templates/pciDeviceId/Definitions/service-Testns8-template-interface.yml
similarity index 100%
copy from s3p/templates/pciDeviceId/Definitions/service-Testns8-template-interface.yml
copy to testsuites/stability/src/main/resources/testplans/templates/pciDeviceId/Definitions/service-Testns8-template-interface.yml
diff --git a/s3p/templates/pciDeviceId/Definitions/service-Testns8-template.yml b/testsuites/stability/src/main/resources/testplans/templates/pciDeviceId/Definitions/service-Testns8-template.yml
similarity index 100%
copy from s3p/templates/pciDeviceId/Definitions/service-Testns8-template.yml
copy to testsuites/stability/src/main/resources/testplans/templates/pciDeviceId/Definitions/service-Testns8-template.yml
diff --git a/s3p/templates/pciDeviceId/TOSCA-Metadata/TOSCA.meta b/testsuites/stability/src/main/resources/testplans/templates/pciDeviceId/TOSCA-Metadata/TOSCA.meta
similarity index 100%
copy from s3p/templates/pciDeviceId/TOSCA-Metadata/TOSCA.meta
copy to testsuites/stability/src/main/resources/testplans/templates/pciDeviceId/TOSCA-Metadata/TOSCA.meta
diff --git a/s3p/templates/pciDeviceId/csar.meta b/testsuites/stability/src/main/resources/testplans/templates/pciDeviceId/csar.meta
similarity index 100%
copy from s3p/templates/pciDeviceId/csar.meta
copy to testsuites/stability/src/main/resources/testplans/templates/pciDeviceId/csar.meta
diff --git a/s3p/templates/pciNumDevices/Artifacts/org.openecomp.resource.vf.Vgw1181049_v1.0/Deployment/OTHER/authorized_keys b/testsuites/stability/src/main/resources/testplans/templates/pciNumDevices/Artifacts/org.openecomp.resource.vf.Vgw1181049_v1.0/Deployment/OTHER/authorized_keys
similarity index 100%
copy from s3p/templates/pciNumDevices/Artifacts/org.openecomp.resource.vf.Vgw1181049_v1.0/Deployment/OTHER/authorized_keys
copy to testsuites/stability/src/main/resources/testplans/templates/pciNumDevices/Artifacts/org.openecomp.resource.vf.Vgw1181049_v1.0/Deployment/OTHER/authorized_keys
diff --git a/s3p/templates/pciNumDevices/Artifacts/org.openecomp.resource.vf.Vgw1181049_v1.0/Deployment/OTHER/id_rsa b/testsuites/stability/src/main/resources/testplans/templates/pciNumDevices/Artifacts/org.openecomp.resource.vf.Vgw1181049_v1.0/Deployment/OTHER/id_rsa
similarity index 100%
copy from s3p/templates/pciNumDevices/Artifacts/org.openecomp.resource.vf.Vgw1181049_v1.0/Deployment/OTHER/id_rsa
copy to testsuites/stability/src/main/resources/testplans/templates/pciNumDevices/Artifacts/org.openecomp.resource.vf.Vgw1181049_v1.0/Deployment/OTHER/id_rsa
diff --git a/s3p/templates/pciNumDevices/Artifacts/org.openecomp.resource.vf.Vgw1181049_v1.0/Deployment/OTHER/id_rsa.pub b/testsuites/stability/src/main/resources/testplans/templates/pciNumDevices/Artifacts/org.openecomp.resource.vf.Vgw1181049_v1.0/Deployment/OTHER/id_rsa.pub
similarity index 100%
copy from s3p/templates/pciNumDevices/Artifacts/org.openecomp.resource.vf.Vgw1181049_v1.0/Deployment/OTHER/id_rsa.pub
copy to testsuites/stability/src/main/resources/testplans/templates/pciNumDevices/Artifacts/org.openecomp.resource.vf.Vgw1181049_v1.0/Deployment/OTHER/id_rsa.pub
diff --git a/s3p/templates/pciNumDevices/Artifacts/org.openecomp.resource.vf.Vgw1181049_v1.0/Deployment/OTHER/image b/testsuites/stability/src/main/resources/testplans/templates/pciNumDevices/Artifacts/org.openecomp.resource.vf.Vgw1181049_v1.0/Deployment/OTHER/image
similarity index 100%
copy from s3p/templates/pciNumDevices/Artifacts/org.openecomp.resource.vf.Vgw1181049_v1.0/Deployment/OTHER/image
copy to testsuites/stability/src/main/resources/testplans/templates/pciNumDevices/Artifacts/org.openecomp.resource.vf.Vgw1181049_v1.0/Deployment/OTHER/image
diff --git a/s3p/templates/pciNumDevices/Artifacts/org.openecomp.resource.vf.Vgw1181049_v1.0/Deployment/VENDOR_LICENSE/vendor-license-model.xml b/testsuites/stability/src/main/resources/testplans/templates/pciNumDevices/Artifacts/org.openecomp.resource.vf.Vgw1181049_v1.0/Deployment/VENDOR_LICENSE/vendor-license-model.xml
similarity index 100%
copy from s3p/templates/pciNumDevices/Artifacts/org.openecomp.resource.vf.Vgw1181049_v1.0/Deployment/VENDOR_LICENSE/vendor-license-model.xml
copy to testsuites/stability/src/main/resources/testplans/templates/pciNumDevices/Artifacts/org.openecomp.resource.vf.Vgw1181049_v1.0/Deployment/VENDOR_LICENSE/vendor-license-model.xml
diff --git a/s3p/templates/pciNumDevices/Artifacts/org.openecomp.resource.vf.Vgw1181049_v1.0/Deployment/VF_LICENSE/vf-license-model.xml b/testsuites/stability/src/main/resources/testplans/templates/pciNumDevices/Artifacts/org.openecomp.resource.vf.Vgw1181049_v1.0/Deployment/VF_LICENSE/vf-license-model.xml
similarity index 100%
copy from s3p/templates/pciNumDevices/Artifacts/org.openecomp.resource.vf.Vgw1181049_v1.0/Deployment/VF_LICENSE/vf-license-model.xml
copy to testsuites/stability/src/main/resources/testplans/templates/pciNumDevices/Artifacts/org.openecomp.resource.vf.Vgw1181049_v1.0/Deployment/VF_LICENSE/vf-license-model.xml
diff --git a/s3p/templates/pciNumDevices/Definitions/annotations.yml b/testsuites/stability/src/main/resources/testplans/templates/pciNumDevices/Definitions/annotations.yml
similarity index 100%
copy from s3p/templates/pciNumDevices/Definitions/annotations.yml
copy to testsuites/stability/src/main/resources/testplans/templates/pciNumDevices/Definitions/annotations.yml
diff --git a/s3p/templates/pciNumDevices/Definitions/artifacts.yml b/testsuites/stability/src/main/resources/testplans/templates/pciNumDevices/Definitions/artifacts.yml
similarity index 100%
copy from s3p/templates/pciNumDevices/Definitions/artifacts.yml
copy to testsuites/stability/src/main/resources/testplans/templates/pciNumDevices/Definitions/artifacts.yml
diff --git a/s3p/templates/pciNumDevices/Definitions/capabilities.yml b/testsuites/stability/src/main/resources/testplans/templates/pciNumDevices/Definitions/capabilities.yml
similarity index 100%
copy from s3p/templates/pciNumDevices/Definitions/capabilities.yml
copy to testsuites/stability/src/main/resources/testplans/templates/pciNumDevices/Definitions/capabilities.yml
diff --git a/s3p/templates/pciNumDevices/Definitions/data.yml b/testsuites/stability/src/main/resources/testplans/templates/pciNumDevices/Definitions/data.yml
similarity index 100%
copy from s3p/templates/pciNumDevices/Definitions/data.yml
copy to testsuites/stability/src/main/resources/testplans/templates/pciNumDevices/Definitions/data.yml
diff --git a/s3p/templates/pciNumDevices/Definitions/groups.yml b/testsuites/stability/src/main/resources/testplans/templates/pciNumDevices/Definitions/groups.yml
similarity index 100%
copy from s3p/templates/pciNumDevices/Definitions/groups.yml
copy to testsuites/stability/src/main/resources/testplans/templates/pciNumDevices/Definitions/groups.yml
diff --git a/s3p/templates/pciNumDevices/Definitions/interfaces.yml b/testsuites/stability/src/main/resources/testplans/templates/pciNumDevices/Definitions/interfaces.yml
similarity index 100%
copy from s3p/templates/pciNumDevices/Definitions/interfaces.yml
copy to testsuites/stability/src/main/resources/testplans/templates/pciNumDevices/Definitions/interfaces.yml
diff --git a/s3p/templates/pciNumDevices/Definitions/nodes.yml b/testsuites/stability/src/main/resources/testplans/templates/pciNumDevices/Definitions/nodes.yml
similarity index 100%
copy from s3p/templates/pciNumDevices/Definitions/nodes.yml
copy to testsuites/stability/src/main/resources/testplans/templates/pciNumDevices/Definitions/nodes.yml
diff --git a/s3p/templates/pciNumDevices/Definitions/policies.yml b/testsuites/stability/src/main/resources/testplans/templates/pciNumDevices/Definitions/policies.yml
similarity index 100%
copy from s3p/templates/pciNumDevices/Definitions/policies.yml
copy to testsuites/stability/src/main/resources/testplans/templates/pciNumDevices/Definitions/policies.yml
diff --git a/s3p/templates/pciNumDevices/Definitions/relationships.yml b/testsuites/stability/src/main/resources/testplans/templates/pciNumDevices/Definitions/relationships.yml
similarity index 100%
copy from s3p/templates/pciNumDevices/Definitions/relationships.yml
copy to testsuites/stability/src/main/resources/testplans/templates/pciNumDevices/Definitions/relationships.yml
diff --git a/s3p/templates/pciNumDevices/Definitions/resource-VduCompute-template.yml b/testsuites/stability/src/main/resources/testplans/templates/pciNumDevices/Definitions/resource-VduCompute-template.yml
similarity index 100%
copy from s3p/templates/pciNumDevices/Definitions/resource-VduCompute-template.yml
copy to testsuites/stability/src/main/resources/testplans/templates/pciNumDevices/Definitions/resource-VduCompute-template.yml
diff --git a/s3p/templates/pciNumDevices/Definitions/resource-VduCp-template.yml b/testsuites/stability/src/main/resources/testplans/templates/pciNumDevices/Definitions/resource-VduCp-template.yml
similarity index 100%
copy from s3p/templates/pciNumDevices/Definitions/resource-VduCp-template.yml
copy to testsuites/stability/src/main/resources/testplans/templates/pciNumDevices/Definitions/resource-VduCp-template.yml
diff --git a/s3p/templates/pciNumDevices/Definitions/resource-VduVirtualstorage-template.yml b/testsuites/stability/src/main/resources/testplans/templates/pciNumDevices/Definitions/resource-VduVirtualstorage-template.yml
similarity index 100%
copy from s3p/templates/pciNumDevices/Definitions/resource-VduVirtualstorage-template.yml
copy to testsuites/stability/src/main/resources/testplans/templates/pciNumDevices/Definitions/resource-VduVirtualstorage-template.yml
diff --git a/s3p/templates/pciNumDevices/Definitions/resource-Vgw1181049-template-interface.yml b/testsuites/stability/src/main/resources/testplans/templates/pciNumDevices/Definitions/resource-Vgw1181049-template-interface.yml
similarity index 100%
copy from s3p/templates/pciNumDevices/Definitions/resource-Vgw1181049-template-interface.yml
copy to testsuites/stability/src/main/resources/testplans/templates/pciNumDevices/Definitions/resource-Vgw1181049-template-interface.yml
diff --git a/s3p/templates/pciNumDevices/Definitions/resource-Vgw1181049-template.yml b/testsuites/stability/src/main/resources/testplans/templates/pciNumDevices/Definitions/resource-Vgw1181049-template.yml
similarity index 100%
copy from s3p/templates/pciNumDevices/Definitions/resource-Vgw1181049-template.yml
copy to testsuites/stability/src/main/resources/testplans/templates/pciNumDevices/Definitions/resource-Vgw1181049-template.yml
diff --git a/s3p/templates/pciNumDevices/Definitions/resource-Vnf-template.yml b/testsuites/stability/src/main/resources/testplans/templates/pciNumDevices/Definitions/resource-Vnf-template.yml
similarity index 100%
copy from s3p/templates/pciNumDevices/Definitions/resource-Vnf-template.yml
copy to testsuites/stability/src/main/resources/testplans/templates/pciNumDevices/Definitions/resource-Vnf-template.yml
diff --git a/s3p/templates/pciNumDevices/Definitions/resource-Vnfvirtuallink-template.yml b/testsuites/stability/src/main/resources/testplans/templates/pciNumDevices/Definitions/resource-Vnfvirtuallink-template.yml
similarity index 100%
copy from s3p/templates/pciNumDevices/Definitions/resource-Vnfvirtuallink-template.yml
copy to testsuites/stability/src/main/resources/testplans/templates/pciNumDevices/Definitions/resource-Vnfvirtuallink-template.yml
diff --git a/s3p/templates/pciNumDevices/Definitions/service-Testns8-template-interface.yml b/testsuites/stability/src/main/resources/testplans/templates/pciNumDevices/Definitions/service-Testns8-template-interface.yml
similarity index 100%
copy from s3p/templates/pciNumDevices/Definitions/service-Testns8-template-interface.yml
copy to testsuites/stability/src/main/resources/testplans/templates/pciNumDevices/Definitions/service-Testns8-template-interface.yml
diff --git a/s3p/templates/pciNumDevices/Definitions/service-Testns8-template.yml b/testsuites/stability/src/main/resources/testplans/templates/pciNumDevices/Definitions/service-Testns8-template.yml
similarity index 100%
copy from s3p/templates/pciNumDevices/Definitions/service-Testns8-template.yml
copy to testsuites/stability/src/main/resources/testplans/templates/pciNumDevices/Definitions/service-Testns8-template.yml
diff --git a/s3p/templates/pciNumDevices/TOSCA-Metadata/TOSCA.meta b/testsuites/stability/src/main/resources/testplans/templates/pciNumDevices/TOSCA-Metadata/TOSCA.meta
similarity index 100%
rename from s3p/templates/pciNumDevices/TOSCA-Metadata/TOSCA.meta
rename to testsuites/stability/src/main/resources/testplans/templates/pciNumDevices/TOSCA-Metadata/TOSCA.meta
diff --git a/s3p/templates/pciNumDevices/csar.meta b/testsuites/stability/src/main/resources/testplans/templates/pciNumDevices/csar.meta
similarity index 100%
copy from s3p/templates/pciNumDevices/csar.meta
copy to testsuites/stability/src/main/resources/testplans/templates/pciNumDevices/csar.meta
diff --git a/s3p/templates/pciVendorId/Artifacts/org.openecomp.resource.vf.Vgw1181049_v1.0/Deployment/OTHER/authorized_keys b/testsuites/stability/src/main/resources/testplans/templates/pciVendorId/Artifacts/org.openecomp.resource.vf.Vgw1181049_v1.0/Deployment/OTHER/authorized_keys
similarity index 100%
copy from s3p/templates/pciVendorId/Artifacts/org.openecomp.resource.vf.Vgw1181049_v1.0/Deployment/OTHER/authorized_keys
copy to testsuites/stability/src/main/resources/testplans/templates/pciVendorId/Artifacts/org.openecomp.resource.vf.Vgw1181049_v1.0/Deployment/OTHER/authorized_keys
diff --git a/s3p/templates/pciVendorId/Artifacts/org.openecomp.resource.vf.Vgw1181049_v1.0/Deployment/OTHER/id_rsa b/testsuites/stability/src/main/resources/testplans/templates/pciVendorId/Artifacts/org.openecomp.resource.vf.Vgw1181049_v1.0/Deployment/OTHER/id_rsa
similarity index 100%
copy from s3p/templates/pciVendorId/Artifacts/org.openecomp.resource.vf.Vgw1181049_v1.0/Deployment/OTHER/id_rsa
copy to testsuites/stability/src/main/resources/testplans/templates/pciVendorId/Artifacts/org.openecomp.resource.vf.Vgw1181049_v1.0/Deployment/OTHER/id_rsa
diff --git a/s3p/templates/pciVendorId/Artifacts/org.openecomp.resource.vf.Vgw1181049_v1.0/Deployment/OTHER/id_rsa.pub b/testsuites/stability/src/main/resources/testplans/templates/pciVendorId/Artifacts/org.openecomp.resource.vf.Vgw1181049_v1.0/Deployment/OTHER/id_rsa.pub
similarity index 100%
copy from s3p/templates/pciVendorId/Artifacts/org.openecomp.resource.vf.Vgw1181049_v1.0/Deployment/OTHER/id_rsa.pub
copy to testsuites/stability/src/main/resources/testplans/templates/pciVendorId/Artifacts/org.openecomp.resource.vf.Vgw1181049_v1.0/Deployment/OTHER/id_rsa.pub
diff --git a/s3p/templates/pciVendorId/Artifacts/org.openecomp.resource.vf.Vgw1181049_v1.0/Deployment/OTHER/image b/testsuites/stability/src/main/resources/testplans/templates/pciVendorId/Artifacts/org.openecomp.resource.vf.Vgw1181049_v1.0/Deployment/OTHER/image
similarity index 100%
copy from s3p/templates/pciVendorId/Artifacts/org.openecomp.resource.vf.Vgw1181049_v1.0/Deployment/OTHER/image
copy to testsuites/stability/src/main/resources/testplans/templates/pciVendorId/Artifacts/org.openecomp.resource.vf.Vgw1181049_v1.0/Deployment/OTHER/image
diff --git a/s3p/templates/pciVendorId/Artifacts/org.openecomp.resource.vf.Vgw1181049_v1.0/Deployment/VENDOR_LICENSE/vendor-license-model.xml b/testsuites/stability/src/main/resources/testplans/templates/pciVendorId/Artifacts/org.openecomp.resource.vf.Vgw1181049_v1.0/Deployment/VENDOR_LICENSE/vendor-license-model.xml
similarity index 100%
copy from s3p/templates/pciVendorId/Artifacts/org.openecomp.resource.vf.Vgw1181049_v1.0/Deployment/VENDOR_LICENSE/vendor-license-model.xml
copy to testsuites/stability/src/main/resources/testplans/templates/pciVendorId/Artifacts/org.openecomp.resource.vf.Vgw1181049_v1.0/Deployment/VENDOR_LICENSE/vendor-license-model.xml
diff --git a/s3p/templates/pciVendorId/Artifacts/org.openecomp.resource.vf.Vgw1181049_v1.0/Deployment/VF_LICENSE/vf-license-model.xml b/testsuites/stability/src/main/resources/testplans/templates/pciVendorId/Artifacts/org.openecomp.resource.vf.Vgw1181049_v1.0/Deployment/VF_LICENSE/vf-license-model.xml
similarity index 100%
copy from s3p/templates/pciVendorId/Artifacts/org.openecomp.resource.vf.Vgw1181049_v1.0/Deployment/VF_LICENSE/vf-license-model.xml
copy to testsuites/stability/src/main/resources/testplans/templates/pciVendorId/Artifacts/org.openecomp.resource.vf.Vgw1181049_v1.0/Deployment/VF_LICENSE/vf-license-model.xml
diff --git a/s3p/templates/pciVendorId/Definitions/annotations.yml b/testsuites/stability/src/main/resources/testplans/templates/pciVendorId/Definitions/annotations.yml
similarity index 100%
copy from s3p/templates/pciVendorId/Definitions/annotations.yml
copy to testsuites/stability/src/main/resources/testplans/templates/pciVendorId/Definitions/annotations.yml
diff --git a/s3p/templates/pciVendorId/Definitions/artifacts.yml b/testsuites/stability/src/main/resources/testplans/templates/pciVendorId/Definitions/artifacts.yml
similarity index 100%
copy from s3p/templates/pciVendorId/Definitions/artifacts.yml
copy to testsuites/stability/src/main/resources/testplans/templates/pciVendorId/Definitions/artifacts.yml
diff --git a/s3p/templates/pciVendorId/Definitions/capabilities.yml b/testsuites/stability/src/main/resources/testplans/templates/pciVendorId/Definitions/capabilities.yml
similarity index 100%
copy from s3p/templates/pciVendorId/Definitions/capabilities.yml
copy to testsuites/stability/src/main/resources/testplans/templates/pciVendorId/Definitions/capabilities.yml
diff --git a/s3p/templates/pciVendorId/Definitions/data.yml b/testsuites/stability/src/main/resources/testplans/templates/pciVendorId/Definitions/data.yml
similarity index 100%
copy from s3p/templates/pciVendorId/Definitions/data.yml
copy to testsuites/stability/src/main/resources/testplans/templates/pciVendorId/Definitions/data.yml
diff --git a/s3p/templates/pciVendorId/Definitions/groups.yml b/testsuites/stability/src/main/resources/testplans/templates/pciVendorId/Definitions/groups.yml
similarity index 100%
copy from s3p/templates/pciVendorId/Definitions/groups.yml
copy to testsuites/stability/src/main/resources/testplans/templates/pciVendorId/Definitions/groups.yml
diff --git a/s3p/templates/pciVendorId/Definitions/interfaces.yml b/testsuites/stability/src/main/resources/testplans/templates/pciVendorId/Definitions/interfaces.yml
similarity index 100%
copy from s3p/templates/pciVendorId/Definitions/interfaces.yml
copy to testsuites/stability/src/main/resources/testplans/templates/pciVendorId/Definitions/interfaces.yml
diff --git a/s3p/templates/pciVendorId/Definitions/nodes.yml b/testsuites/stability/src/main/resources/testplans/templates/pciVendorId/Definitions/nodes.yml
similarity index 100%
copy from s3p/templates/pciVendorId/Definitions/nodes.yml
copy to testsuites/stability/src/main/resources/testplans/templates/pciVendorId/Definitions/nodes.yml
diff --git a/s3p/templates/pciVendorId/Definitions/policies.yml b/testsuites/stability/src/main/resources/testplans/templates/pciVendorId/Definitions/policies.yml
similarity index 100%
copy from s3p/templates/pciVendorId/Definitions/policies.yml
copy to testsuites/stability/src/main/resources/testplans/templates/pciVendorId/Definitions/policies.yml
diff --git a/s3p/templates/pciVendorId/Definitions/relationships.yml b/testsuites/stability/src/main/resources/testplans/templates/pciVendorId/Definitions/relationships.yml
similarity index 100%
copy from s3p/templates/pciVendorId/Definitions/relationships.yml
copy to testsuites/stability/src/main/resources/testplans/templates/pciVendorId/Definitions/relationships.yml
diff --git a/s3p/templates/pciVendorId/Definitions/resource-VduCompute-template.yml b/testsuites/stability/src/main/resources/testplans/templates/pciVendorId/Definitions/resource-VduCompute-template.yml
similarity index 100%
copy from s3p/templates/pciVendorId/Definitions/resource-VduCompute-template.yml
copy to testsuites/stability/src/main/resources/testplans/templates/pciVendorId/Definitions/resource-VduCompute-template.yml
diff --git a/s3p/templates/pciVendorId/Definitions/resource-VduCp-template.yml b/testsuites/stability/src/main/resources/testplans/templates/pciVendorId/Definitions/resource-VduCp-template.yml
similarity index 100%
copy from s3p/templates/pciVendorId/Definitions/resource-VduCp-template.yml
copy to testsuites/stability/src/main/resources/testplans/templates/pciVendorId/Definitions/resource-VduCp-template.yml
diff --git a/s3p/templates/pciVendorId/Definitions/resource-VduVirtualstorage-template.yml b/testsuites/stability/src/main/resources/testplans/templates/pciVendorId/Definitions/resource-VduVirtualstorage-template.yml
similarity index 100%
copy from s3p/templates/pciVendorId/Definitions/resource-VduVirtualstorage-template.yml
copy to testsuites/stability/src/main/resources/testplans/templates/pciVendorId/Definitions/resource-VduVirtualstorage-template.yml
diff --git a/s3p/templates/pciVendorId/Definitions/resource-Vgw1181049-template-interface.yml b/testsuites/stability/src/main/resources/testplans/templates/pciVendorId/Definitions/resource-Vgw1181049-template-interface.yml
similarity index 100%
copy from s3p/templates/pciVendorId/Definitions/resource-Vgw1181049-template-interface.yml
copy to testsuites/stability/src/main/resources/testplans/templates/pciVendorId/Definitions/resource-Vgw1181049-template-interface.yml
diff --git a/s3p/templates/pciVendorId/Definitions/resource-Vgw1181049-template.yml b/testsuites/stability/src/main/resources/testplans/templates/pciVendorId/Definitions/resource-Vgw1181049-template.yml
similarity index 100%
copy from s3p/templates/pciVendorId/Definitions/resource-Vgw1181049-template.yml
copy to testsuites/stability/src/main/resources/testplans/templates/pciVendorId/Definitions/resource-Vgw1181049-template.yml
diff --git a/s3p/templates/pciVendorId/Definitions/resource-Vnf-template.yml b/testsuites/stability/src/main/resources/testplans/templates/pciVendorId/Definitions/resource-Vnf-template.yml
similarity index 100%
copy from s3p/templates/pciVendorId/Definitions/resource-Vnf-template.yml
copy to testsuites/stability/src/main/resources/testplans/templates/pciVendorId/Definitions/resource-Vnf-template.yml
diff --git a/s3p/templates/pciVendorId/Definitions/resource-Vnfvirtuallink-template.yml b/testsuites/stability/src/main/resources/testplans/templates/pciVendorId/Definitions/resource-Vnfvirtuallink-template.yml
similarity index 100%
copy from s3p/templates/pciVendorId/Definitions/resource-Vnfvirtuallink-template.yml
copy to testsuites/stability/src/main/resources/testplans/templates/pciVendorId/Definitions/resource-Vnfvirtuallink-template.yml
diff --git a/s3p/templates/pciVendorId/Definitions/service-Testns8-template-interface.yml b/testsuites/stability/src/main/resources/testplans/templates/pciVendorId/Definitions/service-Testns8-template-interface.yml
similarity index 100%
copy from s3p/templates/pciVendorId/Definitions/service-Testns8-template-interface.yml
copy to testsuites/stability/src/main/resources/testplans/templates/pciVendorId/Definitions/service-Testns8-template-interface.yml
diff --git a/s3p/templates/pciVendorId/Definitions/service-Testns8-template.yml b/testsuites/stability/src/main/resources/testplans/templates/pciVendorId/Definitions/service-Testns8-template.yml
similarity index 100%
copy from s3p/templates/pciVendorId/Definitions/service-Testns8-template.yml
copy to testsuites/stability/src/main/resources/testplans/templates/pciVendorId/Definitions/service-Testns8-template.yml
diff --git a/s3p/templates/pciVendorId/TOSCA-Metadata/TOSCA.meta b/testsuites/stability/src/main/resources/testplans/templates/pciVendorId/TOSCA-Metadata/TOSCA.meta
similarity index 100%
copy from s3p/templates/pciVendorId/TOSCA-Metadata/TOSCA.meta
copy to testsuites/stability/src/main/resources/testplans/templates/pciVendorId/TOSCA-Metadata/TOSCA.meta
diff --git a/s3p/templates/pciVendorId/csar.meta b/testsuites/stability/src/main/resources/testplans/templates/pciVendorId/csar.meta
similarity index 100%
copy from s3p/templates/pciVendorId/csar.meta
copy to testsuites/stability/src/main/resources/testplans/templates/pciVendorId/csar.meta