Add sdc startup in IT

Move the Api tests code in the integration-test module, and remove the need to have a container

Issue-ID: SDC-3232
Signed-off-by: sebdet <sebastien.determe@intl.att.com>
Change-Id: Ia2b5d94d958e975867c600597ab5e56dffcd06ab
Signed-off-by: JulienBe <julien.bertozzi@intl.att.com>

314 files changed, 67996 insertions, 17 deletions

diff --git a/integration-tests/environments/integration-test.json b/integration-tests/environments/integration-test.json
new file mode 100644
index 0000000000..dec9c2f042
--- /dev/null
+++ b/integration-tests/environments/integration-test.json
@@ -0,0 +1,104 @@
+{
+   "name": "${it.env.name}",
+   "description": "OpenSource-${it.env.name}",
+   "json_class": "Chef::Environment",
+   "chef_type": "environment",
+
+   "default_attributes": {
+      "disableHttp": false,
+      "CS_VIP": "sdc-cs",
+      "BE_VIP": "sdc-BE",
+      "ONBOARDING_BE_VIP": "sdc-onboard-BE",
+      "FE_VIP": "sdc-FE",
+      "DCAE_BE_VIP": "localhost",
+      "DCAE_FE_VIP": "localhost",
+      "DCAE_TOSCA_LAB_VIP": "localhost",
+      "interfaces": {
+         "application": "eth0",
+         "private": "eth1"
+      },
+      "ECompP": {
+         "ecomp_rest_url": "http://portal.api.simpledemo.onap.org:8989/ONAPPORTAL/auxapi",
+         "ecomp_redirect_url": "http://portal.api.simpledemo.openecomp.org:8989/ECOMPPORTAL/login.htm",
+         "cipher_key": "AGLDdG4D04BKm2IxIWEr8o==",
+         "portal_user": "Ipwxi2oLvDxctMA1royaRw1W0jhucLx+grHzci3ePIA=",
+         "portal_pass": "j85yNhyIs7zKYbR1VlwEfNhS6b7Om4l0Gx5O8931sCI=",
+         "portal_app_name": "Ipwxi2oLvDxctMA1royaRw1W0jhucLx+grHzci3ePIA="
+      },
+      "UEB": {
+         "PublicKey": "iPIxkpAMI8qTcQj8",
+         "SecretKey": "Ehq3WyT4bkif4zwgEbvshGal",
+         "fqdn": ["10.0.11.1", "10.0.11.1"]
+      },
+      "Nodes": {
+         "CS": [
+            "sdc-cs"
+         ],
+         "BE":            "sdc-BE",
+         "ONBOARDING_BE": "sdc-onboard-BE",
+         "FE":            "sdc-FE"
+      },
+      "VnfRepo": {
+         "vnfRepoPort": "8702",
+         "vnfRepoHost": "10.0.14.1"
+      }
+   },
+   "override_attributes": {
+      "FE": {
+         "http_port": "8181",
+         "https_port": "9443",
+         "domain_name": "sdc"
+      },
+      "BE": {
+         "http_port": "8080",
+         "https_port": "8443",
+         "domain_name": "sdc"
+      },
+      "ONBOARDING_BE": {
+         "http_port": "8081",
+         "https_port": "8445",
+         "domain_name": "sdc",
+         "catalog_notification_url": "%s://%s:%s/sdc2/rest/v1/catalog/notif/vsp/"
+      },
+      "cassandra": {
+         "cassandra_port": 9042,
+         "concurrent_reads": "32",
+         "num_tokens": "256",
+         "data_dir": "/var/lib/cassandra/data",
+         "hinted_handoff_enabled": "true",
+         "cassandra_user": "${it.sdc.user}",
+         "cassandra_password": "${it.sdc.password}",
+         "concurrent_writes": "32",
+         "cluster_name": "${it.sdc.cluster.name}",
+         "datacenter_name": "${it.sdc.cluster.name}",
+         "multithreaded_compaction": "false",
+         "cache_dir": "/var/lib/cassandra/saved_caches",
+         "log_file": "/var/lib/cassandra/log/system.log",
+         "phi_convict_threshold": "8",
+         "commitlog_dir": "/var/lib/cassandra/commitlog",
+         "socket_read_timeout": "40000",
+         "socket_connect_timeout": "40000",
+         "janusgraph_connection_timeout": "20000",
+         "replication_factor": "1"
+      },
+      "DMAAP": {
+         "consumer": {
+            "host": "dcae-mrtr.com:3905",
+            "topic": "operationalEnvironmentEvent",
+            "serviceName": "dcae-mrtr.com:3905/events",
+            "environment": "${it.env.name}",
+            "partner": "BOT_R",
+            "username": "user1@sdc.com",
+            "password": "password=="
+         },
+         "producer": {
+            "host": "olsd004.com:3905",
+            "topic": "SDC-FACADE-NOTIF-v1 ",
+            "serviceName": "dmaap.com:3905/events",
+            "environment": "${it.env.name}",
+            "username": "user1@sdc.com",
+            "password": "password=="
+         }
+      }
+   }
+}
diff --git a/integration-tests/pom.xml b/integration-tests/pom.xml
index a4a6e9099d..fe5a09f989 100644
--- a/integration-tests/pom.xml
+++ b/integration-tests/pom.xml
@@ -25,7 +25,7 @@ limitations under the License.
 
     <groupId>org.openecomp.sdc</groupId>
     <artifactId>sdc-integration-tests</artifactId>
-    <packaging>pom</packaging>
+    <packaging>jar</packaging>
     <name>sdc-integration-tests</name>
 
     <parent>
@@ -50,6 +50,127 @@ limitations under the License.
     </properties>
 
     <dependencies>
+        <dependency>
+            <groupId>org.yaml</groupId>
+            <artifactId>snakeyaml</artifactId>
+            <version>${snakeyaml.version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.google.guava</groupId>
+            <artifactId>guava</artifactId>
+            <version>${guava.version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>${junit.version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.testng</groupId>
+            <artifactId>testng</artifactId>
+            <version>${testng.version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.google.code.gson</groupId>
+            <artifactId>gson</artifactId>
+            <version>${gson.version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.openecomp.sdc.be</groupId>
+            <artifactId>catalog-model</artifactId>
+            <version>${project.version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.openecomp.sdc.be</groupId>
+            <artifactId>catalog-dao</artifactId>
+            <version>${project.version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.aventstack</groupId>
+            <artifactId>extentreports</artifactId>
+            <version>3.0.6</version>
+            <!--to update -->
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.janusgraph</groupId>
+            <artifactId>janusgraph-core</artifactId>
+            <version>${janusgraph.version}</version>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <artifactId>slf4j-log4j12</artifactId>
+                    <groupId>org.slf4j</groupId>
+                </exclusion>
+                <exclusion>
+                    <artifactId>commons-collections</artifactId>
+                    <groupId>commons-collections</groupId>
+                </exclusion>
+                <exclusion>
+                    <artifactId>groovy</artifactId>
+                    <groupId>org.codehaus.groovy</groupId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.apache.thrift</groupId>
+                    <artifactId>libthrift</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>org.assertj</groupId>
+            <artifactId>assertj-core</artifactId>
+            <version>${assertj.version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.clearspring.analytics</groupId>
+            <artifactId>stream</artifactId>
+            <version>${clearspring.version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.httpcomponents</groupId>
+            <artifactId>httpclient</artifactId>
+            <version>${httpclient.version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.httpcomponents</groupId>
+            <artifactId>httpcore</artifactId>
+            <version>${httpcore.version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-core</artifactId>
+            <version>${jackson.version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.codehaus.jackson</groupId>
+            <artifactId>jackson-mapper-asl</artifactId>
+            <version>1.9.2</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-databind</artifactId>
+            <version>${jackson.version}</version>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>com.fasterxml.jackson.core</groupId>
+                    <artifactId>jackson-core</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
     </dependencies>
 
     <build>
@@ -68,7 +189,7 @@ limitations under the License.
                             <outputDirectory>${it.chef.config}</outputDirectory>
                             <resources>
                                 <resource>
-                                    <directory>src/test/resources</directory>
+                                    <directory>environments</directory>
                                     <filtering>true</filtering>
                                     <includes>
                                         <include>integration-test.json</include>
@@ -120,7 +241,6 @@ limitations under the License.
             <plugin>
                 <groupId>io.fabric8</groupId>
                 <artifactId>docker-maven-plugin</artifactId>
-                <inherited>false</inherited>
                 <dependencies>
                     <dependency>
                         <groupId>org.apache.httpcomponents</groupId>
@@ -260,12 +380,13 @@ limitations under the License.
                                     <SDC_PASSWORD>${it.sdc.password}</SDC_PASSWORD>
                                     <ENVNAME>${it.env.name}</ENVNAME>
                                     <SDC_CERT_DIR>onap/cert</SDC_CERT_DIR>
-                                    <JAVA_OPTIONS>-Xmx1536m -Xms1536m</JAVA_OPTIONS>
+                                    <JAVA_OPTIONS>-Xdebug -agentlib:jdwp=transport=dt_socket,address=4001,server=y,suspend=n -Xmx1g -Xms1g</JAVA_OPTIONS>
                                 </env>
                                 <hostname>sdc-onboard-BE</hostname>
                                 <volumes>
                                     <bind>
                                         <volume>${it.chef.config}:/var/lib/jetty/chef-solo/environments</volume>
+                                        <volume>${project.basedir}/src/test/resources/cert:/var/lib/jetty/onap/cert</volume>
                                     </bind>
                                 </volumes>
                                 <wait>
@@ -276,12 +397,14 @@ limitations under the License.
                                         <ports>
                                             <port>8445</port>
                                             <port>8081</port>
+                                            <port>4001</port>
                                         </ports>
                                     </tcp>
                                 </wait>
                                 <ports>
                                     <port>8445:8445</port>
                                     <port>8081:8081</port>
+                                    <port>4001:4001</port>
                                 </ports>
                                 <network>
                                     <mode>custom</mode>
@@ -300,7 +423,7 @@ limitations under the License.
                                 <env>
                                     <cassandra_ssl_enabled>${it.cassandra.ssl.enabled}</cassandra_ssl_enabled>
                                     <ENVNAME>${it.env.name}</ENVNAME>
-                                    <JAVA_OPTIONS>-Xmx1536m -Xms1536m</JAVA_OPTIONS>
+                                    <JAVA_OPTIONS>-Xdebug -agentlib:jdwp=transport=dt_socket,address=4000,server=y,suspend=n -Xmx1536m -Xms1536m</JAVA_OPTIONS>
                                 </env>
                                 <hostname>sdc-BE</hostname>
                                 <volumes>
@@ -317,12 +440,14 @@ limitations under the License.
                                         <ports>
                                             <port>8443</port>
                                             <port>8080</port>
+                                            <port>4000</port>
                                         </ports>
                                     </tcp>
                                 </wait>
                                 <ports>
                                     <port>8443:8443</port>
                                     <port>8080:8080</port>
+                                    <port>4000:4000</port>
                                 </ports>
                                 <network>
                                     <mode>custom</mode>
@@ -368,7 +493,7 @@ limitations under the License.
                                 </dependsOn>
                                 <env>
                                     <ENVNAME>${it.env.name}</ENVNAME>
-                                    <JAVA_OPTIONS>-Xmx256m -Xms256m</JAVA_OPTIONS>
+                                    <JAVA_OPTIONS>-Xdebug -agentlib:jdwp=transport=dt_socket,address=6000,server=y,suspend=n -Xmx256m -Xms256m</JAVA_OPTIONS>
                                 </env>
                                 <hostname>sdc-FE</hostname>
                                 <volumes>
@@ -376,7 +501,7 @@ limitations under the License.
                                         <volume>${it.chef.config}:/var/lib/jetty/chef-solo/environments</volume>
                                         <volume>${it.shared.volume}:/var/lib/jetty/logs</volume>
                                         <volume>
-                                            sdc-os-chef/environments/plugins-configuration.yaml:/var/lib/jetty/config/catalog-fe/plugins-configuration.yaml
+                                            environments/plugins-configuration.yaml:/var/lib/jetty/config/catalog-fe/plugins-configuration.yaml
                                         </volume>
                                     </bind>
                                 </volumes>
@@ -388,12 +513,14 @@ limitations under the License.
                                         <ports>
                                             <port>9443</port>
                                             <port>8181</port>
+                                            <port>6000</port>
                                         </ports>
                                     </tcp>
                                 </wait>
                                 <ports>
                                     <port>9443:9443</port>
                                     <port>8181:8181</port>
+                                    <port>6000:6000</port>
                                 </ports>
                                 <network>
                                     <mode>custom</mode>
@@ -402,9 +529,48 @@ limitations under the License.
                                 </network>
                             </run>
                         </image>
+                        <image>
+                            <name>onap/sdc-simulator:${it.docker.version}</name>
+                            <alias>sdc-simulator</alias>
+                            <run>
+                                <dependsOn>
+                                    <container>sdc-frontend</container>
+                                </dependsOn>
+                                <env>
+                                    <!--<FE_URL>${it.env.name}</FE_URL>-->
+                                    <JAVA_OPTIONS>-Xmx128m -Xms128m -Xss1m</JAVA_OPTIONS>
+                                    <ENVNAME>${it.env.name}</ENVNAME>
+                                </env>
+                                <hostname>sdc-sim</hostname>
+                                <volumes>
+                                    <bind>
+                                        <volume>${it.chef.config}:/root/chef-solo/environments</volume>
+                                    </bind>
+                                </volumes>
+                                <wait>
+                                    <time>60000</time>
+                                    <tcp>
+                                        <host>sdc-sim</host>
+                                        <mode>direct</mode>
+                                        <ports>
+                                            <port>8080</port>
+                                            <port>8443</port>
+                                        </ports>
+                                    </tcp>
+                                </wait>
+                                <ports>
+                                    <port>8285:8080</port>
+                                    <port>8286:8443</port>
+                                </ports>
+                                <network>
+                                    <mode>custom</mode>
+                                    <name>sdc-network</name>
+                                    <alias>sdc-sim</alias>
+                                </network>
+                            </run>
+                        </image>
                     </images>
                 </configuration>
-
                 <executions>
                     <execution>
                         <id>docker-start-for-it</id>
@@ -422,6 +588,48 @@ limitations under the License.
                     </execution>
                 </executions>
             </plugin>
+
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <configuration>
+                    <skip>true</skip>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-failsafe-plugin</artifactId>
+                <configuration>
+                    <suiteXmlFiles>
+                        <file>src/test/resources/ci/testSuites/onapApiSanity.xml</file>
+                        <!--<file>src/test/resources/ci/testSuites/artifacts.xml</file>-->
+                        <!--<file>src/test/resources/ci/testSuites/cap_req.xml</file>-->
+                        <!--<file>src/test/resources/ci/testSuites/category.xml</file>-->
+                        <!--<file>src/test/resources/ci/testSuites/ciFull.xml</file>-->
+                        <!--<file>src/test/resources/ci/testSuites/CRUDArtifacts.xml</file>-->
+                        <!--<file>src/test/resources/ci/testSuites/externalAPIs.xml</file>-->
+                        <!--<file>src/test/resources/ci/testSuites/ExternalApiSanity.xml</file>-->
+<!--                        <file>src/test/resources/ci/testSuites/general.xml</file>-->
+<!--                        <file>src/test/resources/ci/testSuites/imports.xml</file>-->
+                        <!--<file>src/test/resources/ci/testSuites/normatives.xml</file>-->
+                        <!--<file>src/test/resources/ci/testSuites/onapApiSanity.xml</file>-->
+                        <!--<file>src/test/resources/ci/testSuites/pass.xml</file>-->
+<!--                        <file>src/test/resources/ci/testSuites/product.xml</file>-->
+                        <!--<file>src/test/resources/ci/testSuites/productAPIs.xml</file>-->
+<!--                        <file>src/test/resources/ci/testSuites/property.xml</file>-->
+<!--                        <file>src/test/resources/ci/testSuites/resource.xml</file>-->
+                        <!--<file>src/test/resources/ci/testSuites/sanity.xml</file>-->
+                        <!--<file>src/test/resources/ci/testSuites/SearchExternalAPI.xml</file>-->
+<!--                        <file>src/test/resources/ci/testSuites/service.xml</file>-->
+                        <!--<file>src/test/resources/ci/testSuites/testngLifeCycle.xml</file>-->
+<!--                        <file>src/test/resources/ci/testSuites/user.xml</file>-->
+                    </suiteXmlFiles>
+<!--                    <includes>-->
+<!--                        <include>**/*Test.java</include>-->
+<!--                    </includes>-->
+
+                </configuration>
+            </plugin>
         </plugins>
     </build>
 </project>
diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/api/AttSdcTest.java b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/api/AttSdcTest.java
new file mode 100644
index 0000000000..b3373ee4bd
--- /dev/null
+++ b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/api/AttSdcTest.java
@@ -0,0 +1,192 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * SDC
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.sdc.ci.tests.api;
+
+import com.google.gson.Gson;
+import com.google.gson.GsonBuilder;
+import org.junit.*;
+import org.junit.rules.TestName;
+import org.junit.rules.TestWatcher;
+import org.openecomp.sdc.ci.tests.config.Config;
+import org.openecomp.sdc.ci.tests.rules.MyTestWatcher;
+import org.openecomp.sdc.ci.tests.utils.Utils;
+import org.openecomp.sdc.ci.tests.utils.general.FileUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.io.File;
+import java.io.FileNotFoundException;
+import java.io.PrintWriter;
+import java.io.StringWriter;
+import java.util.List;
+
+import static org.junit.Assert.assertTrue;
+
+public abstract class AttSdcTest {
+
+	public static StringBuilder doc = new StringBuilder();
+	public static String file = null;
+	public static Config config = null;
+	// protected Gson gson = new Gson();
+	protected Gson prettyGson = new GsonBuilder().setPrettyPrinting().create();
+
+	protected TestName testName = null;
+	protected Logger logger = null;
+
+	protected static boolean displayException = false;
+
+	public AttSdcTest(TestName testName, String className) {
+		super();
+
+		this.testName = testName;
+		this.logger = LoggerFactory.getLogger(className);
+
+		String displayEx = System.getProperty("displayException");
+		if (displayEx != null && Boolean.valueOf(displayEx).booleanValue()) {
+			displayException = true;
+		}
+
+	}
+
+	@Rule
+	public TestWatcher tw = new MyTestWatcher(this);
+
+	@BeforeClass
+	public static void beforeClass() {
+		doc = new StringBuilder();
+		doc.append(
+				"<Html><head><style>th{background-color: gray;color: white;height: 30px;}td {color: black;height: 30px;}.fail {background-color: #FF5555;width: 100px;text-align: center;}.success {background-color: #00FF00;width: 100px;text-align: center;}.name {width: 200px;background-color: #F0F0F0;}.message {width: 300px;background-color: #F0F0F0;}</style>");
+
+		doc.append("<meta name=\"viewport\" content=\"width=device-width, initial-scale=1\">");
+		doc.append(
+				"<link rel=\"stylesheet\" href=\"http://maxcdn.bootstrapcdn.com/bootstrap/3.3.4/css/bootstrap.min.css\">");
+
+		doc.append("</head><body>");
+
+		doc.append("<script src=\"https://ajax.googleapis.com/ajax/libs/jquery/1.11.1/jquery.min.js\"></script>");
+		doc.append("<script src=\"http://maxcdn.bootstrapcdn.com/bootstrap/3.3.4/js/bootstrap.min.js\"></script>");
+
+		doc.append("<table>");
+
+		doc.append("<tr>");
+		doc.append("<th>").append("Test Name").append("</th>");
+		doc.append("<th>").append("Status").append("</th>");
+		doc.append("<th>").append("Message").append("</th>");
+
+		if (displayException) {
+			doc.append("<th>").append("Exception").append("</th>");
+		}
+		doc.append("</tr>");
+	}
+
+	@AfterClass
+	public static void afterClass() {
+		doc.append("<table>");
+		// writeToFile("./" + ConfigAttOdlIt.REPORT_FILE , doc.toString());
+		FileUtils.writeToFile(
+				Config.instance().getOutputFolder() + File.separator + file + System.currentTimeMillis() + ".html",
+				doc.toString());
+
+	}
+
+	@Before
+	public void beforeTest() throws FileNotFoundException {
+		file = FileUtils.getFileName(this.getClass().getName());
+		config = Utils.getConfig();
+		assertTrue(config != null);		
+	}
+
+	@After
+	public void afterTest() throws FileNotFoundException {
+
+	}
+
+	public void addTestSummary(String testName, boolean isSuccess) {
+		addTestSummary(testName, isSuccess, null);
+	}
+
+	public void addTestSummary(String testName, boolean isSuccess, Throwable exception) {
+
+		String message = exception == null ? "" : exception.getMessage();
+
+		String result = (isSuccess) ? "success" : "fail";
+		doc.append("<tr>");
+		doc.append("<td class=\"name\">").append(testName).append("</td>");
+		doc.append("<td class=\"" + result + "\">").append(result).append("</td>");
+		doc.append("<td class=\"message\">").append(message).append("</td>");
+
+		if (displayException) {
+			// doc.append("<td
+			// class=\"message\">").append(convertExceptionToString(exception)).append("</td>");
+			doc.append("<td class=\"message\">");
+
+			doc.append("<button type=\"button\" class=\"btn btn-info\" data-toggle=\"collapse\" data-target=\"#demo"
+					+ testName + "\">Simple collapsible</button>");
+			doc.append("<div id=\"demo" + testName + "\" class=\"collapse out\">");
+
+			doc.append(convertExceptionToString(exception));
+
+			doc.append("</div>");
+			doc.append("</td>");
+		}
+
+		doc.append("</tr>");
+
+		if (isSuccess) {
+			logger.debug("Test {} {}",testName,(isSuccess ? " SUCCEEDED " : " FAILED with error " + message));
+		} else {
+			logger.error("Test {} {}",testName,(isSuccess ? " SUCCEEDED " : " FAILED with error " + message));
+		}
+	}
+
+	private String convertExceptionToString(Throwable exception) {
+
+		if (exception == null) {
+			return "";
+		}
+
+		StringWriter sw = new StringWriter();
+		exception.printStackTrace(new PrintWriter(sw));
+		String exceptionAsString = sw.toString();
+
+		return exceptionAsString;
+	}
+
+	public Logger getLogger() {
+		return logger;
+	}
+
+	protected boolean ignoreDueToBug(String bug) {
+
+		List<String> bugs = config.getBugs();
+
+		if (bugs != null && bugs.size() > 0) {
+			for (String bugNumber : bugs) {
+				if (bugNumber.startsWith(bug)) {
+					return true;
+				}
+			}
+		}
+
+		return false;
+	}
+
+}
diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/api/ComponentBaseTest.java b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/api/ComponentBaseTest.java
new file mode 100644
index 0000000000..8c238ce8ac
--- /dev/null
+++ b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/api/ComponentBaseTest.java
@@ -0,0 +1,255 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * SDC
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.sdc.ci.tests.api;
+
+import ch.qos.logback.classic.Level;
+import ch.qos.logback.classic.LoggerContext;
+import com.aventstack.extentreports.ExtentTest;
+import com.aventstack.extentreports.Status;
+import java.io.File;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.stream.Collectors;
+import org.apache.commons.collections.CollectionUtils;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+import org.openecomp.sdc.be.datatypes.enums.ComponentTypeEnum;
+import org.openecomp.sdc.be.datatypes.enums.ResourceTypeEnum;
+import org.openecomp.sdc.be.model.Component;
+import org.openecomp.sdc.be.model.Product;
+import org.openecomp.sdc.be.model.Resource;
+import org.openecomp.sdc.be.model.Service;
+import org.openecomp.sdc.be.model.User;
+import org.openecomp.sdc.ci.tests.config.Config;
+import org.openecomp.sdc.ci.tests.datatypes.ResourceReqDetails;
+import org.openecomp.sdc.ci.tests.datatypes.enums.UserRoleEnum;
+import org.openecomp.sdc.ci.tests.datatypes.http.RestResponse;
+import org.openecomp.sdc.ci.tests.utils.Utils;
+import org.openecomp.sdc.ci.tests.utils.general.AtomicOperationUtils;
+import org.openecomp.sdc.ci.tests.utils.general.ElementFactory;
+import org.openecomp.sdc.ci.tests.utils.general.FileHandling;
+import org.openecomp.sdc.ci.tests.utils.rest.BaseRestUtils;
+import org.openecomp.sdc.ci.tests.utils.rest.CatalogRestUtils;
+import org.openecomp.sdc.ci.tests.utils.rest.ProductRestUtils;
+import org.openecomp.sdc.ci.tests.utils.rest.ResourceRestUtils;
+import org.openecomp.sdc.ci.tests.utils.rest.ResponseParser;
+import org.openecomp.sdc.ci.tests.utils.rest.ServiceRestUtils;
+import org.slf4j.LoggerFactory;
+import org.testng.ITestContext;
+import org.testng.ITestResult;
+import org.testng.annotations.AfterMethod;
+import org.testng.annotations.AfterSuite;
+import org.testng.annotations.BeforeMethod;
+import org.testng.annotations.BeforeSuite;
+
+public abstract class ComponentBaseTest {
+
+    protected static Logger logger = LogManager.getLogger(ComponentBaseTest.class);
+
+    protected static final String REPORT_FOLDER = "." + File.separator + "ExtentReport" + File.separator;
+    private static final String REPORT_FILE_NAME = "SDC_CI_Extent_Report.html";
+    public static Config config;
+    protected static ITestContext myContext;
+
+
+    /**************** METHODS ****************/
+    public static ExtentTest getExtendTest() {
+        SomeInterface testManager = new ExtentTestManager();
+        return testManager.getTest();
+    }
+
+    public enum ComponentOperationEnum {
+        CREATE_COMPONENT, UPDATE_COMPONENT, GET_COMPONENT, DELETE_COMPONENT, CHANGE_STATE_CHECKIN, CHANGE_STATE_CHECKOUT, CHANGE_STATE_UNDO_CHECKOUT
+    }
+
+    public ComponentBaseTest() {
+        LoggerContext lc = (LoggerContext) LoggerFactory.getILoggerFactory();
+        lc.getLogger("com.thinkaurelius").setLevel(Level.INFO);
+        lc.getLogger("com.datastax").setLevel(Level.INFO);
+        lc.getLogger("io.netty").setLevel(Level.INFO);
+        lc.getLogger("c.d").setLevel(Level.INFO);
+    }
+
+    public static String getReportFolder() {
+        return REPORT_FOLDER;
+    }
+
+    @BeforeSuite(alwaysRun = true)
+    public void setupBeforeSuite(ITestContext context) throws Exception {
+        config = Utils.getConfig();
+        myContext = context;
+        ExtentManager.initReporter(getReportFolder(), REPORT_FILE_NAME, context);
+        AtomicOperationUtils.createDefaultConsumer(true);
+        performClean();
+    }
+
+    @BeforeMethod(alwaysRun = true)
+    public void setupBeforeTest(java.lang.reflect.Method method, ITestContext context) throws Exception {
+        if (!"onboardVNFShotFlow".equals(method.getName()) &&
+            !"onboardPNFFlow".equals(method.getName()) ) {
+            logger.info("ExtentReport instance started from BeforeMethod...");
+            ExtentTestManager.startTest(method.getName());
+            ExtentTestManager.assignCategory(this.getClass());
+
+        } else {
+            logger.debug("ExtentReport instance started from Test...");
+        }
+    }
+
+    @AfterMethod(alwaysRun = true)
+    public void quitAfterTest(ITestResult result, ITestContext context) throws Exception {
+        int status = result.getStatus();
+        switch (status) {
+            case ITestResult.SUCCESS:
+                getExtendTest().log(Status.PASS, "Test Result : <span class='label success'>Success</span>");
+                break;
+
+            case ITestResult.FAILURE:
+                getExtendTest().log(Status.ERROR, "ERROR - The following exepction occured");
+                getExtendTest().log(Status.ERROR, result.getThrowable());
+                getExtendTest().log(Status.FAIL, "<span class='label failure'>Failure</span>");
+                break;
+
+            case ITestResult.SKIP:
+                getExtendTest().log(Status.SKIP, "SKIP - The following exepction occured");
+                break;
+            default:
+                break;
+        }
+        ExtentTestManager.endTest();
+    }
+
+    @AfterSuite(alwaysRun = true)
+    public static void shutdownJanusGraph() throws Exception {
+        performClean();
+    }
+
+    public void setLog(String fromDataProvider) {
+        ExtentTestManager.startTest(Thread.currentThread().getStackTrace()[2].getMethodName() + "&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;" + fromDataProvider);
+        ExtentTestManager.assignCategory(this.getClass());
+    }
+
+    protected static void performClean() throws Exception {
+        if (!config.getSystemUnderDebug()) {
+            deleteCreatedComponents(getCatalogAsMap());
+            FileHandling.overWriteExistindDir("target/outputCsar");
+        } else {
+            System.out.println("Accordindig to configuration components will not be deleted, in case to unable option to delete, please change systemUnderDebug parameter value to false ...");
+        }
+    }
+
+    private static void deleteCreatedComponents(Map<String, List<Component>> convertCatalogResponseToJavaObject) throws IOException {
+        final String userId = UserRoleEnum.DESIGNER.getUserId();
+
+        List<Component> resourcesArrayList = convertCatalogResponseToJavaObject.get(ComponentTypeEnum.RESOURCE_PARAM_NAME);
+        if (!CollectionUtils.isEmpty(resourcesArrayList)) {
+            List<String> collect = buildCollectionUniqueId(resourcesArrayList);
+            for (String uId : collect) {
+                ResourceRestUtils.markResourceToDelete(uId, userId);
+            }
+            ResourceRestUtils.deleteMarkedResources(userId);
+        }
+
+        resourcesArrayList = convertCatalogResponseToJavaObject.get(ComponentTypeEnum.SERVICE_PARAM_NAME);
+        if (resourcesArrayList.size() > 0) {
+            List<String> collect = buildCollectionUniqueId(resourcesArrayList);
+            for (String uId : collect) {
+                ServiceRestUtils.markServiceToDelete(uId, userId);
+            }
+            ServiceRestUtils.deleteMarkedServices(userId);
+        }
+    }
+
+    protected static List<String> buildCollectionUniqueId(List<Component> resourcesArrayList) {
+
+
+        List<String> genericCollection = new ArrayList<>();
+        if(resourcesArrayList.get(0) != null) {
+            ComponentTypeEnum componentTypeEnum = resourcesArrayList.get(0).getComponentType();
+            resourcesArrayList.stream().filter(Objects::nonNull).
+                    filter(s -> s.getName().toLowerCase().startsWith("ci") && !s.getName().toLowerCase().equals("cindervolume")).
+                    filter(f -> f.getUniqueId() != null).
+                    map(Component::getUniqueId).
+                    collect(Collectors.toList()).
+                    forEach((i) -> buildCollectionBaseOnComponentType(componentTypeEnum, genericCollection, i));
+        }
+        return genericCollection;
+    }
+
+    public static void buildCollectionBaseOnComponentType(ComponentTypeEnum componentTypeEnum,
+                                                          List<String> genericCollection, String i) {
+        try {
+            switch (componentTypeEnum) {
+                case RESOURCE:
+                    RestResponse resource = ResourceRestUtils.getResource(i);
+                    Resource convertResourceResponseToJavaObject = ResponseParser.convertResourceResponseToJavaObject(resource.getResponse());
+                    Map<String, String> allVersions = convertResourceResponseToJavaObject.getAllVersions();
+                    Collection<String> values = allVersions.values();
+                    genericCollection.addAll(values);
+
+                    break;
+                case SERVICE:
+                    RestResponse service = ServiceRestUtils.getService(i);
+                    Service convertServiceResponseToJavaObject = ResponseParser.convertServiceResponseToJavaObject(service.getResponse());
+                    allVersions = convertServiceResponseToJavaObject.getAllVersions();
+                    values = allVersions.values();
+                    genericCollection.addAll(values);
+
+                    break;
+
+
+                case PRODUCT:
+                    RestResponse product = ProductRestUtils.getProduct(i);
+                    Product convertProductResponseToJavaObject = ResponseParser.convertProductResponseToJavaObject(product.getResponse());
+                    allVersions = convertProductResponseToJavaObject.getAllVersions();
+                    values = allVersions.values();
+                    genericCollection.addAll(values);
+
+                    break;
+            }
+        } catch (Exception e1) {
+            e1.printStackTrace();
+        }
+    }
+
+    protected static Map<String, List<Component>> getCatalogAsMap() throws Exception {
+        RestResponse catalog = CatalogRestUtils.getCatalog(UserRoleEnum.DESIGNER.getUserId());
+        return ResponseParser.convertCatalogResponseToJavaObject(catalog.getResponse());
+    }
+
+    protected Resource createVfFromCSAR(User sdncModifierDetails, String csarId) throws Exception {
+        // create new resource from Csar
+        ResourceReqDetails resourceDetails = ElementFactory.getDefaultResource();
+
+        resourceDetails.setCsarUUID(csarId);
+        resourceDetails.setResourceType(ResourceTypeEnum.VF.name());
+        RestResponse createResource = ResourceRestUtils.createResource(resourceDetails, sdncModifierDetails);
+        BaseRestUtils.checkCreateResponse(createResource);
+        return ResponseParser.convertResourceResponseToJavaObject(createResource.getResponse());
+    }
+
+
+}
diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/api/ComponentInstanceBaseTest.java b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/api/ComponentInstanceBaseTest.java
new file mode 100644
index 0000000000..678ebc4afe
--- /dev/null
+++ b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/api/ComponentInstanceBaseTest.java
@@ -0,0 +1,728 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * SDC
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.sdc.ci.tests.api;
+
+import org.apache.commons.lang3.tuple.ImmutablePair;
+import org.junit.rules.TestName;
+import org.openecomp.sdc.be.datatypes.enums.ComponentTypeEnum;
+import org.openecomp.sdc.be.datatypes.enums.ResourceTypeEnum;
+import org.openecomp.sdc.be.model.*;
+import org.openecomp.sdc.ci.tests.datatypes.*;
+import org.openecomp.sdc.ci.tests.datatypes.enums.*;
+import org.openecomp.sdc.ci.tests.datatypes.http.RestResponse;
+import org.openecomp.sdc.ci.tests.utils.general.ElementFactory;
+import org.openecomp.sdc.ci.tests.utils.rest.*;
+import org.testng.Assert;
+
+import java.io.IOException;
+import java.util.*;
+import java.util.Map.Entry;
+import java.util.function.Function;
+import java.util.stream.Collectors;
+
+import static org.testng.AssertJUnit.*;
+
+public class ComponentInstanceBaseTest extends ComponentBaseTest {
+	public static final String acceptHeaderData = "application/json";
+	// Req/cap of container component
+	protected Map<String, List<CapabilityDefinition>> expectedContainerCapabilities;
+	protected Map<String, List<RequirementDefinition>> expectedContainerRequirements;
+	protected Map<String, Map<String, List<RequirementDefinition>>> removedRequirements;
+	protected Map<String, ImmutablePair<Map<String, List<CapabilityDefinition>>, Map<String, List<RequirementDefinition>>>> expectedContInstReqCap;
+
+	protected User sdncPsDetails1;
+	protected User sdncPsDetails2;
+	protected User sdncPmDetails1;
+	protected User sdncPmDetails2;
+	protected User sdncDesignerDetails;
+	protected User sdncAdminDetails;
+	protected User sdncTesterDetails;
+	protected ResourceReqDetails resourceDetailsVFC_01;
+	protected ResourceReqDetails resourceDetailsVFC_02;
+	protected ResourceReqDetails resourceDetailsVF_01;
+	protected ResourceReqDetails resourceDetailsVF_02;
+	protected ResourceReqDetails resourceDetailsCP_01;
+	protected ResourceReqDetails resourceDetailsCP_02;
+	protected ResourceReqDetails resourceDetailsVL_01;
+	protected ResourceReqDetails resourceDetailsVL_02;
+	protected ServiceReqDetails serviceDetails_01;
+	protected ServiceReqDetails serviceDetails_02;
+	protected ServiceReqDetails serviceDetails_03;
+	protected ProductReqDetails productDetails_01;
+	protected ProductReqDetails productDetails_02;
+
+	public void init() {
+		// Req/caps of inner componentInstances
+		expectedContainerCapabilities = new LinkedHashMap<>();
+		expectedContainerRequirements = new LinkedHashMap<>();
+		removedRequirements = new HashMap<>();
+		expectedContInstReqCap = new HashMap<>();
+
+		sdncPsDetails1 = ElementFactory.getDefaultUser(UserRoleEnum.PRODUCT_STRATEGIST1);
+		sdncPsDetails2 = ElementFactory.getDefaultUser(UserRoleEnum.PRODUCT_STRATEGIST2);
+		sdncPmDetails1 = ElementFactory.getDefaultUser(UserRoleEnum.PRODUCT_MANAGER1);
+		sdncPmDetails2 = ElementFactory.getDefaultUser(UserRoleEnum.PRODUCT_MANAGER2);
+		sdncDesignerDetails = ElementFactory.getDefaultUser(UserRoleEnum.DESIGNER);
+		sdncAdminDetails = ElementFactory.getDefaultUser(UserRoleEnum.ADMIN);
+		sdncTesterDetails = ElementFactory.getDefaultUser(UserRoleEnum.TESTER);
+		resourceDetailsVFC_01 = ElementFactory.getDefaultResourceByType("ciVFC100", NormativeTypesEnum.SOFTWARE_COMPONENT, ResourceCategoryEnum.GENERIC_DATABASE, sdncDesignerDetails.getUserId(), ResourceTypeEnum.VFC.toString()); // resourceType = VFC
+		resourceDetailsVFC_02 = ElementFactory.getDefaultResourceByType("ciVFC200", NormativeTypesEnum.COMPUTE, ResourceCategoryEnum.GENERIC_INFRASTRUCTURE, sdncDesignerDetails.getUserId(), ResourceTypeEnum.VFC.toString());
+		resourceDetailsVF_01 = ElementFactory.getDefaultResourceByType("ciVF100", NormativeTypesEnum.ROOT, ResourceCategoryEnum.GENERIC_INFRASTRUCTURE, sdncDesignerDetails.getUserId(), ResourceTypeEnum.VF.toString());
+		resourceDetailsVF_02 = ElementFactory.getDefaultResourceByType("ciVF200", NormativeTypesEnum.ROOT, ResourceCategoryEnum.GENERIC_INFRASTRUCTURE, sdncDesignerDetails.getUserId(), ResourceTypeEnum.VF.toString());
+		resourceDetailsCP_01 = ElementFactory.getDefaultResourceByType("ciCP100", NormativeTypesEnum.PORT, ResourceCategoryEnum.GENERIC_NETWORK_ELEMENTS, sdncDesignerDetails.getUserId(), ResourceTypeEnum.CP.toString());
+		resourceDetailsCP_02 = ElementFactory.getDefaultResourceByType("ciCP200", NormativeTypesEnum.PORT, ResourceCategoryEnum.GENERIC_DATABASE, sdncDesignerDetails.getUserId(), ResourceTypeEnum.CP.toString());
+		resourceDetailsVL_01 = ElementFactory.getDefaultResourceByType("ciVL100", NormativeTypesEnum.NETWORK, ResourceCategoryEnum.GENERIC_NETWORK_ELEMENTS, sdncDesignerDetails.getUserId(), ResourceTypeEnum.VL.toString());
+		resourceDetailsVL_02 = ElementFactory.getDefaultResourceByType("ciVL200", NormativeTypesEnum.NETWORK, ResourceCategoryEnum.GENERIC_NETWORK_ELEMENTS, sdncDesignerDetails.getUserId(), ResourceTypeEnum.VL.toString());
+		serviceDetails_01 = ElementFactory.getDefaultService("ciNewtestservice1", ServiceCategoriesEnum.MOBILITY, sdncDesignerDetails.getUserId(), ServiceInstantiationType.A_LA_CARTE.getValue());
+		serviceDetails_02 = ElementFactory.getDefaultService("ciNewtestservice2", ServiceCategoriesEnum.MOBILITY, sdncDesignerDetails.getUserId(), ServiceInstantiationType.A_LA_CARTE.getValue());
+		serviceDetails_03 = ElementFactory.getDefaultService("ciNewtestservice3", ServiceCategoriesEnum.MOBILITY, sdncDesignerDetails.getUserId(), ServiceInstantiationType.A_LA_CARTE.getValue());
+		productDetails_01 = ElementFactory.getDefaultProduct("ciProduct01");
+		productDetails_02 = ElementFactory.getDefaultProduct("ciProduct02");
+	}
+
+	public void verifyVFReqCap(String componentId) throws Exception {
+		RestResponse restResponse = ResourceRestUtils.getResource(componentId);
+		Resource resource = ResponseParser.parseToObject(restResponse.getResponse(), Resource.class);
+		verifyReqCap(resource);
+	}
+
+	public void verifyServiceReqCap(String componentId) throws Exception {
+		RestResponse restResponse = ServiceRestUtils.getService(componentId, sdncDesignerDetails);
+		Service service = ResponseParser.parseToObject(restResponse.getResponse(), Service.class);
+		verifyReqCap(service);
+	}
+
+	public void verifyProductReqCap(String componentId) throws Exception {
+		RestResponse restResponse = ProductRestUtils.getProduct(componentId, sdncPsDetails1.getUserId());
+		Product product = ResponseParser.parseToObject(restResponse.getResponse(), Product.class);
+		verifyReqCap(product);
+	}
+
+	public void verifyReqCap(Component actualComponent) {
+		verifyContainerReqCap(actualComponent);
+		verifyCompInstReqCap(actualComponent);
+	}
+
+	public RestResponse changeServiceInstanceVersion(String componentUniqueId, String serviceInstanceToReplaceUniqueId, String serviceUniqueId, User sdncModifierDetails, ComponentTypeEnum componentType, boolean isHighestLevel) throws Exception {
+		RestResponse changeResourceInstanceVersion = ProductRestUtils.changeServiceInstanceVersion(componentUniqueId, serviceInstanceToReplaceUniqueId, serviceUniqueId, sdncModifierDetails, componentType);
+		if (changeResourceInstanceVersion.getErrorCode().equals(BaseRestUtils.STATUS_CODE_SUCCESS) && isHighestLevel) {
+			/*
+			 * // Add RI Capabilities and Requirements to expected MAP --> expectedVfCapabilities and expectedVfRequirements
+			 * 
+			 * ComponentInstance componentInstance = ResponseParser.parseToObjectUsingMapper( changeResourceInstanceVersion.getResponse(), ComponentInstance.class); addCompInstReqCapToExpected(componentInstance, componentType);
+			 */
+		}
+		return changeResourceInstanceVersion;
+	}
+
+	protected void updateExpectedReqCapAfterChangeLifecycleState(String oldContainerUniqueIdToReplace, String newContainerUniqueId) {
+
+		// Update of container req/cap
+
+		Set<String> compInstKeysToChange = new HashSet<>();
+
+		for (String expKey : expectedContainerCapabilities.keySet()) {
+			List<CapabilityDefinition> expCapList = expectedContainerCapabilities.get(expKey);
+			for (CapabilityDefinition cap : expCapList) {
+				String ownerId = cap.getOwnerId();
+
+				if (ownerId.contains(oldContainerUniqueIdToReplace)) {
+					compInstKeysToChange.add(ownerId);
+					cap.setOwnerId(cap.getOwnerId().replaceAll(oldContainerUniqueIdToReplace, newContainerUniqueId));
+				}
+			}
+		}
+
+		for (String expKey : expectedContainerRequirements.keySet()) {
+			List<RequirementDefinition> expCapList = expectedContainerRequirements.get(expKey);
+			for (RequirementDefinition cap : expCapList) {
+				String ownerId = cap.getOwnerId();
+				if (ownerId.contains(oldContainerUniqueIdToReplace)) {
+					compInstKeysToChange.add(ownerId);
+					cap.setOwnerId(cap.getOwnerId().replaceAll(oldContainerUniqueIdToReplace, newContainerUniqueId));
+				}
+			}
+		}
+
+		// Update of internal comp instances req/cap
+		for (String oldKey : compInstKeysToChange) {
+			ImmutablePair<Map<String, List<CapabilityDefinition>>, Map<String, List<RequirementDefinition>>> immutablePair = expectedContInstReqCap.get(oldKey);
+			if (immutablePair != null) {
+				expectedContInstReqCap.remove(oldKey);
+				String newKey = oldKey.replaceAll(oldContainerUniqueIdToReplace, newContainerUniqueId);
+				expectedContInstReqCap.put(newKey, immutablePair);
+			}
+		}
+
+		// Update of removed req
+		for (String oldKey : compInstKeysToChange) {
+			Map<String, List<RequirementDefinition>> map = removedRequirements.get(oldKey);
+			if (map != null) {
+				removedRequirements.remove(oldKey);
+				String newKey = oldKey.replaceAll(oldContainerUniqueIdToReplace, newContainerUniqueId);
+				Collection<List<RequirementDefinition>> values = map.values();
+				if (values != null) {
+					for (List<RequirementDefinition> list : values) {
+						for (RequirementDefinition reqDef : list) {
+							reqDef.setOwnerId(reqDef.getOwnerId().replaceAll(oldContainerUniqueIdToReplace, newContainerUniqueId));
+						}
+					}
+				}
+				removedRequirements.put(newKey, map);
+			}
+		}
+	}
+
+	private void verifyCompInstReqCap(Component actualComponent) {
+		List<ComponentInstance> componentInstances = actualComponent.getComponentInstances();
+		if (componentInstances != null) {
+			assertEquals(expectedContInstReqCap.size(), componentInstances.size());
+			for (ComponentInstance compInst : componentInstances) {
+				String uniqueId = compInst.getUniqueId();
+				// System.out.println("Verifying req/cap of component instance
+				// "+ uniqueId);
+				Map<String, List<RequirementDefinition>> actualCompInstReq = compInst.getRequirements();
+				if (actualCompInstReq == null) {
+					actualCompInstReq = new HashMap<>();
+				}
+				Map<String, List<CapabilityDefinition>> actualCompInstCap = compInst.getCapabilities();
+				if (actualCompInstCap == null) {
+					actualCompInstCap = new HashMap<>();
+				}
+				ImmutablePair<Map<String, List<CapabilityDefinition>>, Map<String, List<RequirementDefinition>>> expReqCap = expectedContInstReqCap.get(uniqueId);
+				assertNotNull(expReqCap);
+				// System.out.println("expected instance requirements:
+				// "+expReqCap.right);
+				// System.out.println("expected instance capabilities:
+				// "+expReqCap.left);
+				// System.out.println("actual instance requirements:
+				// "+actualCompInstReq);
+				// System.out.println("actual instance capabilities:
+				// "+actualCompInstCap);
+
+				// REQ comparison
+				compareReqCapMaps(expReqCap.right, actualCompInstReq);
+
+				// CAP comparison
+				compareReqCapMaps(expReqCap.left, actualCompInstCap);
+			}
+
+		} else {
+			assertTrue(expectedContInstReqCap.isEmpty());
+		}
+	}
+
+	private void verifyContainerReqCap(Component actualComponent) {
+		Map<String, List<RequirementDefinition>> actualContainerRequirements = actualComponent.getRequirements();
+		if (actualContainerRequirements == null) {
+			actualContainerRequirements = new HashMap<>();
+		}
+		Map<String, List<CapabilityDefinition>> actualContainerCapabilities = actualComponent.getCapabilities();
+		if (actualContainerCapabilities == null) {
+			actualContainerCapabilities = new HashMap<>();
+		}
+		// System.out.println("Verifying req/cap of container component "+
+		// actualComponent.getUniqueId());
+		// System.out.println("expected container requirements:
+		// "+expectedContainerRequirements);
+		// System.out.println("expected container capabilities:
+		// "+expectedContainerCapabilities);
+		// System.out.println("actual container requirements:
+		// "+actualContainerRequirements);
+		// System.out.println("actual container capabilities:
+		// "+actualContainerCapabilities);
+
+		// REQ comparison
+		compareReqCapMaps(expectedContainerRequirements, actualContainerRequirements);
+
+		// CAP comparison
+		compareReqCapMaps(expectedContainerCapabilities, actualContainerCapabilities);
+	}
+
+	private <T> void compareReqCapMaps(Map<String, List<T>> expectedMap, Map<String, List<T>> actualMap) {
+		assertEquals(expectedMap.size(), actualMap.size());
+		for (String expKey : expectedMap.keySet()) {
+			List<?> expCapList = expectedMap.get(expKey);
+			List<?> actCapList = actualMap.get(expKey);
+			assertEquals(expCapList.size(), actCapList.size());
+			assertEquals(new HashSet<>(expCapList), new HashSet<>(actCapList));
+		}
+	}
+
+	public void addCompInstReqCapToExpected(ComponentInstance componentInstance, ComponentTypeEnum containerComponentType) throws Exception {
+		String uniqueId = componentInstance.getUniqueId();
+		String name = componentInstance.getName();
+		String originComponentId = componentInstance.getComponentUid();
+		RestResponse getResponse = null;
+		ComponentTypeEnum compInstType = getCompInstTypeByContainerType(containerComponentType);
+		Component component = null;
+		if (compInstType == ComponentTypeEnum.RESOURCE) {
+			getResponse = ResourceRestUtils.getResource(sdncDesignerDetails, originComponentId);
+			ResourceRestUtils.checkSuccess(getResponse);
+			component = ResponseParser.parseToObjectUsingMapper(getResponse.getResponse(), Resource.class);
+		} else if (compInstType == ComponentTypeEnum.SERVICE) {
+			getResponse = ServiceRestUtils.getService(originComponentId, sdncDesignerDetails);
+			ResourceRestUtils.checkSuccess(getResponse);
+			component = ResponseParser.parseToObjectUsingMapper(getResponse.getResponse(), Service.class);
+		} else {
+			Assert.fail("Unsupported type - " + containerComponentType);
+		}
+
+		Map<String, List<RequirementDefinition>> resourceRequirements = component.getRequirements();
+		if (resourceRequirements == null) {
+			resourceRequirements = new HashMap<>();
+		}
+		
+		Function<Entry<String, List<RequirementDefinition>>, List<RequirementDefinition>> requirementDefinitionMapper = e -> new ArrayList<>(e.getValue().stream().map(item -> new RequirementDefinition(item)).collect(Collectors.toList()));
+		Map<String, List<RequirementDefinition>> reqCopy = resourceRequirements.entrySet().stream().collect(Collectors.toMap(e -> e.getKey(), requirementDefinitionMapper));
+		
+		Map<String, List<CapabilityDefinition>> resourceCapabilities = component.getCapabilities();
+		if (resourceCapabilities == null) {
+			resourceCapabilities = new HashMap<>();
+		}
+		
+		Function<? super Entry<String, List<CapabilityDefinition>>, List<CapabilityDefinition>> capabilityDefinitionMapper = e -> new ArrayList<>(e.getValue().stream().map(item -> new CapabilityDefinition(item)).collect(Collectors.toList()));
+		Map<String, List<CapabilityDefinition>> capCopy = resourceCapabilities.entrySet().stream().collect(Collectors.toMap(e -> e.getKey(), capabilityDefinitionMapper));
+		
+		setupContainerExpectedReqCap(uniqueId, name, resourceRequirements, resourceCapabilities);
+		if (component.getComponentType().equals(ComponentTypeEnum.RESOURCE) && ((Resource) component).getResourceType() != ResourceTypeEnum.VF) {
+			setupConstInstExpectedReqCap(uniqueId, name, reqCopy, capCopy);
+		}
+
+		// adding entry for expected componentInstance
+		ImmutablePair<Map<String, List<CapabilityDefinition>>, Map<String, List<RequirementDefinition>>> compInstReqCapPair = new ImmutablePair<Map<String, List<CapabilityDefinition>>, Map<String, List<RequirementDefinition>>>(capCopy, reqCopy);
+		expectedContInstReqCap.put(uniqueId, compInstReqCapPair);
+	}
+
+	private void setupContainerExpectedReqCap(String uniqueId, String name, Map<String, List<RequirementDefinition>> componentRequirements, Map<String, List<CapabilityDefinition>> componentCapabilities) {
+		for (Entry<String, List<RequirementDefinition>> resReq : componentRequirements.entrySet()) {
+			List<RequirementDefinition> reqListToAdd = resReq.getValue();
+			for (RequirementDefinition requirementDefinition : reqListToAdd) {
+				requirementDefinition.setOwnerId(uniqueId);
+				requirementDefinition.setOwnerName(name);
+			}
+			List<RequirementDefinition> expectedReqList = expectedContainerRequirements.get(resReq.getKey());
+			if (expectedReqList == null) {
+				expectedReqList = reqListToAdd;
+			} else {
+				expectedReqList.addAll(reqListToAdd);
+			}
+			expectedContainerRequirements.put(resReq.getKey(), expectedReqList);
+		}
+
+		for (Entry<String, List<CapabilityDefinition>> resCap : componentCapabilities.entrySet()) {
+			List<CapabilityDefinition> capListToAdd = resCap.getValue();
+			for (CapabilityDefinition capDefinition : capListToAdd) {
+				capDefinition.setOwnerId(uniqueId);
+				capDefinition.setOwnerName(name);
+			}
+			List<CapabilityDefinition> expectedCapList = expectedContainerCapabilities.get(resCap.getKey());
+			if (expectedCapList == null) {
+				expectedCapList = capListToAdd;
+			} else {
+				expectedCapList.addAll(capListToAdd);
+			}
+			expectedContainerCapabilities.put(resCap.getKey(), expectedCapList);
+		}
+	}
+
+	private void setupConstInstExpectedReqCap(String uniqueId, String name, Map<String, List<RequirementDefinition>> componentRequirements, Map<String, List<CapabilityDefinition>> componentCapabilities) {
+		for (Entry<String, List<RequirementDefinition>> resReq : componentRequirements.entrySet()) {
+			List<RequirementDefinition> reqListToAdd = resReq.getValue();
+			for (RequirementDefinition requirementDefinition : reqListToAdd) {
+				requirementDefinition.setOwnerId(uniqueId);
+				requirementDefinition.setOwnerName(name);
+			}
+		}
+
+		for (Entry<String, List<CapabilityDefinition>> resCap : componentCapabilities.entrySet()) {
+			List<CapabilityDefinition> capListToAdd = resCap.getValue();
+			for (CapabilityDefinition capDefinition : capListToAdd) {
+				capDefinition.setOwnerId(uniqueId);
+				capDefinition.setOwnerName(name);
+			}
+		}
+	}
+
+	private ComponentTypeEnum getCompInstTypeByContainerType(ComponentTypeEnum componentType) {
+		switch (componentType) {
+		case RESOURCE:
+			return ComponentTypeEnum.RESOURCE;
+		case SERVICE:
+			return ComponentTypeEnum.RESOURCE;
+		case PRODUCT:
+			return ComponentTypeEnum.SERVICE;
+		default:
+			break;
+		}
+		return null;
+	}
+
+	public void deleteCompInstReqCapFromExpected(String componentInstanceId) {
+		List<String> entriesRequirementsToRemove = new ArrayList<>();
+		List<String> entriesCapabilitiesToRemove = new ArrayList<>();
+		for (Entry<String, List<RequirementDefinition>> reqEntry : expectedContainerRequirements.entrySet()) {
+			List<RequirementDefinition> reqList = reqEntry.getValue();
+			List<RequirementDefinition> reqListToDelete = new ArrayList<>();
+			for (RequirementDefinition requirementDefinition : reqList) {
+				if (requirementDefinition.getOwnerId().equals(componentInstanceId)) {
+					reqListToDelete.add(requirementDefinition);
+				}
+			}
+			reqList.removeAll(reqListToDelete);
+			if (reqList.isEmpty()) {
+				entriesRequirementsToRemove.add(reqEntry.getKey());
+			}
+		}
+
+		for (String ekey : entriesRequirementsToRemove) {
+			expectedContainerRequirements.remove(ekey);
+		}
+
+		for (Entry<String, List<CapabilityDefinition>> capEntry : expectedContainerCapabilities.entrySet()) {
+			List<CapabilityDefinition> capList = capEntry.getValue();
+			List<CapabilityDefinition> capListToDelete = new ArrayList<>();
+			for (CapabilityDefinition capabilityDefinition : capList) {
+				if (capabilityDefinition.getOwnerId().equals(componentInstanceId)) {
+					capListToDelete.add(capabilityDefinition);
+				}
+			}
+			capList.removeAll(capListToDelete);
+			if (capList.isEmpty()) {
+				entriesCapabilitiesToRemove.add(capEntry.getKey());
+			}
+		}
+		for (String ekey : entriesCapabilitiesToRemove) {
+			expectedContainerCapabilities.remove(ekey);
+		}
+
+		expectedContInstReqCap.remove(componentInstanceId);
+
+	}
+
+	// Automatically updates the expected req/cap of the container
+	protected RestResponse createAtomicInstanceForVF(ResourceReqDetails containerDetails, ResourceReqDetails compInstOriginDetails, User modifier) throws Exception {
+		return createComponentInstance(containerDetails, compInstOriginDetails, modifier, ComponentTypeEnum.RESOURCE, true);
+	}
+
+	// Automatically updates the expected req/cap of the container
+	protected RestResponse createAtomicInstanceForService(ServiceReqDetails containerDetails, ResourceReqDetails compInstOriginDetails, User modifier) throws Exception {
+		return createComponentInstance(containerDetails, compInstOriginDetails, modifier, ComponentTypeEnum.SERVICE, true);
+	}
+
+	// Automatically updates the expected req/cap of the container
+	protected RestResponse createVFInstance(ServiceReqDetails containerDetails, ResourceReqDetails compInstOriginDetails, User modifier) throws Exception {
+		return createComponentInstance(containerDetails, compInstOriginDetails, modifier, ComponentTypeEnum.SERVICE, true);
+	}
+
+	// Automatically updates the expected req/cap of the container
+	protected RestResponse createServiceInstance(ProductReqDetails containerDetails, ServiceReqDetails compInstOriginDetails, User modifier) throws Exception {
+		return createComponentInstance(containerDetails, compInstOriginDetails, modifier, ComponentTypeEnum.PRODUCT, true);
+	}
+
+	// Automatically updates the expected req/cap of the container
+	protected RestResponse deleteAtomicInstanceForVF(String compInstUniqueId, ResourceReqDetails containerDetails, User modifier) throws IOException, Exception {
+		return deleteComponentInstance(compInstUniqueId, containerDetails, modifier, ComponentTypeEnum.RESOURCE, true);
+	}
+
+	// Automatically updates the expected req/cap of the container
+	protected RestResponse deleteAtomicInstanceForService(String compInstUniqueId, ServiceReqDetails containerDetails, User modifier) throws IOException, Exception {
+		return deleteComponentInstance(compInstUniqueId, containerDetails, modifier, ComponentTypeEnum.SERVICE, true);
+	}
+
+	// Automatically updates the expected req/cap of the container
+	protected RestResponse deleteVFInstance(String compInstUniqueId, ServiceReqDetails containerDetails, User modifier) throws IOException, Exception {
+		return deleteComponentInstance(compInstUniqueId, containerDetails, modifier, ComponentTypeEnum.SERVICE, true);
+
+	}
+
+	// Automatically updates the expected req/cap of the container
+	protected RestResponse deleteServiceInstance(String compInstUniqueId, ProductReqDetails containerDetails, User modifier) throws IOException, Exception {
+		return deleteComponentInstance(compInstUniqueId, containerDetails, modifier, ComponentTypeEnum.PRODUCT, true);
+	}
+
+	// Setup of lower components - Doesn't affect req/cap of the container (for
+	// example, setup of VF for testing a Product)
+	protected RestResponse createAtomicInstanceForVFDuringSetup(ResourceReqDetails containerDetails, ResourceReqDetails compInstOriginDetails, User modifier) throws Exception {
+		return createComponentInstance(containerDetails, compInstOriginDetails, modifier, ComponentTypeEnum.RESOURCE, false);
+	}
+
+	// Setup of lower components - Doesn't affect req/cap of the container (for
+	// example, setup of VF for testing a Product)
+	protected RestResponse createAtomicInstanceForServiceDuringSetup(ServiceReqDetails containerDetails, ResourceReqDetails compInstOriginDetails, User modifier) throws Exception {
+		return createComponentInstance(containerDetails, compInstOriginDetails, modifier, ComponentTypeEnum.SERVICE, false);
+	}
+
+	// Setup of lower components - Doesn't affect req/cap of the container (for
+	// example, setup of VF for testing a Product)
+	protected RestResponse createVFInstanceDuringSetup(ServiceReqDetails containerDetails, ResourceReqDetails compInstOriginDetails, User modifier) throws Exception {
+		return createComponentInstance(containerDetails, compInstOriginDetails, modifier, ComponentTypeEnum.SERVICE, false);
+	}
+
+	// Setup of lower components - Doesn't affect req/cap of the container (for
+	// example, setup of VF for testing a Product)
+	protected RestResponse createServiceInstanceDuringSetup(ProductReqDetails containerDetails, ServiceReqDetails compInstOriginDetails, User modifier) throws Exception {
+		return createComponentInstance(containerDetails, compInstOriginDetails, modifier, ComponentTypeEnum.PRODUCT, false);
+	}
+
+	// Setup of lower components - Doesn't affect req/cap of the container (for
+	// example, setup of VF for testing a Product)
+	protected RestResponse deleteAtomicInstanceForVFDuringSetup(String compInstUniqueId, ResourceReqDetails containerDetails, User modifier) throws IOException, Exception {
+		return deleteComponentInstance(compInstUniqueId, containerDetails, modifier, ComponentTypeEnum.RESOURCE, false);
+	}
+
+	// Setup of lower components - Doesn't affect req/cap of the container (for
+	// example, setup of VF for testing a Product)
+	protected RestResponse deleteAtomicInstanceForServiceDuringSetup(String compInstUniqueId, ServiceReqDetails containerDetails, User modifier) throws IOException, Exception {
+		return deleteComponentInstance(compInstUniqueId, containerDetails, modifier, ComponentTypeEnum.SERVICE, false);
+	}
+
+	// Setup of lower components - Doesn't affect req/cap of the container (for
+	// example, setup of VF for testing a Product)
+	protected RestResponse deleteVFInstanceDuringSetup(String compInstUniqueId, ServiceReqDetails containerDetails, User modifier) throws IOException, Exception {
+		return deleteComponentInstance(compInstUniqueId, containerDetails, modifier, ComponentTypeEnum.SERVICE, false);
+
+	}
+
+	// Setup of lower components - Doesn't affect req/cap of the container (for
+	// example, setup of VF for testing a Product)
+	protected RestResponse deleteServiceInstanceDuringSetup(String compInstUniqueId, ProductReqDetails containerDetails, User modifier) throws IOException, Exception {
+		return deleteComponentInstance(compInstUniqueId, containerDetails, modifier, ComponentTypeEnum.PRODUCT, false);
+	}
+
+	protected Component getComponentAndValidateRIs(ComponentReqDetails componentDetails, int numberOfRIs, int numberOfRelations) throws IOException, Exception {
+
+		RestResponse getResponse = null;
+		Component component = null;
+		if (componentDetails instanceof ResourceReqDetails) {
+			getResponse = ResourceRestUtils.getResource(sdncAdminDetails, componentDetails.getUniqueId());
+			component = ResponseParser.parseToObjectUsingMapper(getResponse.getResponse(), Resource.class);
+		} else if (componentDetails instanceof ServiceReqDetails) {
+			getResponse = ServiceRestUtils.getService((ServiceReqDetails) componentDetails, sdncAdminDetails);
+			component = ResponseParser.parseToObjectUsingMapper(getResponse.getResponse(), Service.class);
+		} else if (componentDetails instanceof ProductReqDetails) {
+			getResponse = ProductRestUtils.getProduct(componentDetails.getUniqueId(), sdncAdminDetails.getUserId());
+			component = ResponseParser.parseToObjectUsingMapper(getResponse.getResponse(), Product.class);
+		} else {
+			Assert.fail("Unsupported type of componentDetails - " + componentDetails.getClass().getSimpleName());
+		}
+		ResourceRestUtils.checkSuccess(getResponse);
+		int numberOfActualRIs = component.getComponentInstances() != null ? component.getComponentInstances().size() : 0;
+		int numberOfActualRelations = component.getComponentInstancesRelations() != null ? component.getComponentInstancesRelations().size() : 0;
+		assertEquals("Check number of RIs meet the expected number", numberOfRIs, numberOfActualRIs);
+		assertEquals("Check number of RI relations meet the expected number", numberOfRelations, numberOfActualRelations);
+		verifyReqCap(component);
+
+		return component;
+	}
+
+	protected void getComponentAndValidateRIsAfterChangeLifecycleState(String oldComponentUniqueIdToReplace, ComponentReqDetails componentDetails, int numOfRIs, int numOfRelations) throws IOException, Exception {
+		updateExpectedReqCapAfterChangeLifecycleState(oldComponentUniqueIdToReplace, componentDetails.getUniqueId());
+		getComponentAndValidateRIs(componentDetails, numOfRIs, numOfRelations);
+	}
+
+	private RestResponse createComponentInstance(ComponentReqDetails containerDetails, ComponentReqDetails compInstOriginDetails, User modifier, ComponentTypeEnum containerComponentTypeEnum, boolean isHighestLevel) throws IOException, Exception {
+		ComponentInstanceReqDetails resourceInstanceReqDetails = ElementFactory.getComponentResourceInstance(compInstOriginDetails);
+		RestResponse createResourceInstanceResponse = ComponentInstanceRestUtils.createComponentInstance(resourceInstanceReqDetails, modifier, containerDetails.getUniqueId(), containerComponentTypeEnum);
+		if (createResourceInstanceResponse.getErrorCode().equals(BaseRestUtils.STATUS_CODE_CREATED) && isHighestLevel) {
+			// Add RI Capabilities and Requirements to expected MAP -->
+			// expectedVfCapabilities and expectedVfRequirements
+			ComponentInstance componentInstance = ResponseParser.parseToObjectUsingMapper(createResourceInstanceResponse.getResponse(), ComponentInstance.class);
+			addCompInstReqCapToExpected(componentInstance, containerComponentTypeEnum);
+		}
+		return createResourceInstanceResponse;
+	}
+
+	private RestResponse deleteComponentInstance(String compInstUniqueId, ComponentReqDetails containerDetails, User modifier, ComponentTypeEnum componentTypeEnum, boolean isHighestLevel) throws Exception {
+		RestResponse deleteResourceInstanceResponse = ComponentInstanceRestUtils.deleteComponentInstance(modifier, containerDetails.getUniqueId(), compInstUniqueId, componentTypeEnum);
+		if (deleteResourceInstanceResponse.getErrorCode().equals(BaseRestUtils.STATUS_CODE_DELETE) && isHighestLevel) {
+			deleteCompInstReqCapFromExpected(compInstUniqueId);
+		}
+		return deleteResourceInstanceResponse;
+	}
+
+	// Create Atomic resource ( VFC/CP/VL)
+	protected void createAtomicResource(ResourceReqDetails resourceDetails) throws Exception {
+		RestResponse createResourceResponse = ResourceRestUtils.createResource(resourceDetails, sdncDesignerDetails);
+		ResourceRestUtils.checkCreateResponse(createResourceResponse);
+
+	}
+
+	protected void createVF(ResourceReqDetails resourceDetails) throws Exception {
+		createVF(resourceDetails, sdncDesignerDetails);
+
+	}
+
+	protected void createVF(ResourceReqDetails resourceDetails, User sdncModifier) throws Exception {
+		RestResponse createVfResponse = ResourceRestUtils.createResource(resourceDetails, sdncModifier);
+		ResourceRestUtils.checkCreateResponse(createVfResponse);
+	}
+
+	protected void createService(ServiceReqDetails serviceDetails) throws Exception {
+		createService(serviceDetails, sdncDesignerDetails);
+	}
+
+	protected void createService(ServiceReqDetails serviceDetails, User sdncModifier) throws Exception {
+		RestResponse createServiceResponse = ServiceRestUtils.createService(serviceDetails, sdncModifier);
+		ResourceRestUtils.checkCreateResponse(createServiceResponse);
+	}
+
+	protected void createProduct(ProductReqDetails productDetails) throws Exception {
+		createProduct(productDetails, sdncPmDetails1);
+	}
+
+	protected void createProduct(ProductReqDetails productDetails, User sdncModifier) throws Exception {
+		RestResponse createProductResponse = ProductRestUtils.createProduct(productDetails, sdncModifier);
+		ResourceRestUtils.checkCreateResponse(createProductResponse);
+	}
+
+	protected RestResponse associateComponentInstancesForService(RequirementCapabilityRelDef requirementDef, ComponentReqDetails containerDetails, User user) throws IOException {
+
+		RestResponse associateInstances = ComponentInstanceRestUtils.associateInstances(requirementDef, user, containerDetails.getUniqueId(), ComponentTypeEnum.SERVICE);
+		ResourceRestUtils.checkSuccess(associateInstances);
+		deleteAssociatedFromExpected(requirementDef);
+
+		return associateInstances;
+	}
+
+	private void deleteAssociatedFromExpected(RequirementCapabilityRelDef requirementDef) {
+		// removing from requirements
+		RelationshipInfo relationship = requirementDef.getRelationships().get(0).getRelation();
+		String type = relationship.getRelationship().getType();
+		String fromId = requirementDef.getFromNode();
+		List<RequirementDefinition> reqList = expectedContainerRequirements.get(type);
+		List<CapabilityDefinition> capList = expectedContainerCapabilities.get(type);
+		RequirementDefinition toDelete = null;
+		if (reqList != null) {
+			for (RequirementDefinition reqDef : reqList) {
+				if (reqDef.getOwnerId().equals(fromId)) {
+					toDelete = reqDef;
+				}
+			}
+			if (toDelete != null) {
+				reqList.remove(toDelete);
+				if (reqList.isEmpty()) {
+					expectedContainerRequirements.remove(type);
+				}
+				String ownerId = toDelete.getOwnerId();
+				Map<String, List<RequirementDefinition>> map = removedRequirements.get(ownerId);
+				if (map == null) {
+					map = new HashMap<>();
+					removedRequirements.put(ownerId, map);
+				}
+				List<RequirementDefinition> list = map.get(type);
+				if (list == null) {
+					list = new ArrayList<>();
+					map.put(type, list);
+				}
+				list.add(toDelete);
+			}
+		}
+
+		for (CapabilityDefinition capabilityDefinition : capList) {
+			if (capabilityDefinition.getType().equals(type)) {
+				int minOccurrences = Integer.parseInt(capabilityDefinition.getMinOccurrences()) - 1;
+				if (minOccurrences < 0)
+					minOccurrences = 0;
+				String minOccurrencesString = Integer.toString(minOccurrences);
+				capabilityDefinition.setMinOccurrences(minOccurrencesString);
+				if (!capabilityDefinition.getMaxOccurrences().equals("UNBOUNDED")) {
+					int maxOccurrences = Integer.parseInt(capabilityDefinition.getMaxOccurrences()) - 1;
+					if (maxOccurrences < 0)
+						maxOccurrences = 0;
+					String maxOccurrencesString = Integer.toString(maxOccurrences);
+					capabilityDefinition.setMaxOccurrences(maxOccurrencesString);
+				}
+			}
+		}
+		expectedContainerCapabilities.put(type, capList);
+	}
+
+	protected void dissociateComponentInstancesForService(RequirementCapabilityRelDef requirementDef, ComponentReqDetails containerDetails, User user) throws IOException {
+
+		RestResponse dissociateInstances = ComponentInstanceRestUtils.dissociateInstances(requirementDef, user, containerDetails.getUniqueId(), ComponentTypeEnum.SERVICE);
+		ResourceRestUtils.checkSuccess(dissociateInstances);
+		addDissociatedToExpected(requirementDef);
+	}
+
+	protected void fulfillCpRequirement(ComponentReqDetails component, String cpCompInstId, String cpReqFulfillerCompInstId, String cpReqFulfillerOwnerId, User user, ComponentTypeEnum containerCompType) throws IOException {
+		// Fulfilling cp's "binding" requirement - US626240
+		String requirementName = "binding";
+		String capType = "tosca.capabilities.network.Bindable";
+		RestResponse getResourceResponse = ComponentRestUtils.getComponentRequirmentsCapabilities(user, component);
+		ResourceRestUtils.checkSuccess(getResourceResponse);
+		CapReqDef capReqDef = ResponseParser.parseToObject(getResourceResponse.getResponse(), CapReqDef.class);
+		List<CapabilityDefinition> capList = capReqDef.getCapabilities().get(capType);
+		List<RequirementDefinition> reqList = capReqDef.getRequirements().get(capType);
+		RequirementCapabilityRelDef reqCapRelation = ElementFactory.getReqCapRelation(cpCompInstId, cpReqFulfillerCompInstId, cpCompInstId, cpReqFulfillerOwnerId, capType, requirementName, capList, reqList);
+		RestResponse associateInstances = ComponentInstanceRestUtils.associateInstances(reqCapRelation, user, component.getUniqueId(), containerCompType);
+		ResourceRestUtils.checkSuccess(associateInstances);
+	}
+
+	protected void consumeVlCapability(ComponentReqDetails component, String vlCapConsumerCompInstId, String vlCompInstId, String vlCapConsumerOwnerId, User user, ComponentTypeEnum containerCompType) throws IOException {
+		// Consuming vl's "link" capability - US626240
+		String requirementName = "link";
+		String capType = "tosca.capabilities.network.Linkable";
+		RestResponse getResourceResponse = ComponentRestUtils.getComponentRequirmentsCapabilities(user, component);
+		ResourceRestUtils.checkSuccess(getResourceResponse);
+		CapReqDef capReqDef = ResponseParser.parseToObject(getResourceResponse.getResponse(), CapReqDef.class);
+		List<CapabilityDefinition> capList = capReqDef.getCapabilities().get(capType);
+		List<RequirementDefinition> reqList = capReqDef.getRequirements().get(capType);
+		RequirementCapabilityRelDef reqCapRelation = ElementFactory.getReqCapRelation(vlCapConsumerCompInstId, vlCompInstId, vlCapConsumerOwnerId, vlCompInstId, capType, requirementName, capList, reqList);
+		RestResponse associateInstances = ComponentInstanceRestUtils.associateInstances(reqCapRelation, user, component.getUniqueId(), containerCompType);
+		ResourceRestUtils.checkSuccess(associateInstances);
+	}
+
+	private void addDissociatedToExpected(RequirementCapabilityRelDef requirementDef) {
+		// adding to requirements
+		RelationshipInfo relationship = requirementDef.getRelationships().get(0).getRelation();
+		String type = relationship.getRelationship().getType();
+		String fromId = requirementDef.getFromNode();
+		Map<String, List<RequirementDefinition>> map = removedRequirements.get(fromId);
+		if (map != null) {
+			List<RequirementDefinition> list = map.get(type);
+			if (list != null && !list.isEmpty()) {
+				List<RequirementDefinition> reqList = expectedContainerRequirements.get(type);
+				if (reqList == null) {
+					reqList = new ArrayList<>();
+					expectedContainerRequirements.put(type, reqList);
+				}
+				reqList.add(list.remove(0));
+			}
+		}
+
+		List<CapabilityDefinition> capList = expectedContainerCapabilities.get(type);
+
+		for (CapabilityDefinition capabilityDefinition : capList) {
+			if (capabilityDefinition.getType().equals(type)) {
+				int minOccurrences = Integer.parseInt(capabilityDefinition.getMinOccurrences()) + 1;
+				String minOccurrencesString = Integer.toString(minOccurrences);
+				capabilityDefinition.setMinOccurrences(minOccurrencesString);
+				if (!capabilityDefinition.getMaxOccurrences().equals("UNBOUNDED")) {
+					int maxOccurrences = Integer.parseInt(capabilityDefinition.getMaxOccurrences()) + 1;
+					String maxOccurrencesString = Integer.toString(maxOccurrences);
+					capabilityDefinition.setMaxOccurrences(maxOccurrencesString);
+				}
+			}
+		}
+		expectedContainerCapabilities.put(type, capList);
+	}
+}
diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/api/ExtentManager.java b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/api/ExtentManager.java
new file mode 100644
index 0000000000..194966d699
--- /dev/null
+++ b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/api/ExtentManager.java
@@ -0,0 +1,161 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * SDC
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.sdc.ci.tests.api;
+
+import com.aventstack.extentreports.ExtentReports;
+import com.aventstack.extentreports.reporter.ExtentHtmlReporter;
+import com.aventstack.extentreports.reporter.ExtentXReporter;
+import com.aventstack.extentreports.reporter.configuration.Protocol;
+import com.aventstack.extentreports.reporter.configuration.Theme;
+import org.openecomp.sdc.ci.tests.config.Config;
+import org.openecomp.sdc.ci.tests.utils.Utils;
+import org.openecomp.sdc.ci.tests.utils.general.FileHandling;
+import org.openecomp.sdc.ci.tests.utils.rest.AutomationUtils;
+import org.testng.ITestContext;
+
+import java.io.File;
+
+public class ExtentManager {
+	
+	private static final String VERSIONS_INFO_FILE_NAME = "versions.info";
+	private static ExtentReports extent;
+	private static ExtentHtmlReporter htmlReporter;
+	private static ExtentXReporter extentxReporter;
+
+	public enum suiteNameXml {
+
+		TESTNG_FAILED_XML_NAME("testng-failed.xml");
+
+		suiteNameXml(String value) {
+		        this.value = value;
+		    }
+
+		private String value;
+
+	    public String getValue() {
+	        return value;
+	    }
+		
+	}
+    
+    public synchronized static ExtentReports setReporter(String filePath, String htmlFile, Boolean isAppend) throws Exception {
+    	String dbIp = Utils.getConfig().getReportDBhost();
+    	int dbPort = Utils.getConfig().getReportDBport();
+
+    	if (extent == null) {
+        	extentxReporter = new ExtentXReporter(dbIp, dbPort);
+    		extent = new ExtentReports();
+    		initAndSetExtentHtmlReporter(filePath, htmlFile, isAppend);
+			
+    		if(extentxReporter.config().getReportObjectId() != null){
+				setExtentXReporter(isAppend);
+			}else{
+				extentxReporter.stop();
+			}
+        }
+        return extent;
+    }
+    
+    public synchronized static void setExtentXReporter(Boolean isAppend){
+    	extentxReporter.setAppendExisting(isAppend);
+		extent.attachReporter(extentxReporter);
+    }
+    
+    public synchronized static void initAndSetExtentHtmlReporter(String filePath, String htmlFile, Boolean isAppend) throws Exception{
+    	htmlReporter = new ExtentHtmlReporter(filePath + htmlFile);
+    	setConfiguration(htmlReporter);
+		htmlReporter.setAppendExisting(isAppend);
+		extent.attachReporter(htmlReporter);
+    }
+
+    public synchronized static ExtentReports getReporter() {
+        return extent;
+    }
+
+	public static void initReporter(String filepath, String htmlFile, ITestContext context) throws Exception {
+		
+		String onboardVersion = AutomationUtils.getOnboardVersion();
+		String osVersion = AutomationUtils.getOSVersion();
+		Config config = Utils.getConfig();
+		String envData = config.getUrl();
+		String suiteName = getSuiteName(context);
+		
+		if(suiteName.equals(suiteNameXml.TESTNG_FAILED_XML_NAME.getValue())){
+			if (config.getUseBrowserMobProxy())
+			    setTrafficCaptue(config);
+			
+			setReporter(filepath, htmlFile, true);
+			String suiteNameFromVersionInfoFile = FileHandling.getKeyByValueFromPropertyFormatFile(filepath + VERSIONS_INFO_FILE_NAME, "suiteName");
+			reporterDataDefinition(onboardVersion, osVersion, envData, suiteNameFromVersionInfoFile);
+		}else{
+			FileHandling.deleteDirectory(ComponentBaseTest.getReportFolder());
+			FileHandling.createDirectory(filepath);
+			setReporter(filepath, htmlFile, false);
+			reporterDataDefinition(onboardVersion, osVersion, envData, suiteName);
+			AutomationUtils.createVersionsInfoFile(filepath + VERSIONS_INFO_FILE_NAME, onboardVersion, osVersion, envData, suiteName);
+		}
+		
+	}
+
+	public static void reporterDataDefinition(String onboardVersion, String osVersion, String envData, String suiteNameFromVersionInfoFile) throws Exception {
+		extent.setSystemInfo("Onboard Version", onboardVersion);
+		extent.setSystemInfo("OS Version", osVersion);
+//		extent.setSystemInfo("Host Name Address", RestCDUtils.getExecutionHostAddress());
+		extent.setSystemInfo("ExecutedOn", envData);
+		extent.setSystemInfo("SuiteName", suiteNameFromVersionInfoFile);
+	}
+
+	public static  String getSuiteName(ITestContext context) {
+		String suitePath = context.getSuite().getXmlSuite().getFileName();
+		if(suitePath != null){
+			File file = new File(suitePath);
+			String suiteName = file.getName();
+			return suiteName;
+		}
+		return null;
+	}
+	
+	public synchronized static ExtentHtmlReporter setConfiguration(ExtentHtmlReporter htmlReporter) throws Exception {
+		
+    	htmlReporter.config().setTheme(Theme.STANDARD);
+    	htmlReporter.config().setEncoding("UTF-8");
+    	htmlReporter.config().setProtocol(Protocol.HTTPS);
+    	htmlReporter.config().setDocumentTitle("SDC Automation Report");
+    	htmlReporter.config().setChartVisibilityOnOpen(true);
+//    	htmlReporter.config().setReportName(AutomationUtils.getATTVersion());
+    	htmlReporter.config().setReportName("SDC Automation Report");
+    	htmlReporter.config().setChartVisibilityOnOpen(false);
+//    	htmlReporter.config().setJS(icon);
+    	return htmlReporter;
+    }
+	
+	public static void closeReporter(){
+		extent.flush();
+	}
+	
+	public static void setTrafficCaptue(Config config) {
+		boolean mobProxyStatus = config.getUseBrowserMobProxy();
+		if (mobProxyStatus){
+			config.setCaptureTraffic(true);;
+		}
+	}	
+}
+
diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/api/ExtentTestActions.java b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/api/ExtentTestActions.java
new file mode 100644
index 0000000000..5cb5a5b442
--- /dev/null
+++ b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/api/ExtentTestActions.java
@@ -0,0 +1,112 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * SDC
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.sdc.ci.tests.api;
+
+import com.aventstack.extentreports.ExtentTest;
+import com.aventstack.extentreports.Status;
+import com.aventstack.extentreports.markuputils.ExtentColor;
+import com.aventstack.extentreports.markuputils.Markup;
+import com.aventstack.extentreports.markuputils.MarkupHelper;
+
+import java.io.File;
+
+
+public class ExtentTestActions {
+	
+	public static SomeInterface testManager = new ExtentTestManager();
+	
+	public static void log(Status logStatus, Markup mark){
+		ExtentTest test = testManager.getTest();
+		test.log(logStatus, mark);
+	}
+
+	public static void log(Status logStatus, String message){
+		ExtentTest test = testManager.getTest();
+		test.log(logStatus, message);
+	}
+	
+	public static void log(Status logStatus, String message, String duration){
+		log(logStatus, message + addDurationTag(duration));
+	}
+	
+	public static void log(Status logStatus, Throwable throwabel){
+		ExtentTest test = testManager.getTest();
+		test.log(logStatus, throwabel);
+	}
+	
+	public static void addTag(Status logStatus, String message){
+		Markup m = null;
+		switch(logStatus){
+		case PASS:
+			m = MarkupHelper.createLabel(message, ExtentColor.GREEN);
+			break;
+		case FAIL:
+			m = MarkupHelper.createLabel(message, ExtentColor.RED);
+			break;
+		case SKIP:
+			m = MarkupHelper.createLabel(message, ExtentColor.BLUE);
+			break;
+		case FATAL:
+			m = MarkupHelper.createLabel(message, ExtentColor.BROWN);
+			break;
+		default:
+			break;
+		}
+		
+		if (m != null){
+			log(logStatus, m);
+		}
+	}
+	
+//	public static String addScreenshot(Status logStatus, String screenshotName, String message) throws IOException{
+//		String imageFilePath = null;
+//		String uuid = UUID.randomUUID().toString();
+//		String[] stringArray = uuid.split("-");
+//		screenshotName = screenshotName + "-" + stringArray[stringArray.length - 1];
+//		try {
+//			File imageFile = GeneralUIUtils.takeScreenshot(screenshotName, SetupCDTest.getScreenshotFolder());
+//			imageFilePath = new File(SetupCDTest.getReportFolder()).toURI().relativize(imageFile.toURI()).getPath();
+//		} catch (IOException e) {
+//			e.printStackTrace();
+//		}
+//
+//		ExtentTest test = ExtentTestManager.getTest();
+//		test.log(logStatus, message, MediaEntityBuilder.createScreenCaptureFromPath(imageFilePath).build());
+//		return imageFilePath;
+//	}
+	
+	private static String addDurationTag(String duration){
+		return "<td width=\"80px\">" + duration + "</td>";
+	}
+	
+	public static String addLinkTag(String fileName, String pathToFile){
+		return String.format("<a download=\"%s\" href=\"%s\">HAR file</a>", fileName, pathToFile);
+	}
+
+	public static void addFileToReportAsLink(File harFile, String pathToFileFromReportDirectory, String message) {
+		log(Status.INFO, message, addLinkTag(harFile.getName(), pathToFileFromReportDirectory));
+	}
+	
+	
+	
+
+
+}
diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/api/ExtentTestManager.java b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/api/ExtentTestManager.java
new file mode 100644
index 0000000000..810f6a6543
--- /dev/null
+++ b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/api/ExtentTestManager.java
@@ -0,0 +1,65 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * SDC
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.sdc.ci.tests.api;
+
+import com.aventstack.extentreports.ExtentReports;
+import com.aventstack.extentreports.ExtentTest;
+
+import java.util.HashMap;
+public class ExtentTestManager implements SomeInterface{
+
+		private static HashMap<Long, ExtentTest> extentTestMap = new HashMap<Long, ExtentTest>();
+		private static ExtentReports extent = ExtentManager.getReporter();
+		
+		public ExtentTestManager(){			
+		}
+        
+		@Override
+	    public synchronized ExtentTest getTest() {
+	        return extentTestMap.get(Thread.currentThread().getId());
+	    }
+
+	    public static synchronized void endTest() {
+//	        extent.endTest(extentTestMap.get(Thread.currentThread().getId()));
+	    	extent.flush();
+	    }
+
+	    public static synchronized ExtentTest startTest(String testName) {
+	        return startTest(testName, "");
+	    }
+
+	    public static synchronized ExtentTest startTest(String testName, String desc) {
+	        ExtentTest test = extent.createTest(testName, desc);
+	        extentTestMap.put(Thread.currentThread().getId(), test);
+
+	        return test;
+	    }
+	    
+	    public static synchronized <T> void assignCategory(Class<T> clazz){
+			String[] parts = clazz.getName().split("\\.");
+			String lastOne1 = parts[parts.length-1];
+			String lastOne2 = parts[parts.length-2];
+			extentTestMap.get(Thread.currentThread().getId()).assignCategory(lastOne2 + "-" + lastOne1);
+	    }
+	    
+	    	
+}
+
diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/api/SomeInterface.java b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/api/SomeInterface.java
new file mode 100644
index 0000000000..ce679a9f87
--- /dev/null
+++ b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/api/SomeInterface.java
@@ -0,0 +1,29 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * SDC
+ * ================================================================================
+ * 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=========================================================
+ */
+
+package org.openecomp.sdc.ci.tests.api;
+
+import com.aventstack.extentreports.ExtentTest;
+
+public interface SomeInterface {
+	
+	abstract ExtentTest getTest();
+
+}
diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/api/Urls.java b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/api/Urls.java
new file mode 100644
index 0000000000..956d9b1d8f
--- /dev/null
+++ b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/api/Urls.java
@@ -0,0 +1,429 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * SDC
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.sdc.ci.tests.api;
+
+
+import org.openecomp.sdc.ci.tests.utils.Utils;
+
+public interface Urls {
+
+
+	final static String SDC_HTTP_METHOD = Utils.getConfigHandleException() == null ? "http" : Utils.getConfigHandleException().getSdcHttpMethod();
+	final String AMDOCS_HTTP_METHOD = SDC_HTTP_METHOD;
+
+
+	final String UPLOAD_ZIP_URL = SDC_HTTP_METHOD + "://%s:%s/sdc1/rest/v1/catalog/resources";
+	final String GET_IMAGE_DATA_FROM_ES = SDC_HTTP_METHOD + "://%s:%s/resources/imagedata/_search?q=resourceName:%s&pretty=true&size=1000";
+	final String GET_SCRIPT_DATA_FROM_ES = SDC_HTTP_METHOD + "://%s:%s/resources/artifactdata/_search?q=resourceName:%s&pretty=true&size=1000";
+	final String GET_ID_LIST_BY_INDEX_FROM_ES = SDC_HTTP_METHOD + "://%s:%s/%s/%s/_search?fields=_id&size=1000";
+
+	final String ES_URL = SDC_HTTP_METHOD + "://%s:%s";
+	final String GET_SERVICE_CSAR_API1 = SDC_HTTP_METHOD + "://%s:%s/sdc2/rest/services/%s/%s";
+	final String GET_SERVICE_CSAR_API2 = SDC_HTTP_METHOD + "://%s:%s/sdc2/rest/services/%s/%s/csar";
+
+	final String GET_SERVICE_CSAR_FE_PROXY_API1 = SDC_HTTP_METHOD + "://%s:%s/sdc1/portal/rest/services/%s/%s";
+	final String GET_CSAR_USING_SIMULATOR = SDC_HTTP_METHOD + "://%s:%s/onboardingci/onbrest/onboarding-api/v1.0/vendor-software-products/packages/%s";
+	final String COPY_CSAR_USING_SIMULATOR = SDC_HTTP_METHOD + "://%s:%s/onboardingci/onbrest/onboarding-api/v1.0/vendor-software-products/packages/%s/%s";
+
+	final String GET_HEALTH_CHECK_VIA_PROXY = SDC_HTTP_METHOD + "://%s:%s/sdc1/rest/healthCheck";
+
+	// Get back-end config http://172.20.43.132:8080/sdc2/rest/configmgr/get
+	final String GET_CONFIG_MANAGER = SDC_HTTP_METHOD + "://%s:%s/sdc2/rest/configmgr/get";
+
+	// Get latest version of all non-abstract resources
+	final String GET_RESOURCE_lATEST_VERSION = SDC_HTTP_METHOD + "://%s:%s/sdc2/rest/v1/catalog/resources/latestversion/notabstract";
+
+	final String GET_SERVICE_lATEST_VERSION = SDC_HTTP_METHOD + "://%s:%s/sdc2/rest/v1/catalog/services/latestversion/notabstract";
+
+	// Get resource artifact list:
+	// http://172.20.43.124:8080/sdc2/rest/v1/catalog/resources/alien.nodes.Apache/2.0.0-SNAPSHOT/artifacts
+	final String GET_RESOURCE_ARTIFACTS_LIST = SDC_HTTP_METHOD + "://%s:%s/sdc2/rest/v1/catalog/resources/%s/%s/artifacts";
+
+	// get resource artifact metadata (creation, MD5, etc):
+	// http://172.20.43.124:8080/sdc2/rest/v1/catalog/resources/alien.nodes.Apache/2.0.0-SNAPSHOT/artifacts/install_apache.sh/metadata
+	final String GET_RESOURCE_ARTIFACT_METADATA = SDC_HTTP_METHOD + "://%s:%s/sdc2/rest/v1/catalog/resources/%s/%s/artifacts/%s/metadata";
+
+	// resource artifact payload:
+	// http://172.20.43.124:8080/sdc2/rest/v1/catalog/resources/alien.nodes.Apache/2.0.0-SNAPSHOT/artifacts/install_apache.sh
+	final String GET_RESOURCE_ARTIFACT_PAYLOAD = SDC_HTTP_METHOD + "://%s:%s/sdc2/rest/v1/catalog/resources/%s/%s/artifacts/%s";
+
+	final String GET_RESOURCE_ARTIFACT_PAYLOAD_FE_PROXY = SDC_HTTP_METHOD + "://%s:%s/sdc1/portal/rest/v1/catalog/resources/%s/%s/artifacts/%s";
+
+	// Get service artifact list:
+	// http://172.20.43.124:8080/sdc2/rest/v1/catalog/services/alien.nodes.Apache/0.0.1/artifacts
+	final String GET_SERVICE_ARTIFACTS_LIST = SDC_HTTP_METHOD + "://%s:%s/sdc2/rest/v1/catalog/services/%s/%s/artifacts";
+
+	// get service artifact metadata (creation, MD5, etc):
+	// http://172.20.43.124:8080/sdc2/rest/v1/catalog/services/alien.nodes.Apache/0.0.1/artifacts/install_apache.sh/metadata
+	final String GET_SERVICE_METADATA = SDC_HTTP_METHOD + "://%s:%s/sdc2/rest/v1/catalog/services/%s/%s/artifacts/%s/metadata";
+
+	// service artifact payload:
+	// http://172.20.43.124:8080/sdc2/rest/v1/catalog/services/alien.nodes.Apache/0.0.1/artifacts/install_apache.sh
+	final String GET_SERVICE_ARTIFACT_PAYLOAD = SDC_HTTP_METHOD + "://%s:%s/sdc2/rest/v1/catalog/services/%s/%s/artifacts/%s";
+
+	final String GET_SEARCH_DATA_FROM_ES = SDC_HTTP_METHOD + "://%s:%s/%s";
+
+	// ****************************************************USER
+	// URLs********************************************************
+	final String GET_USER = SDC_HTTP_METHOD + "://%s:%s/sdc2/rest/v1/user/%s";
+
+	final String GET_USER_ROLE = SDC_HTTP_METHOD + "://%s:%s/sdc2/rest/v1/user/%s/role";
+
+	final String CREATE_USER = SDC_HTTP_METHOD + "://%s:%s/sdc2/rest/v1/user";
+
+	final String UPDATE_USER = SDC_HTTP_METHOD + "://%s:%s/sdc2/rest/v1/user/%s";
+
+	final String UPDATE_USER_ROLE = SDC_HTTP_METHOD + "://%s:%s/sdc2/rest/v1/user/%s/role";
+
+	String DELETE_USER = SDC_HTTP_METHOD + "://%s:%s/sdc2/rest/v1/user/%s";
+
+	String GET_ALL_ADMIN_USERS = SDC_HTTP_METHOD + "://%s:%s/sdc2/rest/v1/user/admins";
+
+	final String AUTHORIZE_USER = SDC_HTTP_METHOD + "://%s:%s/sdc2/rest/v1/user/authorize";
+
+	final String GET_ALL_TAGS = SDC_HTTP_METHOD + "://%s:%s/sdc2/rest/v1/tags";
+
+	final String AUTH_USER = SDC_HTTP_METHOD + "://%s:%s/sdc2/rest/v1/user/authorize";
+
+	final String GET_ALL_NOT_ABSTRACT_RESOURCES = SDC_HTTP_METHOD + "://%s:%s/sdc2/rest/v1/catalog/resources/certified/notabstract";
+
+	final String GET_ALL_ABSTRACT_RESOURCES = SDC_HTTP_METHOD + "://%s:%s/sdc2/rest/v1/catalog/resources/certified/abstract";
+
+	final String QUERY_NEO4J = SDC_HTTP_METHOD + "://%s:%s/db/data/transaction";
+	final String CHANGE_IN_NEO4J = SDC_HTTP_METHOD + "://%s:%s/db/data/transaction/commit";
+
+	final String GET_ALL_ADMINS = SDC_HTTP_METHOD + "://%s:%s/sdc2/rest/v1/user/admins";
+
+	final String GET_USERS_BY_ROLES = SDC_HTTP_METHOD + "://%s:%s/sdc2/rest/v1/user/users?roles=%s";
+
+	final String GET_ALL_USERS = SDC_HTTP_METHOD + "://%s:%s/sdc2/rest/v1/user/users?roles/";
+
+	// *****************************************ECOMP User
+	// URL's*****************************************************
+	final String ECOMP_PUSH_USER = SDC_HTTP_METHOD + "://%s:%s/api/v2/user";
+
+	final String ECOMP_EDIT_USER = SDC_HTTP_METHOD + "://%s:%s/api/v2/user/%s";
+
+	final String ECOMP_GET_USER = SDC_HTTP_METHOD + "://%s:%s/api/v2/user/%s";
+
+	final String ECOMP_GET_ALL_USERS = SDC_HTTP_METHOD + "://%s:%s/api/v2/users";
+
+	final String ECOMP_GET_ALL_AVAILABLE_ROLES = SDC_HTTP_METHOD + "://%s:%s/api/v2/roles";
+
+	final String ECOMP_PUSH_USER_ROLES = SDC_HTTP_METHOD + "://%s:%s/api/v2/user/%s/roles";
+
+	final String ECOMP_GET_USER_ROLES = SDC_HTTP_METHOD + "://%s:%s/api/v2/user/%s/roles";
+
+	// *****************************************Elements*************************************************************
+	final String GET_TAGS_LIST = SDC_HTTP_METHOD + "://%s:%s/sdc2/rest/v1/tags";
+
+	final String GET_PROPERTY_SCOPES_LIST = SDC_HTTP_METHOD + "://%s:%s/sdc2/rest/v1/propertyScopes";
+
+	final String GET_CONFIGURATION = SDC_HTTP_METHOD + "://%s:%s/sdc2/rest/v1/configuration/ui";
+
+	final String GET_ALL_ARTIFACTS = SDC_HTTP_METHOD + "://%s:%s/sdc2/rest/v1/artifactTypes";
+
+	final String GET_FOLLWED_LIST = SDC_HTTP_METHOD + "://%s:%s/sdc2/rest/v1/followed";
+
+	final String GET_CATALOG_DATA = SDC_HTTP_METHOD + "://%s:%s/sdc2/rest/v1/screen/?excludeTypes=VFCMT&excludeTypes=Configuration";
+
+	// *****************************************Resources
+	// **********************************************************************
+	final String GET_LIST_CERTIFIED_RESOURCE_TEMPLATES = SDC_HTTP_METHOD + "://%s:%s/sdc2/rest/v1/resoourceTemplates";
+
+	final String CREATE_RESOURCE = SDC_HTTP_METHOD + "://%s:%s/sdc2/rest/v1/catalog/resources";
+	final String UPDATE_RESOURCE = SDC_HTTP_METHOD + "://%s:%s/sdc2/rest/v1/catalog/resources/%s";
+
+	final String IMPORT_RESOURCE_NORMATIVE = SDC_HTTP_METHOD + "://%s:%s/sdc2/rest/v1/catalog/upload/multipart";
+
+	final String IMPORT_USER_RESOURCE = SDC_HTTP_METHOD + "://%s:%s/sdc2/rest/v1/catalog/upload/user-resource";
+
+	final String IMPORT_CAPABILITY_TYPE = SDC_HTTP_METHOD + "://%s:%s/sdc2/rest/v1/catalog/uploadType/capability";
+	final String IMPORT_CATEGORIES = SDC_HTTP_METHOD + "://%s:%s/sdc2/rest/v1/catalog/uploadType/categories";
+	final String IMPORT_GROUP_TYPE = SDC_HTTP_METHOD + "://%s:%s/sdc2/rest/v1/catalog/uploadType/grouptypes";
+
+	// last %s is resourceId, resourceId = resourceName.resourceVersion
+	final String GET_RESOURCE = SDC_HTTP_METHOD + "://%s:%s/sdc2/rest/v1/catalog/resources/%s";
+	final String GET_RESOURCE_BY_NAME_AND_VERSION = SDC_HTTP_METHOD + "://%s:%s/sdc2/rest/v1/catalog/resources/resourceName/%s/resourceVersion/%s";
+	final String GET_RESOURCE_BY_CSAR_UUID = SDC_HTTP_METHOD + "://%s:%s/sdc2/rest/v1/catalog/resources/csar/%s";
+	final String GET_COMPONENT_REQUIRMENTS_CAPABILITIES = SDC_HTTP_METHOD + "://%s:%s/sdc2/rest/v1/catalog/%s/%s/requirmentsCapabilities";
+
+	final String DELETE_RESOURCE = SDC_HTTP_METHOD + "://%s:%s/sdc2/rest/v1/catalog/resources/%s";
+	final String DELETE_RESOURCE_BY_NAME_AND_VERSION = SDC_HTTP_METHOD + "://%s:%s/sdc2/rest/v1/catalog/resources/%s/%s";
+	final String DELETE_SERVICE_BY_NAME_AND_VERSION = SDC_HTTP_METHOD + "://%s:%s/sdc2/rest/v1/catalog/services/%s/%s";
+
+	final String DELETE_MARKED_RESOURCES = SDC_HTTP_METHOD + "://%s:%s/sdc2/rest/v1/inactiveComponents/resource";
+	final String DELETE_MARKED_SERVICES = SDC_HTTP_METHOD + "://%s:%s/sdc2/rest/v1/inactiveComponents/service";
+
+	final String GET_FOLLOWED_RESOURCES = SDC_HTTP_METHOD + "://%s:%s/sdc2/rest/v1/followed/resources/%s";
+	final String CHANGE_RESOURCE_LIFECYCLE_STATE = SDC_HTTP_METHOD + "://%s:%s/sdc2/rest/v1/catalog/resources/%s/lifecycleState/%s";
+	final String CHANGE_SERVICE_LIFECYCLE_STATE = SDC_HTTP_METHOD + "://%s:%s/sdc2/rest/v1/catalog/services/%s/lifecycleState/%s";
+	final String CHANGE_PRODUCT_LIFECYCLE_STATE = SDC_HTTP_METHOD + "://%s:%s/sdc2/rest/v1/catalog/products/%s/lifecycleState/%s";
+	final String CHANGE_COMPONENT_LIFECYCLE_STATE = SDC_HTTP_METHOD + "://%s:%s/sdc2/rest/v1/catalog/%s/%s/lifecycleState/%s";
+
+	final String CREATE_PROPERTY = SDC_HTTP_METHOD + "://%s:%s/sdc2/rest/v1/catalog/resources/%s/properties";
+    String CREATE_SERVICE_PROPERTY = SDC_HTTP_METHOD + "://%s:%s/sdc2/rest/v1/catalog/services/%s/properties";
+	final String DECLARE_PROPERTIES  = SDC_HTTP_METHOD + "://%s:%s/sdc2/rest/v1/catalog/%s/%s/create/inputs";
+	final String UPDATE_INPUT  = SDC_HTTP_METHOD + "://%s:%s/sdc2/rest/v1/catalog/resources/%s/update/inputs";
+
+	final String UPDATE_RESOURCE_METADATA = SDC_HTTP_METHOD + "://%s:%s/sdc2/rest/v1/catalog/resources/%s/metadata";
+
+	// ***********************************External API's
+	// (AssetData)****************************************
+
+	final String DELETE_EXTRNAL_API_DELETE_ARTIFACT_OF_ASSET = SDC_HTTP_METHOD + "://%s:%s/sdc/v1/catalog/%s/%s/artifacts/%s";
+	final String DELETE_EXTRNAL_API_DELETE_ARTIFACT_OF_COMPONENTINSTANCE_ON_ASSET = SDC_HTTP_METHOD + "://%s:%s/sdc/v1/catalog/%s/%s/resourceInstances/%s/artifacts/%s";
+
+	final String POST_EXTERNAL_API_UPDATE_ARTIFACT_OF_ASSET = SDC_HTTP_METHOD + "://%s:%s/sdc/v1/catalog/%s/%s/artifacts/%s";
+	final String POST_EXTERNAL_API_UPDATE_ARTIFACT_OF_COMPONENTINSTANCE_ON_ASSET = SDC_HTTP_METHOD + "://%s:%s/sdc/v1/catalog/%s/%s/resourceInstances/%s/artifacts/%s";
+
+	final String POST_EXTERNAL_API_UPLOAD_ARTIFACT_OF_ASSET = SDC_HTTP_METHOD + "://%s:%s/sdc/v1/catalog/%s/%s/artifacts";
+	final String POST_EXTERNAL_API_UPLOAD_ARTIFACT_OF_COMPONENTINSTANCE_ON_ASSET  = SDC_HTTP_METHOD + "://%s:%s/sdc/v1/catalog/%s/%s/resourceInstances/%s/artifacts";
+
+	final String GET_DOWNLOAD_RESOURCE_ARTIFACT_OF_ASSET = SDC_HTTP_METHOD + "://%s:%s/sdc/v1/catalog/resources/%s/artifacts/%s";
+	final String GET_DOWNLOAD_SERVICE_ARTIFACT_OF_ASSET = SDC_HTTP_METHOD + "://%s:%s/sdc/v1/catalog/services/%s/artifacts/%s";
+
+	final String GET_DOWNLOAD_RESOURCE_ARTIFACT_OF_COMPONENT_INSTANCE = SDC_HTTP_METHOD + "://%s:%s/sdc/v1/catalog/resources/%s/resourceInstances/%s/artifacts/%s";
+	final String GET_DOWNLOAD_SERVICE_ARTIFACT_OF_COMPONENT_INSTANCE = SDC_HTTP_METHOD + "://%s:%s/sdc/v1/catalog/services/%s/resourceInstances/%s/artifacts/%s";
+
+	final String GET_ASSET_LIST = SDC_HTTP_METHOD + "://%s:%s/sdc/v1/catalog/%s";
+	final String GET_FILTERED_ASSET_LIST = SDC_HTTP_METHOD + "://%s:%s/sdc/v1/catalog/%s?%s";
+	final String GET_TOSCA_MODEL = SDC_HTTP_METHOD + "://%s:%s/sdc/v1/catalog/%s/%s/toscaModel";
+	// https://{serverRoot}/sdc/v1/catalog/{assetType}/{uuid}/metadata, where
+	// assetType in {resources, services}
+	final String GET_ASSET_METADATA = SDC_HTTP_METHOD + "://%s:%s/sdc/v1/catalog/%s/%s/metadata";
+	final String POST_AUTHORIZATION = SDC_HTTP_METHOD + "://%s:%s/sdc2/rest/v1/consumers";
+	final String GET_DOWNLOAD_SERVICE_RI_ARTIFACT = SDC_HTTP_METHOD + "://%s:%s/sdc/v1/catalog/services/%s/resourceInstances/%s/artifacts/%s";
+	final String GET_DOWNLOAD_SERVICE_ARTIFACT = SDC_HTTP_METHOD + "://%s:%s/sdc/v1/catalog/services/%s/artifacts/%s";
+
+	final String POST_EXTERNAL_API_CREATE_RESOURCE = SDC_HTTP_METHOD + "://%s:%s/sdc/v1/catalog/resources";
+
+	// Change LifeCycle of Resource
+	// https://{serverRoot}:{port}/sdc/v1/catalog/{resources|services}/{uuid}/lifecycleState/{lifecycle state}
+	final String POST_EXTERNAL_API_CHANGE_LIFE_CYCLE_OF_ASSET = SDC_HTTP_METHOD + "://%s:%s/sdc/v1/catalog/%s/%s/lifecycleState/%s";
+
+
+	// *****************************************************************************************************
+
+	final String ADD_ARTIFACT_TO_RESOURCE = SDC_HTTP_METHOD + "://%s:%s/sdc2/rest/v1/catalog/resources/%s/artifacts";
+	final String UPDATE_OR_DELETE_ARTIFACT_OF_RESOURCE = SDC_HTTP_METHOD + "://%s:%s/sdc2/rest/v1/catalog/resources/%s/artifacts/%s";
+	final String ADD_ARTIFACT_TO_SERVICE = SDC_HTTP_METHOD + "://%s:%s/sdc2/rest/v1/catalog/services/%s/artifacts";
+	final String UPDATE_OR_DELETE_ARTIFACT_OF_SERVICE = SDC_HTTP_METHOD + "://%s:%s/sdc2/rest/v1/catalog/services/%s/artifacts/%s";
+
+	final String UPLOAD_DELETE_ARTIFACT_OF_COMPONENT = SDC_HTTP_METHOD + "://%s:%s/sdc2/rest/v1/catalog/%s/%s/artifacts";
+	final String UPDATE_ARTIFACT_OF_COMPONENT = SDC_HTTP_METHOD + "://%s:%s/sdc2/rest/v1/catalog/%s/%s/artifacts/%s";
+	final String UPLOAD_HEAT_ENV_ARTIFACT = SDC_HTTP_METHOD + "://%s:%s/sdc2/rest/v1/catalog/%s/%s/resourceInstance/%s/artifacts/%s";
+	// *****************************************************************************************************
+	final String UPLOAD_ARTIFACT_BY_INTERFACE_TO_RESOURCE = SDC_HTTP_METHOD + "://%s:%s/sdc2/rest/v1/catalog/resources/%s/%s/%s/artifacts/";
+	final String UPDATE_OR_DELETE_ARTIFACT_BY_INTERFACE_TO_RESOURCE = SDC_HTTP_METHOD + "://%s:%s/sdc2/rest/v1/catalog/resources/%s/%s/%s/artifacts/%s";
+
+	final String UPLOAD_ARTIFACT_BY_INTERFACE_TO_COMPONENT = SDC_HTTP_METHOD + "://%s:%s/sdc2/rest/v1/catalog/resources/%s/%s/%s/artifacts/";
+	final String UPDATE_OR_DELETE_ARTIFACT_BY_INTERFACE_TO_COMPONENT = SDC_HTTP_METHOD + "://%s:%s/sdc2/rest/v1/catalog/resources/%s/%s/%s/artifacts/%s";
+
+	// *****************************************************************************************************
+	// "/sdc2/v1/services/<serviceName>/<0.1>/artifacts/aaa.hh"
+	final String DISTRIB_DOWNLOAD_SERVICE_ARTIFACT = "/sdc2/rest/v1/catalog/services/%s/%s/artifacts/%s";
+	// "/sdc2/v1/services/<serviceName>/<0.1>/resources/{resourceName}/{resourceVersion}/artifacts/<opeartion_name>_aaa.hh"
+	final String DISTRIB_DOWNLOAD_RESOURCE_ARTIFACT = "/sdc2/rest/v1/catalog/services/%s/%s/resources/%s/%s/artifacts/%s";
+	final String DISTRIB_DOWNLOAD_SERVICE_ARTIFACT_RELATIVE_URL = "/sdc/v1/catalog/services/%s/%s/artifacts/%s";
+	final String DISTRIB_DOWNLOAD_RESOURCE_ARTIFACT_RELATIVE_URL = "/sdc/v1/catalog/services/%s/%s/resources/%s/%s/artifacts/%s";
+	final String DOWNLOAD_SERVICE_ARTIFACT_FULL_URL = SDC_HTTP_METHOD + "://%s:%s%s";
+	final String DOWNLOAD_RESOURCE_ARTIFACT_FULL_URL = SDC_HTTP_METHOD + "://%s:%s%s";
+	// **********************************************************************************
+	final String UI_DOWNLOAD_RESOURCE_ARTIFACT = SDC_HTTP_METHOD + "://%s:%s/sdc2/rest/v1/catalog/resources/%s/artifacts/%s";
+	final String UI_DOWNLOAD_SERVICE_ARTIFACT = SDC_HTTP_METHOD + "://%s:%s/sdc2/rest/v1/catalog/services/%s/artifacts/%s";
+
+	// **********************************************************************************************************
+	final String UPDATE_PROPERTY = SDC_HTTP_METHOD + "://%s:%s/sdc2/rest/v1/catalog/resources/%s/properties/%s";
+
+	final String DELETE_PROPERTY = SDC_HTTP_METHOD + "://%s:%s/sdc2/rest/v1/catalog/resources/%s/properties/%s";
+
+	final String GET_PROPERTY = SDC_HTTP_METHOD + "://%s:%s/sdc2/rest/v1/catalog/resources/%s/properties/%s";
+
+	// *****************************************************************************************************
+
+	final String VALIDATE_RESOURCE_NAME = SDC_HTTP_METHOD + "://%s:%s/sdc2/rest/v1/catalog/resources/validate-name/%s";
+
+	final String CREATE_SERVICE = SDC_HTTP_METHOD + "://%s:%s/sdc2/rest/v1/catalog/services";
+	final String DELETE_SERVICE = SDC_HTTP_METHOD + "://%s:%s/sdc2/rest/v1/catalog/services/%s";
+	final String GET_SERVICE = SDC_HTTP_METHOD + "://%s:%s/sdc2/rest/v1/catalog/services/%s";
+	final String GET_SERVICE_BY_NAME_AND_VERSION = SDC_HTTP_METHOD + "://%s:%s/sdc2/rest/v1/catalog/services/serviceName/%s/serviceVersion/%s";
+
+	final String GET_SERVICES_REQUIRMENTS_CAPABILITIES = SDC_HTTP_METHOD + "://%s:%s/sdc2/rest/v1/catalog/requirmentsCapabilities/services/%s";
+	final String GET_INSTANCE_REQUIRMENTS_CAPABILITIES  = SDC_HTTP_METHOD + "://%s:%s/sdc2/rest/v1/catalog/%s/%s/filteredDataByParams?include=requirements&include=capabilities";
+
+	final String CREATE_COMPONENT_INSTANCE = SDC_HTTP_METHOD + "://%s:%s/sdc2/rest/v1/catalog/%s/%s/resourceInstance";
+	final String DELETE_COMPONENT_INSTANCE = SDC_HTTP_METHOD + "://%s:%s/sdc2/rest/v1/catalog/%s/%s/resourceInstance/%s";
+	final String UPDATE_COMPONENT_INSTANCE = SDC_HTTP_METHOD + "://%s:%s/sdc2/rest/v1/catalog/%s/%s/resourceInstance/%s";
+	final String GET_COMPONENT_INSTANCES = SDC_HTTP_METHOD + "://%s:%s/sdc2/rest/v1/catalog/%s/%s/componentInstances";
+	// Tal New API
+	final String UPDATE_MULTIPLE_COMPONENT_INSTANCE = SDC_HTTP_METHOD + "://%s:%s/sdc2/rest/v1/catalog/%s/%s/resourceInstance/multipleComponentInstance";
+
+	final String CHANGE__RESOURCE_INSTANCE_VERSION = SDC_HTTP_METHOD + "://%s:%s/sdc2/rest/v1/catalog/%s/%s/resourceInstance/%s/changeVersion";
+
+	final String CREATE_AND_ASSOCIATE_RESOURCE_INSTANCE = SDC_HTTP_METHOD + "://%s:%s/sdc2/rest/v1/catalog/services/%s/resourceInstance/createAndAssociate";
+	final String ASSOCIATE__RESOURCE_INSTANCE = SDC_HTTP_METHOD + "://%s:%s/sdc2/rest/v1/catalog/%s/%s/resourceInstance/associate";
+	final String DISSOCIATE__RESOURCE_INSTANCE = SDC_HTTP_METHOD + "://%s:%s/sdc2/rest/v1/catalog/%s/%s/resourceInstance/dissociate";
+
+	final String DISTRIBUTION_INIT = SDC_HTTP_METHOD + "://%s:%s/init";
+	final String DISTRIBUTION_INIT_RESET = SDC_HTTP_METHOD + "://%s:%s/initReset";
+	final String APPROVE_DISTRIBUTION = SDC_HTTP_METHOD + "://%s:%s/sdc2/rest/v1/catalog/services/%s/distribution-state/approve";
+	final String REJECT_DISTRIBUTION = SDC_HTTP_METHOD + "://%s:%s/sdc2/rest/v1/catalog/services/%s/distribution-state/reject";
+	final String DISTRIBUTION_DOWNLOAD_ARTIFACT = SDC_HTTP_METHOD + "://%s:%s/download";
+	final String ACTIVATE_DISTRIBUTION = SDC_HTTP_METHOD + "://%s:%s/sdc2/rest/v1/catalog/services/%s/distribution/%s/activate";
+	final String DISTRIBUTION_SERVICE_LIST = SDC_HTTP_METHOD + "://%s:%s/sdc2/rest/v1/catalog/services/%s/distribution";
+	final String DISTRIBUTION_SERVICE_MONITOR = SDC_HTTP_METHOD + "://%s:%s/sdc2/rest/v1/catalog/services/distribution/%s";
+
+	final String DEPLOY_SERVICE = SDC_HTTP_METHOD + "://%s:%s/sdc2/rest/v1/catalog/services/%s/distribution/%s/markDeployed";
+	final String UPDATE_SERVICE_METADATA = SDC_HTTP_METHOD + "://%s:%s/sdc2/rest/v1/catalog/services/%s/metadata";
+
+	// Andrey changed name from ADD_PROPERTY_TO_RESOURCE_INSTANCE to
+	// UPDATE_PROPERTY_TO_RESOURCE_INSTANCE
+	final String UPDATE_PROPERTY_TO_RESOURCE_INSTANCE = SDC_HTTP_METHOD + "://%s:%s/sdc2/rest/v1/catalog/%s/%s/resourceInstance/%s/property";
+	final String DELETE_PROPERTY_FROM_RESOURCE_INSTANCE = SDC_HTTP_METHOD + "://%s:%s/sdc2/rest/v1/catalog/services/%s/resourceInstance/%s/property/%s";
+	final String UPDATE_RESOURCE_INSTANCE_HEAT_ENV_PARAMS = SDC_HTTP_METHOD + "://%s:%s/sdc2/rest/v1/catalog/services/%s/resourceInstance/%s/artifacts/%s/heatParams";
+
+	// Actions on artifact in resource instance
+	final String ADD_RESOURCE_INSTANCE_ARTIFACT = SDC_HTTP_METHOD + "://%s:%s/sdc2/rest/v1/catalog/services/%s/resourceInstance/%s/artifacts";
+	final String UPDATE_RESOURCE_INSTANCE_ARTIFACT = SDC_HTTP_METHOD + "://%s:%s/sdc2/rest/v1/catalog/services/%s/resourceInstance/%s/artifacts/%s";
+	final String DELETE_RESOURCE_INSTANCE_ARTIFACT = SDC_HTTP_METHOD + "://%s:%s/sdc2/rest/v1/catalog/services/%s/resourceInstance/%s/artifacts/%s";
+
+	// Attributes On Resource instance
+	public static final String UPDATE_ATTRIBUTE_ON_RESOURCE_INSTANCE = SDC_HTTP_METHOD + "://%s:%s/sdc2/rest/v1/catalog/%s/%s/resourceInstance/%s/attribute";
+
+	// ("/services/{serviceId}/resourceInstances/{resourceInstanceId}/artifacts/{artifactId}")
+	final String DOWNLOAD_COMPONENT_INSTANCE_ARTIFACT = SDC_HTTP_METHOD + "://%s:%s/sdc2/rest/v1/catalog/services/%s/resourceInstances/%s/artifacts/%s";
+
+	// -------------------------------service api
+	// artifact-----------------------------------------------------
+	final String UPDATE_DELETE_SERVICE_API_ARTIFACT = SDC_HTTP_METHOD + "://%s:%s/sdc2/rest/v1/catalog/services/%s/artifacts/api/%s";
+
+	final String CREATE_ADDITIONAL_INFORMATION_RESOURCE = SDC_HTTP_METHOD + "://%s:%s/sdc2/rest/v1/catalog/resources/%s/additionalinfo";
+	final String UPDATE_ADDITIONAL_INFORMATION_RESOURCE = SDC_HTTP_METHOD + "://%s:%s/sdc2/rest/v1/catalog/resources/%s/additionalinfo/%s";
+	final String DELETE_ADDITIONAL_INFORMATION_RESOURCE = UPDATE_ADDITIONAL_INFORMATION_RESOURCE;
+	final String GET_ADDITIONAL_INFORMATION_RESOURCE = SDC_HTTP_METHOD + "://%s:%s/sdc2/rest/v1/catalog/resources/%s/additionalinfo/%s";
+	final String GET_ALL_ADDITIONAL_INFORMATION_RESOURCE = SDC_HTTP_METHOD + "://%s:%s/sdc2/rest/v1/catalog/resources/%s/additionalinfo";
+
+	final String CREATE_ADDITIONAL_INFORMATION_SERVICE = SDC_HTTP_METHOD + "://%s:%s/sdc2/rest/v1/catalog/services/%s/additionalinfo";
+	final String UPDATE_ADDITIONAL_INFORMATION_SERVICE = SDC_HTTP_METHOD + "://%s:%s/sdc2/rest/v1/catalog/services/%s/additionalinfo/%s";
+	final String DELETE_ADDITIONAL_INFORMATION_SERVICE = UPDATE_ADDITIONAL_INFORMATION_SERVICE;
+	final String GET_ADDITIONAL_INFORMATION_SERVICE = SDC_HTTP_METHOD + "://%s:%s/sdc2/rest/v1/catalog/services/%s/additionalinfo/%s";
+	final String GET_ALL_ADDITIONAL_INFORMATION_SERVICE = SDC_HTTP_METHOD + "://%s:%s/sdc2/rest/v1/catalog/services/%s/additionalinfo";
+
+	final String GET_COMPONENT_AUDIT_RECORDS = SDC_HTTP_METHOD + "://%s:%s/sdc2/rest/v1/catalog/audit-records/%s/%s";
+
+	// CONSUMER
+	final String CREATE_CONSUMER = SDC_HTTP_METHOD + "://%s:%s/sdc2/rest/v1/consumers";
+	final String GET_CONSUMER = SDC_HTTP_METHOD + "://%s:%s/sdc2/rest/v1/consumers/%s";
+	final String DELETE_CONSUMER = SDC_HTTP_METHOD + "://%s:%s/sdc2/rest/v1/consumers/%s";
+
+	// Categories
+	final String CREATE_CATEGORY = SDC_HTTP_METHOD + "://%s:%s/sdc2/rest/v1/category/%s";
+	final String GET_ALL_CATEGORIES = SDC_HTTP_METHOD + "://%s:%s/sdc2/rest/v1/categories/%s";
+	final String GET_ALL_CATEGORIES_FE = SDC_HTTP_METHOD + "://%s:%s/sdc1/feProxy/rest/v1/categories/%s";
+	final String DELETE_CATEGORY = SDC_HTTP_METHOD + "://%s:%s/sdc2/rest/v1/category/%s/%s";
+	final String CREATE_SUB_CATEGORY = SDC_HTTP_METHOD + "://%s:%s/sdc2/rest/v1/category/%s/%s/subCategory";
+	final String DELETE_SUB_CATEGORY = SDC_HTTP_METHOD + "://%s:%s/sdc2/rest/v1/category/%s/%s/subCategory/%s";
+	final String CREATE_GROUPING = SDC_HTTP_METHOD + "://%s:%s/sdc2/rest/v1/category/%s/%s/subCategory/%s/grouping";
+	final String DELETE_GROUPING = SDC_HTTP_METHOD + "://%s:%s/sdc2/rest/v1/category/%s/%s/subCategory/%s/grouping/%s";
+
+	// product
+	final String CREATE_PRODUCT = SDC_HTTP_METHOD + "://%s:%s/sdc2/rest/v1/catalog/products";
+	final String DELETE_PRODUCT = SDC_HTTP_METHOD + "://%s:%s/sdc2/rest/v1/catalog/products/%s";
+	// last %s is resourceId, productId
+	final String GET_PRODUCT = SDC_HTTP_METHOD + "://%s:%s/sdc2/rest/v1/catalog/products/%s";
+	final String UPDATE_PRODUCT = SDC_HTTP_METHOD + "://%s:%s/sdc2/rest/v1/catalog/products/%s/metadata";
+	final String GET_PRODUCT_BY_NAME_AND_VERSION = SDC_HTTP_METHOD + "://%s:%s/sdc2/rest/v1/catalog/products/productName/%s/productVersion/%s";
+
+	// groups
+	final String GET_GROUP_BY_ID = SDC_HTTP_METHOD + "://%s:%s/sdc2/rest/v1/catalog/%s/%s/groups/%s";
+	//module property
+	final String RESOURCE_GROUP_PROPERTY = SDC_HTTP_METHOD + "://%s:%s/sdc2/rest/v1/catalog/resources/%s/groups/%s/properties";
+	// modules
+	final String GET_MODULE_BY_ID = SDC_HTTP_METHOD + "://%s:%s/sdc2/rest/v1/catalog/resources/%s/groups/%s";
+
+	// inputs
+	final String UPDATE_INPUTS = SDC_HTTP_METHOD + "://%s:%s/sdc2/rest/v1/catalog/%s/%s/update/inputs";
+	final String ADD_INPUTS = SDC_HTTP_METHOD + "://%s:%s/sdc2/rest/v1/catalog/%s/%s/create/inputs"; //{componentType}/{componentId}/create/inputs
+	final String DELETE_INPUT_BY_ID = SDC_HTTP_METHOD + "://%s:%s/sdc2/rest/v1/catalog/%s/%s/delete/%s/input"; //{componentType}/{componentId}/delete/{inputId}/input
+	final String GET_COMPONENT_INPUTS = SDC_HTTP_METHOD + "://%s:%s/sdc2/rest/v1/catalog/services/%s/inputs"; //services/{componentId}/inputs
+	final String GET_COMPONENT_INSTANCE_INPUTS = SDC_HTTP_METHOD + "://%s:%s/sdc2/rest/v1/catalog/%s/%s/componentInstances/%s/%s/inputs"; //{componentType}/{componentId}/componentInstances/{instanceId}/{originComonentUid}/inputs
+	final String GET_INPUTS_FOR_COMPONENT_INPUT = SDC_HTTP_METHOD + "://%s:%s/sdc2/rest/v1/catalog/resources/%s/groups/%s"; //{componentType}/{componentId}/inputs/{inputId}/inputs
+
+	// check version
+	final String ONBOARD_VERSION = SDC_HTTP_METHOD + "://%s:%s/onboarding-api/docs/build-info.json";
+	final String OS_VERSION = SDC_HTTP_METHOD + "://%s:%s/sdc2/rest/version";
+
+//	amdocs APIs
+	final String GET_VENDOR_SOFTWARE_PRODUCT = SDC_HTTP_METHOD + "://%s:%s/onboarding-api/v1.0/vendor-software-products/packages/%s";
+	final String UPLOAD_SNMP_POLL_ARTIFACT = SDC_HTTP_METHOD + "://%s:%s/onboarding-api/v1.0/vendor-software-products/%s/versions/%s/components/%s/uploads/types/SNMP_POLL";
+	final String UPLOAD_SNMP_TRAP_ARTIFACT = SDC_HTTP_METHOD + "://%s:%s/onboarding-api/v1.0/vendor-software-products/%s/versions/%s/components/%s/uploads/types/SNMP_TRAP";
+	final String UPLOAD_VES_EVENTS_ARTIFACT = SDC_HTTP_METHOD + "://%s:%s/onboarding-api/v1.0/vendor-software-products/%s/versions/%s/components/%s/uploads/types/VES_EVENTS";
+	final String UPLOAD_AMDOCS_ARTIFACT = SDC_HTTP_METHOD + "://%s:%s/onboarding-api/v1.0/vendor-software-products/%s/versions/%s/components/%s/uploads/types/%s";
+	final String DELETE_AMDOCS_ARTIFACT_BY_TYPE = SDC_HTTP_METHOD + "://%s:%s/onboarding-api/v1.0/vendor-software-products/%s/versions/%s/components/%s/monitors/%s";
+	final String GET_VSP_COMPONENTS = SDC_HTTP_METHOD + "://%s:%s/onboarding-api/v1.0/vendor-software-products/%s/versions/%s/components";
+	final String CREATE_VENDOR_LISENCE_MODELS = SDC_HTTP_METHOD + "://%s:%s/onboarding-api/v1.0/vendor-license-models";
+	final String CREATE_VENDOR_LISENCE_AGREEMENT = SDC_HTTP_METHOD + "://%s:%s/onboarding-api/v1.0/vendor-license-models/%s/versions/%s/license-agreements";
+	final String CREATE_VENDOR_LISENCE_FEATURE_GROUPS = SDC_HTTP_METHOD + "://%s:%s/onboarding-api/v1.0/vendor-license-models/%s/versions/%s/feature-groups";
+	final String CREATE_VENDOR_LISENCE_ENTITLEMENT_POOL = SDC_HTTP_METHOD + "://%s:%s/onboarding-api/v1.0/vendor-license-models/%s/versions/%s/entitlement-pools";
+	final String CREATE_VENDOR_LISENCE_KEY_GROUPS = SDC_HTTP_METHOD + "://%s:%s/onboarding-api/v1.0/vendor-license-models/%s/versions/%s/license-key-groups";
+	final String CREATE_METHOD = SDC_HTTP_METHOD + "://%s:%s/onboarding-api/v1.0/%s/%s/versions/%s/";
+	final String CREATE_VENDOR_SOFTWARE_PRODUCT = SDC_HTTP_METHOD + "://%s:%s/onboarding-api/v1.0/vendor-software-products";
+	final String VALIDATE_UPLOAD = SDC_HTTP_METHOD + "://%s:%s/onboarding-api/v1.0/vendor-software-products/%s/versions/%s/orchestration-template-candidate/process";
+	final String UPLOAD_HEAT_PACKAGE = SDC_HTTP_METHOD + "://%s:%s/onboarding-api/v1.0/vendor-software-products/%s/versions/%s/orchestration-template-candidate";
+	final String ACTION_ON_COMPONENT = SDC_HTTP_METHOD + "://%s:%s/onboarding-api/v1.0/%s/%s/versions/%s/actions";
+	final String UPDATE_VSP = SDC_HTTP_METHOD + "://%s:%s/onboarding-api/v1.0/vendor-software-products/%s/versions/%s";
+	final String GET_VSP_COMPONENT_BY_VERSION = SDC_HTTP_METHOD + "://%s:%s/onboarding-api/v1.0/vendor-software-products/%s/versions/%s";
+	final String GET_VLM_COMPONENT_BY_VERSION = SDC_HTTP_METHOD + "://%s:%s/onboarding-api/v1.0/vendor-license-models/%s/versions/%s";
+	final String ACTION_ARCHIVE_RESTORE_COMPONENT = SDC_HTTP_METHOD + "://%s:%s/onboarding-api/v1.0/%s/%s/actions";
+	String CREATE_SERVICE_FILTER = SDC_HTTP_METHOD + "://%s:%s/sdc2/rest/v1/catalog/services/%s/resourceInstances/%s/nodeFilter";
+    String UPDATE_SERVICE_FILTER = SDC_HTTP_METHOD + "://%s:%s/sdc2/rest/v1/catalog/services/%s"
+            + "/resourceInstances/%s/nodeFilter/";
+	String DELETE_SERVICE_FILTER = SDC_HTTP_METHOD + "://%s:%s/sdc2/rest/v1/catalog/services/%s"
+												  + "/resourceInstances/%s/nodeFilter/%s";
+	String MARK_AS_DEPENDENT = SDC_HTTP_METHOD + "://%s:%s/sdc2/rest/v1/catalog/%s/%s/resourceInstance/%s";
+
+	// Interface Lifecycle Types
+	final String GET_All_INTERFACE_LIFECYCLE_TYPES = SDC_HTTP_METHOD + "://%s:%s/sdc2/rest/v1/catalog/interfaceLifecycleTypes";
+
+	// Interface Operation
+	final String ADD_INTERFACE_OPERATIONS = SDC_HTTP_METHOD + "://%s:%s/sdc2/rest/v1/catalog/%s/%s/interfaceOperations";
+	final String UPDATE_INTERFACE_OPERATIONS = SDC_HTTP_METHOD + "://%s:%s/sdc2/rest/v1/catalog/%s/%s/interfaceOperations";
+	final String GET_INTERFACE_OPERATIONS = SDC_HTTP_METHOD + "://%s:%s/sdc2/rest/v1/catalog/%s/%s/interfaces/%s/operations/%s";
+	final String DELETE_INTERFACE_OPERATIONS = SDC_HTTP_METHOD + "://%s:%s/sdc2/rest/v1/catalog/%s/%s/interfaces/%s/operations/%s";
+    final String UPLOAD_INTERFACE_OPERATION_ARTIFACT = SDC_HTTP_METHOD + "://%s:%s/sdc2/rest/v1/catalog/%s/%s/interfaces/%s/operations/%s/artifacts/%s";
+
+	//Requirements
+	String CREATE_REQUIREMENT = SDC_HTTP_METHOD + "://%s:%s/sdc2/rest/v1/catalog/%s/%s/requirements";
+	String UPDATE_REQUIREMENT = SDC_HTTP_METHOD + "://%s:%s/sdc2/rest/v1/catalog/%s/%s/requirements";
+	String DELETE_REQUIREMENT = SDC_HTTP_METHOD + "://%s:%s/sdc2/rest/v1/catalog/%s/%s/requirements/%s";
+	String GET_REQUIREMENT = SDC_HTTP_METHOD + "://%s:%s/sdc2/rest/v1/catalog/%s/%s/requirements/%s";
+	//Capabilities
+	String CREATE_CAPABILITY = SDC_HTTP_METHOD + "://%s:%s/sdc2/rest/v1/catalog/%s/%s/capabilities";
+	String UPDATE_CAPABILITY = SDC_HTTP_METHOD + "://%s:%s/sdc2/rest/v1/catalog/%s/%s/capabilities";
+	String DELETE_CAPABILITY = SDC_HTTP_METHOD + "://%s:%s/sdc2/rest/v1/catalog/%s/%s/capabilities/%s";
+	String GET_CAPABILITY = SDC_HTTP_METHOD + "://%s:%s/sdc2/rest/v1/catalog/%s/%s/capabilities/%s";
+
+	//VSP Validation Operation
+	final String VSP_VALIDATION_CONFIGURATION = SDC_HTTP_METHOD + "://%s:%s/onboarding-api/v1.0/externaltesting/config";
+	final String GET_INSTANCE_TOSCA_ARTIFACTS = SDC_HTTP_METHOD
+			+ "://%s:%s/sdc2/rest/v1/catalog/%s/%s/filteredDataByParams?include=toscaArtifacts";
+}
diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/capability/CapabilitiesTest.java b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/capability/CapabilitiesTest.java
new file mode 100644
index 0000000000..179c1c22df
--- /dev/null
+++ b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/capability/CapabilitiesTest.java
@@ -0,0 +1,358 @@
+/*
+ * Copyright © 2016-2018 European Support Limited
+ *
+ * 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.
+ */
+
+package org.openecomp.sdc.ci.tests.capability;
+
+import fj.data.Either;
+import org.junit.Rule;
+import org.junit.rules.TestName;
+import org.openecomp.sdc.be.datatypes.elements.SchemaDefinition;
+import org.openecomp.sdc.be.datatypes.enums.ResourceTypeEnum;
+import org.openecomp.sdc.be.model.ComponentInstanceProperty;
+import org.openecomp.sdc.be.model.Resource;
+import org.openecomp.sdc.be.model.Service;
+import org.openecomp.sdc.be.model.User;
+import org.openecomp.sdc.ci.tests.api.ComponentBaseTest;
+import org.openecomp.sdc.ci.tests.datatypes.CapabilityDetails;
+import org.openecomp.sdc.ci.tests.datatypes.enums.UserRoleEnum;
+import org.openecomp.sdc.ci.tests.datatypes.http.RestResponse;
+import org.openecomp.sdc.ci.tests.utils.general.AtomicOperationUtils;
+import org.openecomp.sdc.ci.tests.utils.general.ElementFactory;
+import org.openecomp.sdc.ci.tests.utils.rest.BaseRestUtils;
+import org.openecomp.sdc.ci.tests.utils.rest.CapabilityRestUtils;
+import org.testng.Assert;
+import org.testng.annotations.BeforeTest;
+import org.testng.annotations.Test;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+import java.util.stream.Collectors;
+
+import static org.openecomp.sdc.ci.tests.utils.general.AtomicOperationUtils.getResourceObject;
+import static org.openecomp.sdc.ci.tests.utils.general.AtomicOperationUtils.getServiceObject;
+import static org.testng.AssertJUnit.fail;
+
+public class CapabilitiesTest extends ComponentBaseTest {
+    @Rule
+    public static TestName name = new TestName();
+
+    private static User user = null;
+    private static Service service;
+    private static Resource resource;
+    private static Resource pnfResource;
+
+    @BeforeTest
+    public void init() throws Exception {
+        user = ElementFactory.getDefaultUser(UserRoleEnum.DESIGNER);
+
+        // Create default service
+        Either<Service, RestResponse> createDefaultServiceEither =
+                AtomicOperationUtils.createDefaultService(UserRoleEnum.DESIGNER, true);
+        if (createDefaultServiceEither.isRight()) {
+            fail("Error creating default service");
+        }
+        service = createDefaultServiceEither.left().value();
+
+        // Create default resource
+        Either<Resource, RestResponse> createDefaultResourceEither =
+                AtomicOperationUtils.createResourceByType(ResourceTypeEnum.VF, UserRoleEnum.DESIGNER, true);
+        if (createDefaultResourceEither.isRight()) {
+            fail("Error creating default resource");
+        }
+        resource = createDefaultResourceEither.left().value();
+
+        // Create default PNF resource
+        Either<Resource, RestResponse> createDefaultPNFResourceEither =
+                AtomicOperationUtils.createResourceByType(ResourceTypeEnum.PNF, UserRoleEnum.DESIGNER, true);
+        if (createDefaultPNFResourceEither.isRight()) {
+            fail("Error creating default pnf resource");
+        }
+        pnfResource = createDefaultPNFResourceEither.left().value();
+    }
+
+    @Test
+    public void createCapabilityOnServiceTest() throws Exception {
+
+        CapabilityDetails capability = createCapability();
+        RestResponse restResponse = CapabilityRestUtils.createCapability(service, Collections.singletonList(capability),
+                user);
+        logger.info("createCapability On Service Response Code:" + restResponse.getErrorCode());
+        Assert.assertEquals((int) restResponse.getErrorCode(), BaseRestUtils.STATUS_CODE_SUCCESS);
+    }
+
+    @Test(dependsOnMethods = "createCapabilityOnServiceTest")
+    public void updateCapabilityOnServiceTest() throws Exception {
+
+        CapabilityDetails capability = createCapability();
+        capability.setMaxOccurrences("10");
+        capability.setMinOccurrences("4");
+        RestResponse restResponse = CapabilityRestUtils.updateCapability(service, Collections.singletonList(capability),
+                user);
+        logger.info("updateCapability On Service Response Code:" + restResponse.getErrorCode());
+        Assert.assertEquals((int) restResponse.getErrorCode(), BaseRestUtils.STATUS_CODE_SUCCESS);
+    }
+
+    @Test(dependsOnMethods = "updateCapabilityOnServiceTest")
+    public void getCapabilityFromServiceTest() throws Exception {
+        Service serviceObject = getServiceObject(service.getUniqueId());
+
+        List<org.openecomp.sdc.be.model.CapabilityDefinition> capabilityDefinitionList = serviceObject.getCapabilities()
+                .values().stream().flatMap(Collection::stream).collect(Collectors.toList());
+
+        RestResponse restResponse = CapabilityRestUtils.getCapability(service,
+                capabilityDefinitionList.get(0).getUniqueId(), user);
+        logger.info("getCapabilityTest from Service Response Code:" + restResponse.getErrorCode());
+        Assert.assertEquals((int) restResponse.getErrorCode(), BaseRestUtils.STATUS_CODE_SUCCESS);
+    }
+
+    @Test(dependsOnMethods = "getCapabilityFromServiceTest")
+    public void deleteCapabilityFromServiceTest() throws Exception {
+        Service serviceObject = getServiceObject(service.getUniqueId());
+
+        List<org.openecomp.sdc.be.model.CapabilityDefinition> capabilityDefinitionList = serviceObject.getCapabilities()
+                .values().stream().flatMap(Collection::stream).collect(Collectors.toList());
+
+        RestResponse restResponse = CapabilityRestUtils.deleteCapability(service,
+                capabilityDefinitionList.get(0).getUniqueId(), user);
+        logger.info("deleteCapabilityTest from Service Response Code:" + restResponse.getErrorCode());
+        Assert.assertEquals((int) restResponse.getErrorCode(), BaseRestUtils.STATUS_CODE_SUCCESS);
+    }
+
+    @Test
+    public void createCapabilityWithPropertiesOnServiceTest() throws Exception {
+
+        CapabilityDetails capability = createCapability();
+        List<ComponentInstanceProperty> properties = new ArrayList<>();
+        ComponentInstanceProperty instanceProperty = new ComponentInstanceProperty();
+        instanceProperty.setType("prop_type");
+        instanceProperty.setName("prop_name");
+        instanceProperty.setDescription("prop_description");
+        instanceProperty.setSchema(new SchemaDefinition());
+        properties.add(instanceProperty);
+        capability.setProperties(properties);
+        RestResponse restResponse = CapabilityRestUtils.createCapability(service, Collections.singletonList(capability),
+                user);
+        logger.info("createCapability On Service Response Code:" + restResponse.getErrorCode());
+        Assert.assertEquals((int) restResponse.getErrorCode(), BaseRestUtils.STATUS_CODE_SUCCESS);
+    }
+
+    @Test(dependsOnMethods = "createCapabilityWithPropertiesOnServiceTest")
+    public void updateCapabilityWithPropertiesOnServiceTest() throws Exception {
+
+        CapabilityDetails capability = createCapability();
+        capability.setMaxOccurrences("10");
+        capability.setMinOccurrences("4");
+
+        List<ComponentInstanceProperty> properties = new ArrayList<>();
+        ComponentInstanceProperty instanceProperty = new ComponentInstanceProperty();
+        instanceProperty.setType("prop_type_updated");
+        instanceProperty.setName("prop_name_updated");
+        instanceProperty.setDescription("prop_description_prop_desc");
+        instanceProperty.setSchema(new SchemaDefinition());
+        properties.add(instanceProperty);
+        capability.setProperties(properties);
+        RestResponse restResponse = CapabilityRestUtils.updateCapability(service, Collections.singletonList(capability),
+                user);
+        logger.info("updateCapability On Service Response Code:" + restResponse.getErrorCode());
+        Assert.assertEquals((int) restResponse.getErrorCode(), BaseRestUtils.STATUS_CODE_SUCCESS);
+    }
+
+    @Test
+    public void createCapabilityOnVfTest() throws Exception {
+
+        CapabilityDetails capability = createCapability();
+        RestResponse restResponse = CapabilityRestUtils.createCapability(resource, Collections.singletonList(capability),
+                user);
+        logger.info("createCapability On Vf Response Code:" + restResponse.getErrorCode());
+        Assert.assertEquals((int) restResponse.getErrorCode(), BaseRestUtils.STATUS_CODE_SUCCESS);
+    }
+
+    @Test(dependsOnMethods = "createCapabilityOnVfTest")
+    public void updateCapabilityOnVfTest() throws Exception {
+
+        CapabilityDetails capability = createCapability();
+        capability.setMaxOccurrences("10");
+        capability.setMinOccurrences("4");
+        RestResponse restResponse = CapabilityRestUtils.updateCapability(resource, Collections.singletonList(capability),
+                user);
+        logger.info("updateCapability On Vf Response Code:" + restResponse.getErrorCode());
+        Assert.assertEquals((int) restResponse.getErrorCode(), BaseRestUtils.STATUS_CODE_SUCCESS);
+    }
+
+    @Test(dependsOnMethods = "updateCapabilityOnVfTest")
+    public void getCapabilityFromVfTest() throws Exception {
+        Resource resourceObject = getResourceObject(resource.getUniqueId());
+
+        List<org.openecomp.sdc.be.model.CapabilityDefinition> capabilityDefinitionList = resourceObject.getCapabilities()
+                .values().stream().flatMap(Collection::stream).collect(Collectors.toList());
+
+        RestResponse restResponse = CapabilityRestUtils.getCapability(resource,
+                capabilityDefinitionList.get(0).getUniqueId(), user);
+        logger.info("getCapabilityTest from Vf Response Code:" + restResponse.getErrorCode());
+        Assert.assertEquals((int) restResponse.getErrorCode(), BaseRestUtils.STATUS_CODE_SUCCESS);
+    }
+
+    @Test(dependsOnMethods = "getCapabilityFromVfTest")
+    public void deleteCapabilityFromVfTest() throws Exception {
+        Resource resourceObject = getResourceObject(resource.getUniqueId());
+
+        List<org.openecomp.sdc.be.model.CapabilityDefinition> capabilityDefinitionList = resourceObject.getCapabilities()
+                .values().stream().flatMap(Collection::stream).collect(Collectors.toList());
+
+        RestResponse restResponse = CapabilityRestUtils.deleteCapability(resource,
+                capabilityDefinitionList.get(0).getUniqueId(), user);
+        logger.info("deleteCapabilityTest from Vf Response Code:" + restResponse.getErrorCode());
+        Assert.assertEquals((int) restResponse.getErrorCode(), BaseRestUtils.STATUS_CODE_SUCCESS);
+    }
+
+    @Test
+    public void createCapabilityWithPropertiesOnVfTest() throws Exception {
+
+        CapabilityDetails capability = createCapability();
+        List<ComponentInstanceProperty> properties = new ArrayList<>();
+        ComponentInstanceProperty instanceProperty = new ComponentInstanceProperty();
+        instanceProperty.setType("prop_type");
+        instanceProperty.setName("prop_name");
+        instanceProperty.setDescription("prop_description");
+        instanceProperty.setSchema(new SchemaDefinition());
+        properties.add(instanceProperty);
+        capability.setProperties(properties);
+        RestResponse restResponse = CapabilityRestUtils.createCapability(resource, Collections.singletonList(capability),
+                user);
+        logger.info("createCapability On Vf Response Code:" + restResponse.getErrorCode());
+        Assert.assertEquals((int) restResponse.getErrorCode(), BaseRestUtils.STATUS_CODE_SUCCESS);
+    }
+
+    @Test(dependsOnMethods = "createCapabilityWithPropertiesOnVfTest")
+    public void updateCapabilityWithPropertiesOnVfTest() throws Exception {
+
+        CapabilityDetails capability = createCapability();
+        capability.setMaxOccurrences("10");
+        capability.setMinOccurrences("4");
+
+        List<ComponentInstanceProperty> properties = new ArrayList<>();
+        ComponentInstanceProperty instanceProperty = new ComponentInstanceProperty();
+        instanceProperty.setType("prop_type_updated");
+        instanceProperty.setName("prop_name_updated");
+        instanceProperty.setDescription("prop_description_prop_desc");
+        instanceProperty.setSchema(new SchemaDefinition());
+        properties.add(instanceProperty);
+        capability.setProperties(properties);
+        RestResponse restResponse = CapabilityRestUtils.updateCapability(resource, Collections.singletonList(capability),
+                user);
+        logger.info("updateCapability On Vf Response Code:" + restResponse.getErrorCode());
+        Assert.assertEquals((int) restResponse.getErrorCode(), BaseRestUtils.STATUS_CODE_SUCCESS);
+    }
+
+
+    @Test
+    public void createCapabilityOnPnfTest() throws Exception {
+
+        CapabilityDetails capability = createCapability();
+        RestResponse restResponse = CapabilityRestUtils.createCapability(pnfResource, Collections.singletonList(capability),
+                user);
+        logger.info("createCapability On Pnf Response Code:" + restResponse.getErrorCode());
+        Assert.assertEquals((int) restResponse.getErrorCode(), BaseRestUtils.STATUS_CODE_SUCCESS);
+    }
+
+    @Test(dependsOnMethods = "createCapabilityOnPnfTest")
+    public void updateCapabilityOnPnfTest() throws Exception {
+
+        CapabilityDetails capability = createCapability();
+        capability.setMaxOccurrences("10");
+        capability.setMinOccurrences("4");
+        RestResponse restResponse = CapabilityRestUtils.updateCapability(pnfResource, Collections.singletonList(capability),
+                user);
+        logger.info("updateCapability On Pnf Response Code:" + restResponse.getErrorCode());
+        Assert.assertEquals((int) restResponse.getErrorCode(), BaseRestUtils.STATUS_CODE_SUCCESS);
+    }
+
+    @Test(dependsOnMethods = "updateCapabilityOnPnfTest")
+    public void getCapabilityFromPnfTest() throws Exception {
+        Resource pnfResourceObject = getResourceObject(pnfResource.getUniqueId());
+
+        List<org.openecomp.sdc.be.model.CapabilityDefinition> capabilityDefinitionList = pnfResourceObject.getCapabilities()
+                .values().stream().flatMap(Collection::stream).collect(Collectors.toList());
+
+        RestResponse restResponse = CapabilityRestUtils.getCapability(pnfResource,
+                capabilityDefinitionList.get(0).getUniqueId(), user);
+        logger.info("getCapabilityTest from Pnf Response Code:" + restResponse.getErrorCode());
+        Assert.assertEquals((int) restResponse.getErrorCode(), BaseRestUtils.STATUS_CODE_SUCCESS);
+    }
+
+    @Test(dependsOnMethods = "getCapabilityFromPnfTest")
+    public void deleteCapabilityFromPnfTest() throws Exception {
+        Resource pnfResourceObject = getResourceObject(pnfResource.getUniqueId());
+
+        List<org.openecomp.sdc.be.model.CapabilityDefinition> capabilityDefinitionList = pnfResourceObject.getCapabilities()
+                .values().stream().flatMap(Collection::stream).collect(Collectors.toList());
+
+        RestResponse restResponse = CapabilityRestUtils.deleteCapability(pnfResource,
+                capabilityDefinitionList.get(0).getUniqueId(), user);
+        logger.info("deleteCapabilityTest from Pnf Response Code:" + restResponse.getErrorCode());
+        Assert.assertEquals((int) restResponse.getErrorCode(), BaseRestUtils.STATUS_CODE_SUCCESS);
+    }
+
+    @Test
+    public void createCapabilityWithPropertiesOnPnfTest() throws Exception {
+
+        CapabilityDetails capability = createCapability();
+        List<ComponentInstanceProperty> properties = new ArrayList<>();
+        ComponentInstanceProperty instanceProperty = new ComponentInstanceProperty();
+        instanceProperty.setType("prop_type");
+        instanceProperty.setName("prop_name");
+        instanceProperty.setDescription("prop_description");
+        instanceProperty.setSchema(new SchemaDefinition());
+        properties.add(instanceProperty);
+        capability.setProperties(properties);
+        RestResponse restResponse = CapabilityRestUtils.createCapability(pnfResource, Collections.singletonList(capability),
+                user);
+        logger.info("createCapability On Pnf Response Code:" + restResponse.getErrorCode());
+        Assert.assertEquals((int) restResponse.getErrorCode(), BaseRestUtils.STATUS_CODE_SUCCESS);
+    }
+
+    @Test(dependsOnMethods = "createCapabilityWithPropertiesOnPnfTest")
+    public void updateCapabilityWithPropertiesOnPnfTest() throws Exception {
+
+        CapabilityDetails capability = createCapability();
+        capability.setMaxOccurrences("10");
+        capability.setMinOccurrences("4");
+
+        List<ComponentInstanceProperty> properties = new ArrayList<>();
+        ComponentInstanceProperty instanceProperty = new ComponentInstanceProperty();
+        instanceProperty.setType("prop_type_updated");
+        instanceProperty.setName("prop_name_updated");
+        instanceProperty.setDescription("prop_description_prop_desc");
+        instanceProperty.setSchema(new SchemaDefinition());
+        properties.add(instanceProperty);
+        capability.setProperties(properties);
+        RestResponse restResponse = CapabilityRestUtils.updateCapability(pnfResource,
+                Collections.singletonList(capability), user);
+        logger.info("updateCapability On Pnf Response Code:" + restResponse.getErrorCode());
+        Assert.assertEquals((int) restResponse.getErrorCode(), BaseRestUtils.STATUS_CODE_SUCCESS);
+    }
+
+
+    private CapabilityDetails createCapability() {
+        CapabilityDetails capabilityDetails = new CapabilityDetails();
+        capabilityDetails.setName("cap" + Math.random());
+        capabilityDetails.setType("tosca.capabilities.network.Bindable");
+
+        return capabilityDetails;
+    }
+}
diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/config/Config.java b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/config/Config.java
new file mode 100644
index 0000000000..f25f16d2cc
--- /dev/null
+++ b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/config/Config.java
@@ -0,0 +1,736 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * SDC
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.sdc.ci.tests.config;
+
+import org.yaml.snakeyaml.Yaml;
+
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
+import java.nio.file.Files;
+import java.nio.file.Paths;
+import java.util.List;
+
+public class Config {
+
+	private static String WINDOWS_CONFIG_FILE = "src/test/resources/ci/conf/attsdc.yaml";
+	private boolean systemUnderDebug;
+	private boolean rerun;
+	private String reportDBhost;
+	private int reportDBport;
+	
+	private String browser;
+	private String catalogBeHost;
+	private String esHost;
+	private String esPort;
+	private String neoHost;
+	private String neoPort;
+	private String disributionClientHost;
+	private String disributionClientPort;
+	private boolean isDistributionClientRunning;
+
+
+	private String errorConfigurationFile;
+	private String resourceConfigDir;
+	private String componentsConfigDir;
+	private String importResourceConfigDir;
+	private String importResourceTestsConfigDir;
+	private String importTypesConfigDir;
+
+	private String testSuites;
+
+	private String catalogFeHost;
+	private String catalogFePort;
+	private String catalogBePort;
+	private String catalogBeTlsPort;
+
+	private String onboardingBeHost;
+	private String onboardingBePort;
+
+	private String neoDBusername;
+	private String neoDBpassword;
+
+	private String janusGraphPropertiesFile;
+	private List<String> packages;
+	private List<String> bugs;
+	private List<String> resourcesNotToDelete;
+	private List<String> resourceCategoriesNotToDelete;
+	private List<String> serviceCategoriesNotToDelete;
+	private boolean stopOnClassFailure = false;
+
+	private String outputFolder;
+	private String reportName;
+	private String url;
+	private String remoteTestingMachineIP;
+	private String remoteTestingMachinePort;
+	private boolean remoteTesting;
+
+	private String cassandraHost;
+	private String cassandraAuditKeySpace;
+	private String cassandraArtifactKeySpace;
+	private boolean cassandraAuthenticate;
+	private String cassandraUsername;
+	private String cassandraPassword;
+	private boolean cassandraSsl;
+	private String cassandraTruststorePath;
+	private String cassandraTruststorePassword;
+	private String windowsDownloadDirectory;
+	private boolean captureTraffic;
+	private boolean useBrowserMobProxy;
+	private String sdcHttpMethod;
+	private String localDataCenter;
+	private boolean uiSimulator;
+
+	public String getLocalDataCenter() {
+		return localDataCenter;
+	}
+
+	public void setLocalDataCenter(String localDataCenter) {
+		this.localDataCenter = localDataCenter;
+	}
+
+	private static Config configIt = null;
+
+	private static Yaml yaml = new Yaml();
+
+	
+	private Config() {
+		super();
+	}
+
+	public String getOnboardingBePort() {
+		return onboardingBePort;
+	}
+
+	public void setOnboardingBePort(String onboardingBePort) {
+		this.onboardingBePort = onboardingBePort;
+	}
+
+	public String getOnboardingBeHost() {
+		return onboardingBeHost;
+	}
+
+	public void setOnboardingBeHost(String onboardingBeHost) {
+		this.onboardingBeHost = onboardingBeHost;
+	}
+
+	public static class TestPackages {
+
+		List<String> packages;
+		List<String> bugs;
+
+		public List<String> getPackages() {
+			return packages;
+		}
+
+		public void setPackages(List<String> packages) {
+			this.packages = packages;
+		}
+
+		public List<String> getBugs() {
+			return bugs;
+		}
+
+		public void setBugs(List<String> bugs) {
+			this.bugs = bugs;
+		}
+
+		@Override
+		public String toString() {
+			return "TestPackages [packages=" + packages + ", bugs=" + bugs + "]";
+		}
+
+	}
+
+	public synchronized static Config instance() {
+		if (configIt == null) {
+			try {
+				configIt = init();
+			} catch (IOException e) {
+				e.printStackTrace();
+				return null;
+			}
+		}
+		return configIt;
+	}
+
+	private static Config init() throws IOException {
+
+		Config config = null;
+
+		String configFile = System.getProperty("config.resource");
+		if (configFile == null) {
+			configFile = WINDOWS_CONFIG_FILE;
+		}
+
+		File file = new File(configFile);
+		if (false == file.exists()) {
+			throw new RuntimeException("The config file " + configFile + " cannot be found.");
+		}
+
+		InputStream in = null;
+		try {
+
+			in = Files.newInputStream(Paths.get(configFile));
+
+			config = yaml.loadAs(in, Config.class);
+
+			setPackagesAndBugs(configFile, config);
+
+		} finally {
+			if (in != null) {
+				try {
+					in.close();
+				} catch (IOException e) {
+					e.printStackTrace();
+				}
+			}
+		}
+
+		// JsonReader jsonReader = new JsonReader(new FileReader(configFile));
+		// Config configAttOdlIt = new Gson().fromJson(jsonReader,
+		// Config.class);
+
+		return config;
+	}
+
+	public boolean isUiSimulator() {
+		return uiSimulator;
+	}
+
+	public void setUiSimulator(boolean uiSimulator) {
+		this.uiSimulator = uiSimulator;
+	}
+
+	private static void setPackagesAndBugs(String path, Config config) throws IOException {
+
+		int separator = Math.max(path.lastIndexOf("\\"), path.lastIndexOf("/"));
+		String dirPath = path.substring(0, separator + 1);
+		String packagesFile = dirPath + File.separator + "attsdc-packages.yaml";
+		File file = new File(packagesFile);
+		if (false == file.exists()) {
+			throw new RuntimeException("The config file " + packagesFile + " cannot be found.");
+		}
+
+		TestPackages testPackages = null;
+		InputStream in = null;
+		try {
+
+			in = Files.newInputStream(Paths.get(packagesFile));
+
+			testPackages = yaml.loadAs(in, TestPackages.class);
+
+			List<String> bugs = testPackages.getBugs();
+			List<String> packages = testPackages.getPackages();
+
+			config.setBugs(bugs);
+			config.setPackages(packages);
+
+		} finally {
+			if (in != null) {
+				try {
+					in.close();
+				} catch (IOException e) {
+					e.printStackTrace();
+				}
+			}
+		}
+
+	}
+
+	// public Config(String catalogBeHost, String esHost, String esPort, String
+	// resourceConfigDir, String componentsConfigDir, String catalogFeHost,
+	// String catalogFePort, String catalogBePort) {
+	// super();
+	// this.catalogBeHost = catalogBeHost;
+	// this.esHost = esHost;
+	// this.esPort = esPort;
+	// this.resourceConfigDir = resourceConfigDir;
+	// this.componentsConfigDir = componentsConfigDir;
+	// this.catalogFeHost = catalogFeHost;
+	// this.catalogFePort = catalogFePort;
+	// this.catalogBePort = catalogBePort;
+	// }
+
+	String configurationFile;
+	
+	public boolean getSystemUnderDebug() {
+		return systemUnderDebug;
+	}
+
+	public void setSystemUnderDebug(boolean systemUnderDebug) {
+		this.systemUnderDebug = systemUnderDebug;
+	}
+
+	public String getSdcHttpMethod() {
+		return sdcHttpMethod;
+	}
+
+	public void setSdcHttpMethod(String sdcHttpMethod) {
+		this.sdcHttpMethod = sdcHttpMethod;
+	}
+
+	public boolean getRerun() {
+		return rerun;
+	}
+
+	public void setRerun(boolean rerun) {
+		this.rerun = rerun;
+	}
+	
+	public String getReportDBhost() {
+		return reportDBhost;
+	}
+
+	public void setReportDBhost(String reportDBhost) {
+		this.reportDBhost = reportDBhost;
+	}
+
+	public int getReportDBport() {
+		return reportDBport;
+	}
+
+	public void setReportDBport(int reportDBport) {
+		this.reportDBport = reportDBport;
+	}
+//	public boolean isUsingBrowserMobProxy() {
+//		return useBrowserMobProxy;
+//	}
+//
+//	public void setUsingBrowserMobProxy(boolean usingBrowserMobProxy) {
+//		this.useBrowserMobProxy = usingBrowserMobProxy;
+//	} 
+
+	
+	
+	
+	public String getBrowser() {
+		return browser;
+	}
+	
+	public boolean getUseBrowserMobProxy() {
+		return useBrowserMobProxy;
+	}
+
+	public void setUseBrowserMobProxy(boolean useBrowserMobProxy) {
+		this.useBrowserMobProxy = useBrowserMobProxy;
+	}
+
+
+
+	public boolean getCaptureTraffic() {
+		return captureTraffic;
+	}
+
+	public void setCaptureTraffic(boolean captureTraffic) {
+		this.captureTraffic = captureTraffic;
+	}
+
+	public void setBrowser(String browser) {
+		this.browser = browser;
+	}
+
+	public String getConfigurationFile() {
+		return configurationFile;
+	}
+
+	public void setConfigurationFile(String configurationFile) {
+		this.configurationFile = configurationFile;
+	}
+
+	public boolean getIsDistributionClientRunning() {
+		return isDistributionClientRunning;
+	}
+
+	public void setIsDistributionClientRunning(boolean isDistributionClientRunning) {
+		this.isDistributionClientRunning = isDistributionClientRunning;
+	}
+	
+	public String getCatalogBePort() {
+		return catalogBePort;
+	}
+
+	public String getDisributionClientHost() {
+		return disributionClientHost;
+	}
+
+	public void setDisributionClientHost(String disributionClientHost) {
+		this.disributionClientHost = disributionClientHost;
+	}
+
+	public String getDisributionClientPort() {
+		return disributionClientPort;
+	}
+
+	public void setDisributionClientPort(String disributionClientPort) {
+		this.disributionClientPort = disributionClientPort;
+	}
+
+	public void setCatalogBePort(String catalogBePort) {
+		this.catalogBePort = catalogBePort;
+	}
+
+	public String getCatalogFeHost() {
+		return catalogFeHost;
+	}
+
+	public void setCatalogFeHost(String catalogFeHost) {
+		this.catalogFeHost = catalogFeHost;
+	}
+
+	public String getCatalogFePort() {
+		return catalogFePort;
+	}
+
+	public void setCatalogFePort(String catalogFePort) {
+		this.catalogFePort = catalogFePort;
+	}
+
+	public String getCatalogBeHost() {
+		return catalogBeHost;
+	}
+
+	public void setCatalogBeHost(String catalogBeHost) {
+		this.catalogBeHost = catalogBeHost;
+	}
+
+	public String getEsHost() {
+		return esHost;
+	}
+
+	public void setEsHost(String esHost) {
+		this.esHost = esHost;
+	}
+
+	public String getEsPort() {
+		return esPort;
+	}
+
+	public void setEsPort(String esPort) {
+		this.esPort = esPort;
+	}
+
+	public String getResourceConfigDir() {
+		return resourceConfigDir;
+	}
+
+	public void setResourceConfigDir(String resourceConfigDir) {
+		this.resourceConfigDir = resourceConfigDir;
+	}
+
+	public String getComponentsConfigDir() {
+		return componentsConfigDir;
+	}
+
+	public void setComponentsConfigDir(String componentsConfigDir) {
+		this.componentsConfigDir = componentsConfigDir;
+	}
+
+	public String getOutputFolder() {
+		return outputFolder;
+	}
+
+	public void setOutputFolder(String outputFolder) {
+		this.outputFolder = outputFolder;
+	}
+
+	public String getReportName() {
+		return reportName;
+	}
+
+	public void setReportName(String reportName) {
+		this.reportName = reportName;
+	}
+
+	public String getNeoPort() {
+		return neoPort;
+	}
+
+	public void setNeoPort(String neoPort) {
+		this.neoPort = neoPort;
+	}
+
+	public String getNeoHost() {
+		return neoHost;
+	}
+
+	public void setNeoHost(String neoHost) {
+		this.neoHost = neoHost;
+	}
+
+	public String getNeoDBpassword() {
+		return neoDBpassword;
+	}
+
+	public String getNeoDBusername() {
+		return neoDBusername;
+	}
+
+	public void setNeoDBusername(String neoDBusername) {
+		this.neoDBusername = neoDBusername;
+	}
+
+	public void setNeoDBpassword(String neoDBpassword) {
+		this.neoDBpassword = neoDBpassword;
+	}
+
+	public String getjanusGraphPropertiesFile() {
+		return janusGraphPropertiesFile;
+	}
+
+	public void setjanusGraphPropertiesFile(String janusGraphPropertiesFile) {
+		this.janusGraphPropertiesFile = janusGraphPropertiesFile;
+	}
+
+	public List<String> getPackages() {
+		return packages;
+	}
+
+	public void setPackages(List<String> packages) {
+		this.packages = packages;
+	}
+
+	public List<String> getBugs() {
+		return bugs;
+	}
+
+	public void setBugs(List<String> bugs) {
+		this.bugs = bugs;
+	}
+
+	public boolean isStopOnClassFailure() {
+		return stopOnClassFailure;
+	}
+
+	public void setStopOnClassFailure(boolean stopOnClassFailure) {
+		this.stopOnClassFailure = stopOnClassFailure;
+	}
+
+	public String getImportResourceConfigDir() {
+		return importResourceConfigDir;
+	}
+
+	public void setImportResourceConfigDir(String importResourceConfigDir) {
+		this.importResourceConfigDir = importResourceConfigDir;
+	}
+
+	public String getImportResourceTestsConfigDir() {
+		return importResourceTestsConfigDir;
+	}
+
+	public void setImportResourceTestsConfigDir(String importResourceTestsConfigDir) {
+		this.importResourceTestsConfigDir = importResourceTestsConfigDir;
+	}
+
+	public String getErrorConfigurationFile() {
+		return errorConfigurationFile;
+	}
+
+	public void setErrorConfigurationFile(String errorConfigurationFile) {
+		this.errorConfigurationFile = errorConfigurationFile;
+	}
+
+	public String getCatalogBeTlsPort() {
+		return catalogBeTlsPort;
+	}
+
+	public void setCatalogBeTlsPort(String catalogBeTlsPort) {
+		this.catalogBeTlsPort = catalogBeTlsPort;
+	}
+
+	public List<String> getResourcesNotToDelete() {
+		return resourcesNotToDelete;
+	}
+
+	public void setResourcesNotToDelete(List<String> resourcesNotToDelete) {
+		this.resourcesNotToDelete = resourcesNotToDelete;
+	}
+
+	public List<String> getResourceCategoriesNotToDelete() {
+		return resourceCategoriesNotToDelete;
+	}
+
+	public void setResourceCategoriesNotToDelete(List<String> resourceCategoriesNotToDelete) {
+		this.resourceCategoriesNotToDelete = resourceCategoriesNotToDelete;
+	}
+
+	public List<String> getServiceCategoriesNotToDelete() {
+		return serviceCategoriesNotToDelete;
+	}
+
+	public void setServiceCategoriesNotToDelete(List<String> serviceCategoriesNotToDelete) {
+		this.serviceCategoriesNotToDelete = serviceCategoriesNotToDelete;
+	}
+
+	public String getImportTypesConfigDir() {
+		return importTypesConfigDir;
+	}
+
+	public void setImportTypesConfigDir(String importTypesConfigDir) {
+		this.importTypesConfigDir = importTypesConfigDir;
+	}
+
+	public String getCassandraHost() {
+		return cassandraHost;
+	}
+
+	public void setCassandraHost(String cassandraHost) {
+		this.cassandraHost = cassandraHost;
+	}
+
+	public String getCassandraAuditKeySpace() {
+		return cassandraAuditKeySpace;
+	}
+
+	public void setCassandraAuditKeySpace(String cassandraAuditKeySpace) {
+		this.cassandraAuditKeySpace = cassandraAuditKeySpace;
+	}
+
+	public String getCassandraArtifactKeySpace() {
+		return cassandraArtifactKeySpace;
+	}
+
+	public void setCassandraArtifactKeySpace(String cassandraArtifactKeySpace) {
+		this.cassandraArtifactKeySpace = cassandraArtifactKeySpace;
+	}
+
+	
+	public String getWindowsDownloadDirectory() {
+		return windowsDownloadDirectory;
+	}
+	
+	public void setWindowsDownloadDirectory(String windowsDownloadDirectory) {
+		this.windowsDownloadDirectory = windowsDownloadDirectory;
+	}
+	
+	@Override
+	public String toString() {
+		return "Config [systemUnderDebug=" + systemUnderDebug + ", rerun=" + rerun + ", reportDBhost=" + reportDBhost
+				+ ", reportDBport=" + reportDBport + ", browser=" + browser + ", catalogBeHost=" + catalogBeHost
+				+ ", esHost=" + esHost + ", esPort=" + esPort + ", neoHost=" + neoHost + ", neoPort=" + neoPort
+				+ ", disributionClientHost=" + disributionClientHost + ", disributionClientPort="
+				+ disributionClientPort + ", isDistributionClientRunning=" + isDistributionClientRunning
+				+ ", errorConfigurationFile=" + errorConfigurationFile + ", resourceConfigDir=" + resourceConfigDir
+				+ ", componentsConfigDir=" + componentsConfigDir + ", importResourceConfigDir="
+				+ importResourceConfigDir + ", importResourceTestsConfigDir=" + importResourceTestsConfigDir
+				+ ", importTypesConfigDir=" + importTypesConfigDir + ", testSuites=" + testSuites + ", catalogFeHost="
+				+ catalogFeHost + ", catalogFePort=" + catalogFePort + ", catalogBePort=" + catalogBePort
+				+ ", catalogBeTlsPort=" + catalogBeTlsPort + ", neoDBusername=" + neoDBusername + ", neoDBpassword="
+				+ neoDBpassword + ", janusGraphPropertiesFile=" + janusGraphPropertiesFile + ", packages=" + packages + ", bugs="
+				+ bugs + ", resourcesNotToDelete=" + resourcesNotToDelete + ", resourceCategoriesNotToDelete="
+				+ resourceCategoriesNotToDelete + ", serviceCategoriesNotToDelete=" + serviceCategoriesNotToDelete
+				+ ", stopOnClassFailure=" + stopOnClassFailure + ", outputFolder=" + outputFolder + ", reportName="
+				+ reportName + ", url=" + url + ", remoteTestingMachineIP=" + remoteTestingMachineIP
+				+ ", remoteTestingMachinePort=" + remoteTestingMachinePort + ", remoteTesting=" + remoteTesting
+				+ ", cassandraHost=" + cassandraHost + ", cassandraAuditKeySpace=" + cassandraAuditKeySpace
+				+ ", cassandraArtifactKeySpace=" + cassandraArtifactKeySpace + ", cassandraAuthenticate="
+				+ cassandraAuthenticate + ", cassandraUsername=" + cassandraUsername + ", cassandraPassword="
+				+ cassandraPassword + ", cassandraSsl=" + cassandraSsl + ", cassandraTruststorePath="
+				+ cassandraTruststorePath + ", cassandraTruststorePassword=" + cassandraTruststorePassword
+				+ ", windowsDownloadDirectory=" + windowsDownloadDirectory + ", captureTraffic=" + captureTraffic
+				+ ", useBrowserMobProxy=" + useBrowserMobProxy + ", configurationFile=" + configurationFile + "]";
+	}
+
+	public boolean isRemoteTesting() {
+		return remoteTesting;
+	}
+
+	public void setRemoteTesting(boolean remoteTesting) {
+		this.remoteTesting = remoteTesting;
+	}
+
+	public String getUrl() {
+		try {
+			return url;
+		} catch (Exception e) {
+			return null;
+		}
+	}
+
+	public void setUrl(String url) {
+		this.url = url;
+	}
+
+	public String getRemoteTestingMachineIP() {
+		return remoteTestingMachineIP;
+	}
+
+	public void setRemoteTestingMachineIP(String remoteTestingMachineIP) {
+		this.remoteTestingMachineIP = remoteTestingMachineIP;
+	}
+
+	public String getRemoteTestingMachinePort() {
+		return remoteTestingMachinePort;
+	}
+
+	public void setRemoteTestingMachinePort(String remoteTestingMachinePort) {
+		this.remoteTestingMachinePort = remoteTestingMachinePort;
+	}
+
+	public boolean getCassandraAuthenticate() {
+		return cassandraAuthenticate;
+	}
+
+	public void setCassandraAuthenticate(boolean cassandraAuthenticate) {
+		this.cassandraAuthenticate = cassandraAuthenticate;
+	}
+
+	public String getCassandraUsername() {
+		return cassandraUsername;
+	}
+
+	public void setCassandraUsername(String cassandraUsername) {
+		this.cassandraUsername = cassandraUsername;
+	}
+
+	public String getCassandraPassword() {
+		return cassandraPassword;
+	}
+
+	public void setCassandraPassword(String cassandraPassword) {
+		this.cassandraPassword = cassandraPassword;
+	}
+
+	public boolean getCassandraSsl() {
+		return cassandraSsl;
+	}
+
+	public void setCassandraSsl(boolean cassandraSsl) {
+		this.cassandraSsl = cassandraSsl;
+	}
+
+	public String getCassandraTruststorePath() {
+		return cassandraTruststorePath;
+	}
+
+	public void setCassandraTruststorePath(String cassandraTruststorePath) {
+		this.cassandraTruststorePath = cassandraTruststorePath;
+	}
+
+	public String getCassandraTruststorePassword() {
+		return cassandraTruststorePassword;
+	}
+
+	public void setCassandraTruststorePassword(String cassandraTruststorePassword) {
+		this.cassandraTruststorePassword = cassandraTruststorePassword;
+	}
+
+}
diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/config/InvokedMethodListener.java b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/config/InvokedMethodListener.java
new file mode 100644
index 0000000000..bfed5dc90d
--- /dev/null
+++ b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/config/InvokedMethodListener.java
@@ -0,0 +1,63 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * SDC
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.sdc.ci.tests.config;
+
+import org.testng.IInvokedMethod;
+import org.testng.IInvokedMethodListener;
+import org.testng.ITestResult;
+import org.testng.SkipException;
+import org.testng.internal.TestResult;
+
+import java.util.HashMap;
+import java.util.Map;
+
+public class InvokedMethodListener implements IInvokedMethodListener {
+
+	static Map<String, Integer> methodFailCount = new HashMap<String, Integer>();
+
+	@Override
+
+	public void beforeInvocation(IInvokedMethod method, ITestResult testResult) {
+
+		if (methodFailCount.get(method.getTestMethod().getMethodName()) != null
+				&& methodFailCount.get(method.getTestMethod().getMethodName()) > 1)
+			throw new SkipException("Skipped due to failure count > 1");
+		;
+
+	}
+
+	@Override
+
+	public void afterInvocation(IInvokedMethod method, ITestResult testResult) {
+
+		if (testResult.getStatus() == TestResult.FAILURE) {
+			if (methodFailCount.get(method.getTestMethod().getMethodName()) == null)
+				methodFailCount.put(method.getTestMethod().getMethodName(), 1);
+			else {
+				methodFailCount.put(method.getTestMethod().getMethodName(),
+						methodFailCount.get(method.getTestMethod().getMethodName()) + 1);
+			}
+
+		}
+
+	}
+
+}
diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/config/UserCredentialsFromFile.java b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/config/UserCredentialsFromFile.java
new file mode 100644
index 0000000000..9dbe9296b0
--- /dev/null
+++ b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/config/UserCredentialsFromFile.java
@@ -0,0 +1,68 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * SDC
+ * ================================================================================
+ * 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=========================================================
+ */
+
+package org.openecomp.sdc.ci.tests.config;
+
+import org.openecomp.sdc.ci.tests.datatypes.UserCredentials;
+import org.openecomp.sdc.ci.tests.utils.general.FileHandling;
+import org.yaml.snakeyaml.Yaml;
+
+import java.io.File;
+import java.util.Map;
+
+public class UserCredentialsFromFile {
+
+    private static final String CREDENTIALS_FILE = "src/test/resources/ci/conf/credentials.yaml";
+    private static Map<String, UserCredentials> credentials;
+    private static Yaml yaml = new Yaml();
+
+    private static final UserCredentialsFromFile instance = new UserCredentialsFromFile();
+
+    public static UserCredentialsFromFile getInstance() {
+        return instance;
+    }
+
+    private UserCredentialsFromFile() {
+
+        credentials = null;
+
+        File credentialsFile = new File(System.getProperty("user.dir")+ System.getProperty("file.separator")+CREDENTIALS_FILE);
+        if (credentialsFile.exists()) {
+            try {
+                credentials = (Map<String, UserCredentials>) FileHandling.parseYamlFile(credentialsFile.getAbsolutePath());
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
+        }
+
+
+    }
+
+    public UserCredentials getUserCredentialsByRole(String userRole) {
+        Map<String, String> credentialsMap = (Map<String, String>) credentials.get(userRole);
+        UserCredentials userCredentials = new UserCredentials();
+        userCredentials.setUserId(credentialsMap.get("username"));
+        userCredentials.setFirstName(credentialsMap.get("firstname"));
+        userCredentials.setLastName(credentialsMap.get("lastname"));
+        userCredentials.setPassword(credentialsMap.get("password"));
+        return userCredentials;
+    }
+
+}
diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/data/providers/OnboardingDataProviders.java b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/data/providers/OnboardingDataProviders.java
new file mode 100644
index 0000000000..a2f39b3f0e
--- /dev/null
+++ b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/data/providers/OnboardingDataProviders.java
@@ -0,0 +1,132 @@
+/*
+ * ============LICENSE_START=======================================================
+ *  Copyright (C) 2019 Nordix Foundation
+ *  ================================================================================
+ *  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.
+ *
+ *  SPDX-License-Identifier: Apache-2.0
+ *  ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.sdc.ci.tests.data.providers;
+
+import static org.testng.Assert.fail;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+import java.util.Optional;
+import org.apache.commons.collections4.CollectionUtils;
+import org.openecomp.sdc.ci.tests.datatypes.enums.XnfTypeEnum;
+import org.openecomp.sdc.ci.tests.utils.general.FileHandling;
+import org.openecomp.sdc.ci.tests.utils.general.OnboardingUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.testng.annotations.DataProvider;
+
+public final class OnboardingDataProviders {
+
+    private static final Logger LOGGER = LoggerFactory.getLogger(OnboardingDataProviders.class);
+    private static final String VNF_FILE_PATH = FileHandling.getXnfRepositoryPath(XnfTypeEnum.VNF);
+
+    private OnboardingDataProviders() {
+
+    }
+
+    @DataProvider(name = "randomVNF_List")
+    private static Object[][] randomVnfList() {
+        final int randomElementNumber = 3; //how many VNFs to onboard randomly
+        final List<String> fileNamesFromFolder = OnboardingUtils.getVnfNamesFileListExcludeToscaParserFailure();
+        final List<String> newRandomFileNamesFromFolder = getRandomElements(randomElementNumber, fileNamesFromFolder);
+        if (CollectionUtils.isEmpty(newRandomFileNamesFromFolder)) {
+            fail("Required number of VNF files not exists under " + VNF_FILE_PATH);
+            return new Object[0][];
+        }
+        LOGGER.debug(String.format("There are %s zip file(s) to test", newRandomFileNamesFromFolder.size()));
+        return provideData(newRandomFileNamesFromFolder, VNF_FILE_PATH);
+    }
+
+    @DataProvider(name = "VNF_List", parallel = true)
+    private static Object[][] vnfList() {
+        final List<String> fileNamesFromFolder = OnboardingUtils.getXnfNamesFileList(XnfTypeEnum.VNF);
+        LOGGER.debug(String.format("There are %s package file(s) to test", fileNamesFromFolder.size()));
+        return provideData(fileNamesFromFolder, VNF_FILE_PATH);
+    }
+
+    @DataProvider(name = "PNF_List", parallel = true)
+    private static Object[][] pnfList() {
+        return provideData(OnboardingUtils.getXnfNamesFileList(XnfTypeEnum.PNF),
+            FileHandling.getXnfRepositoryPath(XnfTypeEnum.PNF));
+    }
+
+    @DataProvider(name = "Single_VNF", parallel = true)
+    private static Object[][] singleVNF() {
+        final List<String> fileNamesFromFolder = OnboardingUtils.getXnfNamesFileList(XnfTypeEnum.VNF);
+        final List<String> newList = new ArrayList<>();
+        newList.add(fileNamesFromFolder.get(0));
+        LOGGER.debug(String.format("There are %s zip file(s) to test", fileNamesFromFolder.size()));
+        return provideData(newList, VNF_FILE_PATH);
+    }
+
+    @DataProvider(name = "softwareInformationPnf", parallel = true)
+    private static Object[][] softwareInformationPnf() {
+        final List<String> pnfPackageFileNameList = OnboardingUtils.getXnfNamesFileList(XnfTypeEnum.PNF);
+        if (CollectionUtils.isEmpty(pnfPackageFileNameList)) {
+            fail("Could not create softwareInformationPnf datasource");
+        }
+        final String pnfPackage = "sample-pnf-1.0.1-SNAPSHOT.csar";
+        final Optional<String> softwareInformationPnfPackage = pnfPackageFileNameList.stream()
+            .filter(pnfPackage::equals).findFirst();
+        if (!softwareInformationPnfPackage.isPresent()) {
+            fail(String.format("Could not create softwareInformationPnf datasource, the package '%s' was not found",
+                pnfPackage));
+        }
+
+        final String folderPath = FileHandling.getXnfRepositoryPath(XnfTypeEnum.PNF);
+        final Object[][] parametersArray = new Object[1][];
+        parametersArray[0] = new Object[]{folderPath, softwareInformationPnfPackage.get(),
+            Arrays.asList("5gDUv18.05.201", "5gDUv18.06.205")};
+        return parametersArray;
+    }
+
+    private static Object[][] provideData(final List<String> fileNamesFromFolder, final String folderPath) {
+        final Object[][] parametersArray = new Object[fileNamesFromFolder.size()][];
+        int index = 0;
+        for (final Object obj : fileNamesFromFolder) {
+            parametersArray[index++] = new Object[]{folderPath, obj};
+        }
+        return parametersArray;
+    }
+
+    public static List<String> getRandomElements(final int randomElementNumber,
+                                                 final List<String> fileNamesFromFolder) {
+        if (fileNamesFromFolder.isEmpty() || fileNamesFromFolder.size() < randomElementNumber) {
+            return Collections.emptyList();
+        } else {
+            final List<Integer> indexList = new ArrayList<>();
+            final List<String> newRandomFileNamesFromFolder = new ArrayList<>();
+            for (int i = 0; i < fileNamesFromFolder.size(); i++) {
+                indexList.add(i);
+            }
+            Collections.shuffle(indexList);
+            final Integer[] randomArray = indexList.subList(0, randomElementNumber)
+                .toArray(new Integer[randomElementNumber]);
+            for (final Integer randomNumber : randomArray) {
+                newRandomFileNamesFromFolder.add(fileNamesFromFolder.get(randomNumber));
+            }
+            return newRandomFileNamesFromFolder;
+        }
+    }
+
+
+}
diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/ArtifactAssetStructure.java b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/ArtifactAssetStructure.java
new file mode 100644
index 0000000000..37f6243f96
--- /dev/null
+++ b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/ArtifactAssetStructure.java
@@ -0,0 +1,134 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * SDC
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.sdc.ci.tests.datatypes;
+
+public class ArtifactAssetStructure {
+
+	String artifactName;
+	String artifactType;
+	String artifactURL;
+	String artifactDescription;
+	int artifactTimeout;// optional
+	String artifactChecksum;
+	String artifactUUID;
+	String artifactVersion;
+	String generatedFromUUID;// optional
+
+	public ArtifactAssetStructure(String artifactName, String artifactType, String artifactURL,
+			String artifactDescription, int artifactTimeout, String artifactChecksum, String artifactUUID,
+			String artifactVersion, String generatedFromUUID) {
+		super();
+		this.artifactName = artifactName;
+		this.artifactType = artifactType;
+		this.artifactURL = artifactURL;
+		this.artifactDescription = artifactDescription;
+		this.artifactTimeout = artifactTimeout;
+		this.artifactChecksum = artifactChecksum;
+		this.artifactUUID = artifactUUID;
+		this.artifactVersion = artifactVersion;
+		this.generatedFromUUID = generatedFromUUID;
+	}
+
+	public ArtifactAssetStructure() {
+		super();
+	}
+
+	public String getArtifactName() {
+		return artifactName;
+	}
+
+	public void setArtifactName(String artifactName) {
+		this.artifactName = artifactName;
+	}
+
+	public String getArtifactType() {
+		return artifactType;
+	}
+
+	public void setArtifactType(String artifactType) {
+		this.artifactType = artifactType;
+	}
+
+	public String getArtifactURL() {
+		return artifactURL;
+	}
+
+	public void setArtifactURL(String artifactURL) {
+		this.artifactURL = artifactURL;
+	}
+
+	public String getArtifactDescription() {
+		return artifactDescription;
+	}
+
+	public void setArtifactDescription(String artifactDescription) {
+		this.artifactDescription = artifactDescription;
+	}
+
+	public int getArtifactTimeout() {
+		return artifactTimeout;
+	}
+
+	public void setArtifactTimeout(int artifactTimeout) {
+		this.artifactTimeout = artifactTimeout;
+	}
+
+	public String getArtifactChecksum() {
+		return artifactChecksum;
+	}
+
+	public void setArtifactChecksum(String artifactChecksum) {
+		this.artifactChecksum = artifactChecksum;
+	}
+
+	public String getArtifactUUID() {
+		return artifactUUID;
+	}
+
+	public void setArtifactUUID(String artifactUUID) {
+		this.artifactUUID = artifactUUID;
+	}
+
+	public String getArtifactVersion() {
+		return artifactVersion;
+	}
+
+	public void setArtifactVersion(String artifactVersion) {
+		this.artifactVersion = artifactVersion;
+	}
+
+	public String getGeneratedFromUUID() {
+		return generatedFromUUID;
+	}
+
+	public void setGeneratedFromUUID(String generatedFromUUID) {
+		this.generatedFromUUID = generatedFromUUID;
+	}
+
+	@Override
+	public String toString() {
+		return "ArtifactAssetStructure [artifactName=" + artifactName + ", artifactType=" + artifactType
+				+ ", artifactURL=" + artifactURL + ", artifactDescription=" + artifactDescription + ", artifactTimeout="
+				+ artifactTimeout + ", artifactChecksum=" + artifactChecksum + ", artifactUUID=" + artifactUUID
+				+ ", artifactVersion=" + artifactVersion + ", generatedFromUUID=" + generatedFromUUID + "]";
+	}
+
+}
diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/ArtifactReqDetails.java b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/ArtifactReqDetails.java
new file mode 100644
index 0000000000..4217a0ea39
--- /dev/null
+++ b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/ArtifactReqDetails.java
@@ -0,0 +1,242 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * SDC
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.sdc.ci.tests.datatypes;
+
+import org.openecomp.sdc.be.model.HeatParameterDefinition;
+
+import java.util.List;
+
+public class ArtifactReqDetails {
+
+	public ArtifactReqDetails() {
+
+	}
+
+	public ArtifactReqDetails(String artifactName, String artifactType, String artifactDescription, String payloadData,
+			String artifactLabel) {
+		super();
+		this.artifactName = artifactName;
+		this.artifactType = artifactType;
+		this.description = artifactDescription;
+		this.payloadData = payloadData;
+		this.artifactLabel = artifactLabel;
+	}
+
+	public ArtifactReqDetails(String artifactLabel, ArtifactReqDetails a) {
+		super();
+		this.artifactName = a.getArtifactName();
+		this.artifactType = a.getArtifactType();
+		this.description = a.getArtifactType();
+		this.payloadData = a.getPayload();
+		this.artifactLabel = artifactLabel;
+	}
+
+	private String uniqueId;
+	private String artifactName;
+	private String artifactType;
+	private String description;
+	private String payloadData;
+	private String artifactLabel;
+	private String apiUrl;
+	private String artifactGroupType;
+	private Integer timeout;
+	private String userIdLastUpdater;
+	private String creatorFullName;
+	private String updaterFullName;
+	private String artifactChecksum;
+	private String artifactDisplayName;
+	private List<HeatParameterDefinition> heatParameters;
+
+	private boolean mandatory;
+	private boolean serviceApi;
+
+	public boolean isServiceApi() {
+		return serviceApi;
+	}
+
+	public void setServiceApi(boolean serviceApi) {
+		this.serviceApi = serviceApi;
+	}
+
+	public String getArtifactLabel() {
+		return artifactLabel;
+	}
+
+	public void setArtifactLabel(String artifactLabel) {
+		this.artifactLabel = artifactLabel;
+	}
+
+	public String getArtifactName() {
+		return artifactName;
+	}
+
+	public void setArtifactName(String artifactName) {
+		this.artifactName = artifactName;
+	}
+
+	public String getArtifactType() {
+		return artifactType;
+	}
+
+	public void setArtifactType(String artifactType) {
+		this.artifactType = artifactType;
+	}
+
+	public String getDescription() {
+		return description;
+	}
+
+	public void setDescription(String description) {
+		this.description = description;
+	}
+
+	public String getPayload() {
+		return payloadData;
+	}
+
+	public void setPayload(String payload) {
+		this.payloadData = payload;
+	}
+
+	public void setPayloadData(String payloadData) {
+		this.payloadData = payloadData;
+	}
+
+	public String getArtifactGroupType() {
+		return artifactGroupType;
+	}
+
+	public void setArtifactGroupType(String artifactGroupType) {
+		this.artifactGroupType = artifactGroupType;
+	}
+
+	public Integer getTimeout() {
+		return timeout;
+	}
+
+	public void setTimeout(Integer timeout) {
+		this.timeout = timeout;
+	}
+
+	public boolean isMandatory() {
+		return mandatory;
+	}
+
+	public void setMandatory(boolean mandatory) {
+		this.mandatory = mandatory;
+	}
+
+	public String getUrl() {
+		return apiUrl;
+	}
+
+	public void setUrl(String url) {
+		this.apiUrl = url;
+	}
+
+	@Override
+	public String toString() {
+		if (!apiUrl.isEmpty()) {
+			return "ArtifactReqDetails [artifactName=" + artifactName + ", artifactType=" + artifactType
+					+ ", description=" + description + ", payloadData=" + payloadData + ", artifactLabel="
+					+ artifactLabel + ", mandatory=" + mandatory + ", url=" + apiUrl + "]";
+		}
+
+		return "ArtifactReqDetails [artifactName=" + artifactName + ", artifactType=" + artifactType + ", description="
+				+ description + ", payloadData=" + payloadData + ", artifactLabel=" + artifactLabel
+				+ ", artifactUniqueId=" + uniqueId + ", mandatory=" + mandatory + ", serviceApi=" + serviceApi + "]";
+
+	}
+
+	// public String getPayloadData() {
+	// return payloadData;
+	// }
+	//
+	// public void setPayloadData(String payloadData) {
+	// this.payloadData = payloadData;
+	// }
+
+	// public String getUserIdCreator() {
+	// return userIdCreator;
+	// }
+	//
+	// public void setUserIdCreator(String userIdCreator) {
+	// this.userIdCreator = userIdCreator;
+	// }
+	//
+	public String getArtifactDisplayName() {
+
+		return artifactDisplayName;
+	}
+
+	public void setArtifactDisplayName(String artifactDisplayName) {
+		this.artifactDisplayName = artifactDisplayName;
+	}
+
+	public String getUserIdLastUpdater() {
+		return userIdLastUpdater;
+	}
+
+	public void setUserIdLastUpdater(String userIdLastUpdater) {
+		this.userIdLastUpdater = userIdLastUpdater;
+	}
+
+	public String getCreatorFullName() {
+		return creatorFullName;
+	}
+
+	public void setCreatorFullName(String creatorFullName) {
+		this.creatorFullName = creatorFullName;
+	}
+
+	public String getUpdaterFullName() {
+		return updaterFullName;
+	}
+
+	public void setUpdaterFullName(String updaterFullName) {
+		this.updaterFullName = updaterFullName;
+	}
+
+	public String getArtifactChecksum() {
+		return artifactChecksum;
+	}
+
+	public void setArtifactChecksum(String artifactChecksum) {
+		this.artifactChecksum = artifactChecksum;
+	}
+
+	public String getUniqueId() {
+		return uniqueId;
+	}
+
+	public void setUniqueId(String artifactUniqueId) {
+		this.uniqueId = artifactUniqueId;
+	}
+
+	public List<HeatParameterDefinition> getHeatParameters() {
+		return heatParameters;
+	}
+
+	public void setHeatParameters(List<HeatParameterDefinition> heatParameters) {
+		this.heatParameters = heatParameters;
+	}
+
+}
diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/AssetStructure.java b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/AssetStructure.java
new file mode 100644
index 0000000000..8820b05772
--- /dev/null
+++ b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/AssetStructure.java
@@ -0,0 +1,122 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * SDC
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.sdc.ci.tests.datatypes;
+
+public class AssetStructure {
+
+	private String uuid;
+	private String invariantUUID;
+	private String name;
+	private String version;
+	private String toscaModelURL;
+	private String category;
+	private String lifecycleState;
+	private String lastUpdaterUserId;
+
+	public AssetStructure() {
+		super();
+	}
+
+	public AssetStructure(String uuid, String invariantUUID, String name, String version, String toscaModelURL,
+			String category, String lifecycleState, String lastUpdaterUserId) {
+		super();
+		this.uuid = uuid;
+		this.invariantUUID = invariantUUID;
+		this.name = name;
+		this.version = version;
+		this.toscaModelURL = toscaModelURL;
+		this.category = category;
+		this.lifecycleState = lifecycleState;
+		this.lastUpdaterUserId = lastUpdaterUserId;
+	}
+
+	@Override
+	public String toString() {
+		return "AssetStructure [uuid=" + uuid + ", invariantUUID=" + invariantUUID + ", name=" + name + ", version="
+				+ version + ", toscaModelURL=" + toscaModelURL + ", category=" + category + ", lifecycleState="
+				+ lifecycleState + ", lastUpdaterUserId=" + lastUpdaterUserId + "]";
+	}
+
+	public String getUuid() {
+		return uuid;
+	}
+
+	public void setUuid(String uuid) {
+		this.uuid = uuid;
+	}
+
+	public String getInvariantUUID() {
+		return invariantUUID;
+	}
+
+	public void setInvariantUUID(String invariantUUID) {
+		this.invariantUUID = invariantUUID;
+	}
+
+	public String getName() {
+		return name;
+	}
+
+	public void setName(String name) {
+		this.name = name;
+	}
+
+	public String getVersion() {
+		return version;
+	}
+
+	public void setVersion(String version) {
+		this.version = version;
+	}
+
+	public String getToscaModelURL() {
+		return toscaModelURL;
+	}
+
+	public void setToscaModelURL(String toscaModelURL) {
+		this.toscaModelURL = toscaModelURL;
+	}
+
+	public String getCategory() {
+		return category;
+	}
+
+	public void setCategory(String category) {
+		this.category = category;
+	}
+
+	public String getLifecycleState() {
+		return lifecycleState;
+	}
+
+	public void setLifecycleState(String lifecycleState) {
+		this.lifecycleState = lifecycleState;
+	}
+
+	public String getLastUpdaterUserId() {
+		return lastUpdaterUserId;
+	}
+
+	public void setLastUpdaterUserId(String lastUpdaterUserId) {
+		this.lastUpdaterUserId = lastUpdaterUserId;
+	}
+
+}
diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/CapabilityDetails.java b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/CapabilityDetails.java
new file mode 100644
index 0000000000..bbed28b654
--- /dev/null
+++ b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/CapabilityDetails.java
@@ -0,0 +1,69 @@
+/*
+ * Copyright © 2016-2018 European Support Limited
+ *
+ * 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.
+ */
+
+package org.openecomp.sdc.ci.tests.datatypes;
+
+import org.openecomp.sdc.be.model.ComponentInstanceProperty;
+
+import java.util.List;
+
+public class CapabilityDetails {
+    private String name;
+    private String type;
+    private String maxOccurrences;
+    private String minOccurrences;
+    private List<ComponentInstanceProperty> properties;
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getType() {
+        return type;
+    }
+
+    public void setType(String type) {
+        this.type = type;
+    }
+
+    public String getMaxOccurrences() {
+        return maxOccurrences;
+    }
+
+    public void setMaxOccurrences(String maxOccurrences) {
+        this.maxOccurrences = maxOccurrences;
+    }
+
+    public String getMinOccurrences() {
+        return minOccurrences;
+    }
+
+    public void setMinOccurrences(String minOccurrences) {
+        this.minOccurrences = minOccurrences;
+    }
+
+    public List<ComponentInstanceProperty> getProperties() {
+        return properties;
+    }
+
+    public void setProperties(List<ComponentInstanceProperty> properties) {
+        this.properties = properties;
+    }
+}
diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/ComponentInstanceReqDetails.java b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/ComponentInstanceReqDetails.java
new file mode 100644
index 0000000000..b2768501d8
--- /dev/null
+++ b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/ComponentInstanceReqDetails.java
@@ -0,0 +1,149 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * SDC
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.sdc.ci.tests.datatypes;
+
+import java.util.List;
+
+import org.openecomp.sdc.be.model.ComponentInstance;
+
+public class ComponentInstanceReqDetails {
+
+	String componentUid;
+	String description;
+	String posX;
+	String posY;
+	String name;
+	String uniqueId;
+	String originType;
+    List<String> directives;
+
+	public ComponentInstanceReqDetails() {
+		super();
+	}
+
+	public ComponentInstanceReqDetails(ComponentInstance componentInstance) {
+		super();
+		this.setUniqueId(componentInstance.getUniqueId());
+		this.description = componentInstance.getDescription();
+		this.posX = componentInstance.getPosX();
+		this.posY = componentInstance.getPosY();
+		// this.name = "myResourceInstance";
+		this.name = componentInstance.getName();
+		this.originType = componentInstance.getOriginType().name();
+	}
+
+	public ComponentInstanceReqDetails(String resourceUid, String description, String posX, String posY, String name, String originType) {
+		super();
+		this.componentUid = resourceUid;
+		this.description = description;
+		this.posX = posX;
+		this.posY = posY;
+		// this.name = "myResourceInstance";
+		this.name = name;
+		this.originType = originType;
+	}
+
+	public ComponentInstanceReqDetails(String resourceUid, String description, String posX, String posY) {
+		super();
+		this.componentUid = resourceUid;
+		this.description = description;
+		this.posX = posX;
+		this.posY = posY;
+	}
+
+	public String getComponentUid() {
+		return componentUid;
+	}
+
+	public void setComponentUid(String resourceUid) {
+		this.componentUid = resourceUid;
+	}
+
+	public String getDescription() {
+		return description;
+	}
+
+	public void setDescription(String description) {
+		this.description = description;
+	}
+
+	public String getPosX() {
+		return posX;
+	}
+
+	public void setPosX(String posX) {
+		this.posX = posX;
+	}
+
+	public String getPosY() {
+		return posY;
+	}
+
+	public void setPosY(String posY) {
+		this.posY = posY;
+	}
+
+	public String getName() {
+		return name;
+	}
+
+	public void setName(String name) {
+		this.name = name;
+	}
+
+	public String getUniqueId() {
+		return uniqueId;
+	}
+
+	public void setUniqueId(String uniqueId) {
+		this.uniqueId = uniqueId;
+	}
+
+	public String getOriginType() {
+		return originType;
+	}
+
+	public void setOriginType(String originType) {
+		this.originType = originType;
+	}
+
+    public List<String> getDirectives() {
+        return directives;
+    }
+
+    public void setDirectives(List<String> directives) {
+        this.directives = directives;
+    }
+
+    @Override
+    public String toString() {
+        return "ComponentInstanceReqDetails{" +
+                "componentUid='" + componentUid + '\'' +
+                ", description='" + description + '\'' +
+                ", posX='" + posX + '\'' +
+                ", posY='" + posY + '\'' +
+                ", name='" + name + '\'' +
+                ", uniqueId='" + uniqueId + '\'' +
+                ", originType='" + originType + '\'' +
+                ", directives=" + directives +
+                '}';
+    }
+}
diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/ComponentReqDetails.java b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/ComponentReqDetails.java
new file mode 100644
index 0000000000..36c9fc8cd7
--- /dev/null
+++ b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/ComponentReqDetails.java
@@ -0,0 +1,272 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * SDC
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.sdc.ci.tests.datatypes;
+
+import org.openecomp.sdc.be.model.LifecycleStateEnum;
+import org.openecomp.sdc.be.model.category.CategoryDefinition;
+import org.openecomp.sdc.be.model.category.SubCategoryDefinition;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public abstract class ComponentReqDetails {
+
+	protected String name;
+	protected String description;
+	protected List<String> tags = new ArrayList<>();
+	protected String contactId;
+	protected String icon;
+	protected String uniqueId;
+	protected String creatorUserId;
+	protected String creatorFullName;
+	protected String lastUpdaterUserId;
+	protected String lastUpdaterFullName;
+	protected Long creationDate;
+	protected Long lastUpdateDate;
+	protected LifecycleStateEnum lifecycleState;
+	protected String version;
+	protected String UUID;
+	protected List<CategoryDefinition> categories;
+	protected String projectCode;
+	protected String csarUUID;
+	protected String csarVersion;
+	protected String importedToscaChecksum;
+	protected String invariantUUID;
+
+	public String getCsarVersion() {
+		return csarVersion;
+	}
+
+	public void setCsarVersion(String csarVersion) {
+		this.csarVersion = csarVersion;
+	}
+
+	public String getName() {
+		return name;
+	}
+
+	public void setName(String name) {
+		this.name = name;
+		tags.add(name);
+	}
+
+	public List<String> getTags() {
+		return tags;
+	}
+
+	public void setTags(List<String> tags) {
+		this.tags = tags;
+	}
+
+	// public String getCategory() {
+	// return category;
+	// }
+	//
+	public String getContactId() {
+		return contactId;
+	}
+
+	public void setContactId(String contactId) {
+		this.contactId = contactId;
+	}
+
+	public String getIcon() {
+		return icon;
+	}
+
+	public void setIcon(String icon) {
+		this.icon = icon;
+	}
+
+	public String getUniqueId() {
+		return uniqueId;
+	}
+
+	public void setUniqueId(String uniqueId) {
+		this.uniqueId = uniqueId;
+	}
+
+	public void setCreatorUserId(String creatorUserId) {
+		this.creatorUserId = creatorUserId;
+	}
+
+	public void setCreatorFullName(String creatorFullName) {
+		this.creatorFullName = creatorFullName;
+	}
+
+	public void setLastUpdaterUserId(String lastUpdaterUserId) {
+		this.lastUpdaterUserId = lastUpdaterUserId;
+	}
+
+	public void setLastUpdaterFullName(String lastUpdaterFullName) {
+		this.lastUpdaterFullName = lastUpdaterFullName;
+	}
+
+	public void setCreationDate(Long creationDate) {
+		this.creationDate = creationDate;
+	}
+
+	public void setLastUpdateDate(Long lastUpdateDate) {
+		this.lastUpdateDate = lastUpdateDate;
+	}
+
+	public void setLifecycleState(LifecycleStateEnum lifecycleState) {
+		this.lifecycleState = lifecycleState;
+	}
+
+	public void setUUID(String uUID) {
+		this.UUID = uUID;
+	}
+
+	public String getCreatorUserId() {
+		return creatorUserId;
+	}
+
+	public String getCreatorFullName() {
+		return creatorFullName;
+	}
+
+	public String getLastUpdaterUserId() {
+		return lastUpdaterUserId;
+	}
+
+	public String getLastUpdaterFullName() {
+		return lastUpdaterFullName;
+	}
+
+	public Long getCreationDate() {
+		return creationDate;
+	}
+
+	public Long getLastUpdateDate() {
+		return lastUpdateDate;
+	}
+
+	public LifecycleStateEnum getLifecycleState() {
+		return lifecycleState;
+	}
+
+	public String getUUID() {
+		return UUID;
+	}
+
+	public String getVersion() {
+		return version;
+	}
+
+	public void setVersion(String version) {
+		this.version = version;
+	}
+
+	public String getDescription() {
+		return description;
+	}
+
+	public void setDescription(String description) {
+		this.description = description;
+	}
+
+	public List<CategoryDefinition> getCategories() {
+		return categories;
+	}
+
+	public void setCategories(List<CategoryDefinition> categories) {
+		this.categories = categories;
+	}
+
+	public void removeAllCategories() {
+		this.categories = new ArrayList<>();
+	}
+
+	public void addCategoryChain(String category, String subCategory) {
+		if (category != null || subCategory != null) {
+			if (categories == null) {
+				categories = new ArrayList<>();
+			}
+			CategoryDefinition selectedCategory = null;
+			for (CategoryDefinition categoryDef : categories) {
+				if (categoryDef.getName().equals(category)) {
+					selectedCategory = categoryDef;
+				}
+			}
+			if (selectedCategory == null) {
+				selectedCategory = new CategoryDefinition();
+				selectedCategory.setName(category);
+				categories.add(selectedCategory);
+			}
+			if (subCategory != null) {
+				List<SubCategoryDefinition> subcategories = selectedCategory.getSubcategories();
+				if (subcategories == null) {
+					subcategories = new ArrayList<>();
+					selectedCategory.setSubcategories(subcategories);
+				}
+				SubCategoryDefinition selectedSubcategory = null;
+				for (SubCategoryDefinition subcategory : subcategories) {
+					if (subcategory.getName().equals(subCategory)) {
+						selectedSubcategory = subcategory;
+					}
+				}
+				if (selectedSubcategory == null) {
+					selectedSubcategory = new SubCategoryDefinition();
+					selectedSubcategory.setName(subCategory);
+					subcategories.add(selectedSubcategory);
+				}
+			}
+		}
+	}
+
+	public void addCategory(String category) {
+		addCategoryChain(category, null);
+	}
+
+	public String getProjectCode() {
+		return projectCode;
+	}
+
+	public void setProjectCode(String projectCode) {
+		this.projectCode = projectCode;
+	}
+
+	public String getCsarUUID() {
+		return csarUUID;
+	}
+
+	public void setCsarUUID(String csarUUID) {
+		this.csarUUID = csarUUID;
+	}
+
+	public String getImportedToscaChecksum() {
+		return importedToscaChecksum;
+	}
+
+	public void setImportedToscaChecksum(String importedToscaChecksum) {
+		this.importedToscaChecksum = importedToscaChecksum;
+	}
+
+	public String getInvariantUUID() {
+		return invariantUUID;
+	}
+
+	public void setInvariantUUID(String invariantUUID) {
+		this.invariantUUID = invariantUUID;
+	}
+
+}
diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/CsarArtifacts.java b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/CsarArtifacts.java
new file mode 100644
index 0000000000..f3379766e2
--- /dev/null
+++ b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/CsarArtifacts.java
@@ -0,0 +1,59 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * SDC
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.sdc.ci.tests.datatypes;
+
+public class CsarArtifacts {
+
+	private String artifactType;
+	private String artifactName;
+
+	public CsarArtifacts() {
+		super();
+	}
+
+	public CsarArtifacts(String artifactName, String artifactType) {
+		super();
+		this.artifactName = artifactName;
+		this.artifactType = artifactType;
+	}
+
+	@Override
+	public String toString() {
+		return "AssetStructure [artifactName=" + artifactName + ", artifactType=" + artifactType + "]";
+	}
+
+	public String getArtifactType() {
+		return artifactType;
+	}
+
+	public void setArtifactType(String artifactType) {
+		this.artifactType = artifactType;
+	}
+
+	public String getArtifactName() {
+		return artifactName;
+	}
+
+	public void setArtifactName(String artifactName) {
+		this.artifactName = artifactName;
+	}
+
+}
diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/DistributionMonitorObject.java b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/DistributionMonitorObject.java
new file mode 100644
index 0000000000..7dfbcd4c67
--- /dev/null
+++ b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/DistributionMonitorObject.java
@@ -0,0 +1,89 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * SDC
+ * ================================================================================
+ * 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=========================================================
+ */
+
+package org.openecomp.sdc.ci.tests.datatypes;
+
+public class DistributionMonitorObject {
+	
+	private String omfComponentID;
+	private String timestamp;
+	private String url;
+	private String status;
+	private String errorReason;
+	
+	public DistributionMonitorObject() {
+		super();
+	}
+
+	public DistributionMonitorObject(String omfComponentID, String timestamp, String url, String status, String errorReason) {
+		super();
+		this.omfComponentID = omfComponentID;
+		this.timestamp = timestamp;
+		this.url = url;
+		this.status = status;
+		this.errorReason = errorReason;
+	}
+
+	public String getOmfComponentID() {
+		return omfComponentID;
+	}
+
+	public void setOmfComponentID(String omfComponentID) {
+		this.omfComponentID = omfComponentID;
+	}
+
+	public String getTimestamp() {
+		return timestamp;
+	}
+
+	public void setTimestamp(String timestamp) {
+		this.timestamp = timestamp;
+	}
+
+	public String getUrl() {
+		return url;
+	}
+
+	public void setUrl(String url) {
+		this.url = url;
+	}
+
+	public String getStatus() {
+		return status;
+	}
+
+	public void setStatus(String status) {
+		this.status = status;
+	}
+
+	public String getErrorReason() {
+		return errorReason;
+	}
+
+	public void setErrorReason(String errorReason) {
+		this.errorReason = errorReason;
+	}
+
+	@Override
+	public String toString() {
+		return "DistributionMonitorObject [omfComponentID=" + omfComponentID + ", timestamp=" + timestamp + ", url=" + url + ", status=" + status + ", errorReason=" + errorReason + "]";
+	}
+	
+}
diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/GroupHeatMetaDefinition.java b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/GroupHeatMetaDefinition.java
new file mode 100644
index 0000000000..5ebb2608b7
--- /dev/null
+++ b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/GroupHeatMetaDefinition.java
@@ -0,0 +1,96 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * SDC
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.sdc.ci.tests.datatypes;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+public class GroupHeatMetaDefinition {
+
+	private int group = 0;
+	private String groupName;
+
+//	private List<String> artifactList = new ArrayList<String>();
+	private List<HeatMetaFirstLevelDefinition> artifactList = new ArrayList<HeatMetaFirstLevelDefinition>();
+	@Override
+	public String toString() {
+		return "GroupHeatMetaDefinition [group=" + group + ", artifactList=" + artifactList + ", artifactMap=" + artifactMap + ", propertyHeatMetaDefinition=" + propertyHeatMetaDefinition + "]";
+	}
+
+	public List<HeatMetaFirstLevelDefinition> getArtifactList() {
+		return artifactList;
+	}
+
+	public void setArtifactList(List<HeatMetaFirstLevelDefinition> artifactList) {
+		this.artifactList = artifactList;
+	}
+
+	private Map<String, String> artifactMap = new HashMap<>();
+	PropertyHeatMetaDefinition propertyHeatMetaDefinition;
+	
+	public Map<String, String> getArtifactMap() {
+		return artifactMap;
+	}
+
+	public void setArtifactMap(Map<String, String> artifactMap) {
+		this.artifactMap = artifactMap;
+	}
+
+
+	public PropertyHeatMetaDefinition getPropertyHeatMetaDefinition() {
+		return propertyHeatMetaDefinition;
+	}
+
+	public void setPropertyHeatMetaDefinition(PropertyHeatMetaDefinition propertyHeatMetaDefinition) {
+		this.propertyHeatMetaDefinition = propertyHeatMetaDefinition;
+	}
+
+	public GroupHeatMetaDefinition() {
+		super();
+	}
+
+	public int getGroup() {
+		return group;
+	}
+
+	public void setGroup(int group) {
+		this.group = group;
+	}
+
+	public String getGroupName() {
+		return groupName;
+	}
+
+	public void setGroupName(String groupName) {
+		this.groupName = groupName;
+	}
+
+	//	public List<String> getArtifactList() {
+//		return artifactList;
+//	}
+//
+//	public void setArtifactList(List<String> artifactList) {
+//		this.artifactList = artifactList;
+//	}
+
+}
diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/HeatMetaFirstLevelDefinition.java b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/HeatMetaFirstLevelDefinition.java
new file mode 100644
index 0000000000..88033024d5
--- /dev/null
+++ b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/HeatMetaFirstLevelDefinition.java
@@ -0,0 +1,75 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * SDC
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.sdc.ci.tests.datatypes;
+
+public class HeatMetaFirstLevelDefinition {
+	
+	public HeatMetaFirstLevelDefinition(String fileName, String type, String checkSum) {
+		super();
+		this.fileName = fileName;
+		this.type = type;
+		this.checkSum = checkSum;
+		
+	}
+	
+	private String fileName;
+	private String type;
+	private String checkSum;
+	
+	public HeatMetaFirstLevelDefinition() {
+		super();
+	}
+
+	public String getFileName() {
+		return fileName;
+	}
+
+	public void setFileName(String fileName) {
+		this.fileName = fileName;
+	}
+
+	public String getType() {
+		return type;
+	}
+
+	public void setType(String type) {
+		this.type = type;
+	}
+
+
+	public String getCheckSum() {
+		return checkSum;
+	}
+
+	public void setCheckSum(String checkSum) {
+		this.checkSum = checkSum;
+	}
+
+	@Override
+	public String toString() {
+		return "HeatMetaFirstLevelDefinition [fileName=" + fileName + ", type=" + type + ", checkSum=" + checkSum + "]";
+	}
+	
+	
+	
+	
+
+}
diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/ImportReqDetails.java b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/ImportReqDetails.java
new file mode 100644
index 0000000000..d877150ceb
--- /dev/null
+++ b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/ImportReqDetails.java
@@ -0,0 +1,334 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * SDC
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.sdc.ci.tests.datatypes;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+import org.codehaus.jettison.json.JSONArray;
+import org.codehaus.jettison.json.JSONException;
+import org.openecomp.sdc.be.model.Resource;
+import org.openecomp.sdc.be.model.User;
+import org.openecomp.sdc.ci.tests.datatypes.http.RestResponse;
+import org.openecomp.sdc.ci.tests.utils.rest.ResourceRestUtils;
+import org.openecomp.sdc.ci.tests.utils.rest.ResponseParser;
+import org.yaml.snakeyaml.Yaml;
+
+import java.io.*;
+import java.util.*;
+
+import static org.testng.AssertJUnit.*;
+
+public class ImportReqDetails extends ResourceReqDetails {
+
+	private static final String CAPS = "capabilities";
+	private String payloadName;
+	private String payloadData;
+
+	private Map<String, Object> requirements;
+	private Map<String, Object> capabilities;
+
+	private List<String> derivedList;
+	private String derivedFromField;
+
+	public ImportReqDetails(String resourceName, String description, List<String> tags, List<String> derivedFrom,
+			String vendorName, String vendorRelease, String contactId, String icon) {
+		super(resourceName, description, tags, null, derivedFrom, vendorName, vendorRelease, contactId, icon);
+	}
+	
+	public ImportReqDetails(Resource resource, String payloadName, String payloadData){
+		super(resource);
+		this.payloadData = payloadData;
+		this.payloadName = payloadName;
+	}
+
+	public String getPayloadName() {
+		return payloadName;
+	}
+
+	public void setPayloadName(String payloadName) {
+		this.payloadName = payloadName;
+	}
+
+	public String getPayloadData() {
+		return payloadData;
+	}
+
+	public void setPayloadData(String payloadData) {
+		this.payloadData = payloadData;
+	}
+
+	@Override
+	public String toString() {
+		return "ImportReqDetails [payloadName=" + payloadName + ", payloadData=" + payloadData + "]";
+	}
+
+	public void setReqirementsAndCapabilities(String path, String fileName, User user, String derivedFromSource) throws IOException, JSONException{
+		setRequirements(path, fileName, user, derivedFromSource);
+		setCapabilities(path, fileName, user, derivedFromSource);
+	}
+
+	public List<String> getDerivedList() {
+		return derivedList;
+	}
+
+	public void setDerivedList(List<String> derivedList) {
+		this.derivedList = derivedList;
+	}
+
+	public String getDerivedFromField() {
+		return derivedFromField;
+	}
+
+	public void setDerivedFromField(String derivedFromField) {
+		this.derivedFromField = derivedFromField;
+	}
+
+	public Map<String, Object> getRequirements() {
+		return requirements;
+	}
+
+	public void setRequirements(String path, String fileName, User user, String derivedFromSource) throws IOException, JSONException {
+		Map<String, Object> requirementsFromFile = getRequirementsMapFromFile(path + File.separator + fileName,
+				toscaResourceName, "requirements");
+		Map<String, Object> reqs = organizeRequirementsMap(requirementsFromFile);
+		getDerivedReqCap(user, reqs, "requirements", derivedFromSource);
+		this.requirements = reqs;
+	}
+
+	@SuppressWarnings("unchecked")
+	private void getDerivedReqCap(User user, Map<String, Object> reqCapMap, String field, String derivedFromResource)
+			throws IOException, JSONException {
+
+		if (derivedFromResource == null) {
+			derivedFromResource = "Root";
+		}
+
+		RestResponse rest = getResourceSource(user, derivedFromResource);
+		Map<String, Object> parsedFieldFromResponseAsMap = ResponseParser.getJsonValueAsMap(rest, field);
+		Iterator<String> iterator = parsedFieldFromResponseAsMap.keySet().iterator();
+		Map<String, Object> convertListToMap = null;
+		while (iterator.hasNext()) {
+			String type = iterator.next();
+			List<Object> lst = (List<Object>) parsedFieldFromResponseAsMap.get(type);
+			convertListToMap = convertListToMap(lst);
+
+			if (field.equals(CAPS)) {
+				convertListToMap.replace("capabilitySources", derivedList);
+				lst = new ArrayList<>(Arrays.asList(convertListToMap));
+			}
+
+			Object existingValue = reqCapMap.get(type);
+			if (existingValue != null) {
+				Map<String, Object> convertedExistingValue = convertListToMap((List<Object>) existingValue);
+				if (convertedExistingValue.get("name").toString().equalsIgnoreCase(convertListToMap.get("name").toString())) {
+					lst = new ArrayList<>(Arrays.asList(convertedExistingValue));
+				} else {
+					lst.add(convertedExistingValue);
+				}
+			}
+
+			reqCapMap.put(type, lst);
+		}
+	}
+
+	private RestResponse getResourceSource(User user, String source) throws IOException, JSONException {
+		org.codehaus.jettison.json.JSONObject getResourceJSONObject = null;
+		RestResponse rest = ResourceRestUtils.getResourceByNameAndVersion(user.getUserId(), source, "1.0");
+		if (rest.getErrorCode().intValue() == 200) {
+			JSONArray jArray = new JSONArray(rest.getResponse());
+			for (int i = 0; i < jArray.length(); i++) {
+				getResourceJSONObject = jArray.getJSONObject(i);
+				String resourceType = getResourceJSONObject.get("resourceType").toString();
+				if (!resourceType.equals("VF")) {
+					rest.setResponse(getResourceJSONObject.toString());
+				}
+			}
+		}
+		return rest;
+	}
+
+	public Map<String, Object> getCapabilities() {
+		return capabilities;
+	}
+
+	public void setCapabilities(String path, String fileName, User user, String derivedFromSource) throws IOException, JSONException {
+		Map<String, Object> capabilitiesFromFile = getCapabilitiesMapFromFile(path + File.separator + fileName,
+				toscaResourceName, CAPS);
+		Map<String, Object> caps = organizeCapabilitiesMap(capabilitiesFromFile);
+		getDerivedReqCap(user, caps, CAPS, derivedFromSource);
+		this.capabilities = caps;
+	}
+
+	@SuppressWarnings("unchecked")
+	private Map<String, Object> organizeCapabilitiesMap(Map<String, Object> capabilitiesFromFile) {
+		Iterator<String> iterator = capabilitiesFromFile.keySet().iterator();
+		Map<String, Object> capMap = new HashMap<>();
+		while (iterator.hasNext()) {
+			List<Object> valueList = new ArrayList<>();
+			String next = iterator.next();
+			Map<String, Object> valuesMap = (Map<String, Object>) capabilitiesFromFile.get(next);
+			String key = valuesMap.remove("type").toString();
+			valuesMap.put("name", next);
+			valuesMap.put("capabilitySources", derivedList);
+			valuesMap.put("type", key);
+
+			if (!valuesMap.containsKey("occurrences")) {
+				valuesMap.put("minOccurrences", "1");
+				valuesMap.put("maxOccurrences", "UNBOUNDED");
+			}
+
+			Object tempValue = capMap.get(key);
+			if (tempValue == null) {
+				valueList.add(valuesMap);
+			} else {
+				Map<String, Object> convertValue = convertListToMap((List<Object>) tempValue);
+				valueList = new ArrayList<>(Arrays.asList(convertValue, valuesMap));
+			}
+			capMap.put(key, valueList);
+		}
+		return capMap;
+	}
+
+	@SuppressWarnings("unchecked")
+	private Map<String, Object> getCapabilitiesMapFromFile(String fileName, String toscaResourceName,
+			String fieldToTest) throws FileNotFoundException {
+		Map<String, Object> resourceToscaMap = getToscaResourceFromFile(fileName, toscaResourceName);
+		Object capMap = resourceToscaMap.get(fieldToTest);
+		if (capMap == null) {
+			return new HashMap<>();
+		}
+		return (Map<String, Object>) capMap;
+	}
+
+	@SuppressWarnings("unchecked")
+	private Map<String, Object> organizeRequirementsMap(Map<String, Object> requirementsFromFile) {
+		Map<String, Object> reqMap = new HashMap<>();
+		List<Object> valueList = new ArrayList<>();
+		Iterator<String> iterator = requirementsFromFile.keySet().iterator();
+		while (iterator.hasNext()) {
+			String key = iterator.next();
+			Map<String, Object> valuesMap = (Map<String, Object>) requirementsFromFile.get(key);
+			valuesMap.put("name", key);
+			String capability = valuesMap.get("capability").toString();
+
+			List<Object> occurencesList = (List<Object>) valuesMap.remove("occurrences");
+			if (occurencesList != null) {
+				valuesMap.put("minOccurrences", occurencesList.get(0).toString());
+				valuesMap.put("maxOccurrences", occurencesList.get(1).toString());
+			}
+
+			valueList.add(valuesMap);
+			reqMap.put(capability, valueList);
+		}
+
+		return reqMap;
+	}
+
+	@SuppressWarnings("unchecked")
+	private Map<String, Object> getRequirementsMapFromFile(String fileName, String toscaResourceName,
+			String fieldToTest) throws FileNotFoundException {
+		Map<String, Object> resourceToscaMap = getToscaResourceFromFile(fileName, toscaResourceName);
+		List<Object> reqListFromFile = (List<Object>) resourceToscaMap.get(fieldToTest);
+		if (reqListFromFile == null) {
+			return new HashMap<>();
+		}
+		return convertListToMap(reqListFromFile);
+	}
+
+	@SuppressWarnings("unchecked")
+	private Map<String, Object> getToscaResourceFromFile(String fullFileName, String toscaResourceName) throws FileNotFoundException{
+		Map<String, Object> nodesTypesMap = getNodesTypesMapFromFile(fullFileName);
+		Map<String, Object> resourceToscaMap = (Map<String, Object>) nodesTypesMap.get(toscaResourceName);
+
+		derivedFromField = resourceToscaMap.get("derived_from").toString();
+
+		return resourceToscaMap;
+	}
+
+	@SuppressWarnings("unchecked")
+	private Map<String, Object> getNodesTypesMapFromFile(String fullFileName) throws FileNotFoundException {
+		Yaml yaml = new Yaml();
+		File file = new File(fullFileName);
+		InputStream inputStream = new FileInputStream(file);
+		Map<?, ?> mapFromFile = (Map<?, ?>) yaml.load(inputStream);
+		return (Map<String, Object>) mapFromFile.get("node_types");
+	}
+
+	@SuppressWarnings("unchecked")
+	private Map<String, Object> convertListToMap(List<Object> testedListFromFile) {
+		Map<String, Object> testedMapFromFile = new HashMap<>();
+		for (int i = 0; i < testedListFromFile.size(); i++) {
+			Object req = testedListFromFile.get(i);
+			ObjectMapper m = new ObjectMapper();
+			Map<? extends String, ? extends String> mappedObject = m.convertValue(req, Map.class);
+			testedMapFromFile.putAll(mappedObject);
+		}
+		return testedMapFromFile;
+	}
+
+	@SuppressWarnings("unchecked")
+	public void compareRequirementsOrCapabilities(Map<String, Object> exepectedReq, Map<String, Object> actualReq) {
+		Iterator<String> iterator = exepectedReq.keySet().iterator();
+		while (iterator.hasNext()) {
+			String key = iterator.next();
+			List<Object> expectedValues = (List<Object>) exepectedReq.get(key);
+			List<Object> actualValues = (List<Object>) actualReq.get(key);
+			assertNotNull(actualValues);
+
+			List<Map<String, Object>> expectedMapsList = convertListToMapList(expectedValues);
+			List<Map<String, Object>> actualMapsList = convertListToMapList(actualValues);
+			assertEquals(expectedMapsList.size(), actualMapsList.size());
+
+			for (int i = 0; i < expectedMapsList.size(); i++) {
+				Map<String, Object> expectedMap = expectedMapsList.get(i);
+				Map<String, Object> actualdMap = actualMapsList.get(i);
+				if (expectedMap.get("name").equals(actualdMap.get("name"))) {
+					Iterator<String> iterator2 = expectedMap.keySet().iterator();
+					while (iterator2.hasNext()) {
+						String innerKey = iterator2.next();
+						assertTrue(
+								"check " + innerKey + " in " + key + ":\nexpected: "
+										+ expectedMap.get(innerKey).toString() + "\nactual: "
+										+ actualdMap.get(innerKey).toString(),
+								expectedMap.get(innerKey).equals(actualdMap.get(innerKey)));
+
+					}
+
+				}
+			}
+		}
+	}
+
+	@SuppressWarnings("unchecked")
+	private List<Map<String, Object>> convertListToMapList(List<Object> testedListFromFile) {
+		List<Map<String, Object>> listOfMaps = new ArrayList<>();
+		for (int i = 0; i < testedListFromFile.size(); i++) {
+			Object req = testedListFromFile.get(i);
+			ObjectMapper m = new ObjectMapper();
+			Map<? extends String, ? extends String> mappedObject = m.convertValue(req, Map.class);
+			mappedObject.remove("uniqueId");
+			Map<String, Object> testedMapFromFile = new HashMap<>();
+			testedMapFromFile.putAll(mappedObject);
+			listOfMaps.add(testedMapFromFile);
+		}
+		return listOfMaps;
+	}
+
+}
diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/LicensingData.java b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/LicensingData.java
new file mode 100644
index 0000000000..788d609f7d
--- /dev/null
+++ b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/LicensingData.java
@@ -0,0 +1,59 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * SDC
+ * ================================================================================
+ * 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=========================================================
+ */
+
+package org.openecomp.sdc.ci.tests.datatypes;
+import java.util.List;
+
+public class LicensingData {
+    private String licenseAgreement;
+    private List<String> featureGroups = null;
+
+    public LicensingData() {
+    }
+
+    public LicensingData(String licenseAgreement, List<String> featureGroups) {
+        this.licenseAgreement = licenseAgreement;
+        this.featureGroups = featureGroups;
+    }
+
+    public String getLicenseAgreement() {
+        return licenseAgreement;
+    }
+
+    public void setLicenseAgreement(String licenseAgreement) {
+        this.licenseAgreement = licenseAgreement;
+    }
+
+    public List<String> getFeatureGroups() {
+        return featureGroups;
+    }
+
+    public void setFeatureGroups(List<String> featureGroups) {
+        this.featureGroups = featureGroups;
+    }
+
+    @Override
+    public String toString() {
+        return "LicensingData{" +
+                "licenseAgreement='" + licenseAgreement + '\'' +
+                ", featureGroups=" + featureGroups +
+                '}';
+    }
+}
diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/LicensingVersion.java b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/LicensingVersion.java
new file mode 100644
index 0000000000..073bdacce5
--- /dev/null
+++ b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/LicensingVersion.java
@@ -0,0 +1,51 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * SDC
+ * ================================================================================
+ * 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=========================================================
+ */
+
+package org.openecomp.sdc.ci.tests.datatypes;
+
+public class LicensingVersion {
+
+    private String id;
+    private String label;
+
+    public LicensingVersion(String id, String label) {
+        this.id = id;
+        this.label = label;
+    }
+
+    public LicensingVersion() {
+    }
+
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    @Override
+    public String toString() {
+        return "LicensingVersion{" +
+                "id='" + id + '\'' +
+                ", label='" + label + '\'' +
+                '}';
+    }
+}
diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/ProductReqDetails.java b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/ProductReqDetails.java
new file mode 100644
index 0000000000..61d923e6c4
--- /dev/null
+++ b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/ProductReqDetails.java
@@ -0,0 +1,88 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * SDC
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.sdc.ci.tests.datatypes;
+
+import org.openecomp.sdc.be.model.category.CategoryDefinition;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class ProductReqDetails extends ComponentReqDetails {
+
+	private String fullName;
+	private List<String> contacts;
+	private String isActive;
+
+	public ProductReqDetails(String name, List<CategoryDefinition> category) {
+		this.categories = category;
+		this.name = name;
+	}
+
+	public ProductReqDetails(String name) {
+		this.name = name;
+	}
+
+	public void addCategory(CategoryDefinition category) {
+		if (categories == null) {
+			categories = new ArrayList<>();
+		}
+		categories.add(category);
+	}
+
+	public void addContact(String contactUserId) {
+		if (contacts == null) {
+			contacts = new ArrayList<>();
+		}
+		contacts.add(contactUserId);
+	}
+
+	public List<String> getContacts() {
+		return contacts;
+	}
+
+	public void setContacts(List<String> contacts) {
+		this.contacts = contacts;
+	}
+
+	public List<CategoryDefinition> getCategories() {
+		return categories;
+	}
+
+	public void setCategories(List<CategoryDefinition> categories) {
+		this.categories = categories;
+	}
+
+	public String getFullName() {
+		return fullName;
+	}
+
+	public void setFullName(String fullName) {
+		this.fullName = fullName;
+	}
+
+	public String getActive() {
+		return isActive;
+	}
+
+	public void setActive(String isActive) {
+		this.isActive = isActive;
+	}
+}
diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/PropertyHeatMetaDefinition.java b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/PropertyHeatMetaDefinition.java
new file mode 100644
index 0000000000..5c9083d757
--- /dev/null
+++ b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/PropertyHeatMetaDefinition.java
@@ -0,0 +1,63 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * SDC
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.sdc.ci.tests.datatypes;
+
+public class PropertyHeatMetaDefinition {
+
+	String name;
+	boolean value;
+
+	public PropertyHeatMetaDefinition() {
+		super();
+	}
+
+	
+
+	public String getName() {
+		return name;
+	}
+
+
+
+	public void setName(String name) {
+		this.name = name;
+	}
+
+
+
+	public boolean getValue() {
+		return value;
+	}
+
+
+
+	public void setValue(boolean value) {
+		this.value = value;
+	}
+
+
+
+	@Override
+	public String toString() {
+		return "PropertyHeatMetaDefinition [name=" + name + ", value=" + value + "]";
+	}
+
+}
diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/PropertyObject.java b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/PropertyObject.java
new file mode 100644
index 0000000000..b969d4d6a1
--- /dev/null
+++ b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/PropertyObject.java
@@ -0,0 +1,110 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * SDC
+ * ================================================================================
+ * 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=========================================================
+ */
+
+package org.openecomp.sdc.ci.tests.datatypes;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class PropertyObject {
+
+    private String defaultValue;
+    private String name;
+    private String parentUniqueId;
+    private boolean password;
+    private boolean required;
+    private List<Schema> Schema;
+    private String type;
+    private String uniqueId;
+    private boolean definition;
+    private Object value = null;
+
+
+    public PropertyObject() {
+    }
+
+    public Object getValue() {
+        return value;
+    }
+
+    public void setValue(Object value) {
+        this.value = value;
+    }
+
+    public PropertyObject(String defaultValue, String name, String parentUniqueId, String uniqueId) {
+        this.defaultValue = defaultValue;
+        this.name = name;
+        this.parentUniqueId = parentUniqueId;
+        this.uniqueId = uniqueId;
+        this.password = false;
+        this.required = false;
+        this.type = "String";
+        this.definition = false;
+        this.Schema = new ArrayList<Schema>();
+    }
+
+    public String getDefaultValue() {
+        return defaultValue;
+    }
+
+    public void setDefaultValue(String defaultValue) {
+        this.defaultValue = defaultValue;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getParentUniqueId() {
+        return parentUniqueId;
+    }
+
+    public void setParentUniqueId(String parentUniqueId) {
+        this.parentUniqueId = parentUniqueId;
+    }
+
+    public String getType() {
+        return type;
+    }
+
+    public void setType(String type) {
+        this.type = type;
+    }
+
+    public String getUniqueId() {
+        return uniqueId;
+    }
+
+    public void setUniqueId(String uniqueId) {
+        this.uniqueId = uniqueId;
+    }
+}
+
+class Schema {
+
+    private List<Property> property;
+}
+
+class Property {}
+
diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/PropertyReqDetails.java b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/PropertyReqDetails.java
new file mode 100644
index 0000000000..64086884fa
--- /dev/null
+++ b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/PropertyReqDetails.java
@@ -0,0 +1,179 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * SDC
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.sdc.ci.tests.datatypes;
+
+import org.openecomp.sdc.be.datatypes.elements.SchemaDefinition;
+
+public class PropertyReqDetails {
+
+	String name;
+	String type;
+	Boolean required = false;
+	String defaultValue;
+	String description;
+	String propertyRangeMin;
+	String propertyRangeMax;
+	Boolean isPassword = false;
+	SchemaDefinition schema;
+	String uniqueId;
+	String parentUniqueId;
+	String value;
+
+	public PropertyReqDetails() {
+		super();
+	}
+
+	public PropertyReqDetails(String propertyName, String propertyType, Boolean propertyRequired,
+							  String propertyDefaultValue, String propertyDescription, String propertyRangeMin,
+							  String propertyRangeMax,
+							  Boolean propertyPassword) {
+		super();
+		this.name = propertyName;
+		this.type = propertyType;
+		this.required = propertyRequired;
+		this.defaultValue = propertyDefaultValue;
+		this.description = propertyDescription;
+		this.propertyRangeMin = propertyRangeMin;
+		this.propertyRangeMax = propertyRangeMax;
+		this.isPassword = propertyPassword;
+	}
+
+	public PropertyReqDetails(String propertyName, String propertyType, String propertyDefaultValue,
+							  String propertyDescription, SchemaDefinition schema) {
+		super();
+		this.name = propertyName;
+		this.type = propertyType;
+		this.defaultValue = propertyDefaultValue;
+		this.description = propertyDescription;
+		this.schema = schema;
+	}
+
+	public SchemaDefinition getSchema() {
+		return schema;
+	}
+
+	public void setSchema(SchemaDefinition schema) {
+		this.schema = schema;
+	}
+
+	public String getName() {
+		return name;
+	}
+
+	public void setName(String propertyName) {
+		this.name = propertyName;
+	}
+
+	public String getPropertyType() {
+		return type;
+	}
+
+	public void setPropertyType(String propertyType) {
+		this.type = propertyType;
+	}
+
+	public Boolean getPropertyRequired() {
+		return required;
+	}
+
+	public void setPropertyRequired(Boolean propertyRequired) {
+		this.required = propertyRequired;
+	}
+
+	public String getPropertyDefaultValue() {
+		return defaultValue;
+	}
+
+	public void setPropertyDefaultValue(String propertyDefaultValue) {
+		this.defaultValue = propertyDefaultValue;
+	}
+
+	public String getPropertyDescription() {
+		return description;
+	}
+
+	public void setPropertyDescription(String propertyDescription) {
+		this.description = propertyDescription;
+	}
+
+	public String getPropertyRangeMin() {
+		return propertyRangeMin;
+	}
+
+	public void setPropertyRangeMin(String propertyRangeMin) {
+		this.propertyRangeMin = propertyRangeMin;
+	}
+
+	public String getPropertyRangeMax() {
+		return propertyRangeMax;
+	}
+
+	public void setPropertyRangeMax(String propertyRangeMax) {
+		this.propertyRangeMax = propertyRangeMax;
+	}
+
+	public Boolean getPropertyPassword() {
+		return isPassword;
+	}
+
+	public void setPropertyPassword(Boolean propertyPassword) {
+		this.isPassword = propertyPassword;
+	}
+
+	public String getUniqueId() {
+		return uniqueId;
+	}
+
+	public void setUniqueId(String uniqueId) {
+		this.uniqueId = uniqueId;
+	}
+
+	public String getParentUniqueId() {
+		return parentUniqueId;
+	}
+
+	public void setParentUniqueId(String parentUniqueId) {
+		this.parentUniqueId = parentUniqueId;
+	}
+
+	public String getValue() {
+		return value;
+	}
+
+	public void setValue(String value) {
+		this.value = value;
+	}
+
+	public String propertyToJsonString() {
+		String jsonString;
+		jsonString =
+				"{\"" + this.getName() + "\":{" + "\"name\":\"" + this.getName() + "\"," + "\"type\":\"" + this
+						.getPropertyType() + "\"," + "\"required\":"
+						+ this.getPropertyRequired() + "," + "\"defaultValue\":\"" + this.getPropertyDefaultValue()
+						+ "\","
+						+ "\"description\":\"" + this.getPropertyDescription() + "\","
+						+ "\"constraints\":[{\"inRange\":[\""
+						+ this.getPropertyRangeMin() + "\",\"" + this.getPropertyRangeMax() + "\"]}],"
+						+ "\"isPassword\":"
+						+ this.getPropertyPassword() + "}}";
+		return jsonString;
+	}
+}
diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/RequirementDetails.java b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/RequirementDetails.java
new file mode 100644
index 0000000000..a720786d83
--- /dev/null
+++ b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/RequirementDetails.java
@@ -0,0 +1,74 @@
+/*
+ * Copyright © 2016-2018 European Support Limited
+ *
+ * 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.
+ */
+
+package org.openecomp.sdc.ci.tests.datatypes;
+
+public class RequirementDetails {
+    private String capability;
+    private String name;
+    private String node;
+    private String relationship;
+    private String maxOccurrences;
+    private String minOccurrences;
+
+    public String getCapability() {
+        return capability;
+    }
+
+    public void setCapability(String capability) {
+        this.capability = capability;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getNode() {
+        return node;
+    }
+
+    public void setNode(String node) {
+        this.node = node;
+    }
+
+    public String getRelationship() {
+        return relationship;
+    }
+
+    public void setRelationship(String relationship) {
+        this.relationship = relationship;
+    }
+
+    public String getMaxOccurrences() {
+        return maxOccurrences;
+    }
+
+    public void setMaxOccurrences(String maxOccurrences) {
+        this.maxOccurrences = maxOccurrences;
+    }
+
+    public String getMinOccurrences() {
+        return minOccurrences;
+    }
+
+    public void setMinOccurrences(String minOccurrences) {
+        this.minOccurrences = minOccurrences;
+    }
+}
diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/ResourceAssetStructure.java b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/ResourceAssetStructure.java
new file mode 100644
index 0000000000..62f5e0c8f0
--- /dev/null
+++ b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/ResourceAssetStructure.java
@@ -0,0 +1,76 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * SDC
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.sdc.ci.tests.datatypes;
+
+public class ResourceAssetStructure extends AssetStructure {
+
+	private String subCategory;
+	private String resourceType;
+	protected String lastUpdaterFullName;
+	protected String toscaResourceName;
+
+	public ResourceAssetStructure() {
+		super();
+	}
+
+	public ResourceAssetStructure(String uuid, String invariantUUID, String name, String version, String toscaModelURL,
+			String category, String lifecycleState, String lastUpdaterUserId) {
+		super(uuid, invariantUUID, name, version, toscaModelURL, category, lifecycleState, lastUpdaterUserId);
+	}
+
+	@Override
+	public String toString() {
+		return "ResourceAssetStructure [subCategory=" + subCategory + ", resourceType=" + resourceType + "]";
+	}
+	
+	public String getLastUpdaterFullName() {
+		return lastUpdaterFullName;
+	}
+
+	public void setLastUpdaterFullName(String lastUpdaterFullName) {
+		this.lastUpdaterFullName = lastUpdaterFullName;
+	}
+
+	public String getToscaResourceName() {
+		return toscaResourceName;
+	}
+
+	public void setToscaResourceName(String toscaResourceName) {
+		this.toscaResourceName = toscaResourceName;
+	}
+
+	public String getSubCategory() {
+		return subCategory;
+	}
+
+	public void setSubCategory(String subCategory) {
+		this.subCategory = subCategory;
+	}
+
+	public String getResourceType() {
+		return resourceType;
+	}
+
+	public void setResourceType(String resourceType) {
+		this.resourceType = resourceType;
+	}
+
+}
diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/ResourceDetailedAssetStructure.java b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/ResourceDetailedAssetStructure.java
new file mode 100644
index 0000000000..b521b4bf08
--- /dev/null
+++ b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/ResourceDetailedAssetStructure.java
@@ -0,0 +1,71 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * SDC
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.sdc.ci.tests.datatypes;
+
+import java.util.List;
+
+public class ResourceDetailedAssetStructure extends ResourceAssetStructure {
+
+	private List<ResourceInstanceAssetStructure> resources;
+	private List<ArtifactAssetStructure> artifacts;
+
+	public ResourceDetailedAssetStructure() {
+		super();
+	}
+
+	public ResourceDetailedAssetStructure(String lastUpdaterFullName, String toscaResourceName,
+			List<ResourceInstanceAssetStructure> resources, List<ArtifactAssetStructure> artifacts) {
+		super();
+		this.lastUpdaterFullName = lastUpdaterFullName;
+		this.toscaResourceName = toscaResourceName;
+		this.resources = resources;
+		this.artifacts = artifacts;
+	}
+
+	public List<ResourceInstanceAssetStructure> getResources() {
+		return resources;
+	}
+
+	public void setResources(List<ResourceInstanceAssetStructure> resources) {
+		this.resources = resources;
+	}
+
+	public List<ArtifactAssetStructure> getArtifacts() {
+		return artifacts;
+	}
+
+	public void setArtifacts(List<ArtifactAssetStructure> artifacts) {
+		this.artifacts = artifacts;
+	}
+
+	@Override
+	public String toString() {
+		return "ResourceDetailedAssetStructure [lastUpdaterFullName=" + lastUpdaterFullName + ", toscaResourceName="
+				+ toscaResourceName + ", resources=" + resources + ", artifacts=" + artifacts + ", toString()="
+				+ super.toString() + ", getSubCategory()=" + getSubCategory() + ", getResourceType()="
+				+ getResourceType() + ", getUuid()=" + getUuid() + ", getInvariantUUID()=" + getInvariantUUID()
+				+ ", getName()=" + getName() + ", getVersion()=" + getVersion() + ", getToscaModelURL()="
+				+ getToscaModelURL() + ", getCategory()=" + getCategory() + ", getLifecycleState()="
+				+ getLifecycleState() + ", getLastUpdaterUserId()=" + getLastUpdaterUserId() + ", getClass()="
+				+ getClass() + ", hashCode()=" + hashCode() + "]";
+	}
+
+}
diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/ResourceExternalReqDetails.java b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/ResourceExternalReqDetails.java
new file mode 100644
index 0000000000..5a968fdcd4
--- /dev/null
+++ b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/ResourceExternalReqDetails.java
@@ -0,0 +1,104 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * SDC
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.sdc.ci.tests.datatypes;
+
+import org.openecomp.sdc.be.datatypes.enums.ResourceTypeEnum;
+
+import java.util.List;
+
+public class ResourceExternalReqDetails extends ComponentReqDetails {
+	String vendorName;
+	String vendorRelease;
+	String category;
+	String subcategory;
+	
+	private String resourceType = ResourceTypeEnum.VFC.toString(); // Default
+																	// value
+	public ResourceExternalReqDetails() {
+		super();
+	}
+	
+	
+	public ResourceExternalReqDetails(String resourceName, String description, List<String> tags,
+			String vendorName, String vendorRelease, String contactId, String icon,
+			String resourceType, String resourceCategory, String resourceSubcategory) {
+		super();
+		this.resourceType = resourceType;
+		this.name = resourceName;
+		this.description = description;
+		this.tags = tags;
+		this.vendorName = vendorName;
+		this.vendorRelease = vendorRelease;
+		this.contactId = contactId;
+		this.icon = icon;
+		this.category = resourceCategory;
+		this.subcategory = resourceSubcategory;
+	}
+
+	public String getVendorName() {
+		return vendorName;
+	}
+
+	public void setVendorName(String vendorName) {
+		this.vendorName = vendorName;
+	}
+
+	public String getVendorRelease() {
+		return vendorRelease;
+	}
+
+	public void setVendorRelease(String vendorRelease) {
+		this.vendorRelease = vendorRelease;
+	}
+	
+	public String getResourceType() {
+		return resourceType;
+	}
+
+	public void setResourceType(String resourceType) {
+		this.resourceType = resourceType;
+	}
+	
+	public String getCategory() {
+		return category;
+	}
+
+	public void setCategory(String category) {
+		this.category = category;
+	}
+
+	public String getSubcategory() {
+		return subcategory;
+	}
+
+	public void setSubcategory(String subcategory) {
+		this.subcategory = subcategory;
+	}
+	
+
+	@Override
+	public String toString() {
+		return "ResourceReqDetails [name=" + name + ", vendorName=" + vendorName
+				+ ", vendorRelease=" + vendorRelease + ", version=" + version
+				+ ", resourceType=" + resourceType + ", category=" + category + ", subcategory=" + subcategory +"]";
+	}
+
+}
diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/ResourceInstanceAssetStructure.java b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/ResourceInstanceAssetStructure.java
new file mode 100644
index 0000000000..6a69120a05
--- /dev/null
+++ b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/ResourceInstanceAssetStructure.java
@@ -0,0 +1,116 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * SDC
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.sdc.ci.tests.datatypes;
+
+import java.util.List;
+
+public class ResourceInstanceAssetStructure {
+
+	String resourceInstanceName;
+	String resourceName;
+	String resourceInvariantUUID;
+	String resourceVersion;
+	String resoucreType;
+	String resourceUUID;
+	List<ArtifactAssetStructure> artifacts;
+
+	public ResourceInstanceAssetStructure() {
+		super();
+	}
+
+	public ResourceInstanceAssetStructure(String resourceInstanceName, String resourceName,
+			String resourceInvariantUUID, String resourceVersion, String resoucreType, String resourceUUID,
+			List<ArtifactAssetStructure> artifacts) {
+		super();
+		this.resourceInstanceName = resourceInstanceName;
+		this.resourceName = resourceName;
+		this.resourceInvariantUUID = resourceInvariantUUID;
+		this.resourceVersion = resourceVersion;
+		this.resoucreType = resoucreType;
+		this.resourceUUID = resourceUUID;
+		this.artifacts = artifacts;
+	}
+
+	public String getResourceInstanceName() {
+		return resourceInstanceName;
+	}
+
+	public void setResourceInstanceName(String resourceInstanceName) {
+		this.resourceInstanceName = resourceInstanceName;
+	}
+
+	public String getResourceName() {
+		return resourceName;
+	}
+
+	public void setResourceName(String resourceName) {
+		this.resourceName = resourceName;
+	}
+
+	public String getResourceInvariantUUID() {
+		return resourceInvariantUUID;
+	}
+
+	public void setResourceInvariantUUID(String resourceInvariantUUID) {
+		this.resourceInvariantUUID = resourceInvariantUUID;
+	}
+
+	public String getResourceVersion() {
+		return resourceVersion;
+	}
+
+	public void setResourceVersion(String resourceVersion) {
+		this.resourceVersion = resourceVersion;
+	}
+
+	public String getResoucreType() {
+		return resoucreType;
+	}
+
+	public void setResoucreType(String resoucreType) {
+		this.resoucreType = resoucreType;
+	}
+
+	public String getResourceUUID() {
+		return resourceUUID;
+	}
+
+	public void setResourceUUID(String resourceUUID) {
+		this.resourceUUID = resourceUUID;
+	}
+
+	public List<ArtifactAssetStructure> getArtifacts() {
+		return artifacts;
+	}
+
+	public void setArtifacts(List<ArtifactAssetStructure> artifacts) {
+		this.artifacts = artifacts;
+	}
+
+	@Override
+	public String toString() {
+		return "ResourceInstanceAssetStructure [resourceInstanceName=" + resourceInstanceName + ", resourceName="
+				+ resourceName + ", resourceInvariantUUID=" + resourceInvariantUUID + ", resourceVersion="
+				+ resourceVersion + ", resoucreType=" + resoucreType + ", resourceUUID=" + resourceUUID + ", artifacts="
+				+ artifacts + "]";
+	}
+
+}
diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/ResourceReqDetails.java b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/ResourceReqDetails.java
new file mode 100644
index 0000000000..cfb7845c63
--- /dev/null
+++ b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/ResourceReqDetails.java
@@ -0,0 +1,245 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * SDC
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.sdc.ci.tests.datatypes;
+
+import org.openecomp.sdc.be.datatypes.enums.ResourceTypeEnum;
+import org.openecomp.sdc.be.model.Resource;
+
+import java.util.List;
+
+public class ResourceReqDetails extends ComponentReqDetails {
+	List<String> derivedFrom;
+	String vendorName;
+	String vendorRelease;
+	String componentType = "RESOURCE";
+
+	public String getComponentType() {
+		return componentType;
+	}
+	// Unsettable/unupdatable fields
+
+	Boolean isAbstract;
+	Boolean isHighestVersion;
+	String cost;
+
+	String licenseType;
+	String toscaResourceName;
+	String resourceVendorModelNumber;
+
+	private String resourceType = ResourceTypeEnum.VFC.toString(); // Default
+																	// value
+
+	public ResourceReqDetails() {
+		super();
+	}
+
+	public ResourceReqDetails(List<String> derivedFrom, String vendorName, String vendorRelease, Boolean isAbstract, Boolean isHighestVersion, String cost, String licenseType, String toscaResourceName, String resourceVendorModelNumber,
+			String resourceType) {
+		super();
+		this.derivedFrom = derivedFrom;
+		this.vendorName = vendorName;
+		this.vendorRelease = vendorRelease;
+		this.isAbstract = isAbstract;
+		this.isHighestVersion = isHighestVersion;
+		this.cost = cost;
+		this.licenseType = licenseType;
+		this.toscaResourceName = toscaResourceName;
+		this.resourceVendorModelNumber = resourceVendorModelNumber;
+		this.resourceType = resourceType;
+	}
+
+	public ResourceReqDetails(Resource resource) {
+		super();
+		this.resourceType = resource.getResourceType().toString();
+		this.name = resource.getName();
+		this.description = resource.getDescription();
+		this.tags = resource.getTags();
+		this.derivedFrom = resource.getDerivedFrom();
+		this.vendorName = resource.getVendorName();
+		this.vendorRelease = resource.getVendorRelease();
+		this.contactId = resource.getContactId();
+		this.icon = resource.getIcon();
+		this.toscaResourceName = resource.getToscaResourceName();
+		this.uniqueId = resource.getUniqueId();
+		this.creatorUserId = resource.getCreatorUserId();
+		this.creatorFullName = resource.getCreatorFullName();
+		this.lastUpdaterUserId = resource.getLastUpdaterUserId();
+		this.lastUpdaterFullName = resource.getLastUpdaterFullName();
+		this.lifecycleState = resource.getLifecycleState();
+		this.version = resource.getVersion();
+		this.UUID = resource.getUUID();
+		this.categories = resource.getCategories();
+		this.importedToscaChecksum = resource.getImportedToscaChecksum();
+		this.resourceVendorModelNumber = resource.getResourceVendorModelNumber();
+
+	}
+
+	public ResourceReqDetails(String resourceName, String description, List<String> tags, String category,
+			List<String> derivedFrom, String vendorName, String vendorRelease, String contactId, String icon) {
+		this(resourceName, description, tags, category, derivedFrom, vendorName, vendorRelease, contactId, icon,
+				ResourceTypeEnum.VFC.toString());
+	}
+
+	public ResourceReqDetails(String resourceName, String description, List<String> tags, String category,
+			List<String> derivedFrom, String vendorName, String vendorRelease, String contactId, String icon,
+			String resourceType) {
+		super();
+		this.resourceType = resourceType;
+		this.name = resourceName;
+		this.description = description;
+		this.tags = tags;
+		this.derivedFrom = derivedFrom;
+		this.vendorName = vendorName;
+		this.vendorRelease = vendorRelease;
+		this.contactId = contactId;
+		this.icon = icon;
+		if (category != null) {
+			String[] arr = category.split("/");
+			if (arr.length == 2) {
+				addCategoryChain(arr[0], arr[1]);
+			}
+		}
+		this.toscaResourceName = resourceName;
+	}
+
+	public ResourceReqDetails(ResourceReqDetails originalResource, String version) {
+		super();
+		this.name = originalResource.getName();
+		this.description = originalResource.getDescription();
+		this.tags = originalResource.getTags();
+		this.derivedFrom = originalResource.getDerivedFrom();
+		this.vendorName = originalResource.getVendorName();
+		this.vendorRelease = originalResource.getVendorRelease();
+		this.contactId = originalResource.getContactId();
+		this.icon = originalResource.getIcon();
+		this.version = version;
+		this.uniqueId = originalResource.getUniqueId();
+		this.categories = originalResource.getCategories();
+		this.toscaResourceName = originalResource.getToscaResourceName();
+		this.resourceType = originalResource.getResourceType();
+	}
+
+	public ResourceReqDetails(String resourceName, List<String> derivedFrom, String vendorName, String vendorRelease,
+			String resourceVersion, Boolean isAbstract, Boolean isHighestVersion, String cost, String licenseType,
+			String resourceType) {
+		super();
+		this.name = resourceName;
+		this.derivedFrom = derivedFrom;
+		this.vendorName = vendorName;
+		this.vendorRelease = vendorRelease;
+		this.version = resourceVersion;
+		this.isAbstract = isAbstract;
+		this.isHighestVersion = isHighestVersion;
+		this.cost = cost;
+		this.licenseType = licenseType;
+		this.resourceType = resourceType;
+		this.toscaResourceName = resourceName;
+	}
+
+	public String getResourceVendorModelNumber() {
+		return resourceVendorModelNumber;
+	}
+	
+	public void setResourceVendorModelNumber(String resourceVendorModelNumber) {
+		this.resourceVendorModelNumber = resourceVendorModelNumber;
+	}
+	public String getToscaResourceName() {
+		return toscaResourceName;
+	}
+
+	public void setToscaResourceName(String toscaResourceName) {
+		this.toscaResourceName = toscaResourceName;
+	}
+
+	public List<String> getDerivedFrom() {
+		return derivedFrom;
+	}
+
+	public void setDerivedFrom(List<String> derivedFrom) {
+		this.derivedFrom = derivedFrom;
+	}
+
+	public String getVendorName() {
+		return vendorName;
+	}
+
+	public void setVendorName(String vendorName) {
+		this.vendorName = vendorName;
+	}
+
+	public String getVendorRelease() {
+		return vendorRelease;
+	}
+
+	public void setVendorRelease(String vendorRelease) {
+		this.vendorRelease = vendorRelease;
+	}
+
+	public String getCost() {
+		return cost;
+	}
+
+	public void setCost(String cost) {
+		this.cost = cost;
+	}
+
+	public String getLicenseType() {
+		return licenseType;
+	}
+
+	public void setLicenseType(String licenseType) {
+		this.licenseType = licenseType;
+	}
+
+	// Unupdatable fields - to check that they are not updated
+	public void setIsAbstract(Boolean isAbstract) {
+		this.isAbstract = isAbstract;
+	}
+
+	public void setIsHighestVersion(Boolean isHighestVersion) {
+		this.isHighestVersion = isHighestVersion;
+	}
+
+	public Boolean getIsAbstract() {
+		return isAbstract;
+	}
+
+	public Boolean getIsHighestVersion() {
+		return isHighestVersion;
+	}
+
+	public String getResourceType() {
+		return resourceType;
+	}
+
+	public void setResourceType(String resourceType) {
+		this.resourceType = resourceType;
+	}
+
+	@Override
+	public String toString() {
+		return "ResourceReqDetails [name=" + name + ", derivedFrom=" + derivedFrom + ", vendorName=" + vendorName
+				+ ", vendorRelease=" + vendorRelease + ", version=" + version + ", isAbstract=" + isAbstract
+				+ ", isHighestVersion=" + isHighestVersion + ", cost=" + cost + ", licenseType=" + licenseType
+				+ ", resourceType=" + resourceType + "]";
+	}
+
+}
diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/ResourceRespJavaObject.java b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/ResourceRespJavaObject.java
new file mode 100644
index 0000000000..78408bd3ed
--- /dev/null
+++ b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/ResourceRespJavaObject.java
@@ -0,0 +1,368 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * SDC
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.sdc.ci.tests.datatypes;
+
+import org.openecomp.sdc.be.model.category.CategoryDefinition;
+
+import java.util.List;
+
+public class ResourceRespJavaObject {
+	String uniqueId;
+	String name;
+	String version;
+	String creatorUserId;
+	String creatorFullName;
+	String lastUpdaterUserId;
+	String lastUpdaterFullName;
+	String description;
+	String icon;
+	List<String> tags;
+	String isHighestVersion;
+	String creationDate;
+	String lastUpdateDate;
+	// String category;
+	String lifecycleState;
+	List<String> derivedFrom;
+	String vendorName;
+	String vendorRelease;
+	String contactId;
+	String abstractt;
+	String highestVersion;
+	List<String> artifacts;
+	List<String> interfaces;
+	String uuid;
+	String cost;
+	String licenseType;
+	String resourceType;
+	List<CategoryDefinition> categories;
+
+	public String getResourceType() {
+		return resourceType;
+	}
+
+	public void setResourceType(String resourceType) {
+		this.resourceType = resourceType;
+	}
+
+	public ResourceRespJavaObject(String uniqueId, String resourceName, String resourceVersion, String creatorUserId,
+			String creatorFullName, String lastUpdaterUserId, String lastUpdaterFullName, String description,
+			String icon, List<String> tags, String isHighestVersion, String creationDate, String lastUpdateDate,
+			String category, String lifecycleState, List<String> derivedFrom, String vendorName, String vendorRelease,
+			String contactId, String abstractt, String highestVersion, List<String> artifacts, List<String> interfaces,
+			String uuid, String cost, String licenseType, String resourceType) {
+		super();
+		this.uniqueId = uniqueId;
+		this.name = resourceName;
+		this.version = resourceVersion;
+		this.creatorUserId = creatorUserId;
+		this.creatorFullName = creatorFullName;
+		this.lastUpdaterUserId = lastUpdaterUserId;
+		this.lastUpdaterFullName = lastUpdaterFullName;
+		this.description = description;
+		this.icon = icon;
+		this.tags = tags;
+		this.isHighestVersion = isHighestVersion;
+		this.creationDate = creationDate;
+		this.lastUpdateDate = lastUpdateDate;
+		// this.category = category;
+		this.lifecycleState = lifecycleState;
+		this.derivedFrom = derivedFrom;
+		this.vendorName = vendorName;
+		this.vendorRelease = vendorRelease;
+		this.contactId = contactId;
+		this.abstractt = abstractt;
+		this.highestVersion = highestVersion;
+		this.artifacts = artifacts;
+		this.interfaces = interfaces;
+		this.uuid = uuid;
+		this.cost = cost;
+		this.licenseType = licenseType;
+		this.resourceType = resourceType;
+	}
+
+	public void setUuid(String uuid) {
+		this.uuid = uuid;
+	}
+
+	public String getCost() {
+		return cost;
+	}
+
+	public void setCost(String cost) {
+		this.cost = cost;
+	}
+
+	public String getLicenseType() {
+		return licenseType;
+	}
+
+	public void setLicenseType(String licenseType) {
+		this.licenseType = licenseType;
+	}
+
+	public String getUuid() {
+		return uuid;
+	}
+
+	public String setUuid() {
+		return uuid;
+	}
+
+	public List<String> getInterfaces() {
+		return interfaces;
+	}
+
+	public void setInterfaces(List<String> interfaces) {
+		this.interfaces = interfaces;
+	}
+
+	public List<String> getArtifacts() {
+		return artifacts;
+	}
+
+	public void setArtifacts(List<String> artifacts) {
+		this.artifacts = artifacts;
+	}
+
+	public ResourceRespJavaObject() {
+		super();
+	}
+
+	// public ResourceRespJavaObject(String uniqueId, String resourceName,
+	// String resourceVersion, String creatorUserId,
+	// String creatorFullName, String lastUpdaterUserId,
+	// String lastUpdaterFullName, String description, String icon,
+	// List<String> tags, String isHighestVersion, String creationDate,
+	// String lastUpdateDate, String category, String lifecycleState,
+	// List<String> derivedFrom, String vendorName, String vendorRelease,
+	// String contactId, String abstractt, String highestVersion) {
+	// super();
+	// this.uniqueId = uniqueId;
+	// this.resourceName = resourceName;
+	// this.resourceVersion = resourceVersion;
+	// this.creatorUserId = creatorUserId;
+	// this.creatorFullName = creatorFullName;
+	// this.lastUpdaterUserId = lastUpdaterUserId;
+	// this.lastUpdaterFullName = lastUpdaterFullName;
+	// this.description = description;
+	// this.icon = icon;
+	// this.tags = tags;
+	// this.isHighestVersion = isHighestVersion;
+	// this.creationDate = creationDate;
+	// this.lastUpdateDate = lastUpdateDate;
+	// this.category = category;
+	// this.lifecycleState = lifecycleState;
+	// this.derivedFrom = derivedFrom;
+	// this.vendorName = vendorName;
+	// this.vendorRelease = vendorRelease;
+	// this.contactId = contactId;
+	// this.abstractt = abstractt;
+	// this.highestVersion = highestVersion;
+	// }
+	public String getUniqueId() {
+		return uniqueId;
+	}
+
+	public void setUniqueId(String uniqueId) {
+		this.uniqueId = uniqueId;
+	}
+
+	public String getName() {
+		return name;
+	}
+
+	public void setName(String resourceName) {
+		this.name = resourceName;
+	}
+
+	public String getVersion() {
+		return version;
+	}
+
+	public void setVersion(String resourceVersion) {
+		this.version = resourceVersion;
+	}
+
+	public String getCreatorUserId() {
+		return creatorUserId;
+	}
+
+	public void setCreatorUserId(String creatorUserId) {
+		this.creatorUserId = creatorUserId;
+	}
+
+	public String getCreatorFullName() {
+		return creatorFullName;
+	}
+
+	public void setCreatorFullName(String creatorFullName) {
+		this.creatorFullName = creatorFullName;
+	}
+
+	public String getLastUpdaterUserId() {
+		return lastUpdaterUserId;
+	}
+
+	public void setLastUpdaterUserId(String lastUpdaterUserId) {
+		this.lastUpdaterUserId = lastUpdaterUserId;
+	}
+
+	public String getLastUpdaterFullName() {
+		return lastUpdaterFullName;
+	}
+
+	public void setLastUpdaterFullName(String lastUpdaterFullName) {
+		this.lastUpdaterFullName = lastUpdaterFullName;
+	}
+
+	public String getDescription() {
+		return description;
+	}
+
+	public void setDescription(String description) {
+		this.description = description;
+	}
+
+	public String getIcon() {
+		return icon;
+	}
+
+	public void setIcon(String icon) {
+		this.icon = icon;
+	}
+
+	public List<String> getTags() {
+		return tags;
+	}
+
+	public void setTags(List<String> tags) {
+		this.tags = tags;
+	}
+
+	public String getIsHighestVersion() {
+		return isHighestVersion;
+	}
+
+	public void setIsHighestVersion(String isHighestVersion) {
+		this.isHighestVersion = isHighestVersion;
+	}
+
+	public String getCreationDate() {
+		return creationDate;
+	}
+
+	public void setCreationDate(String creationDate) {
+		this.creationDate = creationDate;
+	}
+
+	public String getLastUpdateDate() {
+		return lastUpdateDate;
+	}
+
+	public void setLastUpdateDate(String lastUpdateDate) {
+		this.lastUpdateDate = lastUpdateDate;
+	}
+
+	// public String getCategory() {
+	// return category;
+	// }
+	// public void setCategory(String category) {
+	// this.category = category;
+	// }
+	public String getLifecycleState() {
+		return lifecycleState;
+	}
+
+	public void setLifecycleState(String lifecycleState) {
+		this.lifecycleState = lifecycleState;
+	}
+
+	public List<String> getDerivedFrom() {
+		return derivedFrom;
+	}
+
+	public void setDerivedFrom(List<String> derivedFrom) {
+		this.derivedFrom = derivedFrom;
+	}
+
+	public String getVendorName() {
+		return vendorName;
+	}
+
+	public void setVendorName(String vendorName) {
+		this.vendorName = vendorName;
+	}
+
+	public String getVendorRelease() {
+		return vendorRelease;
+	}
+
+	public void setVendorRelease(String vendorRelease) {
+		this.vendorRelease = vendorRelease;
+	}
+
+	public String getContactId() {
+		return contactId;
+	}
+
+	public void setContactId(String contactId) {
+		this.contactId = contactId;
+	}
+
+	public String getAbstractt() {
+		return abstractt;
+	}
+
+	public void setAbstractt(String abstractt) {
+		this.abstractt = abstractt;
+	}
+
+	public String getHighestVersion() {
+		return highestVersion;
+	}
+
+	public void setHighestVersion(String highestVersion) {
+		this.highestVersion = highestVersion;
+	}
+
+	public List<CategoryDefinition> getCategories() {
+		return categories;
+	}
+
+	public void setCategories(List<CategoryDefinition> categories) {
+		this.categories = categories;
+	}
+
+	@Override
+	public String toString() {
+		return "ResourceRespJavaObject [uniqueId=" + uniqueId + ", resourceName=" + name + ", resourceVersion="
+				+ version + ", creatorUserId=" + creatorUserId + ", creatorFullName=" + creatorFullName
+				+ ", lastUpdaterUserId=" + lastUpdaterUserId + ", lastUpdaterFullName=" + lastUpdaterFullName
+				+ ", description=" + description + ", icon=" + icon + ", tags=" + tags + ", isHighestVersion="
+				+ isHighestVersion + ", creationDate=" + creationDate + ", lastUpdateDate=" + lastUpdateDate
+				+ ", lifecycleState=" + lifecycleState + ", derivedFrom=" + derivedFrom + ", vendorName=" + vendorName
+				+ ", vendorRelease=" + vendorRelease + ", contactId=" + contactId + ", abstractt=" + abstractt
+				+ ", highestVersion=" + highestVersion + ", artifacts=" + artifacts + ", interfaces=" + interfaces
+				+ ", uuid=" + uuid + ", cost=" + cost + ", licenseType=" + licenseType + ", resourceType="
+				+ resourceType + "]";
+	}
+
+}
diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/ServiceAssetStructure.java b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/ServiceAssetStructure.java
new file mode 100644
index 0000000000..015d228acf
--- /dev/null
+++ b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/ServiceAssetStructure.java
@@ -0,0 +1,49 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * SDC
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.sdc.ci.tests.datatypes;
+
+public class ServiceAssetStructure extends AssetStructure {
+
+	private String distributionStatus;
+
+	public ServiceAssetStructure() {
+		super();
+	}
+
+	public ServiceAssetStructure(String uuid, String invariantUUID, String name, String version, String toscaModelURL,
+			String category, String lifecycleState, String lastUpdaterUserId) {
+		super(uuid, invariantUUID, name, version, toscaModelURL, category, lifecycleState, lastUpdaterUserId);
+	}
+
+	@Override
+	public String toString() {
+		return "ServiceAssetStructure [distributionStatus=" + distributionStatus + "]";
+	}
+
+	public String getDistributionStatus() {
+		return distributionStatus;
+	}
+
+	public void setDistributionStatus(String distributionStatus) {
+		this.distributionStatus = distributionStatus;
+	}
+
+}
diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/ServiceDetailedAssetStructure.java b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/ServiceDetailedAssetStructure.java
new file mode 100644
index 0000000000..cc283a3169
--- /dev/null
+++ b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/ServiceDetailedAssetStructure.java
@@ -0,0 +1,78 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * SDC
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.sdc.ci.tests.datatypes;
+
+import java.util.List;
+
+public class ServiceDetailedAssetStructure extends ServiceAssetStructure {
+
+	String lastUpdaterFullName;
+	List<ResourceInstanceAssetStructure> resources;
+	List<ArtifactAssetStructure> artifacts;
+
+	public ServiceDetailedAssetStructure() {
+		super();
+	}
+
+	public ServiceDetailedAssetStructure(String uuid, String invariantUUID, String name, String version,
+			String toscaModelURL, String category, String lifecycleState, String lastUpdaterUserId) {
+		super(uuid, invariantUUID, name, version, toscaModelURL, category, lifecycleState, lastUpdaterUserId);
+	}
+
+	public ServiceDetailedAssetStructure(String lastUpdaterFullName, List<ResourceInstanceAssetStructure> resources,
+			List<ArtifactAssetStructure> artifacts) {
+		super();
+		this.lastUpdaterFullName = lastUpdaterFullName;
+		this.resources = resources;
+		this.artifacts = artifacts;
+	}
+
+	public String getLastUpdaterFullName() {
+		return lastUpdaterFullName;
+	}
+
+	public void setLastUpdaterFullName(String lastUpdaterFullName) {
+		this.lastUpdaterFullName = lastUpdaterFullName;
+	}
+
+	public List<ResourceInstanceAssetStructure> getResources() {
+		return resources;
+	}
+
+	public void setResources(List<ResourceInstanceAssetStructure> resources) {
+		this.resources = resources;
+	}
+
+	public List<ArtifactAssetStructure> getArtifacts() {
+		return artifacts;
+	}
+
+	public void setArtifacts(List<ArtifactAssetStructure> artifacts) {
+		this.artifacts = artifacts;
+	}
+
+	@Override
+	public String toString() {
+		return "ServiceDetailedAssetStructure [lastUpdaterFullName=" + lastUpdaterFullName + ", resources=" + resources
+				+ ", artifacts=" + artifacts + "]";
+	}
+
+}
diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/ServiceDistributionStatus.java b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/ServiceDistributionStatus.java
new file mode 100644
index 0000000000..fa80999bb3
--- /dev/null
+++ b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/ServiceDistributionStatus.java
@@ -0,0 +1,79 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * SDC
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.sdc.ci.tests.datatypes;
+
+public class ServiceDistributionStatus {
+	
+	private String distributionID;
+	private String timestamp;
+	private String userId;
+	private String deployementStatus;
+	
+	public ServiceDistributionStatus() {
+		super();
+	}
+
+	public ServiceDistributionStatus(String distributionID, String timestamp, String userId, String deployementStatus) {
+		super();
+		this.distributionID = distributionID;
+		this.timestamp = timestamp;
+		this.userId = userId;
+		this.deployementStatus = deployementStatus;
+	}
+
+	@Override
+	public String toString() {
+		return "ServiceDistributionStatus [distributionID=" + distributionID + ", timestamp=" + timestamp + ", userId=" + userId + ", deployementStatus=" + deployementStatus + "]";
+	}
+
+	public String getDistributionID() {
+		return distributionID;
+	}
+
+	public void setDistributionID(String distributionID) {
+		this.distributionID = distributionID;
+	}
+
+	public String getTimestamp() {
+		return timestamp;
+	}
+
+	public void setTimestamp(String timestamp) {
+		this.timestamp = timestamp;
+	}
+
+	public String getUserId() {
+		return userId;
+	}
+
+	public void setUserId(String userId) {
+		this.userId = userId;
+	}
+
+	public String getDeployementStatus() {
+		return deployementStatus;
+	}
+
+	public void setDeployementStatus(String deployementStatus) {
+		this.deployementStatus = deployementStatus;
+	}
+
+}
diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/ServiceFilterDetails.java b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/ServiceFilterDetails.java
new file mode 100644
index 0000000000..caeae85a15
--- /dev/null
+++ b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/ServiceFilterDetails.java
@@ -0,0 +1,80 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * SDC
+ * ================================================================================
+ * 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=========================================================
+ */
+
+package org.openecomp.sdc.ci.tests.datatypes;
+
+public class ServiceFilterDetails {
+    private String servicePropertyName;
+    private String constraintOperator;
+    private String sourceType;
+    private String sourceName;
+    private Object value;
+
+    public ServiceFilterDetails() {}
+
+    public ServiceFilterDetails(String servicePropertyName, String constraintOperator, String sourceType, String sourceName,
+                        Object value) {
+        this.servicePropertyName = servicePropertyName;
+        this.constraintOperator = constraintOperator;
+        this.sourceType = sourceType;
+        this.sourceName = sourceName;
+        this.value = value;
+    }
+
+    public String getServicePropertyName() {
+        return servicePropertyName;
+    }
+
+    public void setServicePropertyName(String servicePropertyName) {
+        this.servicePropertyName = servicePropertyName;
+    }
+
+    public String getConstraintOperator() {
+        return constraintOperator;
+    }
+
+    public void setConstraintOperator(String constraintOperator) {
+        this.constraintOperator = constraintOperator;
+    }
+
+    public String getSourceType() {
+        return sourceType;
+    }
+
+    public void setSourceType(String sourceType) {
+        this.sourceType = sourceType;
+    }
+
+    public Object getValue() {
+        return value;
+    }
+
+    public void setValue(Object value) {
+        this.value = value;
+    }
+
+    public String getSourceName() {
+        return sourceName;
+    }
+
+    public void setSourceName(String sourceName) {
+        this.sourceName = sourceName;
+    }
+}
diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/ServiceReqDetails.java b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/ServiceReqDetails.java
new file mode 100644
index 0000000000..85e7cf6b29
--- /dev/null
+++ b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/ServiceReqDetails.java
@@ -0,0 +1,145 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * SDC
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.sdc.ci.tests.datatypes;
+
+import org.openecomp.sdc.be.model.Service;
+import org.openecomp.sdc.be.model.category.CategoryDefinition;
+import org.openecomp.sdc.ci.tests.datatypes.enums.ServiceInstantiationType;
+
+import java.util.ArrayList;
+import java.util.Collections;
+
+public class ServiceReqDetails extends ComponentReqDetails {
+	
+	protected String serviceType = "MyServiceType";
+	protected String serviceRole = "MyServiceRole";
+	protected String namingPolicy = "MyServiceNamingPolicy";
+	protected Boolean ecompGeneratedNaming = true;
+	protected String instantiationType = ServiceInstantiationType.A_LA_CARTE.getValue();
+	protected String serviceFunction = "";
+
+	public String getServiceType() {
+		return serviceType;
+	}
+
+	public void setServiceType(String serviceType) {
+		this.serviceType = serviceType;
+	}
+	
+	public String getInstantiationType() {
+		return instantiationType;
+	}
+	
+	public String getServiceRole() {
+		return serviceRole;
+	}
+
+	public void setServiceRole(String serviceRole) {
+		this.serviceRole = serviceRole;
+	}
+
+	public String getNamingPolicy() {
+		return namingPolicy;
+	}
+
+	public void setNamingPolicy(String namingPolicy) {
+		this.namingPolicy = namingPolicy;
+	}
+
+	public Boolean getEcompGeneratedNaming() {
+		return ecompGeneratedNaming;
+	}
+
+	public void setEcompGeneratedNaming(Boolean ecompGeneratedNaming) {
+		this.ecompGeneratedNaming = ecompGeneratedNaming;
+	}
+
+	public String getServiceFunction() {
+		return serviceFunction;
+	}
+
+	public void setServiceFunction(String serviceFunction) {
+		this.serviceFunction = serviceFunction;
+	}
+
+	public ServiceReqDetails(String serviceName, String category, ArrayList<String> tags, String description,
+			String contactId, String icon, String instantiationType) {
+		this.name = serviceName;
+		this.tags = tags;
+		this.description = description;
+		this.contactId = contactId;
+		this.icon = icon;
+		projectCode = "12345";
+		serviceFunction = "serviceFunction name";
+		CategoryDefinition categoryDefinition = new CategoryDefinition();
+		categoryDefinition.setName(category);
+		categoryDefinition.setIcons(Collections.singletonList(icon));
+		categories = new ArrayList<>();
+		categories.add(categoryDefinition);
+
+	}
+
+	public ServiceReqDetails(Service service) {
+		this.contactId = service.getContactId();
+		this.categories = service.getCategories();
+		this.creatorUserId = service.getCreatorUserId();
+		this.creatorFullName = service.getCreatorFullName();
+		this.description = service.getDescription();
+		this.icon = service.getIcon();
+		this.name = service.getName();
+		this.projectCode = service.getProjectCode();
+		this.tags = service.getTags();
+		this.uniqueId = service.getUniqueId();
+		this.UUID = service.getUUID();
+		this.version = service.getVersion();
+
+	}
+
+	public ServiceReqDetails() {
+		contactId = "aa1234";
+		projectCode = "12345";
+	}
+
+	public ServiceReqDetails(ServiceReqDetails a, String newServiceName) {
+		a.setName(newServiceName);
+	}
+
+	@Override
+	public String toString() {
+		return "ServiceDetails [name = " + name + ", category = " + getCategory() + ", tags = " + tags + ", description = "
+				+ description + ", contactId = " + contactId + ", icon = " + icon + ", instantiation type = " + getInstantiationType() + "]";
+	}
+
+	public ServiceReqDetails(ServiceReqDetails aService) {
+		this(aService.getName(), aService.getCategory(), (ArrayList<String>) aService.getTags(),
+				aService.getDescription(), aService.getContactId(), aService.getIcon(), aService.getInstantiationType());
+		uniqueId = aService.getUniqueId();
+		version = aService.getVersion();
+	}
+
+	public String getCategory() {
+		if (categories != null && categories.size() >= 1) {
+			return categories.get(0).getName();
+		}
+		return null;
+	}
+
+}
diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/ServiceRespJavaObject.java b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/ServiceRespJavaObject.java
new file mode 100644
index 0000000000..7bec221ef1
--- /dev/null
+++ b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/ServiceRespJavaObject.java
@@ -0,0 +1,266 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * SDC
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.sdc.ci.tests.datatypes;
+
+import java.util.ArrayList;
+
+public class ServiceRespJavaObject {
+
+	String category;
+	String creatorUserId;
+	String creatorFullName;
+	String lastUpdaterUserId;
+	String lastUpdaterFullName;
+	String serviceName;
+	String version;
+	String creationDate;
+	String icon;
+	String name;
+	String description;
+	ArrayList<String> tags;
+	String uniqueId;
+	String lastUpdateDate;
+	String contactId;
+	String vendorName;
+	String vendorRelease;
+	String lifecycleState;
+	String highestVersion;
+	ArrayList<String> artifacts;
+	ArrayList<String> ResourceInstances;
+	ArrayList<String> ResourceInstancesRelations;
+
+	public ServiceRespJavaObject() {
+		super();
+	}
+
+	public ServiceRespJavaObject(String category, String creatorUserId, String creatorFullName,
+			String lastUpdaterUserId, String lastUpdaterFullName, String serviceName, String version,
+			String creationDate, String icon, String name, String description, ArrayList<String> tags, String uniqueId,
+			String lastUpdateDate, String contactId, String vendorName, String vendorRelease, String lifecycleState,
+			String highestVersion, ArrayList<String> artifacts, ArrayList<String> resourceInstances,
+			ArrayList<String> resourceInstancesRelations) {
+		super();
+		this.category = category;
+		this.creatorUserId = creatorUserId;
+		this.creatorFullName = creatorFullName;
+		this.lastUpdaterUserId = lastUpdaterUserId;
+		this.lastUpdaterFullName = lastUpdaterFullName;
+		this.serviceName = serviceName;
+		this.version = version;
+		this.creationDate = creationDate;
+		this.icon = icon;
+		this.name = name;
+		this.description = description;
+		this.tags = tags;
+		this.uniqueId = uniqueId;
+		this.lastUpdateDate = lastUpdateDate;
+		this.contactId = contactId;
+		this.vendorName = vendorName;
+		this.vendorRelease = vendorRelease;
+		this.lifecycleState = lifecycleState;
+		this.highestVersion = highestVersion;
+		this.artifacts = artifacts;
+		ResourceInstances = resourceInstances;
+		ResourceInstancesRelations = resourceInstancesRelations;
+	}
+
+	public String getCategory() {
+		return category;
+	}
+
+	public void setCategory(String category) {
+		this.category = category;
+	}
+
+	public String getCreatorUserId() {
+		return creatorUserId;
+	}
+
+	public void setCreatorUserId(String creatorUserId) {
+		this.creatorUserId = creatorUserId;
+	}
+
+	public String getCreatorFullName() {
+		return creatorFullName;
+	}
+
+	public void setCreatorFullName(String creatorFullName) {
+		this.creatorFullName = creatorFullName;
+	}
+
+	public String getLastUpdaterUserId() {
+		return lastUpdaterUserId;
+	}
+
+	public void setLastUpdaterUserId(String lastUpdaterUserId) {
+		this.lastUpdaterUserId = lastUpdaterUserId;
+	}
+
+	public String getLastUpdaterFullName() {
+		return lastUpdaterFullName;
+	}
+
+	public void setLastUpdaterFullName(String lastUpdaterFullName) {
+		this.lastUpdaterFullName = lastUpdaterFullName;
+	}
+
+	public String getVersion() {
+		return version;
+	}
+
+	public void setVersion(String version) {
+		this.version = version;
+	}
+
+	public String getCreationDate() {
+		return creationDate;
+	}
+
+	public void setCreationDate(String creationDate) {
+		this.creationDate = creationDate;
+	}
+
+	public String getIcon() {
+		return icon;
+	}
+
+	public void setIcon(String icon) {
+		this.icon = icon;
+	}
+
+	public String getName() {
+		return name;
+	}
+
+	public void setName(String name) {
+		this.name = name;
+	}
+
+	public String getDescription() {
+		return description;
+	}
+
+	public void setDescription(String description) {
+		this.description = description;
+	}
+
+	public ArrayList<String> getTags() {
+		return tags;
+	}
+
+	public void setTags(ArrayList<String> tags) {
+		this.tags = tags;
+	}
+
+	public String getUniqueId() {
+		return uniqueId;
+	}
+
+	public void setUniqueId(String uniqueId) {
+		this.uniqueId = uniqueId;
+	}
+
+	public String getLastUpdateDate() {
+		return lastUpdateDate;
+	}
+
+	public void setLastUpdateDate(String lastUpdateDate) {
+		this.lastUpdateDate = lastUpdateDate;
+	}
+
+	public String getContactId() {
+		return contactId;
+	}
+
+	public void setContactId(String contactId) {
+		this.contactId = contactId;
+	}
+
+	public String getVendorName() {
+		return vendorName;
+	}
+
+	public void setVendorName(String vendorName) {
+		this.vendorName = vendorName;
+	}
+
+	public String getVendorRelease() {
+		return vendorRelease;
+	}
+
+	public void setVendorRelease(String vendorRelease) {
+		this.vendorRelease = vendorRelease;
+	}
+
+	public String getLifecycleState() {
+		return lifecycleState;
+	}
+
+	public void setLifecycleState(String lifecycleState) {
+		this.lifecycleState = lifecycleState;
+	}
+
+	public String getHighestVersion() {
+		return highestVersion;
+	}
+
+	public void setHighestVersion(String highest) {
+		this.highestVersion = highest;
+	}
+
+	public ArrayList<String> getArtifacts() {
+		return artifacts;
+	}
+
+	public void setArtifacts(ArrayList<String> artifacts) {
+		this.artifacts = artifacts;
+	}
+
+	public ArrayList<String> getResourceInstances() {
+		return ResourceInstances;
+	}
+
+	public void setResourceInstances(ArrayList<String> resourceInstances) {
+		ResourceInstances = resourceInstances;
+	}
+
+	public ArrayList<String> getResourceInstancesRelations() {
+		return ResourceInstancesRelations;
+	}
+
+	public void setResourceInstancesRelations(ArrayList<String> resourceInstancesRelations) {
+		ResourceInstancesRelations = resourceInstancesRelations;
+	}
+
+	@Override
+	public String toString() {
+		return "ServiceRespJavaObject [category=" + category + ", creatorUserId=" + creatorUserId + ", creatorFullName="
+				+ creatorFullName + ", lastUpdaterUserId=" + lastUpdaterUserId + ", lastUpdaterFullName="
+				+ lastUpdaterFullName + ", serviceName=" + serviceName + ", version=" + version + ", creationDate="
+				+ creationDate + ", icon=" + icon + ", name=" + name + ", description=" + description + ", tags=" + tags
+				+ ", uniqueId=" + uniqueId + ", lastUpdateDate=" + lastUpdateDate + ", contactId=" + contactId
+				+ ", vendorName=" + vendorName + ", vendorRelease=" + vendorRelease + ", lifecycleState="
+				+ lifecycleState + ", lifecycleState=" + lifecycleState + ", artifacts=" + artifacts
+				+ ", ResourceInstances=" + ResourceInstances + ", ResourceInstancesRelations="
+				+ ResourceInstancesRelations + "]";
+	}
+
+}
diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/TypeHeatMetaDefinition.java b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/TypeHeatMetaDefinition.java
new file mode 100644
index 0000000000..d0f029242f
--- /dev/null
+++ b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/TypeHeatMetaDefinition.java
@@ -0,0 +1,57 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * SDC
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.sdc.ci.tests.datatypes;
+
+import java.util.List;
+
+public class TypeHeatMetaDefinition {
+
+	String typeName;
+
+	List<GroupHeatMetaDefinition> groupHeatMetaDefinition;
+
+	public TypeHeatMetaDefinition() {
+		super();
+	}
+
+	public String getTypeName() {
+		return typeName;
+	}
+
+	public void setTypeName(String typeName) {
+		this.typeName = typeName;
+	}
+
+	public List<GroupHeatMetaDefinition> getGroupHeatMetaDefinition() {
+		return groupHeatMetaDefinition;
+	}
+
+	public void setGroupHeatMetaDefinition(List<GroupHeatMetaDefinition> groupHeatMetaDefinition) {
+		this.groupHeatMetaDefinition = groupHeatMetaDefinition;
+	}
+
+	@Override
+	public String toString() {
+		return "TypeHeatMetaDefinition [typeName=" + typeName + ", groupHeatMetaDefinition=" + groupHeatMetaDefinition
+				+ "]";
+	}
+
+}
diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/UserCredentials.java b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/UserCredentials.java
new file mode 100644
index 0000000000..2de872504f
--- /dev/null
+++ b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/UserCredentials.java
@@ -0,0 +1,58 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * SDC
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.sdc.ci.tests.datatypes;
+
+import org.openecomp.sdc.be.model.User;
+
+public class UserCredentials extends User {
+
+	// private String userName;
+	private String password;
+
+	public UserCredentials(String userId, String password, String firstname, String lastname, String role) {
+		super();
+		setUserId(userId);
+		// this.userName = userName;
+		this.password = password;
+		setFirstName(firstname);
+		setLastName(lastname);
+		setRole(role);
+	}
+
+	public UserCredentials() {
+		super();
+	}
+
+	// public String getUserName() {
+	// return userName;
+	// }
+	// public void setUserName(String userName) {
+	// this.userName = userName;
+	// }
+	public String getPassword() {
+		return password;
+	}
+
+	public void setPassword(String password) {
+		this.password = password;
+	}
+
+}
diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/VendorLicenseModel.java b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/VendorLicenseModel.java
new file mode 100644
index 0000000000..4ed0e83179
--- /dev/null
+++ b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/VendorLicenseModel.java
@@ -0,0 +1,58 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * SDC
+ * ================================================================================
+ * 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=========================================================
+ */
+
+package org.openecomp.sdc.ci.tests.datatypes;
+
+import lombok.Getter;
+import lombok.Setter;
+import lombok.ToString;
+
+@ToString
+@Getter
+public class VendorLicenseModel {
+
+	private final String vendorId;
+	private final String vendorLicenseName;
+	private final String vendorLicenseAgreementId;
+	private final String featureGroupId;
+	private String licenseVersionId;
+	private String licenseVersionLabel;
+	@Setter
+	private String version;
+
+	public VendorLicenseModel(final String vendorId, final String vendorLicenseName,
+							  final String vendorLicenseAgreementId, final String featureGroupId,
+							  final String licenseVersionId, final String licenseVersionLabel) {
+		this.vendorId = vendorId;
+		this.vendorLicenseName = vendorLicenseName;
+		this.vendorLicenseAgreementId = vendorLicenseAgreementId;
+		this.featureGroupId = featureGroupId;
+		this.licenseVersionId = licenseVersionId;
+		this.licenseVersionLabel = licenseVersionLabel;
+	}
+
+	public VendorLicenseModel(String vendorId, String vendorLicenseName, String vendorLicenseAgreementId, String featureGroupId) {
+		this.vendorId = vendorId;
+		this.vendorLicenseName = vendorLicenseName;
+		this.vendorLicenseAgreementId = vendorLicenseAgreementId;
+		this.featureGroupId = featureGroupId;
+	}
+
+}
diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/VendorSoftwareProductObject.java b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/VendorSoftwareProductObject.java
new file mode 100644
index 0000000000..96308b3e54
--- /dev/null
+++ b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/VendorSoftwareProductObject.java
@@ -0,0 +1,88 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * SDC
+ * ================================================================================
+ * 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=========================================================
+ */
+
+package org.openecomp.sdc.ci.tests.datatypes;
+
+public class VendorSoftwareProductObject extends VendorSoftwareProductObjectReqDetails {
+
+	private String vspId;
+	private String componentId;
+	private String attContact;
+	private String version;
+
+	public VendorSoftwareProductObject(){super();}
+
+	public VendorSoftwareProductObject(String vspId, String componentId, String attContact, String version) {
+		this.vspId = vspId;
+		this.componentId = componentId;
+		this.attContact = attContact;
+		this.version = version;
+	}
+
+	public VendorSoftwareProductObject(String name, String description, String category, String subCategory, String vendorId, String vendorName, String licensingVersion, LicensingData licensingData, String onboardingMethod, String networkPackageName, String onboardingOrigin, String icon, String vspId, String componentId, String attContact, String version) {
+		super(name, description, category, subCategory, vendorId, vendorName, licensingVersion, licensingData, onboardingMethod, networkPackageName, onboardingOrigin, icon);
+		this.vspId = vspId;
+		this.componentId = componentId;
+		this.attContact = attContact;
+		this.version = version;
+	}
+
+	public String getVspId() {
+		return vspId;
+	}
+
+	public void setVspId(String vspId) {
+		this.vspId = vspId;
+	}
+
+	public String getComponentId() {
+		return componentId;
+	}
+
+	public void setComponentId(String componentId) {
+		this.componentId = componentId;
+	}
+
+	public String getAttContact() {
+		return attContact;
+	}
+
+	public void setAttContact(String attContact) {
+		this.attContact = attContact;
+	}
+
+	public String getVersion() {
+		return version;
+	}
+
+	public void setVersion(String version) {
+		this.version = version;
+	}
+
+	@Override
+	public String toString() {
+		return "VendorSoftwareProductObject{" +
+				"vspId='" + vspId + '\'' +
+				", componentId='" + componentId + '\'' +
+				", attContact='" + attContact + '\'' +
+				", version='" + version + '\'' +
+				'}';
+	}
+}
diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/VendorSoftwareProductObjectReqDetails.java b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/VendorSoftwareProductObjectReqDetails.java
new file mode 100644
index 0000000000..d69f14ff4f
--- /dev/null
+++ b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/VendorSoftwareProductObjectReqDetails.java
@@ -0,0 +1,178 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * SDC
+ * ================================================================================
+ * 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=========================================================
+ */
+
+package org.openecomp.sdc.ci.tests.datatypes;
+
+public class VendorSoftwareProductObjectReqDetails {
+
+    private String name;
+    private String description;
+    private String category;
+    private String subCategory;
+    private String vendorId;
+    private String vendorName;
+//    private LicensingVersion licensingVersion;
+    private String licensingVersion;
+    private LicensingData licensingData;
+    private String onboardingMethod;
+    private String networkPackageName;
+    private String onboardingOrigin;
+    private String icon;
+
+
+    public String getIcon() {
+        return icon;
+    }
+
+    public void setIcon(String icon) {
+        this.icon = icon;
+    }
+
+    public VendorSoftwareProductObjectReqDetails() {
+    }
+
+    public VendorSoftwareProductObjectReqDetails(String name, String description, String category, String subCategory, String vendorId, String vendorName, String licensingVersion, LicensingData licensingData, String onboardingMethod, String networkPackageName, String onboardingOrigin, String icon) {
+        this.name = name;
+        this.description = description;
+        this.category = category;
+        this.subCategory = subCategory;
+        this.vendorId = vendorId;
+        this.vendorName = vendorName;
+        this.licensingVersion = licensingVersion;
+        this.licensingData = licensingData;
+        this.onboardingMethod = onboardingMethod;
+        this.networkPackageName = networkPackageName;
+        this.onboardingOrigin = onboardingOrigin;
+        this.icon = icon;
+    }
+
+    public String getLicensingVersion() {
+        return licensingVersion;
+    }
+
+    public void setLicensingVersion(String licensingVersion) {
+        this.licensingVersion = licensingVersion;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getDescription() {
+        return description;
+    }
+
+    public void setDescription(String description) {
+        this.description = description;
+    }
+
+    public String getCategory() {
+        return category;
+    }
+
+    public void setCategory(String category) {
+        this.category = category;
+    }
+
+    public String getSubCategory() {
+        return subCategory;
+    }
+
+    public void setSubCategory(String subCategory) {
+        this.subCategory = subCategory;
+    }
+
+    public String getVendorId() {
+        return vendorId;
+    }
+
+    public void setVendorId(String vendorId) {
+        this.vendorId = vendorId;
+    }
+
+    public String getVendorName() {
+        return vendorName;
+    }
+
+    public void setVendorName(String vendorName) {
+        this.vendorName = vendorName;
+    }
+
+//    public LicensingVersion getLicensingVersion() {
+//        return licensingVersion;
+//    }
+//
+//    public void setLicensingVersion(LicensingVersion licensingVersion) {
+//        this.licensingVersion = licensingVersion;
+//    }
+
+    public LicensingData getLicensingData() {
+        return licensingData;
+    }
+
+    public void setLicensingData(LicensingData licensingData) {
+        this.licensingData = licensingData;
+    }
+
+    public String getOnboardingMethod() {
+        return onboardingMethod;
+    }
+
+    public void setOnboardingMethod(String onboardingMethod) {
+        this.onboardingMethod = onboardingMethod;
+    }
+
+    public String getNetworkPackageName() {
+        return networkPackageName;
+    }
+
+    public void setNetworkPackageName(String networkPackageName) {
+        this.networkPackageName = networkPackageName;
+    }
+
+    public String getOnboardingOrigin() {
+        return onboardingOrigin;
+    }
+
+    public void setOnboardingOrigin(String onboardingOrigin) {
+        this.onboardingOrigin = onboardingOrigin;
+    }
+
+    @Override
+    public String toString() {
+        return "VendorSoftwareProductObjectReqDetails{" +
+                "name='" + name + '\'' +
+                ", description='" + description + '\'' +
+                ", category='" + category + '\'' +
+                ", subCategory='" + subCategory + '\'' +
+                ", vendorId='" + vendorId + '\'' +
+                ", vendorName='" + vendorName + '\'' +
+                ", licensingVersion=" + licensingVersion +
+                ", licensingData=" + licensingData +
+                ", onboardingMethod='" + onboardingMethod + '\'' +
+                ", networkPackageName='" + networkPackageName + '\'' +
+                ", onboardingOrigin='" + onboardingOrigin + '\'' +
+                '}';
+    }
+}
diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/enums/ArtifactTypeEnum.java b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/enums/ArtifactTypeEnum.java
new file mode 100644
index 0000000000..17be9334fa
--- /dev/null
+++ b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/enums/ArtifactTypeEnum.java
@@ -0,0 +1,57 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * SDC
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.sdc.ci.tests.datatypes.enums;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+/**
+ * Enum That Represents possible Artifacts Types.
+ *
+ */
+@Getter
+@AllArgsConstructor
+public enum ArtifactTypeEnum {
+	CHEF("CHEF"), PUPPET("PUPPET"), YANG("YANG"), SHELL_SCRIPT("SHELL_SCRIPT"), ICON("ICON"), UNKNOWN("UNKNOWN"), HEAT("HEAT"), DG_XML("DG_XML"), MURANO_PKG("MURANO_PKG"), 
+	HEAT_ENV("HEAT_ENV"), YANG_XML("YANG_XML"), HEAT_VOL("HEAT_VOL"), HEAT_NET("HEAT_NET"), OTHER("OTHER"), WORKFLOW("WORKFLOW"), NETWORK_CALL_FLOW("NETWORK_CALL_FLOW"), 
+	TOSCA_TEMPLATE("TOSCA_TEMPLATE"), TOSCA_CSAR("TOSCA_CSAR"), VNF_CATALOG("VNF_CATALOG"), VF_LICENSE("VF_LICENSE"), VENDOR_LICENSE("VENDOR_LICENSE"), 
+	MODEL_INVENTORY_PROFILE("MODEL_INVENTORY_PROFILE"), MODEL_QUERY_SPEC("MODEL_QUERY_SPEC"), APPC_CONFIG("APPC_CONFIG"), HEAT_NESTED("HEAT_NESTED"), 
+	HEAT_ARTIFACT("HEAT_ARTIFACT"), VF_MODULES_METADATA("VF_MODULES_METADATA"), PNF_SW_INFORMATION("PNF_SW_INFORMATION"),
+	// DCAE Artifacts
+	DCAE_TOSCA("DCAE_TOSCA"), DCAE_JSON("DCAE_JSON"), DCAE_POLICY("DCAE_POLICY"), DCAE_DOC("DCAE_DOC"), DCAE_EVENT("DCAE_EVENT"), DCAE_INVENTORY_TOSCA("DCAE_INVENTORY_TOSCA"), 
+	DCAE_INVENTORY_JSON("DCAE_INVENTORY_JSON"), DCAE_INVENTORY_POLICY("DCAE_INVENTORY_POLICY"), DCAE_INVENTORY_DOC("DCAE_INVENTORY_DOC"), 
+	DCAE_INVENTORY_BLUEPRINT("DCAE_INVENTORY_BLUEPRINT"), DCAE_INVENTORY_EVENT("DCAE_INVENTORY_EVENT"),
+	// AAI Artifacts
+	AAI_SERVICE_MODEL("AAI_SERVICE_MODEL"), AAI_VF_MODEL("AAI_VF_MODEL"), AAI_VF_MODULE_MODEL("AAI_VF_MODULE_MODEL"), AAI_VF_INSTANCE_MODEL("AAI_VF_INSTANCE_MODEL"),
+	// MIB artifacts
+	SNMP_POLL ("SNMP_POLL"), SNMP_TRAP("SNMP_TRAP"), GUIDE("GUIDE");
+
+	private final String type;
+
+	public static ArtifactTypeEnum findType(final String type) {
+		for (final ArtifactTypeEnum ate : ArtifactTypeEnum.values()) {
+			if (ate.getType().equalsIgnoreCase(type)) {
+				return ate;
+			}
+		}
+		return null;
+	}
+}
diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/enums/AssocType.java b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/enums/AssocType.java
new file mode 100644
index 0000000000..82e9a36780
--- /dev/null
+++ b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/enums/AssocType.java
@@ -0,0 +1,39 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * SDC
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.sdc.ci.tests.datatypes.enums;
+
+public enum AssocType {
+
+	BINDABLE("tosca.capabilities.network.Bindable"), HOSTEDON("tosca.relationships.HostedOn"), LINKABLE("tosca.capabilities.network.Linkable"), 
+	CONTAINER("tosca.capabilities.Container"), NODE("tosca.capabilities.Node");
+
+	private String assocType;
+
+	private AssocType(String assocType) {
+		this.assocType = assocType;
+
+	}
+
+	public String getAssocType() {
+		return assocType;
+	}
+
+}
diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/enums/AuditEnum.java b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/enums/AuditEnum.java
new file mode 100644
index 0000000000..a713d5089f
--- /dev/null
+++ b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/enums/AuditEnum.java
@@ -0,0 +1,39 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * SDC
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.sdc.ci.tests.datatypes.enums;
+
+public enum AuditEnum {
+
+	ACTION("ACTION"), RESOURCE_NAME("RESOURCE_NAME"), RESOURCE_TYPE("RESOURCE_TYPE"), PREV_VERSION("PREV_VERSION"), CURR_VERSION("CURR_VERSION"), MODIFIER("MODIFIER"), PREV_STATE("PREV_STATE"), 
+	CURR_STATE("CURR_STATE"), STATUS("STATUS-Type"), DESC("DESC"), URL("URL"), USER("USER"), AUTH_STATUS("AUTH_STATUS"), REALM("REALM");
+
+	String value;
+
+	private AuditEnum(String value) {
+		this.value = value;
+	}
+
+	public String getValue() {
+
+		return value.toLowerCase();
+	}
+
+}
diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/enums/AuditJsonKeysEnum.java b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/enums/AuditJsonKeysEnum.java
new file mode 100644
index 0000000000..308ea5c990
--- /dev/null
+++ b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/enums/AuditJsonKeysEnum.java
@@ -0,0 +1,40 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * SDC
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.sdc.ci.tests.datatypes.enums;
+
+public enum AuditJsonKeysEnum {
+
+	ACTION("ACTION"), RESOURCE_NAME("RESOURCE_NAME"), RESOURCE_TYPE("RESOURCE_TYPE"), PREV_VERSION("PREV_VERSION"), CURR_VERSION("CURR_VERSION"), PREV_STATE("PREV_STATE"), CURR_STATE("CURR_STATE"), 
+	DPREV_STATUS("DPREV_STATUS"), DCURR_STATUS("DCURR_STATUS"), STATUS("STATUS"), DESCRIPTION("DESCRIPTION"), ARTIFACT_DATA("ARTIFACT_DATA"), CONSUMER_ID("CONSUMER_ID"), RESOURCE_URL("RESOURCE_URL"), 
+	COMMENT("COMMENT"), DID("DID"), TOPIC_NAME("TOPIC_NAME"), TOSCA_NODE_TYPE("TOSCA_NODE_TYPE"), CURR_ARTIFACT_UUID("CURR_ARTIFACT_UUID"), PREV_ARTIFACT_UUID("PREV_ARTIFACT_UUID"), DETAILS("DETAILS"), 
+	MODIFIER("MODIFIER"), SERVICE_INSTANCE_ID("SERVICE_INSTANCE_ID"), INVARIANT_UUID("INVARIANT_UUID");
+
+	private String auditJsonKeyName;
+
+	private AuditJsonKeysEnum(String auditJsonKeyName) {
+		this.auditJsonKeyName = auditJsonKeyName;
+	}
+
+	public String getAuditJsonKeyName() {
+		return auditJsonKeyName.toLowerCase();
+	}
+
+}
diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/enums/CircleSize.java b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/enums/CircleSize.java
new file mode 100644
index 0000000000..82142db220
--- /dev/null
+++ b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/enums/CircleSize.java
@@ -0,0 +1,27 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * SDC
+ * ================================================================================
+ * 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=========================================================
+ */
+
+package org.openecomp.sdc.ci.tests.datatypes.enums;
+
+public enum CircleSize {
+    VF(),
+    SERVICE(),
+    NORMATIVE();
+}
diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/enums/ComponentType.java b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/enums/ComponentType.java
new file mode 100644
index 0000000000..3d242e8c52
--- /dev/null
+++ b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/enums/ComponentType.java
@@ -0,0 +1,37 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * SDC
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.sdc.ci.tests.datatypes.enums;
+
+public enum ComponentType {
+
+	RESOURCE("Resource"), SERVICE("Service"), ARTIFACT("Artifact");
+
+	String value;
+
+	private ComponentType(String value) {
+		this.value = value;
+	}
+
+	public String getValue() {
+
+		return value;
+	}
+}
diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/enums/CvfcTypeEnum.java b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/enums/CvfcTypeEnum.java
new file mode 100644
index 0000000000..0e623aa8cd
--- /dev/null
+++ b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/enums/CvfcTypeEnum.java
@@ -0,0 +1,39 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * SDC
+ * ================================================================================
+ * 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=========================================================
+ */
+
+package org.openecomp.sdc.ci.tests.datatypes.enums;
+
+public enum CvfcTypeEnum {
+
+		SNMP_POLL ("SNMP_POLL"),
+		SNMP_TRAP ("SNMP_TRAP"),
+		VES_EVENTS ("VES_EVENTS");
+		
+		private String value;
+	
+		public String getValue() {
+			return value;
+		}
+	
+		private CvfcTypeEnum(String value) {
+			this.value = value;
+	}
+		
+}
diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/enums/DistributionNotificationStatusEnum.java b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/enums/DistributionNotificationStatusEnum.java
new file mode 100644
index 0000000000..7042a954e7
--- /dev/null
+++ b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/enums/DistributionNotificationStatusEnum.java
@@ -0,0 +1,52 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * SDC
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.sdc.ci.tests.datatypes.enums;
+
+public enum DistributionNotificationStatusEnum {
+
+	
+	DEPLOY_OK("DEPLOY_OK"), 
+	DOWNLOAD_OK("DOWNLOAD_OK"),
+	NOTIFIED("NOTIFIED"),
+	NOT_NOTIFIED("NOT_NOTIFIED");
+
+	private String value;
+
+	private DistributionNotificationStatusEnum(String value) {
+		this.value = value;
+	}
+
+	public String getValue() {
+		return value;
+	}
+
+	public static DistributionNotificationStatusEnum findState(String state) {
+
+		for (DistributionNotificationStatusEnum distributionStatus : DistributionNotificationStatusEnum.values()) {
+			if (distributionStatus.name().equalsIgnoreCase(state)
+					|| distributionStatus.getValue().equalsIgnoreCase(state)) {
+				return distributionStatus;
+			}
+		}
+		return null;
+	}
+	
+}
diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/enums/ErrorInfo.java b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/enums/ErrorInfo.java
new file mode 100644
index 0000000000..2d5075e6c7
--- /dev/null
+++ b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/enums/ErrorInfo.java
@@ -0,0 +1,92 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * SDC
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.sdc.ci.tests.datatypes.enums;
+
+public class ErrorInfo {
+
+	private Integer code;
+	private String message;
+	private String messageId;
+
+	public ErrorInfo() {
+		super();
+	}
+
+	public ErrorInfo(Integer code, String message, String messageId) {
+		super();
+		this.code = code;
+		this.message = message;
+		this.messageId = messageId;
+	}
+
+	public ErrorInfo(Integer code, String message) {
+		super();
+		this.code = code;
+		this.message = message;
+	}
+
+	public Integer getCode() {
+		return code;
+	}
+
+	public void setCode(Integer code) {
+		this.code = code;
+	}
+
+	public String getMessage() {
+		return message;
+	}
+
+	public String getMessageAndReplaceVariables(Object... variables) {
+		String formatReadyString = message.replaceAll("%[\\d]+", "%s");
+		formatReadyString = String.format(formatReadyString, variables);
+		return formatReadyString;
+	}
+
+	public String getAuditDesc(Object... variables) {
+		String messageAndReplaceVariables = getMessageAndReplaceVariables(variables);
+		String res;
+		if (messageId != null) {
+			res = messageId + ": " + messageAndReplaceVariables;
+		} else {
+			res = messageAndReplaceVariables;
+		}
+		return res;
+	}
+
+	public void setMessage(String message) {
+		this.message = message;
+	}
+
+	public String getMessageId() {
+		return messageId;
+	}
+
+	public void setMessageId(String messageId) {
+		this.messageId = messageId;
+	}
+
+	@Override
+	public String toString() {
+		return "ErrorInfo [code=" + code + ", message=" + message + ", messageId=" + messageId + "]";
+	}
+
+}
diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/enums/EsIndexTypeIdToDelete.java b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/enums/EsIndexTypeIdToDelete.java
new file mode 100644
index 0000000000..6bfbd8af7d
--- /dev/null
+++ b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/enums/EsIndexTypeIdToDelete.java
@@ -0,0 +1,64 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * SDC
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.sdc.ci.tests.datatypes.enums;
+
+public class EsIndexTypeIdToDelete {
+
+	String index;
+	String type;
+	String id;
+
+	public EsIndexTypeIdToDelete() {
+		super();
+	}
+
+	public EsIndexTypeIdToDelete(String index, String type, String id) {
+		super();
+		this.index = index;
+		this.type = type;
+		this.id = id;
+	}
+
+	public String getIndex() {
+		return index;
+	}
+
+	public void setIndex(String index) {
+		this.index = index;
+	}
+
+	public String getType() {
+		return type;
+	}
+
+	public void setType(String type) {
+		this.type = type;
+	}
+
+	public String getId() {
+		return id;
+	}
+
+	public void setId(String id) {
+		this.id = id;
+	}
+
+}
diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/enums/ExceptionEnumType.java b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/enums/ExceptionEnumType.java
new file mode 100644
index 0000000000..59d1dec453
--- /dev/null
+++ b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/enums/ExceptionEnumType.java
@@ -0,0 +1,36 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * SDC
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.sdc.ci.tests.datatypes.enums;
+
+public enum ExceptionEnumType {
+
+	SERVICE_EXCEPTION("serviceException"), POLICY_EXCPTION("policyException");
+
+	String value;
+
+	private ExceptionEnumType(String value) {
+		this.value = value;
+	}
+
+	public String getValue() {
+		return value;
+	}
+}
diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/enums/GroupPropertyEnum.java b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/enums/GroupPropertyEnum.java
new file mode 100644
index 0000000000..24538b7414
--- /dev/null
+++ b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/enums/GroupPropertyEnum.java
@@ -0,0 +1,66 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * SDC
+ * ================================================================================
+ * 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=========================================================
+ */
+
+package org.openecomp.sdc.ci.tests.datatypes.enums;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public enum GroupPropertyEnum {
+
+    IS_BASE("isBase"),
+    MIN_VF_MODULE_INSTANCES("min_vf_module_instances"),
+    MAX_VF_MODULE_INSTANCES("max_vf_module_instances"),
+    VF_MODULE_LABEL("vf_module_label"),
+    VFC_LIST("vfc_list"),
+    VF_MODULE_TYPE("vf_module_type"),
+    VF_MODULE_DESCRIPTION("vf_module_description"),
+    INITIAL_COUNT("initial_count"),
+    VOLUME_GROUP("volume_group"),
+    AVAILABILITY_ZONE_COUNT("availability_zone_count");
+
+    private String propertyName;
+
+    GroupPropertyEnum(String propertyName) {
+        this.propertyName = propertyName;
+    }
+
+    public String getPropertyName() {
+        return propertyName;
+    }
+
+    public static List<String> getGroupPropertyNamesWithoutIsbase(){
+        List<String> groupPropertyNames = new ArrayList<>();
+
+        for(GroupPropertyEnum groupProperty : GroupPropertyEnum.values()) {
+            if (!groupProperty.getPropertyName().equals(GroupPropertyEnum.IS_BASE)){
+                groupPropertyNames.add(groupProperty.getPropertyName());
+            }
+        }
+        return groupPropertyNames;
+    }
+
+    public static List<String> getGroupPropertyNames(){
+        List<String> groupPropertyNames = GroupPropertyEnum.getGroupPropertyNamesWithoutIsbase();
+        groupPropertyNames.add(GroupPropertyEnum.IS_BASE.getPropertyName());
+        return groupPropertyNames;
+    }
+
+}
diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/enums/ImportTestTypesEnum.java b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/enums/ImportTestTypesEnum.java
new file mode 100644
index 0000000000..ed71faa8ce
--- /dev/null
+++ b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/enums/ImportTestTypesEnum.java
@@ -0,0 +1,95 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * SDC
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.sdc.ci.tests.datatypes.enums;
+
+import org.openecomp.sdc.be.dao.api.ActionStatus;
+
+import java.util.Arrays;
+import java.util.List;
+
+public enum ImportTestTypesEnum {
+
+	MISSING_CONTACT("tosca.nodes.missing_contact", "missing_contact", ActionStatus.COMPONENT_MISSING_CONTACT, Arrays.asList("Resource"), true), 
+	MISSING_RESOURCE_NAME("tosca.nodes.missing_resource_name", "missing_resource_name", ActionStatus.MISSING_COMPONENT_NAME, Arrays.asList("Resource"), true), 
+	MISSING_DESC("tosca.nodes.missing_desc", "missing_desc", ActionStatus.COMPONENT_MISSING_DESCRIPTION, Arrays.asList("Resource"), true), 
+	MISSING_ICON("tosca.nodes.missing_icon", "missing_icon", ActionStatus.COMPONENT_MISSING_ICON, Arrays.asList("Resource"), true), 
+	MISSING_TAGS("tosca.nodes.missing_tags", "missing_tags", ActionStatus.COMPONENT_MISSING_TAGS, null, true), 
+	MISSING_CATEGORY("tosca.nodes.missing_category", "missing_category", ActionStatus.COMPONENT_MISSING_CATEGORY, Arrays.asList("Resource"), true),
+	// MISSING_PAYLOADNAME("tosca.nodes.missing_payloadName",
+	// "missing_payloadName", ActionStatus.INVALID_TOSCA_FILE_EXTENSION, null,
+	// true),
+
+	EMPTY_RESOURCE_NAME("tosca.nodes.empty_resource_name", "missing_resource_name"/* "empty_resource_name" */, ActionStatus.MISSING_COMPONENT_NAME, Arrays.asList("Resource"), false), 
+	EMPTY_CONTACT("tosca.nodes.empty_contact", "missing_contact"/* "empty_contact" */, ActionStatus.COMPONENT_MISSING_CONTACT, Arrays.asList("Resource"), false), 
+	EMPTY_CATEGORY("tosca.nodes.empty_category", "missing_category"/* "empty_category" */, ActionStatus.COMPONENT_MISSING_CATEGORY, Arrays.asList("Resource"), false), 
+	EMPTY_DESC("tosca.nodes.empty_desc", "missing_desc"/* "empty_desc" */, ActionStatus.COMPONENT_MISSING_DESCRIPTION, Arrays.asList("Resource"), false), 
+	EMPTY_ICON("tosca.nodes.empty_icon", "missing_icon"/* "empty_icon" */, ActionStatus.COMPONENT_MISSING_ICON, Arrays.asList("Resource"), false), 
+	EMPTY_PAYLOADNAME("tosca.nodes.empty_payloadName", "missing_payloadName"/* "empty_payloadName" */, ActionStatus.INVALID_TOSCA_FILE_EXTENSION, null, false),
+	EMPTY_TAG("tosca.nodes.empty_tag", "empty_tag", ActionStatus.INVALID_FIELD_FORMAT, Arrays.asList("Resource", "tag"), false), 
+	VALIDATE_PROPORTIES_1("tosca.nodes.validateProporties_typeBoolean_valueInit", "validateProporties_typeBoolean_valueInit", ActionStatus.INVALID_DEFAULT_VALUE, Arrays.asList("validation_test", "boolean", "123456"), false), 
+	VALIDATE_PROPORTIES_2("tosca.nodes.validateProporties_typeBoolean_valueString", "validateProporties_typeBoolean_valueString", ActionStatus.INVALID_DEFAULT_VALUE, Arrays.asList("validation_test", "boolean", "abcd"), false), 
+	VALIDATE_PROPORTIES_3("tosca.nodes.validateProporties_typeFloat_valueBoolean", "validateProporties_typeFloat_valueBoolean", ActionStatus.INVALID_DEFAULT_VALUE, Arrays.asList("validation_test", "float", "true"), false), 
+	VALIDATE_PROPORTIES_4("tosca.nodes.validateProporties_typeFloat_valueString", "validateProporties_typeFloat_valueString", ActionStatus.INVALID_DEFAULT_VALUE, Arrays.asList("validation_test", "float", "abcd"), false), 
+	VALIDATE_PROPORTIES_5("tosca.nodes.validateProporties_typeInit_valueBoolean", "validateProporties_typeInit_valueBoolean", ActionStatus.INVALID_DEFAULT_VALUE, Arrays.asList("validation_test", "integer", "true"), false), 
+	VALIDATE_PROPORTIES_6("tosca.nodes.validateProporties_typeInit_valueFloat", "validateProporties_typeInit_valueFloat", ActionStatus.INVALID_DEFAULT_VALUE, Arrays.asList("validation_test", "integer", "0.123"), false), 
+	VALIDATE_PROPORTIES_7("tosca.nodes.validateProporties_typeInit_valueString", "validateProporties_typeInit_valueString", ActionStatus.INVALID_DEFAULT_VALUE, Arrays.asList("validation_test", "integer", "abcd"), false);
+	// VALIDATE_PROPORTIES_8("tosca.nodes.validateProporties_happyScenarios","validateProporties_happyScenarios", ActionStatus.OK, null, false);
+
+	private String normativeName;
+	private String folderName;
+	private ActionStatus actionStatus;
+	private Boolean validateAudit;
+	private List<String> errorParams;
+	private Boolean validateYaml;
+
+	// private enum ActionStatus;
+
+	private ImportTestTypesEnum(String resourceName, String folderName, ActionStatus actionStatus,
+			List<String> errorParams, Boolean validateAudit) {
+		this.normativeName = resourceName;
+		this.folderName = folderName;
+		this.actionStatus = actionStatus;
+		this.errorParams = errorParams;
+		this.validateAudit = validateAudit;
+
+	}
+
+	public String getNormativeName() {
+		return normativeName;
+	}
+
+	public String getFolderName() {
+		return folderName;
+	}
+
+	public ActionStatus getActionStatus() {
+		return actionStatus;
+	}
+
+	public Boolean getvalidateAudit() {
+		return validateAudit;
+	}
+
+	public List<String> getErrorParams() {
+		return errorParams;
+	}
+
+}
diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/enums/LifeCycleStatesEnum.java b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/enums/LifeCycleStatesEnum.java
new file mode 100644
index 0000000000..7c330a3d10
--- /dev/null
+++ b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/enums/LifeCycleStatesEnum.java
@@ -0,0 +1,75 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * SDC
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.sdc.ci.tests.datatypes.enums;
+
+public enum LifeCycleStatesEnum {
+
+	CHECKOUT("checkout", "NOT_CERTIFIED_CHECKOUT"), 
+	CHECKIN("checkin", "NOT_CERTIFIED_CHECKIN"), 
+	CERTIFICATIONREQUEST("certificationRequest", "READY_FOR_CERTIFICATION"), 
+	UNDOCHECKOUT("undoCheckout", ""), 
+	CANCELCERTIFICATION("cancelCertification", ""), 
+	STARTCERTIFICATION("startCertification", "CERTIFICATION_IN_PROGRESS"), 
+	FAILCERTIFICATION("failCertification", ""), 
+	CERTIFY("certify", "CERTIFIED");
+
+	private String state;
+	private String componentState;
+
+	private LifeCycleStatesEnum(String state, String componentState) {
+		this.state = state;
+		this.componentState = componentState;
+
+	}
+
+	public String getState() {
+		return state;
+	}
+
+	public String getComponentState() {
+		return componentState;
+	}
+
+	public static LifeCycleStatesEnum findByCompState(String compState) {
+
+		for (LifeCycleStatesEnum lifeCycleStatesEnum : LifeCycleStatesEnum.values()) {
+			if (lifeCycleStatesEnum.getComponentState().equals(compState)) {
+				return lifeCycleStatesEnum;
+			}
+		}
+
+		return null;
+
+	}
+
+	public static LifeCycleStatesEnum findByState(String state) {
+
+		for (LifeCycleStatesEnum lifeCycleStatesEnum : LifeCycleStatesEnum.values()) {
+			if (lifeCycleStatesEnum.name().equals(state)) {
+				return lifeCycleStatesEnum;
+			}
+		}
+
+		return null;
+
+	}
+
+}
diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/enums/MandatoryResourceArtifactTypeEnum.java b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/enums/MandatoryResourceArtifactTypeEnum.java
new file mode 100644
index 0000000000..58892439b0
--- /dev/null
+++ b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/enums/MandatoryResourceArtifactTypeEnum.java
@@ -0,0 +1,49 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * SDC
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.sdc.ci.tests.datatypes.enums;
+
+import org.openecomp.sdc.common.api.ArtifactGroupTypeEnum;
+
+public enum MandatoryResourceArtifactTypeEnum {
+
+	TEST_SCRIPTS(null, "testscripts"), FEATURES(null, "features"), CAPACITY(null, "capacity"), VENDOR_TEST_RESULT(null, "vendortestresult"), CLOUD_QUESTIONNAIRE(null, "cloudQuestionnaire");
+
+	String artifactName;
+	String logicalName;
+
+	private MandatoryResourceArtifactTypeEnum(String artifactName, String logicalName) {
+		this.artifactName = artifactName;
+		this.logicalName = logicalName;
+	}
+
+	public String getArtifactName() {
+		return artifactName;
+	}
+
+	public String getLogicalName() {
+		return logicalName;
+	}
+
+	public ArtifactGroupTypeEnum getGroupType() {
+		return ArtifactGroupTypeEnum.INFORMATIONAL;
+	}
+
+}
diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/enums/MandatoryServiceArtifactTypeEnum.java b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/enums/MandatoryServiceArtifactTypeEnum.java
new file mode 100644
index 0000000000..b73d5a8fee
--- /dev/null
+++ b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/enums/MandatoryServiceArtifactTypeEnum.java
@@ -0,0 +1,66 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * SDC
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.sdc.ci.tests.datatypes.enums;
+
+public enum MandatoryServiceArtifactTypeEnum {
+
+	MESSAGE_FLOWS(null, "messageflows".toLowerCase(), "Message Flows"), 
+	INSTANT_FLOWS(null, "instantiationflows".toLowerCase(), "Management Flows"), 
+	SERVICE_ART_PLAN(null, "serviceartifactplan".toLowerCase(), "Service Artifact Plan"), 
+	SUM_OF_ELEMENTS(null, "summaryofimpactstoecompelements".toLowerCase(), "Summary of impacts to ECOMP elements,OSSs, BSSs"), 
+	CONTROL_LOOP_FUN(null, "controlloopfunctions".toLowerCase(), "Control Loop Functions"), 
+	DIMENSIONNING_INFO(null, "dimensioninginfo".toLowerCase(), "Dimensioning Info"), 
+	AFFINITY_RULES(null, "affinityrules".toLowerCase(), "Affinity Rules"), 
+	OPERATIONAL_POLICIES(null, "operationalpolicies".toLowerCase(), "Operational Policies"), 
+	SERVICE_SPECIFIC_POLICIES(null, "servicespecificpolicies".toLowerCase(), "Service-specific Policies"), 
+	ENGINEERING_RULES(null, "engineeringrules".toLowerCase(), "Engineering Rules (ERD)"), 
+	DISTRIB_INSTRUCTIONS(null, "distributioninstructions".toLowerCase(), "Distribution Instructions"), 
+	DEPLOYMENT_VOTING_REC(null, "deploymentvotingrecord".toLowerCase(), "Deployment Voting Record"), 
+	CERTIFICATION_TEST_RESULT(null, "certificationtestresults".toLowerCase(), "TD Certification Test Results");
+	// SERVICE_QUESTIONNAIRE(null, "serviceQuestionnaire".toLowerCase());
+
+	String artifactName;
+	String logicalName;
+	String artifactDisplayName;
+
+	private MandatoryServiceArtifactTypeEnum(String artifactName, String logicalName, String artifactDisplayName) {
+		this.artifactName = artifactName;
+		this.logicalName = logicalName;
+		this.artifactDisplayName = artifactDisplayName;
+	}
+
+	public String getArtifactName() {
+		return artifactName;
+	}
+
+	public String getLogicalName() {
+		return logicalName;
+	}
+
+	public String getArtifactDisplayName() {
+		return artifactDisplayName;
+	}
+
+	public void setArtifactDisplayName(String artifactDisplayName) {
+		this.artifactDisplayName = artifactDisplayName;
+	}
+
+}
diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/enums/NormativeTypesEnum.java b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/enums/NormativeTypesEnum.java
new file mode 100644
index 0000000000..389b962f1c
--- /dev/null
+++ b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/enums/NormativeTypesEnum.java
@@ -0,0 +1,45 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * SDC
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.sdc.ci.tests.datatypes.enums;
+
+public enum NormativeTypesEnum {
+	ROOT("tosca.nodes.Root", "root"), COMPUTE("tosca.nodes.Compute", "compute"), BLOCK_STORAGE("tosca.nodes.BlockStorage", "blockStorage"), CONTAINER_APPLICATION("tosca.nodes.Container.Application", "containerApplication"), 
+	CONTAINER_RUNTIME("tosca.nodes.Container.Runtime","containerRuntime"), DATABASE("tosca.nodes.Database", "database"), DBMS("tosca.nodes.DBMS", "DBMS"), LOAD_BALANCER("tosca.nodes.LoadBalancer", "loadBalancer"), 
+	OBJECT_STORAGE("tosca.nodes.ObjectStorage", "objectStorage"), NETWORK("tosca.nodes.network.Network", "network"), PORT("tosca.nodes.network.Port", "port"), SOFTWARE_COMPONENT("tosca.nodes.SoftwareComponent", "softwareComponent"), 
+	WEB_APPLICATION("tosca.nodes.webapplication","webApplication"), WEB_SERVER("tosca.nodes.WebServer", "webServer");
+	
+	public String normativeName;
+	private String folderName;
+
+	private NormativeTypesEnum(String resourceName, String folderName) {
+		this.normativeName = resourceName;
+		this.folderName = folderName;
+	}
+
+	public String getNormativeName() {
+		return normativeName;
+	}
+
+	public String getFolderName() {
+		return folderName;
+	}
+
+}
diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/enums/OriginTypeEnum.java b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/enums/OriginTypeEnum.java
new file mode 100644
index 0000000000..d85a496241
--- /dev/null
+++ b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/enums/OriginTypeEnum.java
@@ -0,0 +1,74 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * SDC
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.sdc.ci.tests.datatypes.enums;
+
+import org.openecomp.sdc.be.datatypes.enums.ComponentTypeEnum;
+
+public enum OriginTypeEnum {
+	PRODUCT("Product", "Product", "product instance", ComponentTypeEnum.PRODUCT), 
+	SERVICE("Service", "Service", "service instance", ComponentTypeEnum.SERVICE), 
+	VF("VF", "VF (Virtual Function)", "resource instance", ComponentTypeEnum.RESOURCE),
+	VFC("VFC", "VFC (Virtual Function Component)", "resource instance", ComponentTypeEnum.RESOURCE),
+	CP("CP", "CP (Connection Point)", "resource instance", ComponentTypeEnum.RESOURCE), 
+	VL("VL", "VL (Virtual Link)", "resource instance", ComponentTypeEnum.RESOURCE),
+	VFCMT("VFCMT", "VFCMT (VFC Monitoring Template)", "resource instance", ComponentTypeEnum.RESOURCE),
+	VFi("VFi", "VFi (Virtual Function Instance)", "resource instance", ComponentTypeEnum.RESOURCE_INSTANCE);
+	
+
+	private String value;
+	private String displayValue;
+	private String instanceType;
+	private ComponentTypeEnum componentType;
+
+	private OriginTypeEnum(String value, String displayValue, String instanceType, ComponentTypeEnum componentType) {
+		this.value = value;
+		this.displayValue = displayValue;
+		this.instanceType = instanceType;
+		this.componentType = componentType;
+	}
+
+	public String getValue() {
+		return value;
+	}
+
+	public String getDisplayValue() {
+		return displayValue;
+	}
+
+	public String getInstanceType() {
+		return instanceType;
+	}
+
+	public ComponentTypeEnum getComponentType() {
+		return componentType;
+	}
+
+	public static OriginTypeEnum findByValue(String value) {
+		OriginTypeEnum ret = null;
+		for (OriginTypeEnum curr : OriginTypeEnum.values()) {
+			if (curr.getValue().equals(value)) {
+				ret = curr;
+				break;
+			}
+		}
+		return ret;
+	}
+}
diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/enums/PropertyTypeEnum.java b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/enums/PropertyTypeEnum.java
new file mode 100644
index 0000000000..b5550fcdd3
--- /dev/null
+++ b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/enums/PropertyTypeEnum.java
@@ -0,0 +1,126 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * SDC
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.sdc.ci.tests.datatypes.enums;
+
+import org.openecomp.sdc.be.datatypes.elements.SchemaDefinition;
+import org.openecomp.sdc.be.model.PropertyDefinition;
+import org.openecomp.sdc.be.model.tosca.ToscaPropertyType;
+
+public enum PropertyTypeEnum {
+	INTEGER("defaultIntegerPropName1", "integer", "125", "346", "default integer type property description", "updated integer type property description",null), 
+	STRING("defaultStringPropName1", "string", "string", "updated string","default string type property description", "updated string type property description",null), 
+	BOOLEAN("defaultBooleanPropName1", "boolean", "true", "false","default boolean type property description", "updated boolean type property description",null),
+	FLOAT("defaultFloatPropName1", "float", "1.2", "3.4","default float type property description", "updated float type property description",null),
+	STRING_LIST("defaultStringListPropName", "list", "[a,b]", "[c,d]","outer description", "updated outer description", getDefaultStringSchema(ToscaPropertyType.STRING.getType())), 
+	INTEGER_LIST("defaultIntegerListPropName", "list", "[1,2]", "[3,4]","outer description", "updated outer description", getDefaultStringSchema(ToscaPropertyType.INTEGER.getType())), 
+	BOOLEAN_LIST("defaultBooleanListPropName", "list", "[true,false]", "[false,true]","outer description", "updated outer description", getDefaultStringSchema(ToscaPropertyType.BOOLEAN.getType())), 
+	FLOAT_LIST("defaultFloatMapPropName", "list", "[1.0,2.0]", "[3.0,4.0]","outer description", "updated outer description", getDefaultStringSchema(ToscaPropertyType.FLOAT.getType())), 
+	STRING_MAP("defaultStringMapPropName", "map", "{\"key1\":val1 , \"key2\":val2}", "{\"key1\":val11 , \"key2\":val22}", "outer description", "updated outer description",getDefaultStringSchema(ToscaPropertyType.STRING.getType())), 
+	INTEGER_MAP("defaultIntegerMapPropName", "map", "{\"key1\":123 , \"key2\":-456}", "{\"key1\":456 , \"key2\":-789}", "outer description", "updated outer description", getDefaultStringSchema(ToscaPropertyType.INTEGER.getType())), 
+	BOOLEAN_MAP("defaultBooleanMapPropName", "map", "{\"key1\":true , \"key2\":false}", "{\"key1\":false , \"key2\":true}", "outer description", "updated outer description",getDefaultStringSchema(ToscaPropertyType.BOOLEAN.getType())), 
+	FLOAT_MAP("defaultFloatMapPropName", "map", "{\"key1\":0.2123 , \"key2\":43.545f}", "{\"key1\":0.5678 , \"key2\":12.789f}","outer description", "updated outer description", getDefaultStringSchema(ToscaPropertyType.FLOAT.getType()));
+
+	private String name;
+	private String type;
+	private String value;
+	private String updateValue;
+	private String description;
+	private String updateDescription;
+	private SchemaDefinition schemaDefinition;
+
+	private PropertyTypeEnum(String name, String type, String value, String updateValue,String description,String updateDescription,
+			SchemaDefinition schemaDefinition) {
+		this.name = name;
+		this.type = type;
+		this.value = value;
+		this.updateValue = updateValue;
+		this.description = description;
+		this.updateDescription = updateDescription;
+		this.schemaDefinition = schemaDefinition;
+	}
+
+	public String getName() {
+		return name;
+	}
+
+	public void setName(String name) {
+		this.name = name;
+	}
+
+	public String getType() {
+		return type;
+	}
+
+	public void setType(String type) {
+		this.type = type;
+	}
+
+	public String getValue() {
+		return value;
+	}
+
+	public void setValue(String value) {
+		this.value = value;
+	}
+	
+	public String getUpdateValue() {
+		return updateValue;
+	}
+	
+	public void setUpdateValue(String updateValue) {
+		this.updateValue = updateValue;
+	}
+
+	public String getDescription() {
+		return description;
+	}
+
+	public void setDescription(String description) {
+		this.description = description;
+	}
+	
+	public String getUpdateDescription() {
+		return updateDescription;
+	}
+	
+	public void setUpdateDescription(String updateDescription) {
+		this.updateDescription = updateDescription;
+	}
+
+	public SchemaDefinition getSchemaDefinition() {
+		return schemaDefinition;
+	}
+
+	public void setSchemaDefinition(SchemaDefinition schemaDefinition) {
+		this.schemaDefinition = schemaDefinition;
+	}
+
+	private static SchemaDefinition getDefaultStringSchema(String innerType) {
+		SchemaDefinition schema = new SchemaDefinition();
+		String description = "inner description";
+		PropertyDefinition property = new PropertyDefinition();
+		property.setType(innerType);
+		property.setDescription(description);
+		schema.setProperty(property);
+		return schema;
+	}
+
+}
diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/enums/ResourceCategoryEnum.java b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/enums/ResourceCategoryEnum.java
new file mode 100644
index 0000000000..1ba6c5c7f1
--- /dev/null
+++ b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/enums/ResourceCategoryEnum.java
@@ -0,0 +1,161 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * SDC
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.sdc.ci.tests.datatypes.enums;
+
+import java.util.Random;
+
+public enum ResourceCategoryEnum {
+
+	NETWORK_L2_3_ROUTERS("Network L2-3", "Router", "resourceNewCategory.network l2-3", "resourceNewCategory.network l2-3.router"), 
+	NETWORK_L2_3_GETEWAY("Network L2-3","Gateway", "resourceNewCategory.network l2-3", "resourceNewCategory.network l2-3.gateway"), 
+	NETWORK_L2_3_WAN_CONNECTORS("Network L2-3", "WAN Connectors", "resourceNewCategory.network l2-3", "resourceNewCategory.network l2-3.lan connectors"), 
+	NETWORK_L2_3_LAN_CONNECTORS("Network L2-3", "LAN Connectors", "resourceNewCategory.network l2-3", "resourceNewCategory.network l2-3.wan connectors"), 
+	NETWORK_L2_3_INFRASTRUCTURE("Network L2-3", "Infrastructure", "resourceNewCategory.network l2-3", "resourceNewCategory.network l2-3.infrastructure"),
+	
+	NETWORK_L4("Network L4+", "Common Network Resources", "resourceNewCategory.network l4+", "resourceNewCategory.network l4+.common network resources"), 
+	
+	APPLICATION_L4_BORDER("Application L4+", "Border Element", "resourceNewCategory.application l4+", "resourceNewCategory.application l4+.border element"), 
+	APPLICATION_L4_APP_SERVER("Application L4+", "Application Server", "resourceNewCategory.application l4+", "resourceNewCategory.application l4+.application server"), 
+	APPLICATION_L4_WEB_SERVERS("Application L4+", "Web Server", "resourceNewCategory.application l4+", "resourceNewCategory.application l4+.web server"), 
+	APPLICATION_L4_CALL_CONTROL("Application L4+","Call Control", "resourceNewCategory.application l4+", "resourceNewCategory.application l4+.call control"), 
+	APPLICATION_L4_MEDIA_SERVER("Application L4+", "Media Servers", "resourceNewCategory.application l4+", "resourceNewCategory.application l4+.media servers"), 
+	APPLICATION_L4_LOAD_BALANCER("Application L4+", "Load Balancer", "resourceNewCategory.application l4+", "resourceNewCategory.application l4+.load balancer"), 
+	APPLICATION_L4_DATABASE("Application L4+","Database", "resourceNewCategory.application l4+", "resourceNewCategory.application l4+.database"), 
+	APPLICATION_L4_FIREWALL("Application L4+", "Firewall", "resourceNewCategory.application l4+", "resourceNewCategory.application l4+.firewall"), 
+	
+	GENERIC_INFRASTRUCTURE("Generic", "Infrastructure", "resourceNewCategory.generic", "resourceNewCategory.generic.infrastructure"), 
+	GENERIC_ABSTRACT("Generic", "Abstract", "resourceNewCategory.generic", "resourceNewCategory.generic.abstract"), 
+	GENERIC_NETWORK_ELEMENTS("Generic","Network Elements", "resourceNewCategory.generic", "resourceNewCategory.generic.network elements"), 
+	GENERIC_DATABASE("Generic", "Database", "resourceNewCategory.generic", "resourceNewCategory.generic.database"),
+	GENERIC_RULES("Generic", "Rules", "resourceNewCategory.generic", "resourceNewCategory.generic.rules"),
+	
+	NETWORK_CONNECTIVITY_CON_POINT("Network Connectivity", "Connection Points", "resourceNewCategory.network connectivity", "resourceNewCategory.network connectivity.connection points"), 
+	NETWORK_CONNECTIVITY_VIRTUAL_LINK("Network Connectivity","Virtual Links", "resourceNewCategory.network connectivity", "resourceNewCategory.network connectivity.virtual links"),
+	
+	TEMPLATE_MONITORING_TEMPLATE("Template", "Monitoring Template", "resourceNewCategory.template", "resourceNewCategory.template.monitoring template"), 
+	
+	ALLOTTED_RESOURCE("Allotted Resource", "Allotted Resource", "resourceNewCategory.allotted resource", "resourceNewCategory.allotted resource.allotted resource"),
+	ALLOTTED_RESOURCE_SERVICE_ADMIN("Allotted Resource", "Service Admin", "resourceNewCategory.allotted resource", "resourceNewCategory.allotted resource.service admin"),
+	ALLOTTED_RESOURCE_CONTRAIL_ROUTE("Allotted Resource", "Contrail Route", "resourceNewCategory.allotted resource", "resourceNewCategory.allotted resource.contrail route"),
+	ALLOTTED_RESOURCE_TUNNEL_XCONNECT("Allotted Resource", "Tunnel XConnect", "resourceNewCategory.allotted resource", "resourceNewCategory.allotted resource.tunnel xconnect"),
+	ALLOTTED_RESOURCE_IP_MUX_DEMUX("Allotted Resource", "IP Mux Demux", "resourceNewCategory.allotted resource", "resourceNewCategory.allotted resource.ip mux demux"),
+	ALLOTTED_RESOURCE_SECURITY_ZONE("Allotted Resource", "Security Zone", "resourceNewCategory.allotted resource", "resourceNewCategory.allotted resource.security zone"),
+	
+	DCAE_COMPONENT_MICROSERVICE("DCAE Component", "Microservice", "resourceNewCategory.dcae component", "resourceNewCategory.dcae component.microservice"),
+	DCAE_COMPONENT_DATABASE("DCAE Component", "Database", "resourceNewCategory.dcae component", "resourceNewCategory.dcae component.database"),
+	DCAE_COMPONENT_POLICY("DCAE Component", "policy", "resourceNewCategory.dcae component", "resourceNewCategory.dcae component.policy"),
+	DCAE_COMPONENT_SOURCE("DCAE Component", "Source", "resourceNewCategory.dcae component", "resourceNewCategory.dcae component.source"),
+	DCAE_COMPONENT_ANALYSTICS("DCAE Component", "Analytics", "resourceNewCategory.dcae component", "resourceNewCategory.dcae component.analytics"),
+	DCAE_COMPONENT_UTILITY("DCAE Component", "Utility", "resourceNewCategory.dcae component", "resourceNewCategory.dcae component.utility"),
+	DCAE_COMPONENT_COLLECTOR("DCAE Component", "Collector", "resourceNewCategory.dcae component", "resourceNewCategory.dcae component.collector"),
+	;
+	
+	private String category;
+	private String subCategory;
+	private String categoryUniqeId;
+	private String subCategoryUniqeId;
+
+	ResourceCategoryEnum(String category, String subCategory) {
+		this.category = category;
+		this.subCategory = subCategory;
+	}
+	
+	private ResourceCategoryEnum(String category, String subCategory, String categoryUniqeId, String subCategoryUniqeId) {
+		this.category = category;
+		this.subCategory = subCategory;
+		this.categoryUniqeId = categoryUniqeId;
+		this.subCategoryUniqeId = subCategoryUniqeId;
+	}
+
+	public String getCategoryUniqeId() {
+		return categoryUniqeId;
+	}
+
+	public void setCategoryUniqeId(String categoryUniqeId) {
+		this.categoryUniqeId = categoryUniqeId;
+	}
+
+	public String getSubCategoryUniqeId() {
+		return subCategoryUniqeId;
+	}
+
+	public void setSubCategoryUniqeId(String subCategoryUniqeId) {
+		this.subCategoryUniqeId = subCategoryUniqeId;
+	}
+
+
+	public String getCategory() {
+		return category;
+	}
+
+	public void setCategory(String category) {
+		this.category = category;
+	}
+
+	public String getSubCategory() {
+		return subCategory;
+	}
+
+	public void setSubCategory(String subCategory) {
+		this.subCategory = subCategory;
+	}
+
+
+	public static ResourceCategoryEnum findEnumNameByValues(String category, String subCategory){
+		for(ResourceCategoryEnum resourceCategoryEnum : ResourceCategoryEnum.values()) {
+			if(resourceCategoryEnum.getCategory().equals(category) && resourceCategoryEnum.getSubCategory().equals(subCategory)){
+				return resourceCategoryEnum;
+			}
+		}
+		return null;
+	}
+
+
+	/**
+	 * @return random category enum except allotted category
+	 */
+	public static ResourceCategoryEnum getRandomElement() {
+		Random random = new Random();
+		ResourceCategoryEnum resourceCategoryEnum = ResourceCategoryEnum.values()[random.nextInt(ResourceCategoryEnum.values().length)];
+
+		if(!resourceCategoryEnum.toString().startsWith("ALLOTTED")){
+			return resourceCategoryEnum;
+		}else{
+			return getRandomElement();
+		}
+	}
+
+
+	/**
+	 * @return random  allotted category enum
+	 */
+	public static ResourceCategoryEnum getRandomAllottedElement() {
+		Random random = new Random();
+		ResourceCategoryEnum resourceCategoryEnum = ResourceCategoryEnum.values()[random.nextInt(ResourceCategoryEnum.values().length)];
+
+		if(resourceCategoryEnum.toString().startsWith("ALLOTTED")){
+			return resourceCategoryEnum;
+		}else{
+			return getRandomAllottedElement();
+		}
+	}
+
+}
diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/enums/RespJsonKeysEnum.java b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/enums/RespJsonKeysEnum.java
new file mode 100644
index 0000000000..a977e38fe2
--- /dev/null
+++ b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/enums/RespJsonKeysEnum.java
@@ -0,0 +1,40 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * SDC
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.sdc.ci.tests.datatypes.enums;
+
+public enum RespJsonKeysEnum {
+
+	IS_ABSTRACT("abstract"), UNIQUE_ID("uniqueId"), RESOURCE_NAME("name"), RESOURCE_VERSION("version"), TAGS("tags"), LIFE_CYCLE_STATE("lifecycleState"), DERIVED_FROM("derivedFrom"), RESOURCE_DESC("description"), 
+	VENDOR_NAME("vendorName"), VENDOR_RELEASE("vendorRelease"), CONTACT_ID("contactId"), ICON("icon"), HIGHEST_VERSION("highestVersion"), CREATOR_ATT_UID("creatorUserId"), CREATOR_FULL_NAME("creatorFullName"), 
+	LAST_UPDATER_ATT_UID("lastUpdaterUserId"), LAST_UPDATER_FULL_NAME("lastUpdaterFullName"), ARTIFACTS("artifacts"), DESCRIPTION("description"), UUID("uuid"), COST("cost"), LICENSE_TYPE("licenseType"), 
+	RESOURCE_TYPE("resourceType"), CATEGORIES("categories");
+	
+	private String respJsonKeyName;
+
+	private RespJsonKeysEnum(String respJsonKeyName) {
+		this.respJsonKeyName = respJsonKeyName;
+	}
+
+	public String getRespJsonKeyName() {
+		return respJsonKeyName;
+	}
+
+}
diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/enums/SearchCriteriaEnum.java b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/enums/SearchCriteriaEnum.java
new file mode 100644
index 0000000000..f26423a35d
--- /dev/null
+++ b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/enums/SearchCriteriaEnum.java
@@ -0,0 +1,38 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * SDC
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.sdc.ci.tests.datatypes.enums;
+
+
+
+public enum SearchCriteriaEnum {
+
+	RESOURCE_TYPE("resourceType"), CATEGORY("category"), SUBCATEGORY("subCategory");
+
+	private String value;
+
+	private SearchCriteriaEnum(String value) {
+		this.value = value;
+	}
+
+	public String getValue() {
+		return value;
+	}
+}
diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/enums/ServiceApiArtifactEnum.java b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/enums/ServiceApiArtifactEnum.java
new file mode 100644
index 0000000000..4cfcc8a558
--- /dev/null
+++ b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/enums/ServiceApiArtifactEnum.java
@@ -0,0 +1,35 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * SDC
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.sdc.ci.tests.datatypes.enums;
+
+public enum ServiceApiArtifactEnum {
+	CONFIGURATION("Configuration".toLowerCase()), INSTANTIATION("Instantiation".toLowerCase()), MONITORING("Monitoring".toLowerCase()), REPORTING("Reporting".toLowerCase()), LOGGING("Logging".toLowerCase()), TESTING("Testing".toLowerCase());
+
+	String logicalName;
+
+	private ServiceApiArtifactEnum(String logicalName) {
+		this.logicalName = logicalName;
+	}
+
+	public String getLogicalName() {
+		return logicalName;
+	}
+}
diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/enums/ServiceCategoriesEnum.java b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/enums/ServiceCategoriesEnum.java
new file mode 100644
index 0000000000..959315acff
--- /dev/null
+++ b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/enums/ServiceCategoriesEnum.java
@@ -0,0 +1,44 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * SDC
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.sdc.ci.tests.datatypes.enums;
+
+import java.util.Random;
+
+public enum ServiceCategoriesEnum {
+
+	VOIP("VoIP Call Control"), MOBILITY("Mobility"), NETWORK_L4("Network L4+"), NETWORK_L3("Network L1-3"),
+		PARTNERSERVICE("Partner Domain Service");
+	String value;
+
+	private ServiceCategoriesEnum(String value) {
+		this.value = value;
+	}
+
+	public String getValue() {
+
+		return value;
+	}
+
+    public static ServiceCategoriesEnum getRandomElement() {
+        Random random = new Random();
+        return ServiceCategoriesEnum.values()[random.nextInt(ServiceCategoriesEnum.values().length)];
+    }
+}
diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/enums/ServiceInstantiationType.java b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/enums/ServiceInstantiationType.java
new file mode 100644
index 0000000000..bba2fe6187
--- /dev/null
+++ b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/enums/ServiceInstantiationType.java
@@ -0,0 +1,35 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * SDC
+ * ================================================================================
+ * 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=========================================================
+ */
+
+package org.openecomp.sdc.ci.tests.datatypes.enums;
+
+public enum ServiceInstantiationType {
+	A_LA_CARTE("A-la-carte"), MACRO("Macro");
+	
+	private String value;
+
+	public String getValue() {
+		return value;
+	}
+
+	private ServiceInstantiationType(String value) {
+		this.value = value;
+	}
+}
diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/enums/ToscaKeysEnum.java b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/enums/ToscaKeysEnum.java
new file mode 100644
index 0000000000..24adc49ebe
--- /dev/null
+++ b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/enums/ToscaKeysEnum.java
@@ -0,0 +1,51 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * SDC
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.sdc.ci.tests.datatypes.enums;
+
+public enum ToscaKeysEnum {
+
+	TOSCA_DEFINITION_VERSION("tosca_definitions_version"),
+	METADATA("metadata"),
+	IMPORTS("imports"),
+	NODE_TYPES("node_types"),
+	TOPOLOGY_TEMPLATE("topology_template"),
+	ANNOTATION_TYPES("annotation_types");
+
+	private String toscaKey;
+
+	public String getToscaKey() {
+		return toscaKey;
+	}
+
+	private ToscaKeysEnum(String toscaKey) {
+		this.toscaKey = toscaKey;
+	}
+
+	public static ToscaKeysEnum findToscaKey(final String toscaKey) {
+		for (ToscaKeysEnum toscaKeyEnum : ToscaKeysEnum.values()) {
+			if (toscaKeyEnum.getToscaKey().equalsIgnoreCase(toscaKey)) {
+				return toscaKeyEnum;
+			}
+		}
+		return null;
+	}
+
+}
diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/enums/UserRoleEnum.java b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/enums/UserRoleEnum.java
new file mode 100644
index 0000000000..65c7f9e206
--- /dev/null
+++ b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/enums/UserRoleEnum.java
@@ -0,0 +1,64 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * SDC
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.sdc.ci.tests.datatypes.enums;
+
+import lombok.Getter;
+import lombok.Setter;
+import org.openecomp.sdc.ci.tests.config.UserCredentialsFromFile;
+import org.openecomp.sdc.ci.tests.datatypes.UserCredentials;
+
+@Getter
+public enum UserRoleEnum {
+
+	ADMIN("admin"),
+	ADMIN2("admin"),
+    DESIGNER("designer"),
+	DESIGNER2("designer"),
+    TESTER("tester"),
+    GOVERNOR("governor"),
+    OPS("ops"),
+	PRODUCT_STRATEGIST1("ops"),
+	PRODUCT_STRATEGIST2("ops"),
+	PRODUCT_STRATEGIST3("ops"),
+	PRODUCT_MANAGER1("ops"),
+	PRODUCT_MANAGER2("ops");
+
+	private String userName;
+	private UserCredentials credentials;
+	private String password;
+	@Setter
+	private String userId;
+	private String firstName;
+    private String lastName;
+    private String userRole;
+
+    UserRoleEnum(final String userRole) {
+        final UserCredentialsFromFile instance = UserCredentialsFromFile.getInstance();
+		this.credentials = instance.getUserCredentialsByRole(userRole);
+		this.userId = this.credentials.getUserId();
+		this.firstName = this.credentials.getFirstName();
+		this.lastName = this.credentials.getLastName();
+		this.password = this.credentials.getPassword();
+		this.userName = this.firstName + " " + this.lastName;
+		this.userRole = userRole;
+	}
+
+}
diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/enums/XnfTypeEnum.java b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/enums/XnfTypeEnum.java
new file mode 100644
index 0000000000..db94817537
--- /dev/null
+++ b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/enums/XnfTypeEnum.java
@@ -0,0 +1,37 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * SDC
+ * ================================================================================
+ * 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=========================================================
+ */
+
+package org.openecomp.sdc.ci.tests.datatypes.enums;
+
+public enum XnfTypeEnum {
+
+    VNF ("VNF"),
+    PNF ("PNF");
+
+    private String value;
+
+    private XnfTypeEnum(String value) {
+        this.value = value;
+    }
+
+    public String getValue() {
+        return value;
+    }
+}
diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/expected/ExpectedArtifactAudit.java b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/expected/ExpectedArtifactAudit.java
new file mode 100644
index 0000000000..344f353348
--- /dev/null
+++ b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/expected/ExpectedArtifactAudit.java
@@ -0,0 +1,166 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * SDC
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.sdc.ci.tests.datatypes.expected;
+
+public class ExpectedArtifactAudit {
+
+	private String action;
+	private String resourceName;
+	private String resourceType;
+	private String prevVersion;
+	private String currVersion;
+	private String modifier;
+	private String prevState;
+	private String currState;
+	private String prevArtifactUuid;
+	private String currArtifactUuid;
+	private String artifactData;
+	private String status;
+	private String desc;
+
+	public ExpectedArtifactAudit(String action, String resourceName, String resourceType, String prevVersion,
+			String currVersion, String modifier, String prevState, String currState, String prevArtifactUuid,
+			String currArtifactUuid, String artifactData, String status, String desc) {
+		super();
+		this.action = action;
+		this.resourceName = resourceName;
+		this.resourceType = resourceType;
+		this.prevVersion = prevVersion;
+		this.currVersion = currVersion;
+		this.modifier = modifier;
+		this.prevState = prevState;
+		this.currState = currState;
+		this.prevArtifactUuid = prevArtifactUuid;
+		this.currArtifactUuid = currArtifactUuid;
+		this.artifactData = artifactData;
+		this.status = status;
+		this.desc = desc;
+	}
+
+	public ExpectedArtifactAudit() {
+		super();
+	}
+
+	public String getAction() {
+		return action;
+	}
+
+	public void setAction(String action) {
+		this.action = action;
+	}
+
+	public String getResourceName() {
+		return resourceName;
+	}
+
+	public void setResourceName(String resourceName) {
+		this.resourceName = resourceName;
+	}
+
+	public String getResourceType() {
+		return resourceType;
+	}
+
+	public void setResourceType(String resourceType) {
+		this.resourceType = resourceType;
+	}
+
+	public String getPrevVersion() {
+		return prevVersion;
+	}
+
+	public void setPrevVersion(String prevVersion) {
+		this.prevVersion = prevVersion;
+	}
+
+	public String getCurrVersion() {
+		return currVersion;
+	}
+
+	public void setCurrVersion(String currVersion) {
+		this.currVersion = currVersion;
+	}
+
+	public String getModifier() {
+		return modifier;
+	}
+
+	public void setModifier(String modifier) {
+		this.modifier = modifier;
+	}
+
+	public String getPrevState() {
+		return prevState;
+	}
+
+	public void setPrevState(String prevState) {
+		this.prevState = prevState;
+	}
+
+	public String getCurrState() {
+		return currState;
+	}
+
+	public void setCurrState(String currState) {
+		this.currState = currState;
+	}
+
+	public String getPrevArtifactUuid() {
+		return prevArtifactUuid;
+	}
+
+	public void setPrevArtifactUuid(String prevArtifactUuid) {
+		this.prevArtifactUuid = prevArtifactUuid;
+	}
+
+	public String getCurrArtifactUuid() {
+		return currArtifactUuid;
+	}
+
+	public void setCurrArtifactUuid(String currArtifactUuid) {
+		this.currArtifactUuid = currArtifactUuid;
+	}
+
+	public String getArtifactData() {
+		return artifactData;
+	}
+
+	public void setArtifactData(String artifactData) {
+		this.artifactData = artifactData;
+	}
+
+	public String getStatus() {
+		return status;
+	}
+
+	public void setStatus(String status) {
+		this.status = status;
+	}
+
+	public String getDesc() {
+		return desc;
+	}
+
+	public void setDesc(String desc) {
+		this.desc = desc;
+	}
+
+}
diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/expected/ExpectedAuthenticationAudit.java b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/expected/ExpectedAuthenticationAudit.java
new file mode 100644
index 0000000000..0d6a5f3b3c
--- /dev/null
+++ b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/expected/ExpectedAuthenticationAudit.java
@@ -0,0 +1,90 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * SDC
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.sdc.ci.tests.datatypes.expected;
+
+public class ExpectedAuthenticationAudit {
+
+	private String url;
+	private String realm;
+	private String user;
+	private String action;
+	private String authStatus;
+
+	public ExpectedAuthenticationAudit(String url, String user, String action, String authStatus) {
+		super();
+		this.url = url;
+		this.user = user;
+		this.action = action;
+		this.authStatus = authStatus;
+		this.realm = "ASDC";
+	}
+
+	public ExpectedAuthenticationAudit() {
+
+	}
+
+	public String getUrl() {
+		return url;
+	}
+
+	public void setUrl(String url) {
+		this.url = url;
+	}
+
+	public String getRealm() {
+		return realm;
+	}
+
+	public void setRealm(String realm) {
+		this.realm = realm;
+	}
+
+	public String getUser() {
+		return user;
+	}
+
+	public void setUser(String user) {
+		this.user = user;
+	}
+
+	public String getAction() {
+		return action;
+	}
+
+	public void setAction(String action) {
+		this.action = action;
+	}
+
+	public String getAuthStatus() {
+		return authStatus;
+	}
+
+	public void setAuthStatus(String authStatus) {
+		this.authStatus = authStatus;
+	}
+
+	@Override
+	public String toString() {
+		return "ExpectedAuthenticationAudit [url=" + url + ", realm=" + realm + ", user=" + user + ", action=" + action
+				+ ", authStatus=" + authStatus + "]";
+	}
+
+}
diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/expected/ExpectedCategoryAudit.java b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/expected/ExpectedCategoryAudit.java
new file mode 100644
index 0000000000..b11f7f585a
--- /dev/null
+++ b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/expected/ExpectedCategoryAudit.java
@@ -0,0 +1,151 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * SDC
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.sdc.ci.tests.datatypes.expected;
+
+public class ExpectedCategoryAudit {
+	String action;
+	String modifier;
+	String modifierUid;
+	String modifierName;
+	String categoryName;
+	String subCategoryName;
+	String groupingName;
+	String resourceType;
+	String status;
+	String desc;
+	String details;
+
+	public ExpectedCategoryAudit(String action, String modifier, String categoryName, String subCategoryName,
+			String groupingName, String resourceType, String status, String desc) {
+		super();
+		this.action = action;
+		this.modifier = modifier;
+		this.categoryName = categoryName;
+		this.subCategoryName = subCategoryName;
+		this.groupingName = groupingName;
+		this.resourceType = resourceType;
+		this.status = status;
+		this.desc = desc;
+	}
+
+	public ExpectedCategoryAudit() {
+		action = null;
+		modifier = null;
+		categoryName = null;
+		subCategoryName = null;
+		groupingName = null;
+		resourceType = null;
+		status = null;
+		desc = null;
+		details = null;
+		modifierName = null;
+		modifierUid = null;
+	}
+
+	public String getAction() {
+		return action;
+	}
+
+	public void setAction(String action) {
+		this.action = action;
+	}
+
+	public String getModifier() {
+		return modifier;
+	}
+
+	public void setModifier(String modifier) {
+		this.modifier = modifier;
+	}
+
+	public String getCategoryName() {
+		return categoryName;
+	}
+
+	public void setCategoryName(String categoryName) {
+		this.categoryName = categoryName;
+	}
+
+	public String getSubCategoryName() {
+		return subCategoryName;
+	}
+
+	public void setSubCategoryName(String subCategoryName) {
+		this.subCategoryName = subCategoryName;
+	}
+
+	public String getGroupingName() {
+		return groupingName;
+	}
+
+	public void setGroupingName(String groupingName) {
+		this.groupingName = groupingName;
+	}
+
+	public String getResourceType() {
+		return resourceType;
+	}
+
+	public void setResourceType(String resourceType) {
+		this.resourceType = resourceType;
+	}
+
+	public String getStatus() {
+		return status;
+	}
+
+	public void setStatus(String status) {
+		this.status = status;
+	}
+
+	public String getDesc() {
+		return desc;
+	}
+
+	public void setDesc(String desc) {
+		this.desc = desc;
+	}
+
+	public String getDetails() {
+		return details;
+	}
+
+	public void setDetails(String details) {
+		this.details = details;
+	}
+
+	public String getModifierUid() {
+		return modifierUid;
+	}
+
+	public void setModifierUid(String modifierUid) {
+		this.modifierUid = modifierUid;
+	}
+
+	public String getModifierName() {
+		return modifierName;
+	}
+
+	public void setModifierName(String modifierName) {
+		this.modifierName = modifierName;
+	}
+
+}
diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/expected/ExpectedDistDownloadAudit.java b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/expected/ExpectedDistDownloadAudit.java
new file mode 100644
index 0000000000..4b135f66f6
--- /dev/null
+++ b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/expected/ExpectedDistDownloadAudit.java
@@ -0,0 +1,79 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * SDC
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.sdc.ci.tests.datatypes.expected;
+
+public class ExpectedDistDownloadAudit {
+
+	String action;
+	String consumerId;
+	String resourceUrl;
+	String status;
+	String desc;
+
+	public ExpectedDistDownloadAudit(String action, String consumerId, String resourceUrl, String status, String desc) {
+		super();
+		this.action = action;
+		this.consumerId = consumerId;
+		this.resourceUrl = resourceUrl;
+		this.status = status;
+		this.desc = desc;
+	}
+
+	public String getAction() {
+		return action;
+	}
+
+	public void setAction(String action) {
+		this.action = action;
+	}
+
+	public String getConsumerId() {
+		return consumerId;
+	}
+
+	public void setConsumerId(String consumerId) {
+		this.consumerId = consumerId;
+	}
+
+	public String getResourceUrl() {
+		return resourceUrl;
+	}
+
+	public void setResourceUrl(String resourceUrl) {
+		this.resourceUrl = resourceUrl;
+	}
+
+	public String getStatus() {
+		return status;
+	}
+
+	public void setStatus(String status) {
+		this.status = status;
+	}
+
+	public String getDesc() {
+		return desc;
+	}
+
+	public void setDesc(String desc) {
+		this.desc = desc;
+	}
+}
diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/expected/ExpectedEcomConsumerAudit.java b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/expected/ExpectedEcomConsumerAudit.java
new file mode 100644
index 0000000000..1414742423
--- /dev/null
+++ b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/expected/ExpectedEcomConsumerAudit.java
@@ -0,0 +1,88 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * SDC
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.sdc.ci.tests.datatypes.expected;
+
+public class ExpectedEcomConsumerAudit {
+
+	String action;
+	String modifier;
+	String ecomUser;
+	String status;
+	String desc;
+
+	public ExpectedEcomConsumerAudit(String action, String modifier, String ecomUser, String status, String desc) {
+		super();
+		this.action = action;
+		this.modifier = modifier;
+		this.ecomUser = ecomUser;
+		this.status = status;
+		this.desc = desc;
+	}
+
+	public ExpectedEcomConsumerAudit() {
+		action = null;
+		modifier = null;
+		ecomUser = null;
+		status = null;
+		desc = null;
+	}
+
+	public String getAction() {
+		return action;
+	}
+
+	public void setAction(String action) {
+		this.action = action;
+	}
+
+	public String getModifier() {
+		return modifier;
+	}
+
+	public void setModifier(String modifier) {
+		this.modifier = modifier;
+	}
+
+	public String getEcomUser() {
+		return ecomUser;
+	}
+
+	public void setEcomUser(String ecomUser) {
+		this.ecomUser = ecomUser;
+	}
+
+	public String getStatus() {
+		return status;
+	}
+
+	public void setStatus(String status) {
+		this.status = status;
+	}
+
+	public String getDesc() {
+		return desc;
+	}
+
+	public void setDesc(String desc) {
+		this.desc = desc;
+	}
+
+}
diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/expected/ExpectedExternalAudit.java b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/expected/ExpectedExternalAudit.java
new file mode 100644
index 0000000000..bc15a0e983
--- /dev/null
+++ b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/expected/ExpectedExternalAudit.java
@@ -0,0 +1,178 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * SDC
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.sdc.ci.tests.datatypes.expected;
+
+public class ExpectedExternalAudit {
+
+	String ACTION;
+	String CONSUMER_ID;
+	String RESOURCE_URL;
+	String STATUS;
+	String DESC;
+	String RESOURCE_NAME;
+	String RESOURCE_TYPE;
+	String SERVICE_INSTANCE_ID;// resource/ service UUID
+	String MODIFIER;
+	String PREV_ARTIFACT_UUID;
+	String CURR_ARTIFACT_UUID;
+	String ARTIFACT_DATA;
+
+	public ExpectedExternalAudit() {
+		super();
+	}
+
+	public String getRESOURCE_NAME() {
+		return RESOURCE_NAME;
+	}
+
+	public void setRESOURCE_NAME(String rESOURCE_NAME) {
+		RESOURCE_NAME = rESOURCE_NAME;
+	}
+
+	public String getRESOURCE_TYPE() {
+		return RESOURCE_TYPE;
+	}
+
+	public void setRESOURCE_TYPE(String rESOURCE_TYPE) {
+		RESOURCE_TYPE = rESOURCE_TYPE;
+	}
+
+	public String getSERVICE_INSTANCE_ID() {
+		return SERVICE_INSTANCE_ID;
+	}
+
+	public void setSERVICE_INSTANCE_ID(String sERVICE_INSTANCE_ID) {
+		SERVICE_INSTANCE_ID = sERVICE_INSTANCE_ID;
+	}
+
+	public ExpectedExternalAudit(String aCTION, String cONSUMER_ID, String rESOURCE_URL, String sTATUS, String dESC,
+			String rESOURCE_NAME, String rESOURCE_TYPE, String sERVICE_INSTANCE_ID) {
+		super();
+		ACTION = aCTION;
+		CONSUMER_ID = cONSUMER_ID;
+		RESOURCE_URL = rESOURCE_URL;
+		STATUS = sTATUS;
+		DESC = dESC;
+		RESOURCE_NAME = rESOURCE_NAME;
+		RESOURCE_TYPE = rESOURCE_TYPE;
+		SERVICE_INSTANCE_ID = sERVICE_INSTANCE_ID;
+	}
+
+	public ExpectedExternalAudit(String aCTION, String cONSUMER_ID, String rESOURCE_URL, String sTATUS, String dESC) {
+		super();
+		ACTION = aCTION;
+		CONSUMER_ID = cONSUMER_ID;
+		RESOURCE_URL = rESOURCE_URL;
+		STATUS = sTATUS;
+		DESC = dESC;
+	}
+
+	public ExpectedExternalAudit(String aCTION, String cONSUMER_ID, String rESOURCE_URL, String sTATUS, String dESC,
+			String rESOURCE_NAME, String rESOURCE_TYPE, String sERVICE_INSTANCE_ID, String mODIFIER,
+			String pREV_ARTIFACT_UUID, String cURR_ARTIFACT_UUID, String aRTIFACT_DATA) {
+		super();
+		ACTION = aCTION;
+		CONSUMER_ID = cONSUMER_ID;
+		RESOURCE_URL = rESOURCE_URL;
+		STATUS = sTATUS;
+		DESC = dESC;
+		RESOURCE_NAME = rESOURCE_NAME;
+		RESOURCE_TYPE = rESOURCE_TYPE;
+		SERVICE_INSTANCE_ID = sERVICE_INSTANCE_ID;
+		MODIFIER = mODIFIER;
+		PREV_ARTIFACT_UUID = pREV_ARTIFACT_UUID;
+		CURR_ARTIFACT_UUID = cURR_ARTIFACT_UUID;
+		ARTIFACT_DATA = aRTIFACT_DATA;
+	}
+
+	public String getACTION() {
+		return ACTION;
+	}
+
+	public void setACTION(String aCTION) {
+		ACTION = aCTION;
+	}
+
+	public String getCONSUMER_ID() {
+		return CONSUMER_ID;
+	}
+
+	public void setCONSUMER_ID(String cONSUMER_ID) {
+		CONSUMER_ID = cONSUMER_ID;
+	}
+
+	public String getRESOURCE_URL() {
+		return RESOURCE_URL;
+	}
+
+	public void setRESOURCE_URL(String rESOURCE_URL) {
+		RESOURCE_URL = rESOURCE_URL;
+	}
+
+	public String getSTATUS() {
+		return STATUS;
+	}
+
+	public void setSTATUS(String sTATUS) {
+		STATUS = sTATUS;
+	}
+
+	public String getDESC() {
+		return DESC;
+	}
+
+	public void setDESC(String dESC) {
+		DESC = dESC;
+	}
+
+	public String getMODIFIER() {
+		return MODIFIER;
+	}
+
+	public void setMODIFIER(String mODIFIER) {
+		MODIFIER = mODIFIER;
+	}
+
+	public String getPREV_ARTIFACT_UUID() {
+		return PREV_ARTIFACT_UUID;
+	}
+
+	public void setPREV_ARTIFACT_UUID(String pREV_ARTIFACT_UUID) {
+		PREV_ARTIFACT_UUID = pREV_ARTIFACT_UUID;
+	}
+
+	public String getCURR_ARTIFACT_UUID() {
+		return CURR_ARTIFACT_UUID;
+	}
+
+	public void setCURR_ARTIFACT_UUID(String cURR_ARTIFACT_UUID) {
+		CURR_ARTIFACT_UUID = cURR_ARTIFACT_UUID;
+	}
+
+	public String getARTIFACT_DATA() {
+		return ARTIFACT_DATA;
+	}
+
+	public void setARTIFACT_DATA(String aRTIFACT_DATA) {
+		ARTIFACT_DATA = aRTIFACT_DATA;
+	}
+
+}
diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/expected/ExpectedGetUserListAudit.java b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/expected/ExpectedGetUserListAudit.java
new file mode 100644
index 0000000000..561b92a317
--- /dev/null
+++ b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/expected/ExpectedGetUserListAudit.java
@@ -0,0 +1,88 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * SDC
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.sdc.ci.tests.datatypes.expected;
+
+public class ExpectedGetUserListAudit {
+
+	String action;
+	String modifier;
+	String status;
+	String desc;
+	String details;
+
+	public ExpectedGetUserListAudit(String action, String modifier, String status, String desc, String details) {
+		super();
+		this.action = action;
+		this.modifier = modifier;
+		this.status = status;
+		this.desc = desc;
+		this.details = details;
+	}
+
+	public ExpectedGetUserListAudit() {
+		action = null;
+		modifier = null;
+		details = null;
+		status = null;
+		desc = null;
+	}
+
+	public String getAction() {
+		return action;
+	}
+
+	public void setAction(String action) {
+		this.action = action;
+	}
+
+	public String getModifier() {
+		return modifier;
+	}
+
+	public void setModifier(String modifier) {
+		this.modifier = modifier;
+	}
+
+	public String getStatus() {
+		return status;
+	}
+
+	public void setStatus(String status) {
+		this.status = status;
+	}
+
+	public String getDesc() {
+		return desc;
+	}
+
+	public void setDesc(String desc) {
+		this.desc = desc;
+	}
+
+	public String getDetails() {
+		return details;
+	}
+
+	public void setDetails(String details) {
+		this.details = details;
+	}
+
+}
diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/expected/ExpectedGroupingAudit.java b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/expected/ExpectedGroupingAudit.java
new file mode 100644
index 0000000000..b481cb77af
--- /dev/null
+++ b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/expected/ExpectedGroupingAudit.java
@@ -0,0 +1,121 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * SDC
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.sdc.ci.tests.datatypes.expected;
+
+public class ExpectedGroupingAudit {
+	String action;
+	String modifier;
+	String categoryName;
+	String subCategoryName;
+	String groupingName;
+	String resourceType;
+	String status;
+	String desc;
+
+	public ExpectedGroupingAudit(String action, String modifier, String categoryName, String subCategoryName,
+			String groupingName, String resourceType, String status, String desc) {
+		super();
+		this.action = action;
+		this.modifier = modifier;
+		this.categoryName = categoryName;
+		this.subCategoryName = subCategoryName;
+		this.groupingName = groupingName;
+		this.resourceType = resourceType;
+		this.status = status;
+		this.desc = desc;
+	}
+
+	public ExpectedGroupingAudit() {
+		action = null;
+		modifier = null;
+		categoryName = null;
+		subCategoryName = null;
+		groupingName = null;
+		resourceType = null;
+		status = null;
+		desc = null;
+	}
+
+	public String getAction() {
+		return action;
+	}
+
+	public void setAction(String action) {
+		this.action = action;
+	}
+
+	public String getModifier() {
+		return modifier;
+	}
+
+	public void setModifier(String modifier) {
+		this.modifier = modifier;
+	}
+
+	public String getCategoryName() {
+		return categoryName;
+	}
+
+	public void setCategoryName(String categoryName) {
+		this.categoryName = categoryName;
+	}
+
+	public String getSubCategoryName() {
+		return subCategoryName;
+	}
+
+	public void setSubCategoryName(String subCategoryName) {
+		this.subCategoryName = subCategoryName;
+	}
+
+	public String getGroupingName() {
+		return groupingName;
+	}
+
+	public void setGroupingName(String groupingName) {
+		this.groupingName = groupingName;
+	}
+
+	public String getResourceType() {
+		return resourceType;
+	}
+
+	public void setResourceType(String resourceType) {
+		this.resourceType = resourceType;
+	}
+
+	public String getStatus() {
+		return status;
+	}
+
+	public void setStatus(String status) {
+		this.status = status;
+	}
+
+	public String getDesc() {
+		return desc;
+	}
+
+	public void setDesc(String desc) {
+		this.desc = desc;
+	}
+
+}
diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/expected/ExpectedProductAudit.java b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/expected/ExpectedProductAudit.java
new file mode 100644
index 0000000000..40b86fa528
--- /dev/null
+++ b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/expected/ExpectedProductAudit.java
@@ -0,0 +1,142 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * SDC
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.sdc.ci.tests.datatypes.expected;
+
+public class ExpectedProductAudit {
+
+	String ACTION;
+	String MODIFIER;
+	String STATUS;
+	String DESC;
+	String RESOURCE_NAME;
+	String RESOURCE_TYPE;
+	String PREV_VERSION;
+	String CURR_VERSION;
+	String PREV_STATE;
+	String CURR_STATE;
+	String TIMESTAMP;
+	String SERVICE_INSTANCE_ID;
+	String COMMENT;
+
+	public String getCOMMENT() {
+		return COMMENT;
+	}
+
+	public void setCOMMENT(String cOMMENT) {
+		COMMENT = cOMMENT;
+	}
+
+	public String getSERVICE_INSTANCE_ID() {
+		return SERVICE_INSTANCE_ID;
+	}
+
+	public void setSERVICE_INSTANCE_ID(String sERVICE_INSTANCE_ID) {
+		SERVICE_INSTANCE_ID = sERVICE_INSTANCE_ID;
+	}
+
+	public String getACTION() {
+		return ACTION;
+	}
+
+	public void setACTION(String aCTION) {
+		ACTION = aCTION;
+	}
+
+	public String getMODIFIER() {
+		return MODIFIER;
+	}
+
+	public void setMODIFIER(String mODIFIER) {
+		MODIFIER = mODIFIER;
+	}
+
+	public String getSTATUS() {
+		return STATUS;
+	}
+
+	public void setSTATUS(String sTATUS) {
+		STATUS = sTATUS;
+	}
+
+	public String getDESC() {
+		return DESC;
+	}
+
+	public void setDESC(String dESC) {
+		DESC = dESC;
+	}
+
+	public String getRESOURCE_NAME() {
+		return RESOURCE_NAME;
+	}
+
+	public void setRESOURCE_NAME(String rESOURCE_NAME) {
+		RESOURCE_NAME = rESOURCE_NAME;
+	}
+
+	public String getRESOURCE_TYPE() {
+		return RESOURCE_TYPE;
+	}
+
+	public void setRESOURCE_TYPE(String rESOURCE_TYPE) {
+		RESOURCE_TYPE = rESOURCE_TYPE;
+	}
+
+	public String getPREV_VERSION() {
+		return PREV_VERSION;
+	}
+
+	public void setPREV_VERSION(String pREV_VERSION) {
+		PREV_VERSION = pREV_VERSION;
+	}
+
+	public String getCURR_VERSION() {
+		return CURR_VERSION;
+	}
+
+	public void setCURR_VERSION(String cURR_VERSION) {
+		CURR_VERSION = cURR_VERSION;
+	}
+
+	public String getPREV_STATE() {
+		return PREV_STATE;
+	}
+
+	public void setPREV_STATE(String pREV_STATE) {
+		PREV_STATE = pREV_STATE;
+	}
+
+	public String getCURR_STATE() {
+		return CURR_STATE;
+	}
+
+	public void setCURR_STATE(String cURR_STATE) {
+		CURR_STATE = cURR_STATE;
+	}
+
+	public String getTIMESTAMP() {
+		return TIMESTAMP;
+	}
+
+	public void setTIMESTAMP(String tIMESTAMP) {
+		TIMESTAMP = tIMESTAMP;
+	}
+}
diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/expected/ExpectedResourceAuditJavaObject.java b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/expected/ExpectedResourceAuditJavaObject.java
new file mode 100644
index 0000000000..59ca7bbf7e
--- /dev/null
+++ b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/expected/ExpectedResourceAuditJavaObject.java
@@ -0,0 +1,310 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * SDC
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.sdc.ci.tests.datatypes.expected;
+
+public class ExpectedResourceAuditJavaObject {
+
+	String ACTION;
+	String MODIFIER_NAME;
+	String MODIFIER_UID;
+	String STATUS;
+	String DESC;
+	String RESOURCE_NAME;
+	String RESOURCE_TYPE;
+	String PREV_VERSION;
+	String CURR_VERSION;
+	String PREV_STATE;
+	String CURR_STATE;
+	String TIMESTAMP;
+	String ARTIFACT_DATA;
+	String DPREV_STATUS;
+	String DCURR_STATUS;
+	String COMMENT;
+	String DID;
+	String TOPIC_NAME;
+	String TOSCA_NODE_TYPE;
+	String CURR_ARTIFACT_UUID;
+	String PREV_ARTIFACT_UUID;
+	String ARTIFACT_TIMEOUT;
+	String MODIFIER;
+	String SERVICE_INSTANCE_ID;
+	String CONSUMER_ID;
+	String RESOURCE_URL;
+	
+	// TODO: Remove comment
+//	String INVARIANT_UUID;
+//	
+//	public String getINVARIANT_UUID() {
+//		return INVARIANT_UUID;
+//	}
+//	
+//	public void setINVARIANT_UUID(String invariant_uuid) {
+//		INVARIANT_UUID = invariant_uuid;
+//	}
+
+	public String getCONSUMER_ID() {
+		return CONSUMER_ID;
+	}
+
+	public void setCONSUMER_ID(String consumer_id) {
+		CONSUMER_ID = consumer_id;
+	}
+
+	public String getRESOURCE_URL() {
+		return RESOURCE_URL;
+	}
+
+	public void setRESOURCE_URL(String resource_url) {
+		RESOURCE_URL = resource_url;
+	}
+
+	public String getSERVICE_INSTANCE_ID() {
+		return SERVICE_INSTANCE_ID;
+	}
+
+	public void setSERVICE_INSTANCE_ID(String sERVICE_INSTANCE_ID) {
+		SERVICE_INSTANCE_ID = sERVICE_INSTANCE_ID;
+	}
+
+	public String getMODIFIER() {
+		return MODIFIER;
+	}
+
+	public void setMODIFIER(String mODIFIER) {
+		MODIFIER = mODIFIER;
+	}
+
+	public String getArtifactTimeout() {
+		return ARTIFACT_TIMEOUT;
+	}
+
+	public void setArtifactTimeout(String artifactTimeout) {
+		this.ARTIFACT_TIMEOUT = artifactTimeout;
+	}
+
+	public String getCurrArtifactUuid() {
+		return CURR_ARTIFACT_UUID;
+	}
+
+	public void setCurrArtifactUuid(String currArtifactUuid) {
+		this.CURR_ARTIFACT_UUID = currArtifactUuid;
+	}
+
+	public String getPrevArtifactUuid() {
+		return PREV_ARTIFACT_UUID;
+	}
+
+	public void setPrevArtifactUuid(String prevArtifactUuid) {
+		this.PREV_ARTIFACT_UUID = prevArtifactUuid;
+	}
+
+	public String getToscaNodeType() {
+		return TOSCA_NODE_TYPE;
+	}
+
+	public void setToscaNodeType(String ToscaNodeType) {
+		this.TOSCA_NODE_TYPE = ToscaNodeType;
+	}
+
+	public String getTopicName() {
+		return TOPIC_NAME;
+	}
+
+	public void setTopicName(String topicName) {
+		this.TOPIC_NAME = topicName;
+	}
+
+	public String getDistributionId() {
+		return DID;
+	}
+
+	public void setDistributionId(String did) {
+		this.DID = did;
+	}
+
+	public ExpectedResourceAuditJavaObject() {
+		super();
+	}
+
+	public ExpectedResourceAuditJavaObject(String action, String modifierName, String modifierUid, String status,
+			String desc, String resourceName, String resourceType, String prevVersion, String currVersion,
+			String prevState, String currState, String timestamp, String toscaNodesType, String timeout,
+			String modifier, String serviceInstanceId) {
+		super();
+		this.ACTION = action;
+		this.MODIFIER_NAME = modifierName;
+		this.MODIFIER_UID = modifierUid;
+		this.STATUS = status;
+		this.DESC = desc;
+		this.RESOURCE_NAME = resourceName;
+		this.RESOURCE_TYPE = resourceType;
+		this.PREV_VERSION = prevVersion;
+		this.CURR_VERSION = currVersion;
+		this.PREV_STATE = prevState;
+		this.CURR_STATE = currState;
+		this.TIMESTAMP = timestamp;
+		this.TOSCA_NODE_TYPE = toscaNodesType;
+		this.ARTIFACT_TIMEOUT = timeout;
+		this.MODIFIER = modifier;
+		this.SERVICE_INSTANCE_ID = serviceInstanceId;
+	}
+
+	public String getAction() {
+		return ACTION;
+	}
+
+	public void setAction(String action) {
+		this.ACTION = action;
+	}
+
+	public String getModifierName() {
+		return MODIFIER_NAME;
+	}
+
+	public void setModifierName(String modifierName) {
+		this.MODIFIER_NAME = modifierName;
+	}
+
+	public String getModifierUid() {
+		return MODIFIER_UID;
+	}
+
+	public void setModifierUid(String modifierUid) {
+		this.MODIFIER_UID = modifierUid;
+	}
+
+	public String getStatus() {
+		return STATUS;
+	}
+
+	public void setStatus(String status) {
+		this.STATUS = status;
+	}
+
+	public String getDesc() {
+		return DESC;
+	}
+
+	public void setDesc(String desc) {
+		this.DESC = desc;
+	}
+
+	public String getResourceName() {
+		return RESOURCE_NAME;
+	}
+
+	public void setResourceName(String resourceName) {
+		this.RESOURCE_NAME = resourceName;
+	}
+
+	public String getResourceType() {
+		return RESOURCE_TYPE;
+	}
+
+	public void setResourceType(String resourceType) {
+		this.RESOURCE_TYPE = resourceType;
+	}
+
+	public String getPrevVersion() {
+		return PREV_VERSION;
+	}
+
+	public void setPrevVersion(String prevVersion) {
+		this.PREV_VERSION = prevVersion;
+	}
+
+	public String getCurrVersion() {
+		return CURR_VERSION;
+	}
+
+	public void setCurrVersion(String currVersion) {
+		this.CURR_VERSION = currVersion;
+	}
+
+	public String getPrevState() {
+		return PREV_STATE;
+	}
+
+	public void setPrevState(String prevState) {
+		this.PREV_STATE = prevState;
+	}
+
+	public String getCurrState() {
+		return CURR_STATE;
+	}
+
+	public void setCurrState(String currState) {
+		this.CURR_STATE = currState;
+	}
+
+	public String getTimestamp() {
+		return TIMESTAMP;
+	}
+
+	public void setTimestamp(String timestamp) {
+		this.TIMESTAMP = timestamp;
+	}
+
+	public String getArtifactData() {
+		return ARTIFACT_DATA;
+	}
+
+	public void setArtifactData(String artifactData) {
+		this.ARTIFACT_DATA = artifactData;
+	}
+
+	public String getDprevStatus() {
+		return DPREV_STATUS;
+	}
+
+	public void setDprevStatus(String dprevStatus) {
+		this.DPREV_STATUS = dprevStatus;
+	}
+
+	public String getDcurrStatus() {
+		return DCURR_STATUS;
+	}
+
+	public void setDcurrStatus(String dcurrStatus) {
+		this.DCURR_STATUS = dcurrStatus;
+	}
+
+	public String getComment() {
+		return COMMENT;
+	}
+
+	public void setComment(String comment) {
+		this.COMMENT = comment;
+	}
+
+	@Override
+	public String toString() {
+		return "ExpectedResourceAuditJavaObject [ACTION=" + ACTION + ", STATUS=" + STATUS + ", DESC=" + DESC
+				+ ", RESOURCE_NAME=" + RESOURCE_NAME + ", RESOURCE_TYPE=" + RESOURCE_TYPE + ", PREV_VERSION="
+				+ PREV_VERSION + ", CURR_VERSION=" + CURR_VERSION + ", PREV_STATE=" + PREV_STATE + ", CURR_STATE="
+				+ CURR_STATE + ", TIMESTAMP=" + TIMESTAMP + ", ARTIFACT_DATA=" + ARTIFACT_DATA + ", DPREV_STATUS="
+				+ DPREV_STATUS + ", DCURR_STATUS=" + DCURR_STATUS + ", COMMENT=" + COMMENT + ", DID=" + DID
+				+ ", TOPIC_NAME=" + TOPIC_NAME + ", TOSCA_NODE_TYPE=" + TOSCA_NODE_TYPE + ", CURR_ARTIFACT_UUID="
+				+ CURR_ARTIFACT_UUID + ", PREV_ARTIFACT_UUID=" + PREV_ARTIFACT_UUID + ", ARTIFACT_TIMEOUT="
+				+ ARTIFACT_TIMEOUT + ", MODIFIER=" + MODIFIER + ", SERVICE_INSTANCE_ID=" + SERVICE_INSTANCE_ID + "]";
+	}
+
+}
diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/expected/ExpectedUserCRUDAudit.java b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/expected/ExpectedUserCRUDAudit.java
new file mode 100644
index 0000000000..2bc8625057
--- /dev/null
+++ b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/expected/ExpectedUserCRUDAudit.java
@@ -0,0 +1,98 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * SDC
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.sdc.ci.tests.datatypes.expected;
+
+public class ExpectedUserCRUDAudit {
+	String action;
+	String modifier;
+	String status;
+	String desc;
+	String userBefore;
+	String userAfter;
+
+	public ExpectedUserCRUDAudit(String action, String modifier, String status, String desc, String userBefore,
+			String userAfter) {
+		super();
+		this.action = action;
+		this.modifier = modifier;
+		this.status = status;
+		this.desc = desc;
+		this.userBefore = userBefore;
+		this.userAfter = userAfter;
+	}
+
+	public ExpectedUserCRUDAudit() {
+		action = null;
+		modifier = null;
+		userBefore = null;
+		userAfter = null;
+		status = null;
+		desc = null;
+	}
+
+	public String getAction() {
+		return action;
+	}
+
+	public void setAction(String action) {
+		this.action = action;
+	}
+
+	public String getModifier() {
+		return modifier;
+	}
+
+	public void setModifier(String modifier) {
+		this.modifier = modifier;
+	}
+
+	public String getStatus() {
+		return status;
+	}
+
+	public void setStatus(String status) {
+		this.status = status;
+	}
+
+	public String getDesc() {
+		return desc;
+	}
+
+	public void setDesc(String desc) {
+		this.desc = desc;
+	}
+
+	public String getUserBefore() {
+		return userBefore;
+	}
+
+	public void setUserBefore(String userBefore) {
+		this.userBefore = userBefore;
+	}
+
+	public String getUserAfter() {
+		return userAfter;
+	}
+
+	public void setUserAfter(String userAfter) {
+		this.userAfter = userAfter;
+	}
+}
diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/http/HeaderData.java b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/http/HeaderData.java
new file mode 100644
index 0000000000..2c23b08717
--- /dev/null
+++ b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/http/HeaderData.java
@@ -0,0 +1,114 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * SDC
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.sdc.ci.tests.datatypes.http;
+
+public class HeaderData {
+	String contentMd5;
+	String contentType;
+	String HttpCspUserId;
+	String HttpCspFirstName;
+	String HttpCspLastName;
+	String HttpCspWsType;
+	String HttpIvRemoteAddress;
+	String HttpIvUser;
+
+	public HeaderData() {
+		super();
+	}
+
+	public HeaderData(String contentMd5, String contentType, String httpCspUserId, String httpCspFirstName,
+			String httpCspLastName, String httpCspWsType, String httpIvRemoteAddress, String httpIvUser) {
+		super();
+		this.contentMd5 = contentMd5;
+		this.contentType = contentType;
+		HttpCspUserId = httpCspUserId;
+		HttpCspFirstName = httpCspFirstName;
+		HttpCspLastName = httpCspLastName;
+		HttpCspWsType = httpCspWsType;
+		HttpIvRemoteAddress = httpIvRemoteAddress;
+		HttpIvUser = httpIvUser;
+	}
+
+	public String getContentMd5() {
+		return contentMd5;
+	}
+
+	public void setContentMd5(String contentMd5) {
+		this.contentMd5 = contentMd5;
+	}
+
+	public String getContentType() {
+		return contentType;
+	}
+
+	public void setContentType(String contentType) {
+		this.contentType = contentType;
+	}
+
+	public String getHttpCspUserId() {
+		return HttpCspUserId;
+	}
+
+	public void setHttpCspUserId(String httpCspUserId) {
+		HttpCspUserId = httpCspUserId;
+	}
+
+	public String getHttpCspFirstName() {
+		return HttpCspFirstName;
+	}
+
+	public void setHttpCspFirstName(String httpCspFirstName) {
+		HttpCspFirstName = httpCspFirstName;
+	}
+
+	public String getHttpCspLastName() {
+		return HttpCspLastName;
+	}
+
+	public void setHttpCspLastName(String httpCspLastName) {
+		HttpCspLastName = httpCspLastName;
+	}
+
+	public String getHttpCspWsType() {
+		return HttpCspWsType;
+	}
+
+	public void setHttpCspWsType(String httpCspWsType) {
+		HttpCspWsType = httpCspWsType;
+	}
+
+	public String getHttpIvRemoteAddress() {
+		return HttpIvRemoteAddress;
+	}
+
+	public void setHttpIvRemoteAddress(String httpIvRemoteAddress) {
+		HttpIvRemoteAddress = httpIvRemoteAddress;
+	}
+
+	public String getHttpIvUser() {
+		return HttpIvUser;
+	}
+
+	public void setHttpIvUser(String httpIvUser) {
+		HttpIvUser = httpIvUser;
+	}
+
+}
diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/http/HeaderValue.java b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/http/HeaderValue.java
new file mode 100644
index 0000000000..4a2ad9ab82
--- /dev/null
+++ b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/http/HeaderValue.java
@@ -0,0 +1,38 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * SDC
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.sdc.ci.tests.datatypes.http;
+
+public enum HeaderValue {
+
+	APPLICATION_JSON("application/json");
+
+	String value;
+
+	private HeaderValue(String value) {
+		this.value = value;
+	}
+
+	public String getValue() {
+
+		return value;
+	}
+
+}
diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/http/HttpHeaderEnum.java b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/http/HttpHeaderEnum.java
new file mode 100644
index 0000000000..cd3beee150
--- /dev/null
+++ b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/http/HttpHeaderEnum.java
@@ -0,0 +1,58 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * SDC
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.sdc.ci.tests.datatypes.http;
+
+public enum HttpHeaderEnum {
+
+	Content_MD5("Content-MD5"), 
+	USER_ID("USER_ID"), 
+	HTTP_CSP_FIRSTNAME("HTTP_CSP_FIRSTNAME"), 
+	HTTP_CSP_LASTNAME("HTTP_CSP_LASTNAME"), 
+	HTTP_CSP_WSTYPE("HTTP_CSP_WSTYPE"), 
+	HTTP_IV_REMOTE_ADDRESS("HTTP_IV_REMOTE_ADDRESS"), 
+	HTTP_IV_USER("HTTP_IV_USER"), 
+	HTTP_CSP_EMAIL("HTTP_CSP_EMAIL"), 
+	CONTENT_TYPE("Content-Type"), 
+	ACCEPT("Accept"), 
+	X_ECOMP_REQUEST_ID_HEADER("X-ECOMP-RequestID"), 
+	CACHE_CONTROL("Cache-Control"), 
+	X_ECOMP_INSTANCE_ID("X-ECOMP-InstanceID"), 
+	AUTHORIZATION("Authorization"), 
+	CONTENT_LENGTH("Content-Length"), 
+	CONTENT_DISPOSITION("Content-Disposition"), 
+	HOST("Host"), 
+	X_ECOMP_SERVICE_ID_HEADER("X-ECOMP-ServiceID"), 
+	WWW_AUTHENTICATE("WWW-Authenticate"),
+	ECOMP_PASSWORD("password"), 
+	ECOMP_USERNAME("username");
+	
+	String value;
+
+	private HttpHeaderEnum(String value) {
+		this.value = value;
+	}
+
+	public String getValue() {
+
+		return value;
+	}
+
+}
diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/http/HttpRequest.java b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/http/HttpRequest.java
new file mode 100644
index 0000000000..9983eb6c11
--- /dev/null
+++ b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/http/HttpRequest.java
@@ -0,0 +1,388 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * SDC
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.sdc.ci.tests.datatypes.http;
+
+import java.io.BufferedReader;
+import java.io.DataOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.io.StringWriter;
+import java.net.HttpURLConnection;
+import java.net.URL;
+import java.nio.charset.Charset;
+import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
+import javax.net.ssl.HttpsURLConnection;
+import org.apache.commons.io.IOUtils;
+import org.apache.http.HttpEntity;
+import org.apache.http.client.methods.CloseableHttpResponse;
+import org.apache.http.client.methods.HttpPost;
+import org.apache.http.impl.client.CloseableHttpClient;
+import org.apache.http.impl.client.HttpClients;
+import org.openecomp.sdc.ci.tests.utils.rest.BaseRestUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class HttpRequest {
+    static Logger logger = LoggerFactory.getLogger(HttpRequest.class.getName());
+
+    //	-----------------------------Http------------------------------------------------------------------------
+    public RestResponse httpSendGetInternal(String url, Map<String, String> headers) throws IOException {
+        RestResponse restResponse = new RestResponse();
+        url = url.replaceAll("\\s", "%20");
+        URL obj = new URL(url);
+        HttpURLConnection con = (HttpURLConnection) obj.openConnection();
+        // optional default is GET
+        con.setRequestMethod("GET");
+        addHttpRequestHEaders(headers, con);
+
+        int responseCode = con.getResponseCode();
+        logger.debug("Send GET http request, url: {}", url);
+        logger.debug("Response Code: {}", responseCode);
+
+        StringBuffer response = new StringBuffer();
+        String result;
+		result = IOUtils.toString(con.getInputStream());
+		response.append(result);
+        if (con.getErrorStream() != null) {
+            throw new IOException(IOUtils.toString(con.getErrorStream()));
+        }
+
+        logger.debug("Response body: {}", response);
+
+        // print result
+        setHttpResponseToObject(restResponse, con, responseCode, response);
+        con.disconnect();
+
+        return restResponse;
+    }
+
+    public RestResponse httpSendByMethodInternal(String url, String method, String body, Map<String, String> headers) throws IOException {
+
+        RestResponse restResponse = new RestResponse();
+        URL obj = new URL(url);
+        HttpURLConnection con = (HttpURLConnection) obj.openConnection();
+        con.setRequestMethod(method);
+        addHttpRequestHEaders(headers, con);
+        if (body != null && !body.isEmpty() && !method.equals("DELETE")) {
+            con.setDoOutput(true);
+            DataOutputStream wr = new DataOutputStream(con.getOutputStream());
+            wr.writeBytes(body);
+            wr.flush();
+            wr.close();
+        }
+
+        int responseCode = con.getResponseCode();
+        logger.debug("Send {} http request, url: {}", method, url);
+        logger.debug("Response Code: {}", responseCode);
+        StringBuffer response = generateHttpResponse(con, false);
+        if (con.getErrorStream() != null) {
+            throw new IOException(IOUtils.toString(con.getErrorStream()));
+        }
+        logger.debug("Response body: {}", response);
+        setHttpResponseToObject(restResponse, con, responseCode, response);
+        con.disconnect();
+
+        return restResponse;
+    }
+
+    public RestResponse httpSendDelete(String url, Map<String, String> headers) throws IOException {
+        if (url.matches("^(https)://.*$")) {
+            return httpsSendDelete(url, headers);
+        }
+        return httpSendDeleteInternal(url, headers);
+    }
+
+    public RestResponse httpSendGet(String url, Map<String, String> headers) throws IOException {
+        if (url.matches("^(https)://.*$")) {
+            return httpsSendGet(url, headers);
+        }
+        return httpSendGetInternal(url, headers);
+    }
+
+    public RestResponse httpSendByMethod(String url, String method, String body, Map<String, String> headers) throws IOException {
+        if (url.matches("^(https)://.*$")) {
+            return httpsSendByMethod(url, method, body, headers);
+        }
+        return httpSendByMethodInternal(url, method, body, headers);
+    }
+
+    public RestResponse httpSendPost(String url, String body, Map<String, String> headers) throws IOException {
+        if (url.matches("^(https)://.*$")) {
+            return httpsSendByMethod(url, "POST", body, headers);
+        }
+        return httpSendByMethod(url, "POST", body, headers);
+    }
+
+    public RestResponse httpSendPut(String url, String body, Map<String, String> headers) throws IOException {
+        if (url.matches("^(https)://.*$")) {
+            return httpsSendByMethod(url, "PUT", body, headers);
+        }
+        return httpSendByMethod(url, "PUT", body, headers);
+    }
+
+
+    public RestResponse httpSendDeleteInternal(String url, Map<String, String> headers) throws IOException {
+
+        RestResponse restResponse = new RestResponse();
+        URL obj = new URL(url);
+        HttpURLConnection con = (HttpURLConnection) obj.openConnection();
+
+        addHttpRequestHEaders(headers, con);
+
+        con.setDoOutput(true);
+        con.setRequestMethod("DELETE");
+        int responseCode = con.getResponseCode();
+        logger.debug("Send DELETE http request, url: {}", url);
+        logger.debug("Response Code: {}", responseCode);
+
+        StringBuffer response = generateHttpResponse(con, false);
+        if (con.getErrorStream() != null) {
+            throw new IOException(IOUtils.toString(con.getErrorStream()));
+        }
+        logger.debug("Response body: {}", response);
+
+        setHttpResponseToObject(restResponse, con, responseCode, response);
+        con.disconnect();
+
+        return restResponse;
+    }
+
+    public static RestResponse sendHttpPostWithEntity(HttpEntity requestEntity, String url, Map<String, String> headers) throws IOException {
+        CloseableHttpResponse response = null;
+        try (CloseableHttpClient client = HttpClients.createDefault()) {
+            HttpPost httpPost = new HttpPost(url);
+            RestResponse restResponse = new RestResponse();
+            for (Entry<String, String> entry : headers.entrySet()) {
+                httpPost.addHeader(entry.getKey(), entry.getValue());
+            }
+
+            httpPost.setEntity(requestEntity);
+            response = client.execute(httpPost);
+            HttpEntity responseEntity = response.getEntity();
+            String responseBody = null;
+            if (responseEntity != null) {
+                try (InputStream instream = responseEntity.getContent()) {
+					StringWriter writer = new StringWriter();
+					IOUtils.copy(instream, writer);
+					responseBody = writer.toString();
+				}
+            }
+
+            restResponse.setErrorCode(response.getStatusLine().getStatusCode());
+            restResponse.setResponse(responseBody);
+
+            return restResponse;
+
+        } finally {
+            closeResponse(response);
+        }
+    }
+
+    private static void closeResponse(CloseableHttpResponse response) {
+        try {
+            if (response != null) {
+                response.close();
+            }
+        } catch (IOException e) {
+            logger.debug("failed to close client or response: ", e);
+        }
+    }
+
+
+    //	-----------------------------Https------------------------------------------------------------------------
+    public RestResponse httpsSendGet(String url, Map<String, String> headers) throws IOException {
+
+        RestResponse restResponse = new RestResponse();
+        url = url.replaceAll("\\s", "%20");
+        URL obj = new URL(null, url);
+        HttpsURLConnection con = (HttpsURLConnection) obj.openConnection();
+// optional default is GET
+        con.setRequestMethod("GET");
+        addHttpsRequestHeaders(headers, con);
+        boolean multiPart = false;
+        if (headers.get(HttpHeaderEnum.ACCEPT.getValue()) != null) {
+            if (headers.get(HttpHeaderEnum.ACCEPT.getValue()).equals(BaseRestUtils.acceptMultipartHeader)) {
+                multiPart = true;
+            }
+        }
+        int responseCode = con.getResponseCode();
+        logger.debug("Send GET http request, url: {}", url);
+        logger.debug("Response Code: {}", responseCode);
+
+        StringBuffer response = generateHttpsResponse(con, multiPart);
+		if (con.getErrorStream() != null) {
+            throw new IOException(IOUtils.toString(con.getErrorStream()));
+		}
+        logger.debug("Response body: {}", response);
+        setHttpsResponseToObject(restResponse, con, responseCode, response);
+        con.disconnect();
+
+        return restResponse;
+    }
+
+    public RestResponse httpsSendByMethod(String url, String method, String body, Map<String, String> headers) throws IOException {
+        RestResponse restResponse = new RestResponse();
+        URL obj = new URL(null, url);
+        HttpsURLConnection con = (HttpsURLConnection) obj.openConnection();
+        con.setRequestMethod(method);
+        addHttpRequestHEaders(headers, con);
+        if (body != null && !body.isEmpty() && !method.equals("DELETE")) {
+            con.setDoOutput(true);
+            DataOutputStream wr = new DataOutputStream(con.getOutputStream());
+            wr.writeBytes(body);
+            wr.flush();
+            wr.close();
+        }
+
+        int responseCode = con.getResponseCode();
+        logger.debug("Send {} http request, url: {}", method, url);
+        logger.debug("Response Code: {}", responseCode);
+
+        StringBuffer response = generateHttpResponse(con, false);
+		if (con.getErrorStream() != null) {
+            throw new IOException(IOUtils.toString(con.getErrorStream()));
+		}
+        logger.debug("Response body: {}", response);
+        setHttpResponseToObject(restResponse, con, responseCode, response);
+        con.disconnect();
+
+        return restResponse;
+    }
+
+
+    public RestResponse httpsSendDelete(String url, Map<String, String> headers) throws IOException {
+
+        RestResponse restResponse = new RestResponse();
+        URL obj = new URL(null, url);
+        HttpsURLConnection con = (HttpsURLConnection) obj.openConnection();
+// add request headers
+        addHttpRequestHEaders(headers, con);
+
+        con.setDoOutput(true);
+        con.setRequestMethod("DELETE");
+        int responseCode = con.getResponseCode();
+        logger.debug("Send DELETE http request, url: {}", url);
+        logger.debug("Response Code: {}", responseCode);
+
+        StringBuffer response = generateHttpsResponse(con, false);
+
+		if (con.getErrorStream() != null) {
+            throw new IOException(IOUtils.toString(con.getErrorStream()));
+		}
+        logger.debug("Response body: {}", response);
+// print result
+        setHttpResponseToObject(restResponse, con, responseCode, response);
+        con.disconnect();
+
+        return restResponse;
+    }
+
+    //	---------------------------------------
+    private void addHttpsRequestHeaders(Map<String, String> headers, HttpsURLConnection con) {
+        // add request header
+        if (headers != null) {
+            for (Entry<String, String> header : headers.entrySet()) {
+                String key = header.getKey();
+                String value = header.getValue();
+                con.setRequestProperty(key, value);
+            }
+
+        }
+    }
+
+    private void addHttpRequestHEaders(Map<String, String> headers, HttpURLConnection con) {
+        // add request header
+        if (headers != null) {
+            for (Entry<String, String> header : headers.entrySet()) {
+                String key = header.getKey();
+                String value = header.getValue();
+                con.setRequestProperty(key, value);
+            }
+
+        }
+    }
+
+    private void setHttpResponseToObject(RestResponse restResponse, HttpURLConnection con, int responseCode, StringBuffer response) throws IOException {
+        restResponse.setErrorCode(responseCode);
+
+        if (response != null) {
+            restResponse.setResponse(response.toString());
+        }
+
+        Map<String, List<String>> headerFields = con.getHeaderFields();
+        restResponse.setHeaderFields(headerFields);
+        String responseMessage = con.getResponseMessage();
+        restResponse.setResponseMessage(responseMessage);
+    }
+
+    private StringBuffer generateHttpResponse(HttpURLConnection con, Boolean isMultiPart) throws IOException {
+        StringBuffer response = new StringBuffer();
+        StringWriter writer = new StringWriter();
+            if (isMultiPart) {
+                IOUtils.copy((con.getInputStream()), writer, Charset.forName("UTF-8"));
+                response = writer.getBuffer();
+            } else {
+                try (BufferedReader in = new BufferedReader(new InputStreamReader(con.getInputStream()))) {
+					String inputLine;
+					while ((inputLine = in.readLine()) != null) {
+						response.append(inputLine);
+					}
+				}
+            }
+
+        return response;
+    }
+
+    private void setHttpsResponseToObject(RestResponse restResponse, HttpsURLConnection con, int responseCode, StringBuffer response) throws IOException {
+        if (response != null) {
+            restResponse.setResponse(response.toString());
+        }
+
+        restResponse.setErrorCode(responseCode);
+        // restResponse.setResponse(result);
+        Map<String, List<String>> headerFields = con.getHeaderFields();
+        restResponse.setHeaderFields(headerFields);
+        String responseMessage = con.getResponseMessage();
+        restResponse.setResponseMessage(responseMessage);
+    }
+
+    private StringBuffer generateHttpsResponse(HttpsURLConnection con, Boolean isMultiPart) throws IOException {
+        StringBuffer response = new StringBuffer();
+        StringWriter writer = new StringWriter();
+		if (isMultiPart) {
+			IOUtils.copy((con.getInputStream()), writer, Charset.forName("UTF-8"));
+			response = writer.getBuffer();
+		} else {
+
+			try (BufferedReader in = new BufferedReader(new InputStreamReader(con.getInputStream()))) {
+				String inputLine;
+				while ((inputLine = in.readLine()) != null) {
+					response.append(inputLine);
+				}
+			}
+		}
+        return response;
+    }
+
+}
diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/http/MustHeaders.java b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/http/MustHeaders.java
new file mode 100644
index 0000000000..6937608d2a
--- /dev/null
+++ b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/http/MustHeaders.java
@@ -0,0 +1,53 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * SDC
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.sdc.ci.tests.datatypes.http;
+
+import java.util.HashMap;
+import java.util.Map;
+
+public class MustHeaders {
+
+	private Map<String, String> headers = new HashMap<String, String>();
+
+	public MustHeaders(HeaderData headerData) {
+
+		super();
+		headers.put(HttpHeaderEnum.Content_MD5.getValue(), headerData.getContentMd5());
+		headers.put(HttpHeaderEnum.CONTENT_TYPE.getValue(), headerData.getContentType());
+		headers.put(HttpHeaderEnum.ACCEPT.getValue(), headerData.getContentType());
+		headers.put(HttpHeaderEnum.USER_ID.getValue(), headerData.getHttpCspUserId());
+		headers.put(HttpHeaderEnum.HTTP_CSP_FIRSTNAME.getValue(), headerData.getHttpCspFirstName());
+		headers.put(HttpHeaderEnum.HTTP_CSP_LASTNAME.getValue(), headerData.getHttpCspLastName());
+		headers.put(HttpHeaderEnum.HTTP_CSP_WSTYPE.getValue(), headerData.getHttpCspWsType());
+		headers.put(HttpHeaderEnum.HTTP_IV_REMOTE_ADDRESS.getValue(), headerData.getHttpIvRemoteAddress());
+		headers.put(HttpHeaderEnum.HTTP_IV_USER.getValue(), headerData.getHttpIvUser());
+
+	}
+
+	public MustHeaders() {
+		super();
+	}
+
+	public Map<String, String> getMap() {
+		return headers;
+	}
+
+}
diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/http/RestResponse.java b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/http/RestResponse.java
new file mode 100644
index 0000000000..f11d35a646
--- /dev/null
+++ b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/http/RestResponse.java
@@ -0,0 +1,84 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * SDC
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.sdc.ci.tests.datatypes.http;
+
+import java.util.List;
+import java.util.Map;
+
+public class RestResponse {
+
+	Integer errorCode;
+	String response;
+	Map<String, List<String>> headerFields;
+	String responseMessage;
+
+	public RestResponse() {
+		super();
+	}
+
+	public RestResponse(Integer errorCode, String response, Map<String, List<String>> headerFields,
+			String responseMessage) {
+		super();
+		this.errorCode = errorCode;
+		this.response = response;
+		this.headerFields = headerFields;
+		this.responseMessage = responseMessage;
+	}
+
+	public Integer getErrorCode() {
+		return errorCode;
+	}
+
+	public void setErrorCode(Integer errorCode) {
+		this.errorCode = errorCode;
+	}
+
+	public String getResponse() {
+		return response;
+	}
+
+	public void setResponse(String response) {
+		this.response = response;
+	}
+
+	public Map<String, List<String>> getHeaderFields() {
+		return headerFields;
+	}
+
+	public void setHeaderFields(Map<String, List<String>> headerFields) {
+		this.headerFields = headerFields;
+	}
+
+	public String getResponseMessage() {
+		return responseMessage;
+	}
+
+	public void setResponseMessage(String responseMessage) {
+		this.responseMessage = responseMessage;
+	}
+
+	@Override
+	public String toString() {
+		return "RestResponse [errorCode=" + errorCode + ", response=" + response + ", headerFields=" + headerFields
+				+ ", responseMessage=" + responseMessage + "]";
+	}
+
+}
diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/execute/TODO/ImportCapabilityTypeCITest.java b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/execute/TODO/ImportCapabilityTypeCITest.java
new file mode 100644
index 0000000000..bcd00a10b7
--- /dev/null
+++ b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/execute/TODO/ImportCapabilityTypeCITest.java
@@ -0,0 +1,134 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * SDC
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.sdc.ci.tests.execute.TODO;
+
+import fj.data.Either;
+import org.apache.http.client.methods.CloseableHttpResponse;
+import org.apache.http.client.methods.HttpPost;
+import org.apache.http.entity.mime.MultipartEntityBuilder;
+import org.apache.http.entity.mime.content.FileBody;
+import org.apache.http.impl.client.CloseableHttpClient;
+import org.apache.http.impl.client.HttpClients;
+import org.apache.tinkerpop.gremlin.structure.Vertex;
+import org.openecomp.sdc.ci.tests.api.Urls;
+import org.openecomp.sdc.ci.tests.config.Config;
+import org.openecomp.sdc.ci.tests.utils.DbUtils;
+import org.openecomp.sdc.ci.tests.utils.DbUtils.JanusGraphState;
+import org.openecomp.sdc.ci.tests.utils.Utils;
+import org.testng.AssertJUnit;
+import org.testng.annotations.AfterClass;
+import org.testng.annotations.Test;
+
+import java.io.File;
+import java.io.IOException;
+
+public class ImportCapabilityTypeCITest {
+	public static final DbUtils DbUtils = new DbUtils();
+
+	@AfterClass
+	public static void afterClass() {
+		DbUtils.shutDownJanusGraph();
+	}
+
+	static Config config = Config.instance();
+
+	// private final String IMPORT_CAPABILITY_TYPES_PATH =
+	// "src/test/resources/CI/importResourceTests/import_capabilitiesTypes/";
+
+	@Test
+	public void testAddingCapabilityTypes() throws IOException {
+		JanusGraphState originalState = DbUtils.getCurrentJanusGraphState();
+
+		String importResourceDir = config.getImportResourceConfigDir();
+
+		String capabilityTypes = importResourceDir + File.separator + "capabilityTypesCi.zip";
+		// importCapabilityType("src/test/resources/CI/importResource/capabilityTypesCi.zip");
+		importCapabilityType(capabilityTypes);
+		Either<Vertex, Boolean> eitherVertex = DbUtils.getVertexByUId("tosca.capabilities.Test.Ci");
+		AssertJUnit.assertTrue(eitherVertex.isLeft());
+		DbUtils.restoreToJanusGraphState(originalState);
+		eitherVertex = DbUtils.getVertexByUId("tosca.capabilities.Test.Ci");
+		AssertJUnit.assertTrue(eitherVertex.isRight());
+	}
+
+	@Test
+	public void AddingCapabilityNotFound() throws IOException {
+		JanusGraphState originalState = DbUtils.getCurrentJanusGraphState();
+		String importResourceTestsDir = config.getImportResourceTestsConfigDir();
+		String capabilitiesTests = importResourceTestsDir + File.separator + "capabilityTypesCi.zip";
+		importCapabilityType(capabilitiesTests);
+		Either<Vertex, Boolean> eitherVertex = DbUtils.getVertexByUId("tosca.capabilities.NonExsitingCapability");
+		AssertJUnit.assertTrue(eitherVertex.isRight());
+		DbUtils.restoreToJanusGraphState(originalState);
+	}
+
+	public static Integer importAllCapabilityTypes() throws IOException {
+
+		String importResourceDir = config.getImportResourceConfigDir() + File.separator + "capabilityTypes.zip";
+		// return
+		// importCapabilityType("src/test/resources/CI/importResource/capabilityTypes.zip");
+		return importCapabilityType(importResourceDir);
+	}
+
+	private static Integer importCapabilityType(String filePath) throws IOException {
+		Config config = Utils.getConfig();
+		CloseableHttpResponse response = null;
+		MultipartEntityBuilder mpBuilder = MultipartEntityBuilder.create();
+
+		mpBuilder.addPart("capabilityTypeZip", new FileBody(new File(filePath)));
+
+		String url = String.format(Urls.IMPORT_CAPABILITY_TYPE, config.getCatalogBeHost(), config.getCatalogBePort());
+
+		CloseableHttpClient client = HttpClients.createDefault();
+		try {
+			HttpPost httpPost = new HttpPost(url);
+			httpPost.addHeader("USER_ID", "jh0003");
+			httpPost.setEntity(mpBuilder.build());
+			response = client.execute(httpPost);
+			return response.getStatusLine().getStatusCode();
+		} finally {
+			closeResponse(response);
+			closeHttpClient(client);
+
+		}
+	}
+
+	private static void closeHttpClient(CloseableHttpClient client) {
+		try {
+			if (client != null) {
+				client.close();
+			}
+		} catch (IOException e) {
+			System.out.println("failed to close client or response: " + e.getMessage());
+		}
+	}
+
+	private static void closeResponse(CloseableHttpResponse response) {
+		try {
+			if (response != null) {
+				response.close();
+			}
+		} catch (IOException e) {
+			System.out.println("failed to close client or response: " + e.getMessage());
+		}
+	}
+
+}
diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/execute/artifacts/DownloadComponentArt.java b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/execute/artifacts/DownloadComponentArt.java
new file mode 100644
index 0000000000..53b8c31808
--- /dev/null
+++ b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/execute/artifacts/DownloadComponentArt.java
@@ -0,0 +1,640 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * SDC
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.sdc.ci.tests.execute.artifacts;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.google.gson.Gson;
+import com.google.gson.JsonElement;
+import com.google.gson.JsonObject;
+import fj.data.Either;
+import org.apache.commons.io.IOUtils;
+import org.apache.http.HttpEntity;
+import org.apache.http.HttpResponse;
+import org.apache.http.client.HttpResponseException;
+import org.apache.http.client.methods.CloseableHttpResponse;
+import org.apache.http.client.methods.HttpDelete;
+import org.apache.http.client.methods.HttpGet;
+import org.apache.http.client.methods.HttpPost;
+import org.apache.http.entity.StringEntity;
+import org.apache.http.impl.client.BasicResponseHandler;
+import org.apache.http.impl.client.CloseableHttpClient;
+import org.apache.http.impl.client.HttpClients;
+import org.apache.http.util.EntityUtils;
+import org.json.simple.JSONObject;
+import org.json.simple.parser.JSONParser;
+import org.json.simple.parser.ParseException;
+import org.junit.Rule;
+import org.junit.rules.TestName;
+import org.openecomp.sdc.be.dao.api.ActionStatus;
+import org.openecomp.sdc.be.datatypes.enums.ResourceTypeEnum;
+import org.openecomp.sdc.be.model.*;
+import org.openecomp.sdc.ci.tests.api.ComponentBaseTest;
+import org.openecomp.sdc.ci.tests.api.Urls;
+import org.openecomp.sdc.ci.tests.config.Config;
+import org.openecomp.sdc.ci.tests.datatypes.ArtifactReqDetails;
+import org.openecomp.sdc.ci.tests.datatypes.ResourceReqDetails;
+import org.openecomp.sdc.ci.tests.datatypes.ServiceReqDetails;
+import org.openecomp.sdc.ci.tests.datatypes.enums.*;
+import org.openecomp.sdc.ci.tests.datatypes.expected.ExpectedResourceAuditJavaObject;
+import org.openecomp.sdc.ci.tests.datatypes.http.HttpHeaderEnum;
+import org.openecomp.sdc.ci.tests.datatypes.http.RestResponse;
+import org.openecomp.sdc.ci.tests.utils.Decoder;
+import org.openecomp.sdc.ci.tests.utils.general.AtomicOperationUtils;
+import org.openecomp.sdc.ci.tests.utils.general.Convertor;
+import org.openecomp.sdc.ci.tests.utils.general.ElementFactory;
+import org.openecomp.sdc.ci.tests.utils.rest.ArtifactRestUtils;
+import org.openecomp.sdc.ci.tests.utils.rest.BaseRestUtils;
+import org.openecomp.sdc.ci.tests.utils.rest.ResourceRestUtils;
+import org.openecomp.sdc.ci.tests.utils.rest.ResponseParser;
+import org.openecomp.sdc.ci.tests.utils.validation.AuditValidationUtils;
+import org.openecomp.sdc.ci.tests.utils.validation.ErrorValidationUtils;
+import org.openecomp.sdc.ci.tests.utils.validation.ServiceValidationUtils;
+import org.openecomp.sdc.common.api.ArtifactGroupTypeEnum;
+import org.openecomp.sdc.common.api.Constants;
+import org.openecomp.sdc.common.util.GeneralUtility;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.testng.Assert;
+import org.testng.AssertJUnit;
+import org.testng.annotations.BeforeMethod;
+import org.testng.annotations.Test;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.UnsupportedEncodingException;
+import java.util.HashMap;
+import java.util.Map;
+
+public class DownloadComponentArt extends ComponentBaseTest {
+
+	private static Logger log = LoggerFactory.getLogger(DownloadComponentArt.class.getName());
+	protected static final String UPLOAD_ARTIFACT_PAYLOAD = "UHVUVFktVXNlci1LZXktRmlsZS0yOiBzc2gtcnNhDQpFbmNyeXB0aW9uOiBhZXMyNTYtY2JjDQpDb21tZW5wOA0K";
+	protected static final String UPLOAD_ARTIFACT_NAME = "TLV_prv.ppk";
+
+	protected Config config = Config.instance();
+	protected String contentTypeHeaderData = "application/json";
+	protected String acceptHeaderDate = "application/json";
+
+
+
+	protected Gson gson = new Gson();
+	protected JSONParser jsonParser = new JSONParser();
+
+
+	protected String serviceVersion;
+	protected ResourceReqDetails resourceDetails;
+	protected User sdncUserDetails;
+	protected ServiceReqDetails serviceDetails;
+	
+
+	@BeforeMethod
+	public void init() throws Exception{
+		sdncUserDetails = ElementFactory.getDefaultUser(UserRoleEnum.DESIGNER);
+		Resource resourceObj = AtomicOperationUtils.createResourceByType(ResourceTypeEnum.VFC, UserRoleEnum.DESIGNER, true).left().value();
+		Service serviceObj = AtomicOperationUtils.createDefaultService(UserRoleEnum.DESIGNER, true).left().value();
+		
+		
+		resourceDetails = new ResourceReqDetails(resourceObj); 
+		serviceDetails = new ServiceReqDetails(serviceObj);
+	}
+	
+	@Rule 
+	public static TestName name = new TestName();
+
+	// External API - Download artifact for resource
+	@Test
+	public void downloadArtifactFromResourceViaExternalAPI() throws Exception {
+		Resource resourceDetailsVF;
+		Either<Resource, RestResponse> createdResource = AtomicOperationUtils.createResourcesByTypeNormTypeAndCatregory(ResourceTypeEnum.VF, NormativeTypesEnum.ROOT, ResourceCategoryEnum.GENERIC_INFRASTRUCTURE, UserRoleEnum.DESIGNER, true);
+		resourceDetailsVF = createdResource.left().value();
+		ArtifactDefinition heatArtifact = AtomicOperationUtils.uploadArtifactByType(ArtifactTypeEnum.HEAT, resourceDetailsVF, UserRoleEnum.DESIGNER, true, true).left().value();
+		resourceDetails = new ResourceReqDetails(resourceDetailsVF); 
+		
+		String resourceUUID = resourceDetailsVF.getUUID();
+		String artifactUUID = heatArtifact.getArtifactUUID();
+		
+		System.out.println("Resource UUID: " + resourceUUID);
+		System.out.println("Artifact UUID: " + artifactUUID);
+		
+		RestResponse restResponse = ArtifactRestUtils.getResourceDeploymentArtifactExternalAPI(resourceUUID, artifactUUID, ElementFactory.getDefaultUser(UserRoleEnum.DESIGNER), "Resource");
+		
+		Integer responseCode = restResponse.getErrorCode();
+		Integer expectedCode = 200;
+		Assert.assertEquals(responseCode,expectedCode, "Response code is not correct.");
+		
+		String response = restResponse.getResponse();
+		
+		String payloadData = "aGVhdF90ZW1wbGF0ZV92ZXJzaW9uOiAyMDEzLTA1LTIzDQoNCmRlc2NyaXB0aW9uOiBTaW1wbGUgdGVtcGxhdGUgdG8gZGVwbG95IGEgc3RhY2sgd2l0aCB0d28gdmlydHVhbCBtYWNoaW5lIGluc3RhbmNlcw0KDQpwYXJhbWV0ZXJzOg0KICBpbWFnZV9uYW1lXzE6DQogICAgdHlwZTogc3RyaW5nDQogICAgbGFiZWw6IEltYWdlIE5hbWUNCiAgICBkZXNjcmlwdGlvbjogU0NPSU1BR0UgU3BlY2lmeSBhbiBpbWFnZSBuYW1lIGZvciBpbnN0YW5jZTENCiAgICBkZWZhdWx0OiBjaXJyb3MtMC4zLjEteDg2XzY0DQogIGltYWdlX25hbWVfMjoNCiAgICB0eXBlOiBzdHJpbmcNCiAgICBsYWJlbDogSW1hZ2UgTmFtZQ0KICAgIGRlc2NyaXB0aW9uOiBTQ09JTUFHRSBTcGVjaWZ5IGFuIGltYWdlIG5hbWUgZm9yIGluc3RhbmNlMg0KICAgIGRlZmF1bHQ6IGNpcnJvcy0wLjMuMS14ODZfNjQNCiAgbmV0d29ya19pZDoNCiAgICB0eXBlOiBzdHJpbmcNCiAgICBsYWJlbDogTmV0d29yayBJRA0KICAgIGRlc2NyaXB0aW9uOiBTQ09ORVRXT1JLIE5ldHdvcmsgdG8gYmUgdXNlZCBmb3IgdGhlIGNvbXB1dGUgaW5zdGFuY2UNCiAgICBoaWRkZW46IHRydWUNCiAgICBjb25zdHJhaW50czoNCiAgICAgIC0gbGVuZ3RoOiB7IG1pbjogNiwgbWF4OiA4IH0NCiAgICAgICAgZGVzY3JpcHRpb246IFBhc3N3b3JkIGxlbmd0aCBtdXN0IGJlIGJldHdlZW4gNiBhbmQgOCBjaGFyYWN0ZXJzLg0KICAgICAgLSByYW5nZTogeyBtaW46IDYsIG1heDogOCB9DQogICAgICAgIGRlc2NyaXB0aW9uOiBSYW5nZSBkZXNjcmlwdGlvbg0KICAgICAgLSBhbGxvd2VkX3ZhbHVlczoNCiAgICAgICAgLSBtMS5zbWFsbA0KICAgICAgICAtIG0xLm1lZGl1bQ0KICAgICAgICAtIG0xLmxhcmdlDQogICAgICAgIGRlc2NyaXB0aW9uOiBBbGxvd2VkIHZhbHVlcyBkZXNjcmlwdGlvbg0KICAgICAgLSBhbGxvd2VkX3BhdHRlcm46ICJbYS16QS1aMC05XSsiDQogICAgICAgIGRlc2NyaXB0aW9uOiBQYXNzd29yZCBtdXN0IGNvbnNpc3Qgb2YgY2hhcmFjdGVycyBhbmQgbnVtYmVycyBvbmx5Lg0KICAgICAgLSBhbGxvd2VkX3BhdHRlcm46ICJbQS1aXStbYS16QS1aMC05XSoiDQogICAgICAgIGRlc2NyaXB0aW9uOiBQYXNzd29yZCBtdXN0IHN0YXJ0IHdpdGggYW4gdXBwZXJjYXNlIGNoYXJhY3Rlci4NCiAgICAgIC0gY3VzdG9tX2NvbnN0cmFpbnQ6IG5vdmEua2V5cGFpcg0KICAgICAgICBkZXNjcmlwdGlvbjogQ3VzdG9tIGRlc2NyaXB0aW9uDQoNCnJlc291cmNlczoNCiAgbXlfaW5zdGFuY2UxOg0KICAgIHR5cGU6IE9TOjpOb3ZhOjpTZXJ2ZXINCiAgICBwcm9wZXJ0aWVzOg0KICAgICAgaW1hZ2U6IHsgZ2V0X3BhcmFtOiBpbWFnZV9uYW1lXzEgfQ0KICAgICAgZmxhdm9yOiBtMS5zbWFsbA0KICAgICAgbmV0d29ya3M6DQogICAgICAgIC0gbmV0d29yayA6IHsgZ2V0X3BhcmFtIDogbmV0d29ya19pZCB9DQogIG15X2luc3RhbmNlMjoNCiAgICB0eXBlOiBPUzo6Tm92YTo6U2VydmVyDQogICAgcHJvcGVydGllczoNCiAgICAgIGltYWdlOiB7IGdldF9wYXJhbTogaW1hZ2VfbmFtZV8yIH0NCiAgICAgIGZsYXZvcjogbTEudGlueQ0KICAgICAgbmV0d29ya3M6DQogICAgICAgIC0gbmV0d29yayA6IHsgZ2V0X3BhcmFtIDogbmV0d29ya19pZCB9";
+		String decodedPaypload = Decoder.decode(payloadData);
+		
+		Assert.assertEquals(response, decodedPaypload, "Response deployment artifact not correct.");
+		
+		String auditAction = "DownloadArtifact";
+		
+		ExpectedResourceAuditJavaObject expectedResourceAuditJavaObject = new ExpectedResourceAuditJavaObject();
+		expectedResourceAuditJavaObject.setAction(auditAction);
+		expectedResourceAuditJavaObject.setResourceName(resourceDetails.getName());
+		expectedResourceAuditJavaObject.setResourceType("Resource");
+		expectedResourceAuditJavaObject.setStatus("200");
+		expectedResourceAuditJavaObject.setDesc("OK");
+		
+		expectedResourceAuditJavaObject.setCONSUMER_ID("ci");
+		String resource_url = String.format("/sdc/v1/catalog/resources/%s/artifacts/%s", resourceUUID, artifactUUID);
+		expectedResourceAuditJavaObject.setRESOURCE_URL(resource_url);
+		
+		AuditValidationUtils.validateAuditDownloadExternalAPI(expectedResourceAuditJavaObject, auditAction, null, false);
+	}
+	
+	
+	// External API - Download artifact for resource - negative test
+	@Test
+	public void downloadArtifactFromResourceViaExternalAPINegativeTest() throws Exception {
+		Resource resourceDetailsVF;
+		Either<Resource, RestResponse> createdResource = AtomicOperationUtils.createResourcesByTypeNormTypeAndCatregory(ResourceTypeEnum.VF, NormativeTypesEnum.ROOT, ResourceCategoryEnum.GENERIC_INFRASTRUCTURE, UserRoleEnum.DESIGNER, true);
+		resourceDetailsVF = createdResource.left().value();
+		ArtifactDefinition heatArtifact = AtomicOperationUtils.uploadArtifactByType(ArtifactTypeEnum.HEAT, resourceDetailsVF, UserRoleEnum.DESIGNER, true, true).left().value();
+		resourceDetails = new ResourceReqDetails(resourceDetailsVF); 
+		
+		String resourceUUID = resourceDetailsVF.getUUID();
+		String artifactUUID = heatArtifact.getArtifactUUID();
+		
+		System.out.println("Resource UUID: " + resourceUUID);
+		System.out.println("Artifact UUID: " + artifactUUID);
+		
+		RestResponse restResponse = ArtifactRestUtils.getResourceDeploymentArtifactExternalAPI(resourceUUID, "dfsgfdsg324", ElementFactory.getDefaultUser(UserRoleEnum.DESIGNER), "Resource");
+		
+		Integer responseCode = restResponse.getErrorCode();
+		Integer expectedCode = 200;
+		Assert.assertEquals(responseCode,expectedCode, "Response code is not correct.");
+	}
+	
+	
+	
+	
+	
+	// External API - Download artifact for service - negative test
+	@Test
+	public void downloadArtifactFromServiceViaExternalAPI() throws Exception {
+		
+		Service resourceDetailsService;
+		Either<Service, RestResponse> createdResource = AtomicOperationUtils.createDefaultService(UserRoleEnum.DESIGNER, true);
+		resourceDetailsService = createdResource.left().value();
+		
+		ArtifactDefinition heatArtifact = AtomicOperationUtils.uploadArtifactByType(ArtifactTypeEnum.OTHER, resourceDetailsService, UserRoleEnum.DESIGNER, true, true).left().value();
+
+		String resourceUUID = resourceDetailsService.getUUID();
+		String artifactUUID = heatArtifact.getArtifactUUID();
+		
+		System.out.println("Resource UUID: " + resourceUUID);
+		System.out.println("Artifact UUID: " + artifactUUID);
+		
+		RestResponse restResponse = ArtifactRestUtils.getResourceDeploymentArtifactExternalAPI(resourceUUID, artifactUUID, ElementFactory.getDefaultUser(UserRoleEnum.DESIGNER), "Service");
+		
+		Integer responseCode = restResponse.getErrorCode();
+		Integer expectedCode = 200;
+		Assert.assertEquals(responseCode,expectedCode, "Response code is not correct.");
+		
+		String response = restResponse.getResponse();
+		
+		String payloadData = "aGVhdF90ZW1wbGF0ZV92ZXJzaW9uOiAyMDEzLTA1LTIzDQoNCmRlc2NyaXB0aW9uOiBTaW1wbGUgdGVtcGxhdGUgdG8gZGVwbG95IGEgc3RhY2sgd2l0aCB0d28gdmlydHVhbCBtYWNoaW5lIGluc3RhbmNlcw0KDQpwYXJhbWV0ZXJzOg0KICBpbWFnZV9uYW1lXzE6DQogICAgdHlwZTogc3RyaW5nDQogICAgbGFiZWw6IEltYWdlIE5hbWUNCiAgICBkZXNjcmlwdGlvbjogU0NPSU1BR0UgU3BlY2lmeSBhbiBpbWFnZSBuYW1lIGZvciBpbnN0YW5jZTENCiAgICBkZWZhdWx0OiBjaXJyb3MtMC4zLjEteDg2XzY0DQogIGltYWdlX25hbWVfMjoNCiAgICB0eXBlOiBzdHJpbmcNCiAgICBsYWJlbDogSW1hZ2UgTmFtZQ0KICAgIGRlc2NyaXB0aW9uOiBTQ09JTUFHRSBTcGVjaWZ5IGFuIGltYWdlIG5hbWUgZm9yIGluc3RhbmNlMg0KICAgIGRlZmF1bHQ6IGNpcnJvcy0wLjMuMS14ODZfNjQNCiAgbmV0d29ya19pZDoNCiAgICB0eXBlOiBzdHJpbmcNCiAgICBsYWJlbDogTmV0d29yayBJRA0KICAgIGRlc2NyaXB0aW9uOiBTQ09ORVRXT1JLIE5ldHdvcmsgdG8gYmUgdXNlZCBmb3IgdGhlIGNvbXB1dGUgaW5zdGFuY2UNCiAgICBoaWRkZW46IHRydWUNCiAgICBjb25zdHJhaW50czoNCiAgICAgIC0gbGVuZ3RoOiB7IG1pbjogNiwgbWF4OiA4IH0NCiAgICAgICAgZGVzY3JpcHRpb246IFBhc3N3b3JkIGxlbmd0aCBtdXN0IGJlIGJldHdlZW4gNiBhbmQgOCBjaGFyYWN0ZXJzLg0KICAgICAgLSByYW5nZTogeyBtaW46IDYsIG1heDogOCB9DQogICAgICAgIGRlc2NyaXB0aW9uOiBSYW5nZSBkZXNjcmlwdGlvbg0KICAgICAgLSBhbGxvd2VkX3ZhbHVlczoNCiAgICAgICAgLSBtMS5zbWFsbA0KICAgICAgICAtIG0xLm1lZGl1bQ0KICAgICAgICAtIG0xLmxhcmdlDQogICAgICAgIGRlc2NyaXB0aW9uOiBBbGxvd2VkIHZhbHVlcyBkZXNjcmlwdGlvbg0KICAgICAgLSBhbGxvd2VkX3BhdHRlcm46ICJbYS16QS1aMC05XSsiDQogICAgICAgIGRlc2NyaXB0aW9uOiBQYXNzd29yZCBtdXN0IGNvbnNpc3Qgb2YgY2hhcmFjdGVycyBhbmQgbnVtYmVycyBvbmx5Lg0KICAgICAgLSBhbGxvd2VkX3BhdHRlcm46ICJbQS1aXStbYS16QS1aMC05XSoiDQogICAgICAgIGRlc2NyaXB0aW9uOiBQYXNzd29yZCBtdXN0IHN0YXJ0IHdpdGggYW4gdXBwZXJjYXNlIGNoYXJhY3Rlci4NCiAgICAgIC0gY3VzdG9tX2NvbnN0cmFpbnQ6IG5vdmEua2V5cGFpcg0KICAgICAgICBkZXNjcmlwdGlvbjogQ3VzdG9tIGRlc2NyaXB0aW9uDQoNCnJlc291cmNlczoNCiAgbXlfaW5zdGFuY2UxOg0KICAgIHR5cGU6IE9TOjpOb3ZhOjpTZXJ2ZXINCiAgICBwcm9wZXJ0aWVzOg0KICAgICAgaW1hZ2U6IHsgZ2V0X3BhcmFtOiBpbWFnZV9uYW1lXzEgfQ0KICAgICAgZmxhdm9yOiBtMS5zbWFsbA0KICAgICAgbmV0d29ya3M6DQogICAgICAgIC0gbmV0d29yayA6IHsgZ2V0X3BhcmFtIDogbmV0d29ya19pZCB9DQogIG15X2luc3RhbmNlMjoNCiAgICB0eXBlOiBPUzo6Tm92YTo6U2VydmVyDQogICAgcHJvcGVydGllczoNCiAgICAgIGltYWdlOiB7IGdldF9wYXJhbTogaW1hZ2VfbmFtZV8yIH0NCiAgICAgIGZsYXZvcjogbTEudGlueQ0KICAgICAgbmV0d29ya3M6DQogICAgICAgIC0gbmV0d29yayA6IHsgZ2V0X3BhcmFtIDogbmV0d29ya19pZCB9";
+		String decodedPaypload = Decoder.decode(payloadData);
+		
+		Assert.assertEquals(response, decodedPaypload, "Response deployment artifact not correct.");
+		
+		String auditAction = "DownloadArtifact";
+		
+		ExpectedResourceAuditJavaObject expectedResourceAuditJavaObject = new ExpectedResourceAuditJavaObject();
+		expectedResourceAuditJavaObject.setAction(auditAction);
+		expectedResourceAuditJavaObject.setResourceName(resourceDetailsService.getName());
+		expectedResourceAuditJavaObject.setResourceType("Service");
+		expectedResourceAuditJavaObject.setStatus("200");
+		expectedResourceAuditJavaObject.setDesc("OK");
+		
+		expectedResourceAuditJavaObject.setCONSUMER_ID("ci");
+		String resource_url = String.format("/sdc/v1/catalog/services/%s/artifacts/%s", resourceUUID, artifactUUID);
+		expectedResourceAuditJavaObject.setRESOURCE_URL(resource_url);
+		
+		AuditValidationUtils.validateAuditDownloadExternalAPI(expectedResourceAuditJavaObject, auditAction, null, false);
+	}
+	
+	
+	
+	
+	
+	
+	// External API - Download ComponentInstance artifact of service - negative test
+	@Test
+	public void downloadArtifactOfComponentInstanceFromServiceViaExternalAPI() throws Exception {
+		
+		Either<Resource, RestResponse> resourceDetailsVF_01e = AtomicOperationUtils.createResourcesByTypeNormTypeAndCatregory(ResourceTypeEnum.VF, NormativeTypesEnum.ROOT, ResourceCategoryEnum.GENERIC_INFRASTRUCTURE, UserRoleEnum.DESIGNER, true);
+		Component resourceDetailsVF_01 = resourceDetailsVF_01e.left().value();
+		ArtifactDefinition heatArtifact = AtomicOperationUtils.uploadArtifactByType(ArtifactTypeEnum.HEAT, resourceDetailsVF_01, UserRoleEnum.DESIGNER, true, true).left().value();
+
+		resourceDetailsVF_01 = AtomicOperationUtils.changeComponentState(resourceDetailsVF_01, UserRoleEnum.DESIGNER, LifeCycleStatesEnum.CHECKIN, true).getLeft();
+		
+		Service resourceDetailsService;
+		Either<Service, RestResponse> createdResource = AtomicOperationUtils.createDefaultService(UserRoleEnum.DESIGNER, true);
+		resourceDetailsService = createdResource.left().value();
+		
+		
+		ComponentInstance resourceDetailsVF1ins_01 = AtomicOperationUtils.addComponentInstanceToComponentContainer(resourceDetailsVF_01, resourceDetailsService, UserRoleEnum.DESIGNER, true).left().value();
+		
+		
+		System.out.println("-----");
+		
+		
+		String resourceUUID = resourceDetailsService.getUUID();
+		String componentNormalizedName = resourceDetailsVF1ins_01.getNormalizedName();
+		String artifactUUID = heatArtifact.getArtifactUUID();
+			
+		System.out.println("Resource UUID: " + resourceUUID);
+		System.out.println("Component NormalizedName: " + componentNormalizedName);
+		System.out.println("Artifact UUID: " + artifactUUID);
+		
+		RestResponse restResponse = ArtifactRestUtils.getComponentInstanceDeploymentArtifactExternalAPI(resourceUUID, componentNormalizedName, artifactUUID, ElementFactory.getDefaultUser(UserRoleEnum.DESIGNER), "Service");
+//			
+		Integer responseCode = restResponse.getErrorCode();
+		Integer expectedCode = 200;
+		Assert.assertEquals(responseCode,expectedCode, "Response code is not correct.");
+			
+		String response = restResponse.getResponse();
+			
+		String payloadData = "aGVhdF90ZW1wbGF0ZV92ZXJzaW9uOiAyMDEzLTA1LTIzDQoNCmRlc2NyaXB0aW9uOiBTaW1wbGUgdGVtcGxhdGUgdG8gZGVwbG95IGEgc3RhY2sgd2l0aCB0d28gdmlydHVhbCBtYWNoaW5lIGluc3RhbmNlcw0KDQpwYXJhbWV0ZXJzOg0KICBpbWFnZV9uYW1lXzE6DQogICAgdHlwZTogc3RyaW5nDQogICAgbGFiZWw6IEltYWdlIE5hbWUNCiAgICBkZXNjcmlwdGlvbjogU0NPSU1BR0UgU3BlY2lmeSBhbiBpbWFnZSBuYW1lIGZvciBpbnN0YW5jZTENCiAgICBkZWZhdWx0OiBjaXJyb3MtMC4zLjEteDg2XzY0DQogIGltYWdlX25hbWVfMjoNCiAgICB0eXBlOiBzdHJpbmcNCiAgICBsYWJlbDogSW1hZ2UgTmFtZQ0KICAgIGRlc2NyaXB0aW9uOiBTQ09JTUFHRSBTcGVjaWZ5IGFuIGltYWdlIG5hbWUgZm9yIGluc3RhbmNlMg0KICAgIGRlZmF1bHQ6IGNpcnJvcy0wLjMuMS14ODZfNjQNCiAgbmV0d29ya19pZDoNCiAgICB0eXBlOiBzdHJpbmcNCiAgICBsYWJlbDogTmV0d29yayBJRA0KICAgIGRlc2NyaXB0aW9uOiBTQ09ORVRXT1JLIE5ldHdvcmsgdG8gYmUgdXNlZCBmb3IgdGhlIGNvbXB1dGUgaW5zdGFuY2UNCiAgICBoaWRkZW46IHRydWUNCiAgICBjb25zdHJhaW50czoNCiAgICAgIC0gbGVuZ3RoOiB7IG1pbjogNiwgbWF4OiA4IH0NCiAgICAgICAgZGVzY3JpcHRpb246IFBhc3N3b3JkIGxlbmd0aCBtdXN0IGJlIGJldHdlZW4gNiBhbmQgOCBjaGFyYWN0ZXJzLg0KICAgICAgLSByYW5nZTogeyBtaW46IDYsIG1heDogOCB9DQogICAgICAgIGRlc2NyaXB0aW9uOiBSYW5nZSBkZXNjcmlwdGlvbg0KICAgICAgLSBhbGxvd2VkX3ZhbHVlczoNCiAgICAgICAgLSBtMS5zbWFsbA0KICAgICAgICAtIG0xLm1lZGl1bQ0KICAgICAgICAtIG0xLmxhcmdlDQogICAgICAgIGRlc2NyaXB0aW9uOiBBbGxvd2VkIHZhbHVlcyBkZXNjcmlwdGlvbg0KICAgICAgLSBhbGxvd2VkX3BhdHRlcm46ICJbYS16QS1aMC05XSsiDQogICAgICAgIGRlc2NyaXB0aW9uOiBQYXNzd29yZCBtdXN0IGNvbnNpc3Qgb2YgY2hhcmFjdGVycyBhbmQgbnVtYmVycyBvbmx5Lg0KICAgICAgLSBhbGxvd2VkX3BhdHRlcm46ICJbQS1aXStbYS16QS1aMC05XSoiDQogICAgICAgIGRlc2NyaXB0aW9uOiBQYXNzd29yZCBtdXN0IHN0YXJ0IHdpdGggYW4gdXBwZXJjYXNlIGNoYXJhY3Rlci4NCiAgICAgIC0gY3VzdG9tX2NvbnN0cmFpbnQ6IG5vdmEua2V5cGFpcg0KICAgICAgICBkZXNjcmlwdGlvbjogQ3VzdG9tIGRlc2NyaXB0aW9uDQoNCnJlc291cmNlczoNCiAgbXlfaW5zdGFuY2UxOg0KICAgIHR5cGU6IE9TOjpOb3ZhOjpTZXJ2ZXINCiAgICBwcm9wZXJ0aWVzOg0KICAgICAgaW1hZ2U6IHsgZ2V0X3BhcmFtOiBpbWFnZV9uYW1lXzEgfQ0KICAgICAgZmxhdm9yOiBtMS5zbWFsbA0KICAgICAgbmV0d29ya3M6DQogICAgICAgIC0gbmV0d29yayA6IHsgZ2V0X3BhcmFtIDogbmV0d29ya19pZCB9DQogIG15X2luc3RhbmNlMjoNCiAgICB0eXBlOiBPUzo6Tm92YTo6U2VydmVyDQogICAgcHJvcGVydGllczoNCiAgICAgIGltYWdlOiB7IGdldF9wYXJhbTogaW1hZ2VfbmFtZV8yIH0NCiAgICAgIGZsYXZvcjogbTEudGlueQ0KICAgICAgbmV0d29ya3M6DQogICAgICAgIC0gbmV0d29yayA6IHsgZ2V0X3BhcmFtIDogbmV0d29ya19pZCB9";
+		String decodedPaypload = Decoder.decode(payloadData);
+			
+		Assert.assertEquals(response, decodedPaypload, "Response deployment artifact not correct.");
+			
+		String auditAction = "DownloadArtifact";
+			
+		ExpectedResourceAuditJavaObject expectedResourceAuditJavaObject = new ExpectedResourceAuditJavaObject();
+		expectedResourceAuditJavaObject.setAction(auditAction);
+		expectedResourceAuditJavaObject.setResourceName(resourceDetailsVF1ins_01.getName());
+		expectedResourceAuditJavaObject.setResourceType("Service");
+		expectedResourceAuditJavaObject.setStatus("200");
+		expectedResourceAuditJavaObject.setDesc("OK");
+			
+		expectedResourceAuditJavaObject.setCONSUMER_ID("ci");
+		String resource_url = String.format("/sdc/v1/catalog/services/%s/resourceInstances/%s/artifacts/%s", resourceUUID, componentNormalizedName, artifactUUID);
+		expectedResourceAuditJavaObject.setRESOURCE_URL(resource_url);
+			
+//		AuditValidationUtils.validateAuditDownloadExternalAPI(expectedResourceAuditJavaObject, auditAction, null, false);
+	}
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	@Test
+	public void downloadArtifactFromResourceTest() throws Exception {
+
+		CloseableHttpClient httpclient = HttpClients.createDefault();
+		try {
+			String jsonBody = createUploadArtifactBodyJson();
+
+			String resourceId = resourceDetails.getUniqueId();
+			String url = String.format(Urls.ADD_ARTIFACT_TO_RESOURCE, config.getCatalogBeHost(), config.getCatalogBePort(), resourceId);
+			HttpPost httppost = createPostAddArtifactRequeast(jsonBody, url, true);
+			HttpResponse response = httpclient.execute(httppost);
+			int status = response.getStatusLine().getStatusCode();
+			AssertJUnit.assertEquals("failed to add artifact", 200, status);
+
+			ArtifactDefinition origArtifact = getArtifactDataFromJson(jsonBody);
+			addArtifactDataFromResponse(response, origArtifact);
+			String artifactId = origArtifact.getUniqueId();
+			
+			url = String.format(Urls.UI_DOWNLOAD_RESOURCE_ARTIFACT, config.getCatalogBeHost(), config.getCatalogBePort(), resourceId, artifactId);
+			HttpGet httpGet = createGetRequest(url);
+			response = httpclient.execute(httpGet);
+			status = response.getStatusLine().getStatusCode();
+			AssertJUnit.assertEquals("failed to download artifact", 200, status);
+									
+			InputStream inputStream = response.getEntity().getContent();
+			ArtifactUiDownloadData artifactUiDownloadData = getArtifactUiDownloadData(IOUtils.toString(inputStream));
+			AssertJUnit.assertEquals("Downloaded payload is different from uploaded one", UPLOAD_ARTIFACT_PAYLOAD, artifactUiDownloadData.getBase64Contents());
+			AssertJUnit.assertEquals("Downloaded artifact name is different from uploaded one", UPLOAD_ARTIFACT_NAME, artifactUiDownloadData.getArtifactName());
+
+			// validate audit
+					
+			ExpectedResourceAuditJavaObject expectedResourceAuditJavaObject = Convertor.constructFieldsForAuditValidation(resourceDetails, resourceDetails.getVersion(), sdncUserDetails);
+			String auditAction = "ArtifactDownload";
+			expectedResourceAuditJavaObject.setAction(auditAction);
+			expectedResourceAuditJavaObject.setPrevState("");
+			expectedResourceAuditJavaObject.setPrevVersion("");
+			expectedResourceAuditJavaObject.setCurrState((LifecycleStateEnum.NOT_CERTIFIED_CHECKOUT).toString());
+			expectedResourceAuditJavaObject.setStatus("200");
+			expectedResourceAuditJavaObject.setDesc("OK");
+			expectedResourceAuditJavaObject.setArtifactData(AuditValidationUtils.buildArtifactDataAudit(origArtifact));
+			expectedResourceAuditJavaObject.setCurrArtifactUuid(origArtifact.getUniqueId());
+			expectedResourceAuditJavaObject.setPrevArtifactUuid("");
+			AuditValidationUtils.validateAudit(expectedResourceAuditJavaObject, auditAction, null, false);
+			
+		} finally {
+			httpclient.close();
+		}
+
+	}
+
+	@Test
+	public void downloadArtifactFromServiceTest() throws Exception {
+
+		CloseableHttpClient httpclient = HttpClients.createDefault();
+
+		try {
+
+			String jsonStr = createUploadArtifactBodyJson();
+
+			String url = String.format(Urls.ADD_ARTIFACT_TO_SERVICE, config.getCatalogBeHost(), config.getCatalogBePort(), serviceDetails.getUniqueId());
+			HttpPost httpPost = createPostAddArtifactRequeast(jsonStr, url, true);
+			CloseableHttpResponse result = httpclient.execute(httpPost);
+			int status = result.getStatusLine().getStatusCode();
+			AssertJUnit.assertEquals("failed to add artifact", 200, status);
+
+			ArtifactDefinition origArtifact = getArtifactDataFromJson(jsonStr);
+			addArtifactDataFromResponse(result, origArtifact);
+			String artifactId = origArtifact.getUniqueId();
+
+			url = String.format(Urls.UI_DOWNLOAD_SERVICE_ARTIFACT, config.getCatalogBeHost(), config.getCatalogBePort(), serviceDetails.getUniqueId(), artifactId);
+			HttpGet httpGet = createGetRequest(url);
+			CloseableHttpResponse response2 = httpclient.execute(httpGet);
+			status = response2.getStatusLine().getStatusCode();
+			AssertJUnit.assertEquals("failed to download artifact", 200, status);
+			InputStream inputStream = response2.getEntity().getContent();
+			ArtifactUiDownloadData artifactUiDownloadData = getArtifactUiDownloadData(IOUtils.toString(inputStream));
+			AssertJUnit.assertEquals("Downloaded payload is different from uploaded one", UPLOAD_ARTIFACT_PAYLOAD, artifactUiDownloadData.getBase64Contents());
+			AssertJUnit.assertEquals("Downloaded artifact name is different from uploaded one", UPLOAD_ARTIFACT_NAME, artifactUiDownloadData.getArtifactName());
+
+			// validate audit
+			ExpectedResourceAuditJavaObject expectedResourceAuditJavaObject = AuditValidationUtils.constructFieldsForAuditValidation(serviceDetails, serviceDetails.getVersion(), sdncUserDetails);
+			String auditAction = "ArtifactDownload";
+			expectedResourceAuditJavaObject.setAction(auditAction);
+			expectedResourceAuditJavaObject.setPrevState("");
+			expectedResourceAuditJavaObject.setPrevVersion("");
+			expectedResourceAuditJavaObject.setCurrState((LifecycleStateEnum.NOT_CERTIFIED_CHECKOUT).toString());
+			expectedResourceAuditJavaObject.setStatus("200");
+			expectedResourceAuditJavaObject.setDesc("OK");
+			expectedResourceAuditJavaObject.setArtifactData(AuditValidationUtils.buildArtifactDataAudit(origArtifact));
+			expectedResourceAuditJavaObject.setCurrArtifactUuid(origArtifact.getUniqueId());
+			expectedResourceAuditJavaObject.setPrevArtifactUuid("");
+			
+			AuditValidationUtils.validateAudit(expectedResourceAuditJavaObject, auditAction, null, false);
+
+		} finally {
+//			RestResponse response = ServiceRestUtils.deleteService(serviceDetails, serviceVersion, sdncUserDetails );
+//			checkDeleteResponse(response);
+			httpclient.close();
+		}
+	}
+
+	@Test
+	public void downloadArtifactFromResourceNotFound() throws Exception {
+
+		CloseableHttpClient httpclient = HttpClients.createDefault();
+		try {
+
+			String resourceId = resourceDetails.getUniqueId();
+			String artifactIdNotFound = "11111";
+
+			ArtifactDefinition origArtifact = new ArtifactDefinition();
+			origArtifact.setUniqueId(artifactIdNotFound);
+			
+			String url = String.format(Urls.UI_DOWNLOAD_RESOURCE_ARTIFACT, config.getCatalogBeHost(), config.getCatalogBePort(), resourceId, artifactIdNotFound);
+			HttpGet httpGet = createGetRequest(url);
+			CloseableHttpResponse response = httpclient.execute(httpGet);
+			int status = response.getStatusLine().getStatusCode();
+			AssertJUnit.assertEquals("expected 404 not found", 404, status);
+
+			// validate audit
+			ErrorInfo errorInfo = ErrorValidationUtils.parseErrorConfigYaml(ActionStatus.ARTIFACT_NOT_FOUND.name());
+			ExpectedResourceAuditJavaObject expectedResourceAuditJavaObject = Convertor.constructFieldsForAuditValidation(resourceDetails, resourceDetails.getVersion(), sdncUserDetails);
+			String auditAction = "ArtifactDownload";
+			expectedResourceAuditJavaObject.setAction(auditAction);
+			expectedResourceAuditJavaObject.setPrevState("");
+			expectedResourceAuditJavaObject.setPrevVersion("");
+			expectedResourceAuditJavaObject.setCurrState((LifecycleStateEnum.NOT_CERTIFIED_CHECKOUT).toString());
+			expectedResourceAuditJavaObject.setStatus(errorInfo.getCode().toString());
+			expectedResourceAuditJavaObject.setDesc(errorInfo.getAuditDesc(""));
+			expectedResourceAuditJavaObject.setArtifactData("");
+			expectedResourceAuditJavaObject.setCurrArtifactUuid(origArtifact.getUniqueId());
+			expectedResourceAuditJavaObject.setPrevArtifactUuid("");
+			AuditValidationUtils.validateAudit(expectedResourceAuditJavaObject, auditAction, null, false);
+			expectedResourceAuditJavaObject.setPrevArtifactUuid(null);
+		} finally {
+			httpclient.close();
+		}
+
+	}
+
+	@Test
+	public void downloadArtifactFromServiceNotFound() throws Exception {
+
+		CloseableHttpClient httpclient = HttpClients.createDefault();
+		try {
+
+			String artifactIdNotFound = "11111";
+			ArtifactDefinition origArtifact = new ArtifactDefinition();
+			origArtifact.setUniqueId(artifactIdNotFound);
+
+			String url = String.format(Urls.UI_DOWNLOAD_SERVICE_ARTIFACT, config.getCatalogBeHost(), config.getCatalogBePort(), serviceDetails.getUniqueId(), artifactIdNotFound);
+			HttpGet httpGet = createGetRequest(url);
+			CloseableHttpResponse response2 = httpclient.execute(httpGet);
+			int status = response2.getStatusLine().getStatusCode();
+			AssertJUnit.assertEquals("expected 404 not found", 404, status);
+
+			// validate audit
+			ErrorInfo errorInfo = ErrorValidationUtils.parseErrorConfigYaml(ActionStatus.ARTIFACT_NOT_FOUND.name());
+			ExpectedResourceAuditJavaObject expectedResourceAuditJavaObject = ServiceValidationUtils.constructFieldsForAuditValidation(serviceDetails, serviceDetails.getVersion(), sdncUserDetails);
+			String auditAction = "ArtifactDownload";
+			expectedResourceAuditJavaObject.setAction(auditAction);
+			expectedResourceAuditJavaObject.setPrevState("");
+			expectedResourceAuditJavaObject.setPrevVersion("");
+			expectedResourceAuditJavaObject.setCurrState((LifecycleStateEnum.NOT_CERTIFIED_CHECKOUT).toString());
+			expectedResourceAuditJavaObject.setStatus(errorInfo.getCode().toString());
+			expectedResourceAuditJavaObject.setDesc(errorInfo.getAuditDesc(""));
+			expectedResourceAuditJavaObject.setArtifactData("");
+			expectedResourceAuditJavaObject.setCurrArtifactUuid(origArtifact.getUniqueId());
+			expectedResourceAuditJavaObject.setPrevArtifactUuid("");
+			AuditValidationUtils.validateAudit(expectedResourceAuditJavaObject, auditAction, null, false);
+
+		} finally {
+			httpclient.close();
+		}
+
+	}
+
+	@Test
+	public void addArtifactToResourceTest() throws Exception {
+
+		ArtifactReqDetails defaultArtifact = ElementFactory.getDefaultArtifact();
+
+		RestResponse response = ArtifactRestUtils.addInformationalArtifactToResource(defaultArtifact, sdncUserDetails, resourceDetails.getUniqueId());
+		int status = response.getErrorCode();
+		AssertJUnit.assertEquals("add informational artifact request returned status: " + response.getErrorCode(), 200, status);
+
+		RestResponse resourceResp = ResourceRestUtils.getResource(resourceDetails.getUniqueId());
+		Resource resource = ResponseParser.convertResourceResponseToJavaObject(resourceResp.getResponse());
+		AssertJUnit.assertNotNull(resource);
+
+		Map<String, ArtifactDefinition> artifacts = resource.getArtifacts();
+		boolean isExist = false;
+		for (Map.Entry<String, ArtifactDefinition> entry : artifacts.entrySet()) {
+			if (entry.getKey().equals(defaultArtifact.getArtifactLabel())) {
+				isExist = true;
+
+			}
+		}
+		AssertJUnit.assertTrue(isExist);
+	}
+	
+	
+	protected String createUploadArtifactBodyJson() {
+		Map<String, Object> jsonBody = new HashMap<String, Object>();
+		jsonBody.put("artifactName", UPLOAD_ARTIFACT_NAME);
+		jsonBody.put("artifactDisplayName", "configure");
+		jsonBody.put("artifactType", "SHELL");
+		jsonBody.put("mandatory", "false");
+		jsonBody.put("description", "ff");
+		jsonBody.put("payloadData", UPLOAD_ARTIFACT_PAYLOAD);
+		jsonBody.put("artifactLabel", "configure");
+		return gson.toJson(jsonBody);
+	}
+	
+	protected ArtifactDefinition getArtifactDataFromJson(String json) {
+		Gson gson = new Gson();
+		JsonObject jsonElement = new JsonObject();
+		jsonElement = gson.fromJson(json, jsonElement.getClass());
+		ArtifactDefinition artifact = new ArtifactDefinition(); 
+		String payload = null;
+		JsonElement artifactPayload = jsonElement.get(Constants.ARTIFACT_PAYLOAD_DATA);
+		if (artifactPayload != null && !artifactPayload.isJsonNull()) {
+			payload = artifactPayload.getAsString();
+		}
+		jsonElement.remove(Constants.ARTIFACT_PAYLOAD_DATA);
+		artifact = gson.fromJson(jsonElement, ArtifactDefinition.class);
+		artifact.setPayloadData(payload);
+		
+		/*atifact.setArtifactName(UPLOAD_ARTIFACT_NAME);
+artifact.setArtifactDisplayName("configure");
+artifact.setArtifactType("SHELL");
+artifact.setMandatory(false);
+artifact.setDescription("ff");
+artifact.setPayloadData(UPLOAD_ARTIFACT_PAYLOAD);
+artifact.setArtifactLabel("configure");*/
+		return artifact;
+	}
+	
+	protected HttpGet createGetRequest(String url) {
+		HttpGet httpGet = new HttpGet(url);
+		httpGet.addHeader(HttpHeaderEnum.CONTENT_TYPE.getValue(), contentTypeHeaderData);
+		httpGet.addHeader(HttpHeaderEnum.ACCEPT.getValue(), acceptHeaderDate);
+		httpGet.addHeader(HttpHeaderEnum.USER_ID.getValue(), sdncUserDetails.getUserId());
+		return httpGet;
+	}
+	
+	protected String getArtifactUid(HttpResponse response) throws HttpResponseException, IOException, ParseException {
+		String responseString = new BasicResponseHandler().handleResponse(response);
+		JSONObject responseMap = (JSONObject) jsonParser.parse(responseString);
+		String artifactId = (String) responseMap.get("uniqueId");
+		return artifactId;
+	}
+	
+	protected String getArtifactEsId(HttpResponse response) throws HttpResponseException, IOException, ParseException {
+		String responseString = new BasicResponseHandler().handleResponse(response);
+		JSONObject responseMap = (JSONObject) jsonParser.parse(responseString);
+		String esId = (String) responseMap.get("EsId");
+		return esId;
+	}
+	
+	protected ArtifactDefinition addArtifactDataFromResponse(HttpResponse response, ArtifactDefinition artifact) throws HttpResponseException, IOException, ParseException {
+		//String responseString = new BasicResponseHandler().handleResponse(response);
+		HttpEntity entity = response.getEntity();
+		String responseString = EntityUtils.toString(entity);				
+		JSONObject responseMap = (JSONObject) jsonParser.parse(responseString);
+		artifact.setEsId((String)responseMap.get("esId"));
+		artifact.setUniqueId((String) responseMap.get("uniqueId"));
+		artifact.setArtifactGroupType(ArtifactGroupTypeEnum.findType((String) responseMap.get("artifactGroupType")));
+		artifact.setTimeout(((Long) responseMap.get("timeout")).intValue());
+		return artifact;
+	}
+	
+	protected String getLifecycleArtifactUid(CloseableHttpResponse response) throws HttpResponseException, IOException, ParseException {
+		String responseString = new BasicResponseHandler().handleResponse(response);
+		JSONObject responseMap = (JSONObject) jsonParser.parse(responseString);
+		responseMap = (JSONObject) responseMap.get("implementation");
+		String artifactId = (String) responseMap.get("uniqueId");
+		return artifactId;
+	}
+	
+	protected HttpDelete createDeleteArtifactRequest(String url) {
+		HttpDelete httpDelete = new HttpDelete(url);
+		httpDelete.addHeader(HttpHeaderEnum.USER_ID.getValue(), sdncUserDetails.getUserId());
+		httpDelete.addHeader(HttpHeaderEnum.ACCEPT.getValue(), acceptHeaderDate);
+		return httpDelete;
+	}
+	
+	protected HttpPost createPostAddArtifactRequeast(String jsonBody, String url, boolean addMd5Header) throws UnsupportedEncodingException {
+		HttpPost httppost = new HttpPost(url);
+		httppost.addHeader(HttpHeaderEnum.CONTENT_TYPE.getValue(), contentTypeHeaderData);
+		httppost.addHeader(HttpHeaderEnum.ACCEPT.getValue(), acceptHeaderDate);
+		httppost.addHeader(HttpHeaderEnum.USER_ID.getValue(), sdncUserDetails.getUserId());
+		if (addMd5Header) {
+			httppost.addHeader(HttpHeaderEnum.Content_MD5.getValue(), GeneralUtility.calculateMD5Base64EncodedByString(jsonBody));
+		}
+		StringEntity input = new StringEntity(jsonBody);
+		input.setContentType("application/json");
+		httppost.setEntity(input);
+		log.debug("Executing request {}" , httppost.getRequestLine());
+		return httppost;
+	}
+	
+	protected String createLoadArtifactBody() {
+		Map<String, Object> json = new HashMap<String, Object>();
+		json.put("artifactName", "install_apache2.sh");
+		json.put("artifactType", "SHELL");
+		json.put("description", "ddd");
+		json.put("payloadData", "UEsDBAoAAAAIAAeLb0bDQz");
+		json.put("artifactLabel", "name123");
+		
+		String jsonStr = gson.toJson(json);
+		return jsonStr;
+	}
+	
+	protected void checkDeleteResponse(RestResponse response) {
+		BaseRestUtils.checkStatusCode(response, "delete request failed", false, 204, 404);
+	}
+	
+	protected ArtifactUiDownloadData getArtifactUiDownloadData(String artifactUiDownloadDataStr) throws Exception {
+		
+		ObjectMapper mapper = new ObjectMapper();
+		try {
+			ArtifactUiDownloadData artifactUiDownloadData = mapper.readValue(artifactUiDownloadDataStr, ArtifactUiDownloadData.class);
+			return artifactUiDownloadData;
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
+		return null;
+	}
+
+	
+}
diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/execute/artifacts/HeatEnvArtifact.java b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/execute/artifacts/HeatEnvArtifact.java
new file mode 100644
index 0000000000..fb707889f6
--- /dev/null
+++ b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/execute/artifacts/HeatEnvArtifact.java
@@ -0,0 +1,181 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * SDC
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.sdc.ci.tests.execute.artifacts;
+
+import org.apache.commons.codec.binary.Base64;
+import org.junit.Rule;
+import org.junit.rules.TestName;
+import org.openecomp.sdc.be.datatypes.elements.HeatParameterDataDefinition;
+import org.openecomp.sdc.be.model.*;
+import org.openecomp.sdc.ci.tests.api.ComponentBaseTest;
+import org.openecomp.sdc.ci.tests.datatypes.ComponentInstanceReqDetails;
+import org.openecomp.sdc.ci.tests.datatypes.ServiceReqDetails;
+import org.openecomp.sdc.ci.tests.datatypes.enums.LifeCycleStatesEnum;
+import org.openecomp.sdc.ci.tests.datatypes.enums.ServiceCategoriesEnum;
+import org.openecomp.sdc.ci.tests.datatypes.enums.ServiceInstantiationType;
+import org.openecomp.sdc.ci.tests.datatypes.enums.UserRoleEnum;
+import org.openecomp.sdc.ci.tests.datatypes.http.RestResponse;
+import org.openecomp.sdc.ci.tests.utils.general.ElementFactory;
+import org.openecomp.sdc.ci.tests.utils.rest.*;
+import org.testng.annotations.Test;
+import org.yaml.snakeyaml.Yaml;
+
+import java.io.ByteArrayInputStream;
+import java.io.InputStream;
+import java.util.List;
+import java.util.Map;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+
+public class HeatEnvArtifact extends ComponentBaseTest {
+
+	@Rule
+	public static TestName name = new TestName();
+
+	@Test()
+	public void heatEnvOnResourceFormatTest() throws Exception {
+
+		User sdncModifierDetails = ElementFactory.getDefaultUser(UserRoleEnum.DESIGNER);
+
+		Resource createdResource = createVfFromCSAR(sdncModifierDetails, "csarHeatEnv.csar");
+		assertNotNull(createdResource);
+
+		RestResponse certifyState = LifecycleRestUtils.changeComponentState(createdResource, sdncModifierDetails, LifeCycleStatesEnum.CHECKIN);
+		BaseRestUtils.checkSuccess(certifyState);
+
+		Resource certifiedResource = ResponseParser.parseToObjectUsingMapper(certifyState.getResponse(), Resource.class);
+
+		ServiceReqDetails serviceDetails = ElementFactory.getDefaultService(
+				"ciNewtestservice1", ServiceCategoriesEnum.MOBILITY, sdncModifierDetails.getUserId(), 
+				ServiceInstantiationType.A_LA_CARTE.getValue());
+
+		// 2 create service
+		RestResponse createServiceResponse = ServiceRestUtils.createService(serviceDetails, sdncModifierDetails);
+		ResourceRestUtils.checkCreateResponse(createServiceResponse);
+		Service service = ResponseParser.parseToObjectUsingMapper(createServiceResponse.getResponse(), Service.class);
+
+		// 3 create vf instance in service
+		ComponentInstanceReqDetails componentInstanceDetails = ElementFactory.getComponentInstance(certifiedResource);
+		RestResponse createComponentInstance = ComponentInstanceRestUtils.createComponentInstance(componentInstanceDetails, sdncModifierDetails, service);
+		ResourceRestUtils.checkCreateResponse(createComponentInstance);
+
+		RestResponse getService = ServiceRestUtils.getService(service.getUniqueId());
+		BaseRestUtils.checkSuccess(getService);
+		service = ResponseParser.parseToObjectUsingMapper(getService.getResponse(), Service.class);
+
+		List<ComponentInstance> componentInstances = service.getComponentInstances();
+		assertNotNull(componentInstances);
+		assertEquals(1, componentInstances.size());
+
+		ComponentInstance vfi = componentInstances.get(0);
+		Map<String, ArtifactDefinition> deploymentArtifacts = vfi.getDeploymentArtifacts();
+		assertNotNull(deploymentArtifacts);
+		assertEquals(4, deploymentArtifacts.size());
+		ArtifactDefinition heatEnv = deploymentArtifacts.get("heat0env");
+		assertNotNull(heatEnv);
+
+		Map<String, Object> yaml = downloadComponentInstanceYamlFile(service.getUniqueId(), vfi.getUniqueId(), sdncModifierDetails, heatEnv.getUniqueId());
+		assertNotNull(yaml);
+		Map<String, Object> paramters = (Map<String, Object>)yaml.get("parameters");
+		assertNotNull(paramters);
+		assertEquals(8, paramters.size());
+		assertEquals(null, paramters.get("param8"));
+		List<HeatParameterDataDefinition> heatParameters = heatEnv.getHeatParameters();
+		heatParameters.forEach(p -> {
+			assertEquals(p.getCurrentValue(), paramters.get(p.getName()));
+		});
+	}
+	@Test(enabled = true)
+	public void noHeatEnvOnResourceFormatTest() throws Exception {
+		User sdncModifierDetails = ElementFactory.getDefaultUser(UserRoleEnum.DESIGNER);
+
+		Resource createdResource = createVfFromCSAR(sdncModifierDetails, "csarHeatNoEnv.csar");
+		assertNotNull(createdResource);
+
+		RestResponse certifyState = LifecycleRestUtils.changeComponentState(createdResource, sdncModifierDetails, LifeCycleStatesEnum.CHECKIN);
+		BaseRestUtils.checkSuccess(certifyState);
+
+		Resource certifiedResource = ResponseParser.parseToObjectUsingMapper(certifyState.getResponse(), Resource.class);
+
+		ServiceReqDetails serviceDetails = ElementFactory.getDefaultService(
+				"ciNewtestservice1", ServiceCategoriesEnum.MOBILITY, sdncModifierDetails.getUserId(), 
+				ServiceInstantiationType.A_LA_CARTE.getValue());
+
+		// 2 create service
+		RestResponse createServiceResponse = ServiceRestUtils.createService(serviceDetails, sdncModifierDetails);
+		ResourceRestUtils.checkCreateResponse(createServiceResponse);
+		Service service = ResponseParser.parseToObjectUsingMapper(createServiceResponse.getResponse(), Service.class);
+
+		// 3 create vf instance in service
+		ComponentInstanceReqDetails componentInstanceDetails = ElementFactory.getComponentInstance(certifiedResource);
+		RestResponse createComponentInstance = ComponentInstanceRestUtils.createComponentInstance(componentInstanceDetails, sdncModifierDetails, service);
+		ResourceRestUtils.checkCreateResponse(createComponentInstance);
+
+		RestResponse getService = ServiceRestUtils.getService(service.getUniqueId());
+		BaseRestUtils.checkSuccess(getService);
+		service = ResponseParser.parseToObjectUsingMapper(getService.getResponse(), Service.class);
+
+		List<ComponentInstance> componentInstances = service.getComponentInstances();
+		assertNotNull(componentInstances);
+		assertEquals(1, componentInstances.size());
+		
+		ComponentInstance vfi = componentInstances.get(0);
+		Map<String, ArtifactDefinition> deploymentArtifacts = vfi.getDeploymentArtifacts();
+		assertNotNull(deploymentArtifacts);
+		assertEquals(4, deploymentArtifacts.size());
+		ArtifactDefinition heatEnv = deploymentArtifacts.get("heat0env");
+		assertNotNull(heatEnv);
+
+		Map<String, Object> yaml = downloadComponentInstanceYamlFile(service.getUniqueId(), vfi.getUniqueId(), sdncModifierDetails, heatEnv.getUniqueId());
+		assertNotNull(yaml);
+		Map<String, Object> paramters = (Map<String, Object>)yaml.get("parameters");
+		assertNotNull(paramters);
+		assertEquals(8, paramters.size());
+		assertEquals(null, paramters.get("param1"));
+		assertEquals(null, paramters.get("param2"));
+		assertEquals(null, paramters.get("param4"));
+		assertEquals(null, paramters.get("param5"));
+		assertEquals(null, paramters.get("param7"));
+		assertEquals(null, paramters.get("param8"));
+		List<HeatParameterDataDefinition> heatParameters = heatEnv.getHeatParameters();
+		heatParameters.forEach(p -> {
+			assertEquals(p.getCurrentValue(), paramters.get(p.getName()));
+		});
+
+	}
+	//****************************************
+	private Map<String, Object> downloadComponentInstanceYamlFile(String serviceUniqueId, String resourceInstanceId, User user, String artifactUniqeId) throws Exception {
+		RestResponse heatEnvDownloadResponse = ArtifactRestUtils.downloadResourceInstanceArtifact(serviceUniqueId, resourceInstanceId, user, artifactUniqeId);
+		BaseRestUtils.checkSuccess(heatEnvDownloadResponse);
+
+		ArtifactUiDownloadData artifactUiDownloadData = ResponseParser.parseToObject(heatEnvDownloadResponse.getResponse(), ArtifactUiDownloadData.class);
+		byte[] fromUiDownload = artifactUiDownloadData.getBase64Contents().getBytes();
+		byte[] decodeBase64 = Base64.decodeBase64(fromUiDownload);
+		Yaml yaml = new Yaml();
+
+		InputStream inputStream = new ByteArrayInputStream(decodeBase64);
+
+		Map<String, Object> load = (Map<String, Object>) yaml.load(inputStream);
+
+		return load;
+	}
+}
diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/execute/artifacts/PlaceHolderValidations.java b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/execute/artifacts/PlaceHolderValidations.java
new file mode 100644
index 0000000000..e7d224031f
--- /dev/null
+++ b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/execute/artifacts/PlaceHolderValidations.java
@@ -0,0 +1,669 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * SDC
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.sdc.ci.tests.execute.artifacts;
+
+//import static org.junit.Assert.assertTrue;
+
+import fj.data.Either;
+import org.junit.Rule;
+import org.junit.rules.TestName;
+import org.openecomp.sdc.be.dao.api.ActionStatus;
+import org.openecomp.sdc.be.datatypes.enums.ResourceTypeEnum;
+import org.openecomp.sdc.be.model.*;
+import org.openecomp.sdc.ci.tests.api.ComponentBaseTest;
+import org.openecomp.sdc.ci.tests.datatypes.ArtifactReqDetails;
+import org.openecomp.sdc.ci.tests.datatypes.ResourceReqDetails;
+import org.openecomp.sdc.ci.tests.datatypes.enums.*;
+import org.openecomp.sdc.ci.tests.datatypes.http.RestResponse;
+import org.openecomp.sdc.ci.tests.utils.Utils;
+import org.openecomp.sdc.ci.tests.utils.general.AtomicOperationUtils;
+import org.openecomp.sdc.ci.tests.utils.general.ElementFactory;
+import org.openecomp.sdc.ci.tests.utils.general.FileUtils;
+import org.openecomp.sdc.ci.tests.utils.rest.*;
+import org.openecomp.sdc.ci.tests.utils.validation.ErrorValidationUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.testng.annotations.BeforeMethod;
+import org.testng.annotations.Test;
+
+import java.io.File;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+
+import static org.testng.AssertJUnit.*;
+
+public class PlaceHolderValidations extends ComponentBaseTest {
+	private static Logger logger = LoggerFactory.getLogger(PlaceHolderValidations.class.getName());
+	private static final String heatExtension = "yaml";
+	// private static final String yangXmlExtension = "xml";
+	// private static final String muranoPkgExtension = "zip";
+	private final String folderName = "addHeatArtifactToServiceAndSertify";
+	private Resource resource;
+	private final int timeOut = 60;
+	private ArtifactReqDetails updateArtifactReqDetails = null;
+	protected User sdncDesignerDetails1 = ElementFactory.getDefaultUser(UserRoleEnum.DESIGNER);
+	protected User sdncDesignerDetails2 = ElementFactory.getDefaultUser(UserRoleEnum.DESIGNER2);
+	protected ResourceReqDetails resourceDetails1;
+	protected ResourceReqDetails resourceVF;
+	protected ResourceReqDetails resourceCP;
+	protected ResourceReqDetails resourceVL;
+
+	protected ArtifactReqDetails heatArtifactDetails;
+	protected ArtifactReqDetails heatVolArtifactDetails;
+	protected ArtifactReqDetails heatNetArtifactDetails;
+
+	@Rule
+	public static TestName name = new TestName();
+
+	@BeforeMethod
+	public void init() throws IOException, Exception {
+
+		heatArtifactDetails = ElementFactory.getDefaultDeploymentArtifactForType(ArtifactTypeEnum.HEAT.getType());
+		heatNetArtifactDetails = ElementFactory
+				.getDefaultDeploymentArtifactForType(ArtifactTypeEnum.HEAT_NET.getType());
+		heatVolArtifactDetails = ElementFactory
+				.getDefaultDeploymentArtifactForType(ArtifactTypeEnum.HEAT_VOL.getType());
+		Resource resourceObject = AtomicOperationUtils
+				.createResourceByType(ResourceTypeEnum.VFC, UserRoleEnum.DESIGNER, true).left().value();
+		resourceDetails1 = new ResourceReqDetails(resourceObject);
+		resourceObject = AtomicOperationUtils.createResourceByType(ResourceTypeEnum.VF, UserRoleEnum.DESIGNER, true)
+				.left().value();
+		resourceVF = new ResourceReqDetails(resourceObject);
+		resourceObject = AtomicOperationUtils.createResourceByType(ResourceTypeEnum.CP, UserRoleEnum.DESIGNER, true)
+				.left().value();
+		resourceCP = new ResourceReqDetails(resourceObject);
+		resourceObject = AtomicOperationUtils.createResourceByType(ResourceTypeEnum.VL, UserRoleEnum.DESIGNER, true)
+				.left().value();
+		resourceVL = new ResourceReqDetails(resourceObject);
+	}
+
+	@Test
+	public void validateDeploymentPlaceHoldersByConfig() throws IOException {
+		RestResponse resourceGetResponse = ResourceRestUtils.getResource(resourceDetails1, sdncDesignerDetails1);
+		Resource resourceObject = ResponseParser.convertResourceResponseToJavaObject(resourceGetResponse.getResponse());
+		Map<String, ArtifactDefinition> deploymentArtifacts = resourceObject.getDeploymentArtifacts();
+		assertNotNull("deploymentArtifacts list is null", deploymentArtifacts);
+		List<String> listOfResDepArtTypesFromConfig = Utils.getListOfDepResArtLabels(true);
+		assertNotNull("deployment artifact types list is null", listOfResDepArtTypesFromConfig);
+		for (String resDepArtType : listOfResDepArtTypesFromConfig) {
+			assertNotNull("placeholder of " + resDepArtType + " type doesn't exist",
+					deploymentArtifacts.get(resDepArtType));
+		}
+	}
+
+	/*private void validateToscaArtifactsBeforeAndAfterSFT(ResourceReqDetails resourceDetails)
+			throws IOException, Exception {
+		RestResponse componentResponse = ResourceRestUtils.getResource(resourceDetails, sdncDesignerDetails1);
+		Component component = ResponseParser.convertResourceResponseToJavaObject(componentResponse.getResponse());
+		Map<String, ArtifactDefinition> toscaArtifacts = component.getToscaArtifacts();
+		for (ArtifactDefinition artifact : toscaArtifacts.values()) {
+			assertNull(artifact.getEsId());
+		}
+
+		componentResponse = LifecycleRestUtils.changeResourceState(resourceDetails, sdncDesignerDetails1,
+				LifeCycleStatesEnum.CERTIFICATIONREQUEST);
+		component = ResponseParser.convertResourceResponseToJavaObject(componentResponse.getResponse());
+		toscaArtifacts = component.getToscaArtifacts();
+
+		for (ArtifactDefinition artifact : toscaArtifacts.values()) {
+			assertEquals(artifact.getEsId(), artifact.getUniqueId());
+			List<Pair<String, String>> fields = new ArrayList();
+			fields.add(new Pair<String, String>("id", artifact.getEsId()));
+			List<Row> fetchFromTable = CassandraUtils.fetchFromTableQuery("sdcartifact", "resources", fields);
+			assertTrue(1 == fetchFromTable.size());
+		}
+	}*/
+
+	/*@Test
+	public void validateToscaArtifactsBeforeAndAfterSFT() throws IOException, Exception {
+		// TODO ADD VF and Service
+		validateToscaArtifactsBeforeAndAfterSFT(resourceDetails1);
+		validateToscaArtifactsBeforeAndAfterSFT(resourceCP);
+		validateToscaArtifactsBeforeAndAfterSFT(resourceVL);
+	}*/
+
+	@Test
+	public void validateToscaPlaceHoldersByConfig() throws IOException, Exception {
+		List<Component> components = new ArrayList<>();
+		RestResponse componentGetResponse = ResourceRestUtils.getResource(resourceDetails1, sdncDesignerDetails1);
+		components.add(ResponseParser.convertResourceResponseToJavaObject(componentGetResponse.getResponse()));
+
+		componentGetResponse = ResourceRestUtils.getResource(resourceCP, sdncDesignerDetails1);
+		components.add(ResponseParser.convertResourceResponseToJavaObject(componentGetResponse.getResponse()));
+
+		componentGetResponse = ResourceRestUtils.getResource(resourceVF, sdncDesignerDetails1);
+		components.add(ResponseParser.convertResourceResponseToJavaObject(componentGetResponse.getResponse()));
+
+		componentGetResponse = ResourceRestUtils.getResource(resourceVL, sdncDesignerDetails1);
+		components.add(ResponseParser.convertResourceResponseToJavaObject(componentGetResponse.getResponse()));
+
+		Service service = AtomicOperationUtils
+				.createServiceByCategory(ServiceCategoriesEnum.MOBILITY, UserRoleEnum.DESIGNER, true).left().value();
+		componentGetResponse = ServiceRestUtils.getService(service.getUniqueId(),
+				ElementFactory.getDefaultUser(UserRoleEnum.DESIGNER));
+		components.add(ResponseParser.parseToObjectUsingMapper(componentGetResponse.getResponse(), Service.class));
+
+		for (Component component : components) {
+			Map<String, ArtifactDefinition> toscaArtifacts = component.getToscaArtifacts();
+			assertNotNull("toscaArtifacts list is null", toscaArtifacts);
+			List<String> listOfToscaArtTypesFromConfig = Utils.getListOfToscaArtLabels(true);
+			assertNotNull("tosca artifact types list is null", listOfToscaArtTypesFromConfig);
+			for (String toscaArtType : listOfToscaArtTypesFromConfig) {
+				assertNotNull("placeholder of " + toscaArtType + " type doesn't exist",
+						toscaArtifacts.get(toscaArtType));
+			}
+		}
+
+	}
+
+	// test check configuration of "displayName" field for "heat" type
+	// deployment artifact
+	@Test
+	public void validateDeploymentPlaceHoldersDescriptionOfHeatByConfig() throws IOException {
+
+		Map<String, Object> mapOfDepResArtTypesObjects = getMapOfDepResArtTypesObjects();
+		assertNotNull("deployment artifact types list is null", mapOfDepResArtTypesObjects);
+		Object object = mapOfDepResArtTypesObjects.get("heat");
+		if (object instanceof Map<?, ?>) {
+			Map<String, Object> map = (Map<String, Object>) object;
+			assertTrue(map.get("displayName").equals("Base HEAT Template"));
+		} else {
+			assertTrue("return object does not instance of map", false);
+		}
+	}
+
+	@Test
+	public void addDepResArtEachType() throws Exception {
+
+		String artType;
+
+		addDeploymentArtifactByTypeToResource(resourceDetails1, heatArtifactDetails);
+		addDeploymentArtifactByTypeToResource(resourceDetails1, heatVolArtifactDetails);
+		addDeploymentArtifactByTypeToResource(resourceDetails1, heatNetArtifactDetails);
+		RestResponse response = ResourceRestUtils.getResource(resourceDetails1.getUniqueId());
+		resource = ResponseParser.convertResourceResponseToJavaObject(response.getResponse());
+		List<String> listOfResDepArtTypesFromConfig = Utils.getListOfDepResArtLabels(true);
+		assertNotNull("deployment artifact types list is null", listOfResDepArtTypesFromConfig);
+		for (String iter : listOfResDepArtTypesFromConfig) {
+			artType = iter;
+			verifyDepArtPlaceHoldersByType(artType);
+		}
+	}
+
+	@Test
+	public void checkHeatParametersExistingForEachType() throws Exception {
+
+		String artType;
+
+		addDeploymentArtifactByTypeToResource(resourceDetails1, heatArtifactDetails);
+		addDeploymentArtifactByTypeToResource(resourceDetails1, heatVolArtifactDetails);
+		addDeploymentArtifactByTypeToResource(resourceDetails1, heatNetArtifactDetails);
+		RestResponse response = ResourceRestUtils.getResource(resourceDetails1.getUniqueId());
+		resource = ResponseParser.convertResourceResponseToJavaObject(response.getResponse());
+		List<String> listOfResDepArtTypesFromConfig = Utils.getListOfDepResArtLabels(true);
+		assertNotNull("deployment artifact types list is null", listOfResDepArtTypesFromConfig);
+		for (String iter : listOfResDepArtTypesFromConfig) {
+			artType = iter;
+			verifyDepArtPlaceHoldersByType(artType);
+			verifyHeatParametersExistance(artType, false);
+		}
+	}
+
+	@Test
+	public void checkHeatParametersExistingForSpecificType() throws Exception {
+
+		String artType;
+
+		addDeploymentArtifactByTypeToResource(resourceDetails1, heatVolArtifactDetails);
+		addDeploymentArtifactByTypeToResource(resourceDetails1, heatNetArtifactDetails);
+		RestResponse response = ResourceRestUtils.getResource(resourceDetails1.getUniqueId());
+		resource = ResponseParser.convertResourceResponseToJavaObject(response.getResponse());
+		List<String> listOfResDepArtTypesFromConfig = Utils.getListOfDepResArtLabels(true);
+		assertNotNull("deployment artifact types list is null", listOfResDepArtTypesFromConfig);
+		for (String iter : listOfResDepArtTypesFromConfig) {
+			artType = iter;
+			if (heatArtifactDetails.getArtifactLabel().equals(iter)) {
+				verifyHeatParametersExistance(artType, true);
+			} else {
+				verifyHeatParametersExistance(artType, false);
+			}
+		}
+	}
+
+	@Test
+	public void addAndDeleteDepResArtEachType() throws Exception {
+
+		String artType;
+
+		addDeploymentArtifactByTypeToResource(resourceDetails1, heatArtifactDetails);
+		addDeploymentArtifactByTypeToResource(resourceDetails1, heatVolArtifactDetails);
+		addDeploymentArtifactByTypeToResource(resourceDetails1, heatNetArtifactDetails);
+		RestResponse response = ResourceRestUtils.getResource(resourceDetails1.getUniqueId());
+		resource = ResponseParser.convertResourceResponseToJavaObject(response.getResponse());
+		List<String> listOfResDepArtTypesFromConfig = Utils.getListOfDepResArtLabels(true);
+		assertNotNull("deployment artifact types list is null", listOfResDepArtTypesFromConfig);
+		for (String iter : listOfResDepArtTypesFromConfig) {
+			artType = iter;
+			verifyDepArtPlaceHoldersByType(artType);
+		}
+		RestResponse restResponseResource = LifecycleRestUtils.changeResourceState(resourceDetails1,
+				sdncDesignerDetails1, LifeCycleStatesEnum.CHECKIN);
+		assertTrue("expected response code in CHECKIN 200", restResponseResource.getErrorCode() == 200);
+		restResponseResource = LifecycleRestUtils.changeResourceState(resourceDetails1, sdncDesignerDetails1,
+				LifeCycleStatesEnum.CHECKOUT);
+		assertTrue("expected response code in CHECKOUT 200", restResponseResource.getErrorCode() == 200);
+
+		// delete all deployment artifacts
+		deleteDeploymentArtifactByTypeToResource(resourceDetails1, heatArtifactDetails);
+		deleteDeploymentArtifactByTypeToResource(resourceDetails1, heatVolArtifactDetails);
+		deleteDeploymentArtifactByTypeToResource(resourceDetails1, heatNetArtifactDetails);
+		response = ResourceRestUtils.getResource(resourceDetails1.getUniqueId());
+		resource = ResponseParser.convertResourceResponseToJavaObject(response.getResponse());
+		listOfResDepArtTypesFromConfig = Utils.getListOfDepResArtLabels(true);
+		assertNotNull("deployment artifact types list is null", listOfResDepArtTypesFromConfig);
+		for (String iter : listOfResDepArtTypesFromConfig) {
+			artType = iter;
+			verifyDepArtPlaceHoldersByType(artType);
+		}
+	}
+
+	@Test
+	public void addRemoveAddAgainArtifact() throws Exception {
+
+		// get MAP before upload artifact
+		RestResponse resourceGetResponse = ResourceRestUtils.getResource(resourceDetails1, sdncDesignerDetails1);
+		Resource resourceRespJavaObject = ResponseParser
+				.convertResourceResponseToJavaObject(resourceGetResponse.getResponse());
+		Map<String, ArtifactDefinition> deploymentArtifacts = resourceRespJavaObject.getDeploymentArtifacts();
+
+		ArtifactDefinition artifactDefinition = deploymentArtifacts.get("heat");
+
+		// validate place holder exist
+		assertNotNull(artifactDefinition);
+
+		// add artifact
+		updateArtifactReqDetails = getUpdateArtifactDetails(ArtifactTypeEnum.HEAT.getType());
+
+		RestResponse addInformationalArtifactToResource = ArtifactRestUtils.updateInformationalArtifactToResource(
+				updateArtifactReqDetails, sdncDesignerDetails1, resourceDetails1.getUniqueId());
+		logger.debug("addInformationalArtifactToResource response:  "
+				+ addInformationalArtifactToResource.getResponseMessage());
+		assertTrue("response code is not 200, returned :" + addInformationalArtifactToResource.getErrorCode(),
+				addInformationalArtifactToResource.getErrorCode() == 200);
+
+		ArtifactDefinition artifactDefinitionResponseJavaObject = ResponseParser
+				.convertArtifactDefinitionResponseToJavaObject(addInformationalArtifactToResource.getResponse());
+		ArtifactDefinition artDef1 = fillArtDefFromResponse(artifactDefinitionResponseJavaObject);
+
+		// remove artifact
+		RestResponse deleteArtifactFromResource = ArtifactRestUtils.deleteInformationalArtifactFromResource(
+				resourceDetails1.getUniqueId(), updateArtifactReqDetails, sdncDesignerDetails1);
+		logger.debug(
+				"addInformationalArtifactToResource response:  " + deleteArtifactFromResource.getResponseMessage());
+		assertTrue("response code is not 200, returned :" + deleteArtifactFromResource.getErrorCode(),
+				deleteArtifactFromResource.getErrorCode() == 200);
+
+		RestResponse getResourceResp = ResourceRestUtils.getResource(resourceDetails1, sdncDesignerDetails1);
+
+		artifactDefinitionResponseJavaObject = ResponseParser
+				.convertArtifactDefinitionResponseToJavaObject(deleteArtifactFromResource.getResponse());
+		assertTrue(artifactDefinitionResponseJavaObject.getArtifactName().isEmpty());
+		assertTrue(artifactDefinitionResponseJavaObject.getDescription().isEmpty());
+		assertTrue(artifactDefinitionResponseJavaObject.getArtifactChecksum().isEmpty());
+		assertTrue(artifactDefinitionResponseJavaObject.getEsId().isEmpty());
+		assertTrue(artifactDefinitionResponseJavaObject.getArtifactUUID().isEmpty());
+		assertNull(artifactDefinitionResponseJavaObject.getHeatParameters());
+
+		// add artifact again with different user
+		addInformationalArtifactToResource = ArtifactRestUtils.updateInformationalArtifactToResource(
+				heatArtifactDetails, sdncDesignerDetails1, resourceDetails1.getUniqueId());
+		logger.debug("addInformationalArtifactToResource response:  "
+				+ addInformationalArtifactToResource.getResponseMessage());
+		assertTrue("response code is not 200, returned :" + addInformationalArtifactToResource.getErrorCode(),
+				addInformationalArtifactToResource.getErrorCode() == 200);
+
+		artifactDefinitionResponseJavaObject = ResponseParser
+				.convertArtifactDefinitionResponseToJavaObject(addInformationalArtifactToResource.getResponse());
+		ArtifactDefinition artDef2 = fillArtDefFromResponse(artifactDefinitionResponseJavaObject);
+
+		assertFalse("check artifact checksum", artDef1.getArtifactChecksum().equals(artDef2.getArtifactChecksum()));
+		assertTrue("check artifact EsId", artDef1.getEsId().equals(artDef2.getEsId()));
+		assertFalse("check artifact UUID", artDef1.getArtifactUUID().equals(artDef2.getArtifactUUID()));
+		assertTrue("check UserIdCreator", artDef1.getUserIdCreator().equals(artDef2.getUserIdCreator()));
+		assertTrue("check UserIdLastUpdater", artDef1.getUserIdLastUpdater().equals(artDef2.getUserIdLastUpdater()));
+	}
+
+	@Test
+	public void addUpdateArtifactByType() throws Exception {
+
+		// get MAP before upload artifact
+		RestResponse resourceGetResponse = ResourceRestUtils.getResource(resourceDetails1, sdncDesignerDetails1);
+		Resource resourceRespJavaObject = ResponseParser
+				.convertResourceResponseToJavaObject(resourceGetResponse.getResponse());
+		Map<String, ArtifactDefinition> deploymentArtifacts = resourceRespJavaObject.getDeploymentArtifacts();
+
+		ArtifactDefinition artifactDefinition = deploymentArtifacts.get("heat");
+
+		// validate place holder exist
+		assertNotNull(artifactDefinition);
+
+		// add artifact
+		updateArtifactReqDetails = getUpdateArtifactDetails(ArtifactTypeEnum.HEAT.getType());
+
+		RestResponse addInformationalArtifactToResource = ArtifactRestUtils.updateInformationalArtifactToResource(
+				updateArtifactReqDetails, sdncDesignerDetails1, resourceDetails1.getUniqueId());
+		logger.debug("addInformationalArtifactToResource response:  "
+				+ addInformationalArtifactToResource.getResponseMessage());
+		assertTrue("response code is not 200, returned :" + addInformationalArtifactToResource.getErrorCode(),
+				addInformationalArtifactToResource.getErrorCode() == 200);
+
+		ArtifactDefinition artifactDefinitionResponseJavaObject = ResponseParser
+				.convertArtifactDefinitionResponseToJavaObject(addInformationalArtifactToResource.getResponse());
+		ArtifactDefinition artDef1 = fillArtDefFromResponse(artifactDefinitionResponseJavaObject);
+
+		RestResponse restResponseResource = LifecycleRestUtils.changeResourceState(resourceDetails1,
+				sdncDesignerDetails1, LifeCycleStatesEnum.CHECKIN);
+		restResponseResource = LifecycleRestUtils.changeResourceState(resourceDetails1, sdncDesignerDetails2,
+				LifeCycleStatesEnum.CHECKOUT);
+
+		// update with different user artifact
+		heatArtifactDetails = ElementFactory.getDefaultDeploymentArtifactForType(ArtifactTypeEnum.HEAT.getType());
+		heatArtifactDetails.setUniqueId(artifactDefinition.getUniqueId());
+		heatArtifactDetails.setArtifactName("2.yaml");
+		heatArtifactDetails.setArtifactLabel(artifactDefinition.getArtifactLabel());
+
+		addInformationalArtifactToResource = ArtifactRestUtils.updateInformationalArtifactToResource(
+				heatArtifactDetails, sdncDesignerDetails2, resourceDetails1.getUniqueId(), "heat");
+		logger.debug("addInformationalArtifactToResource response:  "
+				+ addInformationalArtifactToResource.getResponseMessage());
+		assertTrue("response code is not 200, returned :" + addInformationalArtifactToResource.getErrorCode(),
+				addInformationalArtifactToResource.getErrorCode() == 200);
+
+		artifactDefinitionResponseJavaObject = ResponseParser
+				.convertArtifactDefinitionResponseToJavaObject(addInformationalArtifactToResource.getResponse());
+		ArtifactDefinition artDef2 = fillArtDefFromResponse(artifactDefinitionResponseJavaObject);
+		verifyArtDefFields(artDef1, artDef2);
+
+	}
+
+	@Test
+	public void addUpdateDeleteArtifact() throws Exception {
+
+		// get MAP before upload artifact
+		RestResponse resourceGetResponse = ResourceRestUtils.getResource(resourceDetails1, sdncDesignerDetails1);
+		Resource resourceRespJavaObject = ResponseParser
+				.convertResourceResponseToJavaObject(resourceGetResponse.getResponse());
+		Map<String, ArtifactDefinition> deploymentArtifacts = resourceRespJavaObject.getDeploymentArtifacts();
+
+		ArtifactDefinition artifactDefinition = deploymentArtifacts.get("heat");
+
+		// validate place holder exist
+		assertNotNull(artifactDefinition);
+
+		updateArtifactReqDetails = getUpdateArtifactDetails(ArtifactTypeEnum.HEAT.getType());
+
+		RestResponse addInformationalArtifactToResource = ArtifactRestUtils.updateInformationalArtifactToResource(
+				updateArtifactReqDetails, sdncDesignerDetails1, resourceDetails1.getUniqueId());
+		logger.debug("addInformationalArtifactToResource response:  "
+				+ addInformationalArtifactToResource.getResponseMessage());
+		assertTrue("response code is not 200, returned :" + addInformationalArtifactToResource.getErrorCode(),
+				addInformationalArtifactToResource.getErrorCode() == 200);
+
+		ArtifactDefinition artifactDefinitionResponseJavaObject = ResponseParser
+				.convertArtifactDefinitionResponseToJavaObject(addInformationalArtifactToResource.getResponse());
+		ArtifactDefinition artDef1 = fillArtDefFromResponse(artifactDefinitionResponseJavaObject);
+
+		RestResponse restResponseResource = LifecycleRestUtils.changeResourceState(resourceDetails1,
+				sdncDesignerDetails1, LifeCycleStatesEnum.CHECKIN);
+		restResponseResource = LifecycleRestUtils.changeResourceState(resourceDetails1, sdncDesignerDetails2,
+				LifeCycleStatesEnum.CHECKOUT);
+
+		// update with different user artifact
+		heatArtifactDetails = ElementFactory.getDefaultDeploymentArtifactForType(ArtifactTypeEnum.HEAT.getType());
+		heatArtifactDetails.setArtifactName("2.yaml");
+
+		addInformationalArtifactToResource = ArtifactRestUtils.updateInformationalArtifactToResource(
+				heatArtifactDetails, sdncDesignerDetails2, resourceDetails1.getUniqueId(), "heat");
+		logger.debug("addInformationalArtifactToResource response:  "
+				+ addInformationalArtifactToResource.getResponseMessage());
+		assertTrue("response code is not 200, returned :" + addInformationalArtifactToResource.getErrorCode(),
+				addInformationalArtifactToResource.getErrorCode() == 200);
+
+		artifactDefinitionResponseJavaObject = ResponseParser
+				.convertArtifactDefinitionResponseToJavaObject(addInformationalArtifactToResource.getResponse());
+		ArtifactDefinition artDef2 = fillArtDefFromResponse(artifactDefinitionResponseJavaObject);
+
+		verifyArtDefFields(artDef1, artDef2);
+
+		RestResponse delteArtifactFromResource = ArtifactRestUtils.deleteInformationalArtifactFromResource(
+				resourceDetails1.getUniqueId(), heatArtifactDetails, sdncDesignerDetails2);
+		logger.debug("addInformationalArtifactToResource response: {}", delteArtifactFromResource.getResponseMessage());
+		assertTrue("response code is not 200, returned :" + delteArtifactFromResource.getErrorCode(),
+				delteArtifactFromResource.getErrorCode() == 200);
+
+	}
+
+	@Test
+	public void addHeatVolArtInvalidExtension() throws Exception {
+
+		heatVolArtifactDetails.setArtifactName("heatVol.txt");
+		RestResponse response = getResponseOnAddDeploymentArtifactByTypeToResource(resourceDetails1,
+				heatVolArtifactDetails);
+		ErrorInfo errorInfo = ErrorValidationUtils
+				.parseErrorConfigYaml(ActionStatus.WRONG_ARTIFACT_FILE_EXTENSION.name());
+		assertEquals("Check response code after upload artifact", errorInfo.getCode(), response.getErrorCode());
+		List<String> variables = Arrays.asList(ArtifactTypeEnum.HEAT_VOL.getType());
+		ErrorValidationUtils.checkBodyResponseOnError(ActionStatus.WRONG_ARTIFACT_FILE_EXTENSION.name(), variables,
+				response.getResponse());
+	}
+
+	@Test
+	public void addHeatNetArtInvalidExtension() throws Exception {
+
+		heatNetArtifactDetails.setArtifactName("yaml");
+		RestResponse response = getResponseOnAddDeploymentArtifactByTypeToResource(resourceDetails1,
+				heatNetArtifactDetails);
+		ErrorInfo errorInfo = ErrorValidationUtils
+				.parseErrorConfigYaml(ActionStatus.WRONG_ARTIFACT_FILE_EXTENSION.name());
+		assertEquals("Check response code after upload artifact", errorInfo.getCode(), response.getErrorCode());
+		List<String> variables = Arrays.asList(ArtifactTypeEnum.HEAT_NET.getType());
+		ErrorValidationUtils.checkBodyResponseOnError(ActionStatus.WRONG_ARTIFACT_FILE_EXTENSION.name(), variables,
+				response.getResponse());
+	}
+
+	@Test
+	public void checkServiceSecurityTemplateInformationalArtifactsCreation() throws IOException, Exception {
+
+		Either<Service, RestResponse> createServiceResponse = AtomicOperationUtils
+				.createServiceByCategory(ServiceCategoriesEnum.MOBILITY, UserRoleEnum.DESIGNER, true);
+		Map<String, ArtifactDefinition> artifacts = null;
+		ArtifactDefinition securitytemplate = null;
+		if (createServiceResponse.isLeft()) {
+			Component component = createServiceResponse.left().value();
+			artifacts = component.getArtifacts();
+			securitytemplate = artifacts.get("servicesecuritytemplate");
+			assertNotNull(securitytemplate);
+			assertEquals("Service Security Template", securitytemplate.getArtifactDisplayName());
+		} else {
+			logger.debug("checkSecurityTemplateInformationalArtifactsCreation service creation response:  "
+					+ createServiceResponse.right().value().getResponseMessage());
+		}
+	}
+
+	@Test
+	public void checkResourceSecurityTemplateInformationalArtifactsCreation() throws IOException, Exception {
+
+		Resource resource = AtomicOperationUtils.createResourcesByTypeNormTypeAndCatregory(ResourceTypeEnum.VFC,
+				NormativeTypesEnum.CONTAINER_APPLICATION, ResourceCategoryEnum.APPLICATION_L4_BORDER,
+				UserRoleEnum.DESIGNER, true).left().value();
+		Map<String, ArtifactDefinition> artifacts = resource.getArtifacts();
+		ArtifactDefinition securitytemplate = artifacts.get("resourcesecuritytemplate");
+		assertNotNull(securitytemplate);
+		assertEquals("Resource Security Template", securitytemplate.getArtifactDisplayName());
+	}
+
+	// Benny
+	@Test
+	public void serviceSecurityTemplateInformationalArtifact() throws IOException, Exception {
+		String artifactPlaceHolder = "servicesecuritytemplate";
+		Service service = AtomicOperationUtils
+				.createServiceByCategory(ServiceCategoriesEnum.MOBILITY, UserRoleEnum.DESIGNER, true).left().value();
+		Map<String, ArtifactDefinition> artifacts = service.getArtifacts();
+		ArtifactDefinition securitytemplate = artifacts.get(artifactPlaceHolder);
+		assertNotNull(securitytemplate);
+		assertEquals("Service Security Template", securitytemplate.getArtifactDisplayName());
+		assertEquals("OTHER", securitytemplate.getArtifactType());
+		assertEquals(artifactPlaceHolder, securitytemplate.getArtifactLabel());
+		// Get service
+		RestResponse getService = ServiceRestUtils.getService(service.getUniqueId(),
+				ElementFactory.getDefaultUser(UserRoleEnum.DESIGNER));
+		assertEquals(BaseRestUtils.STATUS_CODE_SUCCESS, getService.getErrorCode().intValue());
+		service = ResponseParser.parseToObjectUsingMapper(getService.getResponse(), Service.class);
+		artifacts = service.getArtifacts();
+		securitytemplate = artifacts.get(artifactPlaceHolder);
+		assertNotNull(securitytemplate);
+		assertEquals("Service Security Template", securitytemplate.getArtifactDisplayName());
+		assertEquals("OTHER", securitytemplate.getArtifactType());
+		assertEquals(artifactPlaceHolder, securitytemplate.getArtifactLabel());
+	}
+
+	@Test
+	public void resourceSecurityTemplateInformationalArtifacts() throws IOException, Exception {
+		String artifactPlaceHolder = "resourcesecuritytemplate";
+		Resource resource = AtomicOperationUtils.createResourcesByTypeNormTypeAndCatregory(ResourceTypeEnum.VFC,
+				NormativeTypesEnum.CONTAINER_APPLICATION, ResourceCategoryEnum.APPLICATION_L4_BORDER,
+				UserRoleEnum.DESIGNER, true).left().value();
+		Map<String, ArtifactDefinition> artifacts = resource.getArtifacts();
+		ArtifactDefinition securitytemplate = artifacts.get("resourcesecuritytemplate");
+		assertNotNull(securitytemplate);
+		assertEquals("Resource Security Template", securitytemplate.getArtifactDisplayName());
+		assertEquals("OTHER", securitytemplate.getArtifactType());
+		assertEquals(artifactPlaceHolder, securitytemplate.getArtifactLabel());
+		// Get resource
+		RestResponse getresource = ResourceRestUtils.getResource(ElementFactory.getDefaultUser(UserRoleEnum.DESIGNER),
+				resource.getUniqueId());
+		assertEquals(BaseRestUtils.STATUS_CODE_SUCCESS, getresource.getErrorCode().intValue());
+		resource = ResponseParser.parseToObjectUsingMapper(getresource.getResponse(), Resource.class);
+		artifacts = resource.getArtifacts();
+		securitytemplate = artifacts.get(artifactPlaceHolder);
+		assertNotNull(securitytemplate);
+		assertEquals("Resource Security Template", securitytemplate.getArtifactDisplayName());
+		assertEquals("OTHER", securitytemplate.getArtifactType());
+		assertEquals(artifactPlaceHolder, securitytemplate.getArtifactLabel());
+	}
+
+	// ================================================
+
+	@SuppressWarnings("unchecked")
+	private Map<String, Object> getMapOfDepResArtTypesObjects() throws FileNotFoundException {
+
+		return (Map<String, Object>) Utils.parseYamlConfig("deploymentResourceArtifacts");
+
+	}
+
+	private void addDeploymentArtifactByTypeToResource(ResourceReqDetails resourceReqDetails,
+			ArtifactReqDetails artReqDetails) throws IOException, Exception {
+
+		RestResponse response = ArtifactRestUtils.addInformationalArtifactToResource(artReqDetails,
+				sdncDesignerDetails1, resourceReqDetails.getUniqueId());
+		assertTrue("add" + artReqDetails.getArtifactLabel() + " artifact to resource request returned status:"
+				+ response.getErrorCode(), response.getErrorCode() == 200);
+	}
+
+	private RestResponse getResponseOnAddDeploymentArtifactByTypeToResource(ResourceReqDetails resourceReqDetails,
+			ArtifactReqDetails artReqDetails) throws IOException, Exception {
+
+		return ArtifactRestUtils.addInformationalArtifactToResource(artReqDetails, sdncDesignerDetails1,
+				resourceReqDetails.getUniqueId());
+	}
+
+	private void deleteDeploymentArtifactByTypeToResource(ResourceReqDetails resourceReqDetails,
+			ArtifactReqDetails artReqDetails) throws IOException, Exception {
+
+		RestResponse response = ArtifactRestUtils.deleteInformationalArtifactFromResource(
+				resourceReqDetails.getUniqueId(), artReqDetails, sdncDesignerDetails1);
+		assertTrue("delete" + artReqDetails.getArtifactLabel() + " artifact to resource request returned status:"
+				+ response.getErrorCode(), response.getErrorCode() == 200);
+	}
+
+	private void verifyDepArtPlaceHoldersByType(String artType) {
+
+		Map<String, ArtifactDefinition> deploymentArtifacts = resource.getDeploymentArtifacts();
+		assertNotNull("deployment artifact data is null", deploymentArtifacts.get(artType));
+		assertNotNull("deployment artifact data is null", deploymentArtifacts.get(artType).getEsId());
+		assertNotNull("deployment artifact data is null", deploymentArtifacts.get(artType).getDescription());
+		assertTrue(
+				"deployment artifact timeout does not equal to default value " + timeOut + " expected " + timeOut
+						+ ", actual - " + deploymentArtifacts.get(artType).getTimeout(),
+				deploymentArtifacts.get(artType).getTimeout() == timeOut);
+		assertTrue("deployment artifact label value ",
+				deploymentArtifacts.get(artType).getArtifactLabel().equals(artType));
+	}
+
+	private void verifyHeatParametersExistance(String artType, Boolean isNull) {
+		Map<String, ArtifactDefinition> deploymentArtifacts = resource.getDeploymentArtifacts();
+		if (isNull) {
+			assertNull("heatParameters list for type " + artType + " is not null",
+					deploymentArtifacts.get(artType).getHeatParameters());
+		} else {
+			assertNotNull("heatParameters list for type " + artType + " is null",
+					deploymentArtifacts.get(artType).getHeatParameters());
+		}
+	}
+
+	private void verifyArtDefFields(ArtifactDefinition artDef1, ArtifactDefinition artDef2) {
+
+		assertFalse("check artifact checksum", artDef1.getArtifactChecksum().equals(artDef2.getArtifactChecksum()));
+		assertFalse("check artifact EsId", artDef1.getEsId().equals(artDef2.getEsId()));
+		assertFalse("check artifact UUID", artDef1.getArtifactUUID().equals(artDef2.getArtifactUUID()));
+		assertTrue("check UserIdCreator", artDef1.getUserIdCreator().equals(artDef2.getUserIdCreator()));
+		assertFalse("check UserIdLastUpdater", artDef1.getUserIdLastUpdater().equals(artDef2.getUserIdLastUpdater()));
+
+	}
+
+	private ArtifactDefinition fillArtDefFromResponse(ArtifactDefinition artifactDefinitionResponseJavaObject) {
+		ArtifactDefinition artDef = new ArtifactDefinition();
+		artDef.setArtifactChecksum(artifactDefinitionResponseJavaObject.getArtifactChecksum());
+		artDef.setEsId(artifactDefinitionResponseJavaObject.getEsId());
+		artDef.setArtifactUUID(artifactDefinitionResponseJavaObject.getArtifactUUID());
+		artDef.setUserIdCreator(artifactDefinitionResponseJavaObject.getUserIdCreator());
+		artDef.setUserIdLastUpdater(artifactDefinitionResponseJavaObject.getUserIdLastUpdater());
+		return artDef;
+	}
+
+	private ArtifactReqDetails getUpdateArtifactDetails(String artType) throws IOException, Exception {
+		String ext = heatExtension;
+		String sourceDir = config.getResourceConfigDir();
+		String testResourcesPath = sourceDir + File.separator + folderName;
+		List<String> listFileName = FileUtils.getFileListFromBaseDirectoryByTestName(testResourcesPath);
+		logger.debug("listFileName: {}", listFileName.toString());
+
+		String payload = FileUtils.loadPayloadFile(listFileName, ext, true);
+		ArtifactReqDetails updateArtifactReqDetails = ElementFactory.getDefaultDeploymentArtifactForType(artType);
+		updateArtifactReqDetails.setPayload(payload);
+		updateArtifactReqDetails.setArtifactName("1.yaml");
+		return updateArtifactReqDetails;
+	}
+}
diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/execute/artifacts/ValidateHeatArtFieldsTypes.java b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/execute/artifacts/ValidateHeatArtFieldsTypes.java
new file mode 100644
index 0000000000..00a304aada
--- /dev/null
+++ b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/execute/artifacts/ValidateHeatArtFieldsTypes.java
@@ -0,0 +1,172 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * SDC
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.sdc.ci.tests.execute.artifacts;
+
+import org.junit.Rule;
+import org.junit.rules.TestName;
+import org.openecomp.sdc.be.dao.api.ActionStatus;
+import org.openecomp.sdc.be.datatypes.elements.HeatParameterDataDefinition;
+import org.openecomp.sdc.be.model.ArtifactDefinition;
+import org.openecomp.sdc.be.model.User;
+import org.openecomp.sdc.ci.tests.api.ComponentBaseTest;
+import org.openecomp.sdc.ci.tests.datatypes.ArtifactReqDetails;
+import org.openecomp.sdc.ci.tests.datatypes.ResourceReqDetails;
+import org.openecomp.sdc.ci.tests.datatypes.ServiceReqDetails;
+import org.openecomp.sdc.ci.tests.datatypes.enums.ArtifactTypeEnum;
+import org.openecomp.sdc.ci.tests.datatypes.enums.RespJsonKeysEnum;
+import org.openecomp.sdc.ci.tests.datatypes.enums.UserRoleEnum;
+import org.openecomp.sdc.ci.tests.datatypes.http.RestResponse;
+import org.openecomp.sdc.ci.tests.utils.general.ElementFactory;
+import org.openecomp.sdc.ci.tests.utils.rest.ArtifactRestUtils;
+import org.openecomp.sdc.ci.tests.utils.rest.ResourceRestUtils;
+import org.openecomp.sdc.ci.tests.utils.rest.ResponseParser;
+import org.openecomp.sdc.ci.tests.utils.validation.ArtifactValidationUtils;
+import org.openecomp.sdc.ci.tests.utils.validation.ErrorValidationUtils;
+import org.testng.AssertJUnit;
+import org.testng.annotations.Test;
+
+import java.util.Arrays;
+import java.util.List;
+
+public class ValidateHeatArtFieldsTypes extends ComponentBaseTest {
+
+	protected User sdncDesignerDetails;
+	protected ResourceReqDetails resourceDetails;
+	protected ServiceReqDetails serviceDetails;
+
+	private static final String heatExtension = "yaml";
+	private static final String yangXmlExtension = "xml";
+	private static final String muranoPkgExtension = "zip";
+	private final String folderName = "yamlFieldsValidation";
+
+	private final String uuidString = RespJsonKeysEnum.UUID.getRespJsonKeyName().toString();
+
+	@Rule
+	public static TestName name = new TestName();
+
+	@Test
+	public void validateHeatArtFiledTypes() throws Exception {
+
+		// get relevant resource and service
+
+		sdncDesignerDetails = ElementFactory.getDefaultUser(UserRoleEnum.DESIGNER);
+		resourceDetails = ElementFactory.getDefaultResource();
+
+		RestResponse response = ResourceRestUtils.createResource(resourceDetails, sdncDesignerDetails);
+		AssertJUnit.assertTrue("create request returned status:" + response.getErrorCode(),
+				response.getErrorCode() == 201);
+
+		// add artifact to resource1
+
+		ArtifactReqDetails heatArtifactDetails = ElementFactory
+				.getDefaultDeploymentArtifactForType(ArtifactTypeEnum.HEAT.getType());
+		List<String> listOfArtifactFromFolder = ArtifactValidationUtils.getListOfArtifactFromFolder(folderName);
+		for (int i = 0; i < listOfArtifactFromFolder.size(); i++) {
+			heatArtifactDetails = ArtifactValidationUtils.replaceDefaultArtWithArtFromList(heatArtifactDetails,
+					heatExtension, folderName, i);
+			response = ArtifactRestUtils.addInformationalArtifactToResource(heatArtifactDetails, sdncDesignerDetails,
+					resourceDetails.getUniqueId());
+
+			if (heatArtifactDetails.getArtifactName().contains("bool")) {
+				if (heatArtifactDetails.getArtifactName().contains("negative")) {
+					// validate negative response
+					List<String> variables = Arrays.asList("HEAT", "boolean", "city_name");
+					ErrorValidationUtils.checkBodyResponseOnError(ActionStatus.INVALID_HEAT_PARAMETER_VALUE.name(),
+							variables, response.getResponse());
+				}
+				if (heatArtifactDetails.getArtifactName().contains("positive")) {
+					AssertJUnit.assertTrue(
+							"add HEAT artifact to resource request returned status:" + response.getErrorCode()
+									+ " fileName: " + heatArtifactDetails.getArtifactName(),
+							response.getErrorCode() == 200);
+					ArtifactDefinition artifactDefinitionJavaObject = ResponseParser
+							.convertArtifactDefinitionResponseToJavaObject(response.getResponse());
+					List<HeatParameterDataDefinition> heatParameters = artifactDefinitionJavaObject.getHeatParameters();
+					String currentValue = null;
+					for (HeatParameterDataDefinition heatParameterDefinition : heatParameters) {
+						if (heatParameterDefinition.getName().equals("city_name")) {
+							currentValue = heatParameterDefinition.getCurrentValue();
+						}
+					}
+					if (heatArtifactDetails.getArtifactName().contains("true")) {
+						AssertJUnit.assertTrue(currentValue.equals("true"));
+					}
+					if (heatArtifactDetails.getArtifactName().contains("false")) {
+						AssertJUnit.assertTrue(currentValue.equals("false"));
+					}
+					RestResponse deleteInformationalArtifactFromResource = ArtifactRestUtils
+							.deleteInformationalArtifactFromResource(resourceDetails.getUniqueId(), heatArtifactDetails,
+									sdncDesignerDetails);
+					AssertJUnit.assertTrue(
+							"delete HEAT artifact from resource request returned status:"
+									+ deleteInformationalArtifactFromResource.getErrorCode(),
+							deleteInformationalArtifactFromResource.getErrorCode() == 200);
+				}
+
+			} else if (heatArtifactDetails.getArtifactName().contains("number")) {
+				if (heatArtifactDetails.getArtifactName().contains("negative")) {
+					// validate negative response
+					List<String> variables = Arrays.asList("HEAT", "number", "city_name");
+					ErrorValidationUtils.checkBodyResponseOnError(ActionStatus.INVALID_HEAT_PARAMETER_VALUE.name(),
+							variables, response.getResponse());
+				}
+				if (heatArtifactDetails.getArtifactName().contains("positive")) {
+					AssertJUnit.assertTrue(
+							"add HEAT artifact to resource request returned status:" + response.getErrorCode()
+									+ " fileName: " + heatArtifactDetails.getArtifactName(),
+							response.getErrorCode() == 200);
+				}
+
+			} else if (heatArtifactDetails.getArtifactName().contains("string")) {
+				if (heatArtifactDetails.getArtifactName().contains("negative")) {
+					// validate negative response
+					List<String> variables = Arrays.asList("HEAT", "string", "city_name");
+					ErrorValidationUtils.checkBodyResponseOnError(ActionStatus.INVALID_HEAT_PARAMETER_VALUE.name(),
+							variables, response.getResponse());
+				}
+				if (heatArtifactDetails.getArtifactName().contains("positive")) {
+					AssertJUnit.assertTrue(
+							"add HEAT artifact to resource request returned status:" + response.getErrorCode()
+									+ " fileName: " + heatArtifactDetails.getArtifactName(),
+							response.getErrorCode() == 200);
+				}
+
+			}
+
+			else if (heatArtifactDetails.getArtifactName().contains("unsupported")) {
+
+				// validate negative response
+				List<String> variables = Arrays.asList("HEAT", "number123");
+				ErrorValidationUtils.checkBodyResponseOnError(ActionStatus.INVALID_HEAT_PARAMETER_TYPE.name(),
+						variables, response.getResponse());
+
+			}
+
+			else {
+				AssertJUnit.assertTrue(
+						"add HEAT artifact to resource request returned status:" + response.getErrorCode(),
+						response.getErrorCode() == 200);
+			}
+		}
+
+	}
+
+}
diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/execute/attribute/ComponentInstanceAttributeTest.java b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/execute/attribute/ComponentInstanceAttributeTest.java
new file mode 100644
index 0000000000..75e06391fd
--- /dev/null
+++ b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/execute/attribute/ComponentInstanceAttributeTest.java
@@ -0,0 +1,89 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * SDC
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.sdc.ci.tests.execute.attribute;
+
+import com.google.gson.Gson;
+import com.google.gson.GsonBuilder;
+import org.junit.Rule;
+import org.junit.rules.TestName;
+import org.openecomp.sdc.be.datatypes.enums.ComponentTypeEnum;
+import org.openecomp.sdc.be.datatypes.enums.ResourceTypeEnum;
+import org.openecomp.sdc.be.model.ComponentInstance;
+import org.openecomp.sdc.be.model.ComponentInstanceProperty;
+import org.openecomp.sdc.be.model.Resource;
+import org.openecomp.sdc.ci.tests.api.ComponentBaseTest;
+import org.openecomp.sdc.ci.tests.api.Urls;
+import org.openecomp.sdc.ci.tests.datatypes.enums.LifeCycleStatesEnum;
+import org.openecomp.sdc.ci.tests.datatypes.enums.UserRoleEnum;
+import org.openecomp.sdc.ci.tests.utils.general.AtomicOperationUtils;
+import org.openecomp.sdc.ci.tests.utils.rest.BaseRestUtils;
+import org.testng.annotations.Test;
+
+import java.io.File;
+import java.util.function.Function;
+
+import static org.junit.Assert.assertEquals;
+import static org.openecomp.sdc.common.datastructure.FunctionalInterfaces.swallowException;
+
+public class ComponentInstanceAttributeTest extends ComponentBaseTest {
+
+	public static Gson gson = new GsonBuilder().setPrettyPrinting().create();
+
+	@Rule
+	public static TestName name = new TestName();
+
+	@Test
+	public void testUpdateAttributeOnResourceInstance() {
+		// Prepare VF with vfc instance with Attributes
+		String testResourcesPath = config.getResourceConfigDir() + File.separator + "importToscaResourceByCreateUrl";
+		final Resource vfcWithAttributes = AtomicOperationUtils
+				.importResource(testResourcesPath, "CPWithAttributes.yml").left().value();
+		swallowException(() -> AtomicOperationUtils.changeComponentState(vfcWithAttributes, UserRoleEnum.DESIGNER,
+				LifeCycleStatesEnum.CHECKIN, false));
+		Resource vf = AtomicOperationUtils.createResourceByType(ResourceTypeEnum.VF, UserRoleEnum.DESIGNER, false)
+				.left().value();
+		ComponentInstance vfcInstance = AtomicOperationUtils
+				.addComponentInstanceToComponentContainer(vfcWithAttributes, vf).left().value();
+
+		// util method to get the specific attribute from the vf
+		Function<Resource, ComponentInstanceProperty> attributeGetter = resourceVf -> resourceVf
+				.getComponentInstancesAttributes().values().iterator().next().stream()
+				.filter(att -> att.getName().equals("private_address")).findAny().get();
+		// update attribute on vfc instance
+		final Resource vfWithInsatncePreUpdate = swallowException(
+				() -> (Resource) AtomicOperationUtils.getComponentObject(vf, UserRoleEnum.DESIGNER));
+		ComponentInstanceProperty attributeOfRI = attributeGetter.apply(vfWithInsatncePreUpdate);
+		final String newAttValue = "NewValue";
+		attributeOfRI.setValue(newAttValue);
+		String body = gson.toJson(attributeOfRI);
+		String url = String.format(Urls.UPDATE_ATTRIBUTE_ON_RESOURCE_INSTANCE, config.getCatalogBeHost(),
+				config.getCatalogBePort(), ComponentTypeEnum.findParamByType(ComponentTypeEnum.RESOURCE),
+				vf.getUniqueId(), vfcInstance.getUniqueId());
+		swallowException(() -> BaseRestUtils.sendPost(url, body, UserRoleEnum.DESIGNER.getUserId(),
+				BaseRestUtils.acceptHeaderData));
+		// Retrieve updated vf and verify attribute was updated
+		final Resource vfWithInsatncePostUpdate = swallowException(
+				() -> (Resource) AtomicOperationUtils.getComponentObject(vf, UserRoleEnum.DESIGNER));
+		ComponentInstanceProperty updatedAttribute = attributeGetter.apply(vfWithInsatncePostUpdate);
+		assertEquals(updatedAttribute.getValue(), newAttValue);
+
+	}
+}
diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/execute/category/CatalogDataApiTest.java b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/execute/category/CatalogDataApiTest.java
new file mode 100644
index 0000000000..871cf7119f
--- /dev/null
+++ b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/execute/category/CatalogDataApiTest.java
@@ -0,0 +1,227 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * SDC
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.sdc.ci.tests.execute.category;
+
+import com.google.gson.Gson;
+import org.json.simple.JSONArray;
+import org.json.simple.JSONObject;
+import org.json.simple.JSONValue;
+import org.junit.Rule;
+import org.junit.rules.TestName;
+import org.openecomp.sdc.be.model.User;
+import org.openecomp.sdc.ci.tests.api.ComponentBaseTest;
+import org.openecomp.sdc.ci.tests.api.Urls;
+import org.openecomp.sdc.ci.tests.config.Config;
+import org.openecomp.sdc.ci.tests.datatypes.ResourceReqDetails;
+import org.openecomp.sdc.ci.tests.datatypes.ServiceReqDetails;
+import org.openecomp.sdc.ci.tests.datatypes.enums.*;
+import org.openecomp.sdc.ci.tests.datatypes.http.HttpHeaderEnum;
+import org.openecomp.sdc.ci.tests.datatypes.http.HttpRequest;
+import org.openecomp.sdc.ci.tests.datatypes.http.RestResponse;
+import org.openecomp.sdc.ci.tests.utils.Utils;
+import org.openecomp.sdc.ci.tests.utils.general.ElementFactory;
+import org.openecomp.sdc.ci.tests.utils.rest.CatalogRestUtils;
+import org.openecomp.sdc.ci.tests.utils.rest.LifecycleRestUtils;
+import org.openecomp.sdc.ci.tests.utils.rest.ResourceRestUtils;
+import org.openecomp.sdc.ci.tests.utils.rest.ResponseParser;
+import org.testng.AssertJUnit;
+import org.testng.annotations.AfterMethod;
+import org.testng.annotations.BeforeMethod;
+import org.testng.annotations.Test;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Map;
+
+public class CatalogDataApiTest extends ComponentBaseTest {
+
+	protected Config config = Config.instance();
+	protected String contentTypeHeaderData = "application/json";
+	protected String acceptHeaderDate = "application/json";
+
+	@Rule
+	public static TestName name = new TestName();
+	protected User user;
+	protected RestResponse res1;
+	protected RestResponse res2;
+	protected RestResponse svc1;
+	protected ResourceReqDetails resourceDetails1;
+	protected ResourceReqDetails resourceDetails2;
+	protected ServiceReqDetails svcDetails1;
+
+	@BeforeMethod
+	public void setUp() throws Exception {
+		user = ElementFactory.getDefaultUser(UserRoleEnum.ADMIN);
+		resourceDetails1 = buildResourceDetails(user, "TestResource1");
+		resourceDetails2 = buildResourceDetails(user, "TestResource2");
+		svcDetails1 = buildServiceDetails("TestService1");
+
+		res1 = createResource(user, resourceDetails1);
+		AssertJUnit.assertEquals("create resorce failed", 201, res1.getErrorCode().intValue());
+		resourceDetails1.setUniqueId(ResponseParser.getUniqueIdFromResponse(res1));
+		resourceDetails2.setVersion(ResponseParser.getVersionFromResponse(res1));
+
+		res2 = createResource(user, resourceDetails2);
+		AssertJUnit.assertEquals("create resorce failed", 201, res2.getErrorCode().intValue());
+		resourceDetails2.setUniqueId(ResponseParser.getUniqueIdFromResponse(res2));
+		resourceDetails2.setVersion(ResponseParser.getVersionFromResponse(res2));
+
+		svc1 = createService(user, svcDetails1);
+		AssertJUnit.assertEquals("create resorce failed", 201, svc1.getErrorCode().intValue());
+		svcDetails1.setUniqueId(ResponseParser.convertServiceResponseToJavaObject(svc1.getResponse()).getUniqueId());
+		svcDetails1.setVersion(ResponseParser.convertServiceResponseToJavaObject(svc1.getResponse()).getVersion());
+	}
+
+	@AfterMethod
+	public void tearDown() throws Exception {
+		deleteResource(resourceDetails1.getUniqueId(), user.getUserId());
+		deleteResource(resourceDetails2.getUniqueId(), user.getUserId());
+		deleteService(svcDetails1.getUniqueId(), user);
+	}
+
+	// Keep 1
+	@Test
+	public void getCatalogData() throws Exception {
+
+		RestResponse checkInResponse = LifecycleRestUtils.changeResourceState(resourceDetails1, user, "0.1",
+				LifeCycleStatesEnum.CHECKIN);
+		AssertJUnit.assertEquals("check in operation failed", 200, checkInResponse.getErrorCode().intValue());
+
+		RestResponse res = CatalogRestUtils.getCatalog(user.getUserId());
+		String json = res.getResponse();
+		JSONObject jsonResp = (JSONObject) JSONValue.parse(json);
+		JSONArray resources = (JSONArray) jsonResp.get("resources");
+		JSONArray services = (JSONArray) jsonResp.get("services");
+
+		// Verify all the expected resources received.
+		AssertJUnit.assertTrue("check resource1 is in response",
+				isComponentInArray(resourceDetails1.getUniqueId(), resources));
+		AssertJUnit.assertTrue("check resource2 is in response",
+				isComponentInArray(resourceDetails2.getUniqueId(), resources));
+		AssertJUnit.assertTrue("check service1 is in response",
+				isComponentInArray(svcDetails1.getUniqueId(), services));
+
+	}
+
+	protected void deleteResource(String resourceUniqueId, String httpCspUserId) throws Exception {
+		RestResponse deleteResourceResponse = ResourceRestUtils.deleteResource(resourceUniqueId, httpCspUserId);
+
+	}
+
+	protected RestResponse createResource(User user, ResourceReqDetails resourceDetails) throws Exception {
+		deleteResource(resourceDetails.getName(), user.getUserId());
+		return ResourceRestUtils.createResource(resourceDetails, user);
+	}
+
+	protected ResourceReqDetails buildResourceDetails(User user, String resourceName) {
+		String description = "description";
+		ArrayList<String> resourceTags = new ArrayList<String>();
+		resourceTags.add(resourceName);
+		ArrayList<String> derivedFrom = new ArrayList<String>();
+		derivedFrom.add("tosca.nodes.Root");
+		String vendorName = "Oracle";
+		String vendorRelease = "1.0";
+		String contactId = user.getUserId();
+		String icon = "myICON";
+
+		ResourceReqDetails resourceDetails = new ResourceReqDetails(resourceName, description, resourceTags, null,
+				derivedFrom, vendorName, vendorRelease, contactId, icon);
+		resourceDetails.addCategoryChain(ResourceCategoryEnum.GENERIC_DATABASE.getCategory(),
+				ResourceCategoryEnum.GENERIC_DATABASE.getSubCategory());
+		return resourceDetails;
+	}
+
+	protected boolean isComponentInArray(String id, JSONArray component) {
+		for (int i = 0; i < component.size(); i++) {
+			JSONObject jobject = (JSONObject) component.get(i);
+			if (jobject.get("uniqueId").toString().equals(id.toLowerCase())) {
+				return true;
+			}
+		}
+		return false;
+	}
+
+	protected RestResponse createService(User user, ServiceReqDetails svcDetails) throws Exception {
+
+		Config config = Utils.getConfig();
+
+		Map<String, String> headersMap = getHeadersMap(user);
+
+		Gson gson = new Gson();
+		String body = gson.toJson(svcDetails);
+		HttpRequest http = new HttpRequest();
+		String url = String.format(Urls.CREATE_SERVICE, config.getCatalogBeHost(), config.getCatalogBePort());
+		RestResponse res = http.httpSendPost(url, body, headersMap);
+		// System.out.println("Create service was finished with response:
+		// "+res.getErrorCode());
+		return res;
+	}
+
+	protected Map<String, String> getHeadersMap(User user) {
+		Map<String, String> headersMap = new HashMap<String, String>();
+		headersMap.put(HttpHeaderEnum.CONTENT_TYPE.getValue(), contentTypeHeaderData);
+		headersMap.put(HttpHeaderEnum.ACCEPT.getValue(), acceptHeaderDate);
+		headersMap.put("USER_ID", user.getUserId());
+		return headersMap;
+	}
+
+	protected ServiceReqDetails buildServiceDetails(String serviceName) {
+		String description = "description";
+		ArrayList<String> serviceTags = new ArrayList<String>();
+		serviceTags.add("tag1");
+		serviceTags.add(serviceName);
+		String category = ServiceCategoriesEnum.MOBILITY.getValue();
+		String vendorName = "Oracle";
+		String vendorRelease = "0.1";
+		String contactId = "al1976";
+		String icon = "myIcon";
+		String instantiationType = ServiceInstantiationType.A_LA_CARTE.getValue();
+
+		ServiceReqDetails svcdetails = new ServiceReqDetails(serviceName, category, serviceTags, description,
+				contactId, icon, instantiationType);
+		return svcdetails;
+	}
+
+	public RestResponse deleteService(String serviceId, User user) throws Exception {
+		HttpRequest httpRequest = new HttpRequest();
+		String url = String.format(Urls.DELETE_SERVICE, config.getCatalogBeHost(), config.getCatalogBePort(),
+				serviceId);
+
+		Map<String, String> headersMap = getHeadersMap(user);
+		RestResponse res = httpRequest.httpSendDelete(url, headersMap);
+		// System.out.println("Delete service was finished with response:
+		// "+res.getErrorCode());
+		return res;
+	}
+
+	public class NewObject {
+		private String _name;
+
+		public String getName() {
+			return _name;
+		}
+
+		public void setName(String name) {
+			this._name = name;
+		}
+	}
+
+}
diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/execute/category/CategoriesBaseTest.java b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/execute/category/CategoriesBaseTest.java
new file mode 100644
index 0000000000..7708894e7b
--- /dev/null
+++ b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/execute/category/CategoriesBaseTest.java
@@ -0,0 +1,44 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * SDC
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.sdc.ci.tests.execute.category;
+
+import org.openecomp.sdc.be.model.User;
+import org.openecomp.sdc.ci.tests.api.ComponentBaseTest;
+import org.openecomp.sdc.ci.tests.datatypes.enums.UserRoleEnum;
+import org.openecomp.sdc.ci.tests.utils.general.ElementFactory;
+
+public abstract class CategoriesBaseTest extends ComponentBaseTest {
+
+	protected static final String AUDIT_SERVICE_TYPE = "Service";
+	protected static final String AUDIT_RESOURCE_TYPE = "Resource";
+	protected static final String AUDIT_PRODUCT_TYPE = "Product";
+	protected static final String GET_CATEGORY_HIERARCHY = "GetCategoryHierarchy";
+	protected static User sdncAdminUserDetails = ElementFactory.getDefaultUser(UserRoleEnum.ADMIN);
+	protected static User sdncAdminUserDetails1 = ElementFactory.getDefaultUser(UserRoleEnum.ADMIN);
+	protected static User sdncDesignerUserDetails = ElementFactory.getDefaultUser(UserRoleEnum.DESIGNER);
+	protected static User sdncTesterUserDetails = ElementFactory.getDefaultUser(UserRoleEnum.TESTER);
+	protected static User sdncGovernorUserDetails = ElementFactory.getDefaultUser(UserRoleEnum.GOVERNOR);
+	protected static User sdncOpsUserDetails = ElementFactory.getDefaultUser(UserRoleEnum.OPS);
+	protected static User sdncProductManagerUserDetails = ElementFactory.getDefaultUser(UserRoleEnum.PRODUCT_MANAGER1);
+	protected static User sdncProductStrategistUserDetails = ElementFactory
+			.getDefaultUser(UserRoleEnum.PRODUCT_STRATEGIST1);
+
+}
diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/execute/category/GroupingTest.java b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/execute/category/GroupingTest.java
new file mode 100644
index 0000000000..ba5c939af1
--- /dev/null
+++ b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/execute/category/GroupingTest.java
@@ -0,0 +1,1990 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * SDC
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.sdc.ci.tests.execute.category;
+
+import org.junit.Rule;
+import org.junit.rules.TestName;
+import org.openecomp.sdc.be.dao.api.ActionStatus;
+import org.openecomp.sdc.be.model.User;
+import org.openecomp.sdc.be.model.category.CategoryDefinition;
+import org.openecomp.sdc.be.model.category.GroupingDefinition;
+import org.openecomp.sdc.be.model.category.SubCategoryDefinition;
+import org.openecomp.sdc.ci.tests.datatypes.enums.ErrorInfo;
+import org.openecomp.sdc.ci.tests.datatypes.enums.UserRoleEnum;
+import org.openecomp.sdc.ci.tests.datatypes.expected.ExpectedCategoryAudit;
+import org.openecomp.sdc.ci.tests.datatypes.http.RestResponse;
+import org.openecomp.sdc.ci.tests.utils.DbUtils;
+import org.openecomp.sdc.ci.tests.utils.general.ElementFactory;
+import org.openecomp.sdc.ci.tests.utils.rest.CategoryRestUtils;
+import org.openecomp.sdc.ci.tests.utils.rest.ResponseParser;
+import org.openecomp.sdc.ci.tests.utils.validation.AuditValidationUtils;
+import org.openecomp.sdc.ci.tests.utils.validation.CategoryValidationUtils;
+import org.openecomp.sdc.ci.tests.utils.validation.ErrorValidationUtils;
+import org.testng.SkipException;
+import org.testng.annotations.BeforeMethod;
+import org.testng.annotations.Test;
+
+import static org.openecomp.sdc.ci.tests.utils.rest.BaseRestUtils.*;
+import static org.testng.AssertJUnit.assertEquals;
+
+public class GroupingTest extends CategoriesBaseTest {
+
+	protected static final String ADD_GROUPING = "AddGrouping";
+	protected static final String CATEGORY = "category";
+	protected static final String SUB_CATEGORY = "sub-category";
+	protected static final String GROUPING = "grouping";
+
+	@Rule
+	public static TestName name = new TestName();
+
+	private CategoryDefinition productCategoryDefinition;
+	private CategoryDefinition productCategoryDefinition2;
+
+	private SubCategoryDefinition productSubCategoryDefinition;
+	private SubCategoryDefinition productSubCategoryDefinition2;
+	private SubCategoryDefinition productSubCategoryDefinition3;
+
+	private GroupingDefinition productGroupingDefinition;
+	private GroupingDefinition productGroupingDefinition2;
+	private GroupingDefinition productGroupingDefinition3;
+
+	@BeforeMethod
+	public void init() throws Exception {
+
+		// Category setup
+		productCategoryDefinition = new CategoryDefinition();
+		productCategoryDefinition.setName("Category1");
+		productCategoryDefinition2 = new CategoryDefinition();
+		productCategoryDefinition2.setName("Category2");
+
+		// Subcategory setup
+		productSubCategoryDefinition = new SubCategoryDefinition();
+		productSubCategoryDefinition.setName("SubCategory1");
+
+		productSubCategoryDefinition2 = new SubCategoryDefinition();
+		productSubCategoryDefinition2.setName("SubCategory2");
+
+		productSubCategoryDefinition3 = new SubCategoryDefinition();
+		productSubCategoryDefinition3.setName("SubCategory1");
+
+		// Group setup
+		productGroupingDefinition = new GroupingDefinition();
+		productGroupingDefinition.setName("Grouping1");
+
+		productGroupingDefinition2 = new GroupingDefinition();
+		productGroupingDefinition2.setName("Grouping2");
+
+		productGroupingDefinition3 = new GroupingDefinition();
+		productGroupingDefinition3.setName("Grouping1");
+
+		// Init product category
+		RestResponse createCategory = CategoryRestUtils.createCategory(productCategoryDefinition,
+				sdncProductStrategistUserDetails, PRODUCT_COMPONENT_TYPE);
+		assertEquals("Check response code after create category", STATUS_CODE_CREATED,
+				createCategory.getErrorCode().intValue());
+		CategoryDefinition category = ResponseParser.parseToObject(createCategory.getResponse(),
+				CategoryDefinition.class);
+		assertEquals("Check category name after creating category ", productCategoryDefinition.getName(),
+				category.getName());
+		productCategoryDefinition = category;
+
+		// Init product category1
+		createCategory = CategoryRestUtils.createCategory(productCategoryDefinition2, sdncProductStrategistUserDetails,
+				PRODUCT_COMPONENT_TYPE);
+		assertEquals("Check response code after create category", STATUS_CODE_CREATED,
+				createCategory.getErrorCode().intValue());
+		category = ResponseParser.parseToObject(createCategory.getResponse(), CategoryDefinition.class);
+		assertEquals("Check category name after creating category ", productCategoryDefinition2.getName(),
+				category.getName());
+		productCategoryDefinition2 = category;
+
+		// Init product productSubCategoryDefinition to
+		// productCategoryDefinition
+		RestResponse createSubCategory = CategoryRestUtils.createSubCategory(productSubCategoryDefinition,
+				productCategoryDefinition, sdncProductStrategistUserDetails, PRODUCT_COMPONENT_TYPE);
+		assertEquals("Check response code after create category", STATUS_CODE_CREATED,
+				createSubCategory.getErrorCode().intValue());
+		SubCategoryDefinition subCategory = ResponseParser.parseToObject(createSubCategory.getResponse(),
+				SubCategoryDefinition.class);
+		assertEquals("Check category name after creating category ", productSubCategoryDefinition.getName(),
+				subCategory.getName());
+		productSubCategoryDefinition = subCategory;
+		productCategoryDefinition.addSubCategory(productSubCategoryDefinition);
+
+		// Init product productSubCategoryDefinition1 to
+		// productCategoryDefinition
+		createSubCategory = CategoryRestUtils.createSubCategory(productSubCategoryDefinition2,
+				productCategoryDefinition, sdncProductStrategistUserDetails, PRODUCT_COMPONENT_TYPE);
+		assertEquals("Check response code after create category", STATUS_CODE_CREATED,
+				createSubCategory.getErrorCode().intValue());
+		subCategory = ResponseParser.parseToObject(createSubCategory.getResponse(), SubCategoryDefinition.class);
+		assertEquals("Check category name after creating category ", productSubCategoryDefinition2.getName(),
+				subCategory.getName());
+		productSubCategoryDefinition2 = subCategory;
+		productCategoryDefinition.addSubCategory(productSubCategoryDefinition2);
+
+		// Init product productSubCategoryDefinition3 to
+		// productCategoryDefinition2
+		createSubCategory = CategoryRestUtils.createSubCategory(productSubCategoryDefinition3,
+				productCategoryDefinition2, sdncProductStrategistUserDetails, PRODUCT_COMPONENT_TYPE);
+		assertEquals("Check response code after create category", STATUS_CODE_CREATED,
+				createSubCategory.getErrorCode().intValue());
+		subCategory = ResponseParser.parseToObject(createSubCategory.getResponse(), SubCategoryDefinition.class);
+		assertEquals("Check category name after creating category ", productSubCategoryDefinition3.getName(),
+				subCategory.getName());
+		productSubCategoryDefinition3 = subCategory;
+		productCategoryDefinition2.addSubCategory(productSubCategoryDefinition3);
+	}
+
+	@Test
+	public void createProductGroupCategorySuccess() throws Exception {
+		createGroupingSuccess(productGroupingDefinition, productSubCategoryDefinition, productCategoryDefinition,
+				sdncProductStrategistUserDetails, PRODUCT_COMPONENT_TYPE, AUDIT_PRODUCT_TYPE);
+	}
+
+	private void createGroupingSuccess(GroupingDefinition groupingDefinition,
+			SubCategoryDefinition subCategoryDefinition, CategoryDefinition categoryDefinition,
+			User sdncProductStrategistUserDetails, String productComponentType, String auditType) throws Exception {
+
+		RestResponse createGroupingRest = CategoryRestUtils.createGrouping(groupingDefinition, subCategoryDefinition,
+				categoryDefinition, sdncProductStrategistUserDetails, productComponentType);
+		assertEquals("Check response code after create product group", STATUS_CODE_CREATED,
+				createGroupingRest.getErrorCode().intValue());
+		productGroupingDefinition.setNormalizedName("grouping1");
+		RestResponse getAllCategoriesRest = CategoryRestUtils.getAllCategories(sdncAdminUserDetails,
+				productComponentType);
+		assertEquals("Check response code after get all categories ", STATUS_CODE_SUCCESS,
+				getAllCategoriesRest.getErrorCode().intValue());
+		CategoryValidationUtils.verifyGroupingExistInGetResponse(getAllCategoriesRest, categoryDefinition.getUniqueId(),
+				subCategoryDefinition.getUniqueId(), groupingDefinition);
+
+		// Audit validation
+		AuditValidationUtils.groupingAuditSuccess(ADD_GROUPING, categoryDefinition, subCategoryDefinition,
+				groupingDefinition, sdncProductStrategistUserDetails, STATUS_CODE_CREATED, auditType);
+	}
+
+	//// Benny
+
+	@Test
+	public void createProductGroupByProductStrategist() throws Exception {
+		RestResponse createGroupingRest = CategoryRestUtils.createGrouping(productGroupingDefinition,
+				productSubCategoryDefinition, productCategoryDefinition, sdncProductStrategistUserDetails,
+				PRODUCT_COMPONENT_TYPE);
+		assertEquals("Check response code after create product group", STATUS_CODE_CREATED,
+				createGroupingRest.getErrorCode().intValue());
+		productGroupingDefinition.setNormalizedName("grouping1");
+		CategoryValidationUtils.validateCreateGroupResponse(createGroupingRest, productGroupingDefinition);
+
+		RestResponse getAllCategoriesRest = CategoryRestUtils.getAllCategories(sdncAdminUserDetails,
+				PRODUCT_COMPONENT_TYPE);
+		assertEquals("Check response code after get all categories ", STATUS_CODE_SUCCESS,
+				getAllCategoriesRest.getErrorCode().intValue());
+		CategoryValidationUtils.verifyGroupingExistInGetResponse(getAllCategoriesRest,
+				productCategoryDefinition.getUniqueId(), productSubCategoryDefinition.getUniqueId(),
+				productGroupingDefinition);
+		// Audit validation
+		AuditValidationUtils.groupingAuditSuccess(ADD_GROUPING, productCategoryDefinition, productSubCategoryDefinition,
+				productGroupingDefinition, sdncProductStrategistUserDetails, STATUS_CODE_CREATED, AUDIT_PRODUCT_TYPE);
+	}
+
+	@Test
+	public void createProductGroupAlreadyExistInSameCategorySubCategory() throws Exception {
+		RestResponse createGroupingRest = CategoryRestUtils.createGrouping(productGroupingDefinition,
+				productSubCategoryDefinition, productCategoryDefinition, sdncProductStrategistUserDetails,
+				PRODUCT_COMPONENT_TYPE);
+		assertEquals("Check response code after create product group", STATUS_CODE_CREATED,
+				createGroupingRest.getErrorCode().intValue());
+		productGroupingDefinition.setNormalizedName("grouping1");
+		CategoryValidationUtils.validateCreateGroupResponse(createGroupingRest, productGroupingDefinition);
+		RestResponse getAllCategoriesRest = CategoryRestUtils.getAllCategories(sdncAdminUserDetails,
+				PRODUCT_COMPONENT_TYPE);
+		assertEquals("Check response code after get all categories ", STATUS_CODE_SUCCESS,
+				getAllCategoriesRest.getErrorCode().intValue());
+		CategoryValidationUtils.verifyGroupingExistInGetResponse(getAllCategoriesRest,
+				productCategoryDefinition.getUniqueId(), productSubCategoryDefinition.getUniqueId(),
+				productGroupingDefinition);
+		AuditValidationUtils.groupingAuditSuccess(ADD_GROUPING, productCategoryDefinition, productSubCategoryDefinition,
+				productGroupingDefinition, sdncProductStrategistUserDetails, STATUS_CODE_CREATED, AUDIT_PRODUCT_TYPE);
+		// Create Same Group already exist on same Category/SubCategory
+		DbUtils.deleteFromEsDbByPattern("_all");
+		createGroupingRest = CategoryRestUtils.createGrouping(productGroupingDefinition, productSubCategoryDefinition,
+				productCategoryDefinition, sdncProductStrategistUserDetails, PRODUCT_COMPONENT_TYPE);
+		assertEquals("Check response code after create Sub category", STATUS_CODE_ALREADY_EXISTS,
+				createGroupingRest.getErrorCode().intValue());
+		AuditValidationUtils.groupingAuditFailure(ADD_GROUPING, productCategoryDefinition, productSubCategoryDefinition,
+				productGroupingDefinition, sdncProductStrategistUserDetails,
+				ActionStatus.COMPONENT_GROUPING_EXISTS_FOR_SUB_CATEGORY, STATUS_CODE_ALREADY_EXISTS, AUDIT_PRODUCT_TYPE,
+				AUDIT_PRODUCT_TYPE, productGroupingDefinition.getName(), productSubCategoryDefinition.getName());
+	}
+
+	@Test
+	public void createProductGroupUnderSameCategoryButDifferentSubCategory() throws Exception {
+		// Setting : Category-A, Sub-category-B , group : aBcd (display-Name :
+		// ABcd, normalized: abcd)  [A, B, ABcd]
+		// Action : Category-A, Sub-category-C, group : abcD (display-Name :
+		// ABcd, normalized: abcd)  [A, C, ABcd]
+		productGroupingDefinition.setName("ABCd");
+		productGroupingDefinition2.setName("abcD");
+		RestResponse createGroupingRest = CategoryRestUtils.createGrouping(productGroupingDefinition,
+				productSubCategoryDefinition, productCategoryDefinition, sdncProductStrategistUserDetails,
+				PRODUCT_COMPONENT_TYPE);
+		assertEquals("Check response code after create product group", STATUS_CODE_CREATED,
+				createGroupingRest.getErrorCode().intValue());
+		productGroupingDefinition.setNormalizedName("abcd");
+		CategoryValidationUtils.validateCreateGroupResponse(createGroupingRest, productGroupingDefinition);
+		AuditValidationUtils.groupingAuditSuccess(ADD_GROUPING, productCategoryDefinition, productSubCategoryDefinition,
+				productGroupingDefinition, sdncProductStrategistUserDetails, STATUS_CODE_CREATED, AUDIT_PRODUCT_TYPE);
+
+		DbUtils.deleteFromEsDbByPattern("_all");
+		createGroupingRest = CategoryRestUtils.createGrouping(productGroupingDefinition2, productSubCategoryDefinition2,
+				productCategoryDefinition, sdncProductStrategistUserDetails, PRODUCT_COMPONENT_TYPE);
+		assertEquals("Check response code after create product group", STATUS_CODE_CREATED,
+				createGroupingRest.getErrorCode().intValue());
+		productGroupingDefinition2.setName("ABCd");
+		productGroupingDefinition2.setNormalizedName("abcd");
+		CategoryValidationUtils.validateCreateGroupResponse(createGroupingRest, productGroupingDefinition2);
+		AuditValidationUtils.groupingAuditSuccess(ADD_GROUPING, productCategoryDefinition,
+				productSubCategoryDefinition2, productGroupingDefinition2, sdncProductStrategistUserDetails,
+				STATUS_CODE_CREATED, AUDIT_PRODUCT_TYPE);
+
+		RestResponse getAllCategoriesRest = CategoryRestUtils.getAllCategories(sdncAdminUserDetails,
+				PRODUCT_COMPONENT_TYPE);
+		assertEquals("Check response code after get all categories ", STATUS_CODE_SUCCESS,
+				getAllCategoriesRest.getErrorCode().intValue());
+		CategoryValidationUtils.verifyGroupingExistInGetResponse(getAllCategoriesRest,
+				productCategoryDefinition.getUniqueId(), productSubCategoryDefinition.getUniqueId(),
+				productGroupingDefinition);
+		CategoryValidationUtils.verifyGroupingExistInGetResponse(getAllCategoriesRest,
+				productCategoryDefinition.getUniqueId(), productSubCategoryDefinition2.getUniqueId(),
+				productGroupingDefinition2);
+	}
+
+	@Test
+	public void createProductGroupUnderSameSubCategoryButDifferentCategory() throws Exception {
+		// Setting : Category-A, Sub-category-B , group : aBcd (display-Name :
+		// ABcd, normalized: abcd)  [A, B, ABcd]
+		// : Category-A, Sub-category-C, group : abcD (display-Name : ABcd,
+		// normalized: abcd)  [A, C, ABcd]
+		// : Category-K, Sub-category-B, group : abcD (display-Name : ABcd,
+		// normalized: abcd)  [K, B, ABcd]
+		productGroupingDefinition.setName("ABCd");
+		productGroupingDefinition2.setName("abcD");
+		productGroupingDefinition3.setName("aBCd");
+		RestResponse createGroupingRest = CategoryRestUtils.createGrouping(productGroupingDefinition,
+				productSubCategoryDefinition, productCategoryDefinition, sdncProductStrategistUserDetails,
+				PRODUCT_COMPONENT_TYPE);
+		assertEquals("Check response code after create product group", STATUS_CODE_CREATED,
+				createGroupingRest.getErrorCode().intValue());
+		productGroupingDefinition.setNormalizedName("abcd");
+		CategoryValidationUtils.validateCreateGroupResponse(createGroupingRest, productGroupingDefinition);
+		AuditValidationUtils.groupingAuditSuccess(ADD_GROUPING, productCategoryDefinition, productSubCategoryDefinition,
+				productGroupingDefinition, sdncProductStrategistUserDetails, STATUS_CODE_CREATED, AUDIT_PRODUCT_TYPE);
+
+		DbUtils.deleteFromEsDbByPattern("_all");
+		createGroupingRest = CategoryRestUtils.createGrouping(productGroupingDefinition2, productSubCategoryDefinition2,
+				productCategoryDefinition, sdncProductStrategistUserDetails, PRODUCT_COMPONENT_TYPE);
+		assertEquals("Check response code after create product group", STATUS_CODE_CREATED,
+				createGroupingRest.getErrorCode().intValue());
+		productGroupingDefinition2.setName("ABCd");
+		productGroupingDefinition2.setNormalizedName("abcd");
+		CategoryValidationUtils.validateCreateGroupResponse(createGroupingRest, productGroupingDefinition2);
+		AuditValidationUtils.groupingAuditSuccess(ADD_GROUPING, productCategoryDefinition,
+				productSubCategoryDefinition2, productGroupingDefinition2, sdncProductStrategistUserDetails,
+				STATUS_CODE_CREATED, AUDIT_PRODUCT_TYPE);
+		DbUtils.deleteFromEsDbByPattern("_all");
+		createGroupingRest = CategoryRestUtils.createGrouping(productGroupingDefinition3, productSubCategoryDefinition3,
+				productCategoryDefinition2, sdncProductStrategistUserDetails, PRODUCT_COMPONENT_TYPE);
+		assertEquals("Check response code after create product group", STATUS_CODE_CREATED,
+				createGroupingRest.getErrorCode().intValue());
+		productGroupingDefinition3.setName("ABCd");
+		productGroupingDefinition3.setNormalizedName("abcd");
+		CategoryValidationUtils.validateCreateGroupResponse(createGroupingRest, productGroupingDefinition3);
+		AuditValidationUtils.groupingAuditSuccess(ADD_GROUPING, productCategoryDefinition2,
+				productSubCategoryDefinition3, productGroupingDefinition3, sdncProductStrategistUserDetails,
+				STATUS_CODE_CREATED, AUDIT_PRODUCT_TYPE);
+
+		RestResponse getAllCategoriesRest = CategoryRestUtils.getAllCategories(sdncAdminUserDetails,
+				PRODUCT_COMPONENT_TYPE);
+		assertEquals("Check response code after get all categories ", STATUS_CODE_SUCCESS,
+				getAllCategoriesRest.getErrorCode().intValue());
+		CategoryValidationUtils.verifyGroupingExistInGetResponse(getAllCategoriesRest,
+				productCategoryDefinition.getUniqueId(), productSubCategoryDefinition.getUniqueId(),
+				productGroupingDefinition);
+		CategoryValidationUtils.verifyGroupingExistInGetResponse(getAllCategoriesRest,
+				productCategoryDefinition.getUniqueId(), productSubCategoryDefinition2.getUniqueId(),
+				productGroupingDefinition2);
+		CategoryValidationUtils.verifyGroupingExistInGetResponse(getAllCategoriesRest,
+				productCategoryDefinition2.getUniqueId(), productSubCategoryDefinition3.getUniqueId(),
+				productGroupingDefinition3);
+
+	}
+
+	@Test
+	public void createProductGroupsOnSameCategorySubCategory() throws Exception {
+		// Setting : Category-A, Sub-category-B , group : ABcd (display-Name :
+		// ABcd, normalized: abcd) [A ,B, ABcd]
+		// Action : Category-A, Sub-category-B, group : ZXcv (display-Name :
+		// ZXcv, normalized: zxcv) [A, B, ZXcv]
+		productGroupingDefinition.setName("ABcd");
+		productGroupingDefinition2.setName("ZXcv");
+		productGroupingDefinition2.setNormalizedName("zxcv");
+		RestResponse createGroupingRest = CategoryRestUtils.createGrouping(productGroupingDefinition,
+				productSubCategoryDefinition, productCategoryDefinition, sdncProductStrategistUserDetails,
+				PRODUCT_COMPONENT_TYPE);
+		assertEquals("Check response code after create product group", STATUS_CODE_CREATED,
+				createGroupingRest.getErrorCode().intValue());
+		productGroupingDefinition.setNormalizedName("abcd");
+		CategoryValidationUtils.validateCreateGroupResponse(createGroupingRest, productGroupingDefinition);
+		AuditValidationUtils.groupingAuditSuccess(ADD_GROUPING, productCategoryDefinition, productSubCategoryDefinition,
+				productGroupingDefinition, sdncProductStrategistUserDetails, STATUS_CODE_CREATED, AUDIT_PRODUCT_TYPE);
+
+		DbUtils.deleteFromEsDbByPattern("_all");
+		createGroupingRest = CategoryRestUtils.createGrouping(productGroupingDefinition2, productSubCategoryDefinition,
+				productCategoryDefinition, sdncProductStrategistUserDetails, PRODUCT_COMPONENT_TYPE);
+		assertEquals("Check response code after create product group", STATUS_CODE_CREATED,
+				createGroupingRest.getErrorCode().intValue());
+		CategoryValidationUtils.validateCreateGroupResponse(createGroupingRest, productGroupingDefinition2);
+		AuditValidationUtils.groupingAuditSuccess(ADD_GROUPING, productCategoryDefinition, productSubCategoryDefinition,
+				productGroupingDefinition2, sdncProductStrategistUserDetails, STATUS_CODE_CREATED, AUDIT_PRODUCT_TYPE);
+
+		RestResponse getAllCategoriesRest = CategoryRestUtils.getAllCategories(sdncAdminUserDetails,
+				PRODUCT_COMPONENT_TYPE);
+		assertEquals("Check response code after get all categories ", STATUS_CODE_SUCCESS,
+				getAllCategoriesRest.getErrorCode().intValue());
+		CategoryValidationUtils.verifyGroupingExistInGetResponse(getAllCategoriesRest,
+				productCategoryDefinition.getUniqueId(), productSubCategoryDefinition.getUniqueId(),
+				productGroupingDefinition);
+		CategoryValidationUtils.verifyGroupingExistInGetResponse(getAllCategoriesRest,
+				productCategoryDefinition.getUniqueId(), productSubCategoryDefinition.getUniqueId(),
+				productGroupingDefinition2);
+	}
+
+	@Test
+	public void createProductGroupUnderDifferentCategory() throws Exception {
+		// Setting : Category-A, Sub-category-B , group : aBcd (display-Name :
+		// ABcd, normalized: abcd) [A ,B, ABcd]
+		// Action : Category-K, Sub-category-B, group : abcD (display-Name :
+		// ABcd, normalized: abcd) [K, B, ABcd]
+		// productGroupingDefinition.setName("ABCd");
+		productGroupingDefinition.setName("ABcD");
+		productGroupingDefinition2.setName("abcD");
+		RestResponse createGroupingRest = CategoryRestUtils.createGrouping(productGroupingDefinition,
+				productSubCategoryDefinition, productCategoryDefinition, sdncProductStrategistUserDetails,
+				PRODUCT_COMPONENT_TYPE);
+		assertEquals("Check response code after create product group", STATUS_CODE_CREATED,
+				createGroupingRest.getErrorCode().intValue());
+		productGroupingDefinition.setNormalizedName("abcd");
+		CategoryValidationUtils.validateCreateGroupResponse(createGroupingRest, productGroupingDefinition);
+		AuditValidationUtils.groupingAuditSuccess(ADD_GROUPING, productCategoryDefinition, productSubCategoryDefinition,
+				productGroupingDefinition, sdncProductStrategistUserDetails, STATUS_CODE_CREATED, AUDIT_PRODUCT_TYPE);
+
+		DbUtils.deleteFromEsDbByPattern("_all");
+		createGroupingRest = CategoryRestUtils.createGrouping(productGroupingDefinition2, productSubCategoryDefinition3,
+				productCategoryDefinition2, sdncProductStrategistUserDetails, PRODUCT_COMPONENT_TYPE);
+		assertEquals("Check response code after create product group", STATUS_CODE_CREATED,
+				createGroupingRest.getErrorCode().intValue());
+		productGroupingDefinition2.setNormalizedName("abcd");
+		productGroupingDefinition2.setName("ABcD");
+		CategoryValidationUtils.validateCreateGroupResponse(createGroupingRest, productGroupingDefinition2);
+		AuditValidationUtils.groupingAuditSuccess(ADD_GROUPING, productCategoryDefinition2,
+				productSubCategoryDefinition3, productGroupingDefinition2, sdncProductStrategistUserDetails,
+				STATUS_CODE_CREATED, AUDIT_PRODUCT_TYPE);
+
+		RestResponse getAllCategoriesRest = CategoryRestUtils.getAllCategories(sdncAdminUserDetails,
+				PRODUCT_COMPONENT_TYPE);
+		assertEquals("Check response code after get all categories ", STATUS_CODE_SUCCESS,
+				getAllCategoriesRest.getErrorCode().intValue());
+		CategoryValidationUtils.verifyGroupingExistInGetResponse(getAllCategoriesRest,
+				productCategoryDefinition.getUniqueId(), productSubCategoryDefinition.getUniqueId(),
+				productGroupingDefinition);
+		CategoryValidationUtils.verifyGroupingExistInGetResponse(getAllCategoriesRest,
+				productCategoryDefinition2.getUniqueId(), productSubCategoryDefinition3.getUniqueId(),
+				productGroupingDefinition2);
+	}
+
+	///////////
+	@Test
+	public void createProductGroupByNonProductStrategist() throws Exception {
+		RestResponse createGroupingRest = CategoryRestUtils.createGrouping(productGroupingDefinition,
+				productSubCategoryDefinition, productCategoryDefinition, sdncAdminUserDetails, PRODUCT_COMPONENT_TYPE);
+		assertEquals("Check response code after create product group", STATUS_CODE_RESTRICTED_OPERATION,
+				createGroupingRest.getErrorCode().intValue());
+		RestResponse getAllCategoriesRest = CategoryRestUtils.getAllCategories(sdncAdminUserDetails,
+				PRODUCT_COMPONENT_TYPE);
+		assertEquals("Check response code after get all categories ", STATUS_CODE_SUCCESS,
+				getAllCategoriesRest.getErrorCode().intValue());
+		CategoryValidationUtils.verifyGroupingNotExistInGetResponse(getAllCategoriesRest,
+				productCategoryDefinition.getUniqueId(), productSubCategoryDefinition.getUniqueId(),
+				productGroupingDefinition);
+		// Audit validation
+		productCategoryDefinition.setName(productCategoryDefinition.getUniqueId());
+		productSubCategoryDefinition.setName(productSubCategoryDefinition.getUniqueId());
+		AuditValidationUtils.groupingAuditFailure(ADD_GROUPING, productCategoryDefinition, productSubCategoryDefinition,
+				productGroupingDefinition, sdncAdminUserDetails, ActionStatus.RESTRICTED_OPERATION,
+				STATUS_CODE_RESTRICTED_OPERATION, AUDIT_PRODUCT_TYPE);
+	}
+
+	// @Ignore("DE176245")
+	@Test
+	public void createProductGroupForNonExistingComponentType() throws Exception {
+		String nonSupportedComponentType = "NonExistingComponentType"; // instead
+																		// resource/product
+		RestResponse createGroupingRest = CategoryRestUtils.createGrouping(productGroupingDefinition,
+				productSubCategoryDefinition, productCategoryDefinition, sdncProductStrategistUserDetails,
+				nonSupportedComponentType);
+		assertEquals("Check response code after create Sub category", STATUS_CODE_INVALID_CONTENT,
+				createGroupingRest.getErrorCode().intValue());
+		RestResponse getAllCategoriesRest = CategoryRestUtils.getAllCategories(sdncAdminUserDetails,
+				PRODUCT_COMPONENT_TYPE);
+		assertEquals("Check response code after get all categories ", STATUS_CODE_SUCCESS,
+				getAllCategoriesRest.getErrorCode().intValue());
+		CategoryValidationUtils.verifyGroupingNotExistInGetResponse(getAllCategoriesRest,
+				productCategoryDefinition.getUniqueId(), productSubCategoryDefinition.getUniqueId(),
+				productGroupingDefinition);
+		// Audit validation
+		productCategoryDefinition.setName(productCategoryDefinition.getUniqueId());
+		productSubCategoryDefinition.setName(productSubCategoryDefinition.getUniqueId());
+		AuditValidationUtils.groupingAuditFailure(ADD_GROUPING, productCategoryDefinition, productSubCategoryDefinition,
+				productGroupingDefinition, sdncProductStrategistUserDetails, ActionStatus.INVALID_CONTENT,
+				STATUS_CODE_INVALID_CONTENT, nonSupportedComponentType);
+	}
+
+	// @Ignore("DE176245")
+	@Test
+	public void createResourceGroup() throws Exception {
+		// Resource doesn't have group
+		RestResponse createGroupingRest = CategoryRestUtils.createGrouping(productGroupingDefinition,
+				productSubCategoryDefinition, productCategoryDefinition, sdncProductStrategistUserDetails,
+				RESOURCE_COMPONENT_TYPE);
+		assertEquals("Check response code after create Sub category", STATUS_CODE_INVALID_CONTENT,
+				createGroupingRest.getErrorCode().intValue());
+		RestResponse getAllCategoriesRest = CategoryRestUtils.getAllCategories(sdncAdminUserDetails,
+				PRODUCT_COMPONENT_TYPE);
+		assertEquals("Check response code after get all categories ", STATUS_CODE_SUCCESS,
+				getAllCategoriesRest.getErrorCode().intValue());
+		CategoryValidationUtils.verifyGroupingNotExistInGetResponse(getAllCategoriesRest,
+				productCategoryDefinition.getUniqueId(), productSubCategoryDefinition.getUniqueId(),
+				productGroupingDefinition);
+		// Audit validation
+		productCategoryDefinition.setName(productCategoryDefinition.getUniqueId());
+		productSubCategoryDefinition.setName(productSubCategoryDefinition.getUniqueId());
+		AuditValidationUtils.groupingAuditFailure(ADD_GROUPING, productCategoryDefinition, productSubCategoryDefinition,
+				productGroupingDefinition, sdncProductStrategistUserDetails, ActionStatus.INVALID_CONTENT,
+				STATUS_CODE_INVALID_CONTENT, AUDIT_RESOURCE_TYPE);
+	}
+
+	// @Ignore("DE176245")
+	@Test
+	public void createServiceGroup() throws Exception {
+		// Service doesn't have group
+		RestResponse createGroupingRest = CategoryRestUtils.createGrouping(productGroupingDefinition,
+				productSubCategoryDefinition, productCategoryDefinition, sdncProductStrategistUserDetails,
+				SERVICE_COMPONENT_TYPE);
+		assertEquals("Check response code after create Sub category", STATUS_CODE_INVALID_CONTENT,
+				createGroupingRest.getErrorCode().intValue());
+		RestResponse getAllCategoriesRest = CategoryRestUtils.getAllCategories(sdncAdminUserDetails,
+				PRODUCT_COMPONENT_TYPE);
+		assertEquals("Check response code after get all categories ", STATUS_CODE_SUCCESS,
+				getAllCategoriesRest.getErrorCode().intValue());
+		CategoryValidationUtils.verifyGroupingNotExistInGetResponse(getAllCategoriesRest,
+				productCategoryDefinition.getUniqueId(), productSubCategoryDefinition.getUniqueId(),
+				productGroupingDefinition);
+		// Audit validation
+		productCategoryDefinition.setName(productCategoryDefinition.getUniqueId());
+		productSubCategoryDefinition.setName(productSubCategoryDefinition.getUniqueId());
+		AuditValidationUtils.groupingAuditFailure(ADD_GROUPING, productCategoryDefinition, productSubCategoryDefinition,
+				productGroupingDefinition, sdncProductStrategistUserDetails, ActionStatus.INVALID_CONTENT,
+				STATUS_CODE_INVALID_CONTENT, AUDIT_SERVICE_TYPE);
+	}
+
+	@Test
+	public void createProductGroupForNonExistingCategory() throws Exception {
+
+		CategoryDefinition productCategoryDefinition100 = new CategoryDefinition();
+		productCategoryDefinition100.setName("category.nonexistingCategory");
+		productCategoryDefinition100.setUniqueId("category.nonexistingCategory");
+		RestResponse createGroupingRest = CategoryRestUtils.createGrouping(productGroupingDefinition,
+				productSubCategoryDefinition, productCategoryDefinition100, sdncProductStrategistUserDetails,
+				PRODUCT_COMPONENT_TYPE);
+		assertEquals("Check response code after create Sub category", STATUS_CODE_NOT_FOUND,
+				createGroupingRest.getErrorCode().intValue());
+		RestResponse getAllCategoriesRest = CategoryRestUtils.getAllCategories(sdncAdminUserDetails,
+				PRODUCT_COMPONENT_TYPE);
+		assertEquals("Check response code after get all categories ", STATUS_CODE_SUCCESS,
+				getAllCategoriesRest.getErrorCode().intValue());
+		CategoryValidationUtils.verifyGroupingNotExistInGetResponse(getAllCategoriesRest,
+				productCategoryDefinition.getUniqueId(), productSubCategoryDefinition.getUniqueId(),
+				productGroupingDefinition);
+		// Audit validation
+		productSubCategoryDefinition.setName(productSubCategoryDefinition.getUniqueId());
+		AuditValidationUtils.groupingAuditFailure(ADD_GROUPING, productCategoryDefinition100,
+				productSubCategoryDefinition, productGroupingDefinition, sdncProductStrategistUserDetails,
+				ActionStatus.COMPONENT_CATEGORY_NOT_FOUND, STATUS_CODE_NOT_FOUND, AUDIT_PRODUCT_TYPE,
+				PRODUCT_COMPONENT_TYPE, CATEGORY, "");
+	}
+
+	@Test
+	public void createProductGroupForNonExistingSunCategory() throws Exception {
+		throw new SkipException(
+				"Skipping - failed in audit validation expected \"products\" actual result was \"product\" ");
+		// SubCategoryDefinition productSubCategoryDefinition100 = new
+		// SubCategoryDefinition();
+		// productSubCategoryDefinition100.setUniqueId("category.nonexistingSubCategory");
+		// RestResponse createGroupingRest =
+		// CategoryRestUtils.createGrouping(productGroupingDefinition,
+		// productSubCategoryDefinition100, productCategoryDefinition,
+		// sdncProductStrategistUserDetails, PRODUCT_COMPONENT_TYPE);
+		// assertEquals("Check response code after create Sub category",
+		// STATUS_CODE_NOT_FOUND, createGroupingRest.getErrorCode().intValue());
+		// RestResponse getAllCategoriesRest =
+		// CategoryRestUtils.getAllCategories(sdncAdminUserDetails,
+		// PRODUCT_COMPONENT_TYPE);
+		// assertEquals("Check response code after get all categories ",
+		// STATUS_CODE_SUCCESS, getAllCategoriesRest.getErrorCode().intValue());
+		// CategoryValidationUtils.verifyGroupingNotExistInGetResponse(getAllCategoriesRest,
+		// productCategoryDefinition.getUniqueId(),
+		// productSubCategoryDefinition.getUniqueId(),
+		// productGroupingDefinition);
+		// //Audit validation
+		// productSubCategoryDefinition100.setName(productSubCategoryDefinition100.getUniqueId());
+		// AuditValidationUtils.groupingAuditFailure(ADD_GROUPING ,
+		// productCategoryDefinition, productSubCategoryDefinition100,
+		// productGroupingDefinition, sdncProductStrategistUserDetails,
+		// ActionStatus.COMPONENT_CATEGORY_NOT_FOUND,
+		// STATUS_CODE_NOT_FOUND,AUDIT_PRODUCT_TYPE, PRODUCT_COMPONENT_TYPE,
+		// SUB_CATEGORY, "");
+	}
+
+	@Test
+	public void ProductGroupAllowedcharacters_01() throws Exception {
+		productGroupingDefinition.setName("1234AbcdE-");
+		RestResponse createGroupingRest = CategoryRestUtils.createGrouping(productGroupingDefinition,
+				productSubCategoryDefinition, productCategoryDefinition, sdncProductStrategistUserDetails,
+				PRODUCT_COMPONENT_TYPE);
+		assertEquals("Check response code after create product group", STATUS_CODE_CREATED,
+				createGroupingRest.getErrorCode().intValue());
+		productGroupingDefinition.setNormalizedName("1234abcde-");
+		CategoryValidationUtils.validateCreateGroupResponse(createGroupingRest, productGroupingDefinition);
+		RestResponse getAllCategoriesRest = CategoryRestUtils.getAllCategories(sdncAdminUserDetails,
+				PRODUCT_COMPONENT_TYPE);
+		assertEquals("Check response code after get all categories ", STATUS_CODE_SUCCESS,
+				getAllCategoriesRest.getErrorCode().intValue());
+		CategoryValidationUtils.verifyGroupingExistInGetResponse(getAllCategoriesRest,
+				productCategoryDefinition.getUniqueId(), productSubCategoryDefinition.getUniqueId(),
+				productGroupingDefinition);
+		// Audit validation
+		AuditValidationUtils.groupingAuditSuccess(ADD_GROUPING, productCategoryDefinition, productSubCategoryDefinition,
+				productGroupingDefinition, sdncProductStrategistUserDetails, STATUS_CODE_CREATED, AUDIT_PRODUCT_TYPE);
+	}
+
+	@Test
+	public void ProductGroupAllowedcharacters_02() throws Exception {
+		productGroupingDefinition.setName("1234AbcdE+");
+		RestResponse createGroupingRest = CategoryRestUtils.createGrouping(productGroupingDefinition,
+				productSubCategoryDefinition, productCategoryDefinition, sdncProductStrategistUserDetails,
+				PRODUCT_COMPONENT_TYPE);
+		assertEquals("Check response code after create product group", STATUS_CODE_CREATED,
+				createGroupingRest.getErrorCode().intValue());
+		productGroupingDefinition.setNormalizedName("1234abcde+");
+		CategoryValidationUtils.validateCreateGroupResponse(createGroupingRest, productGroupingDefinition);
+		RestResponse getAllCategoriesRest = CategoryRestUtils.getAllCategories(sdncAdminUserDetails,
+				PRODUCT_COMPONENT_TYPE);
+		assertEquals("Check response code after get all categories ", STATUS_CODE_SUCCESS,
+				getAllCategoriesRest.getErrorCode().intValue());
+		CategoryValidationUtils.verifyGroupingExistInGetResponse(getAllCategoriesRest,
+				productCategoryDefinition.getUniqueId(), productSubCategoryDefinition.getUniqueId(),
+				productGroupingDefinition);
+		// Audit validation
+		AuditValidationUtils.groupingAuditSuccess(ADD_GROUPING, productCategoryDefinition, productSubCategoryDefinition,
+				productGroupingDefinition, sdncProductStrategistUserDetails, STATUS_CODE_CREATED, AUDIT_PRODUCT_TYPE);
+	}
+
+	@Test
+	public void ProductGroupAllowedcharacters_03() throws Exception {
+		productGroupingDefinition.setName("1234AbcdE&");
+		RestResponse createGroupingRest = CategoryRestUtils.createGrouping(productGroupingDefinition,
+				productSubCategoryDefinition, productCategoryDefinition, sdncProductStrategistUserDetails,
+				PRODUCT_COMPONENT_TYPE);
+		assertEquals("Check response code after create product group", STATUS_CODE_CREATED,
+				createGroupingRest.getErrorCode().intValue());
+		productGroupingDefinition.setNormalizedName("1234abcde&");
+		CategoryValidationUtils.validateCreateGroupResponse(createGroupingRest, productGroupingDefinition);
+		RestResponse getAllCategoriesRest = CategoryRestUtils.getAllCategories(sdncAdminUserDetails,
+				PRODUCT_COMPONENT_TYPE);
+		assertEquals("Check response code after get all categories ", STATUS_CODE_SUCCESS,
+				getAllCategoriesRest.getErrorCode().intValue());
+		CategoryValidationUtils.verifyGroupingExistInGetResponse(getAllCategoriesRest,
+				productCategoryDefinition.getUniqueId(), productSubCategoryDefinition.getUniqueId(),
+				productGroupingDefinition);
+		// Audit validation
+		AuditValidationUtils.groupingAuditSuccess(ADD_GROUPING, productCategoryDefinition, productSubCategoryDefinition,
+				productGroupingDefinition, sdncProductStrategistUserDetails, STATUS_CODE_CREATED, AUDIT_PRODUCT_TYPE);
+	}
+
+	@Test
+	public void ProductGroupAllowedcharacters_04() throws Exception {
+		productGroupingDefinition.setName("1234AbcdE-");
+		RestResponse createGroupingRest = CategoryRestUtils.createGrouping(productGroupingDefinition,
+				productSubCategoryDefinition, productCategoryDefinition, sdncProductStrategistUserDetails,
+				PRODUCT_COMPONENT_TYPE);
+		assertEquals("Check response code after create product group", STATUS_CODE_CREATED,
+				createGroupingRest.getErrorCode().intValue());
+		productGroupingDefinition.setNormalizedName("1234abcde-");
+		CategoryValidationUtils.validateCreateGroupResponse(createGroupingRest, productGroupingDefinition);
+		RestResponse getAllCategoriesRest = CategoryRestUtils.getAllCategories(sdncAdminUserDetails,
+				PRODUCT_COMPONENT_TYPE);
+		assertEquals("Check response code after get all categories ", STATUS_CODE_SUCCESS,
+				getAllCategoriesRest.getErrorCode().intValue());
+		CategoryValidationUtils.verifyGroupingExistInGetResponse(getAllCategoriesRest,
+				productCategoryDefinition.getUniqueId(), productSubCategoryDefinition.getUniqueId(),
+				productGroupingDefinition);
+		// Audit validation
+		AuditValidationUtils.groupingAuditSuccess(ADD_GROUPING, productCategoryDefinition, productSubCategoryDefinition,
+				productGroupingDefinition, sdncProductStrategistUserDetails, STATUS_CODE_CREATED, AUDIT_PRODUCT_TYPE);
+	}
+
+	@Test
+	public void ProductGroupAllowedcharacters_05() throws Exception {
+		productGroupingDefinition.setName("1234AbcdE+");
+		RestResponse createGroupingRest = CategoryRestUtils.createGrouping(productGroupingDefinition,
+				productSubCategoryDefinition, productCategoryDefinition, sdncProductStrategistUserDetails,
+				PRODUCT_COMPONENT_TYPE);
+		assertEquals("Check response code after create product group", STATUS_CODE_CREATED,
+				createGroupingRest.getErrorCode().intValue());
+		productGroupingDefinition.setNormalizedName("1234abcde+");
+		CategoryValidationUtils.validateCreateGroupResponse(createGroupingRest, productGroupingDefinition);
+		RestResponse getAllCategoriesRest = CategoryRestUtils.getAllCategories(sdncAdminUserDetails,
+				PRODUCT_COMPONENT_TYPE);
+		assertEquals("Check response code after get all categories ", STATUS_CODE_SUCCESS,
+				getAllCategoriesRest.getErrorCode().intValue());
+		CategoryValidationUtils.verifyGroupingExistInGetResponse(getAllCategoriesRest,
+				productCategoryDefinition.getUniqueId(), productSubCategoryDefinition.getUniqueId(),
+				productGroupingDefinition);
+		// Audit validation
+		AuditValidationUtils.groupingAuditSuccess(ADD_GROUPING, productCategoryDefinition, productSubCategoryDefinition,
+				productGroupingDefinition, sdncProductStrategistUserDetails, STATUS_CODE_CREATED, AUDIT_PRODUCT_TYPE);
+	}
+
+	@Test
+	public void ProductGroupAllowedcharacters_06() throws Exception {
+		productGroupingDefinition.setName("1234AbcdE.");
+		RestResponse createGroupingRest = CategoryRestUtils.createGrouping(productGroupingDefinition,
+				productSubCategoryDefinition, productCategoryDefinition, sdncProductStrategistUserDetails,
+				PRODUCT_COMPONENT_TYPE);
+		assertEquals("Check response code after create product group", STATUS_CODE_CREATED,
+				createGroupingRest.getErrorCode().intValue());
+		productGroupingDefinition.setNormalizedName("1234abcde.");
+		CategoryValidationUtils.validateCreateGroupResponse(createGroupingRest, productGroupingDefinition);
+		RestResponse getAllCategoriesRest = CategoryRestUtils.getAllCategories(sdncAdminUserDetails,
+				PRODUCT_COMPONENT_TYPE);
+		assertEquals("Check response code after get all categories ", STATUS_CODE_SUCCESS,
+				getAllCategoriesRest.getErrorCode().intValue());
+		CategoryValidationUtils.verifyGroupingExistInGetResponse(getAllCategoriesRest,
+				productCategoryDefinition.getUniqueId(), productSubCategoryDefinition.getUniqueId(),
+				productGroupingDefinition);
+		// Audit validation
+		AuditValidationUtils.groupingAuditSuccess(ADD_GROUPING, productCategoryDefinition, productSubCategoryDefinition,
+				productGroupingDefinition, sdncProductStrategistUserDetails, STATUS_CODE_CREATED, AUDIT_PRODUCT_TYPE);
+	}
+
+	@Test
+	public void ProductGroupAllowedcharacters_07() throws Exception {
+		productGroupingDefinition.setName("1234AbcdE'");
+		RestResponse createGroupingRest = CategoryRestUtils.createGrouping(productGroupingDefinition,
+				productSubCategoryDefinition, productCategoryDefinition, sdncProductStrategistUserDetails,
+				PRODUCT_COMPONENT_TYPE);
+		assertEquals("Check response code after create product group", STATUS_CODE_CREATED,
+				createGroupingRest.getErrorCode().intValue());
+		productGroupingDefinition.setNormalizedName("1234abcde'");
+		CategoryValidationUtils.validateCreateGroupResponse(createGroupingRest, productGroupingDefinition);
+		RestResponse getAllCategoriesRest = CategoryRestUtils.getAllCategories(sdncAdminUserDetails,
+				PRODUCT_COMPONENT_TYPE);
+		assertEquals("Check response code after get all categories ", STATUS_CODE_SUCCESS,
+				getAllCategoriesRest.getErrorCode().intValue());
+		CategoryValidationUtils.verifyGroupingExistInGetResponse(getAllCategoriesRest,
+				productCategoryDefinition.getUniqueId(), productSubCategoryDefinition.getUniqueId(),
+				productGroupingDefinition);
+		// Audit validation
+		AuditValidationUtils.groupingAuditSuccess(ADD_GROUPING, productCategoryDefinition, productSubCategoryDefinition,
+				productGroupingDefinition, sdncProductStrategistUserDetails, STATUS_CODE_CREATED, AUDIT_PRODUCT_TYPE);
+	}
+
+	@Test
+	public void ProductGroupAllowedcharacters_08() throws Exception {
+		productGroupingDefinition.setName("1234AbcdE=");
+		RestResponse createGroupingRest = CategoryRestUtils.createGrouping(productGroupingDefinition,
+				productSubCategoryDefinition, productCategoryDefinition, sdncProductStrategistUserDetails,
+				PRODUCT_COMPONENT_TYPE);
+		assertEquals("Check response code after create product group", STATUS_CODE_CREATED,
+				createGroupingRest.getErrorCode().intValue());
+		productGroupingDefinition.setNormalizedName("1234abcde=");
+		CategoryValidationUtils.validateCreateGroupResponse(createGroupingRest, productGroupingDefinition);
+		RestResponse getAllCategoriesRest = CategoryRestUtils.getAllCategories(sdncAdminUserDetails,
+				PRODUCT_COMPONENT_TYPE);
+		assertEquals("Check response code after get all categories ", STATUS_CODE_SUCCESS,
+				getAllCategoriesRest.getErrorCode().intValue());
+		CategoryValidationUtils.verifyGroupingExistInGetResponse(getAllCategoriesRest,
+				productCategoryDefinition.getUniqueId(), productSubCategoryDefinition.getUniqueId(),
+				productGroupingDefinition);
+		// Audit validation
+		AuditValidationUtils.groupingAuditSuccess(ADD_GROUPING, productCategoryDefinition, productSubCategoryDefinition,
+				productGroupingDefinition, sdncProductStrategistUserDetails, STATUS_CODE_CREATED, AUDIT_PRODUCT_TYPE);
+	}
+
+	@Test
+	public void ProductGroupAllowedcharacters_09() throws Exception {
+		productGroupingDefinition.setName("1234AbcdE:");
+		RestResponse createGroupingRest = CategoryRestUtils.createGrouping(productGroupingDefinition,
+				productSubCategoryDefinition, productCategoryDefinition, sdncProductStrategistUserDetails,
+				PRODUCT_COMPONENT_TYPE);
+		assertEquals("Check response code after create product group", STATUS_CODE_CREATED,
+				createGroupingRest.getErrorCode().intValue());
+		productGroupingDefinition.setNormalizedName("1234abcde:");
+		CategoryValidationUtils.validateCreateGroupResponse(createGroupingRest, productGroupingDefinition);
+		RestResponse getAllCategoriesRest = CategoryRestUtils.getAllCategories(sdncAdminUserDetails,
+				PRODUCT_COMPONENT_TYPE);
+		assertEquals("Check response code after get all categories ", STATUS_CODE_SUCCESS,
+				getAllCategoriesRest.getErrorCode().intValue());
+		CategoryValidationUtils.verifyGroupingExistInGetResponse(getAllCategoriesRest,
+				productCategoryDefinition.getUniqueId(), productSubCategoryDefinition.getUniqueId(),
+				productGroupingDefinition);
+		// Audit validation
+		AuditValidationUtils.groupingAuditSuccess(ADD_GROUPING, productCategoryDefinition, productSubCategoryDefinition,
+				productGroupingDefinition, sdncProductStrategistUserDetails, STATUS_CODE_CREATED, AUDIT_PRODUCT_TYPE);
+	}
+
+	@Test
+	public void ProductGroupAllowedcharacters_10() throws Exception {
+		productGroupingDefinition.setName("1234AbcdE@");
+		RestResponse createGroupingRest = CategoryRestUtils.createGrouping(productGroupingDefinition,
+				productSubCategoryDefinition, productCategoryDefinition, sdncProductStrategistUserDetails,
+				PRODUCT_COMPONENT_TYPE);
+		assertEquals("Check response code after create product group", STATUS_CODE_CREATED,
+				createGroupingRest.getErrorCode().intValue());
+		productGroupingDefinition.setNormalizedName("1234abcde@");
+		CategoryValidationUtils.validateCreateGroupResponse(createGroupingRest, productGroupingDefinition);
+		RestResponse getAllCategoriesRest = CategoryRestUtils.getAllCategories(sdncAdminUserDetails,
+				PRODUCT_COMPONENT_TYPE);
+		assertEquals("Check response code after get all categories ", STATUS_CODE_SUCCESS,
+				getAllCategoriesRest.getErrorCode().intValue());
+		CategoryValidationUtils.verifyGroupingExistInGetResponse(getAllCategoriesRest,
+				productCategoryDefinition.getUniqueId(), productSubCategoryDefinition.getUniqueId(),
+				productGroupingDefinition);
+		// Audit validation
+		AuditValidationUtils.groupingAuditSuccess(ADD_GROUPING, productCategoryDefinition, productSubCategoryDefinition,
+				productGroupingDefinition, sdncProductStrategistUserDetails, STATUS_CODE_CREATED, AUDIT_PRODUCT_TYPE);
+	}
+
+	@Test
+	public void ProductGroupAllowedcharacters_11() throws Exception {
+		productGroupingDefinition.setName("1234AbcdE_");
+		RestResponse createGroupingRest = CategoryRestUtils.createGrouping(productGroupingDefinition,
+				productSubCategoryDefinition, productCategoryDefinition, sdncProductStrategistUserDetails,
+				PRODUCT_COMPONENT_TYPE);
+		assertEquals("Check response code after create product group", STATUS_CODE_CREATED,
+				createGroupingRest.getErrorCode().intValue());
+		productGroupingDefinition.setNormalizedName("1234abcde_");
+		CategoryValidationUtils.validateCreateGroupResponse(createGroupingRest, productGroupingDefinition);
+		RestResponse getAllCategoriesRest = CategoryRestUtils.getAllCategories(sdncAdminUserDetails,
+				PRODUCT_COMPONENT_TYPE);
+		assertEquals("Check response code after get all categories ", STATUS_CODE_SUCCESS,
+				getAllCategoriesRest.getErrorCode().intValue());
+		CategoryValidationUtils.verifyGroupingExistInGetResponse(getAllCategoriesRest,
+				productCategoryDefinition.getUniqueId(), productSubCategoryDefinition.getUniqueId(),
+				productGroupingDefinition);
+		// Audit validation
+		AuditValidationUtils.groupingAuditSuccess(ADD_GROUPING, productCategoryDefinition, productSubCategoryDefinition,
+				productGroupingDefinition, sdncProductStrategistUserDetails, STATUS_CODE_CREATED, AUDIT_PRODUCT_TYPE);
+	}
+
+	@Test
+	public void ProductGroupAllowedcharacters_12() throws Exception {
+		productGroupingDefinition.setName("1234AbcdE#");
+		RestResponse createGroupingRest = CategoryRestUtils.createGrouping(productGroupingDefinition,
+				productSubCategoryDefinition, productCategoryDefinition, sdncProductStrategistUserDetails,
+				PRODUCT_COMPONENT_TYPE);
+		assertEquals("Check response code after create product group", STATUS_CODE_CREATED,
+				createGroupingRest.getErrorCode().intValue());
+		productGroupingDefinition.setNormalizedName("1234abcde#");
+		CategoryValidationUtils.validateCreateGroupResponse(createGroupingRest, productGroupingDefinition);
+		RestResponse getAllCategoriesRest = CategoryRestUtils.getAllCategories(sdncAdminUserDetails,
+				PRODUCT_COMPONENT_TYPE);
+		assertEquals("Check response code after get all categories ", STATUS_CODE_SUCCESS,
+				getAllCategoriesRest.getErrorCode().intValue());
+		CategoryValidationUtils.verifyGroupingExistInGetResponse(getAllCategoriesRest,
+				productCategoryDefinition.getUniqueId(), productSubCategoryDefinition.getUniqueId(),
+				productGroupingDefinition);
+		// Audit validation
+		AuditValidationUtils.groupingAuditSuccess(ADD_GROUPING, productCategoryDefinition, productSubCategoryDefinition,
+				productGroupingDefinition, sdncProductStrategistUserDetails, STATUS_CODE_CREATED, AUDIT_PRODUCT_TYPE);
+	}
+
+	@Test
+	public void ProductGroupAllowedcharacters_13() throws Exception {
+		productGroupingDefinition.setName("1234AbcdE d");
+		RestResponse createGroupingRest = CategoryRestUtils.createGrouping(productGroupingDefinition,
+				productSubCategoryDefinition, productCategoryDefinition, sdncProductStrategistUserDetails,
+				PRODUCT_COMPONENT_TYPE);
+		assertEquals("Check response code after create product group", STATUS_CODE_CREATED,
+				createGroupingRest.getErrorCode().intValue());
+		productGroupingDefinition.setName("1234AbcdE D");
+		productGroupingDefinition.setNormalizedName("1234abcde d");
+		CategoryValidationUtils.validateCreateGroupResponse(createGroupingRest, productGroupingDefinition);
+		RestResponse getAllCategoriesRest = CategoryRestUtils.getAllCategories(sdncAdminUserDetails,
+				PRODUCT_COMPONENT_TYPE);
+		assertEquals("Check response code after get all categories ", STATUS_CODE_SUCCESS,
+				getAllCategoriesRest.getErrorCode().intValue());
+		CategoryValidationUtils.verifyGroupingExistInGetResponse(getAllCategoriesRest,
+				productCategoryDefinition.getUniqueId(), productSubCategoryDefinition.getUniqueId(),
+				productGroupingDefinition);
+		// Audit validation
+		AuditValidationUtils.groupingAuditSuccess(ADD_GROUPING, productCategoryDefinition, productSubCategoryDefinition,
+				productGroupingDefinition, sdncProductStrategistUserDetails, STATUS_CODE_CREATED, AUDIT_PRODUCT_TYPE);
+	}
+
+	@Test
+	public void groupNameValidation_RemoveSpaceFromBeginning() throws Exception {
+		productGroupingDefinition.setName("  Category01");
+		RestResponse createGroupingRest = CategoryRestUtils.createGrouping(productGroupingDefinition,
+				productSubCategoryDefinition, productCategoryDefinition, sdncProductStrategistUserDetails,
+				PRODUCT_COMPONENT_TYPE);
+		assertEquals("Check response code after create product group", STATUS_CODE_CREATED,
+				createGroupingRest.getErrorCode().intValue());
+		productGroupingDefinition.setNormalizedName("category01");
+		productGroupingDefinition.setName("Category01");
+		CategoryValidationUtils.validateCreateGroupResponse(createGroupingRest, productGroupingDefinition);
+		RestResponse getAllCategoriesRest = CategoryRestUtils.getAllCategories(sdncAdminUserDetails,
+				PRODUCT_COMPONENT_TYPE);
+		assertEquals("Check response code after get all categories ", STATUS_CODE_SUCCESS,
+				getAllCategoriesRest.getErrorCode().intValue());
+		CategoryValidationUtils.verifyGroupingExistInGetResponse(getAllCategoriesRest,
+				productCategoryDefinition.getUniqueId(), productSubCategoryDefinition.getUniqueId(),
+				productGroupingDefinition);
+		// Audit validation
+		AuditValidationUtils.groupingAuditSuccess(ADD_GROUPING, productCategoryDefinition, productSubCategoryDefinition,
+				productGroupingDefinition, sdncProductStrategistUserDetails, STATUS_CODE_CREATED, AUDIT_PRODUCT_TYPE);
+	}
+
+	@Test
+	public void groupNameValidation_RemoveSpaceFromEnd() throws Exception {
+		productGroupingDefinition.setName("Category01    ");
+		RestResponse createGroupingRest = CategoryRestUtils.createGrouping(productGroupingDefinition,
+				productSubCategoryDefinition, productCategoryDefinition, sdncProductStrategistUserDetails,
+				PRODUCT_COMPONENT_TYPE);
+		assertEquals("Check response code after create product group", STATUS_CODE_CREATED,
+				createGroupingRest.getErrorCode().intValue());
+		productGroupingDefinition.setNormalizedName("category01");
+		productGroupingDefinition.setName("Category01");
+		CategoryValidationUtils.validateCreateGroupResponse(createGroupingRest, productGroupingDefinition);
+		RestResponse getAllCategoriesRest = CategoryRestUtils.getAllCategories(sdncAdminUserDetails,
+				PRODUCT_COMPONENT_TYPE);
+		assertEquals("Check response code after get all categories ", STATUS_CODE_SUCCESS,
+				getAllCategoriesRest.getErrorCode().intValue());
+		CategoryValidationUtils.verifyGroupingExistInGetResponse(getAllCategoriesRest,
+				productCategoryDefinition.getUniqueId(), productSubCategoryDefinition.getUniqueId(),
+				productGroupingDefinition);
+		// Audit validation
+		AuditValidationUtils.groupingAuditSuccess(ADD_GROUPING, productCategoryDefinition, productSubCategoryDefinition,
+				productGroupingDefinition, sdncProductStrategistUserDetails, STATUS_CODE_CREATED, AUDIT_PRODUCT_TYPE);
+	}
+
+	@Test
+	public void groupNameValidation_RemoveExtraSpace() throws Exception {
+		productGroupingDefinition.setName("Category    02");
+		RestResponse createGroupingRest = CategoryRestUtils.createGrouping(productGroupingDefinition,
+				productSubCategoryDefinition, productCategoryDefinition, sdncProductStrategistUserDetails,
+				PRODUCT_COMPONENT_TYPE);
+		assertEquals("Check response code after create product group", STATUS_CODE_CREATED,
+				createGroupingRest.getErrorCode().intValue());
+		productGroupingDefinition.setNormalizedName("category 02");
+		productGroupingDefinition.setName("Category 02");
+		CategoryValidationUtils.validateCreateGroupResponse(createGroupingRest, productGroupingDefinition);
+		RestResponse getAllCategoriesRest = CategoryRestUtils.getAllCategories(sdncAdminUserDetails,
+				PRODUCT_COMPONENT_TYPE);
+		assertEquals("Check response code after get all categories ", STATUS_CODE_SUCCESS,
+				getAllCategoriesRest.getErrorCode().intValue());
+		CategoryValidationUtils.verifyGroupingExistInGetResponse(getAllCategoriesRest,
+				productCategoryDefinition.getUniqueId(), productSubCategoryDefinition.getUniqueId(),
+				productGroupingDefinition);
+		// Audit validation
+		AuditValidationUtils.groupingAuditSuccess(ADD_GROUPING, productCategoryDefinition, productSubCategoryDefinition,
+				productGroupingDefinition, sdncProductStrategistUserDetails, STATUS_CODE_CREATED, AUDIT_PRODUCT_TYPE);
+	}
+
+	@Test
+	public void groupNameValidation_RemoveExtraAmpersand() throws Exception {
+		productGroupingDefinition.setName("Category&& &02");
+		RestResponse createGroupingRest = CategoryRestUtils.createGrouping(productGroupingDefinition,
+				productSubCategoryDefinition, productCategoryDefinition, sdncProductStrategistUserDetails,
+				PRODUCT_COMPONENT_TYPE);
+		assertEquals("Check response code after create product group", STATUS_CODE_CREATED,
+				createGroupingRest.getErrorCode().intValue());
+		productGroupingDefinition.setNormalizedName("category& &02");
+		productGroupingDefinition.setName("Category& &02");
+		CategoryValidationUtils.validateCreateGroupResponse(createGroupingRest, productGroupingDefinition);
+		RestResponse getAllCategoriesRest = CategoryRestUtils.getAllCategories(sdncAdminUserDetails,
+				PRODUCT_COMPONENT_TYPE);
+		assertEquals("Check response code after get all categories ", STATUS_CODE_SUCCESS,
+				getAllCategoriesRest.getErrorCode().intValue());
+		CategoryValidationUtils.verifyGroupingExistInGetResponse(getAllCategoriesRest,
+				productCategoryDefinition.getUniqueId(), productSubCategoryDefinition.getUniqueId(),
+				productGroupingDefinition);
+		// Audit validation
+		AuditValidationUtils.groupingAuditSuccess(ADD_GROUPING, productCategoryDefinition, productSubCategoryDefinition,
+				productGroupingDefinition, sdncProductStrategistUserDetails, STATUS_CODE_CREATED, AUDIT_PRODUCT_TYPE);
+	}
+
+	@Test
+	public void groupNameValidation_RemoveExtraDash() throws Exception {
+		productGroupingDefinition.setName("CategorY-- --02");
+		RestResponse createGroupingRest = CategoryRestUtils.createGrouping(productGroupingDefinition,
+				productSubCategoryDefinition, productCategoryDefinition, sdncProductStrategistUserDetails,
+				PRODUCT_COMPONENT_TYPE);
+		assertEquals("Check response code after create product group", STATUS_CODE_CREATED,
+				createGroupingRest.getErrorCode().intValue());
+		productGroupingDefinition.setNormalizedName("category- -02");
+		productGroupingDefinition.setName("CategorY- -02");
+		CategoryValidationUtils.validateCreateGroupResponse(createGroupingRest, productGroupingDefinition);
+		RestResponse getAllCategoriesRest = CategoryRestUtils.getAllCategories(sdncAdminUserDetails,
+				PRODUCT_COMPONENT_TYPE);
+		assertEquals("Check response code after get all categories ", STATUS_CODE_SUCCESS,
+				getAllCategoriesRest.getErrorCode().intValue());
+		CategoryValidationUtils.verifyGroupingExistInGetResponse(getAllCategoriesRest,
+				productCategoryDefinition.getUniqueId(), productSubCategoryDefinition.getUniqueId(),
+				productGroupingDefinition);
+		// Audit validation
+		AuditValidationUtils.groupingAuditSuccess(ADD_GROUPING, productCategoryDefinition, productSubCategoryDefinition,
+				productGroupingDefinition, sdncProductStrategistUserDetails, STATUS_CODE_CREATED, AUDIT_PRODUCT_TYPE);
+	}
+
+	@Test
+	public void groupNameValidation_RemoveExtraPlus() throws Exception {
+		productGroupingDefinition.setName("CateGory++++ +02");
+		RestResponse createGroupingRest = CategoryRestUtils.createGrouping(productGroupingDefinition,
+				productSubCategoryDefinition, productCategoryDefinition, sdncProductStrategistUserDetails,
+				PRODUCT_COMPONENT_TYPE);
+		assertEquals("Check response code after create product group", STATUS_CODE_CREATED,
+				createGroupingRest.getErrorCode().intValue());
+		productGroupingDefinition.setName("CateGory+ +02");
+		productGroupingDefinition.setNormalizedName("category+ +02");
+		CategoryValidationUtils.validateCreateGroupResponse(createGroupingRest, productGroupingDefinition);
+		RestResponse getAllCategoriesRest = CategoryRestUtils.getAllCategories(sdncAdminUserDetails,
+				PRODUCT_COMPONENT_TYPE);
+		assertEquals("Check response code after get all categories ", STATUS_CODE_SUCCESS,
+				getAllCategoriesRest.getErrorCode().intValue());
+		CategoryValidationUtils.verifyGroupingExistInGetResponse(getAllCategoriesRest,
+				productCategoryDefinition.getUniqueId(), productSubCategoryDefinition.getUniqueId(),
+				productGroupingDefinition);
+		// Audit validation
+		AuditValidationUtils.groupingAuditSuccess(ADD_GROUPING, productCategoryDefinition, productSubCategoryDefinition,
+				productGroupingDefinition, sdncProductStrategistUserDetails, STATUS_CODE_CREATED, AUDIT_PRODUCT_TYPE);
+	}
+
+	@Test
+	public void groupNameValidation_RemoveExtraPeriod() throws Exception {
+		productGroupingDefinition.setName("Category.... .02");
+		RestResponse createGroupingRest = CategoryRestUtils.createGrouping(productGroupingDefinition,
+				productSubCategoryDefinition, productCategoryDefinition, sdncProductStrategistUserDetails,
+				PRODUCT_COMPONENT_TYPE);
+		assertEquals("Check response code after create product group", STATUS_CODE_CREATED,
+				createGroupingRest.getErrorCode().intValue());
+		productGroupingDefinition.setName("Category. .02");
+		productGroupingDefinition.setNormalizedName("category. .02");
+		CategoryValidationUtils.validateCreateGroupResponse(createGroupingRest, productGroupingDefinition);
+		RestResponse getAllCategoriesRest = CategoryRestUtils.getAllCategories(sdncAdminUserDetails,
+				PRODUCT_COMPONENT_TYPE);
+		assertEquals("Check response code after get all categories ", STATUS_CODE_SUCCESS,
+				getAllCategoriesRest.getErrorCode().intValue());
+		CategoryValidationUtils.verifyGroupingExistInGetResponse(getAllCategoriesRest,
+				productCategoryDefinition.getUniqueId(), productSubCategoryDefinition.getUniqueId(),
+				productGroupingDefinition);
+		// Audit validation
+		AuditValidationUtils.groupingAuditSuccess(ADD_GROUPING, productCategoryDefinition, productSubCategoryDefinition,
+				productGroupingDefinition, sdncProductStrategistUserDetails, STATUS_CODE_CREATED, AUDIT_PRODUCT_TYPE);
+	}
+
+	@Test
+	public void groupNameValidation_RemoveExtraApostrophe() throws Exception {
+		productGroupingDefinition.setName("CaTegory''' '02");
+		RestResponse createGroupingRest = CategoryRestUtils.createGrouping(productGroupingDefinition,
+				productSubCategoryDefinition, productCategoryDefinition, sdncProductStrategistUserDetails,
+				PRODUCT_COMPONENT_TYPE);
+		assertEquals("Check response code after create product group", STATUS_CODE_CREATED,
+				createGroupingRest.getErrorCode().intValue());
+		productGroupingDefinition.setName("CaTegory' '02");
+		productGroupingDefinition.setNormalizedName("category' '02");
+		CategoryValidationUtils.validateCreateGroupResponse(createGroupingRest, productGroupingDefinition);
+		RestResponse getAllCategoriesRest = CategoryRestUtils.getAllCategories(sdncAdminUserDetails,
+				PRODUCT_COMPONENT_TYPE);
+		assertEquals("Check response code after get all categories ", STATUS_CODE_SUCCESS,
+				getAllCategoriesRest.getErrorCode().intValue());
+		CategoryValidationUtils.verifyGroupingExistInGetResponse(getAllCategoriesRest,
+				productCategoryDefinition.getUniqueId(), productSubCategoryDefinition.getUniqueId(),
+				productGroupingDefinition);
+		// Audit validation
+		AuditValidationUtils.groupingAuditSuccess(ADD_GROUPING, productCategoryDefinition, productSubCategoryDefinition,
+				productGroupingDefinition, sdncProductStrategistUserDetails, STATUS_CODE_CREATED, AUDIT_PRODUCT_TYPE);
+	}
+
+	@Test
+	public void groupNameValidation_RemoveExtraHashtag() throws Exception {
+		productGroupingDefinition.setName("Category### #02");
+		RestResponse createGroupingRest = CategoryRestUtils.createGrouping(productGroupingDefinition,
+				productSubCategoryDefinition, productCategoryDefinition, sdncProductStrategistUserDetails,
+				PRODUCT_COMPONENT_TYPE);
+		assertEquals("Check response code after create product group", STATUS_CODE_CREATED,
+				createGroupingRest.getErrorCode().intValue());
+		productGroupingDefinition.setName("Category# #02");
+		productGroupingDefinition.setNormalizedName("category# #02");
+		CategoryValidationUtils.validateCreateGroupResponse(createGroupingRest, productGroupingDefinition);
+		RestResponse getAllCategoriesRest = CategoryRestUtils.getAllCategories(sdncAdminUserDetails,
+				PRODUCT_COMPONENT_TYPE);
+		assertEquals("Check response code after get all categories ", STATUS_CODE_SUCCESS,
+				getAllCategoriesRest.getErrorCode().intValue());
+		CategoryValidationUtils.verifyGroupingExistInGetResponse(getAllCategoriesRest,
+				productCategoryDefinition.getUniqueId(), productSubCategoryDefinition.getUniqueId(),
+				productGroupingDefinition);
+		// Audit validation
+		AuditValidationUtils.groupingAuditSuccess(ADD_GROUPING, productCategoryDefinition, productSubCategoryDefinition,
+				productGroupingDefinition, sdncProductStrategistUserDetails, STATUS_CODE_CREATED, AUDIT_PRODUCT_TYPE);
+	}
+
+	@Test
+	public void groupNameValidation_RemoveExtrEequal() throws Exception {
+		productGroupingDefinition.setName("Category=== =02");
+		RestResponse createGroupingRest = CategoryRestUtils.createGrouping(productGroupingDefinition,
+				productSubCategoryDefinition, productCategoryDefinition, sdncProductStrategistUserDetails,
+				PRODUCT_COMPONENT_TYPE);
+		assertEquals("Check response code after create product group", STATUS_CODE_CREATED,
+				createGroupingRest.getErrorCode().intValue());
+		productGroupingDefinition.setName("Category= =02");
+		productGroupingDefinition.setNormalizedName("category= =02");
+		CategoryValidationUtils.validateCreateGroupResponse(createGroupingRest, productGroupingDefinition);
+		RestResponse getAllCategoriesRest = CategoryRestUtils.getAllCategories(sdncAdminUserDetails,
+				PRODUCT_COMPONENT_TYPE);
+		assertEquals("Check response code after get all categories ", STATUS_CODE_SUCCESS,
+				getAllCategoriesRest.getErrorCode().intValue());
+		CategoryValidationUtils.verifyGroupingExistInGetResponse(getAllCategoriesRest,
+				productCategoryDefinition.getUniqueId(), productSubCategoryDefinition.getUniqueId(),
+				productGroupingDefinition);
+		// Audit validation
+		AuditValidationUtils.groupingAuditSuccess(ADD_GROUPING, productCategoryDefinition, productSubCategoryDefinition,
+				productGroupingDefinition, sdncProductStrategistUserDetails, STATUS_CODE_CREATED, AUDIT_PRODUCT_TYPE);
+	}
+
+	@Test
+	public void groupNameValidation_RemoveExtrColon() throws Exception {
+		productGroupingDefinition.setName("Category::: :02");
+		RestResponse createGroupingRest = CategoryRestUtils.createGrouping(productGroupingDefinition,
+				productSubCategoryDefinition, productCategoryDefinition, sdncProductStrategistUserDetails,
+				PRODUCT_COMPONENT_TYPE);
+		assertEquals("Check response code after create product group", STATUS_CODE_CREATED,
+				createGroupingRest.getErrorCode().intValue());
+		productGroupingDefinition.setName("Category: :02");
+		productGroupingDefinition.setNormalizedName("category: :02");
+		CategoryValidationUtils.validateCreateGroupResponse(createGroupingRest, productGroupingDefinition);
+		RestResponse getAllCategoriesRest = CategoryRestUtils.getAllCategories(sdncAdminUserDetails,
+				PRODUCT_COMPONENT_TYPE);
+		assertEquals("Check response code after get all categories ", STATUS_CODE_SUCCESS,
+				getAllCategoriesRest.getErrorCode().intValue());
+		CategoryValidationUtils.verifyGroupingExistInGetResponse(getAllCategoriesRest,
+				productCategoryDefinition.getUniqueId(), productSubCategoryDefinition.getUniqueId(),
+				productGroupingDefinition);
+		// Audit validation
+		AuditValidationUtils.groupingAuditSuccess(ADD_GROUPING, productCategoryDefinition, productSubCategoryDefinition,
+				productGroupingDefinition, sdncProductStrategistUserDetails, STATUS_CODE_CREATED, AUDIT_PRODUCT_TYPE);
+	}
+
+	@Test
+	public void groupNameValidation_RemoveExtrAt() throws Exception {
+		productGroupingDefinition.setName("Category@@@ @a2");
+		RestResponse createGroupingRest = CategoryRestUtils.createGrouping(productGroupingDefinition,
+				productSubCategoryDefinition, productCategoryDefinition, sdncProductStrategistUserDetails,
+				PRODUCT_COMPONENT_TYPE);
+		assertEquals("Check response code after create product group", STATUS_CODE_CREATED,
+				createGroupingRest.getErrorCode().intValue());
+		productGroupingDefinition.setName("Category@ @a2");
+		productGroupingDefinition.setNormalizedName("category@ @a2");
+		CategoryValidationUtils.validateCreateGroupResponse(createGroupingRest, productGroupingDefinition);
+		RestResponse getAllCategoriesRest = CategoryRestUtils.getAllCategories(sdncAdminUserDetails,
+				PRODUCT_COMPONENT_TYPE);
+		assertEquals("Check response code after get all categories ", STATUS_CODE_SUCCESS,
+				getAllCategoriesRest.getErrorCode().intValue());
+		CategoryValidationUtils.verifyGroupingExistInGetResponse(getAllCategoriesRest,
+				productCategoryDefinition.getUniqueId(), productSubCategoryDefinition.getUniqueId(),
+				productGroupingDefinition);
+		// Audit validation
+		AuditValidationUtils.groupingAuditSuccess(ADD_GROUPING, productCategoryDefinition, productSubCategoryDefinition,
+				productGroupingDefinition, sdncProductStrategistUserDetails, STATUS_CODE_CREATED, AUDIT_PRODUCT_TYPE);
+	}
+
+	@Test
+	public void groupNameValidation_RemoveExtraUnderscore() throws Exception {
+		productGroupingDefinition.setName("Category___ _22");
+		RestResponse createGroupingRest = CategoryRestUtils.createGrouping(productGroupingDefinition,
+				productSubCategoryDefinition, productCategoryDefinition, sdncProductStrategistUserDetails,
+				PRODUCT_COMPONENT_TYPE);
+		assertEquals("Check response code after create product group", STATUS_CODE_CREATED,
+				createGroupingRest.getErrorCode().intValue());
+		productGroupingDefinition.setName("Category_ _22");
+		productGroupingDefinition.setNormalizedName("category_ _22");
+		CategoryValidationUtils.validateCreateGroupResponse(createGroupingRest, productGroupingDefinition);
+		RestResponse getAllCategoriesRest = CategoryRestUtils.getAllCategories(sdncAdminUserDetails,
+				PRODUCT_COMPONENT_TYPE);
+		assertEquals("Check response code after get all categories ", STATUS_CODE_SUCCESS,
+				getAllCategoriesRest.getErrorCode().intValue());
+		CategoryValidationUtils.verifyGroupingExistInGetResponse(getAllCategoriesRest,
+				productCategoryDefinition.getUniqueId(), productSubCategoryDefinition.getUniqueId(),
+				productGroupingDefinition);
+		// Audit validation
+		AuditValidationUtils.groupingAuditSuccess(ADD_GROUPING, productCategoryDefinition, productSubCategoryDefinition,
+				productGroupingDefinition, sdncProductStrategistUserDetails, STATUS_CODE_CREATED, AUDIT_PRODUCT_TYPE);
+	}
+
+	@Test
+	public void groupNameValidation_FirstWordStartWithNumber() throws Exception {
+		productGroupingDefinition.setName("1Category one");
+		RestResponse createGroupingRest = CategoryRestUtils.createGrouping(productGroupingDefinition,
+				productSubCategoryDefinition, productCategoryDefinition, sdncProductStrategistUserDetails,
+				PRODUCT_COMPONENT_TYPE);
+		assertEquals("Check response code after create product group", STATUS_CODE_CREATED,
+				createGroupingRest.getErrorCode().intValue());
+		productGroupingDefinition.setName("1Category One");
+		productGroupingDefinition.setNormalizedName("1category one");
+		CategoryValidationUtils.validateCreateGroupResponse(createGroupingRest, productGroupingDefinition);
+		RestResponse getAllCategoriesRest = CategoryRestUtils.getAllCategories(sdncAdminUserDetails,
+				PRODUCT_COMPONENT_TYPE);
+		assertEquals("Check response code after get all categories ", STATUS_CODE_SUCCESS,
+				getAllCategoriesRest.getErrorCode().intValue());
+		CategoryValidationUtils.verifyGroupingExistInGetResponse(getAllCategoriesRest,
+				productCategoryDefinition.getUniqueId(), productSubCategoryDefinition.getUniqueId(),
+				productGroupingDefinition);
+		// Audit validation
+		AuditValidationUtils.groupingAuditSuccess(ADD_GROUPING, productCategoryDefinition, productSubCategoryDefinition,
+				productGroupingDefinition, sdncProductStrategistUserDetails, STATUS_CODE_CREATED, AUDIT_PRODUCT_TYPE);
+	}
+
+	@Test
+	public void groupNameValidation_FirstWordStartWithNonAlphaNumeric() throws Exception { // The
+																							// first
+																							// word
+																							// must
+																							// start
+																							// with
+																							// an
+																							// alpha-numeric
+																							// character
+																							// [a-Z
+																							// A..Z,
+																							// 0..9]
+		char invalidChars[] = { '&', '-', '+', '.', '\'', '#', '=', ':', '@', '_' };
+		RestResponse createGroupingRest;
+		RestResponse getAllCategoriesRest;
+		for (int i = 0; i < invalidChars.length; i++) {
+			DbUtils.deleteFromEsDbByPattern("_all");
+			productGroupingDefinition.setName(invalidChars[i] + "AbcD123");
+			productGroupingDefinition.setNormalizedName((invalidChars[i] + "AbcD123").toLowerCase());
+			createGroupingRest = CategoryRestUtils.createGrouping(productGroupingDefinition,
+					productSubCategoryDefinition, productCategoryDefinition, sdncProductStrategistUserDetails,
+					PRODUCT_COMPONENT_TYPE);
+			assertEquals("Check response code after create Category", STATUS_CODE_INVALID_CONTENT,
+					createGroupingRest.getErrorCode().intValue());
+
+			getAllCategoriesRest = CategoryRestUtils.getAllCategories(sdncAdminUserDetails, PRODUCT_COMPONENT_TYPE);
+			assertEquals("Check response code after get all categories ", STATUS_CODE_SUCCESS,
+					getAllCategoriesRest.getErrorCode().intValue());
+			CategoryValidationUtils.verifyGroupingNotExistInGetResponse(getAllCategoriesRest,
+					productCategoryDefinition.getUniqueId(), productSubCategoryDefinition.getUniqueId(),
+					productGroupingDefinition);
+		}
+	}
+
+	@Test
+	public void groupNameValidation_ReplaceAndWithAmpersand_01() throws Exception {
+		productGroupingDefinition.setName("At and T");
+		RestResponse createGroupingRest = CategoryRestUtils.createGrouping(productGroupingDefinition,
+				productSubCategoryDefinition, productCategoryDefinition, sdncProductStrategistUserDetails,
+				PRODUCT_COMPONENT_TYPE);
+		assertEquals("Check response code after create product group", STATUS_CODE_CREATED,
+				createGroupingRest.getErrorCode().intValue());
+		productGroupingDefinition.setName("At & T");
+		productGroupingDefinition.setNormalizedName("at & t");
+		CategoryValidationUtils.validateCreateGroupResponse(createGroupingRest, productGroupingDefinition);
+		RestResponse getAllCategoriesRest = CategoryRestUtils.getAllCategories(sdncAdminUserDetails,
+				PRODUCT_COMPONENT_TYPE);
+		assertEquals("Check response code after get all categories ", STATUS_CODE_SUCCESS,
+				getAllCategoriesRest.getErrorCode().intValue());
+		CategoryValidationUtils.verifyGroupingExistInGetResponse(getAllCategoriesRest,
+				productCategoryDefinition.getUniqueId(), productSubCategoryDefinition.getUniqueId(),
+				productGroupingDefinition);
+		// Audit validation
+		AuditValidationUtils.groupingAuditSuccess(ADD_GROUPING, productCategoryDefinition, productSubCategoryDefinition,
+				productGroupingDefinition, sdncProductStrategistUserDetails, STATUS_CODE_CREATED, AUDIT_PRODUCT_TYPE);
+	}
+
+	@Test
+	public void groupNameValidation_ReplaceAndWithAmpersand_02() throws Exception {
+		productGroupingDefinition.setName("At and t");
+		RestResponse createGroupingRest = CategoryRestUtils.createGrouping(productGroupingDefinition,
+				productSubCategoryDefinition, productCategoryDefinition, sdncProductStrategistUserDetails,
+				PRODUCT_COMPONENT_TYPE);
+		assertEquals("Check response code after create product group", STATUS_CODE_CREATED,
+				createGroupingRest.getErrorCode().intValue());
+		productGroupingDefinition.setName("At & T");
+		productGroupingDefinition.setNormalizedName("at & t");
+		CategoryValidationUtils.validateCreateGroupResponse(createGroupingRest, productGroupingDefinition);
+		RestResponse getAllCategoriesRest = CategoryRestUtils.getAllCategories(sdncAdminUserDetails,
+				PRODUCT_COMPONENT_TYPE);
+		assertEquals("Check response code after get all categories ", STATUS_CODE_SUCCESS,
+				getAllCategoriesRest.getErrorCode().intValue());
+		CategoryValidationUtils.verifyGroupingExistInGetResponse(getAllCategoriesRest,
+				productCategoryDefinition.getUniqueId(), productSubCategoryDefinition.getUniqueId(),
+				productGroupingDefinition);
+		// Audit validation
+		AuditValidationUtils.groupingAuditSuccess(ADD_GROUPING, productCategoryDefinition, productSubCategoryDefinition,
+				productGroupingDefinition, sdncProductStrategistUserDetails, STATUS_CODE_CREATED, AUDIT_PRODUCT_TYPE);
+	}
+
+	@Test
+	public void groupNameValidation_ReplaceAndWithAmpersand_03() throws Exception {
+		productGroupingDefinition.setName("Atand T");
+		RestResponse createGroupingRest = CategoryRestUtils.createGrouping(productGroupingDefinition,
+				productSubCategoryDefinition, productCategoryDefinition, sdncProductStrategistUserDetails,
+				PRODUCT_COMPONENT_TYPE);
+		assertEquals("Check response code after create product group", STATUS_CODE_CREATED,
+				createGroupingRest.getErrorCode().intValue());
+		productGroupingDefinition.setNormalizedName("atand t");
+		CategoryValidationUtils.validateCreateGroupResponse(createGroupingRest, productGroupingDefinition);
+		RestResponse getAllCategoriesRest = CategoryRestUtils.getAllCategories(sdncAdminUserDetails,
+				PRODUCT_COMPONENT_TYPE);
+		assertEquals("Check response code after get all categories ", STATUS_CODE_SUCCESS,
+				getAllCategoriesRest.getErrorCode().intValue());
+		CategoryValidationUtils.verifyGroupingExistInGetResponse(getAllCategoriesRest,
+				productCategoryDefinition.getUniqueId(), productSubCategoryDefinition.getUniqueId(),
+				productGroupingDefinition);
+		// Audit validation
+		AuditValidationUtils.groupingAuditSuccess(ADD_GROUPING, productCategoryDefinition, productSubCategoryDefinition,
+				productGroupingDefinition, sdncProductStrategistUserDetails, STATUS_CODE_CREATED, AUDIT_PRODUCT_TYPE);
+	}
+
+	@Test
+	public void groupNameValidation_ReplaceAndWithAmpersand_04() throws Exception {
+		productGroupingDefinition.setName("At andT");
+		RestResponse createGroupingRest = CategoryRestUtils.createGrouping(productGroupingDefinition,
+				productSubCategoryDefinition, productCategoryDefinition, sdncProductStrategistUserDetails,
+				PRODUCT_COMPONENT_TYPE);
+		assertEquals("Check response code after create product group", STATUS_CODE_CREATED,
+				createGroupingRest.getErrorCode().intValue());
+		productGroupingDefinition.setNormalizedName("at andt");
+		productGroupingDefinition.setName("At AndT");
+		CategoryValidationUtils.validateCreateGroupResponse(createGroupingRest, productGroupingDefinition);
+		RestResponse getAllCategoriesRest = CategoryRestUtils.getAllCategories(sdncAdminUserDetails,
+				PRODUCT_COMPONENT_TYPE);
+		assertEquals("Check response code after get all categories ", STATUS_CODE_SUCCESS,
+				getAllCategoriesRest.getErrorCode().intValue());
+		CategoryValidationUtils.verifyGroupingExistInGetResponse(getAllCategoriesRest,
+				productCategoryDefinition.getUniqueId(), productSubCategoryDefinition.getUniqueId(),
+				productGroupingDefinition);
+		// Audit validation
+		AuditValidationUtils.groupingAuditSuccess(ADD_GROUPING, productCategoryDefinition, productSubCategoryDefinition,
+				productGroupingDefinition, sdncProductStrategistUserDetails, STATUS_CODE_CREATED, AUDIT_PRODUCT_TYPE);
+	}
+
+	@Test
+	public void groupNameValidation_ReplaceAndWithAmpersand_05() throws Exception {
+		productGroupingDefinition.setName(" and AttT");
+		RestResponse createGroupingRest = CategoryRestUtils.createGrouping(productGroupingDefinition,
+				productSubCategoryDefinition, productCategoryDefinition, sdncProductStrategistUserDetails,
+				PRODUCT_COMPONENT_TYPE);
+		assertEquals("Check response code after create product group", STATUS_CODE_CREATED,
+				createGroupingRest.getErrorCode().intValue());
+		productGroupingDefinition.setNormalizedName("and attt");
+		productGroupingDefinition.setName("And AttT");
+		CategoryValidationUtils.validateCreateGroupResponse(createGroupingRest, productGroupingDefinition);
+		RestResponse getAllCategoriesRest = CategoryRestUtils.getAllCategories(sdncAdminUserDetails,
+				PRODUCT_COMPONENT_TYPE);
+		assertEquals("Check response code after get all categories ", STATUS_CODE_SUCCESS,
+				getAllCategoriesRest.getErrorCode().intValue());
+		CategoryValidationUtils.verifyGroupingExistInGetResponse(getAllCategoriesRest,
+				productCategoryDefinition.getUniqueId(), productSubCategoryDefinition.getUniqueId(),
+				productGroupingDefinition);
+		// Audit validation
+		AuditValidationUtils.groupingAuditSuccess(ADD_GROUPING, productCategoryDefinition, productSubCategoryDefinition,
+				productGroupingDefinition, sdncProductStrategistUserDetails, STATUS_CODE_CREATED, AUDIT_PRODUCT_TYPE);
+	}
+
+	@Test
+	public void groupNameValidation_ReplaceAndWithAmpersand_06() throws Exception {
+		productGroupingDefinition.setName("AttT and ");
+		RestResponse createGroupingRest = CategoryRestUtils.createGrouping(productGroupingDefinition,
+				productSubCategoryDefinition, productCategoryDefinition, sdncProductStrategistUserDetails,
+				PRODUCT_COMPONENT_TYPE);
+		assertEquals("Check response code after create product group", STATUS_CODE_CREATED,
+				createGroupingRest.getErrorCode().intValue());
+		productGroupingDefinition.setNormalizedName("attt and");
+		productGroupingDefinition.setName("AttT And");
+		CategoryValidationUtils.validateCreateGroupResponse(createGroupingRest, productGroupingDefinition);
+		RestResponse getAllCategoriesRest = CategoryRestUtils.getAllCategories(sdncAdminUserDetails,
+				PRODUCT_COMPONENT_TYPE);
+		assertEquals("Check response code after get all categories ", STATUS_CODE_SUCCESS,
+				getAllCategoriesRest.getErrorCode().intValue());
+		CategoryValidationUtils.verifyGroupingExistInGetResponse(getAllCategoriesRest,
+				productCategoryDefinition.getUniqueId(), productSubCategoryDefinition.getUniqueId(),
+				productGroupingDefinition);
+		// Audit validation
+		AuditValidationUtils.groupingAuditSuccess(ADD_GROUPING, productCategoryDefinition, productSubCategoryDefinition,
+				productGroupingDefinition, sdncProductStrategistUserDetails, STATUS_CODE_CREATED, AUDIT_PRODUCT_TYPE);
+	}
+
+	@Test
+	public void groupNameValidation_ReplaceAndWithAmpersand_07() throws Exception {
+		productGroupingDefinition.setName(" and a");
+		RestResponse createGroupingRest = CategoryRestUtils.createGrouping(productGroupingDefinition,
+				productSubCategoryDefinition, productCategoryDefinition, sdncProductStrategistUserDetails,
+				PRODUCT_COMPONENT_TYPE);
+		assertEquals("Check response code after create product group", STATUS_CODE_CREATED,
+				createGroupingRest.getErrorCode().intValue());
+		productGroupingDefinition.setNormalizedName("and a");
+		productGroupingDefinition.setName("And a");
+		CategoryValidationUtils.validateCreateGroupResponse(createGroupingRest, productGroupingDefinition);
+		RestResponse getAllCategoriesRest = CategoryRestUtils.getAllCategories(sdncAdminUserDetails,
+				PRODUCT_COMPONENT_TYPE);
+		assertEquals("Check response code after get all categories ", STATUS_CODE_SUCCESS,
+				getAllCategoriesRest.getErrorCode().intValue());
+		CategoryValidationUtils.verifyGroupingExistInGetResponse(getAllCategoriesRest,
+				productCategoryDefinition.getUniqueId(), productSubCategoryDefinition.getUniqueId(),
+				productGroupingDefinition);
+		// Audit validation
+		AuditValidationUtils.groupingAuditSuccess(ADD_GROUPING, productCategoryDefinition, productSubCategoryDefinition,
+				productGroupingDefinition, sdncProductStrategistUserDetails, STATUS_CODE_CREATED, AUDIT_PRODUCT_TYPE);
+	}
+
+	@Test
+	public void groupNameValidationMaxLength() throws Exception {
+		productGroupingDefinition.setName("AsdfghjQ234567890@#.&:+-_");
+		RestResponse createGroupingRest = CategoryRestUtils.createGrouping(productGroupingDefinition,
+				productSubCategoryDefinition, productCategoryDefinition, sdncProductStrategistUserDetails,
+				PRODUCT_COMPONENT_TYPE);
+		assertEquals("Check response code after create product group", STATUS_CODE_CREATED,
+				createGroupingRest.getErrorCode().intValue());
+		productGroupingDefinition.setNormalizedName("asdfghjq234567890@#.&:+-_");
+		CategoryValidationUtils.validateCreateGroupResponse(createGroupingRest, productGroupingDefinition);
+		RestResponse getAllCategoriesRest = CategoryRestUtils.getAllCategories(sdncAdminUserDetails,
+				PRODUCT_COMPONENT_TYPE);
+		assertEquals("Check response code after get all categories ", STATUS_CODE_SUCCESS,
+				getAllCategoriesRest.getErrorCode().intValue());
+		CategoryValidationUtils.verifyGroupingExistInGetResponse(getAllCategoriesRest,
+				productCategoryDefinition.getUniqueId(), productSubCategoryDefinition.getUniqueId(),
+				productGroupingDefinition);
+		// Audit validation
+		AuditValidationUtils.groupingAuditSuccess(ADD_GROUPING, productCategoryDefinition, productSubCategoryDefinition,
+				productGroupingDefinition, sdncProductStrategistUserDetails, STATUS_CODE_CREATED, AUDIT_PRODUCT_TYPE);
+	}
+
+	@Test
+	public void groupNameValidationMaxLengthAfterNormalization() throws Exception {
+		productGroupingDefinition.setName("  A jQ234 @@@___ +++ At and T and and ");
+		RestResponse createGroupingRest = CategoryRestUtils.createGrouping(productGroupingDefinition,
+				productSubCategoryDefinition, productCategoryDefinition, sdncProductStrategistUserDetails,
+				PRODUCT_COMPONENT_TYPE);
+		assertEquals("Check response code after create product group", STATUS_CODE_CREATED,
+				createGroupingRest.getErrorCode().intValue());
+		productGroupingDefinition.setNormalizedName("a jq234 @_ + at & t & and");
+		productGroupingDefinition.setName("A JQ234 @_ + At & T & And");
+		CategoryValidationUtils.validateCreateGroupResponse(createGroupingRest, productGroupingDefinition);
+		RestResponse getAllCategoriesRest = CategoryRestUtils.getAllCategories(sdncAdminUserDetails,
+				PRODUCT_COMPONENT_TYPE);
+		assertEquals("Check response code after get all categories ", STATUS_CODE_SUCCESS,
+				getAllCategoriesRest.getErrorCode().intValue());
+		CategoryValidationUtils.verifyGroupingExistInGetResponse(getAllCategoriesRest,
+				productCategoryDefinition.getUniqueId(), productSubCategoryDefinition.getUniqueId(),
+				productGroupingDefinition);
+		// Audit validation
+		AuditValidationUtils.groupingAuditSuccess(ADD_GROUPING, productCategoryDefinition, productSubCategoryDefinition,
+				productGroupingDefinition, sdncProductStrategistUserDetails, STATUS_CODE_CREATED, AUDIT_PRODUCT_TYPE);
+	}
+
+	@Test
+	public void groupNameValidationExceedMaxLengthAfterNormalization() throws Exception {
+		productGroupingDefinition.setName("  AbdfghBCVa jQ234 @@___ +++ At and T   ");
+		RestResponse createGroupingRest = CategoryRestUtils.createGrouping(productGroupingDefinition,
+				productSubCategoryDefinition, productCategoryDefinition, sdncProductStrategistUserDetails,
+				PRODUCT_COMPONENT_TYPE);
+		assertEquals("Check response code after create product group", STATUS_CODE_INVALID_CONTENT,
+				createGroupingRest.getErrorCode().intValue());
+		productGroupingDefinition.setNormalizedName("abdfghbcva jq234 @_ + at&t");
+		RestResponse getAllCategoriesRest = CategoryRestUtils.getAllCategories(sdncAdminUserDetails,
+				PRODUCT_COMPONENT_TYPE);
+		assertEquals("Check response code after get all categories ", STATUS_CODE_SUCCESS,
+				getAllCategoriesRest.getErrorCode().intValue());
+		CategoryValidationUtils.verifyGroupingNotExistInGetResponse(getAllCategoriesRest,
+				productCategoryDefinition.getUniqueId(), productSubCategoryDefinition.getUniqueId(),
+				productGroupingDefinition);
+		// Audit validation
+		AuditValidationUtils.groupingAuditFailure(ADD_GROUPING, productCategoryDefinition, productSubCategoryDefinition,
+				productGroupingDefinition, sdncProductStrategistUserDetails,
+				ActionStatus.COMPONENT_ELEMENT_INVALID_NAME_LENGTH, STATUS_CODE_INVALID_CONTENT, AUDIT_PRODUCT_TYPE,
+				AUDIT_PRODUCT_TYPE, GROUPING);
+	}
+
+	@Test
+	public void groupNameValidationMinLengthAfterNormalization() throws Exception {
+		productGroupingDefinition.setName("  At&&&&&&&&&&&&t   ");
+		RestResponse createGroupingRest = CategoryRestUtils.createGrouping(productGroupingDefinition,
+				productSubCategoryDefinition, productCategoryDefinition, sdncProductStrategistUserDetails,
+				PRODUCT_COMPONENT_TYPE);
+		assertEquals("Check response code after create product group", STATUS_CODE_CREATED,
+				createGroupingRest.getErrorCode().intValue());
+		productGroupingDefinition.setNormalizedName("at&t");
+		productGroupingDefinition.setName("At&t");
+		CategoryValidationUtils.validateCreateGroupResponse(createGroupingRest, productGroupingDefinition);
+		RestResponse getAllCategoriesRest = CategoryRestUtils.getAllCategories(sdncAdminUserDetails,
+				PRODUCT_COMPONENT_TYPE);
+		assertEquals("Check response code after get all categories ", STATUS_CODE_SUCCESS,
+				getAllCategoriesRest.getErrorCode().intValue());
+		CategoryValidationUtils.verifyGroupingExistInGetResponse(getAllCategoriesRest,
+				productCategoryDefinition.getUniqueId(), productSubCategoryDefinition.getUniqueId(),
+				productGroupingDefinition);
+		// Audit validation
+		AuditValidationUtils.groupingAuditSuccess(ADD_GROUPING, productCategoryDefinition, productSubCategoryDefinition,
+				productGroupingDefinition, sdncProductStrategistUserDetails, STATUS_CODE_CREATED, AUDIT_PRODUCT_TYPE);
+	}
+
+	@Test
+	public void groupNameValidationLessThanMinLengthAfterNormalization() throws Exception {
+		productGroupingDefinition.setName("  A&&&&&&&&&&&&T   ");
+		RestResponse createGroupingRest = CategoryRestUtils.createGrouping(productGroupingDefinition,
+				productSubCategoryDefinition, productCategoryDefinition, sdncProductStrategistUserDetails,
+				PRODUCT_COMPONENT_TYPE);
+		assertEquals("Check response code after create product group", STATUS_CODE_INVALID_CONTENT,
+				createGroupingRest.getErrorCode().intValue());
+		productGroupingDefinition.setNormalizedName("a&t");
+		RestResponse getAllCategoriesRest = CategoryRestUtils.getAllCategories(sdncAdminUserDetails,
+				PRODUCT_COMPONENT_TYPE);
+		assertEquals("Check response code after get all categories ", STATUS_CODE_SUCCESS,
+				getAllCategoriesRest.getErrorCode().intValue());
+		CategoryValidationUtils.verifyGroupingNotExistInGetResponse(getAllCategoriesRest,
+				productCategoryDefinition.getUniqueId(), productSubCategoryDefinition.getUniqueId(),
+				productGroupingDefinition);
+		// Audit validation
+		AuditValidationUtils.groupingAuditFailure(ADD_GROUPING, productCategoryDefinition, productSubCategoryDefinition,
+				productGroupingDefinition, sdncProductStrategistUserDetails,
+				ActionStatus.COMPONENT_ELEMENT_INVALID_NAME_LENGTH, STATUS_CODE_INVALID_CONTENT, AUDIT_PRODUCT_TYPE,
+				AUDIT_PRODUCT_TYPE, GROUPING);
+	}
+
+	@Test
+	public void groupNameValidationIsEmpty() throws Exception {
+		productGroupingDefinition.setName("");
+		RestResponse createGroupingRest = CategoryRestUtils.createGrouping(productGroupingDefinition,
+				productSubCategoryDefinition, productCategoryDefinition, sdncProductStrategistUserDetails,
+				PRODUCT_COMPONENT_TYPE);
+		assertEquals("Check response code after create product group", STATUS_CODE_INVALID_CONTENT,
+				createGroupingRest.getErrorCode().intValue());
+		productGroupingDefinition.setNormalizedName("");
+		RestResponse getAllCategoriesRest = CategoryRestUtils.getAllCategories(sdncAdminUserDetails,
+				PRODUCT_COMPONENT_TYPE);
+		assertEquals("Check response code after get all categories ", STATUS_CODE_SUCCESS,
+				getAllCategoriesRest.getErrorCode().intValue());
+		CategoryValidationUtils.verifyGroupingNotExistInGetResponse(getAllCategoriesRest,
+				productCategoryDefinition.getUniqueId(), productSubCategoryDefinition.getUniqueId(),
+				productGroupingDefinition);
+		// Audit validation
+		AuditValidationUtils.groupingAuditFailure(ADD_GROUPING, productCategoryDefinition, productSubCategoryDefinition,
+				productGroupingDefinition, sdncProductStrategistUserDetails,
+				ActionStatus.COMPONENT_ELEMENT_INVALID_NAME_FORMAT, STATUS_CODE_INVALID_CONTENT, AUDIT_PRODUCT_TYPE,
+				AUDIT_PRODUCT_TYPE, GROUPING);
+	}
+
+	@Test
+	public void groupNameValidationInvalidCharacters() throws Exception {
+		RestResponse createGroupingRest;
+		RestResponse getAllCategoriesRest;
+		char invalidChars[] = { '~', '!', '$', '%', '^', '*', '(', ')', '"', '{', '}', '[', ']', '?', '>', '<', '/',
+				'|', '\\', ',' };
+		for (int i = 0; i < invalidChars.length; i++) {
+			DbUtils.deleteFromEsDbByPattern("_all");
+			productGroupingDefinition.setName("AbcD123" + invalidChars[i]);
+			createGroupingRest = CategoryRestUtils.createGrouping(productGroupingDefinition,
+					productSubCategoryDefinition, productCategoryDefinition, sdncProductStrategistUserDetails,
+					PRODUCT_COMPONENT_TYPE);
+			assertEquals("Check response code after create product group", STATUS_CODE_INVALID_CONTENT,
+					createGroupingRest.getErrorCode().intValue());
+			productGroupingDefinition.setNormalizedName("");
+			getAllCategoriesRest = CategoryRestUtils.getAllCategories(sdncAdminUserDetails, PRODUCT_COMPONENT_TYPE);
+			assertEquals("Check response code after get all categories ", STATUS_CODE_SUCCESS,
+					getAllCategoriesRest.getErrorCode().intValue());
+			CategoryValidationUtils.verifyGroupingNotExistInGetResponse(getAllCategoriesRest,
+					productCategoryDefinition.getUniqueId(), productSubCategoryDefinition.getUniqueId(),
+					productGroupingDefinition);
+			// Audit validation
+			AuditValidationUtils.groupingAuditFailure(ADD_GROUPING, productCategoryDefinition,
+					productSubCategoryDefinition, productGroupingDefinition, sdncProductStrategistUserDetails,
+					ActionStatus.COMPONENT_ELEMENT_INVALID_NAME_FORMAT, STATUS_CODE_INVALID_CONTENT, AUDIT_PRODUCT_TYPE,
+					AUDIT_PRODUCT_TYPE, GROUPING);
+		}
+	}
+
+	@Test
+	public void groupNameValidationConjunctions_01() throws Exception {
+		// Normalize the grouping name conjunctions ('of', 'to', 'for', 'as',
+		// 'a', 'an' , 'the') are lower case.
+		productGroupingDefinition.setName(" bank OF america  ");
+		RestResponse createGroupingRest = CategoryRestUtils.createGrouping(productGroupingDefinition,
+				productSubCategoryDefinition, productCategoryDefinition, sdncProductStrategistUserDetails,
+				PRODUCT_COMPONENT_TYPE);
+		assertEquals("Check response code after create product group", STATUS_CODE_CREATED,
+				createGroupingRest.getErrorCode().intValue());
+		productGroupingDefinition.setNormalizedName("bank of america");
+		productGroupingDefinition.setName("Bank of America");
+		CategoryValidationUtils.validateCreateGroupResponse(createGroupingRest, productGroupingDefinition);
+		RestResponse getAllCategoriesRest = CategoryRestUtils.getAllCategories(sdncAdminUserDetails,
+				PRODUCT_COMPONENT_TYPE);
+		assertEquals("Check response code after get all categories ", STATUS_CODE_SUCCESS,
+				getAllCategoriesRest.getErrorCode().intValue());
+		CategoryValidationUtils.verifyGroupingExistInGetResponse(getAllCategoriesRest,
+				productCategoryDefinition.getUniqueId(), productSubCategoryDefinition.getUniqueId(),
+				productGroupingDefinition);
+		// Audit validation
+		AuditValidationUtils.groupingAuditSuccess(ADD_GROUPING, productCategoryDefinition, productSubCategoryDefinition,
+				productGroupingDefinition, sdncProductStrategistUserDetails, STATUS_CODE_CREATED, AUDIT_PRODUCT_TYPE);
+	}
+
+	@Test
+	public void groupNameValidationConjunctions_02() throws Exception {
+		// Normalize the grouping name conjunctions ('of', 'to', 'for', 'as',
+		// 'a', 'an' , 'the') are lower case.
+		productGroupingDefinition.setName("THE america bank   ");
+		RestResponse createGroupingRest = CategoryRestUtils.createGrouping(productGroupingDefinition,
+				productSubCategoryDefinition, productCategoryDefinition, sdncProductStrategistUserDetails,
+				PRODUCT_COMPONENT_TYPE);
+		assertEquals("Check response code after create product group", STATUS_CODE_CREATED,
+				createGroupingRest.getErrorCode().intValue());
+		productGroupingDefinition.setName("THE America Bank");
+		productGroupingDefinition.setNormalizedName("the america bank");
+		CategoryValidationUtils.validateCreateGroupResponse(createGroupingRest, productGroupingDefinition);
+		RestResponse getAllCategoriesRest = CategoryRestUtils.getAllCategories(sdncAdminUserDetails,
+				PRODUCT_COMPONENT_TYPE);
+		assertEquals("Check response code after get all categories ", STATUS_CODE_SUCCESS,
+				getAllCategoriesRest.getErrorCode().intValue());
+		CategoryValidationUtils.verifyGroupingExistInGetResponse(getAllCategoriesRest,
+				productCategoryDefinition.getUniqueId(), productSubCategoryDefinition.getUniqueId(),
+				productGroupingDefinition);
+		// Audit validation
+		AuditValidationUtils.groupingAuditSuccess(ADD_GROUPING, productCategoryDefinition, productSubCategoryDefinition,
+				productGroupingDefinition, sdncProductStrategistUserDetails, STATUS_CODE_CREATED, AUDIT_PRODUCT_TYPE);
+	}
+
+	@Test
+	public void groupNameValidationConjunctions_03() throws Exception {
+		// Normalize the grouping name conjunctions ('of', 'to', 'for', 'as',
+		// 'a', 'an' , 'the') are lower case.
+		productGroupingDefinition.setName("   A bank OF america  ");
+		RestResponse createGroupingRest = CategoryRestUtils.createGrouping(productGroupingDefinition,
+				productSubCategoryDefinition, productCategoryDefinition, sdncProductStrategistUserDetails,
+				PRODUCT_COMPONENT_TYPE);
+		assertEquals("Check response code after create product group", STATUS_CODE_CREATED,
+				createGroupingRest.getErrorCode().intValue());
+		productGroupingDefinition.setName("A Bank of America");
+		productGroupingDefinition.setNormalizedName("a bank of america");
+		CategoryValidationUtils.validateCreateGroupResponse(createGroupingRest, productGroupingDefinition);
+		RestResponse getAllCategoriesRest = CategoryRestUtils.getAllCategories(sdncAdminUserDetails,
+				PRODUCT_COMPONENT_TYPE);
+		assertEquals("Check response code after get all categories ", STATUS_CODE_SUCCESS,
+				getAllCategoriesRest.getErrorCode().intValue());
+		CategoryValidationUtils.verifyGroupingExistInGetResponse(getAllCategoriesRest,
+				productCategoryDefinition.getUniqueId(), productSubCategoryDefinition.getUniqueId(),
+				productGroupingDefinition);
+		// Audit validation
+		AuditValidationUtils.groupingAuditSuccess(ADD_GROUPING, productCategoryDefinition, productSubCategoryDefinition,
+				productGroupingDefinition, sdncProductStrategistUserDetails, STATUS_CODE_CREATED, AUDIT_PRODUCT_TYPE);
+	}
+
+	@Test
+	public void groupNameValidationConjunctions_04() throws Exception {
+		// Normalize the grouping name conjunctions ('of', 'to', 'for', 'as',
+		// 'a', 'an' , 'the') are lower case.
+		productGroupingDefinition.setName("  bank  america is A big ban  ");
+		RestResponse createGroupingRest = CategoryRestUtils.createGrouping(productGroupingDefinition,
+				productSubCategoryDefinition, productCategoryDefinition, sdncProductStrategistUserDetails,
+				PRODUCT_COMPONENT_TYPE);
+		assertEquals("Check response code after create product group", STATUS_CODE_CREATED,
+				createGroupingRest.getErrorCode().intValue());
+		productGroupingDefinition.setName("Bank America Is a Big Ban");
+		productGroupingDefinition.setNormalizedName("bank america is a big ban");
+		CategoryValidationUtils.validateCreateGroupResponse(createGroupingRest, productGroupingDefinition);
+		RestResponse getAllCategoriesRest = CategoryRestUtils.getAllCategories(sdncAdminUserDetails,
+				PRODUCT_COMPONENT_TYPE);
+		assertEquals("Check response code after get all categories ", STATUS_CODE_SUCCESS,
+				getAllCategoriesRest.getErrorCode().intValue());
+		CategoryValidationUtils.verifyGroupingExistInGetResponse(getAllCategoriesRest,
+				productCategoryDefinition.getUniqueId(), productSubCategoryDefinition.getUniqueId(),
+				productGroupingDefinition);
+		// Audit validation
+		AuditValidationUtils.groupingAuditSuccess(ADD_GROUPING, productCategoryDefinition, productSubCategoryDefinition,
+				productGroupingDefinition, sdncProductStrategistUserDetails, STATUS_CODE_CREATED, AUDIT_PRODUCT_TYPE);
+	}
+
+	@Test
+	public void groupNameValidationConjunctions_05() throws Exception {
+		// Normalize the grouping name conjunctions ('of', 'to', 'for', 'as',
+		// 'a', 'an' , 'the') are lower case.
+		productGroupingDefinition.setName(" aN apple comPany inC ");
+		RestResponse createGroupingRest = CategoryRestUtils.createGrouping(productGroupingDefinition,
+				productSubCategoryDefinition, productCategoryDefinition, sdncProductStrategistUserDetails,
+				PRODUCT_COMPONENT_TYPE);
+		assertEquals("Check response code after create product group", STATUS_CODE_CREATED,
+				createGroupingRest.getErrorCode().intValue());
+		productGroupingDefinition.setName("AN Apple ComPany InC");
+		productGroupingDefinition.setNormalizedName("an apple company inc");
+		CategoryValidationUtils.validateCreateGroupResponse(createGroupingRest, productGroupingDefinition);
+		RestResponse getAllCategoriesRest = CategoryRestUtils.getAllCategories(sdncAdminUserDetails,
+				PRODUCT_COMPONENT_TYPE);
+		assertEquals("Check response code after get all categories ", STATUS_CODE_SUCCESS,
+				getAllCategoriesRest.getErrorCode().intValue());
+		CategoryValidationUtils.verifyGroupingExistInGetResponse(getAllCategoriesRest,
+				productCategoryDefinition.getUniqueId(), productSubCategoryDefinition.getUniqueId(),
+				productGroupingDefinition);
+		// Audit validation
+		AuditValidationUtils.groupingAuditSuccess(ADD_GROUPING, productCategoryDefinition, productSubCategoryDefinition,
+				productGroupingDefinition, sdncProductStrategistUserDetails, STATUS_CODE_CREATED, AUDIT_PRODUCT_TYPE);
+	}
+
+	@Test
+	public void groupNameValidationConjunctions_06() throws Exception {
+		// Normalize the grouping name conjunctions ('of', 'to', 'for', 'as',
+		// 'a', 'an' , 'the') are lower case.
+		productGroupingDefinition.setName(" eat AN apple ANAN");
+		RestResponse createGroupingRest = CategoryRestUtils.createGrouping(productGroupingDefinition,
+				productSubCategoryDefinition, productCategoryDefinition, sdncProductStrategistUserDetails,
+				PRODUCT_COMPONENT_TYPE);
+		assertEquals("Check response code after create product group", STATUS_CODE_CREATED,
+				createGroupingRest.getErrorCode().intValue());
+		productGroupingDefinition.setName("Eat an Apple ANAN");
+		productGroupingDefinition.setNormalizedName("eat an apple anan");
+		CategoryValidationUtils.validateCreateGroupResponse(createGroupingRest, productGroupingDefinition);
+		RestResponse getAllCategoriesRest = CategoryRestUtils.getAllCategories(sdncAdminUserDetails,
+				PRODUCT_COMPONENT_TYPE);
+		assertEquals("Check response code after get all categories ", STATUS_CODE_SUCCESS,
+				getAllCategoriesRest.getErrorCode().intValue());
+		CategoryValidationUtils.verifyGroupingExistInGetResponse(getAllCategoriesRest,
+				productCategoryDefinition.getUniqueId(), productSubCategoryDefinition.getUniqueId(),
+				productGroupingDefinition);
+		// Audit validation
+		AuditValidationUtils.groupingAuditSuccess(ADD_GROUPING, productCategoryDefinition, productSubCategoryDefinition,
+				productGroupingDefinition, sdncProductStrategistUserDetails, STATUS_CODE_CREATED, AUDIT_PRODUCT_TYPE);
+	}
+
+	@Test
+	public void groupNameValidationConjunctions_07() throws Exception {
+		// Normalize the grouping name conjunctions ('of', 'to', 'for', 'as',
+		// 'a', 'an' , 'the') are lower case.
+		productGroupingDefinition.setName(" united states OF americA ");
+		RestResponse createGroupingRest = CategoryRestUtils.createGrouping(productGroupingDefinition,
+				productSubCategoryDefinition, productCategoryDefinition, sdncProductStrategistUserDetails,
+				PRODUCT_COMPONENT_TYPE);
+		assertEquals("Check response code after create product group", STATUS_CODE_CREATED,
+				createGroupingRest.getErrorCode().intValue());
+		productGroupingDefinition.setName("United States of AmericA");
+		productGroupingDefinition.setNormalizedName("united states of america");
+		CategoryValidationUtils.validateCreateGroupResponse(createGroupingRest, productGroupingDefinition);
+		RestResponse getAllCategoriesRest = CategoryRestUtils.getAllCategories(sdncAdminUserDetails,
+				PRODUCT_COMPONENT_TYPE);
+		assertEquals("Check response code after get all categories ", STATUS_CODE_SUCCESS,
+				getAllCategoriesRest.getErrorCode().intValue());
+		CategoryValidationUtils.verifyGroupingExistInGetResponse(getAllCategoriesRest,
+				productCategoryDefinition.getUniqueId(), productSubCategoryDefinition.getUniqueId(),
+				productGroupingDefinition);
+		// Audit validation
+		AuditValidationUtils.groupingAuditSuccess(ADD_GROUPING, productCategoryDefinition, productSubCategoryDefinition,
+				productGroupingDefinition, sdncProductStrategistUserDetails, STATUS_CODE_CREATED, AUDIT_PRODUCT_TYPE);
+	}
+
+	@Test
+	public void groupNameValidationConjunctions_08() throws Exception {
+		// Normalize the grouping name conjunctions ('of', 'to', 'for', 'as',
+		// 'a', 'an' , 'the') are lower case.
+		productGroupingDefinition.setName(" oF united states OF amer ");
+		RestResponse createGroupingRest = CategoryRestUtils.createGrouping(productGroupingDefinition,
+				productSubCategoryDefinition, productCategoryDefinition, sdncProductStrategistUserDetails,
+				PRODUCT_COMPONENT_TYPE);
+		assertEquals("Check response code after create product group", STATUS_CODE_CREATED,
+				createGroupingRest.getErrorCode().intValue());
+		productGroupingDefinition.setName("OF United States of Amer");
+		productGroupingDefinition.setNormalizedName("of united states of amer");
+		CategoryValidationUtils.validateCreateGroupResponse(createGroupingRest, productGroupingDefinition);
+		RestResponse getAllCategoriesRest = CategoryRestUtils.getAllCategories(sdncAdminUserDetails,
+				PRODUCT_COMPONENT_TYPE);
+		assertEquals("Check response code after get all categories ", STATUS_CODE_SUCCESS,
+				getAllCategoriesRest.getErrorCode().intValue());
+		CategoryValidationUtils.verifyGroupingExistInGetResponse(getAllCategoriesRest,
+				productCategoryDefinition.getUniqueId(), productSubCategoryDefinition.getUniqueId(),
+				productGroupingDefinition);
+		// Audit validation
+		AuditValidationUtils.groupingAuditSuccess(ADD_GROUPING, productCategoryDefinition, productSubCategoryDefinition,
+				productGroupingDefinition, sdncProductStrategistUserDetails, STATUS_CODE_CREATED, AUDIT_PRODUCT_TYPE);
+	}
+
+	@Test
+	public void groupNameValidationConjunctions_09() throws Exception {
+		// Normalize the grouping name conjunctions ('of', 'to', 'for', 'as',
+		// 'a', 'an' , 'the') are lower case.
+		productGroupingDefinition.setName(" to Apple TO at&T TOO ");
+		RestResponse createGroupingRest = CategoryRestUtils.createGrouping(productGroupingDefinition,
+				productSubCategoryDefinition, productCategoryDefinition, sdncProductStrategistUserDetails,
+				PRODUCT_COMPONENT_TYPE);
+		assertEquals("Check response code after create product group", STATUS_CODE_CREATED,
+				createGroupingRest.getErrorCode().intValue());
+		productGroupingDefinition.setName("To Apple to At&T TOO");
+		productGroupingDefinition.setNormalizedName("to apple to at&t too");
+		CategoryValidationUtils.validateCreateGroupResponse(createGroupingRest, productGroupingDefinition);
+		RestResponse getAllCategoriesRest = CategoryRestUtils.getAllCategories(sdncAdminUserDetails,
+				PRODUCT_COMPONENT_TYPE);
+		assertEquals("Check response code after get all categories ", STATUS_CODE_SUCCESS,
+				getAllCategoriesRest.getErrorCode().intValue());
+		CategoryValidationUtils.verifyGroupingExistInGetResponse(getAllCategoriesRest,
+				productCategoryDefinition.getUniqueId(), productSubCategoryDefinition.getUniqueId(),
+				productGroupingDefinition);
+		// Audit validation
+		AuditValidationUtils.groupingAuditSuccess(ADD_GROUPING, productCategoryDefinition, productSubCategoryDefinition,
+				productGroupingDefinition, sdncProductStrategistUserDetails, STATUS_CODE_CREATED, AUDIT_PRODUCT_TYPE);
+	}
+
+	@Test
+	public void groupNameValidationConjunctions_10() throws Exception {
+		// Normalize the grouping name conjunctions ('of', 'to', 'for', 'as',
+		// 'a', 'an' , 'the') are lower case.
+		productGroupingDefinition.setName(" eat apple AS you liiikeas ");
+		RestResponse createGroupingRest = CategoryRestUtils.createGrouping(productGroupingDefinition,
+				productSubCategoryDefinition, productCategoryDefinition, sdncProductStrategistUserDetails,
+				PRODUCT_COMPONENT_TYPE);
+		assertEquals("Check response code after create product group", STATUS_CODE_CREATED,
+				createGroupingRest.getErrorCode().intValue());
+		productGroupingDefinition.setName("Eat Apple as You Liiikeas");
+		productGroupingDefinition.setNormalizedName("eat apple as you liiikeas");
+		CategoryValidationUtils.validateCreateGroupResponse(createGroupingRest, productGroupingDefinition);
+		RestResponse getAllCategoriesRest = CategoryRestUtils.getAllCategories(sdncAdminUserDetails,
+				PRODUCT_COMPONENT_TYPE);
+		assertEquals("Check response code after get all categories ", STATUS_CODE_SUCCESS,
+				getAllCategoriesRest.getErrorCode().intValue());
+		CategoryValidationUtils.verifyGroupingExistInGetResponse(getAllCategoriesRest,
+				productCategoryDefinition.getUniqueId(), productSubCategoryDefinition.getUniqueId(),
+				productGroupingDefinition);
+		// Audit validation
+		AuditValidationUtils.groupingAuditSuccess(ADD_GROUPING, productCategoryDefinition, productSubCategoryDefinition,
+				productGroupingDefinition, sdncProductStrategistUserDetails, STATUS_CODE_CREATED, AUDIT_PRODUCT_TYPE);
+	}
+
+	@Test
+	public void groupNameValidationConjunctions_11() throws Exception {
+		// Normalize the grouping name conjunctions ('of', 'to', 'for', 'as',
+		// 'a', 'an' , 'the') are lower case.
+		productGroupingDefinition.setName(" as you may want ");
+		RestResponse createGroupingRest = CategoryRestUtils.createGrouping(productGroupingDefinition,
+				productSubCategoryDefinition, productCategoryDefinition, sdncProductStrategistUserDetails,
+				PRODUCT_COMPONENT_TYPE);
+		assertEquals("Check response code after create product group", STATUS_CODE_CREATED,
+				createGroupingRest.getErrorCode().intValue());
+		productGroupingDefinition.setName("As You May Want");
+		productGroupingDefinition.setNormalizedName("as you may want");
+		CategoryValidationUtils.validateCreateGroupResponse(createGroupingRest, productGroupingDefinition);
+		RestResponse getAllCategoriesRest = CategoryRestUtils.getAllCategories(sdncAdminUserDetails,
+				PRODUCT_COMPONENT_TYPE);
+		assertEquals("Check response code after get all categories ", STATUS_CODE_SUCCESS,
+				getAllCategoriesRest.getErrorCode().intValue());
+		CategoryValidationUtils.verifyGroupingExistInGetResponse(getAllCategoriesRest,
+				productCategoryDefinition.getUniqueId(), productSubCategoryDefinition.getUniqueId(),
+				productGroupingDefinition);
+		// Audit validation
+		AuditValidationUtils.groupingAuditSuccess(ADD_GROUPING, productCategoryDefinition, productSubCategoryDefinition,
+				productGroupingDefinition, sdncProductStrategistUserDetails, STATUS_CODE_CREATED, AUDIT_PRODUCT_TYPE);
+	}
+
+	@Test
+	public void groupNameValidationConjunctions_12() throws Exception {
+		// Normalize the grouping name conjunctions ('of', 'to', 'for', 'as',
+		// 'a', 'an' , 'the') are lower case.
+		productGroupingDefinition.setName(" the bank OF america ");
+		RestResponse createGroupingRest = CategoryRestUtils.createGrouping(productGroupingDefinition,
+				productSubCategoryDefinition, productCategoryDefinition, sdncProductStrategistUserDetails,
+				PRODUCT_COMPONENT_TYPE);
+		assertEquals("Check response code after create product group", STATUS_CODE_CREATED,
+				createGroupingRest.getErrorCode().intValue());
+		productGroupingDefinition.setName("The Bank of America");
+		productGroupingDefinition.setNormalizedName("the bank of america");
+		CategoryValidationUtils.validateCreateGroupResponse(createGroupingRest, productGroupingDefinition);
+		RestResponse getAllCategoriesRest = CategoryRestUtils.getAllCategories(sdncAdminUserDetails,
+				PRODUCT_COMPONENT_TYPE);
+		assertEquals("Check response code after get all categories ", STATUS_CODE_SUCCESS,
+				getAllCategoriesRest.getErrorCode().intValue());
+		CategoryValidationUtils.verifyGroupingExistInGetResponse(getAllCategoriesRest,
+				productCategoryDefinition.getUniqueId(), productSubCategoryDefinition.getUniqueId(),
+				productGroupingDefinition);
+		// Audit validation
+		AuditValidationUtils.groupingAuditSuccess(ADD_GROUPING, productCategoryDefinition, productSubCategoryDefinition,
+				productGroupingDefinition, sdncProductStrategistUserDetails, STATUS_CODE_CREATED, AUDIT_PRODUCT_TYPE);
+	}
+
+	@Test
+	public void groupNameValidationConjunctions_13() throws Exception {
+		// Normalize the grouping name conjunctions ('of', 'to', 'for', 'as',
+		// 'a', 'an' , 'the') are lower case.
+		productGroupingDefinition.setName("  To tel-toto ");
+		RestResponse createGroupingRest = CategoryRestUtils.createGrouping(productGroupingDefinition,
+				productSubCategoryDefinition, productCategoryDefinition, sdncProductStrategistUserDetails,
+				PRODUCT_COMPONENT_TYPE);
+		assertEquals("Check response code after create product group", STATUS_CODE_CREATED,
+				createGroupingRest.getErrorCode().intValue());
+		productGroupingDefinition.setName("To Tel-toto");
+		productGroupingDefinition.setNormalizedName("to tel-toto");
+		CategoryValidationUtils.validateCreateGroupResponse(createGroupingRest, productGroupingDefinition);
+		RestResponse getAllCategoriesRest = CategoryRestUtils.getAllCategories(sdncAdminUserDetails,
+				PRODUCT_COMPONENT_TYPE);
+		assertEquals("Check response code after get all categories ", STATUS_CODE_SUCCESS,
+				getAllCategoriesRest.getErrorCode().intValue());
+		CategoryValidationUtils.verifyGroupingExistInGetResponse(getAllCategoriesRest,
+				productCategoryDefinition.getUniqueId(), productSubCategoryDefinition.getUniqueId(),
+				productGroupingDefinition);
+		// Audit validation
+		AuditValidationUtils.groupingAuditSuccess(ADD_GROUPING, productCategoryDefinition, productSubCategoryDefinition,
+				productGroupingDefinition, sdncProductStrategistUserDetails, STATUS_CODE_CREATED, AUDIT_PRODUCT_TYPE);
+	}
+
+	@Test
+	public void groupNameValidationConjunctions_14() throws Exception {
+		// Normalize the grouping name conjunctions ('of', 'to', 'for', 'as',
+		// 'a', 'an' , 'the') are lower case.
+		productGroupingDefinition.setName("   tel-aviv To   la ");
+		RestResponse createGroupingRest = CategoryRestUtils.createGrouping(productGroupingDefinition,
+				productSubCategoryDefinition, productCategoryDefinition, sdncProductStrategistUserDetails,
+				PRODUCT_COMPONENT_TYPE);
+		assertEquals("Check response code after create product group", STATUS_CODE_CREATED,
+				createGroupingRest.getErrorCode().intValue());
+		productGroupingDefinition.setName("Tel-aviv to La");
+		productGroupingDefinition.setNormalizedName("tel-aviv to la");
+		CategoryValidationUtils.validateCreateGroupResponse(createGroupingRest, productGroupingDefinition);
+		RestResponse getAllCategoriesRest = CategoryRestUtils.getAllCategories(sdncAdminUserDetails,
+				PRODUCT_COMPONENT_TYPE);
+		assertEquals("Check response code after get all categories ", STATUS_CODE_SUCCESS,
+				getAllCategoriesRest.getErrorCode().intValue());
+		CategoryValidationUtils.verifyGroupingExistInGetResponse(getAllCategoriesRest,
+				productCategoryDefinition.getUniqueId(), productSubCategoryDefinition.getUniqueId(),
+				productGroupingDefinition);
+		// Audit validation
+		AuditValidationUtils.groupingAuditSuccess(ADD_GROUPING, productCategoryDefinition, productSubCategoryDefinition,
+				productGroupingDefinition, sdncProductStrategistUserDetails, STATUS_CODE_CREATED, AUDIT_PRODUCT_TYPE);
+	}
+
+	@Test
+	public void createProductGroupHttpCspUserIdIsEmpty() throws Exception {
+		User sdncPS = ElementFactory.getDefaultUser(UserRoleEnum.PRODUCT_STRATEGIST1);
+		sdncPS.setUserId("");
+		RestResponse createGroupingRest = CategoryRestUtils.createGrouping(productGroupingDefinition,
+				productSubCategoryDefinition, productCategoryDefinition, sdncPS, PRODUCT_COMPONENT_TYPE);
+		assertEquals("Check response code after create Consumer", STATUS_CODE_MISSING_INFORMATION,
+				createGroupingRest.getErrorCode().intValue());
+		RestResponse getAllCategoriesRest = CategoryRestUtils.getAllCategories(sdncAdminUserDetails,
+				PRODUCT_COMPONENT_TYPE);
+		assertEquals("Check response code after get all categories ", STATUS_CODE_SUCCESS,
+				getAllCategoriesRest.getErrorCode().intValue());
+		CategoryValidationUtils.verifyGroupingNotExistInGetResponse(getAllCategoriesRest,
+				productCategoryDefinition.getUniqueId(), productSubCategoryDefinition.getUniqueId(),
+				productGroupingDefinition);
+		// Audit validation
+		ErrorInfo errorInfo = ErrorValidationUtils.parseErrorConfigYaml(ActionStatus.MISSING_INFORMATION.name());
+		ExpectedCategoryAudit expectedCatrgoryAuditJavaObject = new ExpectedCategoryAudit();
+		expectedCatrgoryAuditJavaObject.setAction(ADD_GROUPING);
+		expectedCatrgoryAuditJavaObject.setModifier("");
+		expectedCatrgoryAuditJavaObject.setCategoryName(productCategoryDefinition.getUniqueId());
+		expectedCatrgoryAuditJavaObject.setSubCategoryName(productSubCategoryDefinition.getUniqueId());
+		expectedCatrgoryAuditJavaObject.setGroupingName(productGroupingDefinition.getName());
+		expectedCatrgoryAuditJavaObject.setResourceType(AUDIT_PRODUCT_TYPE);
+		expectedCatrgoryAuditJavaObject.setStatus(String.valueOf(STATUS_CODE_MISSING_INFORMATION));
+		expectedCatrgoryAuditJavaObject.setDesc(errorInfo.getAuditDesc());
+		AuditValidationUtils.validateCategoryAudit(expectedCatrgoryAuditJavaObject, ADD_GROUPING);
+	}
+
+	@Test
+	public void createProductGroupHttpCspUserIdIsNull() throws Exception {
+		User sdncPS = ElementFactory.getDefaultUser(UserRoleEnum.PRODUCT_STRATEGIST1);
+		sdncPS.setUserId(null);
+		RestResponse createGroupingRest = CategoryRestUtils.createGrouping(productGroupingDefinition,
+				productSubCategoryDefinition, productCategoryDefinition, sdncPS, PRODUCT_COMPONENT_TYPE);
+		assertEquals("Check response code after create Consumer", STATUS_CODE_MISSING_INFORMATION,
+				createGroupingRest.getErrorCode().intValue());
+		RestResponse getAllCategoriesRest = CategoryRestUtils.getAllCategories(sdncAdminUserDetails,
+				PRODUCT_COMPONENT_TYPE);
+		assertEquals("Check response code after get all categories ", STATUS_CODE_SUCCESS,
+				getAllCategoriesRest.getErrorCode().intValue());
+		CategoryValidationUtils.verifyGroupingNotExistInGetResponse(getAllCategoriesRest,
+				productCategoryDefinition.getUniqueId(), productSubCategoryDefinition.getUniqueId(),
+				productGroupingDefinition);
+		// Audit validation
+		ErrorInfo errorInfo = ErrorValidationUtils.parseErrorConfigYaml(ActionStatus.MISSING_INFORMATION.name());
+		ExpectedCategoryAudit expectedCatrgoryAuditJavaObject = new ExpectedCategoryAudit();
+		expectedCatrgoryAuditJavaObject.setAction(ADD_GROUPING);
+		expectedCatrgoryAuditJavaObject.setModifier("");
+		expectedCatrgoryAuditJavaObject.setCategoryName(productCategoryDefinition.getUniqueId());
+		expectedCatrgoryAuditJavaObject.setSubCategoryName(productSubCategoryDefinition.getUniqueId());
+		expectedCatrgoryAuditJavaObject.setGroupingName(productGroupingDefinition.getName());
+		expectedCatrgoryAuditJavaObject.setResourceType(AUDIT_PRODUCT_TYPE);
+		expectedCatrgoryAuditJavaObject.setStatus(String.valueOf(STATUS_CODE_MISSING_INFORMATION));
+		expectedCatrgoryAuditJavaObject.setDesc(errorInfo.getAuditDesc());
+		AuditValidationUtils.validateCategoryAudit(expectedCatrgoryAuditJavaObject, ADD_GROUPING);
+	}
+
+	////////////////////////////////////////////////
+	///////////////////////////////////////////////
+	@Test
+	public void getProductCategoryHierarchySuccessFlow() throws Exception {
+		throw new SkipException(
+				"Skipping - failed in audit validation expected \"products\" actual result was \"product\" ");
+		// int numOfGrouping = 3;
+		// List<GroupingDefinition> groupingList = new ArrayList<>();
+		// RestResponse restResponse;
+		// GroupingDefinition grouping;
+		// String groupingName = productGroupingDefinition.getName();
+		// for (int i = 0; i < numOfGrouping; i++) {
+		// productGroupingDefinition.setName(groupingName+i);
+		// restResponse =
+		// CategoryRestUtils.createGrouping(productGroupingDefinition,
+		// productSubCategoryDefinition, productCategoryDefinition,
+		// sdncProductStrategistUserDetails, PRODUCT_COMPONENT_TYPE);
+		// grouping = ResponseParser.parseToObject(restResponse.getResponse(),
+		// GroupingDefinition.class);
+		// groupingList.add(grouping);
+		// }
+		// RestResponse getAllCategoriesRest =
+		// CategoryRestUtils.getAllCategories(sdncProductStrategistUserDetails,
+		// PRODUCT_COMPONENT_TYPE);
+		// assertEquals("Check response code after get all categories ",
+		// STATUS_CODE_SUCCESS, getAllCategoriesRest.getErrorCode().intValue());
+		// AuditValidationUtils.GetCategoryHierarchyAuditSuccess(GET_CATEGORY_HIERARCHY,
+		// AUDIT_PRODUCT_TYPE, sdncProductStrategistUserDetails,
+		// STATUS_CODE_SUCCESS);
+		//
+		// for (GroupingDefinition group : groupingList) {
+		// CategoryValidationUtils.verifyGroupingExistInGetResponse(getAllCategoriesRest,
+		// productCategoryDefinition.getUniqueId(),
+		// productSubCategoryDefinition.getUniqueId(), group);
+		// }
+	}
+}
diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/execute/category/SubCategoriesTest.java b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/execute/category/SubCategoriesTest.java
new file mode 100644
index 0000000000..0099e98b01
--- /dev/null
+++ b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/execute/category/SubCategoriesTest.java
@@ -0,0 +1,1894 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * SDC
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.sdc.ci.tests.execute.category;
+
+import org.junit.Rule;
+import org.junit.rules.TestName;
+import org.openecomp.sdc.be.dao.api.ActionStatus;
+import org.openecomp.sdc.be.model.User;
+import org.openecomp.sdc.be.model.category.CategoryDefinition;
+import org.openecomp.sdc.be.model.category.SubCategoryDefinition;
+import org.openecomp.sdc.ci.tests.api.ComponentBaseTest;
+import org.openecomp.sdc.ci.tests.datatypes.enums.ErrorInfo;
+import org.openecomp.sdc.ci.tests.datatypes.enums.UserRoleEnum;
+import org.openecomp.sdc.ci.tests.datatypes.expected.ExpectedCategoryAudit;
+import org.openecomp.sdc.ci.tests.datatypes.http.RestResponse;
+import org.openecomp.sdc.ci.tests.utils.DbUtils;
+import org.openecomp.sdc.ci.tests.utils.general.ElementFactory;
+import org.openecomp.sdc.ci.tests.utils.rest.CategoryRestUtils;
+import org.openecomp.sdc.ci.tests.utils.rest.ResponseParser;
+import org.openecomp.sdc.ci.tests.utils.validation.AuditValidationUtils;
+import org.openecomp.sdc.ci.tests.utils.validation.CategoryValidationUtils;
+import org.openecomp.sdc.ci.tests.utils.validation.ErrorValidationUtils;
+import org.testng.annotations.BeforeMethod;
+import org.testng.annotations.Test;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import static org.openecomp.sdc.ci.tests.utils.rest.BaseRestUtils.*;
+import static org.testng.AssertJUnit.assertEquals;
+
+public class SubCategoriesTest extends ComponentBaseTest {
+
+	protected static final String ADD_SUB_CATEGORY = "AddSubCategory";
+	protected static final String CATEGORY = "category";
+	protected static final String SUB_CATEGORY = "sub-category";
+
+	protected static final String AUDIT_SERVICE_TYPE = "Service";
+	protected static final String AUDIT_RESOURCE_TYPE = "Resource";
+	protected static final String AUDIT_PRODUCT_TYPE = "Product";
+	protected static final String GET_CATEGORY_HIERARCHY = "GetCategoryHierarchy";
+	protected static User sdncAdminUserDetails = ElementFactory.getDefaultUser(UserRoleEnum.ADMIN);
+	protected static User sdncAdminUserDetails1 = ElementFactory.getDefaultUser(UserRoleEnum.ADMIN);
+	protected static User sdncDesignerUserDetails = ElementFactory.getDefaultUser(UserRoleEnum.DESIGNER);
+	protected static User sdncTesterUserDetails = ElementFactory.getDefaultUser(UserRoleEnum.TESTER);
+	protected static User sdncGovernorUserDetails = ElementFactory.getDefaultUser(UserRoleEnum.GOVERNOR);
+	protected static User sdncOpsUserDetails = ElementFactory.getDefaultUser(UserRoleEnum.OPS);
+	protected static User sdncProductManagerUserDetails = ElementFactory.getDefaultUser(UserRoleEnum.PRODUCT_MANAGER1);
+	protected static User sdncProductStrategistUserDetails = ElementFactory
+			.getDefaultUser(UserRoleEnum.PRODUCT_STRATEGIST1);
+
+	@Rule
+	public static TestName name = new TestName();
+
+	private CategoryDefinition resourceCategoryDefinition;
+	private CategoryDefinition resourceCategoryDefinition1;
+	private CategoryDefinition serviceCategoryDefinition;
+	private CategoryDefinition productCategoryDefinition;
+	private CategoryDefinition productCategoryDefinition1;
+	private CategoryDefinition resourceCategoryDefinition100;
+	private CategoryDefinition productCategoryDefinition200;
+
+	private SubCategoryDefinition resourceSubCategoryDefinition;
+	private SubCategoryDefinition resourceSubCategoryDefinition1;
+	private SubCategoryDefinition serviceSubCategoryDefinition;
+	private SubCategoryDefinition productSubCategoryDefinition;
+	private SubCategoryDefinition productSubCategoryDefinition1;
+
+	@BeforeMethod
+	public void init() throws Exception {
+
+		// Category setup
+		resourceCategoryDefinition = new CategoryDefinition();
+		resourceCategoryDefinition1 = new CategoryDefinition();
+		serviceCategoryDefinition = new CategoryDefinition();
+		productCategoryDefinition = new CategoryDefinition();
+		productCategoryDefinition1 = new CategoryDefinition();
+		resourceCategoryDefinition100 = new CategoryDefinition(); // for
+																	// negative
+																	// tests
+		productCategoryDefinition200 = new CategoryDefinition(); // for negative
+																	// tests
+
+		resourceCategoryDefinition.setName("Category1");
+		resourceCategoryDefinition1.setName("Category2");
+		serviceCategoryDefinition.setName("Category1");
+		productCategoryDefinition.setName("Category2");
+		productCategoryDefinition1.setName("Category3");
+		resourceCategoryDefinition100.setName("Category100");
+		productCategoryDefinition200.setName("Category100");
+
+		// Subcategory setup
+		resourceSubCategoryDefinition = new SubCategoryDefinition();
+		resourceSubCategoryDefinition1 = new SubCategoryDefinition();
+		serviceSubCategoryDefinition = new SubCategoryDefinition();
+		productSubCategoryDefinition = new SubCategoryDefinition();
+		productSubCategoryDefinition1 = new SubCategoryDefinition();
+
+		resourceSubCategoryDefinition.setName("Resource-subcat");
+		// Service sub - for negative testing since it's not allowed
+		serviceSubCategoryDefinition.setName("Service-subcat");
+		productSubCategoryDefinition.setName("Product-subcat");
+
+		// Init resource category
+		RestResponse createCategory = CategoryRestUtils.createCategory(resourceCategoryDefinition, sdncAdminUserDetails,
+				RESOURCE_COMPONENT_TYPE);
+		assertEquals("Check response code after create category", STATUS_CODE_CREATED,
+				createCategory.getErrorCode().intValue());
+		CategoryDefinition category = ResponseParser.parseToObject(createCategory.getResponse(),
+				CategoryDefinition.class);
+		assertEquals("Check category name after creating category ", resourceCategoryDefinition.getName(),
+				category.getName());
+		resourceCategoryDefinition = category;
+
+		// Init resource category1
+		createCategory = CategoryRestUtils.createCategory(resourceCategoryDefinition1, sdncAdminUserDetails,
+				RESOURCE_COMPONENT_TYPE);
+		assertEquals("Check response code after create category", STATUS_CODE_CREATED,
+				createCategory.getErrorCode().intValue());
+		category = ResponseParser.parseToObject(createCategory.getResponse(), CategoryDefinition.class);
+		assertEquals("Check category name after creating category ", resourceCategoryDefinition1.getName(),
+				category.getName());
+		resourceCategoryDefinition1 = category;
+
+		// Init service category
+		createCategory = CategoryRestUtils.createCategory(serviceCategoryDefinition, sdncAdminUserDetails,
+				SERVICE_COMPONENT_TYPE);
+		assertEquals("Check response code after create category", STATUS_CODE_CREATED,
+				createCategory.getErrorCode().intValue());
+		category = ResponseParser.parseToObject(createCategory.getResponse(), CategoryDefinition.class);
+		assertEquals("Check category name after creating category ", serviceCategoryDefinition.getName(),
+				category.getName());
+		serviceCategoryDefinition = category;
+
+		// Init product category
+		createCategory = CategoryRestUtils.createCategory(productCategoryDefinition, sdncProductStrategistUserDetails,
+				PRODUCT_COMPONENT_TYPE);
+		assertEquals("Check response code after create category", STATUS_CODE_CREATED,
+				createCategory.getErrorCode().intValue());
+		category = ResponseParser.parseToObject(createCategory.getResponse(), CategoryDefinition.class);
+		assertEquals("Check category name after creating category ", productCategoryDefinition.getName(),
+				category.getName());
+		productCategoryDefinition = category;
+
+		// Init product category1
+		createCategory = CategoryRestUtils.createCategory(productCategoryDefinition1, sdncProductStrategistUserDetails,
+				PRODUCT_COMPONENT_TYPE);
+		assertEquals("Check response code after create category", STATUS_CODE_CREATED,
+				createCategory.getErrorCode().intValue());
+		category = ResponseParser.parseToObject(createCategory.getResponse(), CategoryDefinition.class);
+		assertEquals("Check category name after creating category ", productCategoryDefinition1.getName(),
+				category.getName());
+		productCategoryDefinition1 = category;
+
+	}
+
+	@Test
+	public void createResourceSubCategorySuccess() throws Exception {
+		createSubCategorySuccess(resourceCategoryDefinition, resourceSubCategoryDefinition, sdncAdminUserDetails,
+				RESOURCE_COMPONENT_TYPE, AUDIT_RESOURCE_TYPE);
+	}
+
+	@Test
+	public void createProductSubCategorySuccess() throws Exception {
+		createSubCategorySuccess(productCategoryDefinition, productSubCategoryDefinition,
+				sdncProductStrategistUserDetails, PRODUCT_COMPONENT_TYPE, AUDIT_PRODUCT_TYPE);
+	}
+
+	@Test
+	public void createProductSubCategoryTwoCategoriesCaseInsensitive() throws Exception {
+		String componentType = PRODUCT_COMPONENT_TYPE;
+		String auditType = AUDIT_PRODUCT_TYPE;
+		User user = sdncProductStrategistUserDetails;
+		// Create product sub Category2-->Product-subcat
+		createSubCategorySuccess(productCategoryDefinition, productSubCategoryDefinition, user, componentType,
+				auditType);
+		DbUtils.deleteFromEsDbByPattern("_all");
+
+		// Create product sub Category3-->PRoDUCT-SUBcat
+		// Should be created Category3-->Product-subcat
+		productSubCategoryDefinition1.setName("PRoDUCT-SUBcat");
+		RestResponse createSubCategoryRest = CategoryRestUtils.createSubCategory(productSubCategoryDefinition1,
+				productCategoryDefinition1, user, componentType);
+		assertEquals("Check response code after create Sub category", STATUS_CODE_CREATED,
+				createSubCategoryRest.getErrorCode().intValue());
+		RestResponse getAllCategoriesRest = CategoryRestUtils.getAllCategories(user, componentType);
+		assertEquals("Check response code after get all categories ", STATUS_CODE_SUCCESS,
+				getAllCategoriesRest.getErrorCode().intValue());
+		productSubCategoryDefinition1.setName(productSubCategoryDefinition.getName());
+		CategoryValidationUtils.verifySubCategoryExistInGetResponse(getAllCategoriesRest,
+				productCategoryDefinition1.getUniqueId(), productSubCategoryDefinition1);
+		AuditValidationUtils.subCategoryAuditSuccess(ADD_SUB_CATEGORY, productCategoryDefinition1,
+				productSubCategoryDefinition1, user, STATUS_CODE_CREATED, auditType);
+	}
+
+	// Benny
+	@Test
+	public void createResourceSubCategoryAlreadyExistInDifferentResourceCategory() throws Exception {
+		RestResponse createSubCategoryRest = CategoryRestUtils.createSubCategory(resourceSubCategoryDefinition,
+				resourceCategoryDefinition, sdncAdminUserDetails, RESOURCE_COMPONENT_TYPE);
+		assertEquals("Check response code after create Sub category", STATUS_CODE_CREATED,
+				createSubCategoryRest.getErrorCode().intValue());
+		RestResponse getAllCategoriesRest = CategoryRestUtils.getAllCategories(sdncAdminUserDetails,
+				RESOURCE_COMPONENT_TYPE);
+		assertEquals("Check response code after get all categories ", STATUS_CODE_SUCCESS,
+				getAllCategoriesRest.getErrorCode().intValue());
+		CategoryValidationUtils.verifySubCategoryExistInGetResponse(getAllCategoriesRest,
+				resourceCategoryDefinition.getUniqueId(), resourceSubCategoryDefinition);
+		// Audit validation
+		AuditValidationUtils.subCategoryAuditSuccess(ADD_SUB_CATEGORY, resourceCategoryDefinition,
+				resourceSubCategoryDefinition, sdncAdminUserDetails, STATUS_CODE_CREATED, AUDIT_RESOURCE_TYPE);
+		DbUtils.deleteFromEsDbByPattern("_all");
+		resourceSubCategoryDefinition1.setName("ResourcE-subCat");
+		createSubCategoryRest = CategoryRestUtils.createSubCategory(resourceSubCategoryDefinition1,
+				resourceCategoryDefinition1, sdncAdminUserDetails, RESOURCE_COMPONENT_TYPE);
+		assertEquals("Check response code after create Sub category", STATUS_CODE_CREATED,
+				createSubCategoryRest.getErrorCode().intValue());
+		getAllCategoriesRest = CategoryRestUtils.getAllCategories(sdncAdminUserDetails, RESOURCE_COMPONENT_TYPE);
+		assertEquals("Check response code after get all categories ", STATUS_CODE_SUCCESS,
+				getAllCategoriesRest.getErrorCode().intValue());
+		resourceSubCategoryDefinition1.setName(resourceSubCategoryDefinition.getName());
+		CategoryValidationUtils.verifySubCategoryExistInGetResponse(getAllCategoriesRest,
+				resourceCategoryDefinition1.getUniqueId(), resourceSubCategoryDefinition1); // also
+																							// set
+																							// catalog
+																							// uniqeId
+		AuditValidationUtils.subCategoryAuditSuccess(ADD_SUB_CATEGORY, resourceCategoryDefinition1,
+				resourceSubCategoryDefinition1, sdncAdminUserDetails, STATUS_CODE_CREATED, AUDIT_RESOURCE_TYPE);
+	}
+
+	@Test
+	public void createProductSubCategoryAlreadyExistInDifferentProductCategory() throws Exception {
+		RestResponse createSubCategoryRest = CategoryRestUtils.createSubCategory(productSubCategoryDefinition,
+				productCategoryDefinition, sdncProductStrategistUserDetails, PRODUCT_COMPONENT_TYPE);
+		assertEquals("Check response code after create Sub category", STATUS_CODE_CREATED,
+				createSubCategoryRest.getErrorCode().intValue());
+		RestResponse getAllCategoriesRest = CategoryRestUtils.getAllCategories(sdncAdminUserDetails,
+				PRODUCT_COMPONENT_TYPE);
+		assertEquals("Check response code after get all categories ", STATUS_CODE_SUCCESS,
+				getAllCategoriesRest.getErrorCode().intValue());
+		CategoryValidationUtils.verifySubCategoryExistInGetResponse(getAllCategoriesRest,
+				productCategoryDefinition.getUniqueId(), productSubCategoryDefinition);
+		// Audit validation
+		AuditValidationUtils.subCategoryAuditSuccess(ADD_SUB_CATEGORY, productCategoryDefinition,
+				productSubCategoryDefinition, sdncProductStrategistUserDetails, STATUS_CODE_CREATED,
+				AUDIT_PRODUCT_TYPE);
+		DbUtils.deleteFromEsDbByPattern("_all");
+		productSubCategoryDefinition1.setName("PRoDUCT-SUBcat");
+		createSubCategoryRest = CategoryRestUtils.createSubCategory(productSubCategoryDefinition1,
+				productCategoryDefinition1, sdncProductStrategistUserDetails, PRODUCT_COMPONENT_TYPE);
+		assertEquals("Check response code after create Sub category", STATUS_CODE_CREATED,
+				createSubCategoryRest.getErrorCode().intValue());
+		getAllCategoriesRest = CategoryRestUtils.getAllCategories(sdncAdminUserDetails, PRODUCT_COMPONENT_TYPE);
+		assertEquals("Check response code after get all categories ", STATUS_CODE_SUCCESS,
+				getAllCategoriesRest.getErrorCode().intValue());
+		productSubCategoryDefinition1.setName(productSubCategoryDefinition.getName());
+		CategoryValidationUtils.verifySubCategoryExistInGetResponse(getAllCategoriesRest,
+				productCategoryDefinition1.getUniqueId(), productSubCategoryDefinition1); // also
+																							// set
+																							// catalog
+																							// uniqeId
+		AuditValidationUtils.subCategoryAuditSuccess(ADD_SUB_CATEGORY, productCategoryDefinition1,
+				productSubCategoryDefinition1, sdncProductStrategistUserDetails, STATUS_CODE_CREATED,
+				AUDIT_PRODUCT_TYPE);
+	}
+
+	@Test
+	public void createResourceSubCategoryAlreadyExistInCategory() throws Exception {
+		RestResponse createSubCategoryRest = CategoryRestUtils.createSubCategory(resourceSubCategoryDefinition,
+				resourceCategoryDefinition, sdncAdminUserDetails, RESOURCE_COMPONENT_TYPE);
+		assertEquals("Check response code after create Sub category", STATUS_CODE_CREATED,
+				createSubCategoryRest.getErrorCode().intValue());
+		RestResponse getAllCategoriesRest = CategoryRestUtils.getAllCategories(sdncAdminUserDetails,
+				RESOURCE_COMPONENT_TYPE);
+		assertEquals("Check response code after get all categories ", STATUS_CODE_SUCCESS,
+				getAllCategoriesRest.getErrorCode().intValue());
+		CategoryValidationUtils.verifySubCategoryExistInGetResponse(getAllCategoriesRest,
+				resourceCategoryDefinition.getUniqueId(), resourceSubCategoryDefinition);
+		// Audit validation
+		AuditValidationUtils.subCategoryAuditSuccess(ADD_SUB_CATEGORY, resourceCategoryDefinition,
+				resourceSubCategoryDefinition, sdncAdminUserDetails, STATUS_CODE_CREATED, AUDIT_RESOURCE_TYPE);
+		DbUtils.deleteFromEsDbByPattern("_all");
+		resourceSubCategoryDefinition1.setName("ResourcE-subCat");
+		createSubCategoryRest = CategoryRestUtils.createSubCategory(resourceSubCategoryDefinition1,
+				resourceCategoryDefinition, sdncAdminUserDetails, RESOURCE_COMPONENT_TYPE);
+		assertEquals("Check response code after create Sub category", STATUS_CODE_ALREADY_EXISTS,
+				createSubCategoryRest.getErrorCode().intValue());
+		getAllCategoriesRest = CategoryRestUtils.getAllCategories(sdncAdminUserDetails, RESOURCE_COMPONENT_TYPE);
+		assertEquals("Check response code after get all categories ", STATUS_CODE_SUCCESS,
+				getAllCategoriesRest.getErrorCode().intValue());
+		CategoryValidationUtils.verifySubCategoryExistInGetResponse(getAllCategoriesRest,
+				resourceCategoryDefinition.getUniqueId(), resourceSubCategoryDefinition);
+		AuditValidationUtils.subCategoryAuditFailure(ADD_SUB_CATEGORY, resourceCategoryDefinition,
+				resourceSubCategoryDefinition1, sdncAdminUserDetails,
+				ActionStatus.COMPONENT_SUB_CATEGORY_EXISTS_FOR_CATEGORY, STATUS_CODE_ALREADY_EXISTS,
+				AUDIT_RESOURCE_TYPE, AUDIT_RESOURCE_TYPE, resourceSubCategoryDefinition1.getName(),
+				resourceCategoryDefinition.getName());
+	}
+
+	@Test
+	public void createProductSubCategoryAlreadyExistInCategory() throws Exception {
+		RestResponse createSubCategoryRest = CategoryRestUtils.createSubCategory(productSubCategoryDefinition,
+				productCategoryDefinition, sdncProductStrategistUserDetails, PRODUCT_COMPONENT_TYPE);
+		assertEquals("Check response code after create Sub category", STATUS_CODE_CREATED,
+				createSubCategoryRest.getErrorCode().intValue());
+		RestResponse getAllCategoriesRest = CategoryRestUtils.getAllCategories(sdncAdminUserDetails,
+				PRODUCT_COMPONENT_TYPE);
+		assertEquals("Check response code after get all categories ", STATUS_CODE_SUCCESS,
+				getAllCategoriesRest.getErrorCode().intValue());
+		CategoryValidationUtils.verifySubCategoryExistInGetResponse(getAllCategoriesRest,
+				productCategoryDefinition.getUniqueId(), productSubCategoryDefinition);
+		// Audit validation
+		AuditValidationUtils.subCategoryAuditSuccess(ADD_SUB_CATEGORY, productCategoryDefinition,
+				productSubCategoryDefinition, sdncProductStrategistUserDetails, STATUS_CODE_CREATED,
+				AUDIT_PRODUCT_TYPE);
+		DbUtils.deleteFromEsDbByPattern("_all");
+		productSubCategoryDefinition1.setName("ProducT-subCat");
+		createSubCategoryRest = CategoryRestUtils.createSubCategory(productSubCategoryDefinition1,
+				productCategoryDefinition, sdncProductStrategistUserDetails, PRODUCT_COMPONENT_TYPE);
+		assertEquals("Check response code after create Sub category", STATUS_CODE_ALREADY_EXISTS,
+				createSubCategoryRest.getErrorCode().intValue());
+		getAllCategoriesRest = CategoryRestUtils.getAllCategories(sdncAdminUserDetails, PRODUCT_COMPONENT_TYPE);
+		assertEquals("Check response code after get all categories ", STATUS_CODE_SUCCESS,
+				getAllCategoriesRest.getErrorCode().intValue());
+		CategoryValidationUtils.verifySubCategoryExistInGetResponse(getAllCategoriesRest,
+				productCategoryDefinition.getUniqueId(), productSubCategoryDefinition);
+		AuditValidationUtils.subCategoryAuditFailure(ADD_SUB_CATEGORY, productCategoryDefinition,
+				productSubCategoryDefinition1, sdncProductStrategistUserDetails,
+				ActionStatus.COMPONENT_SUB_CATEGORY_EXISTS_FOR_CATEGORY, STATUS_CODE_ALREADY_EXISTS, AUDIT_PRODUCT_TYPE,
+				AUDIT_PRODUCT_TYPE, productSubCategoryDefinition1.getName(), productCategoryDefinition.getName());
+	}
+
+	@Test
+	public void addSameNormalizedSubCategoryNameForRecourceAndProductCategory() throws Exception {
+		// add sub-categoty name "SubCaT" to resource category
+		// add sub-categoty name "SUbcAt" to product category
+		resourceSubCategoryDefinition.setName("SubCaT"); // normalized 'subcat'
+		productSubCategoryDefinition.setName("SUbcAt"); // normalized 'subcat'
+		RestResponse createSubCategoryRest = CategoryRestUtils.createSubCategory(resourceSubCategoryDefinition,
+				resourceCategoryDefinition, sdncAdminUserDetails, RESOURCE_COMPONENT_TYPE);
+		assertEquals("Check response code after create Sub category", STATUS_CODE_CREATED,
+				createSubCategoryRest.getErrorCode().intValue());
+		// Audit validation
+		AuditValidationUtils.subCategoryAuditSuccess(ADD_SUB_CATEGORY, resourceCategoryDefinition,
+				resourceSubCategoryDefinition, sdncAdminUserDetails, STATUS_CODE_CREATED, AUDIT_RESOURCE_TYPE);
+		RestResponse getAllCategoriesRest = CategoryRestUtils.getAllCategories(sdncAdminUserDetails,
+				RESOURCE_COMPONENT_TYPE);
+		assertEquals("Check response code after get all categories ", STATUS_CODE_SUCCESS,
+				getAllCategoriesRest.getErrorCode().intValue());
+		CategoryValidationUtils.verifySubCategoryExistInGetResponse(getAllCategoriesRest,
+				resourceCategoryDefinition.getUniqueId(), resourceSubCategoryDefinition);
+
+		DbUtils.deleteFromEsDbByPattern("_all");
+		createSubCategoryRest = CategoryRestUtils.createSubCategory(productSubCategoryDefinition,
+				productCategoryDefinition, sdncProductStrategistUserDetails, PRODUCT_COMPONENT_TYPE);
+		assertEquals("Check response code after create Sub category", STATUS_CODE_CREATED,
+				createSubCategoryRest.getErrorCode().intValue());
+		getAllCategoriesRest = CategoryRestUtils.getAllCategories(sdncAdminUserDetails, PRODUCT_COMPONENT_TYPE);
+		assertEquals("Check response code after get all categories ", STATUS_CODE_SUCCESS,
+				getAllCategoriesRest.getErrorCode().intValue());
+		CategoryValidationUtils.verifySubCategoryExistInGetResponse(getAllCategoriesRest,
+				productCategoryDefinition.getUniqueId(), productSubCategoryDefinition);
+		// Audit validation
+		AuditValidationUtils.subCategoryAuditSuccess(ADD_SUB_CATEGORY, productCategoryDefinition,
+				productSubCategoryDefinition, sdncProductStrategistUserDetails, STATUS_CODE_CREATED,
+				AUDIT_PRODUCT_TYPE);
+	}
+
+	@Test
+	public void createResourceSubCategoryByNonAdminUser() throws Exception {
+		RestResponse createSubCategoryRest = CategoryRestUtils.createSubCategory(resourceSubCategoryDefinition,
+				resourceCategoryDefinition, sdncTesterUserDetails, RESOURCE_COMPONENT_TYPE);
+		assertEquals("Check response code after create Sub category", STATUS_CODE_RESTRICTED_OPERATION,
+				createSubCategoryRest.getErrorCode().intValue());
+		RestResponse getAllCategoriesRest = CategoryRestUtils.getAllCategories(sdncAdminUserDetails,
+				RESOURCE_COMPONENT_TYPE);
+		assertEquals("Check response code after get all categories ", STATUS_CODE_SUCCESS,
+				getAllCategoriesRest.getErrorCode().intValue());
+		CategoryValidationUtils.verifySubCategoryNotExistsInGetResponse(getAllCategoriesRest,
+				resourceCategoryDefinition.getUniqueId(), resourceSubCategoryDefinition);
+		// Audit validation
+		resourceCategoryDefinition.setName(resourceCategoryDefinition.getUniqueId());
+		AuditValidationUtils.subCategoryAuditFailure(ADD_SUB_CATEGORY, resourceCategoryDefinition,
+				resourceSubCategoryDefinition, sdncTesterUserDetails, ActionStatus.RESTRICTED_OPERATION,
+				STATUS_CODE_RESTRICTED_OPERATION, AUDIT_RESOURCE_TYPE);
+	}
+
+	@Test
+	public void createResourceSubCategoryByProducStrategistUser() throws Exception {
+		RestResponse createSubCategoryRest = CategoryRestUtils.createSubCategory(resourceSubCategoryDefinition,
+				resourceCategoryDefinition, sdncProductStrategistUserDetails, RESOURCE_COMPONENT_TYPE);
+		assertEquals("Check response code after create Sub category", STATUS_CODE_RESTRICTED_OPERATION,
+				createSubCategoryRest.getErrorCode().intValue());
+		RestResponse getAllCategoriesRest = CategoryRestUtils.getAllCategories(sdncAdminUserDetails,
+				RESOURCE_COMPONENT_TYPE);
+		assertEquals("Check response code after get all categories ", STATUS_CODE_SUCCESS,
+				getAllCategoriesRest.getErrorCode().intValue());
+		CategoryValidationUtils.verifySubCategoryNotExistsInGetResponse(getAllCategoriesRest,
+				resourceCategoryDefinition.getUniqueId(), resourceSubCategoryDefinition);
+		// Audit validation
+		resourceCategoryDefinition.setName(resourceCategoryDefinition.getUniqueId());
+		AuditValidationUtils.subCategoryAuditFailure(ADD_SUB_CATEGORY, resourceCategoryDefinition,
+				resourceSubCategoryDefinition, sdncProductStrategistUserDetails, ActionStatus.RESTRICTED_OPERATION,
+				STATUS_CODE_RESTRICTED_OPERATION, AUDIT_RESOURCE_TYPE);
+	}
+
+	@Test
+	public void createProductSubCategoryByNonProducStrategistUser() throws Exception {
+		RestResponse createSubCategoryRest = CategoryRestUtils.createSubCategory(productSubCategoryDefinition,
+				productCategoryDefinition, sdncDesignerUserDetails, PRODUCT_COMPONENT_TYPE);
+		assertEquals("Check response code after create Sub category", STATUS_CODE_RESTRICTED_OPERATION,
+				createSubCategoryRest.getErrorCode().intValue());
+		RestResponse getAllCategoriesRest = CategoryRestUtils.getAllCategories(sdncAdminUserDetails,
+				PRODUCT_COMPONENT_TYPE);
+		assertEquals("Check response code after get all categories ", STATUS_CODE_SUCCESS,
+				getAllCategoriesRest.getErrorCode().intValue());
+		CategoryValidationUtils.verifySubCategoryNotExistsInGetResponse(getAllCategoriesRest,
+				productCategoryDefinition.getUniqueId(), productSubCategoryDefinition);
+		// Audit validation
+		productCategoryDefinition.setName(productCategoryDefinition.getUniqueId());
+		AuditValidationUtils.subCategoryAuditFailure(ADD_SUB_CATEGORY, productCategoryDefinition,
+				productSubCategoryDefinition, sdncDesignerUserDetails, ActionStatus.RESTRICTED_OPERATION,
+				STATUS_CODE_RESTRICTED_OPERATION, AUDIT_PRODUCT_TYPE);
+	}
+
+	@Test
+	public void createProductSubCategoryByAdminUser() throws Exception {
+		RestResponse createSubCategoryRest = CategoryRestUtils.createSubCategory(productSubCategoryDefinition,
+				productCategoryDefinition, sdncAdminUserDetails, PRODUCT_COMPONENT_TYPE);
+		assertEquals("Check response code after create Sub category", STATUS_CODE_RESTRICTED_OPERATION,
+				createSubCategoryRest.getErrorCode().intValue());
+		RestResponse getAllCategoriesRest = CategoryRestUtils.getAllCategories(sdncAdminUserDetails,
+				PRODUCT_COMPONENT_TYPE);
+		assertEquals("Check response code after get all categories ", STATUS_CODE_SUCCESS,
+				getAllCategoriesRest.getErrorCode().intValue());
+		CategoryValidationUtils.verifySubCategoryNotExistsInGetResponse(getAllCategoriesRest,
+				productCategoryDefinition.getUniqueId(), productSubCategoryDefinition);
+		// Audit validation
+		productCategoryDefinition.setName(productCategoryDefinition.getUniqueId());
+		AuditValidationUtils.subCategoryAuditFailure(ADD_SUB_CATEGORY, productCategoryDefinition,
+				productSubCategoryDefinition, sdncAdminUserDetails, ActionStatus.RESTRICTED_OPERATION,
+				STATUS_CODE_RESTRICTED_OPERATION, AUDIT_PRODUCT_TYPE);
+	}
+
+	// @Ignore("DE176245")
+	@Test
+	public void createResourceSubCategoryForNonExistingComponentType() throws Exception {
+		String nonSupportedComponentType = "NonExistingComponentType"; // instead
+																		// resource/product
+		RestResponse createSubCategoryRest = CategoryRestUtils.createSubCategory(resourceSubCategoryDefinition,
+				resourceCategoryDefinition, sdncAdminUserDetails, nonSupportedComponentType);
+		assertEquals("Check response code after create Sub category", STATUS_CODE_INVALID_CONTENT,
+				createSubCategoryRest.getErrorCode().intValue());
+		RestResponse getAllCategoriesRest = CategoryRestUtils.getAllCategories(sdncAdminUserDetails,
+				RESOURCE_COMPONENT_TYPE);
+		assertEquals("Check response code after get all categories ", STATUS_CODE_SUCCESS,
+				getAllCategoriesRest.getErrorCode().intValue());
+		CategoryValidationUtils.verifySubCategoryNotExistsInGetResponse(getAllCategoriesRest,
+				resourceCategoryDefinition.getUniqueId(), resourceSubCategoryDefinition);
+		// Audit validation
+		resourceCategoryDefinition.setName(resourceCategoryDefinition.getUniqueId());
+		AuditValidationUtils.subCategoryAuditFailure(ADD_SUB_CATEGORY, resourceCategoryDefinition,
+				resourceSubCategoryDefinition, sdncAdminUserDetails, ActionStatus.INVALID_CONTENT,
+				STATUS_CODE_INVALID_CONTENT, nonSupportedComponentType);
+	}
+
+	// @Ignore("DE176245")
+	@Test
+	public void createProductSubCategoryForNonExistingComponentType() throws Exception {
+		String nonSupportedComponentType = "NonExistingComponentType"; // instead
+																		// resource/product
+		RestResponse createSubCategoryRest = CategoryRestUtils.createSubCategory(productSubCategoryDefinition,
+				productCategoryDefinition, sdncProductStrategistUserDetails, nonSupportedComponentType);
+		assertEquals("Check response code after create Sub category", STATUS_CODE_INVALID_CONTENT,
+				createSubCategoryRest.getErrorCode().intValue());
+		RestResponse getAllCategoriesRest = CategoryRestUtils.getAllCategories(sdncAdminUserDetails,
+				PRODUCT_COMPONENT_TYPE);
+		assertEquals("Check response code after get all categories ", STATUS_CODE_SUCCESS,
+				getAllCategoriesRest.getErrorCode().intValue());
+		CategoryValidationUtils.verifySubCategoryNotExistsInGetResponse(getAllCategoriesRest,
+				productCategoryDefinition.getUniqueId(), productSubCategoryDefinition);
+		// Audit validation
+		productCategoryDefinition.setName(productCategoryDefinition.getUniqueId());
+		AuditValidationUtils.subCategoryAuditFailure(ADD_SUB_CATEGORY, productCategoryDefinition,
+				productSubCategoryDefinition, sdncProductStrategistUserDetails, ActionStatus.INVALID_CONTENT,
+				STATUS_CODE_INVALID_CONTENT, nonSupportedComponentType);
+	}
+
+	@Test
+	public void createServiceSubCategoryByAdmin() throws Exception {
+		// Service doesn't have sub-category
+		RestResponse createSubCategoryRest = CategoryRestUtils.createSubCategory(resourceSubCategoryDefinition,
+				resourceCategoryDefinition, sdncAdminUserDetails, SERVICE_COMPONENT_TYPE);
+		assertEquals("Check response code after create Sub category", STATUS_CODE_INVALID_CONTENT,
+				createSubCategoryRest.getErrorCode().intValue());
+		RestResponse getAllCategoriesRest = CategoryRestUtils.getAllCategories(sdncAdminUserDetails,
+				RESOURCE_COMPONENT_TYPE);
+		assertEquals("Check response code after get all categories ", STATUS_CODE_SUCCESS,
+				getAllCategoriesRest.getErrorCode().intValue());
+		CategoryValidationUtils.verifySubCategoryNotExistsInGetResponse(getAllCategoriesRest,
+				resourceCategoryDefinition.getUniqueId(), resourceSubCategoryDefinition);
+		// Audit validation
+		resourceCategoryDefinition.setName(resourceCategoryDefinition.getUniqueId());
+		AuditValidationUtils.subCategoryAuditFailure(ADD_SUB_CATEGORY, resourceCategoryDefinition,
+				resourceSubCategoryDefinition, sdncAdminUserDetails, ActionStatus.INVALID_CONTENT,
+				STATUS_CODE_INVALID_CONTENT, AUDIT_SERVICE_TYPE);
+	}
+
+	@Test
+	public void createServiceSubCategoryByProductStrategist() throws Exception {
+		// Service doesn't have sub-category
+		RestResponse createSubCategoryRest = CategoryRestUtils.createSubCategory(productSubCategoryDefinition,
+				productCategoryDefinition, sdncProductStrategistUserDetails, SERVICE_COMPONENT_TYPE);
+		assertEquals("Check response code after create Sub category", STATUS_CODE_INVALID_CONTENT,
+				createSubCategoryRest.getErrorCode().intValue());
+		RestResponse getAllCategoriesRest = CategoryRestUtils.getAllCategories(sdncAdminUserDetails,
+				PRODUCT_COMPONENT_TYPE);
+		assertEquals("Check response code after get all categories ", STATUS_CODE_SUCCESS,
+				getAllCategoriesRest.getErrorCode().intValue());
+		CategoryValidationUtils.verifySubCategoryNotExistsInGetResponse(getAllCategoriesRest,
+				productCategoryDefinition.getUniqueId(), productSubCategoryDefinition);
+		// Audit validation
+		productCategoryDefinition.setName(productCategoryDefinition.getUniqueId());
+		AuditValidationUtils.subCategoryAuditFailure(ADD_SUB_CATEGORY, productCategoryDefinition,
+				productSubCategoryDefinition, sdncProductStrategistUserDetails, ActionStatus.INVALID_CONTENT,
+				STATUS_CODE_INVALID_CONTENT, AUDIT_SERVICE_TYPE);
+	}
+
+	@Test
+	public void createResourceSubCategoryForNonExistingCategory() throws Exception {
+		resourceCategoryDefinition100.setUniqueId(resourceCategoryDefinition100.getName());
+		RestResponse createSubCategoryRest = CategoryRestUtils.createSubCategory(resourceSubCategoryDefinition,
+				resourceCategoryDefinition100, sdncAdminUserDetails, RESOURCE_COMPONENT_TYPE);
+		assertEquals("Check response code after create Sub category", STATUS_CODE_NOT_FOUND,
+				createSubCategoryRest.getErrorCode().intValue());
+		AuditValidationUtils.subCategoryAuditFailure(ADD_SUB_CATEGORY, resourceCategoryDefinition100,
+				resourceSubCategoryDefinition, sdncAdminUserDetails, ActionStatus.COMPONENT_CATEGORY_NOT_FOUND,
+				STATUS_CODE_NOT_FOUND, AUDIT_RESOURCE_TYPE, RESOURCE_COMPONENT_TYPE, CATEGORY, "");
+
+		RestResponse getAllCategoriesRest = CategoryRestUtils.getAllCategories(sdncAdminUserDetails,
+				RESOURCE_COMPONENT_TYPE);
+		assertEquals("Check response code after get all categories ", STATUS_CODE_SUCCESS,
+				getAllCategoriesRest.getErrorCode().intValue());
+		CategoryValidationUtils.verifySubCategoryNotExistsInGetResponse(getAllCategoriesRest,
+				resourceCategoryDefinition100.getUniqueId(), resourceSubCategoryDefinition);
+	}
+
+	@Test
+	public void createProductSubCategoryForNonExistingCategory() throws Exception {
+		productCategoryDefinition200.setUniqueId(productCategoryDefinition200.getName());
+		RestResponse createSubCategoryRest = CategoryRestUtils.createSubCategory(productSubCategoryDefinition,
+				productCategoryDefinition200, sdncProductStrategistUserDetails, PRODUCT_COMPONENT_TYPE);
+		assertEquals("Check response code after create Sub category", STATUS_CODE_NOT_FOUND,
+				createSubCategoryRest.getErrorCode().intValue());
+		RestResponse getAllCategoriesRest = CategoryRestUtils.getAllCategories(sdncAdminUserDetails,
+				PRODUCT_COMPONENT_TYPE);
+		assertEquals("Check response code after get all categories ", STATUS_CODE_SUCCESS,
+				getAllCategoriesRest.getErrorCode().intValue());
+		CategoryValidationUtils.verifySubCategoryNotExistsInGetResponse(getAllCategoriesRest,
+				productCategoryDefinition200.getUniqueId(), productSubCategoryDefinition);
+		// Audit validation // need to change ActionStatus
+		AuditValidationUtils.subCategoryAuditFailure(ADD_SUB_CATEGORY, productCategoryDefinition200,
+				productSubCategoryDefinition, sdncProductStrategistUserDetails,
+				ActionStatus.COMPONENT_CATEGORY_NOT_FOUND, STATUS_CODE_NOT_FOUND, AUDIT_PRODUCT_TYPE,
+				PRODUCT_COMPONENT_TYPE, CATEGORY, "");
+	}
+
+	// pass
+	@Test
+	public void subCategoryAllowedcharacters_01() throws Exception {
+		resourceSubCategoryDefinition.setName("1234AbcdE-");
+		RestResponse createSubCategoryRest = CategoryRestUtils.createSubCategory(resourceSubCategoryDefinition,
+				resourceCategoryDefinition, sdncAdminUserDetails, RESOURCE_COMPONENT_TYPE);
+		assertEquals("Check response code after create Sub category", STATUS_CODE_CREATED,
+				createSubCategoryRest.getErrorCode().intValue());
+		CategoryValidationUtils.validateCreateSubCategoryResponse(createSubCategoryRest, resourceSubCategoryDefinition);
+		RestResponse getAllCategoriesRest = CategoryRestUtils.getAllCategories(sdncAdminUserDetails,
+				RESOURCE_COMPONENT_TYPE);
+		assertEquals("Check response code after get all categories ", STATUS_CODE_SUCCESS,
+				getAllCategoriesRest.getErrorCode().intValue());
+		CategoryValidationUtils.verifySubCategoryExistInGetResponse(getAllCategoriesRest,
+				resourceCategoryDefinition.getUniqueId(), resourceSubCategoryDefinition); // also
+																							// set
+																							// catalog
+																							// uniqeId
+		// Audit validation
+		AuditValidationUtils.subCategoryAuditSuccess(ADD_SUB_CATEGORY, resourceCategoryDefinition,
+				resourceSubCategoryDefinition, sdncAdminUserDetails, STATUS_CODE_CREATED, AUDIT_RESOURCE_TYPE);
+	}
+
+	// pass
+	@Test
+	public void subCategoryAllowedcharacters_02() throws Exception {
+		resourceSubCategoryDefinition.setName("1234AbcdE+");
+		RestResponse createSubCategoryRest = CategoryRestUtils.createSubCategory(resourceSubCategoryDefinition,
+				resourceCategoryDefinition, sdncAdminUserDetails, RESOURCE_COMPONENT_TYPE);
+		assertEquals("Check response code after create Sub category", STATUS_CODE_CREATED,
+				createSubCategoryRest.getErrorCode().intValue());
+		CategoryValidationUtils.validateCreateSubCategoryResponse(createSubCategoryRest, resourceSubCategoryDefinition);
+
+		RestResponse getAllCategoriesRest = CategoryRestUtils.getAllCategories(sdncAdminUserDetails,
+				RESOURCE_COMPONENT_TYPE);
+		assertEquals("Check response code after get all categories ", STATUS_CODE_SUCCESS,
+				getAllCategoriesRest.getErrorCode().intValue());
+		CategoryValidationUtils.verifySubCategoryExistInGetResponse(getAllCategoriesRest,
+				resourceCategoryDefinition.getUniqueId(), resourceSubCategoryDefinition);
+		// Audit validation
+		AuditValidationUtils.subCategoryAuditSuccess(ADD_SUB_CATEGORY, resourceCategoryDefinition,
+				resourceSubCategoryDefinition, sdncAdminUserDetails, STATUS_CODE_CREATED, AUDIT_RESOURCE_TYPE);
+	}
+
+	@Test
+	public void subCategoryAllowedcharacters_03() throws Exception {
+		resourceSubCategoryDefinition.setName("1234AbcdE&");
+		RestResponse createSubCategoryRest = CategoryRestUtils.createSubCategory(resourceSubCategoryDefinition,
+				resourceCategoryDefinition, sdncAdminUserDetails, RESOURCE_COMPONENT_TYPE);
+		assertEquals("Check response code after create Sub category", STATUS_CODE_CREATED,
+				createSubCategoryRest.getErrorCode().intValue());
+		CategoryValidationUtils.validateCreateSubCategoryResponse(createSubCategoryRest, resourceSubCategoryDefinition);
+
+		RestResponse getAllCategoriesRest = CategoryRestUtils.getAllCategories(sdncAdminUserDetails,
+				RESOURCE_COMPONENT_TYPE);
+		assertEquals("Check response code after get all categories ", STATUS_CODE_SUCCESS,
+				getAllCategoriesRest.getErrorCode().intValue());
+		CategoryValidationUtils.verifySubCategoryExistInGetResponse(getAllCategoriesRest,
+				resourceCategoryDefinition.getUniqueId(), resourceSubCategoryDefinition);
+		// Audit validation
+		AuditValidationUtils.subCategoryAuditSuccess(ADD_SUB_CATEGORY, resourceCategoryDefinition,
+				resourceSubCategoryDefinition, sdncAdminUserDetails, STATUS_CODE_CREATED, AUDIT_RESOURCE_TYPE);
+	}
+
+	@Test
+	public void subCategoryAllowedcharacters_04() throws Exception {
+		resourceSubCategoryDefinition.setName("1234AbcdE.");
+		RestResponse createSubCategoryRest = CategoryRestUtils.createSubCategory(resourceSubCategoryDefinition,
+				resourceCategoryDefinition, sdncAdminUserDetails, RESOURCE_COMPONENT_TYPE);
+		assertEquals("Check response code after create Sub category", STATUS_CODE_CREATED,
+				createSubCategoryRest.getErrorCode().intValue());
+		CategoryValidationUtils.validateCreateSubCategoryResponse(createSubCategoryRest, resourceSubCategoryDefinition);
+		RestResponse getAllCategoriesRest = CategoryRestUtils.getAllCategories(sdncAdminUserDetails,
+				RESOURCE_COMPONENT_TYPE);
+		assertEquals("Check response code after get all categories ", STATUS_CODE_SUCCESS,
+				getAllCategoriesRest.getErrorCode().intValue());
+		CategoryValidationUtils.verifySubCategoryExistInGetResponse(getAllCategoriesRest,
+				resourceCategoryDefinition.getUniqueId(), resourceSubCategoryDefinition);
+		// Audit validation
+		AuditValidationUtils.subCategoryAuditSuccess(ADD_SUB_CATEGORY, resourceCategoryDefinition,
+				resourceSubCategoryDefinition, sdncAdminUserDetails, STATUS_CODE_CREATED, AUDIT_RESOURCE_TYPE);
+	}
+
+	@Test
+	public void subCategoryAllowedcharacters_05() throws Exception {
+		resourceSubCategoryDefinition.setName("1234AbcdE'");
+		RestResponse createSubCategoryRest = CategoryRestUtils.createSubCategory(resourceSubCategoryDefinition,
+				resourceCategoryDefinition, sdncAdminUserDetails, RESOURCE_COMPONENT_TYPE);
+		assertEquals("Check response code after create Sub category", STATUS_CODE_CREATED,
+				createSubCategoryRest.getErrorCode().intValue());
+		RestResponse getAllCategoriesRest = CategoryRestUtils.getAllCategories(sdncAdminUserDetails,
+				RESOURCE_COMPONENT_TYPE);
+		CategoryValidationUtils.validateCreateSubCategoryResponse(createSubCategoryRest, resourceSubCategoryDefinition);
+
+		assertEquals("Check response code after get all categories ", STATUS_CODE_SUCCESS,
+				getAllCategoriesRest.getErrorCode().intValue());
+		CategoryValidationUtils.verifySubCategoryExistInGetResponse(getAllCategoriesRest,
+				resourceCategoryDefinition.getUniqueId(), resourceSubCategoryDefinition);
+		// Audit validation
+		AuditValidationUtils.subCategoryAuditSuccess(ADD_SUB_CATEGORY, resourceCategoryDefinition,
+				resourceSubCategoryDefinition, sdncAdminUserDetails, STATUS_CODE_CREATED, AUDIT_RESOURCE_TYPE);
+	}
+
+	@Test
+	public void subCategoryAllowedcharacters_06() throws Exception {
+		resourceSubCategoryDefinition.setName("1234AbcdE=");
+		RestResponse createSubCategoryRest = CategoryRestUtils.createSubCategory(resourceSubCategoryDefinition,
+				resourceCategoryDefinition, sdncAdminUserDetails, RESOURCE_COMPONENT_TYPE);
+		assertEquals("Check response code after create Sub category", STATUS_CODE_CREATED,
+				createSubCategoryRest.getErrorCode().intValue());
+		CategoryValidationUtils.validateCreateSubCategoryResponse(createSubCategoryRest, resourceSubCategoryDefinition);
+
+		RestResponse getAllCategoriesRest = CategoryRestUtils.getAllCategories(sdncAdminUserDetails,
+				RESOURCE_COMPONENT_TYPE);
+		assertEquals("Check response code after get all categories ", STATUS_CODE_SUCCESS,
+				getAllCategoriesRest.getErrorCode().intValue());
+		CategoryValidationUtils.verifySubCategoryExistInGetResponse(getAllCategoriesRest,
+				resourceCategoryDefinition.getUniqueId(), resourceSubCategoryDefinition);
+		// Audit validation
+		AuditValidationUtils.subCategoryAuditSuccess(ADD_SUB_CATEGORY, resourceCategoryDefinition,
+				resourceSubCategoryDefinition, sdncAdminUserDetails, STATUS_CODE_CREATED, AUDIT_RESOURCE_TYPE);
+	}
+
+	@Test
+	public void subCategoryAllowedcharacters_07() throws Exception {
+		resourceSubCategoryDefinition.setName("1234AbcdE:");
+		RestResponse createSubCategoryRest = CategoryRestUtils.createSubCategory(resourceSubCategoryDefinition,
+				resourceCategoryDefinition, sdncAdminUserDetails, RESOURCE_COMPONENT_TYPE);
+		assertEquals("Check response code after create Sub category", STATUS_CODE_CREATED,
+				createSubCategoryRest.getErrorCode().intValue());
+		CategoryValidationUtils.validateCreateSubCategoryResponse(createSubCategoryRest, resourceSubCategoryDefinition);
+
+		RestResponse getAllCategoriesRest = CategoryRestUtils.getAllCategories(sdncAdminUserDetails,
+				RESOURCE_COMPONENT_TYPE);
+		assertEquals("Check response code after get all categories ", STATUS_CODE_SUCCESS,
+				getAllCategoriesRest.getErrorCode().intValue());
+		CategoryValidationUtils.verifySubCategoryExistInGetResponse(getAllCategoriesRest,
+				resourceCategoryDefinition.getUniqueId(), resourceSubCategoryDefinition);
+		// Audit validation
+		AuditValidationUtils.subCategoryAuditSuccess(ADD_SUB_CATEGORY, resourceCategoryDefinition,
+				resourceSubCategoryDefinition, sdncAdminUserDetails, STATUS_CODE_CREATED, AUDIT_RESOURCE_TYPE);
+	}
+
+	@Test
+	public void subCategoryAllowedcharacters_08() throws Exception {
+		resourceSubCategoryDefinition.setName("1234AbcdE@");
+		RestResponse createSubCategoryRest = CategoryRestUtils.createSubCategory(resourceSubCategoryDefinition,
+				resourceCategoryDefinition, sdncAdminUserDetails, RESOURCE_COMPONENT_TYPE);
+		assertEquals("Check response code after create Sub category", STATUS_CODE_CREATED,
+				createSubCategoryRest.getErrorCode().intValue());
+		CategoryValidationUtils.validateCreateSubCategoryResponse(createSubCategoryRest, resourceSubCategoryDefinition);
+
+		RestResponse getAllCategoriesRest = CategoryRestUtils.getAllCategories(sdncAdminUserDetails,
+				RESOURCE_COMPONENT_TYPE);
+		assertEquals("Check response code after get all categories ", STATUS_CODE_SUCCESS,
+				getAllCategoriesRest.getErrorCode().intValue());
+		CategoryValidationUtils.verifySubCategoryExistInGetResponse(getAllCategoriesRest,
+				resourceCategoryDefinition.getUniqueId(), resourceSubCategoryDefinition);
+		// Audit validation
+		AuditValidationUtils.subCategoryAuditSuccess(ADD_SUB_CATEGORY, resourceCategoryDefinition,
+				resourceSubCategoryDefinition, sdncAdminUserDetails, STATUS_CODE_CREATED, AUDIT_RESOURCE_TYPE);
+	}
+
+	@Test
+	public void subCategoryAllowedcharacters_09() throws Exception {
+		resourceSubCategoryDefinition.setName("1234AbcdE_");
+		RestResponse createSubCategoryRest = CategoryRestUtils.createSubCategory(resourceSubCategoryDefinition,
+				resourceCategoryDefinition, sdncAdminUserDetails, RESOURCE_COMPONENT_TYPE);
+		assertEquals("Check response code after create Sub category", STATUS_CODE_CREATED,
+				createSubCategoryRest.getErrorCode().intValue());
+		CategoryValidationUtils.validateCreateSubCategoryResponse(createSubCategoryRest, resourceSubCategoryDefinition);
+
+		RestResponse getAllCategoriesRest = CategoryRestUtils.getAllCategories(sdncAdminUserDetails,
+				RESOURCE_COMPONENT_TYPE);
+		assertEquals("Check response code after get all categories ", STATUS_CODE_SUCCESS,
+				getAllCategoriesRest.getErrorCode().intValue());
+		CategoryValidationUtils.verifySubCategoryExistInGetResponse(getAllCategoriesRest,
+				resourceCategoryDefinition.getUniqueId(), resourceSubCategoryDefinition);
+		// Audit validation
+		AuditValidationUtils.subCategoryAuditSuccess(ADD_SUB_CATEGORY, resourceCategoryDefinition,
+				resourceSubCategoryDefinition, sdncAdminUserDetails, STATUS_CODE_CREATED, AUDIT_RESOURCE_TYPE);
+	}
+
+	@Test
+	public void subCategoryAllowedcharacters_10() throws Exception {
+		resourceSubCategoryDefinition.setName("1234AbcdE#");
+		RestResponse createSubCategoryRest = CategoryRestUtils.createSubCategory(resourceSubCategoryDefinition,
+				resourceCategoryDefinition, sdncAdminUserDetails, RESOURCE_COMPONENT_TYPE);
+		assertEquals("Check response code after create Sub category", STATUS_CODE_CREATED,
+				createSubCategoryRest.getErrorCode().intValue());
+		CategoryValidationUtils.validateCreateSubCategoryResponse(createSubCategoryRest, resourceSubCategoryDefinition);
+
+		RestResponse getAllCategoriesRest = CategoryRestUtils.getAllCategories(sdncAdminUserDetails,
+				RESOURCE_COMPONENT_TYPE);
+		assertEquals("Check response code after get all categories ", STATUS_CODE_SUCCESS,
+				getAllCategoriesRest.getErrorCode().intValue());
+		CategoryValidationUtils.verifySubCategoryExistInGetResponse(getAllCategoriesRest,
+				resourceCategoryDefinition.getUniqueId(), resourceSubCategoryDefinition);
+		// Audit validation
+		AuditValidationUtils.subCategoryAuditSuccess(ADD_SUB_CATEGORY, resourceCategoryDefinition,
+				resourceSubCategoryDefinition, sdncAdminUserDetails, STATUS_CODE_CREATED, AUDIT_RESOURCE_TYPE);
+	}
+
+	@Test
+	public void subCategoryAllowedcharacters_11() throws Exception {
+		resourceSubCategoryDefinition.setName("1234AbcdE d");
+		RestResponse createSubCategoryRest = CategoryRestUtils.createSubCategory(resourceSubCategoryDefinition,
+				resourceCategoryDefinition, sdncAdminUserDetails, RESOURCE_COMPONENT_TYPE);
+		assertEquals("Check response code after create Sub category", STATUS_CODE_CREATED,
+				createSubCategoryRest.getErrorCode().intValue());
+		resourceSubCategoryDefinition.setName("1234AbcdE D");
+		CategoryValidationUtils.validateCreateSubCategoryResponse(createSubCategoryRest, resourceSubCategoryDefinition);
+
+		RestResponse getAllCategoriesRest = CategoryRestUtils.getAllCategories(sdncAdminUserDetails,
+				RESOURCE_COMPONENT_TYPE);
+		assertEquals("Check response code after get all categories ", STATUS_CODE_SUCCESS,
+				getAllCategoriesRest.getErrorCode().intValue());
+		CategoryValidationUtils.verifySubCategoryExistInGetResponse(getAllCategoriesRest,
+				resourceCategoryDefinition.getUniqueId(), resourceSubCategoryDefinition);
+		// Audit validation
+		AuditValidationUtils.subCategoryAuditSuccess(ADD_SUB_CATEGORY, resourceCategoryDefinition,
+				resourceSubCategoryDefinition, sdncAdminUserDetails, STATUS_CODE_CREATED, AUDIT_RESOURCE_TYPE);
+	}
+
+	@Test
+	public void subCategoryAllowedcharacters_12() throws Exception {
+		resourceSubCategoryDefinition.setName("1234AbcdE   &_=+.-'#:@ d");
+		RestResponse createSubCategoryRest = CategoryRestUtils.createSubCategory(resourceSubCategoryDefinition,
+				resourceCategoryDefinition, sdncAdminUserDetails, RESOURCE_COMPONENT_TYPE);
+		assertEquals("Check response code after create Sub category", STATUS_CODE_CREATED,
+				createSubCategoryRest.getErrorCode().intValue());
+		resourceSubCategoryDefinition.setName("1234AbcdE &_=+.-'#:@ D");
+		CategoryValidationUtils.validateCreateSubCategoryResponse(createSubCategoryRest, resourceSubCategoryDefinition);
+
+		RestResponse getAllCategoriesRest = CategoryRestUtils.getAllCategories(sdncAdminUserDetails,
+				RESOURCE_COMPONENT_TYPE);
+		assertEquals("Check response code after get all categories ", STATUS_CODE_SUCCESS,
+				getAllCategoriesRest.getErrorCode().intValue());
+		CategoryValidationUtils.verifySubCategoryExistInGetResponse(getAllCategoriesRest,
+				resourceCategoryDefinition.getUniqueId(), resourceSubCategoryDefinition);
+		// Audit validation
+		AuditValidationUtils.subCategoryAuditSuccess(ADD_SUB_CATEGORY, resourceCategoryDefinition,
+				resourceSubCategoryDefinition, sdncAdminUserDetails, STATUS_CODE_CREATED, AUDIT_RESOURCE_TYPE);
+	}
+
+	@Test
+	public void subCategoryRemoveSpaceFromBeginning() throws Exception {
+		resourceSubCategoryDefinition.setName("  Category01");
+		RestResponse createSubCategoryRest = CategoryRestUtils.createSubCategory(resourceSubCategoryDefinition,
+				resourceCategoryDefinition, sdncAdminUserDetails, RESOURCE_COMPONENT_TYPE);
+		assertEquals("Check response code after create Sub category", STATUS_CODE_CREATED,
+				createSubCategoryRest.getErrorCode().intValue());
+		resourceSubCategoryDefinition.setName("Category01");
+		CategoryValidationUtils.validateCreateSubCategoryResponse(createSubCategoryRest, resourceSubCategoryDefinition);
+
+		RestResponse getAllCategoriesRest = CategoryRestUtils.getAllCategories(sdncAdminUserDetails,
+				RESOURCE_COMPONENT_TYPE);
+		assertEquals("Check response code after get all categories ", STATUS_CODE_SUCCESS,
+				getAllCategoriesRest.getErrorCode().intValue());
+		CategoryValidationUtils.verifySubCategoryExistInGetResponse(getAllCategoriesRest,
+				resourceCategoryDefinition.getUniqueId(), resourceSubCategoryDefinition);
+		// Audit validation
+		AuditValidationUtils.subCategoryAuditSuccess(ADD_SUB_CATEGORY, resourceCategoryDefinition,
+				resourceSubCategoryDefinition, sdncAdminUserDetails, STATUS_CODE_CREATED, AUDIT_RESOURCE_TYPE);
+	}
+
+	@Test
+	public void subCategoryRemoveSpaceFromEnd() throws Exception {
+		resourceSubCategoryDefinition.setName("Category01    ");
+		RestResponse createSubCategoryRest = CategoryRestUtils.createSubCategory(resourceSubCategoryDefinition,
+				resourceCategoryDefinition, sdncAdminUserDetails, RESOURCE_COMPONENT_TYPE);
+		assertEquals("Check response code after create Sub category", STATUS_CODE_CREATED,
+				createSubCategoryRest.getErrorCode().intValue());
+		resourceSubCategoryDefinition.setName("Category01");
+		CategoryValidationUtils.validateCreateSubCategoryResponse(createSubCategoryRest, resourceSubCategoryDefinition);
+
+		RestResponse getAllCategoriesRest = CategoryRestUtils.getAllCategories(sdncAdminUserDetails,
+				RESOURCE_COMPONENT_TYPE);
+		assertEquals("Check response code after get all categories ", STATUS_CODE_SUCCESS,
+				getAllCategoriesRest.getErrorCode().intValue());
+		CategoryValidationUtils.verifySubCategoryExistInGetResponse(getAllCategoriesRest,
+				resourceCategoryDefinition.getUniqueId(), resourceSubCategoryDefinition);
+		// Audit validation
+		AuditValidationUtils.subCategoryAuditSuccess(ADD_SUB_CATEGORY, resourceCategoryDefinition,
+				resourceSubCategoryDefinition, sdncAdminUserDetails, STATUS_CODE_CREATED, AUDIT_RESOURCE_TYPE);
+	}
+
+	@Test
+	public void subCategoryRemoveExtraSpace() throws Exception {
+		resourceSubCategoryDefinition.setName("Category    02");
+		RestResponse createSubCategoryRest = CategoryRestUtils.createSubCategory(resourceSubCategoryDefinition,
+				resourceCategoryDefinition, sdncAdminUserDetails, RESOURCE_COMPONENT_TYPE);
+		assertEquals("Check response code after create Sub category", STATUS_CODE_CREATED,
+				createSubCategoryRest.getErrorCode().intValue());
+		resourceSubCategoryDefinition.setName("Category 02");
+		CategoryValidationUtils.validateCreateSubCategoryResponse(createSubCategoryRest, resourceSubCategoryDefinition);
+
+		RestResponse getAllCategoriesRest = CategoryRestUtils.getAllCategories(sdncAdminUserDetails,
+				RESOURCE_COMPONENT_TYPE);
+		assertEquals("Check response code after get all categories ", STATUS_CODE_SUCCESS,
+				getAllCategoriesRest.getErrorCode().intValue());
+		CategoryValidationUtils.verifySubCategoryExistInGetResponse(getAllCategoriesRest,
+				resourceCategoryDefinition.getUniqueId(), resourceSubCategoryDefinition);
+		// Audit validation
+		AuditValidationUtils.subCategoryAuditSuccess(ADD_SUB_CATEGORY, resourceCategoryDefinition,
+				resourceSubCategoryDefinition, sdncAdminUserDetails, STATUS_CODE_CREATED, AUDIT_RESOURCE_TYPE);
+	}
+
+	@Test
+	public void subCategoryRemoveExtraAmpersand() throws Exception {
+		resourceSubCategoryDefinition.setName("Category&& &02");
+		RestResponse createSubCategoryRest = CategoryRestUtils.createSubCategory(resourceSubCategoryDefinition,
+				resourceCategoryDefinition, sdncAdminUserDetails, RESOURCE_COMPONENT_TYPE);
+		assertEquals("Check response code after create Sub category", STATUS_CODE_CREATED,
+				createSubCategoryRest.getErrorCode().intValue());
+		resourceSubCategoryDefinition.setName("Category& &02");
+		CategoryValidationUtils.validateCreateSubCategoryResponse(createSubCategoryRest, resourceSubCategoryDefinition);
+
+		RestResponse getAllCategoriesRest = CategoryRestUtils.getAllCategories(sdncAdminUserDetails,
+				RESOURCE_COMPONENT_TYPE);
+		assertEquals("Check response code after get all categories ", STATUS_CODE_SUCCESS,
+				getAllCategoriesRest.getErrorCode().intValue());
+		CategoryValidationUtils.verifySubCategoryExistInGetResponse(getAllCategoriesRest,
+				resourceCategoryDefinition.getUniqueId(), resourceSubCategoryDefinition);
+		// Audit validation
+		AuditValidationUtils.subCategoryAuditSuccess(ADD_SUB_CATEGORY, resourceCategoryDefinition,
+				resourceSubCategoryDefinition, sdncAdminUserDetails, STATUS_CODE_CREATED, AUDIT_RESOURCE_TYPE);
+	}
+
+	@Test
+	public void subCategoryRemoveExtraDash() throws Exception {
+		resourceSubCategoryDefinition.setName("CategorY-- --02");
+		RestResponse createSubCategoryRest = CategoryRestUtils.createSubCategory(resourceSubCategoryDefinition,
+				resourceCategoryDefinition, sdncAdminUserDetails, RESOURCE_COMPONENT_TYPE);
+		assertEquals("Check response code after create Sub category", STATUS_CODE_CREATED,
+				createSubCategoryRest.getErrorCode().intValue());
+		resourceSubCategoryDefinition.setName("CategorY- -02");
+		CategoryValidationUtils.validateCreateSubCategoryResponse(createSubCategoryRest, resourceSubCategoryDefinition);
+
+		RestResponse getAllCategoriesRest = CategoryRestUtils.getAllCategories(sdncAdminUserDetails,
+				RESOURCE_COMPONENT_TYPE);
+		assertEquals("Check response code after get all categories ", STATUS_CODE_SUCCESS,
+				getAllCategoriesRest.getErrorCode().intValue());
+		CategoryValidationUtils.verifySubCategoryExistInGetResponse(getAllCategoriesRest,
+				resourceCategoryDefinition.getUniqueId(), resourceSubCategoryDefinition);
+		// Audit validation
+		AuditValidationUtils.subCategoryAuditSuccess(ADD_SUB_CATEGORY, resourceCategoryDefinition,
+				resourceSubCategoryDefinition, sdncAdminUserDetails, STATUS_CODE_CREATED, AUDIT_RESOURCE_TYPE);
+	}
+
+	@Test
+	public void subCategoryRemoveExtraPlus() throws Exception {
+		resourceSubCategoryDefinition.setName("CateGory++++ +02");
+		RestResponse createSubCategoryRest = CategoryRestUtils.createSubCategory(resourceSubCategoryDefinition,
+				resourceCategoryDefinition, sdncAdminUserDetails, RESOURCE_COMPONENT_TYPE);
+		assertEquals("Check response code after create Sub category", STATUS_CODE_CREATED,
+				createSubCategoryRest.getErrorCode().intValue());
+		resourceSubCategoryDefinition.setName("CateGory+ +02");
+		CategoryValidationUtils.validateCreateSubCategoryResponse(createSubCategoryRest, resourceSubCategoryDefinition);
+
+		RestResponse getAllCategoriesRest = CategoryRestUtils.getAllCategories(sdncAdminUserDetails,
+				RESOURCE_COMPONENT_TYPE);
+		assertEquals("Check response code after get all categories ", STATUS_CODE_SUCCESS,
+				getAllCategoriesRest.getErrorCode().intValue());
+		CategoryValidationUtils.verifySubCategoryExistInGetResponse(getAllCategoriesRest,
+				resourceCategoryDefinition.getUniqueId(), resourceSubCategoryDefinition);
+		// Audit validation
+		AuditValidationUtils.subCategoryAuditSuccess(ADD_SUB_CATEGORY, resourceCategoryDefinition,
+				resourceSubCategoryDefinition, sdncAdminUserDetails, STATUS_CODE_CREATED, AUDIT_RESOURCE_TYPE);
+	}
+
+	@Test
+	public void subCategoryRemoveExtraPeriod() throws Exception {
+		resourceSubCategoryDefinition.setName("Category.... .02");
+		RestResponse createSubCategoryRest = CategoryRestUtils.createSubCategory(resourceSubCategoryDefinition,
+				resourceCategoryDefinition, sdncAdminUserDetails, RESOURCE_COMPONENT_TYPE);
+		assertEquals("Check response code after create Sub category", STATUS_CODE_CREATED,
+				createSubCategoryRest.getErrorCode().intValue());
+		resourceSubCategoryDefinition.setName("Category. .02");
+		CategoryValidationUtils.validateCreateSubCategoryResponse(createSubCategoryRest, resourceSubCategoryDefinition);
+
+		RestResponse getAllCategoriesRest = CategoryRestUtils.getAllCategories(sdncAdminUserDetails,
+				RESOURCE_COMPONENT_TYPE);
+		assertEquals("Check response code after get all categories ", STATUS_CODE_SUCCESS,
+				getAllCategoriesRest.getErrorCode().intValue());
+		CategoryValidationUtils.verifySubCategoryExistInGetResponse(getAllCategoriesRest,
+				resourceCategoryDefinition.getUniqueId(), resourceSubCategoryDefinition);
+		// Audit validation
+		AuditValidationUtils.subCategoryAuditSuccess(ADD_SUB_CATEGORY, resourceCategoryDefinition,
+				resourceSubCategoryDefinition, sdncAdminUserDetails, STATUS_CODE_CREATED, AUDIT_RESOURCE_TYPE);
+	}
+
+	@Test
+	public void subCategoryRemoveExtraApostrophe() throws Exception {
+		resourceSubCategoryDefinition.setName("CaTegory''' '02");
+		RestResponse createSubCategoryRest = CategoryRestUtils.createSubCategory(resourceSubCategoryDefinition,
+				resourceCategoryDefinition, sdncAdminUserDetails, RESOURCE_COMPONENT_TYPE);
+		assertEquals("Check response code after create Sub category", STATUS_CODE_CREATED,
+				createSubCategoryRest.getErrorCode().intValue());
+		resourceSubCategoryDefinition.setName("CaTegory' '02");
+		CategoryValidationUtils.validateCreateSubCategoryResponse(createSubCategoryRest, resourceSubCategoryDefinition);
+
+		RestResponse getAllCategoriesRest = CategoryRestUtils.getAllCategories(sdncAdminUserDetails,
+				RESOURCE_COMPONENT_TYPE);
+		assertEquals("Check response code after get all categories ", STATUS_CODE_SUCCESS,
+				getAllCategoriesRest.getErrorCode().intValue());
+		CategoryValidationUtils.verifySubCategoryExistInGetResponse(getAllCategoriesRest,
+				resourceCategoryDefinition.getUniqueId(), resourceSubCategoryDefinition);
+		// Audit validation
+		AuditValidationUtils.subCategoryAuditSuccess(ADD_SUB_CATEGORY, resourceCategoryDefinition,
+				resourceSubCategoryDefinition, sdncAdminUserDetails, STATUS_CODE_CREATED, AUDIT_RESOURCE_TYPE);
+	}
+
+	@Test
+	public void subCategoryRemoveExtraHashtag() throws Exception {
+		resourceSubCategoryDefinition.setName("Category### #02");
+		RestResponse createSubCategoryRest = CategoryRestUtils.createSubCategory(resourceSubCategoryDefinition,
+				resourceCategoryDefinition, sdncAdminUserDetails, RESOURCE_COMPONENT_TYPE);
+		assertEquals("Check response code after create Sub category", STATUS_CODE_CREATED,
+				createSubCategoryRest.getErrorCode().intValue());
+		resourceSubCategoryDefinition.setName("Category# #02");
+		CategoryValidationUtils.validateCreateSubCategoryResponse(createSubCategoryRest, resourceSubCategoryDefinition);
+
+		RestResponse getAllCategoriesRest = CategoryRestUtils.getAllCategories(sdncAdminUserDetails,
+				RESOURCE_COMPONENT_TYPE);
+		assertEquals("Check response code after get all categories ", STATUS_CODE_SUCCESS,
+				getAllCategoriesRest.getErrorCode().intValue());
+		CategoryValidationUtils.verifySubCategoryExistInGetResponse(getAllCategoriesRest,
+				resourceCategoryDefinition.getUniqueId(), resourceSubCategoryDefinition);
+		// Audit validation
+		AuditValidationUtils.subCategoryAuditSuccess(ADD_SUB_CATEGORY, resourceCategoryDefinition,
+				resourceSubCategoryDefinition, sdncAdminUserDetails, STATUS_CODE_CREATED, AUDIT_RESOURCE_TYPE);
+	}
+
+	@Test
+	public void subCategoryRemoveExtrEequal() throws Exception {
+		resourceSubCategoryDefinition.setName("Category=== =02");
+		RestResponse createSubCategoryRest = CategoryRestUtils.createSubCategory(resourceSubCategoryDefinition,
+				resourceCategoryDefinition, sdncAdminUserDetails, RESOURCE_COMPONENT_TYPE);
+		assertEquals("Check response code after create Sub category", STATUS_CODE_CREATED,
+				createSubCategoryRest.getErrorCode().intValue());
+		resourceSubCategoryDefinition.setName("Category= =02");
+		CategoryValidationUtils.validateCreateSubCategoryResponse(createSubCategoryRest, resourceSubCategoryDefinition);
+
+		RestResponse getAllCategoriesRest = CategoryRestUtils.getAllCategories(sdncAdminUserDetails,
+				RESOURCE_COMPONENT_TYPE);
+		assertEquals("Check response code after get all categories ", STATUS_CODE_SUCCESS,
+				getAllCategoriesRest.getErrorCode().intValue());
+		CategoryValidationUtils.verifySubCategoryExistInGetResponse(getAllCategoriesRest,
+				resourceCategoryDefinition.getUniqueId(), resourceSubCategoryDefinition);
+		// Audit validation
+		AuditValidationUtils.subCategoryAuditSuccess(ADD_SUB_CATEGORY, resourceCategoryDefinition,
+				resourceSubCategoryDefinition, sdncAdminUserDetails, STATUS_CODE_CREATED, AUDIT_RESOURCE_TYPE);
+	}
+
+	@Test
+	public void subCategoryRemoveExtrColon() throws Exception {
+		resourceSubCategoryDefinition.setName("Category::: :02");
+		RestResponse createSubCategoryRest = CategoryRestUtils.createSubCategory(resourceSubCategoryDefinition,
+				resourceCategoryDefinition, sdncAdminUserDetails, RESOURCE_COMPONENT_TYPE);
+		assertEquals("Check response code after create Sub category", STATUS_CODE_CREATED,
+				createSubCategoryRest.getErrorCode().intValue());
+		resourceSubCategoryDefinition.setName("Category: :02");
+		CategoryValidationUtils.validateCreateSubCategoryResponse(createSubCategoryRest, resourceSubCategoryDefinition);
+
+		RestResponse getAllCategoriesRest = CategoryRestUtils.getAllCategories(sdncAdminUserDetails,
+				RESOURCE_COMPONENT_TYPE);
+		assertEquals("Check response code after get all categories ", STATUS_CODE_SUCCESS,
+				getAllCategoriesRest.getErrorCode().intValue());
+		CategoryValidationUtils.verifySubCategoryExistInGetResponse(getAllCategoriesRest,
+				resourceCategoryDefinition.getUniqueId(), resourceSubCategoryDefinition);
+		// Audit validation
+		AuditValidationUtils.subCategoryAuditSuccess(ADD_SUB_CATEGORY, resourceCategoryDefinition,
+				resourceSubCategoryDefinition, sdncAdminUserDetails, STATUS_CODE_CREATED, AUDIT_RESOURCE_TYPE);
+	}
+
+	@Test
+	public void subCategoryRemoveExtrAt() throws Exception {
+		resourceSubCategoryDefinition.setName("Category@@@ @a2");
+		RestResponse createSubCategoryRest = CategoryRestUtils.createSubCategory(resourceSubCategoryDefinition,
+				resourceCategoryDefinition, sdncAdminUserDetails, RESOURCE_COMPONENT_TYPE);
+		assertEquals("Check response code after create Sub category", STATUS_CODE_CREATED,
+				createSubCategoryRest.getErrorCode().intValue());
+		resourceSubCategoryDefinition.setName("Category@ @a2");
+		CategoryValidationUtils.validateCreateSubCategoryResponse(createSubCategoryRest, resourceSubCategoryDefinition);
+
+		RestResponse getAllCategoriesRest = CategoryRestUtils.getAllCategories(sdncAdminUserDetails,
+				RESOURCE_COMPONENT_TYPE);
+		assertEquals("Check response code after get all categories ", STATUS_CODE_SUCCESS,
+				getAllCategoriesRest.getErrorCode().intValue());
+		CategoryValidationUtils.verifySubCategoryExistInGetResponse(getAllCategoriesRest,
+				resourceCategoryDefinition.getUniqueId(), resourceSubCategoryDefinition);
+		// Audit validation
+		AuditValidationUtils.subCategoryAuditSuccess(ADD_SUB_CATEGORY, resourceCategoryDefinition,
+				resourceSubCategoryDefinition, sdncAdminUserDetails, STATUS_CODE_CREATED, AUDIT_RESOURCE_TYPE);
+	}
+
+	@Test
+	public void subCategoryRemoveExtraUnderscore() throws Exception {
+		resourceSubCategoryDefinition.setName("Category___ _22");
+		RestResponse createSubCategoryRest = CategoryRestUtils.createSubCategory(resourceSubCategoryDefinition,
+				resourceCategoryDefinition, sdncAdminUserDetails, RESOURCE_COMPONENT_TYPE);
+		assertEquals("Check response code after create Sub category", STATUS_CODE_CREATED,
+				createSubCategoryRest.getErrorCode().intValue());
+		resourceSubCategoryDefinition.setName("Category_ _22");
+		CategoryValidationUtils.validateCreateSubCategoryResponse(createSubCategoryRest, resourceSubCategoryDefinition);
+
+		RestResponse getAllCategoriesRest = CategoryRestUtils.getAllCategories(sdncAdminUserDetails,
+				RESOURCE_COMPONENT_TYPE);
+		assertEquals("Check response code after get all categories ", STATUS_CODE_SUCCESS,
+				getAllCategoriesRest.getErrorCode().intValue());
+		CategoryValidationUtils.verifySubCategoryExistInGetResponse(getAllCategoriesRest,
+				resourceCategoryDefinition.getUniqueId(), resourceSubCategoryDefinition);
+		// Audit validation
+		AuditValidationUtils.subCategoryAuditSuccess(ADD_SUB_CATEGORY, resourceCategoryDefinition,
+				resourceSubCategoryDefinition, sdncAdminUserDetails, STATUS_CODE_CREATED, AUDIT_RESOURCE_TYPE);
+	}
+
+	@Test
+	public void subCategoryFirstWordStartWithNumber() throws Exception {
+		resourceSubCategoryDefinition.setName("1Category one");
+		RestResponse createSubCategoryRest = CategoryRestUtils.createSubCategory(resourceSubCategoryDefinition,
+				resourceCategoryDefinition, sdncAdminUserDetails, RESOURCE_COMPONENT_TYPE);
+		assertEquals("Check response code after create Sub category", STATUS_CODE_CREATED,
+				createSubCategoryRest.getErrorCode().intValue());
+		resourceSubCategoryDefinition.setName("1Category One");
+		CategoryValidationUtils.validateCreateSubCategoryResponse(createSubCategoryRest, resourceSubCategoryDefinition);
+
+		RestResponse getAllCategoriesRest = CategoryRestUtils.getAllCategories(sdncAdminUserDetails,
+				RESOURCE_COMPONENT_TYPE);
+		assertEquals("Check response code after get all categories ", STATUS_CODE_SUCCESS,
+				getAllCategoriesRest.getErrorCode().intValue());
+		CategoryValidationUtils.verifySubCategoryExistInGetResponse(getAllCategoriesRest,
+				resourceCategoryDefinition.getUniqueId(), resourceSubCategoryDefinition);
+		// Audit validation
+		AuditValidationUtils.subCategoryAuditSuccess(ADD_SUB_CATEGORY, resourceCategoryDefinition,
+				resourceSubCategoryDefinition, sdncAdminUserDetails, STATUS_CODE_CREATED, AUDIT_RESOURCE_TYPE);
+	}
+
+	// Bug
+	// Desc=<ACTION = "AddSubCategory" MODIFIER = "Jimmy Hendrix(jh0003)"
+	// CATEGORY_NAME = "Category1" SUB_CATEGORY_NAME = "&AbcD123" GROUPING_NAME
+	// = "" RESOURCE_TYPE = "Resource" STATUS = "400" DESC = "SVC4556: Error:
+	// Invalid Resource sub-category name format.">
+	// DESC=SVC4556: Error: InvalidResourcesub-categorynameformat.,
+	// @Ignore
+	@Test
+	public void subCategoryFirstWordStartWithNonAlphaNumeric() throws Exception {
+		// The first word must start with an alpha-numeric character [a-Z A..Z,
+		// 0..9]
+		char invalidChars[] = { '&', '-', '+', '.', '\'', '#', '=', ':', '@', '_' };
+		for (int i = 0; i < invalidChars.length; i++) {
+			DbUtils.deleteFromEsDbByPattern("_all");
+			resourceSubCategoryDefinition.setName(invalidChars[i] + "AbcD123");
+			RestResponse createSubCategoryRest = CategoryRestUtils.createSubCategory(resourceSubCategoryDefinition,
+					resourceCategoryDefinition, sdncAdminUserDetails, RESOURCE_COMPONENT_TYPE);
+			assertEquals("Check response code after create Category", STATUS_CODE_INVALID_CONTENT,
+					createSubCategoryRest.getErrorCode().intValue());
+			RestResponse getAllCategoriesRest = CategoryRestUtils.getAllCategories(sdncAdminUserDetails,
+					RESOURCE_COMPONENT_TYPE);
+			assertEquals("Check response code after get all categories ", STATUS_CODE_SUCCESS,
+					getAllCategoriesRest.getErrorCode().intValue());
+			CategoryValidationUtils.verifySubCategoryNotExistsInGetResponse(getAllCategoriesRest,
+					resourceCategoryDefinition.getUniqueId(), resourceSubCategoryDefinition);
+			// Audit validation
+			AuditValidationUtils.subCategoryAuditFailure(ADD_SUB_CATEGORY, resourceCategoryDefinition,
+					resourceSubCategoryDefinition, sdncAdminUserDetails,
+					ActionStatus.COMPONENT_ELEMENT_INVALID_NAME_FORMAT, STATUS_CODE_INVALID_CONTENT,
+					AUDIT_RESOURCE_TYPE, AUDIT_RESOURCE_TYPE, SUB_CATEGORY);
+
+		}
+	}
+
+	@Test
+	public void subCategoryReplaceAndWithAmpersand_01() throws Exception {
+		resourceSubCategoryDefinition.setName("At and T");
+		RestResponse createSubCategoryRest = CategoryRestUtils.createSubCategory(resourceSubCategoryDefinition,
+				resourceCategoryDefinition, sdncAdminUserDetails, RESOURCE_COMPONENT_TYPE);
+		assertEquals("Check response code after create Sub category", STATUS_CODE_CREATED,
+				createSubCategoryRest.getErrorCode().intValue());
+		resourceSubCategoryDefinition.setName("At & T");
+		CategoryValidationUtils.validateCreateSubCategoryResponse(createSubCategoryRest, resourceSubCategoryDefinition);
+
+		RestResponse getAllCategoriesRest = CategoryRestUtils.getAllCategories(sdncAdminUserDetails,
+				RESOURCE_COMPONENT_TYPE);
+		assertEquals("Check response code after get all categories ", STATUS_CODE_SUCCESS,
+				getAllCategoriesRest.getErrorCode().intValue());
+		CategoryValidationUtils.verifySubCategoryExistInGetResponse(getAllCategoriesRest,
+				resourceCategoryDefinition.getUniqueId(), resourceSubCategoryDefinition);
+		// Audit validation
+		AuditValidationUtils.subCategoryAuditSuccess(ADD_SUB_CATEGORY, resourceCategoryDefinition,
+				resourceSubCategoryDefinition, sdncAdminUserDetails, STATUS_CODE_CREATED, AUDIT_RESOURCE_TYPE);
+	}
+
+	@Test
+	public void subCategoryReplaceAndWithAmpersand_02() throws Exception {
+		resourceSubCategoryDefinition.setName("At and t");
+		RestResponse createSubCategoryRest = CategoryRestUtils.createSubCategory(resourceSubCategoryDefinition,
+				resourceCategoryDefinition, sdncAdminUserDetails, RESOURCE_COMPONENT_TYPE);
+		assertEquals("Check response code after create Sub category", STATUS_CODE_CREATED,
+				createSubCategoryRest.getErrorCode().intValue());
+		resourceSubCategoryDefinition.setName("At & T");
+		CategoryValidationUtils.validateCreateSubCategoryResponse(createSubCategoryRest, resourceSubCategoryDefinition);
+
+		RestResponse getAllCategoriesRest = CategoryRestUtils.getAllCategories(sdncAdminUserDetails,
+				RESOURCE_COMPONENT_TYPE);
+		assertEquals("Check response code after get all categories ", STATUS_CODE_SUCCESS,
+				getAllCategoriesRest.getErrorCode().intValue());
+		CategoryValidationUtils.verifySubCategoryExistInGetResponse(getAllCategoriesRest,
+				resourceCategoryDefinition.getUniqueId(), resourceSubCategoryDefinition);
+		// Audit validation
+		AuditValidationUtils.subCategoryAuditSuccess(ADD_SUB_CATEGORY, resourceCategoryDefinition,
+				resourceSubCategoryDefinition, sdncAdminUserDetails, STATUS_CODE_CREATED, AUDIT_RESOURCE_TYPE);
+	}
+
+	@Test
+	public void subCategoryReplaceAndWithAmpersand_03() throws Exception {
+		resourceSubCategoryDefinition.setName("Atand T");
+		RestResponse createSubCategoryRest = CategoryRestUtils.createSubCategory(resourceSubCategoryDefinition,
+				resourceCategoryDefinition, sdncAdminUserDetails, RESOURCE_COMPONENT_TYPE);
+		assertEquals("Check response code after create Sub category", STATUS_CODE_CREATED,
+				createSubCategoryRest.getErrorCode().intValue());
+		CategoryValidationUtils.validateCreateSubCategoryResponse(createSubCategoryRest, resourceSubCategoryDefinition);
+
+		RestResponse getAllCategoriesRest = CategoryRestUtils.getAllCategories(sdncAdminUserDetails,
+				RESOURCE_COMPONENT_TYPE);
+		assertEquals("Check response code after get all categories ", STATUS_CODE_SUCCESS,
+				getAllCategoriesRest.getErrorCode().intValue());
+		CategoryValidationUtils.verifySubCategoryExistInGetResponse(getAllCategoriesRest,
+				resourceCategoryDefinition.getUniqueId(), resourceSubCategoryDefinition);
+		// Audit validation
+		AuditValidationUtils.subCategoryAuditSuccess(ADD_SUB_CATEGORY, resourceCategoryDefinition,
+				resourceSubCategoryDefinition, sdncAdminUserDetails, STATUS_CODE_CREATED, AUDIT_RESOURCE_TYPE);
+	}
+
+	@Test
+	public void subCategoryReplaceAndWithAmpersand_04() throws Exception {
+		resourceSubCategoryDefinition.setName("At andT");
+		RestResponse createSubCategoryRest = CategoryRestUtils.createSubCategory(resourceSubCategoryDefinition,
+				resourceCategoryDefinition, sdncAdminUserDetails, RESOURCE_COMPONENT_TYPE);
+		assertEquals("Check response code after create Sub category", STATUS_CODE_CREATED,
+				createSubCategoryRest.getErrorCode().intValue());
+		resourceSubCategoryDefinition.setName("At AndT");
+		CategoryValidationUtils.validateCreateSubCategoryResponse(createSubCategoryRest, resourceSubCategoryDefinition);
+
+		RestResponse getAllCategoriesRest = CategoryRestUtils.getAllCategories(sdncAdminUserDetails,
+				RESOURCE_COMPONENT_TYPE);
+		assertEquals("Check response code after get all categories ", STATUS_CODE_SUCCESS,
+				getAllCategoriesRest.getErrorCode().intValue());
+		CategoryValidationUtils.verifySubCategoryExistInGetResponse(getAllCategoriesRest,
+				resourceCategoryDefinition.getUniqueId(), resourceSubCategoryDefinition);
+		// Audit validation
+		AuditValidationUtils.subCategoryAuditSuccess(ADD_SUB_CATEGORY, resourceCategoryDefinition,
+				resourceSubCategoryDefinition, sdncAdminUserDetails, STATUS_CODE_CREATED, AUDIT_RESOURCE_TYPE);
+	}
+
+	@Test
+	public void subCategoryReplaceAndWithAmpersand_05() throws Exception {
+		resourceSubCategoryDefinition.setName(" and AttT");
+		RestResponse createSubCategoryRest = CategoryRestUtils.createSubCategory(resourceSubCategoryDefinition,
+				resourceCategoryDefinition, sdncAdminUserDetails, RESOURCE_COMPONENT_TYPE);
+		assertEquals("Check response code after create Sub category", STATUS_CODE_CREATED,
+				createSubCategoryRest.getErrorCode().intValue());
+		resourceSubCategoryDefinition.setName("And AttT");
+		CategoryValidationUtils.validateCreateSubCategoryResponse(createSubCategoryRest, resourceSubCategoryDefinition);
+
+		RestResponse getAllCategoriesRest = CategoryRestUtils.getAllCategories(sdncAdminUserDetails,
+				RESOURCE_COMPONENT_TYPE);
+		assertEquals("Check response code after get all categories ", STATUS_CODE_SUCCESS,
+				getAllCategoriesRest.getErrorCode().intValue());
+		CategoryValidationUtils.verifySubCategoryExistInGetResponse(getAllCategoriesRest,
+				resourceCategoryDefinition.getUniqueId(), resourceSubCategoryDefinition);
+		// Audit validation
+		AuditValidationUtils.subCategoryAuditSuccess(ADD_SUB_CATEGORY, resourceCategoryDefinition,
+				resourceSubCategoryDefinition, sdncAdminUserDetails, STATUS_CODE_CREATED, AUDIT_RESOURCE_TYPE);
+	}
+
+	@Test
+	public void subCategoryReplaceAndWithAmpersand_06() throws Exception {
+		resourceSubCategoryDefinition.setName("AttT and ");
+		RestResponse createSubCategoryRest = CategoryRestUtils.createSubCategory(resourceSubCategoryDefinition,
+				resourceCategoryDefinition, sdncAdminUserDetails, RESOURCE_COMPONENT_TYPE);
+		assertEquals("Check response code after create Sub category", STATUS_CODE_CREATED,
+				createSubCategoryRest.getErrorCode().intValue());
+		resourceSubCategoryDefinition.setName("AttT And");
+		CategoryValidationUtils.validateCreateSubCategoryResponse(createSubCategoryRest, resourceSubCategoryDefinition);
+
+		RestResponse getAllCategoriesRest = CategoryRestUtils.getAllCategories(sdncAdminUserDetails,
+				RESOURCE_COMPONENT_TYPE);
+		assertEquals("Check response code after get all categories ", STATUS_CODE_SUCCESS,
+				getAllCategoriesRest.getErrorCode().intValue());
+		CategoryValidationUtils.verifySubCategoryExistInGetResponse(getAllCategoriesRest,
+				resourceCategoryDefinition.getUniqueId(), resourceSubCategoryDefinition);
+		// Audit validation
+		AuditValidationUtils.subCategoryAuditSuccess(ADD_SUB_CATEGORY, resourceCategoryDefinition,
+				resourceSubCategoryDefinition, sdncAdminUserDetails, STATUS_CODE_CREATED, AUDIT_RESOURCE_TYPE);
+	}
+
+	@Test
+	public void subCategoryReplaceAndWithAmpersand_07() throws Exception {
+		resourceSubCategoryDefinition.setName(" and a");
+		RestResponse createSubCategoryRest = CategoryRestUtils.createSubCategory(resourceSubCategoryDefinition,
+				resourceCategoryDefinition, sdncAdminUserDetails, RESOURCE_COMPONENT_TYPE);
+		assertEquals("Check response code after create Sub category", STATUS_CODE_CREATED,
+				createSubCategoryRest.getErrorCode().intValue());
+		resourceSubCategoryDefinition.setName("And a");
+		CategoryValidationUtils.validateCreateSubCategoryResponse(createSubCategoryRest, resourceSubCategoryDefinition);
+
+		RestResponse getAllCategoriesRest = CategoryRestUtils.getAllCategories(sdncAdminUserDetails,
+				RESOURCE_COMPONENT_TYPE);
+		assertEquals("Check response code after get all categories ", STATUS_CODE_SUCCESS,
+				getAllCategoriesRest.getErrorCode().intValue());
+		CategoryValidationUtils.verifySubCategoryExistInGetResponse(getAllCategoriesRest,
+				resourceCategoryDefinition.getUniqueId(), resourceSubCategoryDefinition);
+		// Audit validation
+		AuditValidationUtils.subCategoryAuditSuccess(ADD_SUB_CATEGORY, resourceCategoryDefinition,
+				resourceSubCategoryDefinition, sdncAdminUserDetails, STATUS_CODE_CREATED, AUDIT_RESOURCE_TYPE);
+	}
+
+	@Test
+	public void subCategoryNameValidationMaxLength() throws Exception {
+		resourceSubCategoryDefinition.setName("AsdfghjQ234567890@#.&:+-_");
+		RestResponse createSubCategoryRest = CategoryRestUtils.createSubCategory(resourceSubCategoryDefinition,
+				resourceCategoryDefinition, sdncAdminUserDetails, RESOURCE_COMPONENT_TYPE);
+		assertEquals("Check response code after create Sub category", STATUS_CODE_CREATED,
+				createSubCategoryRest.getErrorCode().intValue());
+		CategoryValidationUtils.validateCreateSubCategoryResponse(createSubCategoryRest, resourceSubCategoryDefinition);
+
+		RestResponse getAllCategoriesRest = CategoryRestUtils.getAllCategories(sdncAdminUserDetails,
+				RESOURCE_COMPONENT_TYPE);
+		assertEquals("Check response code after get all categories ", STATUS_CODE_SUCCESS,
+				getAllCategoriesRest.getErrorCode().intValue());
+		CategoryValidationUtils.verifySubCategoryExistInGetResponse(getAllCategoriesRest,
+				resourceCategoryDefinition.getUniqueId(), resourceSubCategoryDefinition);
+		// Audit validation
+		AuditValidationUtils.subCategoryAuditSuccess(ADD_SUB_CATEGORY, resourceCategoryDefinition,
+				resourceSubCategoryDefinition, sdncAdminUserDetails, STATUS_CODE_CREATED, AUDIT_RESOURCE_TYPE);
+	}
+
+	@Test
+	public void subCategoryNameValidationMaxLengthAfterNormalization() throws Exception {
+		resourceSubCategoryDefinition.setName("  A jQ234 @@@___ +++ At and T and and ");
+		RestResponse createSubCategoryRest = CategoryRestUtils.createSubCategory(resourceSubCategoryDefinition,
+				resourceCategoryDefinition, sdncAdminUserDetails, RESOURCE_COMPONENT_TYPE);
+		assertEquals("Check response code after create Sub category", STATUS_CODE_CREATED,
+				createSubCategoryRest.getErrorCode().intValue());
+		resourceSubCategoryDefinition.setName("A JQ234 @_ + At & T & And");
+		CategoryValidationUtils.validateCreateSubCategoryResponse(createSubCategoryRest, resourceSubCategoryDefinition);
+
+		RestResponse getAllCategoriesRest = CategoryRestUtils.getAllCategories(sdncAdminUserDetails,
+				RESOURCE_COMPONENT_TYPE);
+		assertEquals("Check response code after get all categories ", STATUS_CODE_SUCCESS,
+				getAllCategoriesRest.getErrorCode().intValue());
+		CategoryValidationUtils.verifySubCategoryExistInGetResponse(getAllCategoriesRest,
+				resourceCategoryDefinition.getUniqueId(), resourceSubCategoryDefinition);
+		// Audit validation
+		AuditValidationUtils.subCategoryAuditSuccess(ADD_SUB_CATEGORY, resourceCategoryDefinition,
+				resourceSubCategoryDefinition, sdncAdminUserDetails, STATUS_CODE_CREATED, AUDIT_RESOURCE_TYPE);
+	}
+
+	// bug :
+	// Desc=<ACTION = "AddSubCategory" MODIFIER = "Jimmy Hendrix(jh0003)"
+	// CATEGORY_NAME = "Category1" SUB_CATEGORY_NAME = " AbdfghBCVa jQ234 @@___
+	// +++ At and T " GROUPING_NAME = "" RESOURCE_TYPE = "Resource" STATUS =
+	// "400" DESC = "SVC4555: Error: Invalid Resource sub-category name
+	// length.">
+	@Test
+	public void subCategoryNameValidationExceedMaxLengthAfterNormalization() throws Exception {
+		resourceSubCategoryDefinition.setName("  AbdfghBCVa jQ234 @@___ +++ At and T   ");
+		RestResponse createSubCategoryRest = CategoryRestUtils.createSubCategory(resourceSubCategoryDefinition,
+				resourceCategoryDefinition, sdncAdminUserDetails, RESOURCE_COMPONENT_TYPE);
+		assertEquals("Check response code after create Sub category", STATUS_CODE_INVALID_CONTENT,
+				createSubCategoryRest.getErrorCode().intValue());
+		RestResponse getAllCategoriesRest = CategoryRestUtils.getAllCategories(sdncAdminUserDetails,
+				RESOURCE_COMPONENT_TYPE);
+		assertEquals("Check response code after get all categories ", STATUS_CODE_SUCCESS,
+				getAllCategoriesRest.getErrorCode().intValue());
+		CategoryValidationUtils.verifySubCategoryNotExistsInGetResponse(getAllCategoriesRest,
+				resourceCategoryDefinition.getUniqueId(), resourceSubCategoryDefinition);
+		// Audit validation
+		AuditValidationUtils.subCategoryAuditFailure(ADD_SUB_CATEGORY, resourceCategoryDefinition,
+				resourceSubCategoryDefinition, sdncAdminUserDetails, ActionStatus.COMPONENT_ELEMENT_INVALID_NAME_LENGTH,
+				STATUS_CODE_INVALID_CONTENT, AUDIT_RESOURCE_TYPE, AUDIT_RESOURCE_TYPE, SUB_CATEGORY);
+	}
+
+	@Test
+	public void subCategoryNameValidationMinLengthAfterNormalization() throws Exception {
+		resourceSubCategoryDefinition.setName("  AT&&&&&&&&&T   ");
+		RestResponse createSubCategoryRest = CategoryRestUtils.createSubCategory(resourceSubCategoryDefinition,
+				resourceCategoryDefinition, sdncAdminUserDetails, RESOURCE_COMPONENT_TYPE);
+		assertEquals("Check response code after create Sub category", STATUS_CODE_CREATED,
+				createSubCategoryRest.getErrorCode().intValue());
+		resourceSubCategoryDefinition.setName("AT&T");
+		CategoryValidationUtils.validateCreateSubCategoryResponse(createSubCategoryRest, resourceSubCategoryDefinition);
+
+		RestResponse getAllCategoriesRest = CategoryRestUtils.getAllCategories(sdncAdminUserDetails,
+				RESOURCE_COMPONENT_TYPE);
+		assertEquals("Check response code after get all categories ", STATUS_CODE_SUCCESS,
+				getAllCategoriesRest.getErrorCode().intValue());
+		CategoryValidationUtils.verifySubCategoryExistInGetResponse(getAllCategoriesRest,
+				resourceCategoryDefinition.getUniqueId(), resourceSubCategoryDefinition);
+		// Audit validation
+		AuditValidationUtils.subCategoryAuditSuccess(ADD_SUB_CATEGORY, resourceCategoryDefinition,
+				resourceSubCategoryDefinition, sdncAdminUserDetails, STATUS_CODE_CREATED, AUDIT_RESOURCE_TYPE);
+	}
+
+	// bug
+	// Desc=<ACTION = "AddSubCategory" MODIFIER = "Jimmy Hendrix(jh0003)"
+	// CATEGORY_NAME = "Category1" SUB_CATEGORY_NAME = " A and T " GROUPING_NAME
+	// = "" RESOURCE_TYPE = "Resource" STATUS = "400" DESC = "SVC4555: Error:
+	// Invalid Resource sub-category name length.">
+	@Test
+	public void subCategoryNameValidationLessThanMinLengthAfterNormalization() throws Exception {
+		resourceSubCategoryDefinition.setName("  A&&&T   ");
+		RestResponse createSubCategoryRest = CategoryRestUtils.createSubCategory(resourceSubCategoryDefinition,
+				resourceCategoryDefinition, sdncAdminUserDetails, RESOURCE_COMPONENT_TYPE);
+		assertEquals("Check response code after create Sub category", STATUS_CODE_INVALID_CONTENT,
+				createSubCategoryRest.getErrorCode().intValue());
+		RestResponse getAllCategoriesRest = CategoryRestUtils.getAllCategories(sdncAdminUserDetails,
+				RESOURCE_COMPONENT_TYPE);
+		assertEquals("Check response code after get all categories ", STATUS_CODE_SUCCESS,
+				getAllCategoriesRest.getErrorCode().intValue());
+		CategoryValidationUtils.verifySubCategoryNotExistsInGetResponse(getAllCategoriesRest,
+				resourceCategoryDefinition.getUniqueId(), resourceSubCategoryDefinition);
+		// Audit validation
+		AuditValidationUtils.subCategoryAuditFailure(ADD_SUB_CATEGORY, resourceCategoryDefinition,
+				resourceSubCategoryDefinition, sdncAdminUserDetails, ActionStatus.COMPONENT_ELEMENT_INVALID_NAME_LENGTH,
+				STATUS_CODE_INVALID_CONTENT, AUDIT_RESOURCE_TYPE, AUDIT_RESOURCE_TYPE, SUB_CATEGORY);
+	}
+
+	@Test
+	public void subCategoryNameIsEmpty() throws Exception {
+		resourceSubCategoryDefinition.setName("");
+		RestResponse createSubCategoryRest = CategoryRestUtils.createSubCategory(resourceSubCategoryDefinition,
+				resourceCategoryDefinition, sdncAdminUserDetails, RESOURCE_COMPONENT_TYPE);
+		assertEquals("Check response code after create Sub category", STATUS_CODE_INVALID_CONTENT,
+				createSubCategoryRest.getErrorCode().intValue());
+		RestResponse getAllCategoriesRest = CategoryRestUtils.getAllCategories(sdncAdminUserDetails,
+				RESOURCE_COMPONENT_TYPE);
+		assertEquals("Check response code after get all categories ", STATUS_CODE_SUCCESS,
+				getAllCategoriesRest.getErrorCode().intValue());
+		CategoryValidationUtils.verifySubCategoryNotExistsInGetResponse(getAllCategoriesRest,
+				resourceCategoryDefinition.getUniqueId(), resourceSubCategoryDefinition);
+		// Audit validation
+		AuditValidationUtils.subCategoryAuditFailure(ADD_SUB_CATEGORY, resourceCategoryDefinition,
+				resourceSubCategoryDefinition, sdncAdminUserDetails, ActionStatus.COMPONENT_ELEMENT_INVALID_NAME_FORMAT,
+				STATUS_CODE_INVALID_CONTENT, AUDIT_RESOURCE_TYPE, AUDIT_RESOURCE_TYPE, SUB_CATEGORY);
+	}
+
+	// bug
+	// Desc=<ACTION = "AddSubCategory" MODIFIER = "Jimmy Hendrix(jh0003)"
+	// CATEGORY_NAME = "Category1" SUB_CATEGORY_NAME = "AbcD123~" GROUPING_NAME
+	// = "" RESOURCE_TYPE = "Resource" STATUS = "400" DESC = "SVC4556: Error:
+	// Invalid Resource sub-category name format.">
+	@Test
+	public void subCategoryNameValidationInvalidCharacters() throws Exception {
+		char invalidChars[] = { '~', '!', '$', '%', '^', '*', '(', ')', '"', '{', '}', '[', ']', '?', '>', '<', '/',
+				'|', '\\', ',' };
+		for (int i = 0; i < invalidChars.length; i++) {
+			DbUtils.deleteFromEsDbByPattern("_all");
+			resourceSubCategoryDefinition.setName("AbcD123" + invalidChars[i]);
+			RestResponse createSubCategoryRest = CategoryRestUtils.createSubCategory(resourceSubCategoryDefinition,
+					resourceCategoryDefinition, sdncAdminUserDetails, RESOURCE_COMPONENT_TYPE);
+			assertEquals("Check response code after create Sub category", STATUS_CODE_INVALID_CONTENT,
+					createSubCategoryRest.getErrorCode().intValue());
+			RestResponse getAllCategoriesRest = CategoryRestUtils.getAllCategories(sdncAdminUserDetails,
+					RESOURCE_COMPONENT_TYPE);
+			assertEquals("Check response code after get all categories ", STATUS_CODE_SUCCESS,
+					getAllCategoriesRest.getErrorCode().intValue());
+			CategoryValidationUtils.verifySubCategoryNotExistsInGetResponse(getAllCategoriesRest,
+					resourceCategoryDefinition.getUniqueId(), resourceSubCategoryDefinition);
+			// Audit validation
+			AuditValidationUtils.subCategoryAuditFailure(ADD_SUB_CATEGORY, resourceCategoryDefinition,
+					resourceSubCategoryDefinition, sdncAdminUserDetails,
+					ActionStatus.COMPONENT_ELEMENT_INVALID_NAME_FORMAT, STATUS_CODE_INVALID_CONTENT,
+					AUDIT_RESOURCE_TYPE, AUDIT_RESOURCE_TYPE, SUB_CATEGORY);
+		}
+	}
+
+	@Test
+	public void subCategoryNameValidationFirstLetterOfKeyWordsCapitalized() throws Exception {
+		resourceSubCategoryDefinition.setName("beNNy shaY michEl");
+		RestResponse createSubCategoryRest = CategoryRestUtils.createSubCategory(resourceSubCategoryDefinition,
+				resourceCategoryDefinition, sdncAdminUserDetails, RESOURCE_COMPONENT_TYPE);
+		assertEquals("Check response code after create Sub category", STATUS_CODE_CREATED,
+				createSubCategoryRest.getErrorCode().intValue());
+		resourceSubCategoryDefinition.setName("BeNNy ShaY MichEl");
+		CategoryValidationUtils.validateCreateSubCategoryResponse(createSubCategoryRest, resourceSubCategoryDefinition);
+
+		RestResponse getAllCategoriesRest = CategoryRestUtils.getAllCategories(sdncAdminUserDetails,
+				RESOURCE_COMPONENT_TYPE);
+		assertEquals("Check response code after get all categories ", STATUS_CODE_SUCCESS,
+				getAllCategoriesRest.getErrorCode().intValue());
+		CategoryValidationUtils.verifySubCategoryExistInGetResponse(getAllCategoriesRest,
+				resourceCategoryDefinition.getUniqueId(), resourceSubCategoryDefinition);
+		// Audit validation
+		AuditValidationUtils.subCategoryAuditSuccess(ADD_SUB_CATEGORY, resourceCategoryDefinition,
+				resourceSubCategoryDefinition, sdncAdminUserDetails, STATUS_CODE_CREATED, AUDIT_RESOURCE_TYPE);
+	}
+
+	@Test
+	public void subCategoryNameValidationConjunctions_01() throws Exception {
+		resourceSubCategoryDefinition.setName(" bank OF america  ");
+		RestResponse createSubCategoryRest = CategoryRestUtils.createSubCategory(resourceSubCategoryDefinition,
+				resourceCategoryDefinition, sdncAdminUserDetails, RESOURCE_COMPONENT_TYPE);
+		assertEquals("Check response code after create Sub category", STATUS_CODE_CREATED,
+				createSubCategoryRest.getErrorCode().intValue());
+		resourceSubCategoryDefinition.setName("Bank of America");
+		CategoryValidationUtils.validateCreateSubCategoryResponse(createSubCategoryRest, resourceSubCategoryDefinition);
+
+		RestResponse getAllCategoriesRest = CategoryRestUtils.getAllCategories(sdncAdminUserDetails,
+				RESOURCE_COMPONENT_TYPE);
+		assertEquals("Check response code after get all categories ", STATUS_CODE_SUCCESS,
+				getAllCategoriesRest.getErrorCode().intValue());
+		CategoryValidationUtils.verifySubCategoryExistInGetResponse(getAllCategoriesRest,
+				resourceCategoryDefinition.getUniqueId(), resourceSubCategoryDefinition);
+		// Audit validation
+		AuditValidationUtils.subCategoryAuditSuccess(ADD_SUB_CATEGORY, resourceCategoryDefinition,
+				resourceSubCategoryDefinition, sdncAdminUserDetails, STATUS_CODE_CREATED, AUDIT_RESOURCE_TYPE);
+	}
+
+	@Test
+	public void subCategoryNameValidationConjunctions_02() throws Exception {
+		resourceSubCategoryDefinition.setName("THE america bank   ");
+		RestResponse createSubCategoryRest = CategoryRestUtils.createSubCategory(resourceSubCategoryDefinition,
+				resourceCategoryDefinition, sdncAdminUserDetails, RESOURCE_COMPONENT_TYPE);
+		assertEquals("Check response code after create Sub category", STATUS_CODE_CREATED,
+				createSubCategoryRest.getErrorCode().intValue());
+		resourceSubCategoryDefinition.setName("THE America Bank");
+		CategoryValidationUtils.validateCreateSubCategoryResponse(createSubCategoryRest, resourceSubCategoryDefinition);
+
+		RestResponse getAllCategoriesRest = CategoryRestUtils.getAllCategories(sdncAdminUserDetails,
+				RESOURCE_COMPONENT_TYPE);
+		assertEquals("Check response code after get all categories ", STATUS_CODE_SUCCESS,
+				getAllCategoriesRest.getErrorCode().intValue());
+		CategoryValidationUtils.verifySubCategoryExistInGetResponse(getAllCategoriesRest,
+				resourceCategoryDefinition.getUniqueId(), resourceSubCategoryDefinition);
+		// Audit validation
+		AuditValidationUtils.subCategoryAuditSuccess(ADD_SUB_CATEGORY, resourceCategoryDefinition,
+				resourceSubCategoryDefinition, sdncAdminUserDetails, STATUS_CODE_CREATED, AUDIT_RESOURCE_TYPE);
+	}
+
+	@Test
+	public void subCategoryNameValidationConjunctions_03() throws Exception {
+		resourceSubCategoryDefinition.setName("   A bank OF america  ");
+		RestResponse createSubCategoryRest = CategoryRestUtils.createSubCategory(resourceSubCategoryDefinition,
+				resourceCategoryDefinition, sdncAdminUserDetails, RESOURCE_COMPONENT_TYPE);
+		assertEquals("Check response code after create Sub category", STATUS_CODE_CREATED,
+				createSubCategoryRest.getErrorCode().intValue());
+		resourceSubCategoryDefinition.setName("A Bank of America");
+		CategoryValidationUtils.validateCreateSubCategoryResponse(createSubCategoryRest, resourceSubCategoryDefinition);
+
+		RestResponse getAllCategoriesRest = CategoryRestUtils.getAllCategories(sdncAdminUserDetails,
+				RESOURCE_COMPONENT_TYPE);
+		assertEquals("Check response code after get all categories ", STATUS_CODE_SUCCESS,
+				getAllCategoriesRest.getErrorCode().intValue());
+		CategoryValidationUtils.verifySubCategoryExistInGetResponse(getAllCategoriesRest,
+				resourceCategoryDefinition.getUniqueId(), resourceSubCategoryDefinition);
+		// Audit validation
+		AuditValidationUtils.subCategoryAuditSuccess(ADD_SUB_CATEGORY, resourceCategoryDefinition,
+				resourceSubCategoryDefinition, sdncAdminUserDetails, STATUS_CODE_CREATED, AUDIT_RESOURCE_TYPE);
+	}
+
+	@Test
+	public void subCategoryNameValidationConjunctions_04() throws Exception {
+		resourceSubCategoryDefinition.setName("  bank  america is A big ban  ");
+		RestResponse createSubCategoryRest = CategoryRestUtils.createSubCategory(resourceSubCategoryDefinition,
+				resourceCategoryDefinition, sdncAdminUserDetails, RESOURCE_COMPONENT_TYPE);
+		assertEquals("Check response code after create Sub category", STATUS_CODE_CREATED,
+				createSubCategoryRest.getErrorCode().intValue());
+		resourceSubCategoryDefinition.setName("Bank America Is a Big Ban");
+		CategoryValidationUtils.validateCreateSubCategoryResponse(createSubCategoryRest, resourceSubCategoryDefinition);
+
+		RestResponse getAllCategoriesRest = CategoryRestUtils.getAllCategories(sdncAdminUserDetails,
+				RESOURCE_COMPONENT_TYPE);
+		assertEquals("Check response code after get all categories ", STATUS_CODE_SUCCESS,
+				getAllCategoriesRest.getErrorCode().intValue());
+		CategoryValidationUtils.verifySubCategoryExistInGetResponse(getAllCategoriesRest,
+				resourceCategoryDefinition.getUniqueId(), resourceSubCategoryDefinition);
+		// Audit validation
+		AuditValidationUtils.subCategoryAuditSuccess(ADD_SUB_CATEGORY, resourceCategoryDefinition,
+				resourceSubCategoryDefinition, sdncAdminUserDetails, STATUS_CODE_CREATED, AUDIT_RESOURCE_TYPE);
+	}
+
+	@Test
+	public void subCategoryNameValidationConjunctions_05() throws Exception {
+		resourceSubCategoryDefinition.setName(" aN apple comPany inC ");
+		RestResponse createSubCategoryRest = CategoryRestUtils.createSubCategory(resourceSubCategoryDefinition,
+				resourceCategoryDefinition, sdncAdminUserDetails, RESOURCE_COMPONENT_TYPE);
+		assertEquals("Check response code after create Sub category", STATUS_CODE_CREATED,
+				createSubCategoryRest.getErrorCode().intValue());
+		resourceSubCategoryDefinition.setName("AN Apple ComPany InC");
+		CategoryValidationUtils.validateCreateSubCategoryResponse(createSubCategoryRest, resourceSubCategoryDefinition);
+
+		RestResponse getAllCategoriesRest = CategoryRestUtils.getAllCategories(sdncAdminUserDetails,
+				RESOURCE_COMPONENT_TYPE);
+		assertEquals("Check response code after get all categories ", STATUS_CODE_SUCCESS,
+				getAllCategoriesRest.getErrorCode().intValue());
+		CategoryValidationUtils.verifySubCategoryExistInGetResponse(getAllCategoriesRest,
+				resourceCategoryDefinition.getUniqueId(), resourceSubCategoryDefinition);
+		// Audit validation
+		AuditValidationUtils.subCategoryAuditSuccess(ADD_SUB_CATEGORY, resourceCategoryDefinition,
+				resourceSubCategoryDefinition, sdncAdminUserDetails, STATUS_CODE_CREATED, AUDIT_RESOURCE_TYPE);
+	}
+
+	@Test
+	public void subCategoryNameValidationConjunctions_06() throws Exception {
+		resourceSubCategoryDefinition.setName(" eat AN apple ANAN");
+		RestResponse createSubCategoryRest = CategoryRestUtils.createSubCategory(resourceSubCategoryDefinition,
+				resourceCategoryDefinition, sdncAdminUserDetails, RESOURCE_COMPONENT_TYPE);
+		assertEquals("Check response code after create Sub category", STATUS_CODE_CREATED,
+				createSubCategoryRest.getErrorCode().intValue());
+		resourceSubCategoryDefinition.setName("Eat an Apple ANAN");
+		CategoryValidationUtils.validateCreateSubCategoryResponse(createSubCategoryRest, resourceSubCategoryDefinition);
+
+		RestResponse getAllCategoriesRest = CategoryRestUtils.getAllCategories(sdncAdminUserDetails,
+				RESOURCE_COMPONENT_TYPE);
+		assertEquals("Check response code after get all categories ", STATUS_CODE_SUCCESS,
+				getAllCategoriesRest.getErrorCode().intValue());
+		CategoryValidationUtils.verifySubCategoryExistInGetResponse(getAllCategoriesRest,
+				resourceCategoryDefinition.getUniqueId(), resourceSubCategoryDefinition);
+		// Audit validation
+		AuditValidationUtils.subCategoryAuditSuccess(ADD_SUB_CATEGORY, resourceCategoryDefinition,
+				resourceSubCategoryDefinition, sdncAdminUserDetails, STATUS_CODE_CREATED, AUDIT_RESOURCE_TYPE);
+	}
+
+	@Test
+	public void subCategoryNameValidationConjunctions_07() throws Exception {
+		resourceSubCategoryDefinition.setName(" united states OF americA ");
+		RestResponse createSubCategoryRest = CategoryRestUtils.createSubCategory(resourceSubCategoryDefinition,
+				resourceCategoryDefinition, sdncAdminUserDetails, RESOURCE_COMPONENT_TYPE);
+		assertEquals("Check response code after create Sub category", STATUS_CODE_CREATED,
+				createSubCategoryRest.getErrorCode().intValue());
+		resourceSubCategoryDefinition.setName("United States of AmericA");
+		CategoryValidationUtils.validateCreateSubCategoryResponse(createSubCategoryRest, resourceSubCategoryDefinition);
+
+		RestResponse getAllCategoriesRest = CategoryRestUtils.getAllCategories(sdncAdminUserDetails,
+				RESOURCE_COMPONENT_TYPE);
+		assertEquals("Check response code after get all categories ", STATUS_CODE_SUCCESS,
+				getAllCategoriesRest.getErrorCode().intValue());
+		CategoryValidationUtils.verifySubCategoryExistInGetResponse(getAllCategoriesRest,
+				resourceCategoryDefinition.getUniqueId(), resourceSubCategoryDefinition);
+		// Audit validation
+		AuditValidationUtils.subCategoryAuditSuccess(ADD_SUB_CATEGORY, resourceCategoryDefinition,
+				resourceSubCategoryDefinition, sdncAdminUserDetails, STATUS_CODE_CREATED, AUDIT_RESOURCE_TYPE);
+	}
+
+	@Test
+	public void subCategoryNameValidationConjunctions_08() throws Exception {
+		resourceSubCategoryDefinition.setName(" oF united states OF amer ");
+		RestResponse createSubCategoryRest = CategoryRestUtils.createSubCategory(resourceSubCategoryDefinition,
+				resourceCategoryDefinition, sdncAdminUserDetails, RESOURCE_COMPONENT_TYPE);
+		assertEquals("Check response code after create Sub category", STATUS_CODE_CREATED,
+				createSubCategoryRest.getErrorCode().intValue());
+		resourceSubCategoryDefinition.setName("OF United States of Amer");
+		CategoryValidationUtils.validateCreateSubCategoryResponse(createSubCategoryRest, resourceSubCategoryDefinition);
+
+		RestResponse getAllCategoriesRest = CategoryRestUtils.getAllCategories(sdncAdminUserDetails,
+				RESOURCE_COMPONENT_TYPE);
+		assertEquals("Check response code after get all categories ", STATUS_CODE_SUCCESS,
+				getAllCategoriesRest.getErrorCode().intValue());
+		CategoryValidationUtils.verifySubCategoryExistInGetResponse(getAllCategoriesRest,
+				resourceCategoryDefinition.getUniqueId(), resourceSubCategoryDefinition);
+		// Audit validation
+		AuditValidationUtils.subCategoryAuditSuccess(ADD_SUB_CATEGORY, resourceCategoryDefinition,
+				resourceSubCategoryDefinition, sdncAdminUserDetails, STATUS_CODE_CREATED, AUDIT_RESOURCE_TYPE);
+	}
+
+	@Test
+	public void subCategoryNameValidationConjunctions_09() throws Exception {
+		resourceSubCategoryDefinition.setName(" to Apple TO at&T TOO ");
+		RestResponse createSubCategoryRest = CategoryRestUtils.createSubCategory(resourceSubCategoryDefinition,
+				resourceCategoryDefinition, sdncAdminUserDetails, RESOURCE_COMPONENT_TYPE);
+		assertEquals("Check response code after create Sub category", STATUS_CODE_CREATED,
+				createSubCategoryRest.getErrorCode().intValue());
+		resourceSubCategoryDefinition.setName("To Apple to At&T TOO");
+		CategoryValidationUtils.validateCreateSubCategoryResponse(createSubCategoryRest, resourceSubCategoryDefinition);
+
+		RestResponse getAllCategoriesRest = CategoryRestUtils.getAllCategories(sdncAdminUserDetails,
+				RESOURCE_COMPONENT_TYPE);
+		assertEquals("Check response code after get all categories ", STATUS_CODE_SUCCESS,
+				getAllCategoriesRest.getErrorCode().intValue());
+		CategoryValidationUtils.verifySubCategoryExistInGetResponse(getAllCategoriesRest,
+				resourceCategoryDefinition.getUniqueId(), resourceSubCategoryDefinition);
+		// Audit validation
+		AuditValidationUtils.subCategoryAuditSuccess(ADD_SUB_CATEGORY, resourceCategoryDefinition,
+				resourceSubCategoryDefinition, sdncAdminUserDetails, STATUS_CODE_CREATED, AUDIT_RESOURCE_TYPE);
+	}
+
+	@Test
+	public void subCategoryNameValidationConjunctions_10() throws Exception {
+		resourceSubCategoryDefinition.setName(" eat apple AS you liiikeas ");
+		RestResponse createSubCategoryRest = CategoryRestUtils.createSubCategory(resourceSubCategoryDefinition,
+				resourceCategoryDefinition, sdncAdminUserDetails, RESOURCE_COMPONENT_TYPE);
+		assertEquals("Check response code after create Sub category", STATUS_CODE_CREATED,
+				createSubCategoryRest.getErrorCode().intValue());
+		resourceSubCategoryDefinition.setName("Eat Apple as You Liiikeas");
+		CategoryValidationUtils.validateCreateSubCategoryResponse(createSubCategoryRest, resourceSubCategoryDefinition);
+
+		RestResponse getAllCategoriesRest = CategoryRestUtils.getAllCategories(sdncAdminUserDetails,
+				RESOURCE_COMPONENT_TYPE);
+		assertEquals("Check response code after get all categories ", STATUS_CODE_SUCCESS,
+				getAllCategoriesRest.getErrorCode().intValue());
+		CategoryValidationUtils.verifySubCategoryExistInGetResponse(getAllCategoriesRest,
+				resourceCategoryDefinition.getUniqueId(), resourceSubCategoryDefinition);
+		// Audit validation
+		AuditValidationUtils.subCategoryAuditSuccess(ADD_SUB_CATEGORY, resourceCategoryDefinition,
+				resourceSubCategoryDefinition, sdncAdminUserDetails, STATUS_CODE_CREATED, AUDIT_RESOURCE_TYPE);
+	}
+
+	@Test
+	public void subCategoryNameValidationConjunctions_11() throws Exception {
+		resourceSubCategoryDefinition.setName(" as you may want ");
+		RestResponse createSubCategoryRest = CategoryRestUtils.createSubCategory(resourceSubCategoryDefinition,
+				resourceCategoryDefinition, sdncAdminUserDetails, RESOURCE_COMPONENT_TYPE);
+		assertEquals("Check response code after create Sub category", STATUS_CODE_CREATED,
+				createSubCategoryRest.getErrorCode().intValue());
+		resourceSubCategoryDefinition.setName("As You May Want");
+		CategoryValidationUtils.validateCreateSubCategoryResponse(createSubCategoryRest, resourceSubCategoryDefinition);
+
+		RestResponse getAllCategoriesRest = CategoryRestUtils.getAllCategories(sdncAdminUserDetails,
+				RESOURCE_COMPONENT_TYPE);
+		assertEquals("Check response code after get all categories ", STATUS_CODE_SUCCESS,
+				getAllCategoriesRest.getErrorCode().intValue());
+		CategoryValidationUtils.verifySubCategoryExistInGetResponse(getAllCategoriesRest,
+				resourceCategoryDefinition.getUniqueId(), resourceSubCategoryDefinition);
+		// Audit validation
+		AuditValidationUtils.subCategoryAuditSuccess(ADD_SUB_CATEGORY, resourceCategoryDefinition,
+				resourceSubCategoryDefinition, sdncAdminUserDetails, STATUS_CODE_CREATED, AUDIT_RESOURCE_TYPE);
+	}
+
+	@Test
+	public void subCategoryNameValidationConjunctions_12() throws Exception {
+		resourceSubCategoryDefinition.setName(" the bank OF america ");
+		RestResponse createSubCategoryRest = CategoryRestUtils.createSubCategory(resourceSubCategoryDefinition,
+				resourceCategoryDefinition, sdncAdminUserDetails, RESOURCE_COMPONENT_TYPE);
+		assertEquals("Check response code after create Sub category", STATUS_CODE_CREATED,
+				createSubCategoryRest.getErrorCode().intValue());
+		resourceSubCategoryDefinition.setName("The Bank of America");
+		CategoryValidationUtils.validateCreateSubCategoryResponse(createSubCategoryRest, resourceSubCategoryDefinition);
+
+		RestResponse getAllCategoriesRest = CategoryRestUtils.getAllCategories(sdncAdminUserDetails,
+				RESOURCE_COMPONENT_TYPE);
+		assertEquals("Check response code after get all categories ", STATUS_CODE_SUCCESS,
+				getAllCategoriesRest.getErrorCode().intValue());
+		CategoryValidationUtils.verifySubCategoryExistInGetResponse(getAllCategoriesRest,
+				resourceCategoryDefinition.getUniqueId(), resourceSubCategoryDefinition);
+		// Audit validation
+		AuditValidationUtils.subCategoryAuditSuccess(ADD_SUB_CATEGORY, resourceCategoryDefinition,
+				resourceSubCategoryDefinition, sdncAdminUserDetails, STATUS_CODE_CREATED, AUDIT_RESOURCE_TYPE);
+	}
+
+	@Test
+	public void subCategoryNameValidationConjunctions_13() throws Exception {
+		resourceSubCategoryDefinition.setName("  To tel-toto ");
+		RestResponse createSubCategoryRest = CategoryRestUtils.createSubCategory(resourceSubCategoryDefinition,
+				resourceCategoryDefinition, sdncAdminUserDetails, RESOURCE_COMPONENT_TYPE);
+		assertEquals("Check response code after create Sub category", STATUS_CODE_CREATED,
+				createSubCategoryRest.getErrorCode().intValue());
+		resourceSubCategoryDefinition.setName("To Tel-toto");
+		CategoryValidationUtils.validateCreateSubCategoryResponse(createSubCategoryRest, resourceSubCategoryDefinition);
+
+		RestResponse getAllCategoriesRest = CategoryRestUtils.getAllCategories(sdncAdminUserDetails,
+				RESOURCE_COMPONENT_TYPE);
+		assertEquals("Check response code after get all categories ", STATUS_CODE_SUCCESS,
+				getAllCategoriesRest.getErrorCode().intValue());
+		CategoryValidationUtils.verifySubCategoryExistInGetResponse(getAllCategoriesRest,
+				resourceCategoryDefinition.getUniqueId(), resourceSubCategoryDefinition);
+		// Audit validation
+		AuditValidationUtils.subCategoryAuditSuccess(ADD_SUB_CATEGORY, resourceCategoryDefinition,
+				resourceSubCategoryDefinition, sdncAdminUserDetails, STATUS_CODE_CREATED, AUDIT_RESOURCE_TYPE);
+	}
+
+	@Test
+	public void subCategoryNameValidationConjunctions_14() throws Exception {
+		resourceSubCategoryDefinition.setName("   tel-aviv To   la ");
+		RestResponse createSubCategoryRest = CategoryRestUtils.createSubCategory(resourceSubCategoryDefinition,
+				resourceCategoryDefinition, sdncAdminUserDetails, RESOURCE_COMPONENT_TYPE);
+		assertEquals("Check response code after create Sub category", STATUS_CODE_CREATED,
+				createSubCategoryRest.getErrorCode().intValue());
+		resourceSubCategoryDefinition.setName("Tel-aviv to La");
+		CategoryValidationUtils.validateCreateSubCategoryResponse(createSubCategoryRest, resourceSubCategoryDefinition);
+
+		RestResponse getAllCategoriesRest = CategoryRestUtils.getAllCategories(sdncAdminUserDetails,
+				RESOURCE_COMPONENT_TYPE);
+		assertEquals("Check response code after get all categories ", STATUS_CODE_SUCCESS,
+				getAllCategoriesRest.getErrorCode().intValue());
+		CategoryValidationUtils.verifySubCategoryExistInGetResponse(getAllCategoriesRest,
+				resourceCategoryDefinition.getUniqueId(), resourceSubCategoryDefinition);
+		// Audit validation
+		AuditValidationUtils.subCategoryAuditSuccess(ADD_SUB_CATEGORY, resourceCategoryDefinition,
+				resourceSubCategoryDefinition, sdncAdminUserDetails, STATUS_CODE_CREATED, AUDIT_RESOURCE_TYPE);
+	}
+
+	@Test
+	public void createSubCategoryHttpCspUserIdHeaderIsMissing() throws Exception {
+		RestResponse createSubCategoryRest = CategoryRestUtils.createSubCategoryHttpCspAtuUidIsMissing(
+				resourceSubCategoryDefinition, resourceCategoryDefinition, sdncAdminUserDetails,
+				RESOURCE_COMPONENT_TYPE);
+		assertEquals("Check response code after create Sub category", STATUS_CODE_MISSING_INFORMATION,
+				createSubCategoryRest.getErrorCode().intValue());
+		RestResponse getAllCategoriesRest = CategoryRestUtils.getAllCategories(sdncAdminUserDetails,
+				RESOURCE_COMPONENT_TYPE);
+		assertEquals("Check response code after get all categories ", STATUS_CODE_SUCCESS,
+				getAllCategoriesRest.getErrorCode().intValue());
+		CategoryValidationUtils.verifySubCategoryNotExistsInGetResponse(getAllCategoriesRest,
+				resourceCategoryDefinition.getUniqueId(), resourceSubCategoryDefinition);
+		// Audit validation
+		ErrorInfo errorInfo = ErrorValidationUtils.parseErrorConfigYaml(ActionStatus.MISSING_INFORMATION.name());
+		ExpectedCategoryAudit expectedCatrgoryAuditJavaObject = new ExpectedCategoryAudit();
+		expectedCatrgoryAuditJavaObject.setAction(ADD_SUB_CATEGORY);
+		expectedCatrgoryAuditJavaObject.setModifier("");
+		expectedCatrgoryAuditJavaObject.setCategoryName(resourceCategoryDefinition.getUniqueId());
+		// String subCategoryName = (resourceSubCategoryDefinition != null ?
+		// resourceSubCategoryDefinition.getName() : Constants.EMPTY_STRING);
+		expectedCatrgoryAuditJavaObject.setSubCategoryName(resourceSubCategoryDefinition.getName());
+		// String groupingName = (groupingDefinition != null ?
+		// groupingDefinition.getName() : Constants.EMPTY_STRING);
+		expectedCatrgoryAuditJavaObject.setGroupingName("");
+		expectedCatrgoryAuditJavaObject.setResourceType(AUDIT_RESOURCE_TYPE);
+		expectedCatrgoryAuditJavaObject.setStatus(String.valueOf(STATUS_CODE_MISSING_INFORMATION));
+		expectedCatrgoryAuditJavaObject.setDesc(errorInfo.getAuditDesc());
+		AuditValidationUtils.validateCategoryAudit(expectedCatrgoryAuditJavaObject, ADD_SUB_CATEGORY);
+	}
+
+	@Test
+	public void createSubCategoryHttpCspUserIdIsEmpty() throws Exception {
+		User sdncAdminUserDetails1 = ElementFactory.getDefaultUser(UserRoleEnum.ADMIN);
+		sdncAdminUserDetails1.setUserId("");
+		RestResponse createSubCategoryRest = CategoryRestUtils.createSubCategory(resourceSubCategoryDefinition,
+				resourceCategoryDefinition, sdncAdminUserDetails1, RESOURCE_COMPONENT_TYPE);
+		assertEquals("Check response code after create Sub category", STATUS_CODE_MISSING_INFORMATION,
+				createSubCategoryRest.getErrorCode().intValue());
+		RestResponse getAllCategoriesRest = CategoryRestUtils.getAllCategories(sdncAdminUserDetails,
+				RESOURCE_COMPONENT_TYPE);
+		assertEquals("Check response code after get all categories ", STATUS_CODE_SUCCESS,
+				getAllCategoriesRest.getErrorCode().intValue());
+		CategoryValidationUtils.verifySubCategoryNotExistsInGetResponse(getAllCategoriesRest,
+				resourceCategoryDefinition.getUniqueId(), resourceSubCategoryDefinition);
+		// Audit validation
+		ErrorInfo errorInfo = ErrorValidationUtils.parseErrorConfigYaml(ActionStatus.MISSING_INFORMATION.name());
+		ExpectedCategoryAudit expectedCatrgoryAuditJavaObject = new ExpectedCategoryAudit();
+		expectedCatrgoryAuditJavaObject.setAction(ADD_SUB_CATEGORY);
+		expectedCatrgoryAuditJavaObject.setModifier("");
+		expectedCatrgoryAuditJavaObject.setCategoryName(resourceCategoryDefinition.getUniqueId());
+		// String subCategoryName = (resourceSubCategoryDefinition != null ?
+		// resourceSubCategoryDefinition.getName() : Constants.EMPTY_STRING);
+		expectedCatrgoryAuditJavaObject.setSubCategoryName(resourceSubCategoryDefinition.getName());
+		// String groupingName = (groupingDefinition != null ?
+		// groupingDefinition.getName() : Constants.EMPTY_STRING);
+		expectedCatrgoryAuditJavaObject.setGroupingName("");
+		expectedCatrgoryAuditJavaObject.setResourceType(AUDIT_RESOURCE_TYPE);
+		expectedCatrgoryAuditJavaObject.setStatus(String.valueOf(STATUS_CODE_MISSING_INFORMATION));
+		expectedCatrgoryAuditJavaObject.setDesc(errorInfo.getAuditDesc());
+		AuditValidationUtils.validateCategoryAudit(expectedCatrgoryAuditJavaObject, ADD_SUB_CATEGORY);
+	}
+
+	////////////////////////////////////////////////////////////
+	private void createSubCategorySuccess(CategoryDefinition categoryDefinition,
+			SubCategoryDefinition subCategoryDefinition, User sdncAdminUserDetails, String componentType,
+			String auditType) throws Exception {
+
+		RestResponse createSubCategoryRest = CategoryRestUtils.createSubCategory(subCategoryDefinition,
+				categoryDefinition, sdncAdminUserDetails, componentType);
+		assertEquals("Check response code after create Sub category", STATUS_CODE_CREATED,
+				createSubCategoryRest.getErrorCode().intValue());
+		CategoryValidationUtils.validateCreateSubCategoryResponse(createSubCategoryRest, subCategoryDefinition);
+		// Audit validation
+		AuditValidationUtils.subCategoryAuditSuccess(ADD_SUB_CATEGORY, categoryDefinition, subCategoryDefinition,
+				sdncAdminUserDetails, STATUS_CODE_CREATED, auditType);
+		// get service category and validate that category added as defined
+		// (also set catalog uniqeId)
+		RestResponse getAllCategoriesRest = CategoryRestUtils.getAllCategories(sdncAdminUserDetails, componentType);
+		assertEquals("Check response code after get all categories ", STATUS_CODE_SUCCESS,
+				getAllCategoriesRest.getErrorCode().intValue());
+		CategoryValidationUtils.verifySubCategoryExistInGetResponse(getAllCategoriesRest,
+				categoryDefinition.getUniqueId(), subCategoryDefinition); // also
+																			// set
+																			// catalog
+																			// uniqeId
+	}
+
+	@Test
+	public void getResourceCategoryHierarchySuccessFlow() throws Exception {
+		int numOfSubCategories = 3;
+		List<SubCategoryDefinition> subCategories = new ArrayList();
+		RestResponse restResponse;
+		SubCategoryDefinition subCategory;
+		String subName = resourceSubCategoryDefinition.getName();
+		for (int i = 0; i < numOfSubCategories; i++) {
+			resourceSubCategoryDefinition.setName(subName + i);
+			restResponse = CategoryRestUtils.createSubCategory(resourceSubCategoryDefinition,
+					resourceCategoryDefinition, sdncAdminUserDetails, RESOURCE_COMPONENT_TYPE);
+			subCategory = ResponseParser.parseToObject(restResponse.getResponse(), SubCategoryDefinition.class);
+			subCategories.add(subCategory);
+		}
+		RestResponse getAllCategoriesRest = CategoryRestUtils.getAllCategories(sdncAdminUserDetails,
+				RESOURCE_COMPONENT_TYPE);
+		assertEquals("Check response code after get all categories ", STATUS_CODE_SUCCESS,
+				getAllCategoriesRest.getErrorCode().intValue());
+		AuditValidationUtils.GetCategoryHierarchyAuditSuccess(GET_CATEGORY_HIERARCHY, AUDIT_RESOURCE_TYPE,
+				sdncAdminUserDetails, STATUS_CODE_SUCCESS);
+		for (SubCategoryDefinition sub : subCategories) {
+			CategoryValidationUtils.verifySubCategoryExistInGetResponse(getAllCategoriesRest,
+					resourceCategoryDefinition.getUniqueId(), sub);
+		}
+	}
+
+}
diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/execute/devCI/ArtifactFromCsar.java b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/execute/devCI/ArtifactFromCsar.java
new file mode 100644
index 0000000000..7a69d374eb
--- /dev/null
+++ b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/execute/devCI/ArtifactFromCsar.java
@@ -0,0 +1,291 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * SDC
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.sdc.ci.tests.execute.devCI;
+
+import org.apache.commons.codec.digest.DigestUtils;
+import org.apache.commons.io.FileUtils;
+import org.apache.commons.io.IOUtils;
+import org.openecomp.sdc.ci.tests.datatypes.GroupHeatMetaDefinition;
+import org.openecomp.sdc.ci.tests.datatypes.HeatMetaFirstLevelDefinition;
+import org.openecomp.sdc.ci.tests.datatypes.TypeHeatMetaDefinition;
+import org.openecomp.sdc.ci.tests.utils.CsarParserUtils;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.nio.file.DirectoryStream;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.util.*;
+import java.util.stream.Collectors;
+import java.util.zip.ZipEntry;
+import java.util.zip.ZipInputStream;
+
+public class ArtifactFromCsar {
+	
+
+	public static void main(String[] args) throws Exception {
+		String zipFile = "C:\\Users\\rp955r\\Documents\\InTesting\\resource-CivfonboardedFdnt2f792348-csar.csar";
+		
+//		Map<String, Object> combinedMap = combineHeatArtifacstWithFolderArtifacsToMap(zipFile);
+		
+		Map<String, Object> vfcArtifacts = ArtifactFromCsar.getVFCArtifacts(zipFile);
+		
+		System.out.println("1234o");
+	}
+	
+	public static Map<String, Object> combineHeatArtifacstWithFolderArtifacsToMap(String pathToCsar) throws Exception {
+		return combineHeatArtifacstWithFolderArtifacsToMap(pathToCsar, "output");
+	}
+	
+	public static Map<String, Object> combineHeatArtifacstWithFolderArtifacsToMap(String pathToCsar, String outputCsar) throws Exception {
+		File csarFile = new File(pathToCsar);
+		
+		
+		File dir = new File(csarFile.getParent() + File.separator + outputCsar);
+			dir.mkdir();
+			if(!dir.exists()) {
+		}
+
+		String outputFolder = dir.getPath();
+		unZip(pathToCsar, outputFolder);
+		File directory = new File(outputFolder + File.separator + "Artifacts" + File.separator );
+		
+		Map<String, Object> artifactsMap = combineHeatArtifacstWithFolderArtifacsToMap(getMapArtifactFromFolderStructure(directory), getDeploymentArtifactListFromHeatMeta(csarFile, directory));
+		FileUtils.cleanDirectory(new File(outputFolder));
+		
+		return artifactsMap;
+	}
+	
+	public static Map<String, Object> getVFCArtifacts(String pathToCsar) throws Exception{
+		String outputFolder = unzipCsarFile(pathToCsar);
+		File directory = new File(outputFolder + File.separator + "Artifacts" + File.separator );
+		Map<String, Object> artifactsMap = getMapArtifactFromFolderStructure(directory);
+		cleanFolders(outputFolder);
+		
+		return artifactsMap;
+	}
+	
+	private static Map<String, Object> combineHeatArtifacstWithFolderArtifacsToMap(Map<String, Object> map, List<HeatMetaFirstLevelDefinition> rlist) {
+		if(map.get("Deployment") != null) {
+			rlist.addAll((Collection<? extends HeatMetaFirstLevelDefinition>) map.get("Deployment"));
+		}
+		map.put("Deployment", rlist);
+		return map;
+	}
+	
+	private static List<HeatMetaFirstLevelDefinition> getDeploymentArtifactListFromHeatMeta(File pathToCsar, File directory) throws Exception {
+		List<HeatMetaFirstLevelDefinition> artifactList = new LinkedList<HeatMetaFirstLevelDefinition>();
+		
+		List<TypeHeatMetaDefinition> listTypeHeatMetaDefinition = CsarParserUtils.getListTypeHeatMetaDefinition(pathToCsar);
+
+	    for(TypeHeatMetaDefinition typeHeatMetaDefinition : listTypeHeatMetaDefinition){
+	    	for(GroupHeatMetaDefinition groupHeatMetaDefinition : typeHeatMetaDefinition.getGroupHeatMetaDefinition()){
+	        	artifactList.addAll(groupHeatMetaDefinition.getArtifactList());
+	        }
+	    }
+		
+	    List<HeatMetaFirstLevelDefinition> listArtifactWithTypesByList = getListArtifactWithTypesByList(directory, artifactList);
+		return listArtifactWithTypesByList;
+//	    return artifactList;
+		
+	}
+	
+	private static Map<String, Object> getMapArtifactFromFolderStructure(File pathToArtifactFolder) throws IOException {
+		
+		Map<String, Object> map = new HashMap<String, Object>();
+		
+		
+		final Path dir = Paths.get(pathToArtifactFolder.getPath());
+		final DirectoryStream<Path> dirStream = Files.newDirectoryStream(dir);
+		
+		dirStream.forEach(currFile -> {
+			File file = currFile.toFile();
+				if (file.isDirectory()) {
+					System.out.println(file.getName());
+					if(file.getName().toLowerCase().equals("deployment") || file.getName().toLowerCase().equals("informational")) {
+						map.put(file.getName(), getListArtifactWithTypes(file));
+					} else {
+						try {
+							map.put(file.getName(), getMapArtifactFromFolderStructure(file));
+						} catch (IOException e) {
+							e.printStackTrace();
+						}
+					}
+				}
+		});
+		
+		dirStream.close();
+		
+
+		
+//		
+//		File[] fileList = pathToArtifactFolder.listFiles();
+//		for(File file: fileList) {
+//			if (file.isDirectory()) {
+//				
+//				System.out.println(file.getName());
+//				if(file.getName().equals("Deployment") || file.getName().equals("Informational")) {
+//					map.put(file.getName(), getListArtifactWithTypes(file));
+//				} else {
+//					map.put(file.getName(), getMapArtifactFromFolderStructure(file));
+//				}
+//			}
+//		}
+		return map;
+	}
+	
+	
+	
+	private static List<HeatMetaFirstLevelDefinition> getListArtifactWithTypes(File folderPath) {
+		List<HeatMetaFirstLevelDefinition> artifactList = new LinkedList<HeatMetaFirstLevelDefinition>();
+		
+		File[] fileList = folderPath.listFiles();
+		
+		for(File file: fileList) {
+			File[] artifacts = file.listFiles();
+			
+			for(File artifact: artifacts) {
+//				HeatMetaFirstLevelDefinition heatMetaFirstLevelDefinition = new HeatMetaFirstLevelDefinition(file.getName(), artifact.getName());
+				HeatMetaFirstLevelDefinition heatMetaFirstLevelDefinition = new HeatMetaFirstLevelDefinition(artifact.getName(), file.getName(), crunchifyGetMd5ForFile(artifact));
+				artifactList.add(heatMetaFirstLevelDefinition);
+			}
+		}
+		
+		return artifactList;
+	}
+	
+	private static List<HeatMetaFirstLevelDefinition> getListArtifactWithTypesByList(File folderPath, List<HeatMetaFirstLevelDefinition> artifactLogicList) {
+				
+		
+		File[] fileList = folderPath.listFiles();
+		
+		
+		
+		for (HeatMetaFirstLevelDefinition heatMetaFirstLevelDefinition : artifactLogicList) {
+			
+			String fileName = heatMetaFirstLevelDefinition.getFileName();
+			
+			for (File fileFromFolder : fileList) {
+				if ( fileFromFolder.getName().equals(fileName)){
+					heatMetaFirstLevelDefinition.setCheckSum(crunchifyGetMd5ForFile(fileFromFolder));
+				}
+				
+			}
+		 }
+
+		return artifactLogicList;
+	}
+	
+	public static String crunchifyGetMd5ForFile(File crunchifyFile) {
+		String crunchifyValue = null;
+		FileInputStream crunchifyInputStream = null;
+		try {
+			crunchifyInputStream = new FileInputStream(crunchifyFile);
+ 
+			// md5Hex converts an array of bytes into an array of characters representing the hexadecimal values of each byte in order.
+			// The returned array will be double the length of the passed array, as it takes two characters to represent any given byte.
+			crunchifyValue = DigestUtils.md5Hex(IOUtils.toByteArray(crunchifyInputStream));
+		} catch (IOException e) {
+			e.printStackTrace();
+		} finally {
+			IOUtils.closeQuietly(crunchifyInputStream);
+		}
+		return crunchifyValue;
+	}
+	
+	public static void unZip(String zipFile, String outputFolder) {
+		byte[] buffer = new byte[1024];
+
+	     try{
+	    	File folder = new File(outputFolder);
+	    	
+	    	if(!folder.exists()){
+	    		folder.mkdir();
+	    	}
+
+	    	ZipInputStream zis = new ZipInputStream(new FileInputStream(zipFile));
+	    	ZipEntry ze = zis.getNextEntry();
+
+	    	while(ze!=null){
+
+	    	   String fileName = ze.getName();
+	    	   File newFile = new File(outputFolder + File.separator + fileName);
+	           
+	           if(ze.isDirectory()) {
+	        	   newFile.mkdir();
+	        	   ze = zis.getNextEntry();
+	        	   continue;
+	           }
+
+	            new File(newFile.getParent()).mkdirs();
+	            FileOutputStream fos = new FileOutputStream(newFile);
+
+	            int len;
+	            while ((len = zis.read(buffer)) > 0) {
+	            	fos.write(buffer, 0, len);
+	            }
+
+	            fos.close();
+	            ze = zis.getNextEntry();
+	    	}
+
+	        zis.closeEntry();
+	    	zis.close();
+
+	    } catch (IOException ex) {
+	       ex.printStackTrace();
+	    }
+
+	}
+	
+    private static void cleanFolders(String outputFolder) throws IOException {
+		System.gc();
+		FileUtils.cleanDirectory(new File(outputFolder));
+		FileUtils.deleteDirectory(new File(outputFolder));
+	}
+
+    private static String unzipCsarFile(String pathToCsar) {
+		File csarFile = new File(pathToCsar);
+		
+		
+		File dir = new File(csarFile.getParent() + File.separator + "output-" + UUID.randomUUID());
+		if(!dir.exists()) {
+			dir.mkdirs();
+		}
+
+		String outputFolder = dir.getPath();
+		ArtifactFromCsar.unZip(pathToCsar, outputFolder);
+		return outputFolder;
+	}
+
+	public static String[] getArtifactNamesFromCsar(String path, String csarFile) throws Exception {
+		Map<String, Object> combinedMap = combineHeatArtifacstWithFolderArtifacsToMap(path + csarFile);
+		LinkedList<HeatMetaFirstLevelDefinition> deploymentArtifacts = ((LinkedList<HeatMetaFirstLevelDefinition>) combinedMap.get("Deployment"));
+		List<String> artifactNamesList = deploymentArtifacts.stream().map(e -> e.getFileName()).collect(Collectors.toList());
+		Object[] artifactNamesObjectArr = artifactNamesList.toArray();
+		String[] artifactNamesFromFile = Arrays.copyOf(artifactNamesObjectArr, artifactNamesObjectArr.length, String[].class);
+		return artifactNamesFromFile;
+	}
+
+}
diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/execute/devCI/ImportCsarValidateArtifacts.java b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/execute/devCI/ImportCsarValidateArtifacts.java
new file mode 100644
index 0000000000..08c2169d67
--- /dev/null
+++ b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/execute/devCI/ImportCsarValidateArtifacts.java
@@ -0,0 +1,99 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * SDC
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.sdc.ci.tests.execute.devCI;
+
+import org.junit.Rule;
+import org.junit.rules.TestName;
+import org.openecomp.sdc.be.datatypes.enums.ResourceTypeEnum;
+import org.openecomp.sdc.be.model.Resource;
+import org.openecomp.sdc.ci.tests.api.ComponentBaseTest;
+import org.openecomp.sdc.ci.tests.datatypes.ResourceReqDetails;
+import org.openecomp.sdc.ci.tests.datatypes.enums.UserRoleEnum;
+import org.openecomp.sdc.ci.tests.datatypes.http.RestResponse;
+import org.openecomp.sdc.ci.tests.utils.general.ElementFactory;
+import org.openecomp.sdc.ci.tests.utils.rest.BaseRestUtils;
+import org.openecomp.sdc.ci.tests.utils.rest.ResourceRestUtils;
+import org.openecomp.sdc.ci.tests.utils.rest.ResponseParser;
+import org.openecomp.sdc.ci.tests.utils.validation.CsarValidationUtils;
+import org.testng.annotations.DataProvider;
+import org.testng.annotations.Test;
+
+import static org.testng.AssertJUnit.assertTrue;
+
+public class ImportCsarValidateArtifacts extends ComponentBaseTest {
+
+	@Rule
+	public static TestName name = new TestName();
+
+	@DataProvider(name = "happyArts")
+	public Object[][] getHappyArtifacts() {
+
+		return new Object[][] { { "happy_VF_RI2_G2_two_different_artifacts_under_heatBaseheatVolheatNet2" },
+				{ "happy_VF_RI2_G2_two_different_artifacts_under_heatBaseheatVolheatNet" },
+				{ "happy_VF_RI2_G2_two_identical_artifacts_under_heatBaseheatVolheatNet" },
+				{ "happy_VF_RI2_G2_two_different_artifacts_under_nested" },
+				{ "happy_VF_RI2_G2_two_indentical_nested_under_different_groups" },
+				{ "happy_VF_RI2_G2_two_different_nested_under_different_groups" },
+				{ "happy_VF_RI2_G2_two_different_nested_under_same_group" },
+
+		};
+	}
+
+	@DataProvider(name = "negativeArts")
+	public Object[][] getNegativeArtifacts() {
+
+		return new Object[][] {
+
+				{ "negative_VF_RI2_G2_same_heatVol_different_groups" },
+				{ "negative_VF_RI2_G2_same_heatBase_different_envs" },
+				{ "negative_VF_RI2_G2_heatBaseHeatVolHeatNet_under_nested" },
+				{ "negative_VF_RI2_G2_two_indentical_artifacts_under_nested" },
+				{ "negative_VF_RI2_G2_nested_under_nested" }, { "negative_VF_RI2_G2_same_heatVol_different_groups" }, };
+	}
+
+	@Test(dataProvider = "happyArts")
+	public void createResourceFromCsarArtsHappy(String artifactName) throws Exception {
+
+		ResourceReqDetails resourceDetails = ElementFactory.getDefaultResource();
+		resourceDetails.setCsarUUID(artifactName);
+		resourceDetails.setResourceType(ResourceTypeEnum.VF.name());
+		RestResponse createResource = ResourceRestUtils.createResource(resourceDetails,
+				ElementFactory.getDefaultUser(UserRoleEnum.DESIGNER));
+
+		BaseRestUtils.checkCreateResponse(createResource);
+		Resource resource = ResponseParser.parseToObjectUsingMapper(createResource.getResponse(), Resource.class);
+		CsarValidationUtils.validateCsarVfArtifact(artifactName, resource);
+
+	}
+
+	@Test(dataProvider = "negativeArts")
+	public void createResourceFromCsarArtsNegative(String artifactName) throws Exception {
+
+		ResourceReqDetails resourceDetails = ElementFactory.getDefaultResource();
+		resourceDetails.setCsarUUID(artifactName);
+		resourceDetails.setResourceType(ResourceTypeEnum.VF.name());
+		RestResponse createResource = ResourceRestUtils.createResource(resourceDetails,
+				ElementFactory.getDefaultUser(UserRoleEnum.DESIGNER));
+		assertTrue(createResource.getErrorCode() != 201 && createResource.getErrorCode() != 500);
+
+	}
+
+}
diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/execute/devCI/ToscaGroupInsideVF.java b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/execute/devCI/ToscaGroupInsideVF.java
new file mode 100644
index 0000000000..77a222a4f3
--- /dev/null
+++ b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/execute/devCI/ToscaGroupInsideVF.java
@@ -0,0 +1,546 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * SDC
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.sdc.ci.tests.execute.devCI;
+
+import org.junit.Rule;
+import org.junit.rules.TestName;
+import org.openecomp.sdc.ci.tests.api.ComponentBaseTest;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class ToscaGroupInsideVF extends ComponentBaseTest {
+	private static Logger logger = LoggerFactory.getLogger(ToscaGroupInsideVF.class.getName());
+
+	@Rule
+	public static TestName name = new TestName();
+
+	/*@Test
+	public void createResourceFromCsarArts() throws Exception {
+
+		// String csar = getCsar();
+		// parseCsar(csar);
+		ResourceReqDetails resourceDetails = ElementFactory.getDefaultResource();
+		resourceDetails.setCsarUUID("VF_RI2_G6_withArtifacts");
+		resourceDetails.setResourceType(ResourceTypeEnum.VF.name());
+		RestResponse createResource = ResourceRestUtils.createResource(resourceDetails,
+				ElementFactory.getDefaultUser(UserRoleEnum.DESIGNER));
+		BaseRestUtils.checkCreateResponse(createResource);
+		Resource resource = ResponseParser.parseToObjectUsingMapper(createResource.getResponse(), Resource.class);
+
+		Component resourceObject = AtomicOperationUtils
+				.changeComponentState(resource, UserRoleEnum.DESIGNER, LifeCycleStatesEnum.CERTIFY, true).getLeft();
+		Resource vfManual = AtomicOperationUtils.createResourceByType(ResourceTypeEnum.VF, UserRoleEnum.DESIGNER, true)
+				.left().value();
+		AtomicOperationUtils.uploadArtifactByType(ArtifactTypeEnum.OTHER, vfManual, UserRoleEnum.DESIGNER, true, true);
+		AtomicOperationUtils.changeComponentState(vfManual, UserRoleEnum.DESIGNER, LifeCycleStatesEnum.CERTIFY, true)
+				.getLeft();
+
+		Service service = AtomicOperationUtils.createDefaultService(UserRoleEnum.DESIGNER, true).left().value();
+		AtomicOperationUtils
+				.addComponentInstanceToComponentContainer(resourceObject, service, UserRoleEnum.DESIGNER, true).left()
+				.value();
+		AtomicOperationUtils.addComponentInstanceToComponentContainer(vfManual, service, UserRoleEnum.DESIGNER, true)
+				.left().value();
+		AtomicOperationUtils.getServiceObject(service, UserRoleEnum.DESIGNER);
+		AtomicOperationUtils
+				.changeComponentState(service, UserRoleEnum.DESIGNER, LifeCycleStatesEnum.CERTIFICATIONREQUEST, true)
+				.getLeft();
+		AtomicOperationUtils
+				.changeComponentState(service, UserRoleEnum.DESIGNER, LifeCycleStatesEnum.CANCELCERTIFICATION, true)
+				.getLeft();
+		AtomicOperationUtils
+				.changeComponentState(service, UserRoleEnum.DESIGNER, LifeCycleStatesEnum.CERTIFICATIONREQUEST, true)
+				.getLeft();
+
+	}
+
+	@Test
+	public void soferTest() throws Exception {
+
+		// String csar = getCsar();
+		// parseCsar(csar);
+		ResourceReqDetails resourceDetails = ElementFactory.getDefaultResource();
+		resourceDetails.setCsarUUID("sofer");
+		resourceDetails.setResourceType(ResourceTypeEnum.VF.name());
+		RestResponse createResource = ResourceRestUtils.createResource(resourceDetails,
+				ElementFactory.getDefaultUser(UserRoleEnum.DESIGNER));
+		BaseRestUtils.checkCreateResponse(createResource);
+		Resource resource = ResponseParser.parseToObjectUsingMapper(createResource.getResponse(), Resource.class);
+
+	}
+
+	@Test
+	public void createVFwith2VLs() throws Exception {
+
+		// String csar = getCsar();
+		// parseCsar(csar);
+		ResourceReqDetails resourceDetails = ElementFactory.getDefaultResource();
+		resourceDetails.setCsarUUID("VSPPackage");
+		resourceDetails.setResourceType(ResourceTypeEnum.VF.name());
+		RestResponse createResource = ResourceRestUtils.createResource(resourceDetails,
+				ElementFactory.getDefaultUser(UserRoleEnum.DESIGNER));
+		BaseRestUtils.checkCreateResponse(createResource);
+		Resource resource = ResponseParser.parseToObjectUsingMapper(createResource.getResponse(), Resource.class);
+
+		Component resourceObject = AtomicOperationUtils
+				.changeComponentState(resource, UserRoleEnum.DESIGNER, LifeCycleStatesEnum.CERTIFY, true).getLeft();
+		Resource vfManual = AtomicOperationUtils.createResourceByType(ResourceTypeEnum.VF, UserRoleEnum.DESIGNER, true)
+				.left().value();
+		AtomicOperationUtils.uploadArtifactByType(ArtifactTypeEnum.OTHER, vfManual, UserRoleEnum.DESIGNER, true, true);
+		AtomicOperationUtils.changeComponentState(vfManual, UserRoleEnum.DESIGNER, LifeCycleStatesEnum.CERTIFY, true)
+				.getLeft();
+
+		Service service = AtomicOperationUtils.createDefaultService(UserRoleEnum.DESIGNER, true).left().value();
+		AtomicOperationUtils
+				.addComponentInstanceToComponentContainer(resourceObject, service, UserRoleEnum.DESIGNER, true).left()
+				.value();
+		AtomicOperationUtils.addComponentInstanceToComponentContainer(vfManual, service, UserRoleEnum.DESIGNER, true)
+				.left().value();
+		AtomicOperationUtils.getServiceObject(service, UserRoleEnum.DESIGNER);
+		AtomicOperationUtils
+				.changeComponentState(service, UserRoleEnum.DESIGNER, LifeCycleStatesEnum.CERTIFICATIONREQUEST, true)
+				.getLeft();
+		AtomicOperationUtils
+				.changeComponentState(service, UserRoleEnum.DESIGNER, LifeCycleStatesEnum.CANCELCERTIFICATION, true)
+				.getLeft();
+		AtomicOperationUtils.changeComponentState(service, UserRoleEnum.DESIGNER, LifeCycleStatesEnum.CERTIFY, true)
+				.getLeft();
+
+	}
+
+	@Test // (enabled = false)
+	public void createResourceFromCsarHappy() throws Exception {
+		// String csarUUID = "VF_RI2_G2_withArtifacts";
+		String csarUUID = "VF_RI2_G1_Invalid";
+		ResourceReqDetails resourceDetails = ElementFactory.getDefaultResource();
+		resourceDetails.setCsarUUID(csarUUID);
+		resourceDetails.setResourceType(ResourceTypeEnum.VF.name());
+		RestResponse createResource = ResourceRestUtils.createResource(resourceDetails,
+				ElementFactory.getDefaultUser(UserRoleEnum.DESIGNER));
+		BaseRestUtils.checkCreateResponse(createResource);
+		Resource resource = ResponseParser.parseToObjectUsingMapper(createResource.getResponse(), Resource.class);
+		CsarValidationUtils.validateCsarVfArtifact(csarUUID, resource);
+	}
+
+	@Test // (enabled = false)
+	public void createResourceFromCsarWithProperty() throws Exception {
+		String csarUUID = "VF_RI2_G4_withArtifacts";
+		ResourceReqDetails resourceDetails = ElementFactory.getDefaultResource();
+		resourceDetails.setCsarUUID(csarUUID);
+		resourceDetails.setResourceType(ResourceTypeEnum.VF.name());
+		RestResponse createResource = ResourceRestUtils.createResource(resourceDetails,
+				ElementFactory.getDefaultUser(UserRoleEnum.DESIGNER));
+		BaseRestUtils.checkCreateResponse(createResource);
+		Resource resource = ResponseParser.parseToObjectUsingMapper(createResource.getResponse(), Resource.class);
+		CsarValidationUtils.validateCsarVfArtifact(csarUUID, resource);
+	}
+
+	@Test // (enabled = false)
+	public void UpdateCsarWithNonExistingResourceInstanceFail() throws Exception {
+
+		// String csarUUID = "VF_RI2_G1-RI_NotExist";
+		// String csarUUID = "nested3";
+
+		// String csarUUID = "VF_RI2_G1_Invalid_WithArtifacts";
+		User sdncModifierDetails = ElementFactory.getDefaultUser(UserRoleEnum.DESIGNER);
+
+		RestResponse copyRes = copyCsarRest(sdncModifierDetails, "VF_RI2_G4_withArtifacts_a.csar",
+				"VF_RI2_G4_withArtifacts.csar");
+		BaseRestUtils.checkSuccess(copyRes);
+		String csarUUID = "VF_RI2_G4_withArtifacts.csar";
+
+		ResourceReqDetails resourceDetails = ElementFactory.getDefaultResource();
+		resourceDetails.setCsarUUID(csarUUID);
+		resourceDetails.setResourceType(ResourceTypeEnum.VF.name());
+		RestResponse createResource = ResourceRestUtils.createResource(resourceDetails,
+				ElementFactory.getDefaultUser(UserRoleEnum.DESIGNER));
+		BaseRestUtils.checkCreateResponse(createResource);
+		Resource resource = ResponseParser.parseToObjectUsingMapper(createResource.getResponse(), Resource.class);
+
+		copyRes = copyCsarRest(sdncModifierDetails, "VF_RI2_G4_withArtifactsRI_FAIL.csar",
+				"VF_RI2_G4_withArtifacts.csar");
+		BaseRestUtils.checkSuccess(copyRes);
+
+		resourceDetails.setName(resource.getName());
+		// resourceDetails.setVendorName("Govnuk");
+		// resourceDetails.setDescription("Other");
+		RestResponse createResource2 = ResourceRestUtils.createResource(resourceDetails,
+				ElementFactory.getDefaultUser(UserRoleEnum.DESIGNER));
+		BaseRestUtils.checkCreateResponse(createResource2);
+		Resource resource2 = ResponseParser.parseToObjectUsingMapper(createResource2.getResponse(), Resource.class);
+
+		CsarValidationUtils.validateCsarVfArtifact(csarUUID, resource);
+		ToscaDefinition toscaDefinition = ToscaParserUtils.getToscaDefinitionObjectByCsarUuid(csarUUID);
+		CsarValidationUtils.validateToscaDefinitonObjectVsResource(toscaDefinition, resource);
+
+		// CsarValidationUtils.validateCsarVfArtifact(csarUUID2, resource2);
+		// ToscaDefinition toscaDefinition2 =
+		// ToscaParserUtils.getToscaDefinitionObjectByCsarUuid(csarUUID2);
+		// CsarValidationUtils.validateToscaDefinitonObjectVsResource(toscaDefinition2,
+		// resource2);
+
+		// Csar csar = parserTocsarObject(csarUUID);
+		// validateCsarVsResourceObj(csar, resource);
+		// csar.node_types();
+
+	}
+
+	@Test // (enabled = false)
+	public void UpdateCsarWithSameCsarDifferentMetadata() throws Exception {
+
+		// User sdncModifierDetails =
+		// ElementFactory.getDefaultUser(UserRoleEnum.DESIGNER);
+		// RestResponse copyRes =
+		// copyCsarRest(sdncModifierDetails,"VF_RI2_G4_withArtifacts_a.csar","VF_RI2_G4_withArtifacts.csar");
+		// BaseRestUtils.checkSuccess(copyRes);
+		String csarUUID = "VF_RI2_G4_withArtifacts.csar";
+
+		ResourceReqDetails resourceDetails = ElementFactory.getDefaultResource();
+		resourceDetails.setCsarUUID(csarUUID);
+		resourceDetails.setResourceType(ResourceTypeEnum.VF.name());
+		RestResponse createResource = ResourceRestUtils.createResource(resourceDetails,
+				ElementFactory.getDefaultUser(UserRoleEnum.DESIGNER));
+		BaseRestUtils.checkCreateResponse(createResource);
+		Resource resource = ResponseParser.parseToObjectUsingMapper(createResource.getResponse(), Resource.class);
+
+		resourceDetails.setName(resource.getName());
+		resourceDetails.setVendorName("Govnuk");
+		resourceDetails.setDescription("Other");
+		RestResponse createResource2 = ResourceRestUtils.createResource(resourceDetails,
+				ElementFactory.getDefaultUser(UserRoleEnum.DESIGNER));
+		BaseRestUtils.checkCreateResponse(createResource2);
+		Resource resource2 = ResponseParser.parseToObjectUsingMapper(createResource2.getResponse(), Resource.class);
+
+		CsarValidationUtils.validateCsarVfArtifact(csarUUID, resource);
+		ToscaDefinition toscaDefinition = ToscaParserUtils.getToscaDefinitionObjectByCsarUuid(csarUUID);
+		CsarValidationUtils.validateToscaDefinitonObjectVsResource(toscaDefinition, resource);
+
+		// CsarValidationUtils.validateCsarVfArtifact(csarUUID2, resource2);
+		// ToscaDefinition toscaDefinition2 =
+		// ToscaParserUtils.getToscaDefinitionObjectByCsarUuid(csarUUID2);
+		// CsarValidationUtils.validateToscaDefinitonObjectVsResource(toscaDefinition2,
+		// resource2);
+
+		// Csar csar = parserTocsarObject(csarUUID);
+		// validateCsarVsResourceObj(csar, resource);
+		// csar.node_types();
+
+	}
+
+	@Test // (enabled = false)
+	public void UpdateCsarWithSameCsar() throws Exception {
+
+		// User sdncModifierDetails =
+		// ElementFactory.getDefaultUser(UserRoleEnum.DESIGNER);
+		// RestResponse copyRes =
+		// copyCsarRest(sdncModifierDetails,"VF_RI2_G4_withArtifacts_a.csar","VF_RI2_G4_withArtifacts.csar");
+		// BaseRestUtils.checkSuccess(copyRes);
+		String csarUUID = "VF_RI2_G4_withArtifacts.csar";
+
+		ResourceReqDetails resourceDetails = ElementFactory.getDefaultResource();
+		resourceDetails.setCsarUUID(csarUUID);
+		resourceDetails.setResourceType(ResourceTypeEnum.VF.name());
+		RestResponse createResource = ResourceRestUtils.createResource(resourceDetails,
+				ElementFactory.getDefaultUser(UserRoleEnum.DESIGNER));
+		BaseRestUtils.checkCreateResponse(createResource);
+		Resource resource = ResponseParser.parseToObjectUsingMapper(createResource.getResponse(), Resource.class);
+
+		resourceDetails.setName(resource.getName());
+		RestResponse createResource2 = ResourceRestUtils.createResource(resourceDetails,
+				ElementFactory.getDefaultUser(UserRoleEnum.DESIGNER));
+		BaseRestUtils.checkCreateResponse(createResource2);
+		Resource resource2 = ResponseParser.parseToObjectUsingMapper(createResource2.getResponse(), Resource.class);
+
+		CsarValidationUtils.validateCsarVfArtifact(csarUUID, resource);
+		ToscaDefinition toscaDefinition = ToscaParserUtils.getToscaDefinitionObjectByCsarUuid(csarUUID);
+		CsarValidationUtils.validateToscaDefinitonObjectVsResource(toscaDefinition, resource);
+
+		// CsarValidationUtils.validateCsarVfArtifact(csarUUID2, resource2);
+		// ToscaDefinition toscaDefinition2 =
+		// ToscaParserUtils.getToscaDefinitionObjectByCsarUuid(csarUUID2);
+		// CsarValidationUtils.validateToscaDefinitonObjectVsResource(toscaDefinition2,
+		// resource2);
+
+		// Csar csar = parserTocsarObject(csarUUID);
+		// validateCsarVsResourceObj(csar, resource);
+		// csar.node_types();
+
+	}
+
+	@Test // (enabled = false)
+	public void UpdateCsarCertifiedVfWithSameCsar() throws Exception {
+
+		User sdncModifierDetails = ElementFactory.getDefaultUser(UserRoleEnum.DESIGNER);
+		RestResponse copyRes = copyCsarRest(sdncModifierDetails, "VF_RI2_G4_withArtifacts_a.csar",
+				"VF_RI2_G4_withArtifacts.csar");
+		BaseRestUtils.checkSuccess(copyRes);
+		String csarUUID = "VF_RI2_G4_withArtifacts.csar";
+
+		ResourceReqDetails resourceDetails = ElementFactory.getDefaultResource();
+		resourceDetails.setCsarUUID(csarUUID);
+		resourceDetails.setResourceType(ResourceTypeEnum.VF.name());
+		RestResponse createResource = ResourceRestUtils.createResource(resourceDetails,
+				ElementFactory.getDefaultUser(UserRoleEnum.DESIGNER));
+		BaseRestUtils.checkCreateResponse(createResource);
+		Resource resource = ResponseParser.parseToObjectUsingMapper(createResource.getResponse(), Resource.class);
+		Pair<Component, RestResponse> changeComponentState = AtomicOperationUtils.changeComponentState(resource,
+				UserRoleEnum.DESIGNER, LifeCycleStatesEnum.CERTIFY, true);
+		resource = (Resource) changeComponentState.getLeft();
+
+		resourceDetails.setName(resource.getName());
+		RestResponse createResource2 = ResourceRestUtils.createResource(resourceDetails,
+				ElementFactory.getDefaultUser(UserRoleEnum.DESIGNER));
+		BaseRestUtils.checkCreateResponse(createResource2);
+		Resource resource2 = ResponseParser.parseToObjectUsingMapper(createResource2.getResponse(), Resource.class);
+
+		CsarValidationUtils.validateCsarVfArtifact(csarUUID, resource);
+		ToscaDefinition toscaDefinition = ToscaParserUtils.getToscaDefinitionObjectByCsarUuid(csarUUID);
+		CsarValidationUtils.validateToscaDefinitonObjectVsResource(toscaDefinition, resource);
+
+		// CsarValidationUtils.validateCsarVfArtifact(csarUUID2, resource2);
+		// ToscaDefinition toscaDefinition2 =
+		// ToscaParserUtils.getToscaDefinitionObjectByCsarUuid(csarUUID2);
+		// CsarValidationUtils.validateToscaDefinitonObjectVsResource(toscaDefinition2,
+		// resource2);
+
+		// Csar csar = parserTocsarObject(csarUUID);
+		// validateCsarVsResourceObj(csar, resource);
+		// csar.node_types();
+
+	}
+
+	@Test // (enabled = false)
+	public void UpdateCsarDifferentTosca() throws Exception {
+
+		User sdncModifierDetails = ElementFactory.getDefaultUser(UserRoleEnum.DESIGNER);
+		RestResponse copyRes = copyCsarRest(sdncModifierDetails, "VF_RI2_G4_withArtifacts_a.csar",
+				"VF_RI2_G4_withArtifacts.csar");
+		BaseRestUtils.checkSuccess(copyRes);
+		String csarUUID = "VF_RI2_G4_withArtifacts.csar";
+
+		ResourceReqDetails resourceDetails = ElementFactory.getDefaultResource();
+		resourceDetails.setCsarUUID(csarUUID);
+		resourceDetails.setResourceType(ResourceTypeEnum.VF.name());
+		RestResponse createResource = ResourceRestUtils.createResource(resourceDetails,
+				ElementFactory.getDefaultUser(UserRoleEnum.DESIGNER));
+		BaseRestUtils.checkCreateResponse(createResource);
+		Resource resource = ResponseParser.parseToObjectUsingMapper(createResource.getResponse(), Resource.class);
+
+		copyRes = copyCsarRest(sdncModifierDetails, "VF_RI2_G4_withArtifactsUpdated.csar",
+				"VF_RI2_G4_withArtifacts.csar");
+		BaseRestUtils.checkSuccess(copyRes);
+
+		resourceDetails.setName(resource.getName());
+		RestResponse createResource2 = ResourceRestUtils.createResource(resourceDetails,
+				ElementFactory.getDefaultUser(UserRoleEnum.DESIGNER));
+		BaseRestUtils.checkCreateResponse(createResource2);
+		Resource resource2 = ResponseParser.parseToObjectUsingMapper(createResource2.getResponse(), Resource.class);
+
+		CsarValidationUtils.validateCsarVfArtifact(csarUUID, resource);
+		ToscaDefinition toscaDefinition = ToscaParserUtils.getToscaDefinitionObjectByCsarUuid(csarUUID);
+		CsarValidationUtils.validateToscaDefinitonObjectVsResource(toscaDefinition, resource);
+
+		// CsarValidationUtils.validateCsarVfArtifact(csarUUID2, resource2);
+		// ToscaDefinition toscaDefinition2 =
+		// ToscaParserUtils.getToscaDefinitionObjectByCsarUuid(csarUUID2);
+		// CsarValidationUtils.validateToscaDefinitonObjectVsResource(toscaDefinition2,
+		// resource2);
+
+		// Csar csar = parserTocsarObject(csarUUID);
+		// validateCsarVsResourceObj(csar, resource);
+		// csar.node_types();
+
+	}
+
+	@Test // (enabled = false)
+	public void UpdateCsarDifferentToscaAndArtifacts() throws Exception {
+
+		User sdncModifierDetails = ElementFactory.getDefaultUser(UserRoleEnum.DESIGNER);
+		RestResponse copyRes = copyCsarRest(sdncModifierDetails, "VF_RI2_G4_withArtifacts_a.csar",
+				"VF_RI2_G4_withArtifacts.csar");
+		BaseRestUtils.checkSuccess(copyRes);
+		String csarUUID = "VF_RI2_G4_withArtifacts.csar";
+
+		ResourceReqDetails resourceDetails = ElementFactory.getDefaultResource();
+		resourceDetails.setCsarUUID(csarUUID);
+		resourceDetails.setResourceType(ResourceTypeEnum.VF.name());
+		RestResponse createResource = ResourceRestUtils.createResource(resourceDetails,
+				ElementFactory.getDefaultUser(UserRoleEnum.DESIGNER));
+		BaseRestUtils.checkCreateResponse(createResource);
+		Resource resource = ResponseParser.parseToObjectUsingMapper(createResource.getResponse(), Resource.class);
+
+		copyRes = copyCsarRest(sdncModifierDetails, "VF_RI2_G4_withArtifacts_UpdateToscaAndArtifacts.csar",
+				"VF_RI2_G4_withArtifacts.csar");
+		BaseRestUtils.checkSuccess(copyRes);
+
+		resourceDetails.setName(resource.getName());
+		RestResponse createResource2 = ResourceRestUtils.createResource(resourceDetails,
+				ElementFactory.getDefaultUser(UserRoleEnum.DESIGNER));
+		BaseRestUtils.checkCreateResponse(createResource2);
+		Resource resource2 = ResponseParser.parseToObjectUsingMapper(createResource2.getResponse(), Resource.class);
+
+		CsarValidationUtils.validateCsarVfArtifact(csarUUID, resource);
+		ToscaDefinition toscaDefinition = ToscaParserUtils.getToscaDefinitionObjectByCsarUuid(csarUUID);
+		CsarValidationUtils.validateToscaDefinitonObjectVsResource(toscaDefinition, resource);
+
+		// CsarValidationUtils.validateCsarVfArtifact(csarUUID2, resource2);
+		// ToscaDefinition toscaDefinition2 =
+		// ToscaParserUtils.getToscaDefinitionObjectByCsarUuid(csarUUID2);
+		// CsarValidationUtils.validateToscaDefinitonObjectVsResource(toscaDefinition2,
+		// resource2);
+
+		// Csar csar = parserTocsarObject(csarUUID);
+		// validateCsarVsResourceObj(csar, resource);
+		// csar.node_types();
+
+	}
+
+	@Test // (enabled = false)
+	public void migration() throws Exception {
+		String csarUUID = "VF_RI2_G4_withArtifacts";
+		ResourceReqDetails resourceDetails = ElementFactory.getDefaultResource();
+		resourceDetails.setCsarUUID(csarUUID);
+		resourceDetails.setName("Resource1");
+		resourceDetails.setResourceType(ResourceTypeEnum.VF.name());
+		RestResponse createResource = ResourceRestUtils.createResource(resourceDetails,
+				ElementFactory.getDefaultUser(UserRoleEnum.DESIGNER));
+		BaseRestUtils.checkCreateResponse(createResource);
+
+		resourceDetails.setName("Resource2");
+		resourceDetails.setResourceType(ResourceTypeEnum.VF.name());
+		createResource = ResourceRestUtils.createResource(resourceDetails,
+				ElementFactory.getDefaultUser(UserRoleEnum.DESIGNER));
+		BaseRestUtils.checkCreateResponse(createResource);
+		Resource resource = ResponseParser.parseToObjectUsingMapper(createResource.getResponse(), Resource.class);
+		resource = (Resource) AtomicOperationUtils
+				.changeComponentState(resource, UserRoleEnum.DESIGNER, LifeCycleStatesEnum.CERTIFY, true).getLeft();
+		resource = (Resource) AtomicOperationUtils
+				.changeComponentState(resource, UserRoleEnum.DESIGNER, LifeCycleStatesEnum.CHECKOUT, true).getLeft();
+		resource = (Resource) AtomicOperationUtils
+				.changeComponentState(resource, UserRoleEnum.DESIGNER, LifeCycleStatesEnum.CHECKIN, true).getLeft();
+		resource = (Resource) AtomicOperationUtils
+				.changeComponentState(resource, UserRoleEnum.DESIGNER, LifeCycleStatesEnum.CHECKOUT, true).getLeft();
+
+		resourceDetails.setName("Resource3");
+		resourceDetails.setResourceType(ResourceTypeEnum.VF.name());
+		createResource = ResourceRestUtils.createResource(resourceDetails,
+				ElementFactory.getDefaultUser(UserRoleEnum.DESIGNER));
+		BaseRestUtils.checkCreateResponse(createResource);
+		resource = ResponseParser.parseToObjectUsingMapper(createResource.getResponse(), Resource.class);
+		resource = (Resource) AtomicOperationUtils
+				.changeComponentState(resource, UserRoleEnum.DESIGNER, LifeCycleStatesEnum.CERTIFY, true).getLeft();
+		resource = (Resource) AtomicOperationUtils
+				.changeComponentState(resource, UserRoleEnum.DESIGNER, LifeCycleStatesEnum.CERTIFY, true).getLeft();
+		resource = (Resource) AtomicOperationUtils
+				.changeComponentState(resource, UserRoleEnum.DESIGNER, LifeCycleStatesEnum.CERTIFY, true).getLeft();
+
+		resourceDetails.setName("Resource4");
+		resourceDetails.setResourceType(ResourceTypeEnum.VF.name());
+		createResource = ResourceRestUtils.createResource(resourceDetails,
+				ElementFactory.getDefaultUser(UserRoleEnum.DESIGNER));
+		BaseRestUtils.checkCreateResponse(createResource);
+		resource = ResponseParser.parseToObjectUsingMapper(createResource.getResponse(), Resource.class);
+		resource = (Resource) AtomicOperationUtils
+				.changeComponentState(resource, UserRoleEnum.DESIGNER, LifeCycleStatesEnum.CHECKIN, true).getLeft();
+		resource = (Resource) AtomicOperationUtils
+				.changeComponentState(resource, UserRoleEnum.DESIGNER, LifeCycleStatesEnum.CHECKOUT, true).getLeft();
+		resource = (Resource) AtomicOperationUtils
+				.changeComponentState(resource, UserRoleEnum.DESIGNER, LifeCycleStatesEnum.CHECKIN, true).getLeft();
+		resource = (Resource) AtomicOperationUtils
+				.changeComponentState(resource, UserRoleEnum.DESIGNER, LifeCycleStatesEnum.CHECKOUT, true).getLeft();
+		resource = (Resource) AtomicOperationUtils
+				.changeComponentState(resource, UserRoleEnum.DESIGNER, LifeCycleStatesEnum.CHECKIN, true).getLeft();
+
+		resourceDetails.setName("Resource5");
+		resourceDetails.setResourceType(ResourceTypeEnum.VF.name());
+		createResource = ResourceRestUtils.createResource(resourceDetails,
+				ElementFactory.getDefaultUser(UserRoleEnum.DESIGNER));
+		BaseRestUtils.checkCreateResponse(createResource);
+		resource = ResponseParser.parseToObjectUsingMapper(createResource.getResponse(), Resource.class);
+		resource = (Resource) AtomicOperationUtils
+				.changeComponentState(resource, UserRoleEnum.DESIGNER, LifeCycleStatesEnum.CHECKIN, true).getLeft();
+		resource = (Resource) AtomicOperationUtils
+				.changeComponentState(resource, UserRoleEnum.DESIGNER, LifeCycleStatesEnum.CHECKOUT, true).getLeft();
+		resource = (Resource) AtomicOperationUtils
+				.changeComponentState(resource, UserRoleEnum.DESIGNER, LifeCycleStatesEnum.CHECKIN, true).getLeft();
+		resource = (Resource) AtomicOperationUtils
+				.changeComponentState(resource, UserRoleEnum.DESIGNER, LifeCycleStatesEnum.CHECKOUT, true).getLeft();
+
+		resourceDetails.setName("Resource6");
+		resourceDetails.setResourceType(ResourceTypeEnum.VF.name());
+		createResource = ResourceRestUtils.createResource(resourceDetails,
+				ElementFactory.getDefaultUser(UserRoleEnum.DESIGNER));
+		BaseRestUtils.checkCreateResponse(createResource);
+		resource = ResponseParser.parseToObjectUsingMapper(createResource.getResponse(), Resource.class);
+		resource = (Resource) AtomicOperationUtils
+				.changeComponentState(resource, UserRoleEnum.DESIGNER, LifeCycleStatesEnum.STARTCERTIFICATION, true)
+				.getLeft();
+
+		resourceDetails.setName("Resource7");
+		resourceDetails.setResourceType(ResourceTypeEnum.VF.name());
+		createResource = ResourceRestUtils.createResource(resourceDetails,
+				ElementFactory.getDefaultUser(UserRoleEnum.DESIGNER));
+		BaseRestUtils.checkCreateResponse(createResource);
+		resource = ResponseParser.parseToObjectUsingMapper(createResource.getResponse(), Resource.class);
+		resource = (Resource) AtomicOperationUtils
+				.changeComponentState(resource, UserRoleEnum.DESIGNER, LifeCycleStatesEnum.CERTIFY, true).getLeft();
+		resource = (Resource) AtomicOperationUtils
+				.changeComponentState(resource, UserRoleEnum.DESIGNER, LifeCycleStatesEnum.CERTIFICATIONREQUEST, true)
+				.getLeft();
+
+		logger.debug("7 VF resources were created");
+
+	}
+
+	public static RestResponse copyCsarRest(User sdncModifierDetails, String sourceCsarUuid, String targetCsarUuid)
+			throws Exception {
+
+		Config config = Utils.getConfig();
+		String url = String.format(Urls.COPY_CSAR_USING_SIMULATOR, config.getCatalogBeHost(), config.getCatalogBePort(),
+				sourceCsarUuid, targetCsarUuid);
+		String userId = sdncModifierDetails.getUserId();
+		Map<String, String> headersMap = prepareHeadersMap(userId);
+		HttpRequest http = new HttpRequest();
+
+		RestResponse copyCsarResponse = http.httpSendPost(url, "dummy", headersMap);
+		if (copyCsarResponse.getErrorCode() != 200) {
+			return null;
+		}
+		return copyCsarResponse;
+
+	}
+
+	private static Map<String, String> prepareHeadersMap(String userId) {
+		Map<String, String> headersMap = new HashMap<String, String>();
+		headersMap.put(HttpHeaderEnum.CONTENT_TYPE.getValue(), "application/json");
+		headersMap.put(HttpHeaderEnum.ACCEPT.getValue(), "application/json");
+		if (userId != null) {
+			headersMap.put(HttpHeaderEnum.USER_ID.getValue(), userId);
+		}
+		return headersMap;
+	}
+
+	public static void main(String[] args) throws Exception {
+		// String csarUUID = "VF_RI2_G4_withArtifacts";
+		String csarUUID = "node_types";
+		ToscaParserUtils.getToscaDefinitionObjectByCsarUuid(csarUUID);
+	}*/
+}
diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/execute/devCI/test1.java b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/execute/devCI/test1.java
new file mode 100644
index 0000000000..bc80545858
--- /dev/null
+++ b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/execute/devCI/test1.java
@@ -0,0 +1,88 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * SDC
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.sdc.ci.tests.execute.devCI;
+
+import fj.data.Either;
+import org.junit.Rule;
+import org.junit.rules.TestName;
+import org.openecomp.sdc.be.datatypes.enums.ResourceTypeEnum;
+import org.openecomp.sdc.be.model.Component;
+import org.openecomp.sdc.be.model.Resource;
+import org.openecomp.sdc.be.model.Service;
+import org.openecomp.sdc.ci.tests.api.ComponentBaseTest;
+import org.openecomp.sdc.ci.tests.config.Config;
+import org.openecomp.sdc.ci.tests.datatypes.enums.*;
+import org.openecomp.sdc.ci.tests.datatypes.http.RestResponse;
+import org.openecomp.sdc.ci.tests.utils.Utils;
+import org.openecomp.sdc.ci.tests.utils.general.AtomicOperationUtils;
+import org.openecomp.sdc.ci.tests.utils.validation.DistributionValidationUtils;
+import org.testng.annotations.Test;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+
+public class test1 extends ComponentBaseTest{
+
+	@Rule 
+	public static TestName name = new TestName();
+
+	public test1() {
+		super();
+
+	}
+	
+	@Test()
+	public void uploadArtifactOnServiceViaExternalAPI() throws Exception {
+		Config config = Utils.getConfig();	
+		
+		Service service = AtomicOperationUtils.createServiceByCategory(ServiceCategoriesEnum.MOBILITY, UserRoleEnum.DESIGNER, true).left().value();
+		AtomicOperationUtils.uploadArtifactByType(ArtifactTypeEnum.MODEL_QUERY_SPEC, service, UserRoleEnum.DESIGNER, true, true);
+		service = (Service) AtomicOperationUtils.changeComponentState(service, UserRoleEnum.DESIGNER, LifeCycleStatesEnum.CERTIFY, true).getLeft();
+		if(config.getIsDistributionClientRunning()){
+			List<String> distributionStatusList = Arrays.asList(DistributionNotificationStatusEnum.DOWNLOAD_OK.toString(), DistributionNotificationStatusEnum.DEPLOY_OK.toString(), DistributionNotificationStatusEnum.NOTIFIED.toString());
+			DistributionValidationUtils.validateDistributedArtifactsByAudit(service, distributionStatusList);
+		}
+	}
+
+	
+	public static Map<String, String> addVNF_ModuleDeploymentArtifactToMap(Service service, Map<String, String> distributionArtifactMap){
+		
+		
+		return distributionArtifactMap;
+	}
+	
+	public Component getComponentInTargetLifeCycleState(String componentType, UserRoleEnum creatorUser, LifeCycleStatesEnum targetLifeCycleState) throws Exception {
+		Component component = null;
+		
+		if(componentType.toLowerCase().equals("vf")) {
+			Either<Resource, RestResponse> createdResource = AtomicOperationUtils.createResourcesByTypeNormTypeAndCatregory(ResourceTypeEnum.VF, NormativeTypesEnum.ROOT, ResourceCategoryEnum.GENERIC_INFRASTRUCTURE, creatorUser, true);
+			component = createdResource.left().value();
+			component = AtomicOperationUtils.changeComponentState(component, creatorUser, targetLifeCycleState, true).getLeft();
+		} else {
+			Either<Service, RestResponse> createdResource = AtomicOperationUtils.createDefaultService(creatorUser, true);
+			component = createdResource.left().value();
+			component = AtomicOperationUtils.changeComponentState(component, creatorUser, targetLifeCycleState, true).getLeft();
+		}
+		
+		return component;
+	}
+}
diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/execute/distribution/AuthanticationTests.java b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/execute/distribution/AuthanticationTests.java
new file mode 100644
index 0000000000..032bbcc5b7
--- /dev/null
+++ b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/execute/distribution/AuthanticationTests.java
@@ -0,0 +1,182 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * SDC
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.sdc.ci.tests.execute.distribution;
+
+import org.junit.Rule;
+import org.junit.rules.TestName;
+import org.openecomp.sdc.be.datatypes.elements.ConsumerDataDefinition;
+import org.openecomp.sdc.be.model.User;
+import org.openecomp.sdc.be.resources.data.auditing.AuditingActionEnum;
+import org.openecomp.sdc.ci.tests.api.ComponentBaseTest;
+import org.openecomp.sdc.ci.tests.datatypes.ArtifactReqDetails;
+import org.openecomp.sdc.ci.tests.datatypes.ResourceReqDetails;
+import org.openecomp.sdc.ci.tests.datatypes.ServiceReqDetails;
+import org.openecomp.sdc.ci.tests.datatypes.enums.ArtifactTypeEnum;
+import org.openecomp.sdc.ci.tests.datatypes.enums.UserRoleEnum;
+import org.openecomp.sdc.ci.tests.datatypes.expected.ExpectedAuthenticationAudit;
+import org.openecomp.sdc.ci.tests.datatypes.http.RestResponse;
+import org.openecomp.sdc.ci.tests.utils.general.ElementFactory;
+import org.openecomp.sdc.ci.tests.utils.rest.ArtifactRestUtils;
+import org.openecomp.sdc.ci.tests.utils.rest.BaseRestUtils;
+import org.openecomp.sdc.ci.tests.utils.rest.ConsumerRestUtils;
+import org.openecomp.sdc.ci.tests.utils.rest.ServiceRestUtils;
+import org.openecomp.sdc.ci.tests.utils.validation.AuditValidationUtils;
+import org.openecomp.sdc.common.api.Constants;
+import org.openecomp.sdc.common.util.ValidationUtils;
+import org.testng.AssertJUnit;
+import org.testng.annotations.AfterMethod;
+import org.testng.annotations.BeforeMethod;
+import org.testng.annotations.DataProvider;
+import org.testng.annotations.Test;
+
+import java.io.IOException;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import static org.testng.AssertJUnit.assertEquals;
+
+public class AuthanticationTests extends ComponentBaseTest {
+
+	@Rule
+	public static TestName name = new TestName();
+	protected ResourceReqDetails resourceDetails;
+	protected ServiceReqDetails serviceDetails;
+	protected User sdncUserDetails;
+
+	protected static final String AUTH_SUCCESS = "AUTH_SUCCESS";
+
+	protected static final String AUTH_REQUIRED = "AUTH_REQUIRED";
+
+	// user ci password 123456
+	// protected final String authorizationHeader = "Basic Y2k6MTIzNDU2";
+	// user ci password 123456
+	protected final String USER = "ci";
+	protected final String PASSWORD = "123456";
+	protected final String SALT = "2a1f887d607d4515d4066fe0f5452a50";
+	protected final String HASHED_PASSWORD = "0a0dc557c3bf594b1a48030e3e99227580168b21f44e285c69740b8d5b13e33b";
+	protected User sdncAdminUserDetails;
+	protected ConsumerDataDefinition consumerDataDefinition;
+
+	@DataProvider
+	private final Object[][] getServiceDepArtType() throws IOException, Exception {
+		return new Object[][] { { ArtifactTypeEnum.YANG_XML.getType() }, { ArtifactTypeEnum.OTHER.getType() } };
+	}
+
+	@BeforeMethod
+	public void setup() throws Exception {
+		resourceDetails = ElementFactory.getDefaultResource();
+		serviceDetails = ElementFactory.getDefaultService();
+		sdncUserDetails = ElementFactory.getDefaultUser(UserRoleEnum.DESIGNER);
+		sdncAdminUserDetails = ElementFactory.getDefaultUser(UserRoleEnum.ADMIN);
+
+		createComponents();
+		consumerDataDefinition = createConsumer();
+		RestResponse deleteResponse = ConsumerRestUtils.deleteConsumer(consumerDataDefinition, sdncAdminUserDetails);
+		BaseRestUtils.checkStatusCode(deleteResponse, "delete operation filed", false, 404, 200);
+		;
+
+		RestResponse createResponse = ConsumerRestUtils.createConsumer(consumerDataDefinition, sdncAdminUserDetails);
+		BaseRestUtils.checkCreateResponse(createResponse);
+
+	}
+
+	@AfterMethod
+	public void tearDown() throws Exception {
+		RestResponse deleteResponse = ConsumerRestUtils.deleteConsumer(consumerDataDefinition, sdncAdminUserDetails);
+		BaseRestUtils.checkStatusCode(deleteResponse, "delete operation filed", false, 404, 200);
+		;
+
+	}
+
+	protected ConsumerDataDefinition createConsumer() {
+		ConsumerDataDefinition consumer = new ConsumerDataDefinition();
+		consumer.setConsumerName(USER);
+		consumer.setConsumerSalt(SALT);
+		consumer.setConsumerPassword(HASHED_PASSWORD);
+		return consumer;
+
+	}
+
+	protected void createComponents() throws Exception {
+		RestResponse response = ServiceRestUtils.createService(serviceDetails, sdncUserDetails);
+		ServiceRestUtils.checkCreateResponse(response);
+	}
+
+	@Test(dataProvider = "getServiceDepArtType", description = "mumu")
+	public void downloadServiceArtifactSuccessWithAutantication(String serviceDepArtType) throws Exception {
+		String serviceUniqueId = serviceDetails.getUniqueId();
+
+		ArtifactReqDetails artifactDetails = ElementFactory.getDefaultDeploymentArtifactForType(serviceDepArtType);
+
+		RestResponse addArtifactResponse = ArtifactRestUtils.addInformationalArtifactToService(artifactDetails,
+				sdncUserDetails, serviceUniqueId, ArtifactRestUtils.calculateChecksum(artifactDetails));
+		AssertJUnit.assertEquals("Check response code after adding interface artifact", 200,
+				addArtifactResponse.getErrorCode().intValue());
+
+		String artifactName = ValidationUtils.normalizeFileName(artifactDetails.getArtifactName());
+		// Thread.sleep(5000);
+		Map<String, String> authorizationHeaders = BaseRestUtils.addAuthorizeHeader(USER, PASSWORD);
+		RestResponse restResponse = ArtifactRestUtils.downloadServiceArtifact(serviceDetails, artifactDetails,
+				sdncUserDetails, authorizationHeaders);
+		AssertJUnit.assertEquals("Check response code after download resource", 200,
+				restResponse.getErrorCode().intValue());
+
+		List<String> contDispHeaderList = restResponse.getHeaderFields().get(Constants.CONTENT_DISPOSITION_HEADER);
+		AssertJUnit.assertNotNull(contDispHeaderList);
+		AssertJUnit.assertEquals("Check content disposition header",
+				new StringBuilder().append("attachment; filename=\"").append(artifactName).append("\"").toString(),
+				contDispHeaderList.get(0));
+
+		String downloadUrl = ArtifactRestUtils
+				.getPartialUrlByArtifactName(serviceDetails, serviceDetails.getVersion(), artifactName).substring(6);
+
+		ExpectedAuthenticationAudit expectedAuthenticationAudit = new ExpectedAuthenticationAudit(downloadUrl, USER,
+				AuditingActionEnum.AUTH_REQUEST.getName(), AUTH_SUCCESS);
+		AuditValidationUtils.validateAuthenticationAudit(expectedAuthenticationAudit);
+	}
+
+	@Test(dataProvider = "getServiceDepArtType")
+	public void downloadServiceArtifactWithOutAutantication(String serviceDepArtType) throws Exception {
+		String serviceUniqueId = serviceDetails.getUniqueId();
+
+		ArtifactReqDetails artifactDetails = ElementFactory.getDefaultDeploymentArtifactForType(serviceDepArtType);
+
+		RestResponse addArtifactResponse = ArtifactRestUtils.addInformationalArtifactToService(artifactDetails,
+				sdncUserDetails, serviceUniqueId, ArtifactRestUtils.calculateChecksum(artifactDetails));
+		assertEquals("Check response code after adding interface artifact", 200,
+				addArtifactResponse.getErrorCode().intValue());
+
+		Map<String, String> authorizationHeaders = new HashMap<String, String>();
+		RestResponse restResponse = ArtifactRestUtils.downloadServiceArtifact(serviceDetails, artifactDetails,
+				sdncUserDetails, authorizationHeaders);
+		assertEquals("Check response code after download resource failure", 401,
+				restResponse.getErrorCode().intValue());
+
+		String downloadUrl = ArtifactRestUtils.getPartialUrlByArtifactName(serviceDetails, serviceDetails.getVersion(),
+				artifactDetails.getArtifactName()).substring(6);
+		ExpectedAuthenticationAudit expectedAuthenticationAudit = new ExpectedAuthenticationAudit(downloadUrl, "",
+				AuditingActionEnum.AUTH_REQUEST.getName(), AUTH_REQUIRED);
+		AuditValidationUtils.validateAuthenticationAudit(expectedAuthenticationAudit);
+
+	}
+
+}
diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/execute/distribution/DistributionDownloadArtifactTest.java b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/execute/distribution/DistributionDownloadArtifactTest.java
new file mode 100644
index 0000000000..0164500613
--- /dev/null
+++ b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/execute/distribution/DistributionDownloadArtifactTest.java
@@ -0,0 +1,525 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * SDC
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.sdc.ci.tests.execute.distribution;
+
+import org.apache.commons.codec.binary.Base64;
+import org.junit.Rule;
+import org.junit.rules.TestName;
+import org.openecomp.sdc.be.datatypes.elements.ConsumerDataDefinition;
+import org.openecomp.sdc.be.datatypes.enums.ResourceTypeEnum;
+import org.openecomp.sdc.be.model.ArtifactDefinition;
+import org.openecomp.sdc.be.model.Resource;
+import org.openecomp.sdc.be.model.User;
+import org.openecomp.sdc.ci.tests.api.ComponentBaseTest;
+import org.openecomp.sdc.ci.tests.api.Urls;
+import org.openecomp.sdc.ci.tests.config.Config;
+import org.openecomp.sdc.ci.tests.datatypes.ArtifactReqDetails;
+import org.openecomp.sdc.ci.tests.datatypes.ResourceReqDetails;
+import org.openecomp.sdc.ci.tests.datatypes.ServiceReqDetails;
+import org.openecomp.sdc.ci.tests.datatypes.enums.ArtifactTypeEnum;
+import org.openecomp.sdc.ci.tests.datatypes.enums.NormativeTypesEnum;
+import org.openecomp.sdc.ci.tests.datatypes.enums.ResourceCategoryEnum;
+import org.openecomp.sdc.ci.tests.datatypes.enums.UserRoleEnum;
+import org.openecomp.sdc.ci.tests.datatypes.expected.ExpectedDistDownloadAudit;
+import org.openecomp.sdc.ci.tests.datatypes.http.HttpHeaderEnum;
+import org.openecomp.sdc.ci.tests.datatypes.http.RestResponse;
+import org.openecomp.sdc.ci.tests.utils.Utils;
+import org.openecomp.sdc.ci.tests.utils.general.ElementFactory;
+import org.openecomp.sdc.ci.tests.utils.rest.*;
+import org.openecomp.sdc.ci.tests.utils.validation.AuditValidationUtils;
+import org.openecomp.sdc.common.api.Constants;
+import org.openecomp.sdc.common.util.GeneralUtility;
+import org.openecomp.sdc.common.util.ValidationUtils;
+import org.testng.AssertJUnit;
+import org.testng.annotations.BeforeMethod;
+import org.testng.annotations.Test;
+
+import java.io.ByteArrayInputStream;
+import java.io.InputStream;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.zip.ZipInputStream;
+
+import static org.testng.AssertJUnit.assertEquals;
+import static org.testng.AssertJUnit.assertNotNull;
+
+public class DistributionDownloadArtifactTest extends ComponentBaseTest {
+
+	protected static ResourceReqDetails resourceDetails;
+	protected static User designerUser;
+	protected static User adminUser;
+	protected static String resourceBaseVersion;
+	// user ci password 123456
+	protected final String authorizationHeader = "Basic Y2k6MTIzNDU2";
+	protected ConsumerDataDefinition consumerDataDefinition;
+
+	@Rule
+	public static TestName name = new TestName();
+	protected static String artifactInterfaceType;
+	protected static String artifactOperationName;
+
+	protected static ServiceReqDetails serviceDetails;
+	protected static String serviceBaseVersion;
+	protected static String serviceUniqueId;
+	protected final String USER = "ci";
+	protected final String PASSWORD = "123456";
+	protected final String SALT = "2a1f887d607d4515d4066fe0f5452a50";
+	protected final String HASHED_PASSWORD = "0a0dc557c3bf594b1a48030e3e99227580168b21f44e285c69740b8d5b13e33b";
+
+	// @BeforeClass
+	// public static void InitBeforeTest() throws Exception
+	// {
+	//
+	//
+	// resourceBaseVersion = "0.1";
+	// serviceBaseVersion = "0.1";
+	// designerUser = ElementFactory.getDefaultUser(UserRoleEnum.DESIGNER);
+	// adminUser = ElementFactory.getDefaultUser(UserRoleEnum.ADMIN);
+	// resourceDetails =
+	// ElementFactory.getDefaultResourceByTypeNormTypeAndCatregory(ResourceTypeEnum.VFC,
+	// NormativeTypesEnum.ROOT, ResourceCategoryEnum.NETWORK_L2_3_ROUTERS,
+	// adminUser);
+	// serviceDetails = ElementFactory.getDefaultService();
+	// serviceUniqueId = "svc_" + serviceDetails.getName().toLowerCase() + "." +
+	// serviceBaseVersion;
+	// artifactInterfaceType = "standard";
+	// artifactOperationName = "start";
+	// }
+
+	@BeforeMethod
+	public void setup() throws Exception {
+
+		resourceBaseVersion = "0.1";
+		serviceBaseVersion = "0.1";
+		designerUser = ElementFactory.getDefaultUser(UserRoleEnum.DESIGNER);
+		adminUser = ElementFactory.getDefaultUser(UserRoleEnum.ADMIN);
+		resourceDetails = ElementFactory.getDefaultResourceByTypeNormTypeAndCatregory(ResourceTypeEnum.VFC,
+				NormativeTypesEnum.ROOT, ResourceCategoryEnum.NETWORK_L2_3_ROUTERS, adminUser);
+		serviceDetails = ElementFactory.getDefaultService();
+		serviceUniqueId = "svc_" + serviceDetails.getName().toLowerCase() + "." + serviceBaseVersion;
+		artifactInterfaceType = "standard";
+		artifactOperationName = "start";
+		consumerDataDefinition = createConsumer();
+		RestResponse deleteResponse = ConsumerRestUtils.deleteConsumer(consumerDataDefinition, adminUser);
+		BaseRestUtils.checkStatusCode(deleteResponse, "delete operation filed", false, 404, 200);
+
+		RestResponse createResponse = ConsumerRestUtils.createConsumer(consumerDataDefinition, adminUser);
+		BaseRestUtils.checkCreateResponse(createResponse);
+	}
+
+	@Test
+	public void downloadResourceArtifactSuccess() throws Exception {
+		// Create service
+		RestResponse serviceResponse = ServiceRestUtils.createService(serviceDetails, designerUser);
+		AssertJUnit.assertEquals("Check response code after creating resource", 201,
+				serviceResponse.getErrorCode().intValue());
+
+		// Create resource
+		RestResponse createResource = ResourceRestUtils.createResource(resourceDetails, designerUser);
+		AssertJUnit.assertEquals("Check response code after creating resource", 201,
+				createResource.getErrorCode().intValue());
+		Resource resource = ResponseParser.convertResourceResponseToJavaObject(createResource.getResponse());
+
+		ArtifactReqDetails artifactDetails = ElementFactory
+				.getDefaultDeploymentArtifactForType(ArtifactTypeEnum.HEAT.getType());
+		// Setting the name to be with space
+		artifactDetails.setArtifactName("test artifact file.yaml");
+		// artifactDetails.set(ArtifactRestUtils.calculateChecksum(artifactDetails));
+
+		RestResponse addArtifactResponse = ArtifactRestUtils.addInformationalArtifactToResource(artifactDetails,
+				designerUser, resource.getUniqueId(), ArtifactRestUtils.calculateChecksum(artifactDetails));
+		AssertJUnit.assertEquals("Check response code after adding interface artifact", 200,
+				addArtifactResponse.getErrorCode().intValue());
+
+		// Getting expected artifact checksum
+		ArtifactDefinition artifactResp = ResponseParser
+				.convertArtifactDefinitionResponseToJavaObject(addArtifactResponse.getResponse());
+		String expectedPayloadChecksum = artifactResp.getArtifactChecksum();
+
+		Config config = Utils.getConfig();
+		String relativeUrl = encodeUrlForDownload(String.format(Urls.DISTRIB_DOWNLOAD_RESOURCE_ARTIFACT_RELATIVE_URL,
+				ValidationUtils.convertToSystemName(serviceDetails.getName()), serviceBaseVersion,
+				ValidationUtils.convertToSystemName(resource.getName()), resource.getVersion(),
+				artifactResp.getArtifactName()));
+		// String fullUrlFormatted =
+		// String.format(Urls.DOWNLOAD_RESOURCE_ARTIFACT_FULL_URL,
+		// config.getCatalogBeHost(),config.getCatalogBePort(), relativeUrl);
+		// String consumerId = "dummy.ecomp";
+
+		ResourceReqDetails resourceInfo = new ResourceReqDetails();
+		resourceInfo.setName(resource.getName());
+		resourceInfo.setVersion(resource.getVersion());
+
+		Map<String, String> authorizationHeaders = new HashMap<String, String>();
+		authorizationHeaders.put(HttpHeaderEnum.AUTHORIZATION.getValue(), authorizationHeader);
+		RestResponse restResponse = ArtifactRestUtils.downloadResourceArtifact(serviceDetails, resourceInfo,
+				artifactDetails, designerUser, authorizationHeaders);
+		// RestResponse restResponse =
+		// artifactUtils.downloadResourceArtifact(designerUser,fullUrlFormatted,
+		// consumerId,true);
+		AssertJUnit.assertEquals("Check response code after download resource", 200,
+				restResponse.getErrorCode().intValue());
+
+		// Validating headers
+		// content disposition
+		List<String> contDispHeaderList = restResponse.getHeaderFields().get(Constants.CONTENT_DISPOSITION_HEADER);
+		AssertJUnit.assertNotNull(contDispHeaderList);
+		AssertJUnit
+				.assertEquals(
+						"Check content disposition header", new StringBuilder().append("attachment; filename=\"")
+								.append(artifactResp.getArtifactName()).append("\"").toString(),
+						contDispHeaderList.get(0));
+
+		// content type
+		List<String> contTypeHeaderList = restResponse.getHeaderFields().get(Constants.CONTENT_TYPE_HEADER);
+		AssertJUnit.assertNotNull(contTypeHeaderList);
+		AssertJUnit.assertEquals("Check content type", "application/octet-stream", contTypeHeaderList.get(0));
+
+		String actualContents = restResponse.getResponse();
+
+		// Contents - comparing decoded content
+		AssertJUnit.assertEquals(artifactDetails.getPayload(), Base64.encodeBase64String(actualContents.getBytes()));
+
+		// validating checksum
+		String actualPayloadChecksum = GeneralUtility.calculateMD5Base64EncodedByByteArray(actualContents.getBytes());
+		AssertJUnit.assertEquals(expectedPayloadChecksum, actualPayloadChecksum);
+
+		// validate audit
+		String auditAction = "DArtifactDownload";
+
+		ExpectedDistDownloadAudit expectedDistDownloadAudit = new ExpectedDistDownloadAudit(auditAction,
+				BaseRestUtils.ecomp, relativeUrl, "200", "OK");
+		AuditValidationUtils.validateAudit(expectedDistDownloadAudit, auditAction);
+	}
+
+	protected void download_serviceNameNotFound_inner(String serviceName, String serviceVersion, String resourceName,
+			String resourceVersion) throws Exception {
+		Config config = Utils.getConfig();
+		String artifactName = "kuku";
+		ArtifactReqDetails artifact = new ArtifactReqDetails();
+		artifact.setArtifactName(artifactName);
+		String relativeUrl;
+		Map<String, String> authorizationHeaders = new HashMap<String, String>();
+		authorizationHeaders.put(HttpHeaderEnum.AUTHORIZATION.getValue(), authorizationHeader);
+		ServiceReqDetails serviceInfo = new ServiceReqDetails();
+		serviceInfo.setName(serviceName);
+		serviceInfo.setVersion(serviceVersion);
+		RestResponse restResponse = null;
+		if (resourceName != null) {
+			ResourceReqDetails resourceDetailes = new ResourceReqDetails();
+			resourceDetailes.setName(resourceName);
+			resourceDetailes.setVersion(resourceVersion);
+			relativeUrl = encodeUrlForDownload(String.format(Urls.DISTRIB_DOWNLOAD_RESOURCE_ARTIFACT_RELATIVE_URL,
+					ValidationUtils.convertToSystemName(serviceName), serviceVersion,
+					ValidationUtils.convertToSystemName(resourceName), resourceVersion, artifactName));
+			restResponse = ArtifactRestUtils.downloadResourceArtifact(serviceInfo, resourceDetailes, artifact,
+					designerUser, authorizationHeaders);
+		} else {
+			relativeUrl = encodeUrlForDownload(String.format(Urls.DISTRIB_DOWNLOAD_SERVICE_ARTIFACT_RELATIVE_URL,
+					ValidationUtils.convertToSystemName(serviceName), serviceVersion, artifactName));
+			restResponse = ArtifactRestUtils.downloadServiceArtifact(serviceInfo, artifact, designerUser,
+					authorizationHeaders);
+		}
+
+		// RestResponse restResponse =
+		// artifactUtils.downloadResourceArtifact(designerUser,fullUrlFormatted,
+		// consumerId,true);
+		AssertJUnit.assertEquals("Check response code after download resource", 404,
+				restResponse.getErrorCode().intValue());
+
+		// validate audit
+		String auditAction = "DArtifactDownload";
+
+		ExpectedDistDownloadAudit expectedDistDownloadAudit = new ExpectedDistDownloadAudit(auditAction,
+				BaseRestUtils.ecomp, relativeUrl, "404", "SVC4503: Error: Requested '"
+						+ ValidationUtils.convertToSystemName(serviceName) + "' service was not found.");
+		AuditValidationUtils.validateAudit(expectedDistDownloadAudit, auditAction);
+	}
+
+	protected void download_serviceVersionNotFound_inner(String serviceName, String serviceVersion, String resourceName,
+			String resourceVersion) throws Exception {
+		Config config = Utils.getConfig();
+		String artifactName = "kuku";
+		String relativeUrl;
+		ArtifactReqDetails artifact = new ArtifactReqDetails();
+		artifact.setArtifactName(artifactName);
+		Map<String, String> authorizationHeaders = new HashMap<String, String>();
+		authorizationHeaders.put(HttpHeaderEnum.AUTHORIZATION.getValue(), authorizationHeader);
+		ServiceReqDetails serviceInfo = new ServiceReqDetails();
+		serviceInfo.setName(serviceName);
+		serviceInfo.setVersion(serviceVersion);
+		RestResponse restResponse = null;
+		if (resourceName != null) {
+			ResourceReqDetails resourceDetailes = new ResourceReqDetails();
+			resourceDetailes.setName(resourceName);
+			resourceDetailes.setVersion(resourceVersion);
+			relativeUrl = encodeUrlForDownload(String.format(Urls.DISTRIB_DOWNLOAD_RESOURCE_ARTIFACT_RELATIVE_URL,
+					ValidationUtils.convertToSystemName(serviceName), serviceVersion,
+					ValidationUtils.convertToSystemName(resourceName), resourceVersion, artifactName));
+			restResponse = ArtifactRestUtils.downloadResourceArtifact(serviceInfo, resourceDetailes, artifact,
+					designerUser, authorizationHeaders);
+		} else {
+			relativeUrl = encodeUrlForDownload(String.format(Urls.DISTRIB_DOWNLOAD_SERVICE_ARTIFACT_RELATIVE_URL,
+					ValidationUtils.convertToSystemName(serviceName), serviceVersion, artifactName));
+			restResponse = ArtifactRestUtils.downloadServiceArtifact(serviceInfo, artifact, designerUser,
+					authorizationHeaders);
+		}
+		// String fullUrlFormatted =
+		// String.format(Urls.DOWNLOAD_RESOURCE_ARTIFACT_FULL_URL,
+		// config.getCatalogBeHost(),config.getCatalogBePort(), relativeUrl);
+		// String consumerId = "dummy.ecomp";
+
+		// RestResponse restResponse =
+		// artifactUtils.downloadResourceArtifact(designerUser,fullUrlFormatted,
+		// consumerId,true);
+		AssertJUnit.assertEquals("Check response code after download resource", 404,
+				restResponse.getErrorCode().intValue());
+
+		// validate audit
+		String auditAction = "DArtifactDownload";
+
+		ExpectedDistDownloadAudit expectedDistDownloadAudit = new ExpectedDistDownloadAudit(auditAction,
+				BaseRestUtils.ecomp, relativeUrl, "404",
+				"SVC4504: Error: Service version " + serviceVersion + " was not found.");
+		AuditValidationUtils.validateAudit(expectedDistDownloadAudit, auditAction);
+	}
+
+	protected String encodeUrlForDownload(String url) {
+		return url.replaceAll(" ", "%20");
+	}
+
+	protected ConsumerDataDefinition createConsumer() {
+		ConsumerDataDefinition consumer = new ConsumerDataDefinition();
+		consumer.setConsumerName(USER);
+		consumer.setConsumerSalt(SALT);
+		consumer.setConsumerPassword(HASHED_PASSWORD);
+		return consumer;
+
+	}
+
+	@Test(enabled = true)
+	public void downloadServiceArtifactSuccess() throws Exception {
+		// Create service
+		RestResponse serviceResponse = ServiceRestUtils.createService(serviceDetails, designerUser);
+		assertEquals("Check response code after creating resource", 201, serviceResponse.getErrorCode().intValue());
+		serviceUniqueId = ResponseParser.convertServiceResponseToJavaObject(serviceResponse.getResponse())
+				.getUniqueId();
+
+		ArtifactReqDetails artifactDetails = ElementFactory.getDefaultDeploymentArtifactForType("MURANO_PKG");
+
+		RestResponse addArtifactResponse = ArtifactRestUtils.addInformationalArtifactToService(artifactDetails,
+				designerUser, serviceUniqueId, ArtifactRestUtils.calculateMD5Header(artifactDetails));
+		assertEquals("Check response code after adding interface artifact", 200,
+				addArtifactResponse.getErrorCode().intValue());
+
+		// Getting expected artifact checksum
+
+		// ArtifactResJavaObject artifactResp =
+		// artifactUtils.parseInformationalArtifactResp(addArtifactResponse);
+		String expectedPayloadChecksum = ResponseParser
+				.convertArtifactDefinitionResponseToJavaObject(addArtifactResponse.getResponse()).getArtifactChecksum();
+
+		String artifactName = ValidationUtils.normalizeFileName(artifactDetails.getArtifactName());
+
+		String relativeUrl = encodeUrlForDownload(String.format(Urls.DISTRIB_DOWNLOAD_SERVICE_ARTIFACT_RELATIVE_URL,
+				ValidationUtils.convertToSystemName(serviceDetails.getName()), serviceBaseVersion, artifactName));
+
+		Map<String, String> authorizationHeaders = new HashMap<String, String>();
+		authorizationHeaders.put(HttpHeaderEnum.AUTHORIZATION.getValue(), authorizationHeader);
+		RestResponse restResponse = ArtifactRestUtils.downloadServiceArtifact(serviceDetails, artifactDetails,
+				designerUser, authorizationHeaders);
+		assertEquals("Check response code after download resource", 200, restResponse.getErrorCode().intValue());
+
+		// Validating headers
+		// content disposition
+		List<String> contDispHeaderList = restResponse.getHeaderFields().get(Constants.CONTENT_DISPOSITION_HEADER);
+		assertNotNull(contDispHeaderList);
+		assertEquals("Check content disposition header",
+				new StringBuilder().append("attachment; filename=\"").append(artifactName).append("\"").toString(),
+				contDispHeaderList.get(0));
+
+		// content type
+		List<String> contTypeHeaderList = restResponse.getHeaderFields().get(Constants.CONTENT_TYPE_HEADER);
+		assertNotNull(contTypeHeaderList);
+		assertEquals("Check content type", "application/octet-stream", contTypeHeaderList.get(0));
+
+		String actualContents = restResponse.getResponse();
+
+		assertEquals(artifactDetails.getPayload(), Base64.encodeBase64String(actualContents.getBytes()));
+
+		// validating checksum
+		byte[] bytes = actualContents.getBytes();
+		String actualPayloadChecksum = GeneralUtility.calculateMD5Base64EncodedByByteArray(bytes);
+		assertEquals(expectedPayloadChecksum, actualPayloadChecksum);
+
+		// validating valid zip
+		InputStream is = new ByteArrayInputStream(bytes);
+		InputStream zis = new ZipInputStream(is);
+		zis.close();
+
+		// validate audit
+		String auditAction = "DArtifactDownload";
+
+		ExpectedDistDownloadAudit expectedDistDownloadAudit = new ExpectedDistDownloadAudit(auditAction,
+				ResourceRestUtils.ecomp, encodeUrlForDownload(relativeUrl), "200", "OK");
+		AuditValidationUtils.validateAudit(expectedDistDownloadAudit, auditAction);
+	}
+
+	@Test
+	public void downloadResourceArtifact_NoConsumerId() throws Exception {
+
+		String artifactName = "kuku";
+		ArtifactReqDetails artifact = new ArtifactReqDetails();
+		artifact.setArtifactName(artifactName);
+		ResourceReqDetails resource = new ResourceReqDetails();
+		resource.setName("notExisting");
+		resource.setVersion("0.1");
+		String relativeUrl = encodeUrlForDownload(String.format(Urls.DISTRIB_DOWNLOAD_RESOURCE_ARTIFACT_RELATIVE_URL,
+				ValidationUtils.convertToSystemName(serviceDetails.getName()), serviceBaseVersion,
+				ValidationUtils.convertToSystemName(resource.getName()), resource.getVersion(), artifactName));
+		serviceDetails.setVersion("0.1");
+		Map<String, String> authorizationHeaders = new HashMap<String, String>();
+		authorizationHeaders.put(HttpHeaderEnum.AUTHORIZATION.getValue(), authorizationHeader);
+		RestResponse restResponse = ArtifactRestUtils.downloadResourceArtifact(serviceDetails, resource, artifact,
+				designerUser, authorizationHeaders, false);
+		assertEquals("Check response code after download resource", 400, restResponse.getErrorCode().intValue());
+
+		// validate audit
+		String auditAction = "DArtifactDownload";
+
+		ExpectedDistDownloadAudit expectedDistDownloadAudit = new ExpectedDistDownloadAudit(auditAction, "",
+				relativeUrl, "400", "POL5001: Error: Missing 'X-ECOMP-InstanceID' HTTP header.");
+		AuditValidationUtils.validateAudit(expectedDistDownloadAudit, auditAction);
+	}
+
+	@Test
+	public void downloadResourceArtifact_ResourceNameNotFound() throws Exception {
+
+		String artifactName = "kuku";
+		ArtifactReqDetails artifact = new ArtifactReqDetails();
+		artifact.setArtifactName(artifactName);
+		ResourceReqDetails resource = new ResourceReqDetails();
+		resource.setName("notExisting");
+		resource.setVersion("0.1");
+		serviceDetails.setVersion("0.1");
+		String relativeUrl = encodeUrlForDownload(String.format(Urls.DISTRIB_DOWNLOAD_RESOURCE_ARTIFACT_RELATIVE_URL,
+				ValidationUtils.convertToSystemName(serviceDetails.getName()), serviceDetails.getVersion(),
+				ValidationUtils.convertToSystemName(resource.getName()), resource.getVersion(), artifactName));
+
+		Map<String, String> authorizationHeaders = new HashMap<String, String>();
+		authorizationHeaders.put(HttpHeaderEnum.AUTHORIZATION.getValue(), authorizationHeader);
+		RestResponse restResponse = ArtifactRestUtils.downloadResourceArtifact(serviceDetails, resource, artifact,
+				designerUser, authorizationHeaders);
+
+		assertEquals("Check response code after download resource", 404, restResponse.getErrorCode().intValue());
+
+		// validate audit
+		String auditAction = "DArtifactDownload";
+
+		ExpectedDistDownloadAudit expectedDistDownloadAudit = new ExpectedDistDownloadAudit(auditAction,
+				BaseRestUtils.ecomp, relativeUrl, "404",
+				"SVC4063: Error: Requested 'Notexisting' resource was not found.");
+		AuditValidationUtils.validateAudit(expectedDistDownloadAudit, auditAction);
+	}
+
+	@Test
+	public void downloadResourceArtifact_ResourceVersionNotFound() throws Exception {
+		RestResponse createResource = ResourceRestUtils.createResource(resourceDetails, designerUser);
+		assertEquals("Check response code after creating resource", 201, createResource.getErrorCode().intValue());
+
+		Resource resource = ResponseParser.convertResourceResponseToJavaObject(createResource.getResponse());
+		ResourceReqDetails resourceDetailes = new ResourceReqDetails();
+		resourceDetailes.setName(resource.getName());
+		resourceDetailes.setVersion("0.2");
+
+		serviceDetails.setVersion("0.1");
+
+		String artifactName = "kuku";
+		ArtifactReqDetails artifact = new ArtifactReqDetails();
+		artifact.setArtifactName(artifactName);
+
+		String relativeUrl = encodeUrlForDownload(String.format(Urls.DISTRIB_DOWNLOAD_RESOURCE_ARTIFACT_RELATIVE_URL,
+				ValidationUtils.convertToSystemName(serviceDetails.getName()), serviceBaseVersion,
+				ValidationUtils.convertToSystemName(resourceDetailes.getName()), resourceDetailes.getVersion(),
+				artifactName));
+
+		Map<String, String> authorizationHeaders = new HashMap<String, String>();
+		authorizationHeaders.put(HttpHeaderEnum.AUTHORIZATION.getValue(), authorizationHeader);
+		RestResponse restResponse = ArtifactRestUtils.downloadResourceArtifact(serviceDetails, resourceDetailes,
+				artifact, designerUser, authorizationHeaders);
+		assertEquals("Check response code after download resource", 404, restResponse.getErrorCode().intValue());
+
+		// validate audit
+		String auditAction = "DArtifactDownload";
+
+		ExpectedDistDownloadAudit expectedDistDownloadAudit = new ExpectedDistDownloadAudit(auditAction,
+				BaseRestUtils.ecomp, relativeUrl, "404", "SVC4504: Error: Resource version 0.2 was not found.");
+		AuditValidationUtils.validateAudit(expectedDistDownloadAudit, auditAction);
+	}
+
+	@Test
+	public void downloadResourceArtifact_ServiceNameNotFound() throws Exception {
+		// Create resource
+		RestResponse createResource = ResourceRestUtils.createResource(resourceDetails, designerUser);
+		assertEquals("Check response code after creating resource", 201, createResource.getErrorCode().intValue());
+		Resource resource = ResponseParser.convertResourceResponseToJavaObject(createResource.getResponse());
+		download_serviceNameNotFound_inner("notExistingServiceName", serviceBaseVersion, resource.getName(),
+				resource.getVersion());
+
+	}
+
+	@Test
+	public void downloadResourceArtifact_ServiceVersionNotFound() throws Exception {
+		// Create resource
+		RestResponse createResource = ResourceRestUtils.createResource(resourceDetails, designerUser);
+		assertEquals("Check response code after creating resource", 201, createResource.getErrorCode().intValue());
+		Resource resource = ResponseParser.convertResourceResponseToJavaObject(createResource.getResponse());
+
+		// Create service
+		RestResponse serviceResponse = ServiceRestUtils.createService(serviceDetails, designerUser);
+		assertEquals("Check response code after creating resource", 201, serviceResponse.getErrorCode().intValue());
+		serviceUniqueId = ResponseParser.convertServiceResponseToJavaObject(serviceResponse.getResponse())
+				.getUniqueId();
+
+		download_serviceVersionNotFound_inner(serviceDetails.getName(), "0.3", resource.getName(),
+				resource.getVersion());
+	}
+
+	@Test
+	public void downloadServiceArtifact_ServiceNameNotFound() throws Exception {
+		download_serviceNameNotFound_inner("notExistingServiceName", serviceBaseVersion, null, null);
+
+	}
+
+	@Test
+	public void downloadServiceArtifact_ServiceVersionNotFound() throws Exception {
+
+		// Create service
+		RestResponse serviceResponse = ServiceRestUtils.createService(serviceDetails, designerUser);
+		assertEquals("Check response code after creating resource", 201, serviceResponse.getErrorCode().intValue());
+		serviceUniqueId = ResponseParser.convertServiceResponseToJavaObject(serviceResponse.getResponse())
+				.getUniqueId();
+
+		download_serviceVersionNotFound_inner(serviceDetails.getName(), "0.2", null, null);
+	}
+
+}
diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/execute/externalapi/DownloadArtifactsTest.java b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/execute/externalapi/DownloadArtifactsTest.java
new file mode 100644
index 0000000000..8ed75c87e3
--- /dev/null
+++ b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/execute/externalapi/DownloadArtifactsTest.java
@@ -0,0 +1,356 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * SDC
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.sdc.ci.tests.execute.externalapi;
+
+import com.google.gson.Gson;
+import org.apache.commons.codec.binary.Base64;
+import org.junit.Rule;
+import org.junit.rules.TestName;
+import org.openecomp.sdc.be.datatypes.enums.ComponentTypeEnum;
+import org.openecomp.sdc.be.datatypes.enums.ResourceTypeEnum;
+import org.openecomp.sdc.be.model.*;
+import org.openecomp.sdc.ci.tests.api.ComponentBaseTest;
+import org.openecomp.sdc.ci.tests.api.Urls;
+import org.openecomp.sdc.ci.tests.datatypes.*;
+import org.openecomp.sdc.ci.tests.datatypes.enums.*;
+import org.openecomp.sdc.ci.tests.datatypes.http.HttpHeaderEnum;
+import org.openecomp.sdc.ci.tests.datatypes.http.HttpRequest;
+import org.openecomp.sdc.ci.tests.datatypes.http.RestResponse;
+import org.openecomp.sdc.ci.tests.utils.general.ElementFactory;
+import org.openecomp.sdc.ci.tests.utils.rest.*;
+import org.testng.Assert;
+import org.testng.annotations.BeforeMethod;
+import org.testng.annotations.Test;
+
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import static org.testng.AssertJUnit.*;
+
+public class DownloadArtifactsTest extends ComponentBaseTest {
+	@Rule
+	public static TestName name = new TestName();
+
+	Gson gson = new Gson();
+
+	private User sdncDesignerDetails;
+	private User sdncAdminDetails;
+	private ImportReqDetails resourceDetailsVF_01;
+	private ResourceReqDetails resourceDetailsVF_02;
+	private ResourceReqDetails resourceDetailsVF_03;
+	private ResourceReqDetails resourceDetailsCP_01;
+	private ServiceReqDetails serviceDetails_01;
+	private ServiceReqDetails serviceDetails_02;
+	public static String rootPath = System.getProperty("user.dir");
+
+	@BeforeMethod(alwaysRun = true)
+	public void before() throws Exception {
+		init();
+		createComponents();
+	}
+
+	private void createComponents() throws Exception {
+		createAtomicResource(resourceDetailsCP_01);
+		importVfWithArtifacts(resourceDetailsVF_01);
+		createVF(resourceDetailsVF_03);
+		createVF(resourceDetailsVF_02);
+		createService(serviceDetails_01);
+	}
+
+	public void init() {
+		sdncDesignerDetails = ElementFactory.getDefaultUser(UserRoleEnum.DESIGNER);
+		sdncAdminDetails = ElementFactory.getDefaultUser(UserRoleEnum.ADMIN);
+		resourceDetailsVF_01 = ElementFactory.getDefaultImportResourceByType("VF100", NormativeTypesEnum.ROOT,
+				ResourceCategoryEnum.GENERIC_INFRASTRUCTURE, sdncDesignerDetails.getUserId(),
+				ResourceTypeEnum.VF.toString());
+		resourceDetailsVF_02 = ElementFactory.getDefaultResourceByType("VF200", NormativeTypesEnum.ROOT,
+				ResourceCategoryEnum.GENERIC_INFRASTRUCTURE, sdncDesignerDetails.getUserId(),
+				ResourceTypeEnum.VF.toString());
+		resourceDetailsVF_03 = ElementFactory.getDefaultResourceByType("VF300", NormativeTypesEnum.ROOT,
+				ResourceCategoryEnum.GENERIC_INFRASTRUCTURE, sdncDesignerDetails.getUserId(),
+				ResourceTypeEnum.VF.toString());
+		resourceDetailsCP_01 = ElementFactory.getDefaultResourceByType("CP100", NormativeTypesEnum.PORT,
+				ResourceCategoryEnum.GENERIC_NETWORK_ELEMENTS, sdncDesignerDetails.getUserId(),
+				ResourceTypeEnum.CP.toString());
+		serviceDetails_01 = ElementFactory.getDefaultService("newtestservice1", ServiceCategoriesEnum.MOBILITY,
+				sdncDesignerDetails.getUserId(),
+				ServiceInstantiationType.A_LA_CARTE.getValue());
+		serviceDetails_02 = ElementFactory.getDefaultService("newtestservice2", ServiceCategoriesEnum.MOBILITY,
+				sdncDesignerDetails.getUserId(),
+				ServiceInstantiationType.A_LA_CARTE.getValue());
+	}
+
+	@Test
+	public void downloadResourceInstanceArtifactsFromServiceTest() throws Exception {
+		Service service = createServiceWithRIsWithArtifacts();
+		Map<String, ArtifactDefinition> deploymentArtifacts;
+		List<ComponentInstance> resourceInstances = service.getComponentInstances();
+		for (ComponentInstance ri : resourceInstances) {
+			deploymentArtifacts = ri.getDeploymentArtifacts();
+			for (ArtifactDefinition artifact : deploymentArtifacts.values()) {
+				assertNotNull(downloadResourceInstanceArtifact(service, ri, artifact));
+			}
+		}
+	}
+
+	@Test
+	public void downloadServiceArtifactsTest() throws Exception {
+		Service service = createServiceWithArtifacts();
+		Map<String, ArtifactDefinition> deploymentArtifacts = service.getDeploymentArtifacts();
+		for (ArtifactDefinition artifact : deploymentArtifacts.values()) {
+			assertNotNull(downloadServiceArtifact(service, artifact));
+		}
+
+	}
+
+	private Service createServiceWithArtifacts() throws Exception {
+
+		ArtifactReqDetails otherArtifactDetails = ElementFactory
+				.getDefaultDeploymentArtifactForType(ArtifactTypeEnum.OTHER.getType());
+
+		RestResponse addInformationalArtifactToService = ArtifactRestUtils.addInformationalArtifactToService(
+				otherArtifactDetails, sdncDesignerDetails, serviceDetails_01.getUniqueId());
+		assertTrue(
+				"response code is not BaseRestUtils.STATUS_CODE_SUCCESS, returned :"
+						+ addInformationalArtifactToService.getErrorCode(),
+				addInformationalArtifactToService.getErrorCode() == BaseRestUtils.STATUS_CODE_SUCCESS);
+
+		ArtifactReqDetails yangXmlArtifactDetails = ElementFactory
+				.getDefaultDeploymentArtifactForType(ArtifactTypeEnum.YANG_XML.getType());
+
+		addInformationalArtifactToService = ArtifactRestUtils.addInformationalArtifactToService(yangXmlArtifactDetails,
+				sdncDesignerDetails, serviceDetails_01.getUniqueId());
+		assertTrue(
+				"response code is not BaseRestUtils.STATUS_CODE_SUCCESS, returned :"
+						+ addInformationalArtifactToService.getErrorCode(),
+				addInformationalArtifactToService.getErrorCode() == BaseRestUtils.STATUS_CODE_SUCCESS);
+		RestResponse createServiceResponse = ServiceRestUtils.getService(serviceDetails_01, sdncDesignerDetails);
+		return ResponseParser.convertServiceResponseToJavaObject(createServiceResponse.getResponse());
+	}
+
+	private RestResponse downloadResourceInstanceArtifact(Service service, ComponentInstance ri,
+			ArtifactDefinition artifact) throws Exception {
+		String url = String.format(Urls.GET_DOWNLOAD_SERVICE_RI_ARTIFACT, "localhost", "8080", service.getUUID(),
+				ri.getUniqueId(), artifact.getArtifactUUID());
+		String userId = sdncDesignerDetails.getUserId();
+		Map<String, String> headersMap = new HashMap<String, String>();
+		headersMap.put(HttpHeaderEnum.CONTENT_TYPE.getValue(), "application/json");
+		headersMap.put(HttpHeaderEnum.CACHE_CONTROL.getValue(), "no-cache");
+		headersMap.put(HttpHeaderEnum.AUTHORIZATION.getValue(), "Basic dGVzdDoxMjM0NTY=");
+		headersMap.put("X-ECOMP-InstanceID", "test");
+		if (userId != null) {
+			headersMap.put(HttpHeaderEnum.USER_ID.getValue(), userId);
+		}
+		sendAuthorizationRequest();
+		HttpRequest http = new HttpRequest();
+		RestResponse response = http.httpSendGet(url, headersMap);
+		if (response.getErrorCode() != 200 && response.getResponse().getBytes() == null
+				&& response.getResponse().getBytes().length == 0) {
+			return null;
+		}
+		return response;
+	}
+
+	private RestResponse downloadServiceArtifact(Service service, ArtifactDefinition artifact) throws Exception {
+		String url = String.format(Urls.GET_DOWNLOAD_SERVICE_ARTIFACT, "localhost", "8080", service.getUUID(),
+				artifact.getArtifactUUID());
+		String userId = sdncDesignerDetails.getUserId();
+		Map<String, String> headersMap = new HashMap<String, String>();
+		headersMap.put(HttpHeaderEnum.CONTENT_TYPE.getValue(), "application/json");
+		headersMap.put(HttpHeaderEnum.CACHE_CONTROL.getValue(), "no-cache");
+		headersMap.put(HttpHeaderEnum.AUTHORIZATION.getValue(), "Basic dGVzdDoxMjM0NTY=");
+		headersMap.put("X-ECOMP-InstanceID", "test");
+		if (userId != null) {
+			headersMap.put(HttpHeaderEnum.USER_ID.getValue(), userId);
+		}
+		sendAuthorizationRequest();
+		HttpRequest http = new HttpRequest();
+		RestResponse response = http.httpSendGet(url, headersMap);
+		if (response.getErrorCode() != 200 && response.getResponse().getBytes() == null
+				&& response.getResponse().getBytes().length == 0) {
+			return null;
+		}
+		return response;
+
+	}
+
+	private RestResponse sendAuthorizationRequest() throws IOException {
+		String url = String.format(Urls.POST_AUTHORIZATION, "localhost", "8080");
+		String userId = sdncAdminDetails.getUserId();
+		Map<String, String> headersMap = new HashMap<String, String>();
+		headersMap.put(HttpHeaderEnum.CONTENT_TYPE.getValue(), "application/json");
+		headersMap.put(HttpHeaderEnum.ACCEPT.getValue(), "application/json");
+		headersMap.put(HttpHeaderEnum.CACHE_CONTROL.getValue(), "no-cache");
+		if (userId != null) {
+			headersMap.put(HttpHeaderEnum.USER_ID.getValue(), userId);
+		}
+
+		HttpRequest http = new HttpRequest();
+		RestResponse response = http.httpSendPost(url,
+				"{\"consumerName\":\"test\",\"consumerPassword\":\"0a0dc557c3bf594b1a48030e3e99227580168b21f44e285c69740b8d5b13e33b\",\"consumerSalt\":\"2a1f887d607d4515d4066fe0f5452a50\"}",
+				headersMap);
+		if (response.getErrorCode() != 201) {
+			return null;
+		}
+		return response;
+	}
+
+	private Service createServiceWithRIsWithArtifacts() throws Exception {
+		serviceDetails_02.setUniqueId(serviceDetails_01.getUniqueId());
+		createTreeCheckedinVFInstances();
+		LifecycleRestUtils.changeResourceState(resourceDetailsCP_01, sdncDesignerDetails, "0.1",
+				LifeCycleStatesEnum.CHECKIN);
+		createVFInstanceAndAtomicResourceInstanceWithoutCheckin(resourceDetailsVF_01, resourceDetailsCP_01,
+				sdncDesignerDetails);
+		RestResponse updateServiceResp = ServiceRestUtils.updateService(serviceDetails_02, sdncDesignerDetails);
+		ServiceRestUtils.checkSuccess(updateServiceResp);
+		getComponentAndValidateRIs(serviceDetails_01, 5, 0);
+
+		return ResponseParser.convertServiceResponseToJavaObject(updateServiceResp.getResponse());
+	}
+
+	private void createTreeCheckedinVFInstances() throws Exception {
+		RestResponse createFirstVFInstResp = createCheckedinVFInstance(serviceDetails_01, resourceDetailsVF_01,
+				sdncDesignerDetails);
+		ResourceRestUtils.checkCreateResponse(createFirstVFInstResp);
+		RestResponse createSecondVFInstResp = createCheckedinVFInstance(serviceDetails_01, resourceDetailsVF_02,
+				sdncDesignerDetails);
+		ResourceRestUtils.checkCreateResponse(createSecondVFInstResp);
+		RestResponse createThirdVFInstResp = createCheckedinVFInstance(serviceDetails_01, resourceDetailsVF_03,
+				sdncDesignerDetails);
+		ResourceRestUtils.checkCreateResponse(createThirdVFInstResp);
+	}
+
+	private Component getComponentAndValidateRIs(ComponentReqDetails componentDetails, int numberOfRIs,
+			int numberOfRelations) throws IOException, Exception {
+
+		RestResponse getResponse = null;
+		Component component = null;
+		if (componentDetails instanceof ResourceReqDetails) {
+			getResponse = ResourceRestUtils.getResource(sdncAdminDetails, componentDetails.getUniqueId());
+			component = ResponseParser.parseToObjectUsingMapper(getResponse.getResponse(), Resource.class);
+		} else if (componentDetails instanceof ServiceReqDetails) {
+			getResponse = ServiceRestUtils.getService((ServiceReqDetails) componentDetails, sdncAdminDetails);
+			component = ResponseParser.parseToObjectUsingMapper(getResponse.getResponse(), Service.class);
+		} else if (componentDetails instanceof ProductReqDetails) {
+			getResponse = ProductRestUtils.getProduct(componentDetails.getUniqueId(), sdncAdminDetails.getUserId());
+			component = ResponseParser.parseToObjectUsingMapper(getResponse.getResponse(), Product.class);
+		} else {
+			Assert.fail("Unsupported type of componentDetails - " + componentDetails.getClass().getSimpleName());
+		}
+		ResourceRestUtils.checkSuccess(getResponse);
+		int numberOfActualRIs = component.getComponentInstances() != null ? component.getComponentInstances().size()
+				: 0;
+		int numberOfActualRelations = component.getComponentInstancesRelations() != null
+				? component.getComponentInstancesRelations().size() : 0;
+		assertEquals("Check number of RIs meet the expected number", numberOfRIs, numberOfActualRIs);
+		assertEquals("Check number of RI relations meet the expected number", numberOfRelations,
+				numberOfActualRelations);
+
+		return component;
+	}
+
+	private void createVFInstanceAndAtomicResourceInstanceWithoutCheckin(ResourceReqDetails vf,
+			ResourceReqDetails atomicResource, User user) throws Exception {
+		RestResponse createVFInstance = createVFInstance(serviceDetails_01, vf, user);
+		ResourceRestUtils.checkCreateResponse(createVFInstance);
+		RestResponse atomicInstanceForService = createAtomicInstanceForService(serviceDetails_01, atomicResource, user);
+		ResourceRestUtils.checkCreateResponse(atomicInstanceForService);
+	}
+
+	private RestResponse createCheckedinVFInstance(ServiceReqDetails containerDetails,
+			ResourceReqDetails compInstOriginDetails, User modifier) throws Exception {
+		changeResourceLifecycleState(compInstOriginDetails, modifier.getUserId(), LifeCycleStatesEnum.CHECKIN);
+		return createVFInstance(containerDetails, compInstOriginDetails, modifier);
+	}
+
+	private RestResponse createVFInstance(ServiceReqDetails containerDetails, ResourceReqDetails compInstOriginDetails,
+			User modifier) throws Exception {
+		return createComponentInstance(containerDetails, compInstOriginDetails, modifier, ComponentTypeEnum.SERVICE,
+				true);
+	}
+
+	private RestResponse createAtomicInstanceForService(ServiceReqDetails containerDetails,
+			ResourceReqDetails compInstOriginDetails, User modifier) throws Exception {
+		return createComponentInstance(containerDetails, compInstOriginDetails, modifier, ComponentTypeEnum.SERVICE,
+				true);
+	}
+
+	private RestResponse createComponentInstance(ComponentReqDetails containerDetails,
+			ComponentReqDetails compInstOriginDetails, User modifier, ComponentTypeEnum containerComponentTypeEnum,
+			boolean isHighestLevel) throws IOException, Exception {
+		ComponentInstanceReqDetails resourceInstanceReqDetails = ElementFactory
+				.getComponentResourceInstance(compInstOriginDetails);
+		RestResponse createResourceInstanceResponse = ComponentInstanceRestUtils.createComponentInstance(
+				resourceInstanceReqDetails, modifier, containerDetails.getUniqueId(), containerComponentTypeEnum);
+		return createResourceInstanceResponse;
+	}
+
+	private void changeResourceLifecycleState(ResourceReqDetails resourceDetails, String userUserId,
+			LifeCycleStatesEnum lifeCycleStates) throws Exception {
+		RestResponse response = LifecycleRestUtils.changeResourceState(resourceDetails, userUserId, lifeCycleStates);
+		LifecycleRestUtils.checkLCS_Response(response);
+	}
+
+	private void createAtomicResource(ResourceReqDetails resourceDetails) throws Exception {
+		RestResponse createResourceResponse = ResourceRestUtils.createResource(resourceDetails, sdncDesignerDetails);
+		ResourceRestUtils.checkCreateResponse(createResourceResponse);
+
+	}
+
+	private void createVF(ResourceReqDetails resourceDetails) throws Exception {
+		createVF(resourceDetails, sdncDesignerDetails);
+
+	}
+
+	private void createVF(ResourceReqDetails resourceDetails, User sdncModifier) throws Exception {
+		RestResponse createVfResponse = ResourceRestUtils.createResource(resourceDetails, sdncModifier);
+		ResourceRestUtils.checkCreateResponse(createVfResponse);
+	}
+
+	private void createService(ServiceReqDetails serviceDetails) throws Exception {
+		createService(serviceDetails, sdncDesignerDetails);
+	}
+
+	private void createService(ServiceReqDetails serviceDetails, User sdncModifier) throws Exception {
+		RestResponse createServiceResponse = ServiceRestUtils.createService(serviceDetails, sdncModifier);
+		ResourceRestUtils.checkCreateResponse(createServiceResponse);
+	}
+
+	private void importVfWithArtifacts(ImportReqDetails resourceDetailsVF_01) throws Exception {
+		String payloadName = "VF_RI2_G4_withArtifacts.csar";
+		Path path = Paths.get(rootPath + "/src/main/resources/ci/VF_RI2_G4_withArtifacts.csar");
+		byte[] data = Files.readAllBytes(path);
+		String payloadData = Base64.encodeBase64String(data);
+		resourceDetailsVF_01.setPayloadData(payloadData);
+
+		resourceDetailsVF_01.setPayloadName(payloadName);
+		resourceDetailsVF_01.setResourceType(ResourceTypeEnum.VF.name());
+		RestResponse createResource = ResourceRestUtils.createResource(resourceDetailsVF_01, sdncDesignerDetails);
+		BaseRestUtils.checkCreateResponse(createResource);
+	}
+
+}
diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/execute/general/FeProxyTest.java b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/execute/general/FeProxyTest.java
new file mode 100644
index 0000000000..a9426f9c03
--- /dev/null
+++ b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/execute/general/FeProxyTest.java
@@ -0,0 +1,49 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * SDC
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.sdc.ci.tests.execute.general;
+
+import org.junit.Rule;
+import org.junit.rules.TestName;
+import org.openecomp.sdc.be.model.User;
+import org.openecomp.sdc.ci.tests.api.ComponentBaseTest;
+import org.openecomp.sdc.ci.tests.datatypes.enums.UserRoleEnum;
+import org.openecomp.sdc.ci.tests.datatypes.http.RestResponse;
+import org.openecomp.sdc.ci.tests.utils.general.ElementFactory;
+import org.openecomp.sdc.ci.tests.utils.rest.BaseRestUtils;
+import org.openecomp.sdc.ci.tests.utils.rest.CategoryRestUtils;
+import org.testng.AssertJUnit;
+import org.testng.annotations.Test;
+
+public class FeProxyTest extends ComponentBaseTest {
+
+	@Rule
+	public static TestName name = new TestName();
+
+	@Test
+	public void testFeProxy() throws Exception {
+		User defaultUser = ElementFactory.getDefaultUser(UserRoleEnum.ADMIN);
+		RestResponse allCategoriesTowardsFe = CategoryRestUtils.getAllCategoriesTowardsFe(defaultUser,
+				BaseRestUtils.RESOURCE_COMPONENT_TYPE);
+		AssertJUnit.assertEquals("Check response code after get categories towards FE", 200,
+				allCategoriesTowardsFe.getErrorCode().intValue());
+	}
+
+}
diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/execute/general/UuidTest.java b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/execute/general/UuidTest.java
new file mode 100644
index 0000000000..ab42a40ee3
--- /dev/null
+++ b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/execute/general/UuidTest.java
@@ -0,0 +1,104 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * SDC
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.sdc.ci.tests.execute.general;
+
+import org.junit.Rule;
+import org.junit.rules.TestName;
+import org.openecomp.sdc.ci.tests.api.ComponentBaseTest;
+import org.openecomp.sdc.ci.tests.config.Config;
+import org.openecomp.sdc.ci.tests.datatypes.http.RestResponse;
+import org.openecomp.sdc.ci.tests.utils.rest.CatalogRestUtils;
+import org.openecomp.sdc.ci.tests.utils.rest.ResourceRestUtils;
+import org.openecomp.sdc.common.api.Constants;
+import org.testng.AssertJUnit;
+import org.testng.annotations.Test;
+
+import java.io.IOException;
+import java.util.List;
+import java.util.UUID;
+
+import static org.testng.AssertJUnit.assertEquals;
+import static org.testng.AssertJUnit.assertTrue;
+
+public class UuidTest extends ComponentBaseTest {
+
+	@Rule
+	public static TestName name = new TestName();
+
+	public UuidTest() {
+		super();
+		config = Config.instance();
+	}
+
+	@Test
+	public void testE2EUuidHeaderReturnedAndPreserved() throws IOException {
+		UUID randomUUID = UUID.randomUUID();
+		String uuidStr = randomUUID.toString();
+		RestResponse allTagsTowardsCatalogFe = CatalogRestUtils.getAllCategoriesTowardsCatalogFeWithUuid(uuidStr);
+		AssertJUnit.assertEquals(allTagsTowardsCatalogFe.getErrorCode(), new Integer(200));
+		List<String> list = allTagsTowardsCatalogFe.getHeaderFields().get(Constants.X_ECOMP_REQUEST_ID_HEADER);
+		// check that header is returned
+		AssertJUnit.assertTrue(list != null && !list.isEmpty());
+		String receivedUuid = list.get(0);
+		// Check that same uuid returned
+		AssertJUnit.assertEquals(uuidStr, receivedUuid);
+	}
+
+	@Test
+	public void testUuidHeaderGeneratedBe() throws IOException {
+		RestResponse allTagsTowardsCatalogBe = CatalogRestUtils.getAllCategoriesTowardsCatalogBe();
+		List<String> list = allTagsTowardsCatalogBe.getHeaderFields().get(Constants.X_ECOMP_REQUEST_ID_HEADER);
+		// check that response was OK
+		assertEquals(allTagsTowardsCatalogBe.getErrorCode(), new Integer(200));
+		// check that header is returned
+		assertTrue(list != null && !list.isEmpty());
+		String uuid = list.get(0);
+		// Check there is no conversion error
+		UUID.fromString(uuid);
+	}
+
+	@Test
+	public void testE2EOptionsNoUuid() throws IOException {
+		RestResponse allTagsTowardsCatalogFe = ResourceRestUtils.sendOptionsTowardsCatalogFeWithUuid();
+		assertEquals(allTagsTowardsCatalogFe.getErrorCode(), new Integer(200));
+		List<String> list = allTagsTowardsCatalogFe.getHeaderFields().get(Constants.X_ECOMP_REQUEST_ID_HEADER);
+		// check that header is returned (generated by BE)
+		assertTrue(list != null && !list.isEmpty());
+		String receivedUuid = list.get(0);
+		// Check there is no conversion error
+		UUID.fromString(receivedUuid);
+	}
+
+	@Test
+	public void testE2EMethodNotAllowedWithUuid() throws IOException {
+		UUID randomUUID = UUID.randomUUID();
+		String uuidStr = randomUUID.toString();
+		RestResponse allTagsTowardsCatalogFe = ResourceRestUtils
+				.putAllCategoriesTowardsCatalogFeWithUuidNotAllowed(uuidStr);
+		assertEquals(allTagsTowardsCatalogFe.getErrorCode(), new Integer(405));
+		List<String> list = allTagsTowardsCatalogFe.getHeaderFields().get(Constants.X_ECOMP_REQUEST_ID_HEADER);
+		// check that header is returned (generated by BE)
+		assertTrue(list != null && !list.isEmpty());
+		String receivedUuid = list.get(0);
+		// Check that same uuid returned
+		assertEquals(uuidStr, receivedUuid);
+	}
+}
diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/execute/globaltypes/InterfaceLifecycleTypesTest.java b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/execute/globaltypes/InterfaceLifecycleTypesTest.java
new file mode 100644
index 0000000000..411058627f
--- /dev/null
+++ b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/execute/globaltypes/InterfaceLifecycleTypesTest.java
@@ -0,0 +1,61 @@
+/*
+ * Copyright © 2018 European Support Limited
+ *
+ * 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.
+ */
+
+package org.openecomp.sdc.ci.tests.execute.globaltypes;
+
+import java.util.HashMap;
+import java.util.Map;
+import org.json.simple.JSONObject;
+import org.json.simple.JSONValue;
+import org.junit.Rule;
+import org.junit.rules.TestName;
+import org.openecomp.sdc.ci.tests.api.ComponentBaseTest;
+import org.openecomp.sdc.ci.tests.api.Urls;
+import org.openecomp.sdc.ci.tests.config.Config;
+import org.openecomp.sdc.ci.tests.datatypes.enums.UserRoleEnum;
+import org.openecomp.sdc.ci.tests.datatypes.http.HttpHeaderEnum;
+import org.openecomp.sdc.ci.tests.datatypes.http.HttpRequest;
+import org.openecomp.sdc.ci.tests.datatypes.http.RestResponse;
+import org.openecomp.sdc.ci.tests.utils.general.ElementFactory;
+import org.testng.AssertJUnit;
+import org.testng.annotations.BeforeMethod;
+import org.testng.annotations.Test;
+
+public class InterfaceLifecycleTypesTest extends ComponentBaseTest {
+
+  protected Config config = Config.instance();
+  protected HttpRequest httpRequest = new HttpRequest();
+  protected Map<String, String> headersMap = new HashMap<>();
+  @Rule
+  public static final TestName testName = new TestName();
+
+  @BeforeMethod
+  public void init() {
+    headersMap.put(HttpHeaderEnum.USER_ID.getValue(), ElementFactory.getDefaultUser(UserRoleEnum.DESIGNER).getUserId());
+  }
+
+  @Test
+  public void testGetAllInterfaceLifecycleTypes() throws Exception {
+    final String standardType = "tosca.interfaces.node.lifecycle.standard";
+    final String nfvType = "tosca.interfaces.nfv.vnf.lifecycle.nfv";
+    String url = String.format(Urls.GET_All_INTERFACE_LIFECYCLE_TYPES, config.getCatalogBeHost(), config.getCatalogBePort());
+    RestResponse restResponse = httpRequest.httpSendGet(url, headersMap);
+    AssertJUnit.assertTrue(restResponse.getErrorCode() == 200);
+    JSONObject jsonObject = (JSONObject) JSONValue.parse(restResponse.getResponse());
+    AssertJUnit.assertTrue(jsonObject.containsKey(standardType));
+    AssertJUnit.assertTrue(jsonObject.containsKey(nfvType));
+  }
+}
diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/execute/groups/GroupsTest.java b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/execute/groups/GroupsTest.java
new file mode 100644
index 0000000000..dbafec1378
--- /dev/null
+++ b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/execute/groups/GroupsTest.java
@@ -0,0 +1,180 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * SDC
+ * ================================================================================
+ * 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=========================================================
+ */
+
+package org.openecomp.sdc.ci.tests.execute.groups;
+
+import fj.data.Either;
+import org.apache.commons.collections.MapUtils;
+import org.junit.Rule;
+import org.junit.rules.TestName;
+import org.openecomp.sdc.be.dao.api.ActionStatus;
+import org.openecomp.sdc.be.datatypes.enums.ResourceTypeEnum;
+import org.openecomp.sdc.be.model.*;
+import org.openecomp.sdc.ci.tests.api.ComponentBaseTest;
+import org.openecomp.sdc.ci.tests.datatypes.ServiceReqDetails;
+import org.openecomp.sdc.ci.tests.datatypes.enums.ServiceCategoriesEnum;
+import org.openecomp.sdc.ci.tests.datatypes.enums.UserRoleEnum;
+import org.openecomp.sdc.ci.tests.datatypes.http.RestResponse;
+import org.openecomp.sdc.ci.tests.execute.lifecycle.LCSbaseTest;
+import org.openecomp.sdc.ci.tests.utils.general.ElementFactory;
+import org.openecomp.sdc.ci.tests.utils.rest.BaseRestUtils;
+import org.openecomp.sdc.ci.tests.utils.rest.ComponentInstanceRestUtils;
+import org.testng.annotations.Test;
+import org.testng.collections.Lists;
+
+import java.io.File;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+
+import static org.junit.Assert.*;
+import static org.openecomp.sdc.ci.tests.utils.general.AtomicOperationUtils.*;
+import static org.testng.Assert.assertNull;
+
+public class GroupsTest extends ComponentBaseTest {
+	@Rule
+	public static TestName name = new TestName();
+	
+	public static final String groupName = "x_group";
+	public static final String capabilityName = "vlan_assignment";
+	public static final String propertyName = "vfc_instance_group_reference";
+	public static final String csarsFilePath = System.getProperty("user.dir") + File.separator + "src" + File.separator + "test" + File.separator + "resources" + File.separator + "CI" + File.separator + "csars" ;
+	
+	@Test
+	public void importResourceWithGroupsTest() throws Exception {
+		importResource("with_groups.csar");
+	}
+	
+	@Test
+	public void importResourceWitIncorrectCapabilityNameTest() throws Exception {
+		RestResponse createResource = getCreateResourceRestResponse(ResourceTypeEnum.VF, UserRoleEnum.DESIGNER, "incorrect_cap.csar", csarsFilePath);
+		BaseRestUtils.checkErrorResponse(createResource, ActionStatus.MISSING_CAPABILITIES,(Lists.newArrayList("vlan_assignment1")).toString(), "group", "x_group");
+	}
+	
+	@Test
+	public void importResourceWithoutCapabilitiesTest() throws Exception {
+		Resource resource =  importResourceFromCsar(ResourceTypeEnum.VF, UserRoleEnum.DESIGNER, "without_caps.csar", csarsFilePath);
+		validateComponentGroupCapabilityPropertyValue(resource, null);
+	}
+	
+	@Test
+	public void updateResourceWithGroupsTest() throws Exception {
+		Resource resource = importResource("with_groups.csar");
+		updateResource(resource, "with_groups_update.csar");
+	}
+
+	@Test
+	public void supportGroupsWithCapabilitiesServiceLevelTest() throws Exception {
+		Resource resource = importCertifiedResourceFromCsar(ResourceTypeEnum.VF, UserRoleEnum.DESIGNER, "VLANTaggingFromAmdox1303_2018.csar", csarsFilePath);
+        CapReqDef caps = ComponentInstanceRestUtils.getInstancesCapabilitiesRequirements(resource, UserRoleEnum.DESIGNER.getUserId());
+		validateVlanAssignmentGroupCapabilitiesInvisible(caps.getCapabilities());
+
+        Service service1 = createCertifiedServiceWithInstance(ServiceCategoriesEnum.MOBILITY, resource);
+        caps = ComponentInstanceRestUtils.getInstancesCapabilitiesRequirements(service1, UserRoleEnum.DESIGNER.getUserId());
+		validateVlanAssignmentGroupCapabilitiesVisible(caps.getCapabilities());
+
+        Service service2 = createCertifiedServiceWithInstance(ServiceCategoriesEnum.NETWORK_L4, resource);
+        caps = ComponentInstanceRestUtils.getInstancesCapabilitiesRequirements(service2, UserRoleEnum.DESIGNER.getUserId());
+		validateVlanAssignmentGroupCapabilitiesVisible(caps.getCapabilities());
+
+        Service serviceContainer = createCertifiedServiceWithProxyInstances(ServiceCategoriesEnum.NETWORK_L3, service1, service2);
+        caps = ComponentInstanceRestUtils.getInstancesCapabilitiesRequirements(serviceContainer, UserRoleEnum.DESIGNER.getUserId());
+		validateVlanAssignmentGroupCapabilitiesVisible(caps.getCapabilities());
+
+        assertTrue(serviceContainer.getComponentInstances()!=null);
+    }
+
+	private void validateVlanAssignmentGroupCapabilitiesVisible(Map<String, List<CapabilityDefinition>> capabilities) {
+		if(MapUtils.isNotEmpty(capabilities)){
+			validateVlanAssignmentGroupCapabilitiesVisibility(capabilities, true);
+		}
+	}
+
+	private void validateVlanAssignmentGroupCapabilitiesInvisible(Map<String, List<CapabilityDefinition>> capabilities) {
+		if(MapUtils.isNotEmpty(capabilities)){
+			validateVlanAssignmentGroupCapabilitiesVisibility(capabilities, false);
+		}
+	}
+    private void validateVlanAssignmentGroupCapabilitiesVisibility(Map<String, List<CapabilityDefinition>> capabilities, boolean shouldBeVisible) {
+		assertTrue(capabilities.containsKey("org.openecomp.capabilities.VLANAssignment") == shouldBeVisible);
+    }
+
+    private Service createCertifiedServiceWithProxyInstances(ServiceCategoriesEnum category, Service service1, Service service2) throws Exception {
+        Either<Service, RestResponse> createServiceRes = createServiceByCategory(category, UserRoleEnum.DESIGNER, true);
+        assertTrue(createServiceRes.isLeft());
+        Either<ComponentInstance, RestResponse> result = addComponentInstanceToComponentContainer(service1, createServiceRes.left().value());
+        assertTrue(result.isLeft());
+        result = addComponentInstanceToComponentContainer(service2, createServiceRes.left().value());
+        assertTrue(result.isLeft());
+        return certifyService(createServiceRes);
+    }
+
+    private Service createCertifiedServiceWithInstance(ServiceCategoriesEnum category, Resource resource) throws Exception {
+        Either<Service, RestResponse> createServiceRes = createServiceByCategory(category, UserRoleEnum.DESIGNER, true);
+        assertTrue(createServiceRes.isLeft());
+        Either<ComponentInstance, RestResponse> result = addComponentInstanceToComponentContainer(resource, createServiceRes.left().value());
+        assertTrue(result.isLeft());
+        return certifyService(createServiceRes);
+    }
+
+    private Service certifyService(Either<Service, RestResponse> serviceProxy1) throws Exception {
+        Service service = getServiceObjectByNameAndVersion(UserRoleEnum.DESIGNER, serviceProxy1.left().value().getName(), "0.1" );
+        assertNotNull(service);
+        ServiceReqDetails serviceReqDetails = new ServiceReqDetails(service);
+        RestResponse restResponseService = LCSbaseTest.certifyService(serviceReqDetails, ElementFactory.getDefaultUser(UserRoleEnum.DESIGNER));
+        assertTrue(restResponseService.getErrorCode()==200);
+        return getServiceObjectByNameAndVersion(UserRoleEnum.DESIGNER, serviceProxy1.left().value().getName(), "1.0" );
+    }
+
+    private static Resource updateResource(Resource resource, String csarFileName) throws Exception {
+		Resource updatedResource = updateResourceFromCsar(resource, UserRoleEnum.DESIGNER, csarFileName, csarsFilePath);
+		validateComponentGroupCapabilityPropertyValue(updatedResource, "new_value");
+		return updatedResource;
+	}
+
+	private static Resource importResource(String csarFileName) throws Exception {
+		Resource resource = importResourceFromCsar(ResourceTypeEnum.VF, UserRoleEnum.DESIGNER, csarFileName, csarsFilePath);
+		validateComponentGroupCapabilityPropertyValue(resource, "success");
+		return resource;
+	}
+
+	private static void validateComponentGroupCapabilityPropertyValue(Component component, String propertyValue) {
+		assertNotNull(component);
+		assertNotNull(component.getGroups());
+		assertFalse(component.getGroups().isEmpty());
+		assertTrue(component.getGroups().size() == 5);
+		Optional<GroupDefinition> vfcInstanceGroup = component.getGroups().stream().filter(g->g.getName().equals(groupName)).findFirst();
+		assertTrue(vfcInstanceGroup.isPresent());
+		assertFalse(vfcInstanceGroup.get().getCapabilities().isEmpty());
+		assertTrue(vfcInstanceGroup.get().getCapabilities().size() == 1);
+		assertNotNull(vfcInstanceGroup.get().getCapabilities().get("org.openecomp.capabilities.VLANAssignment"));
+		assertTrue(vfcInstanceGroup.get().getCapabilities().get("org.openecomp.capabilities.VLANAssignment").size() == 1);
+		assertNotNull(vfcInstanceGroup.get().getCapabilities().get("org.openecomp.capabilities.VLANAssignment").get(0));
+		assertTrue(vfcInstanceGroup.get().getCapabilities().get("org.openecomp.capabilities.VLANAssignment").get(0).getName().equals(capabilityName));
+		assertNotNull(vfcInstanceGroup.get().getCapabilities().get("org.openecomp.capabilities.VLANAssignment").get(0).getProperties());
+		assertTrue(vfcInstanceGroup.get().getCapabilities().get("org.openecomp.capabilities.VLANAssignment").get(0).getProperties().size() == 1);
+		assertTrue(vfcInstanceGroup.get().getCapabilities().get("org.openecomp.capabilities.VLANAssignment").get(0).getProperties().get(0).getName().equals(propertyName));
+		if(propertyValue == null)
+			assertNull(vfcInstanceGroup.get().getCapabilities().get("org.openecomp.capabilities.VLANAssignment").get(0).getProperties().get(0).getValue());
+		else
+			assertTrue(vfcInstanceGroup.get().getCapabilities().get("org.openecomp.capabilities.VLANAssignment").get(0).getProperties().get(0).getValue().equals(propertyValue));
+	}
+	
+}
diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/execute/imports/CsarUtilsTest.java b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/execute/imports/CsarUtilsTest.java
new file mode 100644
index 0000000000..e16ebf7f74
--- /dev/null
+++ b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/execute/imports/CsarUtilsTest.java
@@ -0,0 +1,447 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * SDC
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.sdc.ci.tests.execute.imports;
+
+import org.apache.commons.codec.binary.Base64;
+import org.junit.Rule;
+import org.junit.rules.TestName;
+import org.openecomp.sdc.be.datatypes.enums.ComponentTypeEnum;
+import org.openecomp.sdc.be.datatypes.enums.ResourceTypeEnum;
+import org.openecomp.sdc.be.model.*;
+import org.openecomp.sdc.ci.tests.api.ComponentBaseTest;
+import org.openecomp.sdc.ci.tests.datatypes.enums.ArtifactTypeEnum;
+import org.openecomp.sdc.ci.tests.datatypes.enums.LifeCycleStatesEnum;
+import org.openecomp.sdc.ci.tests.datatypes.enums.UserRoleEnum;
+import org.openecomp.sdc.ci.tests.datatypes.http.RestResponse;
+import org.openecomp.sdc.ci.tests.utils.general.AtomicOperationUtils;
+import org.openecomp.sdc.ci.tests.utils.general.ElementFactory;
+import org.openecomp.sdc.ci.tests.utils.rest.ArtifactRestUtils;
+import org.openecomp.sdc.ci.tests.utils.rest.BaseRestUtils;
+import org.openecomp.sdc.ci.tests.utils.rest.ResponseParser;
+import org.openecomp.sdc.common.util.YamlToObjectConverter;
+import org.testng.annotations.Test;
+import org.yaml.snakeyaml.Yaml;
+
+import java.io.ByteArrayInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.Map;
+import java.util.zip.ZipEntry;
+import java.util.zip.ZipInputStream;
+
+import static org.junit.Assert.*;
+
+public class CsarUtilsTest extends ComponentBaseTest {
+	
+	public static final String ASSET_TOSCA_TEMPLATE = "assettoscatemplate";
+	
+	@Rule
+	public static TestName name = new TestName();
+	
+	@Test()
+	public void createServiceCsarBasicTest() throws Exception {
+		
+		Service service = AtomicOperationUtils.createDefaultService(UserRoleEnum.DESIGNER, true).left().value();
+
+		Resource resourceVF = AtomicOperationUtils.createResourceByType(ResourceTypeEnum.VF, UserRoleEnum.DESIGNER, true).left().value();
+		
+		AtomicOperationUtils.uploadArtifactByType(ArtifactTypeEnum.VENDOR_LICENSE, resourceVF, UserRoleEnum.DESIGNER,
+				true, true);
+		resourceVF = (Resource) AtomicOperationUtils
+				.changeComponentState(resourceVF, UserRoleEnum.DESIGNER, LifeCycleStatesEnum.CERTIFY, true).getLeft();
+		
+		AtomicOperationUtils.addComponentInstanceToComponentContainer(resourceVF, service, UserRoleEnum.DESIGNER, true);
+		
+		service = (Service) AtomicOperationUtils.changeComponentState(service, UserRoleEnum.DESIGNER, LifeCycleStatesEnum.CERTIFY, true).getLeft();
+		
+		User sdncModifierDetails = ElementFactory.getDefaultUser(UserRoleEnum.DESIGNER);
+		
+		byte[] downloadCSAR = downloadCSAR(sdncModifierDetails, service);
+		
+		csarBasicValidation(service, downloadCSAR);
+	}
+	
+	@Test(enabled = true)
+	public void createResourceCsarBasicTest() throws Exception {
+
+		Resource resourceVF = AtomicOperationUtils.createResourceByType(ResourceTypeEnum.VF, UserRoleEnum.DESIGNER, true).left().value();
+		resourceVF = (Resource) AtomicOperationUtils
+				.changeComponentState(resourceVF, UserRoleEnum.DESIGNER, LifeCycleStatesEnum.CERTIFY, true).getLeft();
+		User sdncModifierDetails = ElementFactory.getDefaultUser(UserRoleEnum.DESIGNER);
+		
+		byte[] downloadCSAR = downloadCSAR(sdncModifierDetails, resourceVF);
+		
+		csarBasicValidation(resourceVF, downloadCSAR);
+	}
+	
+	@Test(enabled = true)
+	public void createServiceCsarInclDeploymentArtTest() throws Exception {
+		
+		Service service = AtomicOperationUtils.createDefaultService(UserRoleEnum.DESIGNER, true).left().value();
+
+		Resource resourceVF1 = AtomicOperationUtils.createResourceByType(ResourceTypeEnum.VF, UserRoleEnum.DESIGNER, true).left().value();
+		Resource resourceVF2 = AtomicOperationUtils.createResourceByType(ResourceTypeEnum.VF, UserRoleEnum.DESIGNER, true).left().value();
+		
+		resourceVF1 = (Resource) AtomicOperationUtils
+				.changeComponentState(resourceVF1, UserRoleEnum.DESIGNER, LifeCycleStatesEnum.CERTIFY, true).getLeft();
+		
+		resourceVF2 = (Resource) AtomicOperationUtils
+				.changeComponentState(resourceVF2, UserRoleEnum.DESIGNER, LifeCycleStatesEnum.CERTIFY, true).getLeft();
+		
+		AtomicOperationUtils.addComponentInstanceToComponentContainer(resourceVF1, service, UserRoleEnum.DESIGNER, true);
+		AtomicOperationUtils.addComponentInstanceToComponentContainer(resourceVF2, service, UserRoleEnum.DESIGNER, true);
+		
+		AtomicOperationUtils.uploadArtifactByType(ArtifactTypeEnum.YANG_XML, service, UserRoleEnum.DESIGNER, true, true);
+		
+		service = (Service) AtomicOperationUtils.changeComponentState(service, UserRoleEnum.DESIGNER, LifeCycleStatesEnum.CERTIFY, true).getLeft();
+		
+		User sdncModifierDetails = ElementFactory.getDefaultUser(UserRoleEnum.DESIGNER);
+		
+		byte[] downloadCSAR = downloadCSAR(sdncModifierDetails, service);
+		
+		csarBasicValidation(service, downloadCSAR);
+		
+		validateServiceCsar(resourceVF1, resourceVF2, service, downloadCSAR, 3, 5, 1);
+	}
+	
+	@Test(enabled = true)
+	public void createResourceCsarInclDeploymentArtTest() throws Exception {
+
+		Resource resourceVF1 = AtomicOperationUtils.createResourceByType(ResourceTypeEnum.VF, UserRoleEnum.DESIGNER, true).left().value();
+		
+		AtomicOperationUtils.uploadArtifactByType(ArtifactTypeEnum.YANG_XML, resourceVF1, UserRoleEnum.DESIGNER, true, true);
+		AtomicOperationUtils.uploadArtifactByType(ArtifactTypeEnum.HEAT_ARTIFACT, resourceVF1, UserRoleEnum.DESIGNER, true, true);
+		
+		resourceVF1 = (Resource) AtomicOperationUtils
+				.changeComponentState(resourceVF1, UserRoleEnum.DESIGNER, LifeCycleStatesEnum.CERTIFY, true).getLeft();
+
+		User sdncModifierDetails = ElementFactory.getDefaultUser(UserRoleEnum.DESIGNER);
+		
+		byte[] downloadCSAR = downloadCSAR(sdncModifierDetails, resourceVF1);
+		
+		csarBasicValidation(resourceVF1, downloadCSAR);
+		
+		validateVFCsar(resourceVF1, downloadCSAR, 1, 0, 1, 1);
+	}
+	
+	private void csarBasicValidation(Component mainComponent, byte[] downloadCSAR) {
+		try (ByteArrayInputStream ins = new ByteArrayInputStream(downloadCSAR);
+				ZipInputStream zip = new ZipInputStream(ins);) {
+
+			String resourceYaml = null;
+			byte[] buffer = new byte[1024];
+			ZipEntry nextEntry = zip.getNextEntry();
+			StringBuilder sb = new StringBuilder();
+			int len;
+
+			while ((len = zip.read(buffer)) > 0) {
+				sb.append(new String(buffer, 0, len));
+			}
+
+			assertTrue(nextEntry.getName().equals("TOSCA-Metadata/TOSCA.meta"));
+
+			sb.setLength(0);
+			nextEntry = zip.getNextEntry();
+
+			while ((len = zip.read(buffer)) > 0) {
+				sb.append(new String(buffer, 0, len));
+			}
+
+			resourceYaml = sb.toString();
+
+			YamlToObjectConverter yamlToObjectConverter = new YamlToObjectConverter();
+			ArtifactDefinition artifactDefinition = mainComponent.getToscaArtifacts()
+					.get(ASSET_TOSCA_TEMPLATE);
+			String fileName = artifactDefinition.getArtifactName();
+			assertEquals("Tosca-Template file name: ", "Definitions/" + fileName, nextEntry.getName());
+			assertTrue("Tosca template Yaml validation: ", yamlToObjectConverter.isValidYaml(resourceYaml.getBytes()));
+
+			ins.close();
+			zip.close();
+		} catch (IOException e) {
+			e.printStackTrace();
+		}
+	}
+	
+	private void validateServiceCsar(Component certifiedVFC1, Component certifiedVFC2, Service fetchedService,
+			byte[] resultByte, int toscaEntryIndexToPass, int generatorEntryIndexToPass,
+			int deploymentArtifactIndexToPass) {
+		
+		// TODO Test to validate everything is right (comment out after testing)
+		/*try {
+			FileUtils.writeByteArrayToFile(new File("c:/TestCSAR/" + fetchedService.getName() + ".zip"), resultByte);
+		} catch (IOException e) {
+			// Auto-generated catch block
+			e.printStackTrace();
+		}*/
+
+		try (ByteArrayInputStream ins = new ByteArrayInputStream(resultByte);
+				ZipInputStream zip = new ZipInputStream(ins);) {
+			
+			String resourceYaml = null;
+			byte[] buffer = new byte[1024];
+			ZipEntry nextEntry = zip.getNextEntry();
+			StringBuilder sb = new StringBuilder();
+			int len;
+
+			while ((len = zip.read(buffer)) > 0) {
+				sb.append(new String(buffer, 0, len));
+			}
+
+			assertTrue(nextEntry.getName().equals("TOSCA-Metadata/TOSCA.meta"));
+
+			YamlToObjectConverter yamlToObjectConverter = new YamlToObjectConverter();
+
+			int toscaEntryIndex = 0;
+			int generatorEntryIndex = 0;
+			int deploymentArtifactIndex = 0;
+			String fileName = null;
+			ArtifactDefinition artifactDefinition;
+			Component componentToValidate = null;
+
+			artifactDefinition = fetchedService.getToscaArtifacts().get(ASSET_TOSCA_TEMPLATE);
+			String serviceFileName = artifactDefinition.getArtifactName();
+			artifactDefinition = certifiedVFC1.getToscaArtifacts().get(ASSET_TOSCA_TEMPLATE);
+			String vfc1FileName = artifactDefinition.getArtifactName();
+			artifactDefinition = certifiedVFC2.getToscaArtifacts().get(ASSET_TOSCA_TEMPLATE);
+			String vfc2FileName = artifactDefinition.getArtifactName();
+
+			while ((nextEntry = zip.getNextEntry()) != null) {
+				sb.setLength(0);
+
+				while ((len = zip.read(buffer)) > 0) {
+					sb.append(new String(buffer, 0, len));
+				}
+
+				String entryName = nextEntry.getName();
+
+				resourceYaml = sb.toString();
+				if (entryName.contains(serviceFileName)) {
+					componentToValidate = fetchedService;
+					fileName = "Definitions/" + serviceFileName;
+					
+					assertEquals("Validate entry Name", (fileName), nextEntry.getName());
+					assertTrue(yamlToObjectConverter.isValidYaml(resourceYaml.getBytes()));
+					validateContent(resourceYaml, componentToValidate);
+					++toscaEntryIndex;
+					continue;
+				}
+				
+				if (entryName.contains(vfc1FileName)) {
+					componentToValidate = certifiedVFC1;
+					fileName = "Definitions/" + vfc1FileName;
+					
+					assertEquals("Validate entry Name", (fileName), nextEntry.getName());
+					assertTrue(yamlToObjectConverter.isValidYaml(resourceYaml.getBytes()));
+					validateContent(resourceYaml, componentToValidate);
+					++toscaEntryIndex;
+					continue;
+				}
+				if (entryName.contains(vfc2FileName)) {
+					componentToValidate = certifiedVFC2;
+					fileName = "Definitions/" + vfc2FileName;
+					
+					assertEquals("Validate entry Name", (fileName), nextEntry.getName());
+					assertTrue(yamlToObjectConverter.isValidYaml(resourceYaml.getBytes()));
+					validateContent(resourceYaml, componentToValidate);
+					++toscaEntryIndex;
+					continue;
+				}
+
+				if (entryName.contains(".xml") && !entryName.startsWith("Artifacts/AAI")) {
+					++deploymentArtifactIndex;
+					continue;
+				}
+
+				if (entryName.startsWith("Artifacts/AAI")) {
+					++generatorEntryIndex;
+					continue;
+				}
+				
+				assertTrue("Unexpected entry: " + entryName, true);
+			}
+			assertEquals("Validate amount of entries", toscaEntryIndexToPass, toscaEntryIndex);
+			assertEquals("Validate amount of generated AAI artifacts", generatorEntryIndexToPass, generatorEntryIndex);
+			assertEquals("Validate amount of generated Deployment artifacts", deploymentArtifactIndexToPass,
+					deploymentArtifactIndex);
+
+			ins.close();
+			zip.close();
+		} catch (IOException e) {
+			e.printStackTrace();
+		}
+	}
+	
+	private void validateVFCsar(Component certifiedVF, byte[] resultByte, int toscaEntryIndexToPass, int ymlDeploymentArtifactIndexToPass,
+			int xmlDeploymentArtifactIndexToPass, int heatEnvDeploymentArtifactIndexToPass) {
+		
+		// TODO Test to validate everything is right (comment out after testing)
+		/*try {
+			FileUtils.writeByteArrayToFile(new File("c:/TestCSAR/" + fetchedService.getName() + ".zip"), resultByte);
+		} catch (IOException e) {
+			// Auto-generated catch block
+			e.printStackTrace();
+		}*/
+
+		try (ByteArrayInputStream ins = new ByteArrayInputStream(resultByte);
+				ZipInputStream zip = new ZipInputStream(ins);) {
+			
+			String resourceYaml = null;
+			byte[] buffer = new byte[1024];
+			ZipEntry nextEntry = zip.getNextEntry();
+			StringBuilder sb = new StringBuilder();
+			int len;
+
+			while ((len = zip.read(buffer)) > 0) {
+				sb.append(new String(buffer, 0, len));
+			}
+
+			assertTrue(nextEntry.getName().equals("TOSCA-Metadata/TOSCA.meta"));
+
+			YamlToObjectConverter yamlToObjectConverter = new YamlToObjectConverter();
+
+			int toscaEntryIndex = 0;
+			int ymlEntryIndex = 0;
+			int xmlArtifactsIndex = 0;
+			int heatEnvDeploymentArtifactIndex = 0;
+			String fileName = null;
+			ArtifactDefinition artifactDefinition;
+			Component componentToValidate = null;
+
+			artifactDefinition = certifiedVF.getToscaArtifacts().get(ASSET_TOSCA_TEMPLATE);
+			String vfFileName = artifactDefinition.getArtifactName();
+
+			while ((nextEntry = zip.getNextEntry()) != null) {
+				sb.setLength(0);
+
+				while ((len = zip.read(buffer)) > 0) {
+					sb.append(new String(buffer, 0, len));
+				}
+
+				String entryName = nextEntry.getName();
+
+				resourceYaml = sb.toString();
+				if (entryName.contains(vfFileName)) {
+					componentToValidate = certifiedVF;
+					fileName = "Definitions/" + vfFileName;
+					
+					assertEquals("Validate entry Name", (fileName), nextEntry.getName());
+					assertTrue(yamlToObjectConverter.isValidYaml(resourceYaml.getBytes()));
+					validateContent(resourceYaml, componentToValidate);
+					++toscaEntryIndex;
+					continue;
+				}
+
+				if (entryName.contains(".xml") && entryName.startsWith("Artifacts/")) {
+					++xmlArtifactsIndex;
+					continue;
+				}
+
+				if (entryName.contains(".sh") && entryName.startsWith("Artifacts/")) {
+					++heatEnvDeploymentArtifactIndex;
+					continue;
+				}
+				
+				if (entryName.contains(".yml") && entryName.startsWith("Artifacts/")) {
+					++ymlEntryIndex;
+					continue;
+				}
+				
+				assertTrue("Unexpected entry: " + entryName, false);
+			}
+			assertEquals("Validate amount of entries", toscaEntryIndexToPass, toscaEntryIndex);
+			assertEquals("Validate amount of YAML artifacts", ymlDeploymentArtifactIndexToPass, ymlEntryIndex);
+			assertEquals("Validate amount of generated XML artifacts", xmlDeploymentArtifactIndexToPass,
+					xmlArtifactsIndex);
+			assertEquals("Validate amount of generated HEAT ENV artifacts", heatEnvDeploymentArtifactIndexToPass,
+					heatEnvDeploymentArtifactIndex);
+
+			ins.close();
+			zip.close();
+		} catch (IOException e) {
+			e.printStackTrace();
+		}
+	}
+	
+	private void validateContent(String content, Component component) {
+		Yaml yaml = new Yaml();
+
+		InputStream inputStream = new ByteArrayInputStream(content.getBytes());
+		@SuppressWarnings("unchecked")
+		Map<String, Object> load = (Map<String, Object>) yaml.load(inputStream);
+		@SuppressWarnings("unchecked")
+		Map<String, Object> metadata = (Map<String, Object>) load.get("metadata");
+		assertNotNull(metadata);
+
+		String name = (String) metadata.get("name");
+		assertNotNull(name);
+		assertEquals("Validate component name", component.getName(), name);
+
+		String invariantUUID = (String) metadata.get("invariantUUID");
+		assertNotNull(invariantUUID);
+		assertEquals("Validate component invariantUUID", component.getInvariantUUID(), invariantUUID);
+
+		String UUID = (String) metadata.get("UUID");
+		assertNotNull(UUID);
+		assertEquals("Validate component invariantUUID", component.getUUID(), UUID);
+
+		String type = (String) metadata.get("type");
+		assertNotNull(type);
+		if (component.getComponentType().equals(ComponentTypeEnum.SERVICE)) {
+			assertEquals("Validate component type", component.getComponentType().getValue(), type);
+		} else {
+			assertEquals("Validate component type", ((Resource) component).getResourceType(),
+					ResourceTypeEnum.valueOf(type));
+		}
+	}
+	
+	private byte[] downloadCSAR(User sdncModifierDetails, Component createdComponent) throws Exception {
+
+		String artifactUniqeId = createdComponent.getToscaArtifacts().get("assettoscacsar").getUniqueId();
+		RestResponse getCsarResponse = null;
+		
+		switch (createdComponent.getComponentType()) {
+		case RESOURCE:
+			getCsarResponse = ArtifactRestUtils.downloadResourceArtifactInternalApi(createdComponent.getUniqueId(),
+					sdncModifierDetails, artifactUniqeId);
+			break;			
+		case SERVICE:
+			getCsarResponse = ArtifactRestUtils.downloadServiceArtifactInternalApi(createdComponent.getUniqueId(),
+					sdncModifierDetails, artifactUniqeId);
+			break;
+		default:
+			break;
+		}
+		
+		assertNotNull(getCsarResponse);
+		BaseRestUtils.checkSuccess(getCsarResponse);
+
+		ArtifactUiDownloadData artifactUiDownloadData = ResponseParser.parseToObject(getCsarResponse.getResponse(),
+				ArtifactUiDownloadData.class);
+
+		assertNotNull(artifactUiDownloadData);
+
+		byte[] fromUiDownload = artifactUiDownloadData.getBase64Contents().getBytes();
+		byte[] decodeBase64 = Base64.decodeBase64(fromUiDownload);
+
+		return decodeBase64;
+	}
+}
diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/execute/imports/ExportToscaTest.java b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/execute/imports/ExportToscaTest.java
new file mode 100644
index 0000000000..c455f6f98a
--- /dev/null
+++ b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/execute/imports/ExportToscaTest.java
@@ -0,0 +1,426 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * SDC
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.sdc.ci.tests.execute.imports;
+
+import com.google.gson.Gson;
+import com.google.gson.JsonParser;
+import com.google.gson.reflect.TypeToken;
+import org.apache.commons.codec.binary.Base64;
+import org.junit.Rule;
+import org.junit.rules.TestName;
+import org.openecomp.sdc.be.datatypes.elements.PropertyDataDefinition;
+import org.openecomp.sdc.be.datatypes.enums.ComponentTypeEnum;
+import org.openecomp.sdc.be.datatypes.enums.ResourceTypeEnum;
+import org.openecomp.sdc.be.model.*;
+import org.openecomp.sdc.be.model.tosca.ToscaPropertyType;
+import org.openecomp.sdc.ci.tests.api.ComponentBaseTest;
+import org.openecomp.sdc.ci.tests.datatypes.ComponentInstanceReqDetails;
+import org.openecomp.sdc.ci.tests.datatypes.ImportReqDetails;
+import org.openecomp.sdc.ci.tests.datatypes.ServiceReqDetails;
+import org.openecomp.sdc.ci.tests.datatypes.enums.*;
+import org.openecomp.sdc.ci.tests.datatypes.http.RestResponse;
+import org.openecomp.sdc.ci.tests.utils.general.ElementFactory;
+import org.openecomp.sdc.ci.tests.utils.rest.*;
+import org.openecomp.sdc.ci.tests.utils.validation.BaseValidationUtils;
+import org.openecomp.sdc.common.api.Constants;
+import org.testng.annotations.Test;
+import org.yaml.snakeyaml.Yaml;
+
+import java.io.ByteArrayInputStream;
+import java.io.InputStream;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.util.*;
+import java.util.Map.Entry;
+import java.util.stream.Collectors;
+
+import static org.junit.Assert.*;
+
+public class ExportToscaTest extends ComponentBaseTest {
+	@Rule
+	public static TestName name = new TestName();
+
+	@Test()
+	public void exportVfModuleTest() throws Exception {
+		User sdncModifierDetails = ElementFactory.getDefaultUser(UserRoleEnum.DESIGNER);
+
+		Resource createdResource = createVfFromCSAR(sdncModifierDetails, "VSPPackage");
+
+		Map<String, Object> load = downloadAndParseToscaTemplate(sdncModifierDetails, createdResource);
+		assertNotNull(load);
+		Map<String, Object> topology_template = (Map<String, Object>) load.get("topology_template");
+		assertNotNull(topology_template);
+		Map<String, Object> groups = (Map<String, Object>) topology_template.get("groups");
+		assertNotNull(groups);
+		List<GroupDefinition> groupsOrigin = createdResource.getGroups();
+
+		assertEquals("Validate groups size", groupsOrigin.size(), groups.size());
+		for (GroupDefinition group : groupsOrigin) {
+			Map<String, Object> groupTosca = (Map<String, Object>) groups.get(group.getName());
+			assertNotNull(groupTosca);
+
+			Map<String, Object> metadata = (Map<String, Object>) groupTosca.get("metadata");
+			assertNotNull(metadata);
+
+			String invariantUUID;
+			String name;
+			String UUID;
+			String version;
+			Map<String, Object> properties = (Map<String, Object>) groupTosca.get("properties");
+
+			if (group.getType().equals(Constants.DEFAULT_GROUP_VF_MODULE)) {
+				invariantUUID = (String) metadata.get("vfModuleModelInvariantUUID");
+				name = (String) metadata.get("vfModuleModelName");
+				UUID = (String) metadata.get("vfModuleModelUUID");
+				version = (String) metadata.get("vfModuleModelVersion");
+				assertNotNull(properties);
+
+				String vf_module_type = (String) properties.get("vf_module_type");
+				List<PropertyDataDefinition> props = group.getProperties();
+				for (PropertyDataDefinition prop : props) {
+					if (prop.getName().equals(Constants.IS_BASE)) {
+						String value = prop.getValue() == null ? prop.getDefaultValue() : prop.getValue();
+						boolean bvalue = Boolean.parseBoolean(value);
+						if (bvalue) {
+							assertEquals("Validate vf_module_type", "Base", vf_module_type);
+						} else {
+							assertEquals("Validate vf_module_type", "Expansion", vf_module_type);
+						}
+						break;
+					}
+				}
+				String vf_module_description = (String) properties.get("vf_module_description");
+				assertEquals("Validate vf_module_description", group.getDescription(), vf_module_description);
+
+				Boolean volume_group = (Boolean) properties.get("volume_group");
+				boolean isVolume = false;
+				List<String> artifactsList = group.getArtifacts();
+				List<ArtifactDefinition> artifacts = new ArrayList<>();
+				if (artifactsList != null && !artifactsList.isEmpty()) {
+					ArtifactDefinition masterArtifact = findMasterArtifact(createdResource.getDeploymentArtifacts(),
+							artifacts, artifactsList);
+					if (masterArtifact.getArtifactType().equalsIgnoreCase(ArtifactTypeEnum.HEAT_VOL.getType())) {
+						isVolume = true;
+					}
+				}
+				assertEquals("Validate volume_group", isVolume, volume_group);
+
+			} else {
+				invariantUUID = (String) metadata.get("invariantUUID");
+				name = (String) metadata.get("name");
+				UUID = (String) metadata.get("UUID");
+				version = (String) metadata.get("version");
+				assertNull(properties);
+
+			}
+			assertEquals("Validate InvariantUUID", group.getInvariantUUID(), invariantUUID);
+			assertEquals("Validate name", group.getName(), name);
+			assertEquals("Validate UUID", group.getGroupUUID(), UUID);
+			assertEquals("Validate version", group.getVersion(), version);
+
+		}
+	}
+
+	@Test(enabled = true)
+	public void exportCsarInputsTest() throws Exception {
+		User sdncModifierDetails = ElementFactory.getDefaultUser(UserRoleEnum.DESIGNER);
+
+		Resource createdResource = createVfFromCSAR(sdncModifierDetails, "csar_1");
+		Map<String, Object> load = downloadAndParseToscaTemplate(sdncModifierDetails, createdResource);
+		assertNotNull(load);
+
+		Map<String, Object> topology_template = (Map<String, Object>) load.get("topology_template");
+		assertNotNull(topology_template);
+
+		Map<String, Object> inputs = (Map<String, Object>) topology_template.get("inputs");
+		assertNotNull(inputs);
+
+		List<InputDefinition> inputsFromResource = createdResource.getInputs();
+		assertEquals("validate inputs size", inputsFromResource.size(), inputs.size());
+		for (InputDefinition inputDef : inputsFromResource) {
+			Map<String, Object> inputInFile = (Map<String, Object>) inputs.get(inputDef.getName());
+			assertNotNull(inputInFile);
+			validateInput(inputDef, inputInFile);
+		}
+		List<ComponentInstance> componentInstances = createdResource.getComponentInstances();
+		Map<String, List<ComponentInstanceProperty>> componentInstancesProperties = createdResource
+				.getComponentInstancesProperties();
+		Map<String, Object> node_templates = (Map<String, Object>) topology_template.get("node_templates");
+		assertNotNull(node_templates);
+
+		JsonParser jsonParser = new JsonParser();
+
+		for (Map.Entry<String, List<ComponentInstanceProperty>> entry : componentInstancesProperties.entrySet()) {
+
+			Optional<ComponentInstance> findFirst = componentInstances.stream()
+					.filter(ci -> ci.getUniqueId().equals(entry.getKey())).findFirst();
+			assertTrue(findFirst.isPresent());
+			String resourceName = findFirst.get().getName();
+			Map<String, Object> instance = (Map<String, Object>) node_templates.get(resourceName);
+			assertNotNull(instance);
+			Map<String, Object> properties = (Map<String, Object>) instance.get("properties");
+
+			for (ComponentInstanceProperty cip : entry.getValue()) {
+				if (cip.getValueUniqueUid() != null && !cip.getValueUniqueUid().isEmpty()) {
+					assertNotNull(properties);
+					if (cip.getValue().contains("get_input")) {
+						Object prop = properties.get(cip.getName());
+						assertNotNull(prop);
+
+						Gson gson = new Gson();
+						String json = gson.toJson(prop);
+						assertEquals("validate json property", cip.getValue(), json);
+					}
+
+				}
+			}
+
+		}
+
+	}
+
+	@Test
+	public void importExportCsarWithJsonPropertyType() throws Exception {
+		User sdncModifierDetails = ElementFactory.getDefaultUser(UserRoleEnum.DESIGNER);
+		String payloadName = "jsonPropertyTypeTest.csar";
+		ImportReqDetails resourceDetails = ElementFactory.getDefaultImportResource();
+		String rootPath = System.getProperty("user.dir");
+		Path path = null;
+		byte[] data = null;
+		String payloadData = null;
+		path = Paths.get(rootPath + "/src/test/resources/CI/csars/jsonPropertyTypeTest.csar");
+		data = Files.readAllBytes(path);
+		payloadData = Base64.encodeBase64String(data);
+		resourceDetails.setPayloadData(payloadData);
+		resourceDetails.setCsarUUID(payloadName);
+		resourceDetails.setPayloadName(payloadName);
+		resourceDetails.setResourceType(ResourceTypeEnum.VF.name());
+		RestResponse createResource = ResourceRestUtils.createResource(resourceDetails, sdncModifierDetails);
+		BaseRestUtils.checkCreateResponse(createResource);
+		Resource resource = ResponseParser.parseToObjectUsingMapper(createResource.getResponse(), Resource.class);
+		ComponentInstance pmaaServer = resource.getComponentInstances().stream()
+				.filter(p -> p.getName().equals("pmaa_server_0")).findAny().get();
+		ComponentInstanceProperty jsonProp = resource.getComponentInstancesProperties().get(pmaaServer.getUniqueId())
+				.stream().filter(p -> p.getType().equals(ToscaPropertyType.JSON.getType())).findAny().get();
+		String jsonValue = "{\"pmaa.sb_nic\":{\"address\":{\"get_input\":\"pmaa_dpu_fixed_ip\"},\"cidr\":{\"get_input\":\"pmaa_dpu_cidr\"},\"gateway\":{\"get_input\":\"pmaa_dpu_gateway\"}}}";
+		assertEquals(jsonProp.getValue(), jsonValue);
+		// download and compare
+		Map<String, Object> load = downloadAndParseToscaTemplate(sdncModifierDetails, resource);
+		assertNotNull(load);
+		Map<String, Object> topology_template = (Map<String, Object>) load.get("topology_template");
+		assertNotNull(topology_template);
+		Map<String, Object> nodes = (Map<String, Object>) topology_template.get("node_templates");
+		assertNotNull(nodes);
+		Map<String, Object> pmaaServerObj = (Map<String, Object>) nodes.get("pmaa_server_0");
+		assertNotNull(pmaaServerObj);
+		Map<String, Object> props = (Map<String, Object>) pmaaServerObj.get("properties");
+		assertNotNull(props);
+		Map<String, Object> jsonPropObj = (Map<String, Object>) props.get("metadata");
+		assertNotNull(jsonPropObj);
+		Gson gson = new Gson();
+		String json = gson.toJson(jsonPropObj);
+		assertEquals(json, jsonValue);
+	}
+	
+	@Test(enabled = true)
+	public void exportServiceInputValue() throws Exception {
+		//1 create vf as certified
+		User sdncModifierDetails = ElementFactory.getDefaultUser(UserRoleEnum.DESIGNER);
+
+		Resource createdResource = createVfFromCSAR(sdncModifierDetails, "csar_1");
+		RestResponse checkinState = LifecycleRestUtils.changeComponentState(createdResource, sdncModifierDetails, LifeCycleStatesEnum.CHECKIN);
+		BaseRestUtils.checkSuccess(checkinState);
+		ServiceReqDetails serviceDetails = ElementFactory.getDefaultService(
+				"ciNewtestservice1", ServiceCategoriesEnum.MOBILITY, sdncModifierDetails.getUserId(), 
+				ServiceInstantiationType.A_LA_CARTE.getValue());
+		
+		//2 create service
+		RestResponse createServiceResponse = ServiceRestUtils.createService(serviceDetails, sdncModifierDetails);
+		ResourceRestUtils.checkCreateResponse(createServiceResponse);
+		Service service = ResponseParser.parseToObjectUsingMapper(createServiceResponse.getResponse(), Service.class);
+
+		//3 create vf instance in service
+		ComponentInstanceReqDetails componentInstanceDetails = ElementFactory.getComponentInstance(createdResource);
+		RestResponse createComponentInstance = ComponentInstanceRestUtils.createComponentInstance(componentInstanceDetails, sdncModifierDetails, service);
+		ResourceRestUtils.checkCreateResponse(createComponentInstance);
+		
+		RestResponse getService = ServiceRestUtils.getService(service.getUniqueId());
+		BaseRestUtils.checkSuccess(getService);
+		service = ResponseParser.parseToObjectUsingMapper(getService.getResponse(), Service.class);
+		
+		//4 download tosca template 
+		Map<String, Object> tosca = downloadAndParseToscaTemplate(sdncModifierDetails, service);
+		assertNotNull(tosca);
+		Map<String, Object> topology_template = (Map<String, Object>) tosca.get("topology_template");
+		assertNotNull(topology_template);
+	
+		//5 validate no inputs in service
+		Map<String, Object> inputs = (Map<String, Object>) tosca.get("inputs");
+		assertNull(inputs);
+	
+		List<ComponentInstance> componentInstances = service.getComponentInstances();
+		assertNotNull(componentInstances);
+		assertEquals(1, componentInstances.size());
+		ComponentInstance vfi = componentInstances.get(0);
+		
+		//6 add instance inputs in service
+		RestResponse getComponentInstanceInputsResponse = InputsRestUtils.getComponentInstanceInputs(service, vfi);
+		BaseValidationUtils.checkSuccess(getComponentInstanceInputsResponse);
+		List<ComponentInstancePropInput> instanceInputs = new Gson().fromJson(getComponentInstanceInputsResponse.getResponse(), new TypeToken<ArrayList<ComponentInstancePropInput>>(){}.getType());
+		// Take only the 2 first inputs
+		List<ComponentInstancePropInput> inputsToAdd = instanceInputs.stream().limit(2).collect(Collectors.toList());
+
+		//7 Build component instances input map to add to server
+		ComponentInstInputsMap buildComponentInstInputsMap = buildComponentInstInputsMap(vfi.getUniqueId(), inputsToAdd);
+		RestResponse addInputResponse = InputsRestUtils.addInput(service, buildComponentInstInputsMap, UserRoleEnum.DESIGNER);
+		BaseValidationUtils.checkSuccess(addInputResponse);
+
+		//8 validate inputs in service 
+		//8.1 download tosca template 
+		getService = ServiceRestUtils.getService(service.getUniqueId());
+		BaseRestUtils.checkSuccess(getService);
+		service = ResponseParser.parseToObjectUsingMapper(getService.getResponse(), Service.class);
+		
+		tosca = downloadAndParseToscaTemplate(sdncModifierDetails, service);
+		assertNotNull(tosca);
+		topology_template = (Map<String, Object>) tosca.get("topology_template");
+		assertNotNull(topology_template);
+	
+		//8.2 validate inputs in service
+		inputs = (Map<String, Object>) topology_template.get("inputs");
+		assertNotNull(inputs);
+		assertEquals(2, inputs.size());
+	
+		//validate created inputs vs inputs in Tosca inputs section		
+		final Map<String, Object> inputsFinal = inputs;
+		buildComponentInstInputsMap.getComponentInstanceInputsMap().values().forEach(listPerInstance ->{
+			listPerInstance.forEach(input ->{
+				Map<String, Object> inputInMap = (Map<String, Object>)inputsFinal.get(input.getName());
+				assertNotNull(inputInMap);
+			});
+		});
+		Map<String, List<ComponentInstanceInput>> componentInstancesInputs = service.getComponentInstancesInputs();
+		
+		//validate created inputs vs inputs in Tosca instance input value
+		List<ComponentInstanceInput> vfiInputs = componentInstancesInputs.get(vfi.getUniqueId());
+		assertNotNull(vfiInputs);
+		assertEquals(2, vfiInputs.size());
+	
+		Map<String, Object> node_templates = (Map<String, Object>) topology_template.get("node_templates");
+		assertNotNull(node_templates);
+
+		Map<String, Object> instance = (Map<String, Object>) node_templates.get(vfi.getName());
+		assertNotNull(instance);
+		Map<String, Object> properties = (Map<String, Object>)instance.get("properties");
+		assertNotNull(properties);
+	
+		vfiInputs.forEach(vfiInput ->{
+			Map<String, Object> inputPropValueInTosca = (Map<String, Object>)properties.get(vfiInput.getName() );
+			assertNotNull(inputPropValueInTosca);
+			String instaneInputName = (String)inputPropValueInTosca.get("get_input");
+			assertNotNull(instaneInputName);
+			Map<String, Object> inputInMap = (Map<String, Object>)inputsFinal.get(instaneInputName);
+			assertNotNull(inputInMap);
+		});
+		
+
+	}
+
+	// ----------------------------------------
+	private void validateInput(InputDefinition inputDef, Map<String, Object> inputInFile) {
+		assertEquals("validate input type", inputDef.getType(), (String) inputInFile.get("type"));
+
+		if (inputDef.getDefaultValue() == null) {
+			assertNull(inputInFile.get("default"));
+		} else {
+			assertNotNull(inputInFile.get("default"));
+			String value = inputDef.getDefaultValue().replace("\"", "");
+			value = value.replace(" ", "");
+			String expValue = inputInFile.get("default").toString().replace(" ", "");
+			assertEquals("validate input default", value, expValue);
+		}
+		assertEquals("validate input description", inputDef.getDescription(), (String) inputInFile.get("description"));
+	}
+
+	private Map<String, Object> downloadAndParseToscaTemplate(User sdncModifierDetails, Component createdComponent)
+			throws Exception {
+		String artifactUniqeId = createdComponent.getToscaArtifacts().get("assettoscatemplate").getUniqueId();
+		RestResponse toscaTemplate;
+
+		if ( createdComponent.getComponentType() == ComponentTypeEnum.RESOURCE ){
+			toscaTemplate = ArtifactRestUtils.downloadResourceArtifactInternalApi(
+					createdComponent.getUniqueId(), sdncModifierDetails, artifactUniqeId);
+				
+		}else{
+			toscaTemplate = ArtifactRestUtils.downloadServiceArtifactInternalApi(
+					createdComponent.getUniqueId(), sdncModifierDetails, artifactUniqeId);
+		}
+		BaseRestUtils.checkSuccess(toscaTemplate);
+
+		ArtifactUiDownloadData artifactUiDownloadData = ResponseParser.parseToObject(toscaTemplate.getResponse(),
+				ArtifactUiDownloadData.class);
+		byte[] fromUiDownload = artifactUiDownloadData.getBase64Contents().getBytes();
+		byte[] decodeBase64 = Base64.decodeBase64(fromUiDownload);
+		Yaml yaml = new Yaml();
+
+		InputStream inputStream = new ByteArrayInputStream(decodeBase64);
+
+		Map<String, Object> load = (Map<String, Object>) yaml.load(inputStream);
+		return load;
+	}
+
+
+	public ArtifactDefinition findMasterArtifact(Map<String, ArtifactDefinition> deplymentArtifact,
+			List<ArtifactDefinition> artifacts, List<String> artifactsList) {
+		for (String artifactUid : artifactsList) {
+			for (Entry<String, ArtifactDefinition> entry : deplymentArtifact.entrySet()) {
+				ArtifactDefinition artifact = entry.getValue();
+				if (artifactUid.equalsIgnoreCase(artifact.getUniqueId())) {
+					artifacts.add(artifact);
+				}
+
+			}
+		}
+		ArtifactDefinition masterArtifact = null;
+		for (ArtifactDefinition artifactInfo : artifacts) {
+			String atrifactType = artifactInfo.getArtifactType();
+			if (atrifactType.equalsIgnoreCase(ArtifactTypeEnum.HEAT_VOL.getType())
+					|| atrifactType.equalsIgnoreCase(ArtifactTypeEnum.HEAT_NET.getType())) {
+				masterArtifact = artifactInfo;
+				continue;
+			}
+			if (atrifactType.equalsIgnoreCase(ArtifactTypeEnum.HEAT.getType())) {
+				masterArtifact = artifactInfo;
+				break;
+			}
+		}
+		return masterArtifact;
+	}
+	private ComponentInstInputsMap buildComponentInstInputsMap (String addToInput, List<ComponentInstancePropInput> inputs) {
+		Map<String, List<ComponentInstancePropInput>> map = new HashMap<>();
+		map.put(addToInput, inputs);
+		ComponentInstInputsMap componentInstInputsMap = new ComponentInstInputsMap();
+		componentInstInputsMap.setComponentInstanceInputsMap(map);		
+		return componentInstInputsMap;
+	}
+
+}
diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/execute/imports/ImportGenericResourceCITest.java b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/execute/imports/ImportGenericResourceCITest.java
new file mode 100644
index 0000000000..cc2aa5335f
--- /dev/null
+++ b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/execute/imports/ImportGenericResourceCITest.java
@@ -0,0 +1,582 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * SDC
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.sdc.ci.tests.execute.imports;
+
+import com.google.gson.Gson;
+import fj.data.Either;
+import org.apache.http.HttpStatus;
+import org.apache.http.client.ClientProtocolException;
+import org.apache.http.client.methods.CloseableHttpResponse;
+import org.apache.http.client.methods.HttpPost;
+import org.apache.http.entity.ContentType;
+import org.apache.http.entity.mime.MultipartEntityBuilder;
+import org.apache.http.entity.mime.content.FileBody;
+import org.apache.http.entity.mime.content.StringBody;
+import org.apache.http.impl.client.CloseableHttpClient;
+import org.apache.http.impl.client.HttpClients;
+import org.junit.Rule;
+import org.junit.rules.TestName;
+import org.openecomp.sdc.be.model.LifecycleStateEnum;
+import org.openecomp.sdc.be.model.category.CategoryDefinition;
+import org.openecomp.sdc.ci.tests.api.ComponentBaseTest;
+import org.openecomp.sdc.ci.tests.api.Urls;
+import org.openecomp.sdc.ci.tests.config.Config;
+import org.openecomp.sdc.ci.tests.datatypes.enums.*;
+import org.openecomp.sdc.ci.tests.datatypes.expected.ExpectedResourceAuditJavaObject;
+import org.openecomp.sdc.ci.tests.datatypes.http.RestResponse;
+import org.openecomp.sdc.ci.tests.execute.TODO.ImportCapabilityTypeCITest;
+import org.openecomp.sdc.ci.tests.utils.DbUtils;
+import org.openecomp.sdc.ci.tests.utils.Utils;
+import org.openecomp.sdc.ci.tests.utils.rest.BaseRestUtils;
+import org.openecomp.sdc.ci.tests.utils.rest.ImportRestUtils;
+import org.openecomp.sdc.ci.tests.utils.rest.ResourceRestUtils;
+import org.openecomp.sdc.ci.tests.utils.rest.ResponseParser;
+import org.openecomp.sdc.ci.tests.utils.validation.AuditValidationUtils;
+import org.openecomp.sdc.ci.tests.utils.validation.ErrorValidationUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.testng.annotations.BeforeClass;
+import org.testng.annotations.Test;
+
+import java.io.File;
+import java.io.IOException;
+import java.nio.file.FileSystems;
+import java.nio.file.Files;
+import java.util.*;
+import java.util.Map.Entry;
+
+import static org.testng.AssertJUnit.*;
+
+public class ImportGenericResourceCITest extends ComponentBaseTest {
+	private static Logger log = LoggerFactory.getLogger(ImportGenericResourceCITest.class.getName());
+	private static final String FILE_NAME_MY_COMPUTE = "tosca.nodes.MyCompute";
+	private static final String RESOURCE_NAME_UPDATE_COMPUTE = "userUpdateCompute";
+	private static final String RESOURCE_NAME_MY_COMPUTE = "myCompute";
+	private static final String RESOURCE_NAME_USER_COMPUTE = "userCompute";
+	private static final String FILE_NAME_USER_COMPUTE = "tosca.nodes.userCompute";
+	@Rule
+	public static TestName name = new TestName();
+
+	@BeforeClass
+	public static void beforeImportClass() throws IOException {
+		ImportCapabilityTypeCITest.importAllCapabilityTypes();
+		// removeAllNormativeTypeResources();
+		// importAllNormativeTypesResources(UserRoleEnum.ADMIN);
+	}
+
+	static Config config = Config.instance();
+
+	public static Map<NormativeTypesEnum, Boolean> removeAllNormativeTypeResources() throws ClientProtocolException, IOException {
+		Map<NormativeTypesEnum, Boolean> normativeExistInDB = new HashMap<>();
+
+		for (NormativeTypesEnum current : NormativeTypesEnum.values()) {
+			Boolean existedBeforeDelete = ImportRestUtils.removeNormativeTypeResource(current);
+			normativeExistInDB.put(current, existedBeforeDelete);
+		}
+		return normativeExistInDB;
+	}
+
+	public static Either<String, Boolean> getNormativeTypeResource(NormativeTypesEnum current) throws ClientProtocolException, IOException {
+		return getResource(current.getNormativeName(), "1.0");
+	}
+
+	@Test
+	public void importAllTestResources() throws Exception {
+		for (ImportTestTypesEnum currResource : ImportTestTypesEnum.values()) {
+			DbUtils.cleanAllAudits();
+
+			RestResponse importResponse = ImportRestUtils.importTestResource(currResource, UserRoleEnum.ADMIN);
+			// System.err.println("import Resource
+			// "+"<"+currResource+">"+"response:
+			// "+importResponse.getErrorCode());
+			ImportRestUtils.validateImportTestTypesResp(currResource, importResponse);
+			if (currResource.getvalidateAudit() == true) {
+				// validate audit
+				String baseVersion = "1.0";
+				ErrorInfo errorInfo = ErrorValidationUtils.parseErrorConfigYaml(currResource.getActionStatus().name());
+				ExpectedResourceAuditJavaObject expectedResourceAuditJavaObject = new ExpectedResourceAuditJavaObject();
+				String auditAction = "ResourceImport";
+				expectedResourceAuditJavaObject.setAction(auditAction);
+				expectedResourceAuditJavaObject.setModifierUid(UserRoleEnum.ADMIN.getUserId());
+				expectedResourceAuditJavaObject.setModifierName(UserRoleEnum.ADMIN.getUserName());
+				expectedResourceAuditJavaObject.setResourceName(currResource.getNormativeName());
+				expectedResourceAuditJavaObject.setResourceType("Resource");
+				expectedResourceAuditJavaObject.setPrevVersion("");
+				expectedResourceAuditJavaObject.setCurrVersion(baseVersion);
+				expectedResourceAuditJavaObject.setPrevState("");
+				expectedResourceAuditJavaObject.setCurrState(LifecycleStateEnum.CERTIFIED.toString());
+				expectedResourceAuditJavaObject.setComment(null);
+				expectedResourceAuditJavaObject.setStatus(errorInfo.getCode().toString());
+				List<String> variables = (currResource.getErrorParams() != null ? currResource.getErrorParams() : new ArrayList<String>());
+				String auditDesc = AuditValidationUtils.buildAuditDescription(errorInfo, variables);
+				expectedResourceAuditJavaObject.setDesc(auditDesc);
+				AuditValidationUtils.validateAuditImport(expectedResourceAuditJavaObject, auditAction);
+			}
+		}
+	}
+
+	// -----------------------------------------------------------------------------------
+	protected void validateMyComputeCapabilities(Map<String, Object> map) {
+		assertTrue(map.containsKey("capabilities"));
+		Map<String, Object> capabilities = (Map<String, Object>) map.get("capabilities");
+		assertTrue(capabilities.containsKey("tosca.capabilities.Container"));
+		List<Object> hostCapList = (List<Object>) capabilities.get("tosca.capabilities.Container");
+		assertFalse(hostCapList.isEmpty());
+		Map<String, Object> hostCap = (Map<String, Object>) hostCapList.get(0);
+		validateField(hostCap, "type", "tosca.capabilities.Container");
+		validateField(hostCap, "name", "host");
+		validateField(hostCap, "validSourceTypes", Arrays.asList(new String[] { "tosca.nodes.SoftwareComponent" }));
+
+		assertTrue(capabilities.containsKey("tosca.capabilities.Endpoint.Admin"));
+		List<Object> endPointCapList = (List<Object>) capabilities.get("tosca.capabilities.Endpoint.Admin");
+		assertFalse(endPointCapList.isEmpty());
+		Map<String, Object> endPointCap = (Map<String, Object>) endPointCapList.get(0);
+		validateField(endPointCap, "name", "endpoint");
+		validateField(endPointCap, "type", "tosca.capabilities.Endpoint.Admin");
+
+		assertTrue(capabilities.containsKey("tosca.capabilities.OperatingSystem"));
+		List<Object> osCapList = (List<Object>) capabilities.get("tosca.capabilities.OperatingSystem");
+		assertFalse(osCapList.isEmpty());
+		Map<String, Object> osCap = (Map<String, Object>) osCapList.get(0);
+		validateField(osCap, "name", "os");
+		validateField(osCap, "type", "tosca.capabilities.OperatingSystem");
+
+		assertTrue(capabilities.containsKey("tosca.capabilities.Scalable"));
+		List<Object> scalableCapList = (List<Object>) capabilities.get("tosca.capabilities.Scalable");
+		assertFalse(scalableCapList.isEmpty());
+		Map<String, Object> scalableCap = (Map<String, Object>) scalableCapList.get(0);
+		validateField(scalableCap, "name", "scalable");
+		validateField(scalableCap, "type", "tosca.capabilities.Scalable");
+
+		assertTrue(capabilities.containsKey("tosca.capabilities.network.Bindable"));
+		List<Object> bindingCapList = (List<Object>) capabilities.get("tosca.capabilities.network.Bindable");
+		assertFalse(bindingCapList.isEmpty());
+		Map<String, Object> bindingCap = (Map<String, Object>) bindingCapList.get(0);
+		validateField(bindingCap, "name", "binding");
+		validateField(bindingCap, "type", "tosca.capabilities.network.Bindable");
+
+	}
+
+	protected void validateMyComputeResource(String resourceName, String resourceVersion, String expectedState) throws ClientProtocolException, IOException {
+		Either<String, Boolean> eitherMyCompute = getResource(resourceName, resourceVersion);
+		assertTrue(eitherMyCompute.isLeft());
+		String testComputeYml = eitherMyCompute.left().value();
+
+		Map<String, Object> map = new HashMap<String, Object>();
+		map = (Map<String, Object>) new Gson().fromJson(testComputeYml, map.getClass());
+
+		validateMyComputeBasicFields(map, resourceName, resourceVersion, expectedState);
+
+		validateMyComputeCapabilities(map);
+
+		validateMyComputeRequirements(map);
+		validateField(map, RespJsonKeysEnum.RESOURCE_VERSION.getRespJsonKeyName(), resourceVersion);
+
+	}
+
+	protected void validateMyComputeResource(String uid, String resourceName, String resourceVersion, String expectedState) throws ClientProtocolException, IOException {
+		RestResponse resourceResponse = ResourceRestUtils.getResource(uid);
+		ResourceRestUtils.checkSuccess(resourceResponse);
+		String testComputeYml = resourceResponse.getResponse();
+
+		// Either<String, Boolean> eitherMyCompute = getResource(resourceName,
+		// resourceVersion);
+		// assertTrue( eitherMyCompute.isLeft() );
+		// String testComputeYml = eitherMyCompute.left().value();
+
+		Map<String, Object> map = new HashMap<String, Object>();
+		map = (Map<String, Object>) new Gson().fromJson(testComputeYml, map.getClass());
+
+		validateMyComputeBasicFields(map, resourceName, resourceVersion, expectedState);
+
+		validateMyComputeCapabilities(map);
+
+		validateMyComputeRequirements(map);
+		validateField(map, RespJsonKeysEnum.RESOURCE_VERSION.getRespJsonKeyName(), resourceVersion);
+
+	}
+
+	protected void validateMyComputeResourceAfterUpdate(String uid, String resourceName, String resourceVersion, String expectedState) throws ClientProtocolException, IOException {
+		RestResponse resourceResponse = ResourceRestUtils.getResource(uid);
+		ResourceRestUtils.checkSuccess(resourceResponse);
+		String testComputeYml = resourceResponse.getResponse();
+
+		// Either<String, Boolean> eitherMyCompute = getResource(resourceName,
+		// resourceVersion);
+		// assertTrue( eitherMyCompute.isLeft() );
+
+		// String testComputeYml = eitherMyCompute.left().value();
+
+		Map<String, Object> map = new HashMap<String, Object>();
+		map = (Map<String, Object>) new Gson().fromJson(testComputeYml, map.getClass());
+
+		validateMyComputeBasicFields(map, resourceName, resourceVersion, expectedState);
+		validateField(map, RespJsonKeysEnum.DESCRIPTION.getRespJsonKeyName(), "Short description");
+		validateField(map, RespJsonKeysEnum.VENDOR_NAME.getRespJsonKeyName(), "UserVendor");
+		validateField(map, RespJsonKeysEnum.VENDOR_RELEASE.getRespJsonKeyName(), "1.1.2");
+
+		// validateMyComputeCapabilities(map);
+		// AssertJUnit.assertTrue(map.containsKey("capabilities"));
+		// Map<String, Object> capabilities = (Map<String, Object>)
+		// map.get("capabilities");
+		// AssertJUnit.assertTrue(capabilities.containsKey("host"));
+		// Map<String, Object> hostCap = (Map<String, Object>)
+		// capabilities.get("host");
+		// validateField(hostCap, "type", "tosca.capabilities.Container");
+		// validateField(hostCap, "validSourceTypes", Arrays.asList(new
+		// String[]{"tosca.nodes.SoftwareComponent"}));
+		//
+		// AssertJUnit.assertTrue(capabilities.containsKey("endpoint"));
+		// Map<String, Object> endPointCap = (Map<String, Object>)
+		// capabilities.get("endpoint");
+		// validateField(endPointCap, "type",
+		// "tosca.capabilities.Endpoint.Admin");
+
+		assertTrue(map.containsKey("capabilities"));
+		Map<String, Object> capabilities = (Map<String, Object>) map.get("capabilities");
+		assertTrue(capabilities.containsKey("tosca.capabilities.Container"));
+		List<Object> hostCapList = (List<Object>) capabilities.get("tosca.capabilities.Container");
+		assertFalse(hostCapList.isEmpty());
+		Map<String, Object> hostCap = (Map<String, Object>) hostCapList.get(0);
+		validateField(hostCap, "type", "tosca.capabilities.Container");
+		validateField(hostCap, "name", "host");
+		validateField(hostCap, "validSourceTypes", Arrays.asList(new String[] { "tosca.nodes.SoftwareComponent" }));
+
+		assertTrue(capabilities.containsKey("tosca.capabilities.Endpoint.Admin"));
+		List<Object> endPointCapList = (List<Object>) capabilities.get("tosca.capabilities.Endpoint.Admin");
+		assertFalse(endPointCapList.isEmpty());
+		Map<String, Object> endPointCap = (Map<String, Object>) endPointCapList.get(0);
+		validateField(endPointCap, "name", "endpoint");
+		validateField(endPointCap, "type", "tosca.capabilities.Endpoint.Admin");
+
+		validateMyComputeRequirements(map);
+		validateField(map, RespJsonKeysEnum.RESOURCE_VERSION.getRespJsonKeyName(), resourceVersion);
+
+	}
+
+	protected void validateMyComputeRequirements(Map<String, Object> map) {
+		assertTrue(map.containsKey("requirements"));
+		Map<String, Object> requirements = (Map<String, Object>) map.get("requirements");
+
+		assertTrue(requirements.containsKey("tosca.capabilities.Attachment"));
+		List<Object> localStorageReqList = (List<Object>) requirements.get("tosca.capabilities.Attachment");
+		assertFalse(localStorageReqList.isEmpty());
+		Map<String, Object> localStorageReq = (Map<String, Object>) localStorageReqList.get(0);
+		validateField(localStorageReq, "capability", "tosca.capabilities.Attachment");
+		validateField(localStorageReq, "node", "tosca.nodes.BlockStorage");
+		validateField(localStorageReq, "relationship", "tosca.relationships.AttachesTo");
+		validateField(localStorageReq, "name", "local_storage");
+	}
+
+	protected void validateMyComputeBasicFields(Map<String, Object> map, String resourceName, String resourceVersion, String expectedState) {
+		validateField(map, RespJsonKeysEnum.IS_ABSTRACT.getRespJsonKeyName(), false);
+		// validateField(map, RespJsonKeysEnum.CATEGORIES.getRespJsonKeyName(),
+		// categoryDefinition);
+		// validateField(map, RespJsonKeysEnum.UNIQUE_ID.getRespJsonKeyName(),
+		// UniqueIdBuilder.buildResourceUniqueId(resourceName,
+		// resourceVersion));
+		validateField(map, RespJsonKeysEnum.RESOURCE_NAME.getRespJsonKeyName(), resourceName);
+		validateField(map, RespJsonKeysEnum.TAGS.getRespJsonKeyName(), Arrays.asList(new String[] { resourceName }));
+		validateField(map, RespJsonKeysEnum.LIFE_CYCLE_STATE.getRespJsonKeyName(), expectedState);
+
+		validateField(map, RespJsonKeysEnum.DERIVED_FROM.getRespJsonKeyName(), Arrays.asList(new String[] { "tosca.nodes.Root" }));
+	}
+
+	protected static void validateField(Map<String, Object> map, String jsonField, Object expectedValue) {
+		if (expectedValue == null) {
+			assertTrue(!map.containsKey(jsonField));
+		} else {
+			assertTrue("map does not contain field " + jsonField, map.containsKey(jsonField));
+			Object foundValue = map.get(jsonField);
+			compareElements(expectedValue, foundValue);
+		}
+	}
+
+	protected static void compareElements(Object expectedValue, Object foundValue) {
+		if (expectedValue instanceof String) {
+			assertTrue(foundValue instanceof String);
+			assertTrue(foundValue.equals(expectedValue));
+		}
+
+		else if (expectedValue instanceof Boolean) {
+			assertTrue(foundValue instanceof Boolean);
+			assertTrue(foundValue == expectedValue);
+		} else if (expectedValue instanceof Map) {
+			assertTrue(foundValue instanceof Map);
+			Map<String, Object> foundMap = (Map<String, Object>) foundValue;
+			Map<String, Object> excpectedMap = (Map<String, Object>) expectedValue;
+			assertTrue(foundMap.size() == excpectedMap.size());
+			Iterator<String> foundkeyItr = foundMap.keySet().iterator();
+			while (foundkeyItr.hasNext()) {
+				String foundKey = foundkeyItr.next();
+				assertTrue(excpectedMap.containsKey(foundKey));
+				compareElements(excpectedMap.get(foundKey), foundMap.get(foundKey));
+			}
+
+		} else if (expectedValue instanceof List) {
+			assertTrue(foundValue instanceof List);
+			List<Object> foundList = (List<Object>) foundValue;
+			List<Object> excpectedList = (List<Object>) expectedValue;
+			assertTrue(foundList.size() == excpectedList.size());
+			for (int i = 0; i < foundList.size(); i++) {
+				compareElements(excpectedList.get(i), foundList.get(i));
+			}
+
+		} else if (expectedValue instanceof CategoryDefinition) {
+			assertTrue(foundValue instanceof Map);
+			CategoryDefinition expCat = (CategoryDefinition) expectedValue;
+			Map<String, Object> actCat = (Map<String, Object>) foundValue;
+			assertEquals(expCat.getName(), actCat.get("name"));
+
+			// assertEquals(expCat.getSubcategories().get(0).getName(),
+			// actCat.get("subcategories").getName());
+		} else {
+			assertTrue(foundValue.equals(expectedValue));
+		}
+	}
+
+	public static void restoreToOriginalState(Map<NormativeTypesEnum, Boolean> originalState, UserRoleEnum userRole) throws IOException {
+		removeAllNormativeTypeResources();
+
+		Iterator<Entry<NormativeTypesEnum, Boolean>> iterator = originalState.entrySet().iterator();
+		while (iterator.hasNext()) {
+			Entry<NormativeTypesEnum, Boolean> entry = iterator.next();
+			Boolean isExistBeforeDelete = entry.getValue();
+			if (isExistBeforeDelete) {
+				importNormativeResource(entry.getKey(), userRole);
+			}
+		}
+
+	}
+
+	public static void importAllNormativeTypesResources(UserRoleEnum userRole) throws IOException {
+		for (NormativeTypesEnum currResource : NormativeTypesEnum.values()) {
+			Either<String, Boolean> resource = getResource(currResource.getNormativeName(), "1.0");
+			if (resource.isRight()) {
+				importNormativeResource(currResource, userRole);
+			}
+		}
+
+	}
+
+	protected static Integer importNormativeResource(NormativeTypesEnum resource, UserRoleEnum userRole) throws IOException {
+		return importResource(resource.getFolderName(), userRole, true);
+	}
+
+	protected static Integer importResource(String folderName, UserRoleEnum userRole, boolean isNormative) throws IOException {
+		Config config = Utils.getConfig();
+		CloseableHttpResponse response = null;
+		MultipartEntityBuilder mpBuilder = MultipartEntityBuilder.create();
+
+		mpBuilder.addPart("resourceZip", new FileBody(getZipFile(folderName)));
+		mpBuilder.addPart("resourceMetadata", new StringBody(getJsonStringOfFile(folderName, folderName + ".json"), ContentType.APPLICATION_JSON));
+
+		String url = String.format(Urls.IMPORT_RESOURCE_NORMATIVE, config.getCatalogBeHost(), config.getCatalogBePort());
+		if (!isNormative) {
+			url = String.format(Urls.IMPORT_USER_RESOURCE, config.getCatalogBeHost(), config.getCatalogBePort());
+		}
+
+		CloseableHttpClient client = HttpClients.createDefault();
+		try {
+			HttpPost httpPost = new HttpPost(url);
+			httpPost.addHeader("USER_ID", userRole.getUserId());
+			httpPost.setEntity(mpBuilder.build());
+			response = client.execute(httpPost);
+			return response.getStatusLine().getStatusCode();
+		} finally {
+			closeResponse(response);
+			closeHttpClient(client);
+
+		}
+	}
+
+	public static void closeHttpClient(CloseableHttpClient client) {
+		try {
+			if (client != null) {
+				client.close();
+			}
+		} catch (IOException e) {
+			log.debug("failed to close client or response: ", e);
+		}
+	}
+
+	public static void closeResponse(CloseableHttpResponse response) {
+		try {
+			if (response != null) {
+				response.close();
+			}
+		} catch (IOException e) {
+			log.debug("failed to close client or response: ", e);
+		}
+	}
+
+	protected static String getJsonStringOfFile(String folderName, String fileName) throws IOException {
+		String sourceDir = config.getImportResourceConfigDir();
+		sourceDir += File.separator + "normative-types";
+
+		java.nio.file.Path filePath = FileSystems.getDefault().getPath(sourceDir + File.separator + folderName, fileName);
+		byte[] fileContent = Files.readAllBytes(filePath);
+		String content = new String(fileContent);
+		return content;
+	}
+
+	protected static File getZipFile(String elementName) throws IOException {
+		String sourceDir = config.getImportResourceConfigDir();
+		sourceDir += File.separator + "normative-types";
+
+		java.nio.file.Path filePath = FileSystems.getDefault().getPath(sourceDir + File.separator + elementName, "normative-types-new-" + elementName + ".zip");
+		return filePath.toFile();
+	}
+
+	protected static String getTestJsonStringOfFile(String folderName, String fileName) throws IOException {
+		String sourceDir = config.getImportResourceTestsConfigDir();
+		java.nio.file.Path filePath = FileSystems.getDefault().getPath(sourceDir + File.separator + folderName, fileName);
+		byte[] fileContent = Files.readAllBytes(filePath);
+		String content = new String(fileContent);
+		return content;
+	}
+
+	protected static File getTestZipFile(String elementName) throws IOException {
+		String sourceDir = config.getImportResourceTestsConfigDir();
+
+		java.nio.file.Path filePath = FileSystems.getDefault().getPath(sourceDir + File.separator + elementName, "normative-types-new-" + elementName + ".zip");
+		return filePath.toFile();
+	}
+
+	protected static Either<String, Boolean> getResource(String name, String version) throws IOException {
+		RestResponse resource = ResourceRestUtils.getResourceByNameAndVersion(UserRoleEnum.DESIGNER.getUserId(), name, version);
+		if (resource.getErrorCode() == ImportRestUtils.STATUS_CODE_GET_SUCCESS) {
+			return Either.left(resource.getResponse());
+			// return Either.right(true);
+
+		}
+		return Either.right(false);
+	}
+
+	@Test
+	public void testImportWithRequirmentsAndCapabilities() throws IOException {
+		String fileName = FILE_NAME_MY_COMPUTE;
+		RestResponse response = ImportRestUtils.importNormativeResourceByName(RESOURCE_NAME_MY_COMPUTE, UserRoleEnum.ADMIN);
+		Integer statusCode = response.getErrorCode();
+		assertTrue(statusCode == ImportRestUtils.STATUS_CODE_IMPORT_SUCCESS);
+		String uid = ResponseParser.getUniqueIdFromResponse(response);
+		validateMyComputeResource(uid, fileName, "1.0", "CERTIFIED");
+	}
+
+	@Test
+	public void testImportWithUpdateNormativeType() throws IOException {
+		String fileName = FILE_NAME_MY_COMPUTE;
+		RestResponse response = ImportRestUtils.importNormativeResourceByName(RESOURCE_NAME_MY_COMPUTE, UserRoleEnum.ADMIN);
+		Integer statusCode = response.getErrorCode();
+		assertTrue(statusCode == BaseRestUtils.STATUS_CODE_IMPORT_SUCCESS);
+		String uid = ResponseParser.getUniqueIdFromResponse(response);
+		validateMyComputeResource(uid, fileName, "1.0", "CERTIFIED");
+
+		// update
+		response = ImportRestUtils.importNormativeResourceByName(RESOURCE_NAME_MY_COMPUTE, UserRoleEnum.ADMIN);
+		statusCode = response.getErrorCode();
+		assertTrue(statusCode == ImportRestUtils.STATUS_CODE_UPDATE_SUCCESS);
+		uid = ResponseParser.getUniqueIdFromResponse(response);
+		validateMyComputeResource(uid, fileName, "2.0", "CERTIFIED");
+
+	}
+
+	@Test
+	public void testImportWithInvalidDefaultValue() throws IOException {
+		RestResponse response = ImportRestUtils.importNewResourceByName("portInvalidDefaultValue", UserRoleEnum.DESIGNER);
+		assertTrue(response.getErrorCode() == HttpStatus.SC_BAD_REQUEST);
+	}
+
+	@Test
+	public void testImportUserResource() throws IOException {
+		String fileName = FILE_NAME_USER_COMPUTE;
+		RestResponse response = ImportRestUtils.importNewResourceByName(RESOURCE_NAME_USER_COMPUTE, UserRoleEnum.DESIGNER);
+		Integer statusCode = response.getErrorCode();
+		assertTrue(statusCode == ImportRestUtils.STATUS_CODE_IMPORT_SUCCESS);
+		String uid = ResponseParser.getUniqueIdFromResponse(response);
+		validateMyComputeResource(uid, fileName, "0.1", "NOT_CERTIFIED_CHECKOUT");
+
+	}
+
+	@Test
+	public void testImportAndUpdateUserResource() throws IOException {
+		String fileName = FILE_NAME_USER_COMPUTE;
+		RestResponse response = ImportRestUtils.importNewResourceByName(RESOURCE_NAME_USER_COMPUTE, UserRoleEnum.DESIGNER);
+		Integer statusCode = response.getErrorCode();
+		assertTrue(statusCode == ImportRestUtils.STATUS_CODE_IMPORT_SUCCESS);
+		String uid = ResponseParser.getUniqueIdFromResponse(response);
+		validateMyComputeResource(uid, fileName, "0.1", "NOT_CERTIFIED_CHECKOUT");
+		response = ImportRestUtils.importNewResourceByName(RESOURCE_NAME_UPDATE_COMPUTE, UserRoleEnum.DESIGNER);
+		statusCode = response.getErrorCode();
+		assertTrue(statusCode == ImportRestUtils.STATUS_CODE_UPDATE_SUCCESS);
+		uid = ResponseParser.getUniqueIdFromResponse(response);
+		validateMyComputeResourceAfterUpdate(uid, fileName, "0.1", "NOT_CERTIFIED_CHECKOUT");
+
+	}
+
+	@Test
+	public void testImportAndUpdateChangesUserResource() throws IOException {
+		String fileName = FILE_NAME_USER_COMPUTE;
+		RestResponse response = ImportRestUtils.importNewResourceByName(RESOURCE_NAME_USER_COMPUTE, UserRoleEnum.DESIGNER);
+		Integer statusCode = response.getErrorCode();
+		assertTrue(statusCode == ImportRestUtils.STATUS_CODE_IMPORT_SUCCESS);
+		String uid = ResponseParser.getUniqueIdFromResponse(response);
+		validateMyComputeResource(uid, fileName, "0.1", "NOT_CERTIFIED_CHECKOUT");
+		// Either<String, Boolean> resource = getResource(fileName, "0.1");
+		// assertTrue(resource.isLeft());
+
+		response = ImportRestUtils.importNewResourceByName(RESOURCE_NAME_UPDATE_COMPUTE, UserRoleEnum.DESIGNER);
+		statusCode = response.getErrorCode();
+		assertTrue(statusCode == ImportRestUtils.STATUS_CODE_UPDATE_SUCCESS);
+		validateMyComputeResourceAfterUpdate(uid, fileName, "0.1", "NOT_CERTIFIED_CHECKOUT");
+
+	}
+
+	@Test
+	public void testImportCheckoutAndUpdateUserResource() throws IOException {
+		String fileName = FILE_NAME_USER_COMPUTE;
+		RestResponse response = ImportRestUtils.importNormativeResourceByName(RESOURCE_NAME_USER_COMPUTE, UserRoleEnum.ADMIN);
+		Integer statusCode = response.getErrorCode();
+		assertTrue(statusCode == ImportRestUtils.STATUS_CODE_IMPORT_SUCCESS);
+		String uid = ResponseParser.getUniqueIdFromResponse(response);
+		validateMyComputeResource(uid, fileName, "1.0", "CERTIFIED");
+
+		response = ImportRestUtils.importNewResourceByName(RESOURCE_NAME_USER_COMPUTE, UserRoleEnum.DESIGNER);
+		statusCode = response.getErrorCode();
+		assertEquals("check response code after update resource", ImportRestUtils.STATUS_CODE_UPDATE_SUCCESS, statusCode.intValue());
+		uid = ResponseParser.getUniqueIdFromResponse(response);
+		validateMyComputeResource(uid, fileName, "1.1", "NOT_CERTIFIED_CHECKOUT");
+
+	}
+
+	@Test
+	public void importNormativeTypesTesterUserRole() throws Exception {
+		Integer statusCode = ImportRestUtils.importNormativeResourceByName(RESOURCE_NAME_MY_COMPUTE, UserRoleEnum.TESTER).getErrorCode();
+		assertTrue(statusCode == ImportRestUtils.RESTRICTED_OPERATION);
+	}
+
+	@Test
+	public void importNormativeTypesDesignerUserRole() throws Exception {
+		Integer statusCode = ImportRestUtils.importNormativeResourceByName(RESOURCE_NAME_MY_COMPUTE, UserRoleEnum.DESIGNER).getErrorCode();
+		assertTrue(statusCode == 409);
+	}
+
+}
diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/execute/imports/ImportToscaCapabilitiesWithProperties.java b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/execute/imports/ImportToscaCapabilitiesWithProperties.java
new file mode 100644
index 0000000000..0e1e59ce13
--- /dev/null
+++ b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/execute/imports/ImportToscaCapabilitiesWithProperties.java
@@ -0,0 +1,404 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * SDC
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.sdc.ci.tests.execute.imports;
+
+import com.google.gson.Gson;
+import org.apache.commons.codec.binary.Base64;
+import org.apache.commons.lang3.tuple.ImmutablePair;
+import org.junit.Rule;
+import org.junit.rules.TestName;
+import org.openecomp.sdc.be.dao.api.ActionStatus;
+import org.openecomp.sdc.be.datatypes.enums.ResourceTypeEnum;
+import org.openecomp.sdc.be.model.*;
+import org.openecomp.sdc.ci.tests.api.ComponentBaseTest;
+import org.openecomp.sdc.ci.tests.datatypes.ImportReqDetails;
+import org.openecomp.sdc.ci.tests.datatypes.ResourceReqDetails;
+import org.openecomp.sdc.ci.tests.datatypes.enums.UserRoleEnum;
+import org.openecomp.sdc.ci.tests.datatypes.http.RestResponse;
+import org.openecomp.sdc.ci.tests.utils.general.ElementFactory;
+import org.openecomp.sdc.ci.tests.utils.rest.BaseRestUtils;
+import org.openecomp.sdc.ci.tests.utils.rest.ResourceRestUtils;
+import org.openecomp.sdc.ci.tests.utils.rest.ResponseParser;
+import org.testng.annotations.Test;
+
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+import static org.testng.AssertJUnit.assertEquals;
+import static org.testng.AssertJUnit.assertTrue;
+
+/**
+ * US US730518 Story [BE] - TOSCA capabilities with properties - import "As a
+ * resource designer, I would like to add my VFC capabilities with properties."
+ * 
+ * @author ns019t
+ *
+ */
+public class ImportToscaCapabilitiesWithProperties extends ComponentBaseTest {
+	@Rule
+	public static TestName name = new TestName();
+
+	Gson gson = new Gson();
+
+	/**
+	 * String constants
+	 */
+	public static String propertyForTestName = "propertyfortest";
+	public static String rootPath = System.getProperty("user.dir");
+	public static String scalable = "tosca.capabilities.Scalable";
+	public static String container = "tosca.capabilities.Container";
+	public static String minInstances = "min_instances";
+	public static String userDefinedNodeYaml = "mycompute.yml";
+
+	/**
+	 * Capability Type - capability type on the graph should already have
+	 * properties modeled on it. please verify. The import of the capability
+	 * types should support adding those properties. when importing, validate
+	 * name uniqueness between the capability's properties see capability
+	 * tosca.capabilities.Container
+	 * 
+	 * Acceptance Criteria: validate capability type properties (for example,
+	 * compute have capability Container -> the properties of this capability
+	 * should be in the Json response)
+	 * 
+	 * @throws IOException
+	 */
+	@Test
+	public void validateCapabilityTypePropertiesSucceed() throws IOException {
+		User user = ElementFactory.getDefaultUser(UserRoleEnum.DESIGNER);
+		RestResponse createResourceRes = ResourceRestUtils.getResourceByNameAndVersion(user.getUserId(), "Compute",
+				"1.0");
+		BaseRestUtils.checkSuccess(createResourceRes);
+		Resource resource = ResponseParser.convertResourceResponseToJavaObject(createResourceRes.getResponse());
+		Map<String, List<CapabilityDefinition>> capabilities = resource.getCapabilities();
+		assertEquals(capabilities.size(), 6);
+
+		CapabilityDefinition capability = capabilities.get(scalable).get(0);
+		List<ComponentInstanceProperty> properties = capability.getProperties();
+		assertEquals(properties.size(), 3);
+		assertTrue(!properties.stream().filter(p -> p.getName().equalsIgnoreCase(propertyForTestName)).findAny()
+				.isPresent());
+
+		ComponentInstanceProperty originalProperty = properties.stream()
+				.filter(p -> p.getName().equalsIgnoreCase(minInstances)).findAny().get();
+		assertEquals(originalProperty.getType(), "integer");
+		assertEquals(originalProperty.getDefaultValue(), "1");
+
+		capability = capabilities.get(container).get(0);
+		properties = capability.getProperties();
+		assertEquals(properties.size(), 4);
+	}
+
+	/**
+	 * Capability Definition on VFC / CP / VL - properties can also be defined
+	 * on the capability when the capability is declared. (property definition
+	 * with default value) If the property name (case insensitive) already
+	 * defined on the capability type, it overrides the capability from the
+	 * capability type Import of VFC / CP /VL should support adding properties
+	 * to the capability. when importing, validate name uniqueness between the
+	 * capability's properties
+	 * 
+	 * Acceptance Criteria: import node type with capability definition on it.
+	 * use the attached "myCompute"
+	 * 
+	 * @throws Exception
+	 */
+	@Test
+	public void importNodeTypeWithCapabilityWithPropertiesFromYmlSucceed() throws Exception {
+		User sdncModifierDetails = ElementFactory.getDefaultUser(UserRoleEnum.DESIGNER);
+		ImportReqDetails resourceDetails = ElementFactory.getDefaultImportResource();
+		RestResponse createResource = importUserDefinedNodeType(userDefinedNodeYaml, sdncModifierDetails,
+				resourceDetails);
+		BaseRestUtils.checkCreateResponse(createResource);
+		Resource resource = ResponseParser.parseToObjectUsingMapper(createResource.getResponse(), Resource.class);
+
+		Map<String, List<CapabilityDefinition>> capabilities = resource.getCapabilities();
+		assertEquals(capabilities.size(), 6);
+
+		CapabilityDefinition capability = capabilities.get(scalable).get(0);
+		List<ComponentInstanceProperty> properties = capability.getProperties();
+		assertEquals(properties.size(), 4);
+
+		ComponentInstanceProperty newProperty = properties.stream()
+				.filter(p -> p.getName().equalsIgnoreCase(propertyForTestName)).findAny().get();
+		assertEquals(newProperty.getType(), "string");
+		assertEquals(newProperty.getDescription(), "test");
+		assertEquals(newProperty.getDefaultValue(), "success");
+
+		ComponentInstanceProperty overriddenProperty = properties.stream()
+				.filter(p -> p.getName().equalsIgnoreCase(minInstances)).collect(Collectors.toList()).get(0);
+		assertEquals(overriddenProperty.getType(), "integer");
+		assertEquals(overriddenProperty.getDefaultValue(), "3");
+
+	}
+
+	/**
+	 * importNodeTypeWithCapabilityWithPropertiesFromYmlFailed
+	 * 
+	 * @throws Exception
+	 */
+	@Test
+	public void importNodeTypeWithCapabilityWithPropertiesFromYmlFailed() throws Exception {
+		User sdncModifierDetails = ElementFactory.getDefaultUser(UserRoleEnum.DESIGNER);
+		ImportReqDetails resourceDetails = ElementFactory.getDefaultImportResource();
+		RestResponse createResource = importUserDefinedNodeType("mycompute_failed.yml", sdncModifierDetails,
+				resourceDetails);
+		BaseRestUtils.checkErrorMessageResponse(createResource, ActionStatus.PROPERTY_NAME_ALREADY_EXISTS);
+	}
+
+	/**
+	 * Capability Assignment (on node_template / resource instance) - should
+	 * support assignment of the property (property value). On the resource
+	 * instance level, value can be assigned to either properties that are
+	 * defined on the capability type or on the capability definition. When
+	 * importing a VF - the node_template can have capability's property value.
+	 * It should be imported and saved on the graph Acceptance Criteria: import
+	 * a VF that assign values to property of capability that was defined on the
+	 * capability type
+	 * 
+	 * @throws Exception
+	 */
+	@Test
+	public void importResourceWithCapabilityWithPropertiesOverridingCapTypePropertiesSucceed() throws Exception {
+		User sdncModifierDetails = ElementFactory.getDefaultUser(UserRoleEnum.DESIGNER);
+		String payloadName = "vf_with_cap_prop_override_cap_type_prop.csar";
+		ImportReqDetails resourceDetails = ElementFactory.getDefaultImportResource();
+		Path path = Paths.get(rootPath + "/src/test/resources/CI/csars/vf_with_cap_prop_override_cap_type_prop.csar");
+		byte[] data = Files.readAllBytes(path);
+		String payloadData = Base64.encodeBase64String(data);
+		resourceDetails.setPayloadData(payloadData);
+
+		resourceDetails.setPayloadName(payloadName);
+		resourceDetails.setResourceType(ResourceTypeEnum.VF.name());
+		RestResponse createResource = ResourceRestUtils.createResource(resourceDetails, sdncModifierDetails);
+		BaseRestUtils.checkCreateResponse(createResource);
+
+		List<ImmutablePair<String, String>> propertyNamesValues = new ArrayList<>();
+		propertyNamesValues.add(new ImmutablePair<String, String>("num_cpus", "2"));
+		propertyNamesValues.add(new ImmutablePair<String, String>("mem_size", "2000 MB"));
+		checkResource(createResource, 8, container, "DBMS", propertyNamesValues);
+
+		ResourceReqDetails resourceDetails2 = ElementFactory.getDefaultResource();
+		resourceDetails2.setCsarUUID("vf_with_cap_prop_override_cap_type_prop.csar");
+		resourceDetails2.setResourceType(ResourceTypeEnum.VF.name());
+		createResource = ResourceRestUtils.createResource(resourceDetails2, sdncModifierDetails);
+		BaseRestUtils.checkCreateResponse(createResource);
+
+		checkResource(createResource, 8, container, "DBMS", propertyNamesValues);
+	}
+
+	/**
+	 * importResourceWithCapabilityWithPropertiesOverridingCapTypePropertiesFailed
+	 * 
+	 * @throws Exception
+	 */
+	@Test
+	public void importResourceWithCapabilityWithPropertiesOverridingCapTypePropertiesFailed() throws Exception {
+		User sdncModifierDetails = ElementFactory.getDefaultUser(UserRoleEnum.DESIGNER);
+		String payloadName = "vf_with_cap_prop_override_cap_type_prop_failed.csar";
+		ImportReqDetails resourceDetails = ElementFactory.getDefaultImportResource();
+		Path path = Paths
+				.get(rootPath + "/src/test/resources/CI/csars/vf_with_cap_prop_override_cap_type_prop_failed.csar");
+		byte[] data = Files.readAllBytes(path);
+		String payloadData = Base64.encodeBase64String(data);
+		resourceDetails.setPayloadData(payloadData);
+
+		resourceDetails.setPayloadName(payloadName);
+		resourceDetails.setResourceType(ResourceTypeEnum.VF.name());
+		RestResponse createResource = ResourceRestUtils.createResource(resourceDetails, sdncModifierDetails);
+		BaseRestUtils.checkErrorMessageResponse(createResource, ActionStatus.INVALID_PROPERTY);
+
+		ResourceReqDetails resourceDetails2 = ElementFactory.getDefaultResource();
+		resourceDetails2.setCsarUUID("vf_with_cap_prop_override_cap_type_prop_failed.csar");
+		resourceDetails2.setResourceType(ResourceTypeEnum.VF.name());
+		createResource = ResourceRestUtils.createResource(resourceDetails2, sdncModifierDetails);
+		BaseRestUtils.checkErrorMessageResponse(createResource, ActionStatus.INVALID_PROPERTY);
+
+	}
+
+	/**
+	 * Capability Assignment (on node_template / resource instance) - should
+	 * support assignment of the property (property value). On the resource
+	 * instance level, value can be assigned to either properties that are
+	 * defined on the capability type or on the capability definition. When
+	 * importing a VF - the node_template can have capability's property value.
+	 * It should be imported and saved on the graph Acceptance Criteria: import
+	 * a VF that assign values to property of capability that was defined on the
+	 * capability definition (on the node type)
+	 * 
+	 * @throws Exception
+	 */
+	@Test
+	public void importResourceWithCapabilityWithPropertiesOverridingNodeTypeCapPropertiesSucceed() throws Exception {
+
+		User sdncModifierDetails = ElementFactory.getDefaultUser(UserRoleEnum.DESIGNER);
+		ImportReqDetails resourceDetails = ElementFactory.getDefaultImportResource();
+		RestResponse createResource = importUserDefinedNodeType(userDefinedNodeYaml, sdncModifierDetails,
+				resourceDetails);
+		BaseRestUtils.checkCreateResponse(createResource);
+		Resource userDefinedNodeType = ResponseParser.parseToObjectUsingMapper(createResource.getResponse(),
+				Resource.class);
+
+		String payloadName = "vf_with_cap_prop_override_cap_type_prop1.csar";
+		resourceDetails = ElementFactory.getDefaultImportResource();
+		Path path = Paths.get(rootPath + "/src/test/resources/CI/csars/vf_with_cap_prop_override_cap_type_prop1.csar");
+		byte[] data = Files.readAllBytes(path);
+		String payloadData = Base64.encodeBase64String(data);
+		resourceDetails.setPayloadData(payloadData);
+
+		resourceDetails.setPayloadName(payloadName);
+		resourceDetails.setResourceType(ResourceTypeEnum.VF.name());
+		createResource = ResourceRestUtils.createResource(resourceDetails, sdncModifierDetails);
+		BaseRestUtils.checkCreateResponse(createResource);
+
+		List<ImmutablePair<String, String>> propertyNamesValues = new ArrayList<>();
+		propertyNamesValues.add(new ImmutablePair<String, String>("num_cpus", "2"));
+		propertyNamesValues.add(new ImmutablePair<String, String>("mem_size", "2000 MB"));
+		checkResource(createResource, 8, container, "DBMS", propertyNamesValues);
+
+		List<ImmutablePair<String, String>> propertyNamesValues1 = new ArrayList<>();
+		propertyNamesValues1.add(new ImmutablePair<String, String>(propertyForTestName, "success_again"));
+		propertyNamesValues1.add(new ImmutablePair<String, String>(minInstances, "4"));
+		checkResource(createResource, 8, scalable, userDefinedNodeType.getName(), propertyNamesValues1);
+
+		ResourceReqDetails resourceDetails2 = ElementFactory.getDefaultResource();
+		resourceDetails2.setCsarUUID("vf_with_cap_prop_override_cap_type_prop1.csar");
+		resourceDetails2.setResourceType(ResourceTypeEnum.VF.name());
+		createResource = ResourceRestUtils.createResource(resourceDetails2, sdncModifierDetails);
+		BaseRestUtils.checkCreateResponse(createResource);
+
+		checkResource(createResource, 8, container, "DBMS", propertyNamesValues);
+		checkResource(createResource, 8, scalable, userDefinedNodeType.getName(), propertyNamesValues1);
+
+	}
+
+	/**
+	 * importResourceWithCapabilityWithPropertiesOverridingNodeTypeCapPropertiesFailed
+	 * 
+	 * @throws Exception
+	 */
+	@Test
+	public void importResourceWithCapabilityWithPropertiesOverridingNodeTypeCapPropertiesFailed() throws Exception {
+
+		User sdncModifierDetails = ElementFactory.getDefaultUser(UserRoleEnum.DESIGNER);
+		ImportReqDetails resourceDetails = ElementFactory.getDefaultImportResource();
+		RestResponse createResource = importUserDefinedNodeType(userDefinedNodeYaml, sdncModifierDetails,
+				resourceDetails);
+		BaseRestUtils.checkCreateResponse(createResource);
+
+		String payloadName = "vf_with_cap_prop_override_cap_type_prop1_failed.csar";
+		resourceDetails = ElementFactory.getDefaultImportResource();
+		Path path = Paths
+				.get(rootPath + "/src/test/resources/CI/csars/vf_with_cap_prop_override_cap_type_prop1_failed.csar");
+		byte[] data = Files.readAllBytes(path);
+		String payloadData = Base64.encodeBase64String(data);
+		resourceDetails.setPayloadData(payloadData);
+
+		resourceDetails.setPayloadName(payloadName);
+		resourceDetails.setResourceType(ResourceTypeEnum.VF.name());
+		createResource = ResourceRestUtils.createResource(resourceDetails, sdncModifierDetails);
+		BaseRestUtils.checkErrorResponse(createResource, ActionStatus.PROPERTY_NAME_ALREADY_EXISTS,
+				propertyForTestName);
+
+		ResourceReqDetails resourceDetails2 = ElementFactory.getDefaultResource();
+		resourceDetails2.setCsarUUID("vf_with_cap_prop_override_cap_type_prop1_failed.csar");
+		resourceDetails2.setResourceType(ResourceTypeEnum.VF.name());
+		createResource = ResourceRestUtils.createResource(resourceDetails2, sdncModifierDetails);
+		BaseRestUtils.checkErrorResponse(createResource, ActionStatus.PROPERTY_NAME_ALREADY_EXISTS,
+				propertyForTestName);
+	}
+
+	private RestResponse importUserDefinedNodeType(String payloadName, User sdncModifierDetails,
+			ImportReqDetails resourceDetails) throws Exception {
+
+		Path path = Paths.get(rootPath + "/src/test/resources/CI/csars/" + payloadName);
+		byte[] data = Files.readAllBytes(path);
+		String payloadData = Base64.encodeBase64String(data);
+		resourceDetails.setPayloadData(payloadData);
+
+		resourceDetails.setPayloadName(payloadName);
+		resourceDetails.setResourceType(ResourceTypeEnum.VFC.name());
+		return ResourceRestUtils.createResource(resourceDetails, sdncModifierDetails);
+	}
+
+	// TODO Tal: Since Cashing change partial resource returned that causes null
+	// pointer exception
+	// commented out till fixing
+	private void checkResource(RestResponse createResource, int capNum, String capType, String riName,
+			List<ImmutablePair<String, String>> propertyNamesValues) {
+		Resource resource = ResponseParser.parseToObjectUsingMapper(createResource.getResponse(), Resource.class);
+
+		Map<String, List<CapabilityDefinition>> capabilities = resource.getCapabilities();
+		// TODO Tal: Since Cashing change partial resource returned that causes
+		// null pointer exception
+		/* assertEquals(capabilities.size(), capNum); */
+		/*
+		 * List<CapabilityDefinition> capabilitesContainer =
+		 * capabilities.get(capType);
+		 */
+
+		ComponentInstance resourceRI = resource.getComponentInstances().stream()
+				.filter(ri -> ri.getComponentName().equals(riName)).collect(Collectors.toList()).get(0);
+		// TODO Tal: Since Cashing change partial resource returned that causes
+		// null pointer exception
+		/*
+		 * CapabilityDefinition capabilityFromContainer =
+		 * capabilitesContainer.stream()
+		 * .filter(cap->cap.getOwnerId().equals(resourceRI.getUniqueId())).
+		 * collect(Collectors.toList()).get(0);
+		 */
+
+		CapabilityDefinition capabilityFromRI = resourceRI.getCapabilities().get(capType).get(0);
+		for (ImmutablePair<String, String> propValuePair : propertyNamesValues) {
+			// TODO Tal: Since Cashing change partial resource returned that
+			// causes null pointer exception
+			/*
+			 * Map<String, ComponentInstanceProperty> propertiesFromContainer =
+			 * capabilityFromContainer.getProperties()
+			 * .stream().filter(p->p.getName().equalsIgnoreCase(propValuePair.
+			 * getLeft())) .collect(Collectors.toMap(p->p.getName(), p->p));
+			 */
+
+			List<ComponentInstanceProperty> propertiesFromRI = capabilityFromRI.getProperties().stream()
+					.filter(p -> p.getName().equalsIgnoreCase(propValuePair.getLeft())).collect(Collectors.toList());
+			// TODO Tal: Since Cashing change partial resource returned that
+			// causes null pointer exception
+			/*
+			 * for(ComponentInstanceProperty riProp : propertiesFromRI){
+			 * assertTrue(propertiesFromContainer.containsKey(riProp.getName()))
+			 * ; ComponentInstanceProperty containerProp =
+			 * propertiesFromContainer.get(riProp.getName());
+			 * assertEquals(riProp.getValue(), containerProp.getValue());
+			 * if(riProp.getName().equals(propValuePair.getLeft()))
+			 * assertEquals(riProp.getValue(), propValuePair.getRight());
+			 * 
+			 * }
+			 */
+		}
+	}
+
+}
diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/execute/inputs/InputsApiTests.java b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/execute/inputs/InputsApiTests.java
new file mode 100644
index 0000000000..292e478884
--- /dev/null
+++ b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/execute/inputs/InputsApiTests.java
@@ -0,0 +1,361 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * SDC
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.sdc.ci.tests.execute.inputs;
+
+import static org.testng.AssertJUnit.assertTrue;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.databind.DeserializationFeature;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.google.gson.Gson;
+import com.google.gson.GsonBuilder;
+import com.google.gson.reflect.TypeToken;
+
+import java.io.IOException;
+import java.lang.reflect.Type;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+import fj.data.Either;
+import org.apache.commons.lang3.tuple.Pair;
+import org.junit.Rule;
+import org.junit.rules.TestName;
+import org.openecomp.sdc.be.datatypes.enums.ComponentTypeEnum;
+import org.openecomp.sdc.be.datatypes.enums.ResourceTypeEnum;
+import org.openecomp.sdc.be.model.Component;
+import org.openecomp.sdc.be.model.ComponentInstInputsMap;
+import org.openecomp.sdc.be.model.ComponentInstance;
+import org.openecomp.sdc.be.model.ComponentInstancePropInput;
+import org.openecomp.sdc.be.model.InputDefinition;
+import org.openecomp.sdc.be.model.PropertyConstraint;
+import org.openecomp.sdc.be.model.PropertyDefinition;
+import org.openecomp.sdc.be.model.Resource;
+import org.openecomp.sdc.be.model.Service;
+import org.openecomp.sdc.be.model.User;
+import org.openecomp.sdc.be.model.operations.impl.PropertyOperation;
+import org.openecomp.sdc.ci.tests.api.ComponentBaseTest;
+import org.openecomp.sdc.ci.tests.datatypes.PropertyReqDetails;
+import org.openecomp.sdc.ci.tests.datatypes.ServiceReqDetails;
+import org.openecomp.sdc.ci.tests.datatypes.enums.LifeCycleStatesEnum;
+import org.openecomp.sdc.ci.tests.datatypes.enums.UserRoleEnum;
+import org.openecomp.sdc.ci.tests.datatypes.http.RestResponse;
+import org.openecomp.sdc.ci.tests.utils.general.AtomicOperationUtils;
+import org.openecomp.sdc.ci.tests.utils.general.ElementFactory;
+import org.openecomp.sdc.ci.tests.utils.rest.BaseRestUtils;
+import org.openecomp.sdc.ci.tests.utils.rest.ComponentInstanceRestUtils;
+import org.openecomp.sdc.ci.tests.utils.rest.InputsRestUtils;
+import org.openecomp.sdc.ci.tests.utils.rest.PropertyRestUtils;
+import org.openecomp.sdc.ci.tests.utils.rest.ResponseParser;
+import org.openecomp.sdc.ci.tests.utils.rest.ServiceRestUtils;
+import org.openecomp.sdc.ci.tests.utils.validation.BaseValidationUtils;
+import org.testng.AssertJUnit;
+import org.testng.annotations.Test;
+
+/**
+ * CI-Tests for inputs
+ * @author il0695
+ *
+ */
+public class InputsApiTests extends ComponentBaseTest {
+
+	private static String inputCsar1 = "FCGI_with_inputs.csar";
+	private static String inputCsar2 = "LDSA1_with_inputs.csar";
+	private static User  sdncDesignerDetails = null;
+
+	@Rule
+	public static TestName name = new TestName();
+
+	/**
+	 * Constructor
+	 */
+	public InputsApiTests() {
+		super();
+		sdncDesignerDetails = ElementFactory.getDefaultUser(UserRoleEnum.DESIGNER);
+	}
+
+	/**
+	 * Create VF with inputs from CSAR file
+	 *
+	 * @throws Exception
+	 */
+	@Test
+	public void testCreateResourceInstanceWithInputsFromCsar() throws Exception {
+		Resource vf = AtomicOperationUtils.importResourceFromCsar(ResourceTypeEnum.VF, UserRoleEnum.DESIGNER, inputCsar1);
+		assertTrue("Success creating VF from CSAR", !vf.getInputs().isEmpty());
+	}
+
+	/**
+	 * Create service and add to it VF instance with inputs
+	 *
+	 * @throws Exception
+	 */
+	@Test
+	public void testAddVfInstanceWithInputsToService() throws Exception {
+		createServiceWithVFInstanceWithInputs();
+	}
+
+	/**
+	 * General test to check most functionality of inputs
+	 * <ul>
+	 * 	<li>Create service with VF instance that has inputs)</li>
+	 * 	<li>Get all inputs of VF instance</li>
+	 * 	<li>Add inputs to service</li>
+	 * 	<li>Get service inputs</li>
+	 * 	<li>Delete service inputs</li>
+	 * </ul>
+	 *
+	 * @throws Exception
+	 */
+	@Test
+	public void testInputsMainFunctionality() throws Exception {
+		Service service = createServiceWithVFInstanceWithInputs();
+		int totalInputsBeforeAdd = service.getInputs().size();
+
+		// Get component instances
+		RestResponse getInstancesResponse = ComponentInstanceRestUtils.getComponentInstances(ComponentTypeEnum.SERVICE, service.getUniqueId(), sdncDesignerDetails);
+		BaseValidationUtils.checkSuccess(getInstancesResponse);
+		List<ComponentInstance> serviceInstances = new Gson().fromJson(getInstancesResponse.getResponse(), new TypeToken<ArrayList<ComponentInstance>>(){}.getType());
+
+		// Get all inputs of first instance
+		ComponentInstance vfInstance = serviceInstances.get(0);
+		RestResponse getComponentInstanceInputsResponse = InputsRestUtils.getComponentInstanceInputs(service, vfInstance);
+		BaseValidationUtils.checkSuccess(getComponentInstanceInputsResponse);
+		List<ComponentInstancePropInput> instanceInputs = new Gson().fromJson(getComponentInstanceInputsResponse.getResponse(), new TypeToken<ArrayList<ComponentInstancePropInput>>(){}.getType());
+
+		// Take only the 2 first inputs
+		List<ComponentInstancePropInput> inputsToAdd = instanceInputs.stream().limit(2).collect(Collectors.toList());
+
+		// Build component instances input map to add to server
+		ComponentInstInputsMap buildComponentInstInputsMap = buildComponentInstInputsMap(vfInstance.getUniqueId(), inputsToAdd);
+		RestResponse addInputResponse = InputsRestUtils.addInput(service, buildComponentInstInputsMap, UserRoleEnum.DESIGNER);
+		BaseValidationUtils.checkSuccess(addInputResponse);
+
+		// Get service inputs count
+		RestResponse getComponentInputsResponse = InputsRestUtils.getComponentInputs(service);
+		BaseValidationUtils.checkSuccess(getComponentInputsResponse);
+		List<InputDefinition> serviceInputsAfterAdd = new Gson().fromJson(getComponentInputsResponse.getResponse(), new TypeToken<ArrayList<InputDefinition>>(){}.getType());
+		if (serviceInputsAfterAdd.size()-totalInputsBeforeAdd!=2) {
+			assertTrue("Error adding inputs to service (service should have 2 inputs)", false);
+		}
+
+		// Delete 1 input from service
+		RestResponse deleteInputFromComponentResponse = InputsRestUtils.deleteInputFromComponent(service, serviceInputsAfterAdd.get(0).getUniqueId());
+		BaseValidationUtils.checkSuccess(deleteInputFromComponentResponse);
+
+		// Get service inputs count after delete
+		RestResponse getComponentInputsResponseAfterDelete = InputsRestUtils.getComponentInputs(service);
+		BaseValidationUtils.checkSuccess(getComponentInputsResponseAfterDelete);
+		List<InputDefinition> serviceInputsAfterDelete = new Gson().fromJson(getComponentInputsResponseAfterDelete.getResponse(), new TypeToken<ArrayList<InputDefinition>>(){}.getType());
+		if (serviceInputsAfterDelete.size()-totalInputsBeforeAdd!=1) {
+			assertTrue("Error deleting inputs from service (service should have 1 input)", false);
+		}
+
+		assertTrue("Success testing inputs main functionality", true);
+	}
+
+	/**
+	 * Private method to create service with VF instance that has inputs
+	 * This is private method to be used by multiple tests
+	 *
+	 * @return {@link org.openecomp.sdc.be.model}
+	 * @throws Exception
+	 * @throws IOException
+	 */
+	private Service createServiceWithVFInstanceWithInputs() throws Exception, IOException {
+		// Create default service
+		Either<Service, RestResponse> createDefaultServiceEither = AtomicOperationUtils.createDefaultService(UserRoleEnum.DESIGNER, true);
+		if (createDefaultServiceEither.isRight()){
+			assertTrue("Error creating default service", false);
+		}
+		Service service = createDefaultServiceEither.left().value();
+
+		// Create VF from CSAR file
+		Resource vfWithInputs = AtomicOperationUtils.importResourceFromCsar(ResourceTypeEnum.VF, UserRoleEnum.DESIGNER, inputCsar2);
+
+		// Certify VF
+		Pair<Component, RestResponse> changeComponentState = AtomicOperationUtils.changeComponentState(vfWithInputs, UserRoleEnum.DESIGNER, LifeCycleStatesEnum.CERTIFY, true);
+		assertTrue("response code is BaseRestUtils.STATUS_CODE_SUCCESS, returned :" + changeComponentState.getRight().getErrorCode(), changeComponentState.getRight().getErrorCode() == BaseRestUtils.STATUS_CODE_SUCCESS);
+
+		// Add VF instance to service
+		Either<ComponentInstance, RestResponse> addComponentInstanceToComponentContainerEither = AtomicOperationUtils.addComponentInstanceToComponentContainer(vfWithInputs, service, UserRoleEnum.DESIGNER, true);
+		if (addComponentInstanceToComponentContainerEither.isRight()){
+			assertTrue("Error adding VF to service", false);
+		}
+
+		// Get service response
+		ServiceReqDetails serviceDetails = new ServiceReqDetails(service);
+		RestResponse getServiceResponse = ServiceRestUtils.getService(serviceDetails, ElementFactory.getDefaultUser(UserRoleEnum.DESIGNER));
+		service = ResponseParser.parseToObjectUsingMapper(getServiceResponse.getResponse(), Service.class);
+
+		// Get VF instance from service
+		ComponentInstance vfInstance = service.getComponentInstances().get(0);
+		if (vfInstance!=null){
+			assertTrue("Success creating service with VF instance", true);
+		} else {
+			assertTrue("Error creating service with VF instance", false);
+		}
+		return service;
+	}
+
+	/**
+	 * Return default ComponentInstInputsMap
+	 *
+	 * @param addToInput
+	 * @param inputs
+	 * @return {@link org.openecomp.sdc.be.model.ComponentInstInputsMap}
+	 */
+	private ComponentInstInputsMap buildComponentInstInputsMap (String addToInput, List<ComponentInstancePropInput> inputs) {
+		Map<String, List<ComponentInstancePropInput>> map = new HashMap<>();
+		map.put(addToInput, inputs);
+		ComponentInstInputsMap componentInstInputsMap = new ComponentInstInputsMap();
+		componentInstInputsMap.setComponentInstanceInputsMap(map);
+		return componentInstInputsMap;
+	}
+
+
+	@Test
+	public void validateValidValueConstraintOnInputFailTest() throws Exception {
+		Either<Service, RestResponse> createDefaultServiceEither = AtomicOperationUtils.createDefaultService(UserRoleEnum.DESIGNER, true);
+		if (createDefaultServiceEither.isRight()){
+			assertTrue("Error creating default service", false);
+		}
+		Service service = createDefaultServiceEither.left().value();
+
+		String body = "{\"SubnetProp\": {\"schema\": {\"property\": {\"type\": \"\"}},\"type\": \"org.openecomp"
+				+ ".datatypes.heat.network.neutron.Subnet\",\"name\": \"SubnetProp\"}}";
+		RestResponse createPropertyResponse = PropertyRestUtils.createProperty(service.getUniqueId(), body,
+				sdncDesignerDetails);
+		AssertJUnit.assertEquals("Expected result code - 200, received - " + createPropertyResponse.getErrorCode(), 200,
+				(int) createPropertyResponse.getErrorCode());
+
+		ObjectMapper mapper = new ObjectMapper();
+		mapper.setSerializationInclusion(JsonInclude.Include.NON_NULL);
+		mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
+		PropertyReqDetails propertyResponseObject = mapper.readValue(createPropertyResponse.getResponse(),
+				PropertyReqDetails.class);
+
+		PropertyDefinition input = new PropertyDefinition();
+		input.setName("ipv6_address_mode");
+		input.setType("string");
+		input.setUniqueId("org.openecomp.datatypes.heat.network.neutron.Subnet.datatype.ipv6_address_mode");
+
+		ComponentInstancePropInput componentInstancePropInput = new ComponentInstancePropInput();
+		componentInstancePropInput.setPropertiesName("SubnetProp#ipv6_address_mode");
+		componentInstancePropInput.setName("SubnetProp");
+		componentInstancePropInput.setParentUniqueId(service.getUniqueId());
+		componentInstancePropInput.setType("org.openecomp.datatypes.heat.network.neutron.Subnet");
+		componentInstancePropInput.setUniqueId(propertyResponseObject.getUniqueId());
+		componentInstancePropInput.setInput(input);
+
+		ComponentInstInputsMap componentInstInputsMap = new ComponentInstInputsMap();
+		componentInstInputsMap.setServiceProperties(Collections.singletonMap(service.getUniqueId(),
+				Collections.singletonList(componentInstancePropInput)));
+		RestResponse addInputResponse = InputsRestUtils.addInput(service, componentInstInputsMap,
+				UserRoleEnum.DESIGNER);
+
+		AssertJUnit.assertEquals("Expected result code - 200, received - " + addInputResponse.getErrorCode(),
+				200, (int) addInputResponse.getErrorCode());
+
+		Type constraintType = new TypeToken<PropertyConstraint>() {}.getType();
+		Type inDefType = new TypeToken<List<InputDefinition>>() { }.getType();
+		Gson gson = new GsonBuilder().registerTypeAdapter(constraintType, new PropertyOperation.PropertyConstraintDeserialiser()).create();
+		try {
+			List<InputDefinition> inputDefinitions = gson.fromJson(addInputResponse.getResponse(),
+					inDefType);
+
+			inputDefinitions.get(0).setDefaultValue("Fail");
+
+			RestResponse updateInputResponse = InputsRestUtils.updateInput(service, mapper.writeValueAsString(inputDefinitions),
+					UserRoleEnum.DESIGNER);
+
+			AssertJUnit.assertEquals("Expected result code - 400, received - " + addInputResponse.getErrorCode(),
+					400, (int) updateInputResponse.getErrorCode());
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
+	}
+
+	@Test
+	public void validateValidValueConstraintOnInputSuccessTest() throws Exception {
+		Either<Service, RestResponse> createDefaultServiceEither = AtomicOperationUtils.createDefaultService(UserRoleEnum.DESIGNER, true);
+		if (createDefaultServiceEither.isRight()){
+			assertTrue("Error creating default service", false);
+		}
+		Service service = createDefaultServiceEither.left().value();
+
+		String body = "{\"SubnetProp\": {\"schema\": {\"property\": {\"type\": \"\"}},\"type\": \"org.openecomp"
+				+ ".datatypes.heat.network.neutron.Subnet\",\"name\": \"SubnetProp\"}}";
+		RestResponse createPropertyResponse = PropertyRestUtils.createProperty(service.getUniqueId(), body,
+				sdncDesignerDetails);
+		AssertJUnit.assertEquals("Expected result code - 200, received - " + createPropertyResponse.getErrorCode(), 200,
+				(int) createPropertyResponse.getErrorCode());
+
+		ObjectMapper mapper = new ObjectMapper();
+		mapper.setSerializationInclusion(JsonInclude.Include.NON_NULL);
+		mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
+		PropertyReqDetails propertyResponseObject = mapper.readValue(createPropertyResponse.getResponse(),
+				PropertyReqDetails.class);
+
+		PropertyDefinition input = new PropertyDefinition();
+		input.setName("ipv6_address_mode");
+		input.setType("string");
+		input.setUniqueId("org.openecomp.datatypes.heat.network.neutron.Subnet.datatype.ipv6_address_mode");
+
+		ComponentInstancePropInput componentInstancePropInput = new ComponentInstancePropInput();
+		componentInstancePropInput.setPropertiesName("SubnetProp#ipv6_address_mode");
+		componentInstancePropInput.setName("SubnetProp");
+		componentInstancePropInput.setParentUniqueId(service.getUniqueId());
+		componentInstancePropInput.setType("org.openecomp.datatypes.heat.network.neutron.Subnet");
+		componentInstancePropInput.setUniqueId(propertyResponseObject.getUniqueId());
+		componentInstancePropInput.setInput(input);
+
+		ComponentInstInputsMap componentInstInputsMap = new ComponentInstInputsMap();
+		componentInstInputsMap.setServiceProperties(Collections.singletonMap(service.getUniqueId(),
+				Collections.singletonList(componentInstancePropInput)));
+		RestResponse addInputResponse = InputsRestUtils.addInput(service, componentInstInputsMap,
+				UserRoleEnum.DESIGNER);
+
+		AssertJUnit.assertEquals("Expected result code - 200, received - " + addInputResponse.getErrorCode(),
+				200, (int) addInputResponse.getErrorCode());
+
+		Type constraintType = new TypeToken<PropertyConstraint>() {}.getType();
+		Type inDefType = new TypeToken<List<InputDefinition>>() { }.getType();
+		Gson gson = new GsonBuilder().registerTypeAdapter(constraintType, new PropertyOperation.PropertyConstraintDeserialiser()).create();
+		try {
+			List<InputDefinition> inputDefinitions = gson.fromJson(addInputResponse.getResponse(),
+					inDefType);
+
+			inputDefinitions.get(0).setDefaultValue("slaac");
+
+			RestResponse updateInputResponse = InputsRestUtils.updateInput(service, mapper.writeValueAsString(inputDefinitions),
+					UserRoleEnum.DESIGNER);
+
+			AssertJUnit.assertEquals("Expected result code - 200, received - " + addInputResponse.getErrorCode(),
+					200, (int) updateInputResponse.getErrorCode());
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
+	}
+}
diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/execute/interfaceoperation/InterfaceOperationsTest.java b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/execute/interfaceoperation/InterfaceOperationsTest.java
new file mode 100644
index 0000000000..764a147d14
--- /dev/null
+++ b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/execute/interfaceoperation/InterfaceOperationsTest.java
@@ -0,0 +1,397 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * SDC
+ * ================================================================================
+ * 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=========================================================
+ */
+
+package org.openecomp.sdc.ci.tests.execute.interfaceoperation;
+
+import static org.testng.AssertJUnit.fail;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.databind.ObjectMapper;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import fj.data.Either;
+import org.apache.commons.collections4.CollectionUtils;
+import org.junit.Rule;
+import org.junit.rules.TestName;
+import org.openecomp.sdc.be.datatypes.elements.ListDataDefinition;
+import org.openecomp.sdc.be.datatypes.elements.OperationInputDefinition;
+import org.openecomp.sdc.be.datatypes.elements.OperationOutputDefinition;
+import org.openecomp.sdc.be.datatypes.enums.ComponentTypeEnum;
+import org.openecomp.sdc.be.datatypes.enums.ResourceTypeEnum;
+import org.openecomp.sdc.be.model.InputDefinition;
+import org.openecomp.sdc.be.model.InterfaceDefinition;
+import org.openecomp.sdc.be.model.Operation;
+import org.openecomp.sdc.be.model.PropertyDefinition;
+import org.openecomp.sdc.be.model.Resource;
+import org.openecomp.sdc.be.model.Service;
+import org.openecomp.sdc.be.model.User;
+import org.openecomp.sdc.ci.tests.api.ComponentBaseTest;
+import org.openecomp.sdc.ci.tests.datatypes.enums.UserRoleEnum;
+import org.openecomp.sdc.ci.tests.datatypes.http.RestResponse;
+import org.openecomp.sdc.ci.tests.utils.general.AtomicOperationUtils;
+import org.openecomp.sdc.ci.tests.utils.general.ElementFactory;
+import org.openecomp.sdc.ci.tests.utils.rest.BaseRestUtils;
+import org.openecomp.sdc.ci.tests.utils.rest.InterfaceOperationsRestUtils;
+import org.openecomp.sdc.ci.tests.utils.rest.ResponseParser;
+import org.openecomp.sdc.ci.tests.utils.rest.ServiceRestUtils;
+import org.testng.Assert;
+import org.testng.annotations.BeforeClass;
+import org.testng.annotations.Test;
+
+public class InterfaceOperationsTest extends ComponentBaseTest {
+
+    @Rule
+    private static final TestName name = new TestName();
+    private static final String INTERFACES = "interfaces";
+    private static final String TOSCA_PRESENTATION = "toscaPresentation";
+    private static final User user = ElementFactory.getDefaultUser(UserRoleEnum.DESIGNER);
+    private static final String WORKFLOW_ID_STR = "WorkflowId";
+    private static final String WORKFLOW_VERSION_ID_STR = "workflowVersionId";
+    private static final String WORKFLOW_ASSOCIATION_TYPE_NONE_STR = "NONE";
+
+    private static Service service;
+    private static Resource resource;
+    private static Resource pnfResource;
+    private String resourceInterfaceUniqueId;
+    private String resourceOperationUniqueId;
+    private String pnfResourceInterfaceUniqueId;
+    private String pnfResourceOperationUniqueId;
+    private String serviceInterfaceUniqueId;
+    private String serviceOperationUniqueId;
+
+    @BeforeClass
+    public static void init() throws Exception {
+        // Create default service
+        Either<Service, RestResponse> createDefaultServiceEither =
+                AtomicOperationUtils.createDefaultService(UserRoleEnum.DESIGNER, true);
+        if (createDefaultServiceEither.isRight()) {
+            fail("Error creating default service");
+        }
+        service = createDefaultServiceEither.left().value();
+
+        // Create default resource
+        Either<Resource, RestResponse> createDefaultResourceEither =
+                AtomicOperationUtils.createResourceByType(ResourceTypeEnum.VF, UserRoleEnum.DESIGNER, true);
+        if (createDefaultResourceEither.isRight()) {
+            fail("Error creating default resource");
+        }
+        resource = createDefaultResourceEither.left().value();
+
+        // Create default PNF resource
+        Either<Resource, RestResponse> createDefaultPNFResourceEither =
+                AtomicOperationUtils.createResourceByType(ResourceTypeEnum.PNF, UserRoleEnum.DESIGNER, true);
+        if (createDefaultPNFResourceEither.isRight()) {
+            fail("Error creating default pnf resource");
+        }
+        pnfResource = createDefaultPNFResourceEither.left().value();
+    }
+
+    public Map<String, Object> buildInterfaceDefinitionForResource(Resource resource,
+                                                                    String resourceInterfaceUniqueId,
+                                                                    String resourceOperationUniqueId) {
+        Operation operation = new Operation();
+        operation.setName("TestOperationOnResource");
+        operation.setWorkflowId(WORKFLOW_ID_STR);
+        operation.setWorkflowVersionId(WORKFLOW_VERSION_ID_STR);
+        operation.setWorkflowAssociationType(WORKFLOW_ASSOCIATION_TYPE_NONE_STR);
+        if(CollectionUtils.isNotEmpty(resource.getInputs())){
+            PropertyDefinition property =
+                    resource.getInputs().stream().filter(a -> a.getName().equalsIgnoreCase("nf_naming")).findFirst()
+                            .orElse(new InputDefinition());
+            ListDataDefinition<OperationInputDefinition> operationInputDefinitionList = new ListDataDefinition<>();
+            operationInputDefinitionList.add(createOperationInputDefinition("TestInput1", property.getUniqueId()));
+            operation.setInputs(operationInputDefinitionList);
+        }
+        ListDataDefinition<OperationOutputDefinition> operationOutputDefinitionList = new ListDataDefinition<>();
+        operationOutputDefinitionList.add(createOperationOutputDefinition("TestOutput1"));
+        operation.setOutputs(operationOutputDefinitionList);
+        return buildInterfaceDefinitionMap(operation, "TestInterface", resourceInterfaceUniqueId,
+                resourceOperationUniqueId);
+    }
+
+    private Map<String, Object> buildInterfaceDefinitionOfGlobalTypeForResource(Resource resource) {
+        Operation operation = new Operation();
+        operation.setName("create");
+        operation.setWorkflowId(WORKFLOW_ID_STR);
+        operation.setWorkflowVersionId(WORKFLOW_VERSION_ID_STR);
+        operation.setWorkflowAssociationType("NONE");
+        if(CollectionUtils.isNotEmpty(resource.getInputs())){
+            PropertyDefinition property =
+                    resource.getInputs().stream().filter(a -> a.getName().equalsIgnoreCase("nf_naming")).findFirst()
+                            .orElse(new InputDefinition());
+            ListDataDefinition<OperationInputDefinition> operationInputDefinitionList = new ListDataDefinition<>();
+            operationInputDefinitionList.add(createOperationInputDefinition("TestInput1", property.getUniqueId()));
+            operation.setInputs(operationInputDefinitionList);
+        }
+        ListDataDefinition<OperationOutputDefinition> operationOutputDefinitionList = new ListDataDefinition<>();
+        operationOutputDefinitionList.add(createOperationOutputDefinition("TestOutput1"));
+        operation.setOutputs(operationOutputDefinitionList);
+        return buildInterfaceDefinitionMap(operation, "tosca.interfaces.node.lifecycle.Standard",
+                resourceInterfaceUniqueId, resourceOperationUniqueId);
+    }
+
+    private OperationInputDefinition createOperationInputDefinition(String name, String inputId) {
+        OperationInputDefinition operationInputDefinition = new OperationInputDefinition();
+        operationInputDefinition.setName(name);
+        operationInputDefinition.setInputId(inputId);
+        operationInputDefinition.setRequired(true);
+        operationInputDefinition.setType("string");
+        return operationInputDefinition;
+    }
+
+    private OperationOutputDefinition createOperationOutputDefinition(String name) {
+        OperationOutputDefinition operationOutputDefinition = new OperationOutputDefinition();
+        operationOutputDefinition.setName(name);
+        operationOutputDefinition.setRequired(true);
+        operationOutputDefinition.setType("string");
+        return operationOutputDefinition;
+    }
+
+    private Map<String, Object> buildInterfaceDefinitionMap(Operation operation, String interfaceType,
+                                                            String interfaceId,
+                                                            String operationId) {
+        if (operationId != null) {
+            operation.setUniqueId(operationId);
+        }
+        Map<String, Operation> operationMap = new HashMap<>();
+        operationMap.put(operation.getName(), operation);
+
+        InterfaceDefinition interfaceDefinition = new InterfaceDefinition();
+        interfaceDefinition.setType(interfaceType);
+        interfaceDefinition.setOperationsMap(operationMap);
+        if (interfaceId != null) {
+            interfaceDefinition.setUniqueId(interfaceId);
+        }
+        interfaceDefinition.setOperationsMap(operationMap);
+
+        Map<String, Object> interfaceDefAsMap = getObjectAsMap(interfaceDefinition);
+        Map<String, Object> interfaceMap = new HashMap<>();
+        interfaceMap.put(interfaceDefinition.getType(), interfaceDefAsMap);
+        Map<String, Object> outerMap = new HashMap<>();
+        outerMap.put(INTERFACES, interfaceMap);
+        return outerMap;
+    }
+
+    private static Map<String, Object> getObjectAsMap(Object obj) {
+        ObjectMapper objectMapper = new ObjectMapper();
+        if (obj instanceof InterfaceDefinition) {
+            objectMapper.setSerializationInclusion(JsonInclude.Include.NON_NULL);
+        }
+        Map<String, Object> objectAsMap =
+                obj instanceof Map ? (Map<String, Object>) obj : objectMapper.convertValue(obj, Map.class);
+        objectAsMap.remove(TOSCA_PRESENTATION);
+        return objectAsMap;
+    }
+
+    public Map<String, Object> buildInterfaceDefinitionForService() {
+        Operation operation = new Operation();
+        operation.setName("TestOperationOnService");
+        operation.setWorkflowId(WORKFLOW_ID_STR);
+        operation.setWorkflowVersionId(WORKFLOW_VERSION_ID_STR);
+        operation.setWorkflowAssociationType("NONE");
+        return buildInterfaceDefinitionMap(operation, "TestInterface", serviceInterfaceUniqueId,
+                serviceOperationUniqueId);
+    }
+
+    @Test
+    public void addInterfaceOperationsOnResource() throws Exception {
+        RestResponse restResponse = InterfaceOperationsRestUtils
+                .addInterfaceOperations(resource,
+                        buildInterfaceDefinitionForResource(resource, resourceInterfaceUniqueId,
+                                resourceOperationUniqueId), user);
+        logger.info("addInterfaceOperationsOnResource Response Code:" + restResponse.getErrorCode());
+        Assert.assertEquals((int) restResponse.getErrorCode(), BaseRestUtils.STATUS_CODE_SUCCESS);
+        String interfaceDefinitionStr = ResponseParser.getListFromJson(restResponse, INTERFACES).get(0).toString();
+        InterfaceDefinition interfaceDefinition =
+                ResponseParser.convertInterfaceDefinitionResponseToJavaObject(interfaceDefinitionStr);
+        resourceInterfaceUniqueId = interfaceDefinition.getUniqueId();
+        resourceOperationUniqueId = interfaceDefinition.getOperationsMap().keySet().stream().findFirst().orElse(null);
+    }
+
+    @Test(dependsOnMethods = "addInterfaceOperationsOnResource")
+    public void getInterfaceOperationsFromResource() throws Exception {
+        RestResponse restResponse = InterfaceOperationsRestUtils
+                .getInterfaceOperations(resource, resourceInterfaceUniqueId,
+                        resourceOperationUniqueId, user);
+        logger.info("getInterfaceOperationsFromResource Response Code:" + restResponse.getErrorCode());
+        Assert.assertEquals((int) restResponse.getErrorCode(), BaseRestUtils.STATUS_CODE_SUCCESS);
+    }
+
+    @Test(dependsOnMethods = "getInterfaceOperationsFromResource")
+    public void updateInterfaceOperationsOnResource() throws Exception {
+        RestResponse restResponse = InterfaceOperationsRestUtils
+                .updateInterfaceOperations(resource,
+                        buildInterfaceDefinitionForResource(resource, resourceInterfaceUniqueId, resourceOperationUniqueId),
+                        user);
+        logger.info("updateInterfaceOperationsOnResource Response Code:" + restResponse.getErrorCode());
+        Assert.assertEquals((int) restResponse.getErrorCode(), BaseRestUtils.STATUS_CODE_SUCCESS);
+    }
+
+    @Test(dependsOnMethods = "updateInterfaceOperationsOnResource")
+    public void deleteInterfaceOperationsFromResource() throws Exception {
+        RestResponse restResponse = InterfaceOperationsRestUtils
+                .deleteInterfaceOperations(resource, resourceInterfaceUniqueId,
+                        resourceOperationUniqueId, user);
+        logger.info("deleteInterfaceOperationsFromResource Response Code:" + restResponse.getErrorCode());
+        Assert.assertEquals((int) restResponse.getErrorCode(), BaseRestUtils.STATUS_CODE_SUCCESS);
+    }
+
+    @Test
+    public void addInterfaceOperationsOnPNFResource() throws Exception {
+        RestResponse restResponse = InterfaceOperationsRestUtils
+                .addInterfaceOperations(pnfResource, buildInterfaceDefinitionForResource(pnfResource, pnfResourceInterfaceUniqueId,
+                        pnfResourceOperationUniqueId), user);
+        logger.info("addInterfaceOperationsOnPNFResource Response Code:" + restResponse.getErrorCode());
+        Assert.assertEquals((int) restResponse.getErrorCode(), BaseRestUtils.STATUS_CODE_SUCCESS);
+        String interfaceDefinitionStr = ResponseParser.getListFromJson(restResponse, INTERFACES).get(0).toString();
+        InterfaceDefinition interfaceDefinition =
+                ResponseParser.convertInterfaceDefinitionResponseToJavaObject(interfaceDefinitionStr);
+        pnfResourceInterfaceUniqueId = interfaceDefinition.getUniqueId();
+        pnfResourceOperationUniqueId =
+                interfaceDefinition.getOperationsMap().keySet().stream().findFirst().orElse(null);
+    }
+
+    @Test(dependsOnMethods = "addInterfaceOperationsOnPNFResource")
+    public void getInterfaceOperationsFromPNFResource() throws Exception {
+        RestResponse restResponse = InterfaceOperationsRestUtils
+                .getInterfaceOperations(pnfResource, pnfResourceInterfaceUniqueId,
+                        pnfResourceOperationUniqueId, user);
+        logger.info("getInterfaceOperationsFromPNFResource Response Code:" + restResponse.getErrorCode());
+        Assert.assertEquals((int) restResponse.getErrorCode(), BaseRestUtils.STATUS_CODE_SUCCESS);
+    }
+
+    @Test(dependsOnMethods = "getInterfaceOperationsFromPNFResource")
+    public void updateInterfaceOperationsOnPNFResource() throws Exception {
+        RestResponse restResponse = InterfaceOperationsRestUtils
+                .updateInterfaceOperations(pnfResource,
+                        buildInterfaceDefinitionForResource(pnfResource, pnfResourceInterfaceUniqueId,
+                                pnfResourceOperationUniqueId), user);
+        logger.info("updateInterfaceOperationsOnPNFResource Response Code:" + restResponse.getErrorCode());
+        Assert.assertEquals((int) restResponse.getErrorCode(), BaseRestUtils.STATUS_CODE_SUCCESS);
+    }
+
+    @Test(dependsOnMethods = "updateInterfaceOperationsOnPNFResource")
+    public void deleteInterfaceOperationsFromPNFResource() throws Exception {
+        RestResponse restResponse = InterfaceOperationsRestUtils
+                .deleteInterfaceOperations(pnfResource, pnfResourceInterfaceUniqueId,
+                        pnfResourceOperationUniqueId, user);
+        logger.info("deleteInterfaceOperationsFromPNFResource Response Code:" + restResponse.getErrorCode());
+        Assert.assertEquals((int) restResponse.getErrorCode(), BaseRestUtils.STATUS_CODE_SUCCESS);
+    }
+
+    @Test
+    public void testCreateOperationWithLocalInterfaceAndDownloadArtifact() throws Exception{
+        Either<Service, RestResponse> createDefaultServiceEither =
+                AtomicOperationUtils.createDefaultService(UserRoleEnum.DESIGNER, true);
+        if (createDefaultServiceEither.isRight()) {
+            fail("Error creating default service");
+        }
+        Service service = createDefaultServiceEither.left().value();
+        String serviceUniqueId = service.getUniqueId();
+        Operation operation = new Operation();
+        operation.setName("LocalOper");
+        operation.setWorkflowAssociationType("NONE");
+        Map<String, Object> interfaceOperationMap = buildInterfaceDefinitionMap(operation, "Local", null, null);
+
+        RestResponse restResponse = InterfaceOperationsRestUtils.addInterfaceOperations(service, interfaceOperationMap,
+                user);
+
+        Integer responseCode = restResponse.getErrorCode();
+        Integer expectedCode = 200;
+        Assert.assertEquals(responseCode, expectedCode);
+
+        service = ResponseParser.convertServiceResponseToJavaObject(
+                ServiceRestUtils.getServiceToscaArtifacts(service.getUniqueId()).getResponse());
+        service.setUniqueId(serviceUniqueId);
+        service.setComponentType(ComponentTypeEnum.SERVICE);
+        service.setLastUpdaterUserId(user.getUserId());
+        Either<String, RestResponse> responseEither = AtomicOperationUtils
+                .getComponenetArtifactPayload(service, "assettoscacsar");
+
+        Assert.assertTrue(responseEither.isLeft());
+    }
+
+    @Test
+    public void addInterfaceOperationsOnService() throws Exception {
+        RestResponse restResponse = InterfaceOperationsRestUtils
+                .addInterfaceOperations(service, buildInterfaceDefinitionForService(),
+                        user);
+        logger.info("addInterfaceOperationsOnService Response Code:" + restResponse.getErrorCode());
+        Assert.assertEquals((int) restResponse.getErrorCode(), BaseRestUtils.STATUS_CODE_SUCCESS);
+        String interfaceDefinitionStr = ResponseParser.getListFromJson(restResponse, INTERFACES).get(0).toString();
+        InterfaceDefinition interfaceDefinition =
+                ResponseParser.convertInterfaceDefinitionResponseToJavaObject(interfaceDefinitionStr);
+        serviceInterfaceUniqueId = interfaceDefinition.getUniqueId();
+        serviceOperationUniqueId = interfaceDefinition.getOperationsMap().keySet().stream().findFirst().orElse(null);
+    }
+
+    @Test(dependsOnMethods = "addInterfaceOperationsOnService")
+    public void getInterfaceOperationsFromService() throws Exception {
+        RestResponse restResponse = InterfaceOperationsRestUtils
+                .getInterfaceOperations(service, serviceInterfaceUniqueId,
+                        serviceOperationUniqueId, user);
+        logger.info("getInterfaceOperationsFromService Response Code:" + restResponse.getErrorCode());
+        Assert.assertEquals((int) restResponse.getErrorCode(), BaseRestUtils.STATUS_CODE_SUCCESS);
+    }
+
+    @Test(dependsOnMethods = "getInterfaceOperationsFromService")
+    public void updateInterfaceOperationsOnService() throws Exception {
+        RestResponse restResponse = InterfaceOperationsRestUtils
+                .updateInterfaceOperations(service, buildInterfaceDefinitionForService(),
+                        user);
+        logger.info("updateInterfaceOperations Response Code:" + restResponse.getErrorCode());
+        Assert.assertEquals((int) restResponse.getErrorCode(), BaseRestUtils.STATUS_CODE_SUCCESS);
+    }
+
+    @Test(dependsOnMethods = "updateInterfaceOperationsOnService")
+    public void deleteInterfaceOperationsFromService() throws Exception {
+        RestResponse restResponse = InterfaceOperationsRestUtils
+                .deleteInterfaceOperations(service, serviceInterfaceUniqueId,
+                        serviceOperationUniqueId, user);
+        logger.info("deleteInterfaceOperations Response Code:" + restResponse.getErrorCode());
+        Assert.assertEquals((int) restResponse.getErrorCode(), BaseRestUtils.STATUS_CODE_SUCCESS);
+    }
+
+    @Test
+    public void addInterfaceOperationsOfGlobalTypeOnResource() throws Exception {
+        RestResponse restResponse =
+                InterfaceOperationsRestUtils.addInterfaceOperations(resource,
+                        buildInterfaceDefinitionOfGlobalTypeForResource(resource), user);
+
+        logger.info("addInterfaceOperationsOnResource Response Code:" + restResponse.getErrorCode());
+        Assert.assertEquals((int) restResponse.getErrorCode(), BaseRestUtils.STATUS_CODE_SUCCESS);
+    }
+
+    @Test
+    public void addInterfaceOperationsOfGlobalTypeOnPNFResource() throws Exception {
+        RestResponse restResponse =
+                InterfaceOperationsRestUtils.addInterfaceOperations(pnfResource,
+                        buildInterfaceDefinitionOfGlobalTypeForResource(pnfResource), user);
+
+        logger.info("addInterfaceOperationsOnPNFResource Response Code:" + restResponse.getErrorCode());
+        Assert.assertEquals((int) restResponse.getErrorCode(), BaseRestUtils.STATUS_CODE_SUCCESS);
+        String interfaceDefinitionStr = ResponseParser.getListFromJson(restResponse, INTERFACES).get(0).toString();
+        InterfaceDefinition interfaceDefinition =
+                ResponseParser.convertInterfaceDefinitionResponseToJavaObject(interfaceDefinitionStr);
+    }
+
+}
diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/execute/lifecycle/LCSbaseTest.java b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/execute/lifecycle/LCSbaseTest.java
new file mode 100644
index 0000000000..8712795dd2
--- /dev/null
+++ b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/execute/lifecycle/LCSbaseTest.java
@@ -0,0 +1,260 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * SDC
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.sdc.ci.tests.execute.lifecycle;
+
+
+import org.junit.rules.TestName;
+import org.openecomp.sdc.be.datatypes.enums.ComponentTypeEnum;
+import org.openecomp.sdc.be.model.LifecycleStateEnum;
+import org.openecomp.sdc.be.model.Resource;
+import org.openecomp.sdc.be.model.User;
+import org.openecomp.sdc.ci.tests.api.ComponentBaseTest;
+import org.openecomp.sdc.ci.tests.datatypes.ArtifactReqDetails;
+import org.openecomp.sdc.ci.tests.datatypes.ComponentInstanceReqDetails;
+import org.openecomp.sdc.ci.tests.datatypes.ResourceReqDetails;
+import org.openecomp.sdc.ci.tests.datatypes.ServiceReqDetails;
+import org.openecomp.sdc.ci.tests.datatypes.enums.*;
+import org.openecomp.sdc.ci.tests.datatypes.http.RestResponse;
+import org.openecomp.sdc.ci.tests.utils.ArtifactUtils;
+import org.openecomp.sdc.ci.tests.utils.DbUtils;
+import org.openecomp.sdc.ci.tests.utils.general.ElementFactory;
+import org.openecomp.sdc.ci.tests.utils.rest.*;
+import org.testng.annotations.BeforeMethod;
+
+import java.io.IOException;
+
+import static org.testng.AssertJUnit.*;
+
+/**
+ * @author al714h
+ * <p>
+ * resourceDetails - create, Add Heat, certify resourceDetails1 - create
+ * resource, LCS - CheckOut serviceDetails - create, add RI from
+ * resourceDetails serviceDetails2 - create, add RI from resourceDetails
+ * serviceDetailsEmpty - create, LCS - CheckOut serviceDetailsEmpty2 -
+ * create, LCS - CheckOut
+ */
+public abstract class LCSbaseTest extends ComponentBaseTest {
+
+    protected ResourceReqDetails resourceDetails;
+    protected ResourceReqDetails resourceDetails1;
+    protected ServiceReqDetails serviceDetails;
+    protected ServiceReqDetails serviceDetails2;
+    protected ServiceReqDetails serviceDetailsEmpty;
+    protected ServiceReqDetails serviceDetailsEmpty2;
+    protected ComponentInstanceReqDetails componentInstanceReqDetails;
+    protected ComponentInstanceReqDetails resourceInstanceReqDetails2;
+    protected User sdncDesignerDetails1;
+    protected User sdncDesignerDetails2;
+    protected static User sdncTesterDeatails1;
+    protected User sdncAdminDetails1;
+    protected ArtifactReqDetails heatArtifactDetails;
+    protected ArtifactReqDetails heatVolArtifactDetails;
+    protected ArtifactReqDetails heatNetArtifactDetails;
+
+    protected ArtifactReqDetails defaultArtifactDetails;
+
+    protected ArtifactUtils artifactUtils;
+
+    // protected static ServiceUtils serviceUtils = new ServiceUtils();
+
+    @BeforeMethod
+    public void before() throws Exception {
+
+        initializeMembers();
+
+        createComponents();
+
+    }
+
+    public void initializeMembers() throws IOException, Exception {
+        resourceDetails = ElementFactory.getDefaultResource();
+        // resourceDetails =
+        // ElementFactory.getDefaultResource("myNewResource1234567890",
+        // NormativeTypesEnum.ROOT, ResourceServiceCategoriesEnum.ROUTERS,
+        // UserRoleEnum.DESIGNER.getUserId());
+        resourceDetails1 = ElementFactory.getDefaultResource("secondResource", NormativeTypesEnum.ROOT);
+        serviceDetails = ElementFactory.getDefaultService();
+		serviceDetails2 = ElementFactory.getDefaultService("newTestService2", ServiceCategoriesEnum.MOBILITY, "al1976", ServiceInstantiationType.A_LA_CARTE.getValue());
+        serviceDetailsEmpty = ElementFactory.getDefaultService("newEmptyService", ServiceCategoriesEnum.MOBILITY,
+				"al1976", ServiceInstantiationType.A_LA_CARTE.getValue());
+        serviceDetailsEmpty2 = ElementFactory.getDefaultService("newEmptyService2", ServiceCategoriesEnum.MOBILITY,
+				"al1976", ServiceInstantiationType.A_LA_CARTE.getValue());
+        sdncDesignerDetails1 = ElementFactory.getDefaultUser(UserRoleEnum.DESIGNER);
+        sdncDesignerDetails2 = ElementFactory.getDefaultUser(UserRoleEnum.DESIGNER2);
+        sdncTesterDeatails1 = ElementFactory.getDefaultUser(UserRoleEnum.TESTER);
+        sdncAdminDetails1 = ElementFactory.getDefaultUser(UserRoleEnum.ADMIN);
+        heatArtifactDetails = ElementFactory.getDefaultDeploymentArtifactForType(ArtifactTypeEnum.HEAT.getType());
+        heatNetArtifactDetails = ElementFactory
+                .getDefaultDeploymentArtifactForType(ArtifactTypeEnum.HEAT_NET.getType());
+        heatVolArtifactDetails = ElementFactory
+                .getDefaultDeploymentArtifactForType(ArtifactTypeEnum.HEAT_VOL.getType());
+        componentInstanceReqDetails = ElementFactory.getDefaultComponentInstance();
+        resourceInstanceReqDetails2 = ElementFactory.getDefaultComponentInstance();
+
+    }
+
+    protected void createComponents() throws Exception {
+
+        RestResponse response = ResourceRestUtils.createResource(resourceDetails1, sdncDesignerDetails1);
+        assertTrue("create request returned status:" + response.getErrorCode(), response.getErrorCode() == 201);
+        assertNotNull("resource uniqueId is null:", resourceDetails1.getUniqueId());
+
+        response = ResourceRestUtils.createResource(resourceDetails, sdncDesignerDetails1);
+        assertTrue("create request returned status:" + response.getErrorCode(), response.getErrorCode() == 201);
+        assertNotNull("resource uniqueId is null:", resourceDetails.getUniqueId());
+
+        response = ServiceRestUtils.createService(serviceDetails, sdncDesignerDetails1);
+        assertTrue("create request returned status:" + response.getErrorCode(), response.getErrorCode() == 201);
+        assertNotNull("service uniqueId is null:", serviceDetails.getUniqueId());
+
+        ArtifactReqDetails heatArtifactDetails = ElementFactory
+                .getDefaultDeploymentArtifactForType(ArtifactTypeEnum.HEAT.getType());
+        response = ArtifactRestUtils.addInformationalArtifactToResource(heatArtifactDetails, sdncDesignerDetails1,
+                resourceDetails.getUniqueId());
+        assertTrue("add HEAT artifact to resource request returned status:" + response.getErrorCode(),
+                response.getErrorCode() == 200);
+
+        // certified resource
+        response = LCSbaseTest.certifyResource(resourceDetails, sdncDesignerDetails1);
+        assertTrue("certify resource request returned status:" + response.getErrorCode(),
+                response.getErrorCode() == 200);
+
+        // add resource instance with HEAT deployment artifact to the service
+        componentInstanceReqDetails.setComponentUid(resourceDetails.getUniqueId());
+        response = ComponentInstanceRestUtils.createComponentInstance(componentInstanceReqDetails, sdncDesignerDetails1,
+                serviceDetails.getUniqueId(), ComponentTypeEnum.SERVICE);
+        assertTrue("response code is not 201, returned: " + response.getErrorCode(), response.getErrorCode() == 201);
+
+        response = ServiceRestUtils.createService(serviceDetails2, sdncDesignerDetails1);
+        assertTrue("create request returned status:" + response.getErrorCode(), response.getErrorCode() == 201);
+        assertNotNull("service uniqueId is null:", serviceDetails2.getUniqueId());
+
+        componentInstanceReqDetails.setComponentUid(resourceDetails.getUniqueId());
+        response = ComponentInstanceRestUtils.createComponentInstance(componentInstanceReqDetails, sdncDesignerDetails1,
+                serviceDetails2.getUniqueId(), ComponentTypeEnum.SERVICE);
+        assertTrue("response code is not 201, returned: " + response.getErrorCode(), response.getErrorCode() == 201);
+
+        response = ServiceRestUtils.createService(serviceDetailsEmpty, sdncDesignerDetails1);
+        assertTrue("create request returned status:" + response.getErrorCode(), response.getErrorCode() == 201);
+        assertNotNull("service uniqueId is null:", serviceDetailsEmpty.getUniqueId());
+
+        response = ServiceRestUtils.createService(serviceDetailsEmpty2, sdncDesignerDetails1);
+        assertTrue("create request returned status:" + response.getErrorCode(), response.getErrorCode() == 201);
+        assertNotNull("service uniqueId is null:", serviceDetailsEmpty2.getUniqueId());
+
+        DbUtils.cleanAllAudits();
+
+    }
+
+    public static RestResponse certifyResource(ResourceReqDetails resourceDetails, User user) throws Exception {
+/*		RestResponse restResponseResource = LifecycleRestUtils.changeResourceState(resourceDetails, user.getUserId(),
+                LifeCycleStatesEnum.CHECKIN);
+		// if (restResponseResource.getErrorCode() == 200){
+		restResponseResource = LifecycleRestUtils.changeResourceState(resourceDetails, user.getUserId(),
+				LifeCycleStatesEnum.CERTIFICATIONREQUEST);
+		// }else
+		// return restResponseResource;
+		sdncTesterDeatails1 = ElementFactory.getDefaultUser(UserRoleEnum.TESTER);
+		if (restResponseResource.getErrorCode() == 200) {
+			restResponseResource = LifecycleRestUtils.changeResourceState(resourceDetails,
+					sdncTesterDeatails1.getUserId(), LifeCycleStatesEnum.STARTCERTIFICATION);
+		} else
+			return restResponseResource;
+		if (restResponseResource.getErrorCode() == 200) {
+			restResponseResource = LifecycleRestUtils.changeResourceState(resourceDetails,
+					sdncTesterDeatails1.getUserId(), LifeCycleStatesEnum.CERTIFY);
+		}
+		return restResponseResource;*/
+        return LifecycleRestUtils.changeResourceState(resourceDetails,
+                sdncTesterDeatails1.getUserId(), LifeCycleStatesEnum.CERTIFY);
+    }
+
+    public static RestResponse certifyService(ServiceReqDetails serviceDetails, User user) throws Exception {
+        RestResponse restResponseService = LifecycleRestUtils.changeServiceState(serviceDetails, user,
+                LifeCycleStatesEnum.CHECKIN);
+        // if (restResponseService.getErrorCode() == 200){
+        restResponseService = LifecycleRestUtils.changeServiceState(serviceDetails, user,
+                LifeCycleStatesEnum.CERTIFICATIONREQUEST);
+        // }else
+        // return restResponseService;
+
+        sdncTesterDeatails1 = ElementFactory.getDefaultUser(UserRoleEnum.TESTER);
+        if (restResponseService.getErrorCode() == 200) {
+            restResponseService = LifecycleRestUtils.changeServiceState(serviceDetails, sdncTesterDeatails1,
+                    LifeCycleStatesEnum.STARTCERTIFICATION);
+        } else
+            return restResponseService;
+        if (restResponseService.getErrorCode() == 200) {
+            restResponseService = LifecycleRestUtils.changeServiceState(serviceDetails, sdncTesterDeatails1,
+                    LifeCycleStatesEnum.CERTIFY);
+        }
+        return restResponseService;
+    }
+
+    protected static RestResponse raiseResourceToTargetVersion(ResourceReqDetails resourceDetails, String targetVersion,
+                                                               User user) throws Exception {
+        return raiseResourceToTargetVersion(resourceDetails, targetVersion, null, user);
+    }
+
+    protected static RestResponse raiseResourceToTargetVersion(ResourceReqDetails resourceDetails, String targetVersion,
+                                                               RestResponse prevResponse, User user) throws Exception {
+
+        String[] splitParts = targetVersion.split("\\.");
+
+        int version = Integer.parseInt(splitParts[1]);
+        String checkinComment = "good checkin";
+        String checkinComentJson = "{\"userRemarks\": \"" + checkinComment + "\"}";
+
+        if (prevResponse != null) {
+            Resource resourceRespJavaObject = ResponseParser
+                    .convertResourceResponseToJavaObject(prevResponse.getResponse());
+            if (resourceRespJavaObject.getLifecycleState().equals(LifecycleStateEnum.CERTIFIED)) {
+                RestResponse restResponseResource = LifecycleRestUtils.changeResourceState(resourceDetails,
+                        user.getUserId(), LifeCycleStatesEnum.CHECKOUT);
+            }
+        }
+
+        RestResponse restResponseResource = null;
+        for (int i = 0; i < (version - 1); i++) {
+
+            restResponseResource = LifecycleRestUtils.changeResourceState(resourceDetails, user, null,
+                    LifeCycleStatesEnum.CHECKIN, checkinComentJson);
+            if (restResponseResource.getErrorCode() == 200) {
+                restResponseResource = LifecycleRestUtils.changeResourceState(resourceDetails, user.getUserId(),
+                        LifeCycleStatesEnum.CHECKOUT);
+                if (restResponseResource.getErrorCode() == 200) {
+
+                } else
+                    break;
+
+            } else
+                break;
+
+        }
+
+        restResponseResource = LifecycleRestUtils.changeResourceState(resourceDetails, user, null,
+                LifeCycleStatesEnum.CHECKIN, checkinComentJson);
+        assertEquals("Check response code ", 200, restResponseResource.getErrorCode().intValue());
+        return restResponseResource;
+    }
+
+}
diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/execute/product/ProductBaseTest.java b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/execute/product/ProductBaseTest.java
new file mode 100644
index 0000000000..80ad348a30
--- /dev/null
+++ b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/execute/product/ProductBaseTest.java
@@ -0,0 +1,195 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * SDC
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.sdc.ci.tests.execute.product;
+
+import com.google.gson.Gson;
+import com.google.gson.reflect.TypeToken;
+import org.junit.rules.TestName;
+import org.openecomp.sdc.be.model.User;
+import org.openecomp.sdc.be.model.category.CategoryDefinition;
+import org.openecomp.sdc.be.model.category.GroupingDefinition;
+import org.openecomp.sdc.be.model.category.SubCategoryDefinition;
+import org.openecomp.sdc.ci.tests.api.ComponentBaseTest;
+import org.openecomp.sdc.ci.tests.datatypes.enums.UserRoleEnum;
+import org.openecomp.sdc.ci.tests.datatypes.http.RestResponse;
+import org.openecomp.sdc.ci.tests.utils.general.ElementFactory;
+import org.openecomp.sdc.ci.tests.utils.rest.BaseRestUtils;
+import org.openecomp.sdc.ci.tests.utils.rest.CategoryRestUtils;
+import org.openecomp.sdc.ci.tests.utils.rest.ResponseParser;
+import org.testng.annotations.BeforeMethod;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+
+import static org.openecomp.sdc.ci.tests.utils.rest.BaseRestUtils.PRODUCT_COMPONENT_TYPE;
+
+public abstract class ProductBaseTest extends ComponentBaseTest {
+	User productStrategistUser1;
+	User productStrategistUser2;
+	User productStrategistUser3;
+	User productManager1;
+	User productManager2;
+	User adminUser;
+	User designerUser;
+
+	// Category1->Subcategory1->Grouping1
+	protected List<CategoryDefinition> defaultCategories;
+
+	protected static String auditAction;
+	protected static ComponentOperationEnum operation;
+
+	@BeforeMethod
+	public void beforeProductTest() throws IOException, Exception {
+		productStrategistUser1 = ElementFactory.getDefaultUser(UserRoleEnum.PRODUCT_STRATEGIST1);
+		productStrategistUser2 = ElementFactory.getDefaultUser(UserRoleEnum.PRODUCT_STRATEGIST2);
+		productStrategistUser3 = ElementFactory.getDefaultUser(UserRoleEnum.PRODUCT_STRATEGIST3);
+		productManager1 = ElementFactory.getDefaultUser(UserRoleEnum.PRODUCT_MANAGER1);
+		productManager2 = ElementFactory.getDefaultUser(UserRoleEnum.PRODUCT_MANAGER2);
+		adminUser = ElementFactory.getDefaultUser(UserRoleEnum.ADMIN);
+		designerUser = ElementFactory.getDefaultUser(UserRoleEnum.DESIGNER);
+		createDefaultChain();
+	}
+
+	private void createDefaultChain() throws Exception {
+		CategoryDefinition productCategoryDefinition = ElementFactory.getDefaultCategory();
+		SubCategoryDefinition productSubCategoryDefinition = ElementFactory.getDefaultSubCategory();
+		GroupingDefinition productGroupingDefinition = ElementFactory.getDefaultGroup();
+		productCategoryDefinition.addSubCategory(productSubCategoryDefinition);
+		productSubCategoryDefinition.addGrouping(productGroupingDefinition);
+		List<CategoryDefinition> definitionsList = new ArrayList<>();
+		definitionsList.add(productCategoryDefinition);
+		defaultCategories = createCategoriesChain(definitionsList);
+	}
+
+	private List<CategoryDefinition> createCategoriesChain(List<CategoryDefinition> categoryDefinitions)
+			throws Exception {
+		for (CategoryDefinition categoryDefinition : categoryDefinitions) {
+			RestResponse createCategory = CategoryRestUtils.createCategory(categoryDefinition, productStrategistUser1,
+					PRODUCT_COMPONENT_TYPE);
+			int status = createCategory.getErrorCode().intValue();
+			if (status == BaseRestUtils.STATUS_CODE_CREATED) {
+				String categoryId = ResponseParser.getUniqueIdFromResponse(createCategory);
+				categoryDefinition.setUniqueId(categoryId);
+			}
+			List<SubCategoryDefinition> subcategories = categoryDefinition.getSubcategories();
+			for (SubCategoryDefinition subCategoryDefinition : subcategories) {
+				RestResponse createSubCategory = CategoryRestUtils.createSubCategory(subCategoryDefinition,
+						categoryDefinition, productStrategistUser1, PRODUCT_COMPONENT_TYPE);
+				status = createSubCategory.getErrorCode().intValue();
+				if (status == BaseRestUtils.STATUS_CODE_CREATED) {
+					String subCategoryId = ResponseParser.getUniqueIdFromResponse(createSubCategory);
+					subCategoryDefinition.setUniqueId(subCategoryId);
+				}
+				List<GroupingDefinition> groupings = subCategoryDefinition.getGroupings();
+				for (GroupingDefinition groupingDefinition : groupings) {
+					RestResponse createGroupingRest = CategoryRestUtils.createGrouping(groupingDefinition,
+							subCategoryDefinition, categoryDefinition, productStrategistUser1, PRODUCT_COMPONENT_TYPE);
+					status = createGroupingRest.getErrorCode().intValue();
+					if (status == BaseRestUtils.STATUS_CODE_CREATED) {
+						String groupingId = ResponseParser.getUniqueIdFromResponse(createGroupingRest);
+						groupingDefinition.setUniqueId(groupingId);
+					}
+				}
+			}
+		}
+		RestResponse allCategories = CategoryRestUtils.getAllCategories(productStrategistUser1, PRODUCT_COMPONENT_TYPE);
+		Gson gson = new Gson();
+		List<CategoryDefinition> res = gson.fromJson(allCategories.getResponse(),
+				new TypeToken<List<CategoryDefinition>>() {
+				}.getType());
+		return res;
+	}
+
+	// Category1->Subcategory1->[Grouping1, Grouping11]
+	protected List<CategoryDefinition> addSecondGroupingToDefaultCategory() throws Exception {
+		GroupingDefinition productGroupingDefinition = ElementFactory.getDefaultGroup();
+		productGroupingDefinition.setName("Grouping11");
+		defaultCategories.get(0).getSubcategories().get(0).addGrouping(productGroupingDefinition);
+		return createCategoriesChain(defaultCategories);
+	}
+
+	// Category1->[Subcategory1->[Grouping1,
+	// Grouping11],Subcategory2->[Grouping12]]
+	protected List<CategoryDefinition> addSubcategoryAndGroupingToDefaultCategory() throws Exception {
+		GroupingDefinition groupingDefinition1 = ElementFactory.getDefaultGroup();
+		groupingDefinition1.setName("Grouping11");
+		defaultCategories.get(0).getSubcategories().get(0).addGrouping(groupingDefinition1);
+
+		SubCategoryDefinition subCategory2 = ElementFactory.getDefaultSubCategory();
+		subCategory2.setName("Subcategory2");
+		GroupingDefinition groupingDefinition2 = ElementFactory.getDefaultGroup();
+		groupingDefinition2.setName("Grouping12");
+		subCategory2.addGrouping(groupingDefinition2);
+		defaultCategories.get(0).addSubCategory(subCategory2);
+		return createCategoriesChain(defaultCategories);
+	}
+
+	// [Category1->[Subcategory1->[Grouping1,
+	// Grouping11],Subcategory2->[Grouping12]],
+	// Category2->[Subcategory1->[Grouping1],Subcategory2->[Grouping1]],
+	// Category3->[Subcategory1->[Grouping11],Subcategory2->[Grouping11,
+	// Grouping22]]]
+	protected List<CategoryDefinition> addManyGroupingsDiffCategories() throws Exception {
+		CategoryDefinition category2 = ElementFactory.getDefaultCategory();
+		category2.setName("Category2");
+		CategoryDefinition category3 = ElementFactory.getDefaultCategory();
+		category3.setName("Category3");
+		SubCategoryDefinition subCategory1 = ElementFactory.getDefaultSubCategory();
+		subCategory1.setName("Subcategory1");
+		SubCategoryDefinition subCategory2 = ElementFactory.getDefaultSubCategory();
+		subCategory2.setName("Subcategory2");
+		SubCategoryDefinition subCategory1_2 = ElementFactory.getDefaultSubCategory();
+		subCategory1_2.setName("Subcategory1");
+		SubCategoryDefinition subCategory2_2 = ElementFactory.getDefaultSubCategory();
+		subCategory2_2.setName("Subcategory2");
+		SubCategoryDefinition subCategory1_3 = ElementFactory.getDefaultSubCategory();
+		subCategory1_3.setName("Subcategory1");
+		SubCategoryDefinition subCategory2_3 = ElementFactory.getDefaultSubCategory();
+		subCategory2_3.setName("Subcategory2");
+
+		GroupingDefinition groupingDefinition1 = ElementFactory.getDefaultGroup();
+		groupingDefinition1.setName("Grouping1");
+		GroupingDefinition groupingDefinition11 = ElementFactory.getDefaultGroup();
+		groupingDefinition11.setName("Grouping11");
+		GroupingDefinition groupingDefinition12 = ElementFactory.getDefaultGroup();
+		groupingDefinition12.setName("Grouping12");
+		GroupingDefinition groupingDefinition22 = ElementFactory.getDefaultGroup();
+		groupingDefinition22.setName("Grouping22");
+
+		defaultCategories.get(0).getSubcategories().get(0).addGrouping(groupingDefinition11);
+		subCategory2.addGrouping(groupingDefinition12);
+		defaultCategories.get(0).addSubCategory(subCategory2);
+
+		defaultCategories.add(category2);
+		defaultCategories.add(category3);
+		category2.addSubCategory(subCategory1_2);
+		category2.addSubCategory(subCategory2_2);
+		subCategory1_2.addGrouping(groupingDefinition1);
+		subCategory2_2.addGrouping(groupingDefinition1);
+		category3.addSubCategory(subCategory1_3);
+		category3.addSubCategory(subCategory2_3);
+		subCategory1_3.addGrouping(groupingDefinition11);
+		subCategory2_3.addGrouping(groupingDefinition11);
+		subCategory2_3.addGrouping(groupingDefinition22);
+		return createCategoriesChain(defaultCategories);
+	}
+}
diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/execute/product/ProductCheckinTest.java b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/execute/product/ProductCheckinTest.java
new file mode 100644
index 0000000000..94027bd6eb
--- /dev/null
+++ b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/execute/product/ProductCheckinTest.java
@@ -0,0 +1,199 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * SDC
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.sdc.ci.tests.execute.product;
+
+import org.junit.Rule;
+import org.junit.rules.TestName;
+import org.openecomp.sdc.be.dao.api.ActionStatus;
+import org.openecomp.sdc.be.model.LifecycleStateEnum;
+import org.openecomp.sdc.be.model.Product;
+import org.openecomp.sdc.be.model.User;
+import org.openecomp.sdc.ci.tests.datatypes.enums.AuditJsonKeysEnum;
+import org.openecomp.sdc.ci.tests.datatypes.enums.LifeCycleStatesEnum;
+import org.openecomp.sdc.ci.tests.datatypes.expected.ExpectedProductAudit;
+import org.openecomp.sdc.ci.tests.datatypes.http.RestResponse;
+import org.openecomp.sdc.ci.tests.utils.DbUtils;
+import org.openecomp.sdc.ci.tests.utils.general.Convertor;
+import org.openecomp.sdc.ci.tests.utils.rest.LifecycleRestUtils;
+import org.openecomp.sdc.ci.tests.utils.rest.ResponseParser;
+import org.openecomp.sdc.ci.tests.utils.validation.AuditValidationUtils;
+import org.openecomp.sdc.ci.tests.utils.validation.ProductValidationUtils;
+import org.openecomp.sdc.common.api.Constants;
+import org.testng.annotations.BeforeClass;
+import org.testng.annotations.Test;
+
+import static org.testng.AssertJUnit.assertEquals;
+
+public class ProductCheckinTest extends ProductLifecycleTest {
+
+	@Rule
+	public static TestName name = new TestName();
+
+	public ProductCheckinTest() {
+		super(name, ProductCheckinTest.class.getName());
+	}
+
+	@BeforeClass
+	public static void staticInit() {
+		auditAction = CHECKIN_ACTION;
+		operation = ComponentOperationEnum.CHANGE_STATE_CHECKIN;
+	}
+
+	@Test
+	public void checkInProductByCreator() throws Exception {
+
+		String checkinComment = "good checkin";
+		RestResponse checkInResponse = LifecycleRestUtils.changeProductState(expectedProduct, productManager1,
+				LifeCycleStatesEnum.CHECKIN, checkinComment);
+		assertEquals("Check response code after checkin resource", 200, checkInResponse.getErrorCode().intValue());
+		Product checkedInProduct = ResponseParser.parseToObjectUsingMapper(checkInResponse.getResponse(),
+				Product.class);
+
+		expectedProduct.setLifecycleState(LifecycleStateEnum.NOT_CERTIFIED_CHECKIN);
+		ProductValidationUtils.compareExpectedAndActualProducts(expectedProduct, checkedInProduct, operation);
+
+		ExpectedProductAudit expectedProductAudit = Convertor.constructFieldsForAuditValidation(checkedInProduct,
+				auditAction, productManager1, ActionStatus.OK, "0.1", "0.1", LifecycleStateEnum.NOT_CERTIFIED_CHECKOUT,
+				LifecycleStateEnum.NOT_CERTIFIED_CHECKIN, checkedInProduct.getUUID());
+		expectedProductAudit.setCOMMENT(checkinComment);
+		AuditValidationUtils.validateAuditProduct(expectedProductAudit, auditAction, AuditJsonKeysEnum.COMMENT);
+	}
+
+	@Test
+	public void checkInProductByPM() throws Exception {
+
+		String checkinComment = "good checkin";
+		RestResponse response = LifecycleRestUtils.changeProductState(expectedProduct, productManager1,
+				LifeCycleStatesEnum.CHECKIN, checkinComment);
+		assertEquals("Check response code after checkin resource", 200, response.getErrorCode().intValue());
+
+		User checkoutUser = productManager2;
+		response = LifecycleRestUtils.changeProductState(expectedProduct, checkoutUser, LifeCycleStatesEnum.CHECKOUT);
+		assertEquals("Check response code after checkin resource", 200, response.getErrorCode().intValue());
+		expectedProduct = ResponseParser.parseToObjectUsingMapper(response.getResponse(), Product.class);
+
+		DbUtils.cleanAllAudits();
+		checkinComment = "good checkin no 2";
+		response = LifecycleRestUtils.changeProductState(expectedProduct, checkoutUser, LifeCycleStatesEnum.CHECKIN,
+				checkinComment);
+		assertEquals("Check response code after checkin resource", 200, response.getErrorCode().intValue());
+
+		Product checkedInProduct = ResponseParser.parseToObjectUsingMapper(response.getResponse(), Product.class);
+
+		expectedProduct.setLifecycleState(LifecycleStateEnum.NOT_CERTIFIED_CHECKIN);
+		expectedProduct.setVersion("0.2");
+		expectedProduct.setLastUpdaterUserId(checkoutUser.getUserId());
+		expectedProduct.setLastUpdaterFullName(checkoutUser.getFullName());
+
+		ProductValidationUtils.compareExpectedAndActualProducts(expectedProduct, checkedInProduct, operation);
+
+		ExpectedProductAudit expectedProductAudit = Convertor.constructFieldsForAuditValidation(checkedInProduct,
+				auditAction, checkoutUser, ActionStatus.OK, "0.2", "0.2", LifecycleStateEnum.NOT_CERTIFIED_CHECKOUT,
+				LifecycleStateEnum.NOT_CERTIFIED_CHECKIN, checkedInProduct.getUUID());
+		expectedProductAudit.setCOMMENT(checkinComment);
+		AuditValidationUtils.validateAuditProduct(expectedProductAudit, auditAction, AuditJsonKeysEnum.COMMENT);
+	}
+
+	@Test
+	public void checkInProductByAdmin() throws Exception {
+
+		String checkinComment = "good checkin";
+		RestResponse checkInResponse = LifecycleRestUtils.changeProductState(expectedProduct, adminUser,
+				LifeCycleStatesEnum.CHECKIN, checkinComment);
+		assertEquals("Check response code after checkin resource", 200, checkInResponse.getErrorCode().intValue());
+		Product checkedInProduct = ResponseParser.parseToObjectUsingMapper(checkInResponse.getResponse(),
+				Product.class);
+
+		expectedProduct.setLifecycleState(LifecycleStateEnum.NOT_CERTIFIED_CHECKIN);
+		expectedProduct.setLastUpdaterUserId(adminUser.getUserId());
+		expectedProduct.setLastUpdaterFullName(adminUser.getFullName());
+
+		ProductValidationUtils.compareExpectedAndActualProducts(expectedProduct, checkedInProduct, operation);
+
+		ExpectedProductAudit expectedProductAudit = Convertor.constructFieldsForAuditValidation(checkedInProduct,
+				auditAction, adminUser, ActionStatus.OK, "0.1", "0.1", LifecycleStateEnum.NOT_CERTIFIED_CHECKOUT,
+				LifecycleStateEnum.NOT_CERTIFIED_CHECKIN, checkedInProduct.getUUID());
+		expectedProductAudit.setCOMMENT(checkinComment);
+		AuditValidationUtils.validateAuditProduct(expectedProductAudit, auditAction, AuditJsonKeysEnum.COMMENT);
+	}
+
+	@Test
+	public void checkInProductByPMNotOwner() throws Exception {
+
+		RestResponse checkInResponse = LifecycleRestUtils.changeProductState(expectedProduct, productManager2,
+				LifeCycleStatesEnum.CHECKIN);
+		assertEquals("Check response code after checkin resource", 403, checkInResponse.getErrorCode().intValue());
+		String[] auditParameters = new String[] { expectedProduct.getName(), "product", productManager1.getFirstName(),
+				productManager1.getLastName(), productManager1.getUserId() };
+		ExpectedProductAudit expectedProductAudit = Convertor.constructFieldsForAuditValidation(expectedProduct,
+				auditAction, productManager2, ActionStatus.COMPONENT_CHECKOUT_BY_ANOTHER_USER, "0.1", "0.1",
+				LifecycleStateEnum.NOT_CERTIFIED_CHECKOUT, LifecycleStateEnum.NOT_CERTIFIED_CHECKOUT,
+				expectedProduct.getUUID(), auditParameters);
+		AuditValidationUtils.validateAuditProduct(expectedProductAudit, auditAction);
+	}
+
+	@Test
+	public void checkInProductByPsRoleNotAllowed() throws Exception {
+
+		RestResponse checkInResponse = LifecycleRestUtils.changeProductState(expectedProduct, productStrategistUser1,
+				LifeCycleStatesEnum.CHECKIN);
+		assertEquals("Check response code after checkin resource", 409, checkInResponse.getErrorCode().intValue());
+		ExpectedProductAudit expectedProductAudit = Convertor.constructFieldsForAuditValidation(expectedProduct,
+				auditAction, productStrategistUser1, ActionStatus.RESTRICTED_OPERATION, "0.1", "0.1",
+				LifecycleStateEnum.NOT_CERTIFIED_CHECKOUT, LifecycleStateEnum.NOT_CERTIFIED_CHECKOUT,
+				expectedProduct.getUUID());
+		AuditValidationUtils.validateAuditProduct(expectedProductAudit, auditAction);
+	}
+
+	@Test
+	public void checkInProductNotExist() throws Exception {
+		String notExisitingUuid = "1234";
+		expectedProduct.setUniqueId(notExisitingUuid);
+		RestResponse checkInResponse = LifecycleRestUtils.changeProductState(expectedProduct, productManager1,
+				LifeCycleStatesEnum.CHECKIN);
+		assertEquals("Check response code after checkin resource", 404, checkInResponse.getErrorCode().intValue());
+		String[] auditParameters = new String[] { "", "product" };
+		ExpectedProductAudit expectedProductAudit = Convertor.constructFieldsForAuditValidation(expectedProduct,
+				auditAction, productManager1, ActionStatus.PRODUCT_NOT_FOUND, Constants.EMPTY_STRING,
+				Constants.EMPTY_STRING, null, null, Constants.EMPTY_STRING, auditParameters);
+		expectedProductAudit.setCURR_STATE(Constants.EMPTY_STRING);
+		expectedProductAudit.setRESOURCE_NAME(notExisitingUuid);
+		AuditValidationUtils.validateAuditProduct(expectedProductAudit, auditAction);
+	}
+
+	@Test
+	public void checkInProductAlreadyCheckedIn() throws Exception {
+		RestResponse checkInResponse = LifecycleRestUtils.changeProductState(expectedProduct, productManager1,
+				LifeCycleStatesEnum.CHECKIN);
+		assertEquals("Check response code after checkin resource", 200, checkInResponse.getErrorCode().intValue());
+		DbUtils.cleanAllAudits();
+		checkInResponse = LifecycleRestUtils.changeProductState(expectedProduct, productManager2,
+				LifeCycleStatesEnum.CHECKIN);
+		assertEquals("Check response code after checkin resource", 409, checkInResponse.getErrorCode().intValue());
+		String[] auditParameters = new String[] { expectedProduct.getName(), "product", productManager1.getFirstName(),
+				productManager1.getLastName(), productManager1.getUserId() };
+		ExpectedProductAudit expectedProductAudit = Convertor.constructFieldsForAuditValidation(expectedProduct,
+				auditAction, productManager2, ActionStatus.COMPONENT_ALREADY_CHECKED_IN, "0.1", "0.1",
+				LifecycleStateEnum.NOT_CERTIFIED_CHECKIN, LifecycleStateEnum.NOT_CERTIFIED_CHECKIN,
+				expectedProduct.getUUID(), auditParameters);
+		AuditValidationUtils.validateAuditProduct(expectedProductAudit, auditAction);
+	}
+}
diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/execute/product/ProductCheckoutTest.java b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/execute/product/ProductCheckoutTest.java
new file mode 100644
index 0000000000..36458d09f9
--- /dev/null
+++ b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/execute/product/ProductCheckoutTest.java
@@ -0,0 +1,146 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * SDC
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.sdc.ci.tests.execute.product;
+
+import org.junit.Rule;
+import org.junit.rules.TestName;
+import org.openecomp.sdc.be.dao.api.ActionStatus;
+import org.openecomp.sdc.be.model.LifecycleStateEnum;
+import org.openecomp.sdc.be.model.Product;
+import org.openecomp.sdc.be.model.User;
+import org.openecomp.sdc.ci.tests.datatypes.enums.LifeCycleStatesEnum;
+import org.openecomp.sdc.ci.tests.datatypes.expected.ExpectedProductAudit;
+import org.openecomp.sdc.ci.tests.datatypes.http.RestResponse;
+import org.openecomp.sdc.ci.tests.utils.DbUtils;
+import org.openecomp.sdc.ci.tests.utils.general.Convertor;
+import org.openecomp.sdc.ci.tests.utils.rest.LifecycleRestUtils;
+import org.openecomp.sdc.ci.tests.utils.rest.ProductRestUtils;
+import org.openecomp.sdc.ci.tests.utils.rest.ResponseParser;
+import org.openecomp.sdc.ci.tests.utils.validation.AuditValidationUtils;
+import org.openecomp.sdc.ci.tests.utils.validation.ProductValidationUtils;
+import org.testng.annotations.BeforeClass;
+import org.testng.annotations.Test;
+
+import java.io.FileNotFoundException;
+
+import static org.testng.AssertJUnit.assertEquals;
+
+public class ProductCheckoutTest extends ProductLifecycleTest {
+
+	@Rule
+	public static TestName name = new TestName();
+
+	@BeforeClass
+	public static void staticInit() {
+		auditAction = CHECKOUT_ACTION;
+		operation = ComponentOperationEnum.CHANGE_STATE_CHECKOUT;
+	}
+
+	public ProductCheckoutTest() {
+		super(name, ProductCheckoutTest.class.getName());
+	}
+
+	@Test
+	public void checkOutProductByPmNotInContacts() throws Exception {
+		checkOutProductSuccess(productManager2);
+	}
+
+	@Test
+	public void checkOutProductByPmInContacts() throws Exception {
+		checkOutProductSuccess(productManager1);
+	}
+
+	@Test
+	public void checkOutProductByAdmin() throws Exception {
+		checkOutProductSuccess(adminUser);
+	}
+
+	@Test
+	public void checkOutProductByPs() throws Exception {
+		// Changed in 1604 patch - now it's restricted
+		checkOutProductRestricted(productStrategistUser3);
+		// checkOutProductSuccess(productStrategistUser3);
+	}
+
+	@Test
+	public void checkOutProductByDesignerRoleNotAllowed() throws Exception {
+		checkOutProductRestricted(designerUser);
+	}
+
+	@Test
+	public void checkOutProductAlreadyCheckedOut() throws Exception {
+		RestResponse lcsResponse = LifecycleRestUtils.changeProductState(expectedProduct, productManager1, LifeCycleStatesEnum.CHECKIN);
+		assertEquals("Check response code after checkin resource", 200, lcsResponse.getErrorCode().intValue());
+
+		lcsResponse = LifecycleRestUtils.changeProductState(expectedProduct, productManager1, LifeCycleStatesEnum.CHECKOUT);
+		assertEquals("Check response code after checkin resource", 200, lcsResponse.getErrorCode().intValue());
+		Product checkedOutProduct = ResponseParser.parseToObjectUsingMapper(lcsResponse.getResponse(), Product.class);
+
+		DbUtils.cleanAllAudits();
+
+		lcsResponse = LifecycleRestUtils.changeProductState(checkedOutProduct, productManager2, LifeCycleStatesEnum.CHECKOUT);
+		assertEquals("Check response code after checkin resource", 403, lcsResponse.getErrorCode().intValue());
+		String[] auditParameters = new String[] { checkedOutProduct.getName(), "product", productManager1.getFirstName(), productManager1.getLastName(), productManager1.getUserId() };
+
+		ExpectedProductAudit expectedProductAudit = Convertor.constructFieldsForAuditValidation(checkedOutProduct, auditAction, productManager2, ActionStatus.COMPONENT_IN_CHECKOUT_STATE, "0.2", "0.2", LifecycleStateEnum.NOT_CERTIFIED_CHECKOUT,
+				LifecycleStateEnum.NOT_CERTIFIED_CHECKOUT, checkedOutProduct.getUUID(), auditParameters);
+		AuditValidationUtils.validateAuditProduct(expectedProductAudit, auditAction);
+	}
+
+	private void checkOutProductSuccess(User checkoutUser) throws Exception, FileNotFoundException {
+		RestResponse lcsResponse = LifecycleRestUtils.changeProductState(expectedProduct, productManager1, LifeCycleStatesEnum.CHECKIN);
+		assertEquals("Check response code after checkin resource", 200, lcsResponse.getErrorCode().intValue());
+
+		lcsResponse = LifecycleRestUtils.changeProductState(expectedProduct, checkoutUser, LifeCycleStatesEnum.CHECKOUT);
+		assertEquals("Check response code after checkin resource", 200, lcsResponse.getErrorCode().intValue());
+
+		// 0.1 is not highest now
+		RestResponse prevVersionProductResp = ProductRestUtils.getProduct(expectedProduct.getUniqueId(), productStrategistUser1.getUserId());
+		Product prevVersionProduct = ResponseParser.parseToObjectUsingMapper(prevVersionProductResp.getResponse(), Product.class);
+		Boolean falseParam = false;
+		assertEquals(falseParam, prevVersionProduct.isHighestVersion());
+
+		Product checkedOutProduct = ResponseParser.parseToObjectUsingMapper(lcsResponse.getResponse(), Product.class);
+
+		expectedProduct.setLifecycleState(LifecycleStateEnum.NOT_CERTIFIED_CHECKOUT);
+		expectedProduct.setVersion("0.2");
+		expectedProduct.setLastUpdaterUserId(checkoutUser.getUserId());
+		expectedProduct.setLastUpdaterFullName(checkoutUser.getFullName());
+		ProductValidationUtils.compareExpectedAndActualProducts(expectedProduct, checkedOutProduct, operation);
+
+		ExpectedProductAudit expectedProductAudit = Convertor.constructFieldsForAuditValidation(checkedOutProduct, auditAction, checkoutUser, ActionStatus.OK, "0.1", "0.2", LifecycleStateEnum.NOT_CERTIFIED_CHECKIN,
+				LifecycleStateEnum.NOT_CERTIFIED_CHECKOUT, checkedOutProduct.getUUID());
+		AuditValidationUtils.validateAuditProduct(expectedProductAudit, auditAction);
+	}
+
+	private void checkOutProductRestricted(User checkoutUser) throws Exception, FileNotFoundException {
+		RestResponse lcsResponse = LifecycleRestUtils.changeProductState(expectedProduct, productManager1, LifeCycleStatesEnum.CHECKIN);
+		assertEquals("Check response code after checkin resource", 200, lcsResponse.getErrorCode().intValue());
+
+		lcsResponse = LifecycleRestUtils.changeProductState(expectedProduct, checkoutUser, LifeCycleStatesEnum.CHECKOUT);
+		assertEquals("Check response code after checkin resource", 409, lcsResponse.getErrorCode().intValue());
+
+		ExpectedProductAudit expectedProductAudit = Convertor.constructFieldsForAuditValidation(expectedProduct, auditAction, checkoutUser, ActionStatus.RESTRICTED_OPERATION, "0.1", "0.1", LifecycleStateEnum.NOT_CERTIFIED_CHECKIN,
+				LifecycleStateEnum.NOT_CERTIFIED_CHECKIN, expectedProduct.getUUID());
+		AuditValidationUtils.validateAuditProduct(expectedProductAudit, auditAction);
+	}
+
+}
diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/execute/product/ProductCreateWithValidationsTest.java b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/execute/product/ProductCreateWithValidationsTest.java
new file mode 100644
index 0000000000..705e396125
--- /dev/null
+++ b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/execute/product/ProductCreateWithValidationsTest.java
@@ -0,0 +1,1717 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * SDC
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.sdc.ci.tests.execute.product;
+
+import org.json.JSONArray;
+import org.json.JSONException;
+import org.junit.Rule;
+import org.junit.rules.TestName;
+import org.openecomp.sdc.be.dao.api.ActionStatus;
+import org.openecomp.sdc.be.model.LifecycleStateEnum;
+import org.openecomp.sdc.be.model.Product;
+import org.openecomp.sdc.be.model.User;
+import org.openecomp.sdc.ci.tests.datatypes.ProductReqDetails;
+import org.openecomp.sdc.ci.tests.datatypes.enums.UserRoleEnum;
+import org.openecomp.sdc.ci.tests.datatypes.expected.ExpectedProductAudit;
+import org.openecomp.sdc.ci.tests.datatypes.http.RestResponse;
+import org.openecomp.sdc.ci.tests.utils.DbUtils;
+import org.openecomp.sdc.ci.tests.utils.general.Convertor;
+import org.openecomp.sdc.ci.tests.utils.general.ElementFactory;
+import org.openecomp.sdc.ci.tests.utils.rest.BaseRestUtils;
+import org.openecomp.sdc.ci.tests.utils.rest.ProductRestUtils;
+import org.openecomp.sdc.ci.tests.utils.rest.ResponseParser;
+import org.openecomp.sdc.ci.tests.utils.validation.AuditValidationUtils;
+import org.openecomp.sdc.ci.tests.utils.validation.ProductValidationUtils;
+import org.openecomp.sdc.common.api.Constants;
+import org.testng.annotations.Test;
+
+import java.util.Arrays;
+
+import static org.testng.AssertJUnit.assertEquals;
+import static org.testng.AssertJUnit.assertTrue;
+
+public class ProductCreateWithValidationsTest extends ProductBaseTest {
+	@Rule
+	public static TestName name = new TestName();
+
+	public static String INITIAL_PRODUCT_VERSION = "0.1";
+	public static String CREATE_AUDIT_ACTION = "Create";
+	public String normalizedName;
+
+	public ProductCreateWithValidationsTest() {
+		super();
+	}
+
+	@Test // (enabled = false)
+	public void createProductSuccessValidation() throws Exception {
+		ProductReqDetails productReqDetails = ElementFactory.getDefaultProduct();
+		// productReqDetails.setName("CIProduct1");
+		productReqDetails.setTags(Arrays.asList(productReqDetails.getName()));
+		normalizedName = productReqDetails.getName().toLowerCase().replaceAll("\\s+", "");
+		RestResponse createProduct = ProductRestUtils.createProduct(productReqDetails, productManager1);
+		ProductRestUtils.checkCreateResponse(createProduct);
+		String productUuid = ResponseParser.getUuidFromResponse(createProduct);
+		compareExpectedAndActualProducts(productReqDetails, createProduct);
+		Product expectedProduct = ResponseParser.parseToObjectUsingMapper(createProduct.getResponse(), Product.class);
+		RestResponse getProductRes = ProductRestUtils.getProduct(productReqDetails.getUniqueId(),
+				productManager1.getUserId());
+		ProductRestUtils.checkSuccess(getProductRes);
+		Product actualProduct = ResponseParser.parseToObjectUsingMapper(getProductRes.getResponse(), Product.class);
+		ProductValidationUtils.compareExpectedAndActualProducts(expectedProduct, actualProduct,
+				ComponentOperationEnum.GET_COMPONENT);
+		assertEquals(actualProduct.getIsActive(), new Boolean(false));
+		ExpectedProductAudit constructFieldsForAuditValidation = Convertor.constructFieldsForAuditValidation(
+				expectedProduct, CREATE_AUDIT_ACTION, productManager1, ActionStatus.CREATED, Constants.EMPTY_STRING,
+				"0.1", null, LifecycleStateEnum.NOT_CERTIFIED_CHECKOUT, productUuid);
+		AuditValidationUtils.validateAuditProduct(constructFieldsForAuditValidation, CREATE_AUDIT_ACTION);
+	}
+
+	@Test
+	public void createProductNotByPmUser() throws Exception {
+		ProductReqDetails productReqDetails = ElementFactory.getDefaultProduct();
+		// productReqDetails.setName("CIProduct1");
+		normalizedName = productReqDetails.getName().toLowerCase();
+		RestResponse createProduct = ProductRestUtils.createProduct(productReqDetails, productStrategistUser1);
+		assertEquals("Check response code ", BaseRestUtils.STATUS_CODE_RESTRICTED_OPERATION,
+				createProduct.getErrorCode().intValue());
+		Product expectedProduct = Convertor.constructFieldsForRespValidation(productReqDetails, INITIAL_PRODUCT_VERSION,
+				productStrategistUser1);
+		ExpectedProductAudit constructFieldsForAuditValidation = Convertor.constructFieldsForAuditValidation(
+				expectedProduct, CREATE_AUDIT_ACTION, productStrategistUser1, ActionStatus.RESTRICTED_OPERATION,
+				Constants.EMPTY_STRING, Constants.EMPTY_STRING, null, null, Constants.EMPTY_STRING);
+		constructFieldsForAuditValidation.setCURR_VERSION("");
+		constructFieldsForAuditValidation.setCURR_STATE("");
+		AuditValidationUtils.validateAuditProduct(constructFieldsForAuditValidation, CREATE_AUDIT_ACTION);
+	}
+
+	@Test
+	public void createProductNotByAsdcUser() throws Exception {
+		User nonAsdcUser = ElementFactory.getDefaultUser(UserRoleEnum.PRODUCT_MANAGER1);
+		nonAsdcUser.setUserId("bt750k");
+		nonAsdcUser.setFirstName(null);
+		nonAsdcUser.setLastName(null);
+		ProductReqDetails productReqDetails = ElementFactory.getDefaultProduct();
+		// productReqDetails.setName("CIProduct1");
+		normalizedName = productReqDetails.getName().toLowerCase();
+		RestResponse createProduct = ProductRestUtils.createProduct(productReqDetails, nonAsdcUser);
+		assertEquals("Check response code ", BaseRestUtils.STATUS_CODE_RESTRICTED_OPERATION,
+				createProduct.getErrorCode().intValue());
+		Product expectedProduct = Convertor.constructFieldsForRespValidation(productReqDetails, INITIAL_PRODUCT_VERSION,
+				nonAsdcUser);
+		ExpectedProductAudit constructFieldsForAuditValidation = Convertor.constructFieldsForAuditValidation(
+				expectedProduct, CREATE_AUDIT_ACTION, nonAsdcUser, ActionStatus.RESTRICTED_OPERATION,
+				Constants.EMPTY_STRING, Constants.EMPTY_STRING, null, null, Constants.EMPTY_STRING);
+		constructFieldsForAuditValidation.setCURR_VERSION("");
+		constructFieldsForAuditValidation.setCURR_STATE("");
+		AuditValidationUtils.validateAuditProduct(constructFieldsForAuditValidation, CREATE_AUDIT_ACTION);
+	}
+
+	@Test
+	public void createProductUserIdIsEmpty() throws Exception {
+		User nonAsdcUser = ElementFactory.getDefaultUser(UserRoleEnum.PRODUCT_MANAGER1);
+		nonAsdcUser.setUserId("");
+		nonAsdcUser.setFirstName(null);
+		nonAsdcUser.setLastName(null);
+		ProductReqDetails productReqDetails = ElementFactory.getDefaultProduct();
+		// productReqDetails.setName("CIProduct1");
+		normalizedName = productReqDetails.getName().toLowerCase();
+		RestResponse createProduct = ProductRestUtils.createProduct(productReqDetails, nonAsdcUser);
+		assertEquals("Check response code ", BaseRestUtils.STATUS_CODE_MISSING_INFORMATION,
+				createProduct.getErrorCode().intValue());
+		Product expectedProduct = Convertor.constructFieldsForRespValidation(productReqDetails, INITIAL_PRODUCT_VERSION,
+				nonAsdcUser);
+		ExpectedProductAudit constructFieldsForAuditValidation = Convertor.constructFieldsForAuditValidation(
+				expectedProduct, CREATE_AUDIT_ACTION, nonAsdcUser, ActionStatus.MISSING_INFORMATION,
+				Constants.EMPTY_STRING, Constants.EMPTY_STRING, null, null, Constants.EMPTY_STRING);
+		constructFieldsForAuditValidation.setCURR_VERSION("");
+		constructFieldsForAuditValidation.setCURR_STATE("");
+		AuditValidationUtils.validateAuditProduct(constructFieldsForAuditValidation, CREATE_AUDIT_ACTION);
+	}
+
+	@Test
+	public void createProductNameValidationLessThanMinCharacters() throws Exception {
+		ProductReqDetails productReqDetails = ElementFactory.getDefaultProduct();
+		productReqDetails.setName("Pro");
+		RestResponse createProduct = ProductRestUtils.createProduct(productReqDetails, productManager1);
+		assertEquals("Check response code ", BaseRestUtils.STATUS_CODE_INVALID_CONTENT,
+				createProduct.getErrorCode().intValue());
+		Product expectedProduct = Convertor.constructFieldsForRespValidation(productReqDetails, "", productManager1);
+		ExpectedProductAudit constructFieldsForAuditValidation = Convertor.constructFieldsForAuditValidation(
+				expectedProduct, CREATE_AUDIT_ACTION, productManager1,
+				ActionStatus.COMPONENT_ELEMENT_INVALID_NAME_LENGTH, Constants.EMPTY_STRING, Constants.EMPTY_STRING,
+				null, null, Constants.EMPTY_STRING, "Product", "abbreviated");
+		constructFieldsForAuditValidation.setCURR_VERSION("");
+		constructFieldsForAuditValidation.setCURR_STATE("");
+		AuditValidationUtils.validateAuditProduct(constructFieldsForAuditValidation, CREATE_AUDIT_ACTION);
+	}
+
+	@Test // (enabled = false)
+	public void createProductNameValidationMaxLength() throws Exception {
+		// Max length = 25
+		ProductReqDetails productReqDetails = ElementFactory.getDefaultProduct();
+//		productReqDetails.setName("Qwertyuiop1234567890asdfA");
+		productReqDetails.setTags(Arrays.asList(productReqDetails.getName()));
+		normalizedName = productReqDetails.getName().toLowerCase();
+		RestResponse createProduct = ProductRestUtils.createProduct(productReqDetails, productManager1);
+		ProductRestUtils.checkCreateResponse(createProduct);
+		String productUuid = ResponseParser.getUuidFromResponse(createProduct);
+		compareExpectedAndActualProducts(productReqDetails, createProduct);
+		Product expectedProduct = ResponseParser.parseToObjectUsingMapper(createProduct.getResponse(), Product.class);
+		RestResponse getProductRes = ProductRestUtils.getProduct(productReqDetails.getUniqueId(),
+				productManager1.getUserId());
+		ProductRestUtils.checkSuccess(getProductRes);
+		Product actualProduct = ResponseParser.parseToObjectUsingMapper(getProductRes.getResponse(), Product.class);
+		ProductValidationUtils.compareExpectedAndActualProducts(expectedProduct, actualProduct,
+				ComponentOperationEnum.GET_COMPONENT);
+		assertEquals(actualProduct.getIsActive(), new Boolean(false));
+		ExpectedProductAudit constructFieldsForAuditValidation = Convertor.constructFieldsForAuditValidation(
+				expectedProduct, CREATE_AUDIT_ACTION, productManager1, ActionStatus.CREATED, Constants.EMPTY_STRING,
+				"0.1", null, LifecycleStateEnum.NOT_CERTIFIED_CHECKOUT, productUuid);
+		AuditValidationUtils.validateAuditProduct(constructFieldsForAuditValidation, CREATE_AUDIT_ACTION);
+	}
+
+	@Test
+	public void createProductNameValidationExceedMaxLength() throws Exception {
+		// Max length = 25
+		ProductReqDetails productReqDetails = ElementFactory.getDefaultProduct();
+		productReqDetails.setName("Qwertyuiop1234567890asdfAa");
+		productReqDetails.setTags(Arrays.asList(productReqDetails.getName()));
+		normalizedName = productReqDetails.getName().toLowerCase();
+		RestResponse createProduct = ProductRestUtils.createProduct(productReqDetails, productManager1);
+		assertEquals("Check response code ", BaseRestUtils.STATUS_CODE_INVALID_CONTENT,
+				createProduct.getErrorCode().intValue());
+		Product expectedProduct = Convertor.constructFieldsForRespValidation(productReqDetails, "", productManager1);
+		ExpectedProductAudit constructFieldsForAuditValidation = Convertor.constructFieldsForAuditValidation(
+				expectedProduct, CREATE_AUDIT_ACTION, productManager1,
+				ActionStatus.COMPONENT_ELEMENT_INVALID_NAME_LENGTH, Constants.EMPTY_STRING, Constants.EMPTY_STRING,
+				null, null, Constants.EMPTY_STRING, "Product", "abbreviated");
+		constructFieldsForAuditValidation.setCURR_VERSION("");
+		constructFieldsForAuditValidation.setCURR_STATE("");
+		AuditValidationUtils.validateAuditProduct(constructFieldsForAuditValidation, CREATE_AUDIT_ACTION);
+	}
+
+	@Test
+	public void createProductNameValidationEmptyName() throws Exception {
+		ProductReqDetails productReqDetails = ElementFactory.getDefaultProduct();
+		productReqDetails.setName("");
+		productReqDetails.setTags(Arrays.asList(productReqDetails.getName()));
+		normalizedName = productReqDetails.getName().toLowerCase();
+		RestResponse createProduct = ProductRestUtils.createProduct(productReqDetails, productManager1);
+		assertEquals("Check response code ", BaseRestUtils.STATUS_CODE_INVALID_CONTENT,
+				createProduct.getErrorCode().intValue());
+		Product expectedProduct = Convertor.constructFieldsForRespValidation(productReqDetails, "", productManager1);
+		ExpectedProductAudit constructFieldsForAuditValidation = Convertor.constructFieldsForAuditValidation(
+				expectedProduct, CREATE_AUDIT_ACTION, productManager1, ActionStatus.MISSING_ONE_OF_COMPONENT_NAMES,
+				Constants.EMPTY_STRING, Constants.EMPTY_STRING, null, null, Constants.EMPTY_STRING, "Product",
+				"abbreviated");
+		constructFieldsForAuditValidation.setCURR_VERSION("");
+		constructFieldsForAuditValidation.setCURR_STATE("");
+		AuditValidationUtils.validateAuditProduct(constructFieldsForAuditValidation, CREATE_AUDIT_ACTION);
+	}
+
+	@Test // (enabled = false)
+	public void createProductNameAlreadyExist() throws Exception {
+		ProductReqDetails productReqDetails = ElementFactory.getDefaultProduct();
+		// productReqDetails.setName("CIProduct1");
+		productReqDetails.setTags(Arrays.asList(productReqDetails.getName()));
+		normalizedName = productReqDetails.getName().toLowerCase();
+		RestResponse createProduct = ProductRestUtils.createProduct(productReqDetails, productManager1);
+		ProductRestUtils.checkCreateResponse(createProduct);
+		productReqDetails.setTags(Arrays.asList(productReqDetails.getName()));
+		normalizedName = productReqDetails.getName().toLowerCase();
+		// // productReqDetails.setName("CIProduct1");
+		DbUtils.deleteFromEsDbByPattern("_all");
+		createProduct = ProductRestUtils.createProduct(productReqDetails, productManager1);
+		assertEquals("Check response code ", BaseRestUtils.STATUS_CODE_ALREADY_EXISTS,
+				createProduct.getErrorCode().intValue());
+		productReqDetails.setVersion("0.1");
+		Product expectedProduct = Convertor.constructFieldsForRespValidation(productReqDetails, "", productManager1);
+		ExpectedProductAudit constructFieldsForAuditValidation = Convertor.constructFieldsForAuditValidation(
+				expectedProduct, CREATE_AUDIT_ACTION, productManager1, ActionStatus.COMPONENT_NAME_ALREADY_EXIST,
+				Constants.EMPTY_STRING, Constants.EMPTY_STRING, null, null, Constants.EMPTY_STRING, "Product",
+				productReqDetails.getName());
+		constructFieldsForAuditValidation.setCURR_VERSION("0.1");
+		constructFieldsForAuditValidation.setCURR_STATE("");
+		constructFieldsForAuditValidation.setCURR_STATE("NOT_CERTIFIED_CHECKOUT");
+		constructFieldsForAuditValidation.setSERVICE_INSTANCE_ID(null);
+		AuditValidationUtils.validateAuditProduct(constructFieldsForAuditValidation, CREATE_AUDIT_ACTION);
+	}
+
+	@Test
+	public void createProductNameValidationNameIsNull() throws Exception {
+		ProductReqDetails productReqDetails = ElementFactory.getDefaultProduct();
+		productReqDetails.setName(null);
+		RestResponse createProduct = ProductRestUtils.createProduct(productReqDetails, productManager1);
+		assertEquals("Check response code ", BaseRestUtils.STATUS_CODE_INVALID_CONTENT,
+				createProduct.getErrorCode().intValue());
+		Product expectedProduct = Convertor.constructFieldsForRespValidation(productReqDetails, "", productManager1);
+		ExpectedProductAudit constructFieldsForAuditValidation = Convertor.constructFieldsForAuditValidation(
+				expectedProduct, CREATE_AUDIT_ACTION, productManager1, ActionStatus.MISSING_ONE_OF_COMPONENT_NAMES,
+				Constants.EMPTY_STRING, Constants.EMPTY_STRING, null, null, Constants.EMPTY_STRING, "Product",
+				"abbreviated");
+		constructFieldsForAuditValidation.setCURR_VERSION("");
+		constructFieldsForAuditValidation.setCURR_STATE("");
+		AuditValidationUtils.validateAuditProduct(constructFieldsForAuditValidation, CREATE_AUDIT_ACTION);
+	}
+
+	// DE193857
+	@Test (enabled = false)
+	public void createProductNameValidationAllowedCharacters() throws Exception {
+		ProductReqDetails productReqDetails = ElementFactory.getDefaultProduct();
+		productReqDetails.setName("Ci_2@3:4& m=n+b-u.j-u'g#b"); // Bug @:&=+'#
+		normalizedName = "ci234mnbujugb";
+		String expectedProductName = "Ci_2@3:4& M=n+b-u.j-u'g#b";
+		productReqDetails.setTags(Arrays.asList(productReqDetails.getName()));
+		RestResponse createProduct = ProductRestUtils.createProduct(productReqDetails, productManager1);
+		ProductRestUtils.checkCreateResponse(createProduct);
+		String productUuid = ResponseParser.getUuidFromResponse(createProduct);
+		productReqDetails.setName(expectedProductName);
+		productReqDetails.setName("Ci_2@3:4& M=n+b-u.j-u'g#b");
+		compareExpectedAndActualProducts(productReqDetails, createProduct);
+		Product expectedProduct = ResponseParser.parseToObjectUsingMapper(createProduct.getResponse(), Product.class);
+		expectedProduct.setNormalizedName(normalizedName);
+		RestResponse getProductRes = ProductRestUtils.getProduct(productReqDetails.getUniqueId(),
+				productManager1.getUserId());
+		ProductRestUtils.checkSuccess(getProductRes);
+		Product actualProduct = ResponseParser.parseToObjectUsingMapper(getProductRes.getResponse(), Product.class);
+		ProductValidationUtils.compareExpectedAndActualProducts(expectedProduct, actualProduct,
+				ComponentOperationEnum.GET_COMPONENT);
+		assertEquals(actualProduct.getIsActive(), new Boolean(false));
+		ExpectedProductAudit constructFieldsForAuditValidation = Convertor.constructFieldsForAuditValidation(
+				expectedProduct, CREATE_AUDIT_ACTION, productManager1, ActionStatus.CREATED, Constants.EMPTY_STRING,
+				"0.1", null, LifecycleStateEnum.NOT_CERTIFIED_CHECKOUT, productUuid);
+		AuditValidationUtils.validateAuditProduct(constructFieldsForAuditValidation, CREATE_AUDIT_ACTION);
+	}
+
+	// DE193857
+	@Test
+	public void createProductNameValidationREmoveExtraNonAlphanumericChars() throws Exception {
+		ProductReqDetails productReqDetails = ElementFactory.getDefaultProduct();
+		productReqDetails.setName("Ci____222----333......asd");
+//		productReqDetails.setTags(Arrays.asList(productReqDetails.getName()));
+		RestResponse createProduct = ProductRestUtils.createProduct(productReqDetails, productManager1);
+		ProductRestUtils.checkCreateResponse(createProduct);
+		productReqDetails.setName("Ci_222-333.asd");
+		normalizedName = "ci222333asd";
+		String productUuid = ResponseParser.getUuidFromResponse(createProduct);
+		compareExpectedAndActualProducts(productReqDetails, createProduct);
+		Product expectedProduct = ResponseParser.parseToObjectUsingMapper(createProduct.getResponse(), Product.class);
+		RestResponse getProductRes = ProductRestUtils.getProduct(productReqDetails.getUniqueId(),
+				productManager1.getUserId());
+		ProductRestUtils.checkSuccess(getProductRes);
+		Product actualProduct = ResponseParser.parseToObjectUsingMapper(getProductRes.getResponse(), Product.class);
+		ProductValidationUtils.compareExpectedAndActualProducts(expectedProduct, actualProduct,
+				ComponentOperationEnum.GET_COMPONENT);
+		assertEquals(actualProduct.getIsActive(), new Boolean(false));
+		ExpectedProductAudit constructFieldsForAuditValidation = Convertor.constructFieldsForAuditValidation(
+				expectedProduct, CREATE_AUDIT_ACTION, productManager1, ActionStatus.CREATED, Constants.EMPTY_STRING,
+				"0.1", null, LifecycleStateEnum.NOT_CERTIFIED_CHECKOUT, productUuid);
+		AuditValidationUtils.validateAuditProduct(constructFieldsForAuditValidation, CREATE_AUDIT_ACTION);
+	}
+
+	@Test
+	public void createProductNameValidationNotAllowedCharacters() throws Exception {
+		ExpectedProductAudit constructFieldsForAuditValidation;
+		char invalidChars[] = { '~', '!', '%', '^', '*', '(', ')', '"', '{', '}', '[', ']', '?', '>', '<', '/', '|',
+				'\\', ',', '$' };
+		for (int i = 0; i < invalidChars.length; i++) {
+			DbUtils.deleteFromEsDbByPattern("_all");
+			ProductReqDetails productReqDetails = ElementFactory.getDefaultProduct();
+			productReqDetails.setName("abc" + invalidChars[i]);
+			RestResponse createProduct = ProductRestUtils.createProduct(productReqDetails, productManager1);
+			assertEquals("Check response code ", BaseRestUtils.STATUS_CODE_INVALID_CONTENT,
+					createProduct.getErrorCode().intValue());
+			Product expectedProduct = Convertor.constructFieldsForRespValidation(productReqDetails, "",
+					productManager1);
+			constructFieldsForAuditValidation = Convertor.constructFieldsForAuditValidation(expectedProduct,
+					CREATE_AUDIT_ACTION, productManager1, ActionStatus.COMPONENT_ELEMENT_INVALID_NAME_FORMAT,
+					Constants.EMPTY_STRING, Constants.EMPTY_STRING, null, null, Constants.EMPTY_STRING, "Product",
+					"abbreviated");
+			constructFieldsForAuditValidation.setCURR_VERSION("");
+			constructFieldsForAuditValidation.setCURR_STATE("");
+			AuditValidationUtils.validateAuditProduct(constructFieldsForAuditValidation, CREATE_AUDIT_ACTION);
+		}
+	}
+
+	@Test
+	public void createProductFullNameContainSpecialCharacters() throws Exception {
+		char invalidChars[] = { '~', '!', '%', '^', '*', '(', ')', '"', '{', '}', '[', ']', '?', '>', '<', '/', '|',
+				'\\', ',', '$' };
+		ProductReqDetails productReqDetails = ElementFactory.getDefaultProduct();
+		for (int i = 0; i < invalidChars.length; i++) {
+			DbUtils.deleteFromEsDbByPattern("_all");
+			productReqDetails.setFullName("abc" + invalidChars[i]);
+			RestResponse createProduct = ProductRestUtils.createProduct(productReqDetails, productManager1);
+			assertEquals("Check response code ", BaseRestUtils.STATUS_CODE_CREATED,
+					createProduct.getErrorCode().intValue());
+			RestResponse deleteProduct = ProductRestUtils.deleteProduct(productReqDetails.getUniqueId(),
+					productManager1.getUserId());
+			assertEquals("Check response code ", BaseRestUtils.STATUS_CODE_SUCCESS,
+					deleteProduct.getErrorCode().intValue());
+		}
+	}
+
+	// Already enabled = false
+	@Test
+	public void createProductNameValidationRemoveSpaceFromBeginning() throws Exception {
+		ProductReqDetails productReqDetails = ElementFactory.getDefaultProduct();
+		productReqDetails.setName("         Ciertyuiop1234567890asdfA");
+//		productReqDetails.setTags(Arrays.asList(productReqDetails.getName().trim()));
+		normalizedName = productReqDetails.getName().trim().toLowerCase();
+		RestResponse createProduct = ProductRestUtils.createProduct(productReqDetails, productManager1);
+		ProductRestUtils.checkCreateResponse(createProduct);
+		String productUuid = ResponseParser.getUuidFromResponse(createProduct);
+		productReqDetails.setName("         Ciertyuiop1234567890asdfA".trim());
+		compareExpectedAndActualProducts(productReqDetails, createProduct);
+		Product expectedProduct = ResponseParser.parseToObjectUsingMapper(createProduct.getResponse(), Product.class);
+		RestResponse getProductRes = ProductRestUtils.getProduct(productReqDetails.getUniqueId(),
+				productManager1.getUserId());
+		ProductRestUtils.checkSuccess(getProductRes);
+		Product actualProduct = ResponseParser.parseToObjectUsingMapper(getProductRes.getResponse(), Product.class);
+		ProductValidationUtils.compareExpectedAndActualProducts(expectedProduct, actualProduct,
+				ComponentOperationEnum.GET_COMPONENT);
+		assertEquals(actualProduct.getIsActive(), new Boolean(false));
+		ExpectedProductAudit constructFieldsForAuditValidation = Convertor.constructFieldsForAuditValidation(
+				expectedProduct, CREATE_AUDIT_ACTION, productManager1, ActionStatus.CREATED, Constants.EMPTY_STRING,
+				"0.1", null, LifecycleStateEnum.NOT_CERTIFIED_CHECKOUT, productUuid);
+		AuditValidationUtils.validateAuditProduct(constructFieldsForAuditValidation, CREATE_AUDIT_ACTION);
+	}
+
+	// Already enabled = false
+	@Test
+	public void createProductNameValidationRemoveSpaceFromTheEnd() throws Exception {
+		ProductReqDetails productReqDetails = ElementFactory.getDefaultProduct();
+		productReqDetails.setName("Ciertyuiop1234567890asdfA        ");
+//		productReqDetails.setTags(Arrays.asList(productReqDetails.getName().trim()));
+		normalizedName = productReqDetails.getName().trim().toLowerCase();
+		RestResponse createProduct = ProductRestUtils.createProduct(productReqDetails, productManager1);
+		ProductRestUtils.checkCreateResponse(createProduct);
+		String productUuid = ResponseParser.getUuidFromResponse(createProduct);
+		productReqDetails.setName("Ciertyuiop1234567890asdfA        ".trim());
+		compareExpectedAndActualProducts(productReqDetails, createProduct);
+		Product expectedProduct = ResponseParser.parseToObjectUsingMapper(createProduct.getResponse(), Product.class);
+		RestResponse getProductRes = ProductRestUtils.getProduct(productReqDetails.getUniqueId(),
+				productManager1.getUserId());
+		ProductRestUtils.checkSuccess(getProductRes);
+		Product actualProduct = ResponseParser.parseToObjectUsingMapper(getProductRes.getResponse(), Product.class);
+		ProductValidationUtils.compareExpectedAndActualProducts(expectedProduct, actualProduct,
+				ComponentOperationEnum.GET_COMPONENT);
+		assertEquals(actualProduct.getIsActive(), new Boolean(false));
+		ExpectedProductAudit constructFieldsForAuditValidation = Convertor.constructFieldsForAuditValidation(
+				expectedProduct, CREATE_AUDIT_ACTION, productManager1, ActionStatus.CREATED, Constants.EMPTY_STRING,
+				"0.1", null, LifecycleStateEnum.NOT_CERTIFIED_CHECKOUT, productUuid);
+		AuditValidationUtils.validateAuditProduct(constructFieldsForAuditValidation, CREATE_AUDIT_ACTION);
+	}
+
+	@Test
+	public void createProductNameValidationStartWithNumber() throws Exception {
+		ProductReqDetails productReqDetails = ElementFactory.getDefaultProduct();
+		productReqDetails.setName("1Qwert");
+//		productReqDetails.setTags(Arrays.asList(productReqDetails.getName().trim()));
+		normalizedName = productReqDetails.getName().trim().toLowerCase();
+		RestResponse createProduct = ProductRestUtils.createProduct(productReqDetails, productManager1);
+		ProductRestUtils.checkCreateResponse(createProduct);
+		String productUuid = ResponseParser.getUuidFromResponse(createProduct);
+		compareExpectedAndActualProducts(productReqDetails, createProduct);
+		Product expectedProduct = ResponseParser.parseToObjectUsingMapper(createProduct.getResponse(), Product.class);
+		RestResponse getProductRes = ProductRestUtils.getProduct(productReqDetails.getUniqueId(),
+				productManager1.getUserId());
+		ProductRestUtils.checkSuccess(getProductRes);
+		Product actualProduct = ResponseParser.parseToObjectUsingMapper(getProductRes.getResponse(), Product.class);
+		ProductValidationUtils.compareExpectedAndActualProducts(expectedProduct, actualProduct,
+				ComponentOperationEnum.GET_COMPONENT);
+		assertEquals(actualProduct.getIsActive(), new Boolean(false));
+		ExpectedProductAudit constructFieldsForAuditValidation = Convertor.constructFieldsForAuditValidation(
+				expectedProduct, CREATE_AUDIT_ACTION, productManager1, ActionStatus.CREATED, Constants.EMPTY_STRING,
+				"0.1", null, LifecycleStateEnum.NOT_CERTIFIED_CHECKOUT, productUuid);
+		AuditValidationUtils.validateAuditProduct(constructFieldsForAuditValidation, CREATE_AUDIT_ACTION);
+		productReqDetails.setName("Ci1Qwert");
+		RestResponse updateProduct = ProductRestUtils.updateProduct(productReqDetails, productManager1);
+		
+	}
+
+	@Test
+	public void createProductNameValidationStartWithNonAlphaNumeric() throws Exception {
+		ProductReqDetails productReqDetails = ElementFactory.getDefaultProduct();
+		productReqDetails.setName("_Qwert");
+		productReqDetails.setTags(Arrays.asList(productReqDetails.getName().trim()));
+		normalizedName = productReqDetails.getName().trim().toLowerCase();
+		RestResponse createProduct = ProductRestUtils.createProduct(productReqDetails, productManager1);
+		assertEquals("Check response code ", BaseRestUtils.STATUS_CODE_INVALID_CONTENT,
+				createProduct.getErrorCode().intValue());
+		Product expectedProduct = Convertor.constructFieldsForRespValidation(productReqDetails, "", productManager1);
+		ExpectedProductAudit constructFieldsForAuditValidation = Convertor.constructFieldsForAuditValidation(
+				expectedProduct, CREATE_AUDIT_ACTION, productManager1,
+				ActionStatus.COMPONENT_ELEMENT_INVALID_NAME_FORMAT, Constants.EMPTY_STRING, Constants.EMPTY_STRING,
+				null, null, Constants.EMPTY_STRING, "Product", "abbreviated");
+		constructFieldsForAuditValidation.setCURR_VERSION("");
+		constructFieldsForAuditValidation.setCURR_STATE("");
+		AuditValidationUtils.validateAuditProduct(constructFieldsForAuditValidation, CREATE_AUDIT_ACTION);
+	}
+
+	@Test // (enabled = false)
+	public void createProductNameValidationFirstLetterOfKeyWordsCapitalized() throws Exception {
+		ProductReqDetails productReqDetails = ElementFactory.getDefaultProduct();
+		// productReqDetails.setName("Abba");
+		// productReqDetails.setTags(Arrays.asList("abba"));
+		normalizedName = productReqDetails.getName().toLowerCase().replaceAll("\\s+", "");
+		RestResponse createProduct = ProductRestUtils.createProduct(productReqDetails, productManager1);
+		ProductRestUtils.checkCreateResponse(createProduct);
+		// // productReqDetails.setName("Abba");
+		/*
+		 * String actualNormalizedNameFromResponse =
+		 * ResponseParser.getValueFromJsonResponse(createProduct.getResponse(),
+		 * "normalizedName");
+		 * assertTrue(actualNormalizedNameFromResponse.equals(normalizedName));
+		 */
+		String productUuid = ResponseParser.getUuidFromResponse(createProduct);
+		compareExpectedAndActualProducts(productReqDetails, createProduct);
+		Product expectedProduct = ResponseParser.parseToObjectUsingMapper(createProduct.getResponse(), Product.class);
+		RestResponse getProductRes = ProductRestUtils.getProduct(productReqDetails.getUniqueId(),
+				productManager1.getUserId());
+		ProductRestUtils.checkSuccess(getProductRes);
+		Product actualProduct = ResponseParser.parseToObjectUsingMapper(getProductRes.getResponse(), Product.class);
+		ProductValidationUtils.compareExpectedAndActualProducts(expectedProduct, actualProduct,
+				ComponentOperationEnum.GET_COMPONENT);
+		assertEquals(actualProduct.getIsActive(), new Boolean(false));
+		ExpectedProductAudit constructFieldsForAuditValidation = Convertor.constructFieldsForAuditValidation(
+				expectedProduct, CREATE_AUDIT_ACTION, productManager1, ActionStatus.CREATED, Constants.EMPTY_STRING,
+				"0.1", null, LifecycleStateEnum.NOT_CERTIFIED_CHECKOUT, productUuid);
+		AuditValidationUtils.validateAuditProduct(constructFieldsForAuditValidation, CREATE_AUDIT_ACTION);
+	}
+
+	@Test
+	public void createProductFullNameValidationIsEmpty() throws Exception {
+		ProductReqDetails productReqDetails = ElementFactory.getDefaultProduct();
+		productReqDetails.setFullName("");
+		RestResponse createProduct = ProductRestUtils.createProduct(productReqDetails, productManager1);
+		assertEquals("Check response code ", BaseRestUtils.STATUS_CODE_INVALID_CONTENT,
+				createProduct.getErrorCode().intValue());
+		Product expectedProduct = Convertor.constructFieldsForRespValidation(productReqDetails, "", productManager1);
+		ExpectedProductAudit constructFieldsForAuditValidation = Convertor.constructFieldsForAuditValidation(
+				expectedProduct, CREATE_AUDIT_ACTION, productManager1, ActionStatus.MISSING_ONE_OF_COMPONENT_NAMES,
+				Constants.EMPTY_STRING, Constants.EMPTY_STRING, null, null, Constants.EMPTY_STRING, "Product", "full");
+		constructFieldsForAuditValidation.setCURR_VERSION("");
+		constructFieldsForAuditValidation.setCURR_STATE("");
+		AuditValidationUtils.validateAuditProduct(constructFieldsForAuditValidation, CREATE_AUDIT_ACTION);
+	}
+
+	@Test
+	public void createProductFullNameValidationIsNull() throws Exception {
+		ProductReqDetails productReqDetails = ElementFactory.getDefaultProduct();
+		productReqDetails.setFullName("");
+		RestResponse createProduct = ProductRestUtils.createProduct(productReqDetails, productManager1);
+		assertEquals("Check response code ", BaseRestUtils.STATUS_CODE_INVALID_CONTENT,
+				createProduct.getErrorCode().intValue());
+		Product expectedProduct = Convertor.constructFieldsForRespValidation(productReqDetails, "", productManager1);
+		ExpectedProductAudit constructFieldsForAuditValidation = Convertor.constructFieldsForAuditValidation(
+				expectedProduct, CREATE_AUDIT_ACTION, productManager1, ActionStatus.MISSING_ONE_OF_COMPONENT_NAMES,
+				Constants.EMPTY_STRING, Constants.EMPTY_STRING, null, null, Constants.EMPTY_STRING, "Product", "full");
+		constructFieldsForAuditValidation.setCURR_VERSION("");
+		constructFieldsForAuditValidation.setCURR_STATE("");
+		AuditValidationUtils.validateAuditProduct(constructFieldsForAuditValidation, CREATE_AUDIT_ACTION);
+	}
+
+	@Test
+	public void createProductFullNameLessThanMinLength() throws Exception {
+		// Min is 4 characters
+		ProductReqDetails productReqDetails = ElementFactory.getDefaultProduct();
+		productReqDetails.setFullName("abc");
+		RestResponse createProduct = ProductRestUtils.createProduct(productReqDetails, productManager1);
+		assertEquals("Check response code ", BaseRestUtils.STATUS_CODE_INVALID_CONTENT,
+				createProduct.getErrorCode().intValue());
+		Product expectedProduct = Convertor.constructFieldsForRespValidation(productReqDetails, "", productManager1);
+		ExpectedProductAudit constructFieldsForAuditValidation = Convertor.constructFieldsForAuditValidation(
+				expectedProduct, CREATE_AUDIT_ACTION, productManager1,
+				ActionStatus.COMPONENT_ELEMENT_INVALID_NAME_LENGTH, Constants.EMPTY_STRING, Constants.EMPTY_STRING,
+				null, null, Constants.EMPTY_STRING, "Product", "full");
+		constructFieldsForAuditValidation.setCURR_VERSION("");
+		constructFieldsForAuditValidation.setCURR_STATE("");
+		AuditValidationUtils.validateAuditProduct(constructFieldsForAuditValidation, CREATE_AUDIT_ACTION);
+	}
+
+	@Test // (enabled = false)
+	public void createProductFullNameHasMinLength() throws Exception {
+		ProductReqDetails productReqDetails = ElementFactory.getDefaultProduct();
+		// productReqDetails.setName("Abba");
+		productReqDetails.setTags(Arrays.asList(productReqDetails.getName()));
+		normalizedName = productReqDetails.getName().toLowerCase().replaceAll("\\s+", "");
+		productReqDetails.setFullName("abcd");
+		RestResponse createProduct = ProductRestUtils.createProduct(productReqDetails, productManager1);
+		ProductRestUtils.checkCreateResponse(createProduct);
+		String productUuid = ResponseParser.getUuidFromResponse(createProduct);
+		compareExpectedAndActualProducts(productReqDetails, createProduct);
+		Product expectedProduct = ResponseParser.parseToObjectUsingMapper(createProduct.getResponse(), Product.class);
+		RestResponse getProductRes = ProductRestUtils.getProduct(productReqDetails.getUniqueId(),
+				productManager1.getUserId());
+		ProductRestUtils.checkSuccess(getProductRes);
+		Product actualProduct = ResponseParser.parseToObjectUsingMapper(getProductRes.getResponse(), Product.class);
+		ProductValidationUtils.compareExpectedAndActualProducts(expectedProduct, actualProduct,
+				ComponentOperationEnum.GET_COMPONENT);
+		assertEquals(actualProduct.getIsActive(), new Boolean(false));
+		ExpectedProductAudit constructFieldsForAuditValidation = Convertor.constructFieldsForAuditValidation(
+				expectedProduct, CREATE_AUDIT_ACTION, productManager1, ActionStatus.CREATED, Constants.EMPTY_STRING,
+				"0.1", null, LifecycleStateEnum.NOT_CERTIFIED_CHECKOUT, productUuid);
+		AuditValidationUtils.validateAuditProduct(constructFieldsForAuditValidation, CREATE_AUDIT_ACTION);
+	}
+
+	@Test // (enabled = false)
+	public void createProductFullNameHasMaxLength() throws Exception {
+		ProductReqDetails productReqDetails = ElementFactory.getDefaultProduct();
+		// productReqDetails.setName("Abba");
+		productReqDetails.setTags(Arrays.asList(productReqDetails.getName()));
+		normalizedName = productReqDetails.getName().toLowerCase().replaceAll("\\s+", "");
+		productReqDetails.setFullName(
+				"Abba1234567890asdfghjk l123zxcvbnm432adfghjkl_-.123Abba1234567890asdfghjkl23zxcvbnm432asdfghjkl_-.12");
+		RestResponse createProduct = ProductRestUtils.createProduct(productReqDetails, productManager1);
+		ProductRestUtils.checkCreateResponse(createProduct);
+		String productUuid = ResponseParser.getUuidFromResponse(createProduct);
+		compareExpectedAndActualProducts(productReqDetails, createProduct);
+		Product expectedProduct = ResponseParser.parseToObjectUsingMapper(createProduct.getResponse(), Product.class);
+		RestResponse getProductRes = ProductRestUtils.getProduct(productReqDetails.getUniqueId(),
+				productManager1.getUserId());
+		ProductRestUtils.checkSuccess(getProductRes);
+		Product actualProduct = ResponseParser.parseToObjectUsingMapper(getProductRes.getResponse(), Product.class);
+		ProductValidationUtils.compareExpectedAndActualProducts(expectedProduct, actualProduct,
+				ComponentOperationEnum.GET_COMPONENT);
+		assertEquals(actualProduct.getIsActive(), new Boolean(false));
+		ExpectedProductAudit constructFieldsForAuditValidation = Convertor.constructFieldsForAuditValidation(
+				expectedProduct, CREATE_AUDIT_ACTION, productManager1, ActionStatus.CREATED, Constants.EMPTY_STRING,
+				"0.1", null, LifecycleStateEnum.NOT_CERTIFIED_CHECKOUT, productUuid);
+		AuditValidationUtils.validateAuditProduct(constructFieldsForAuditValidation, CREATE_AUDIT_ACTION);
+	}
+
+	@Test // (enabled = false)
+	public void createProductFullNameExceedMaxLength() throws Exception {
+		ProductReqDetails productReqDetails = ElementFactory.getDefaultProduct();
+		// productReqDetails.setName("Abba");
+		productReqDetails.setTags(Arrays.asList(productReqDetails.getName()));
+		normalizedName = productReqDetails.getName().toLowerCase().replaceAll("\\s+", "");
+		productReqDetails.setFullName(
+				"Abba1234567890asdfghjk l123zxcvbnm432adfghjkl_-.123Abba1234567890asdfghjkl23zxcvbnm432asdfghjkl_-.123");
+		RestResponse createProduct = ProductRestUtils.createProduct(productReqDetails, productManager1);
+		assertEquals("Check response code ", BaseRestUtils.STATUS_CODE_INVALID_CONTENT,
+				createProduct.getErrorCode().intValue());
+		Product expectedProduct = Convertor.constructFieldsForRespValidation(productReqDetails, "", productManager1);
+		ExpectedProductAudit constructFieldsForAuditValidation = Convertor.constructFieldsForAuditValidation(
+				expectedProduct, CREATE_AUDIT_ACTION, productManager1,
+				ActionStatus.COMPONENT_ELEMENT_INVALID_NAME_LENGTH, Constants.EMPTY_STRING, Constants.EMPTY_STRING,
+				null, null, Constants.EMPTY_STRING, "Product", "full");
+		constructFieldsForAuditValidation.setCURR_VERSION("");
+		constructFieldsForAuditValidation.setCURR_STATE("");
+		AuditValidationUtils.validateAuditProduct(constructFieldsForAuditValidation, CREATE_AUDIT_ACTION);
+	}
+
+	@Test // (enabled = false)
+	public void createProductFullNameRemoveExtraSpaces() throws Exception {
+		ProductReqDetails productReqDetails = ElementFactory.getDefaultProduct();
+		// productReqDetails.setName("Abba");
+		productReqDetails.setTags(Arrays.asList(productReqDetails.getName()));
+		normalizedName = productReqDetails.getName().toLowerCase().replaceAll("\\s+", "");
+		productReqDetails.setFullName("Abbaaa  a1");
+		RestResponse createProduct = ProductRestUtils.createProduct(productReqDetails, productManager1);
+		ProductRestUtils.checkCreateResponse(createProduct);
+		productReqDetails.setFullName("Abbaaa a1");
+		String productUuid = ResponseParser.getUuidFromResponse(createProduct);
+		compareExpectedAndActualProducts(productReqDetails, createProduct);
+		Product expectedProduct = ResponseParser.parseToObjectUsingMapper(createProduct.getResponse(), Product.class);
+		RestResponse getProductRes = ProductRestUtils.getProduct(productReqDetails.getUniqueId(),
+				productManager1.getUserId());
+		ProductRestUtils.checkSuccess(getProductRes);
+		Product actualProduct = ResponseParser.parseToObjectUsingMapper(getProductRes.getResponse(), Product.class);
+		ProductValidationUtils.compareExpectedAndActualProducts(expectedProduct, actualProduct,
+				ComponentOperationEnum.GET_COMPONENT);
+		assertEquals(actualProduct.getIsActive(), new Boolean(false));
+		ExpectedProductAudit constructFieldsForAuditValidation = Convertor.constructFieldsForAuditValidation(
+				expectedProduct, CREATE_AUDIT_ACTION, productManager1, ActionStatus.CREATED, Constants.EMPTY_STRING,
+				"0.1", null, LifecycleStateEnum.NOT_CERTIFIED_CHECKOUT, productUuid);
+		AuditValidationUtils.validateAuditProduct(constructFieldsForAuditValidation, CREATE_AUDIT_ACTION);
+	}
+
+	@Test
+	public void createProductDescriptionValidationIsEmpty() throws Exception {
+		ProductReqDetails productReqDetails = ElementFactory.getDefaultProduct();
+		productReqDetails.setDescription("");
+		RestResponse createProduct = ProductRestUtils.createProduct(productReqDetails, productManager1);
+		assertEquals("Check response code ", BaseRestUtils.STATUS_CODE_INVALID_CONTENT,
+				createProduct.getErrorCode().intValue());
+		Product expectedProduct = Convertor.constructFieldsForRespValidation(productReqDetails, "", productManager1);
+		ExpectedProductAudit constructFieldsForAuditValidation = Convertor.constructFieldsForAuditValidation(
+				expectedProduct, CREATE_AUDIT_ACTION, productManager1, ActionStatus.COMPONENT_MISSING_DESCRIPTION,
+				Constants.EMPTY_STRING, Constants.EMPTY_STRING, null, null, Constants.EMPTY_STRING, "Product");
+		constructFieldsForAuditValidation.setCURR_VERSION("");
+		constructFieldsForAuditValidation.setCURR_STATE("");
+		AuditValidationUtils.validateAuditProduct(constructFieldsForAuditValidation, CREATE_AUDIT_ACTION);
+	}
+
+	@Test
+	public void createProductDescriptionValidationIsNull() throws Exception {
+		ProductReqDetails productReqDetails = ElementFactory.getDefaultProduct();
+		productReqDetails.setDescription(null);
+		RestResponse createProduct = ProductRestUtils.createProduct(productReqDetails, productManager1);
+		assertEquals("Check response code ", BaseRestUtils.STATUS_CODE_INVALID_CONTENT,
+				createProduct.getErrorCode().intValue());
+		Product expectedProduct = Convertor.constructFieldsForRespValidation(productReqDetails, "", productManager1);
+		ExpectedProductAudit constructFieldsForAuditValidation = Convertor.constructFieldsForAuditValidation(
+				expectedProduct, CREATE_AUDIT_ACTION, productManager1, ActionStatus.COMPONENT_MISSING_DESCRIPTION,
+				Constants.EMPTY_STRING, Constants.EMPTY_STRING, null, null, Constants.EMPTY_STRING, "Product");
+		constructFieldsForAuditValidation.setCURR_VERSION("");
+		constructFieldsForAuditValidation.setCURR_STATE("");
+		AuditValidationUtils.validateAuditProduct(constructFieldsForAuditValidation, CREATE_AUDIT_ACTION);
+	}
+
+	@Test (enabled = false)
+	public void createProductDescriptionValidCharacters01() throws Exception {
+		ProductReqDetails productReqDetails = ElementFactory.getDefaultProduct();
+		// productReqDetails.setName("Abba");
+		productReqDetails.setTags(Arrays.asList(productReqDetails.getName()));
+		normalizedName = productReqDetails.getName().toLowerCase().replaceAll("\\s+", "");
+		productReqDetails.setDescription("qwertyuiopasdfghjklzxcvbnm1234567890<b>Bold<</b>");
+		RestResponse createProduct = ProductRestUtils.createProduct(productReqDetails, productManager1);
+		ProductRestUtils.checkCreateResponse(createProduct);
+		productReqDetails.setDescription("qwertyuiopasdfghjklzxcvbnm1234567890Bold&lt;");
+		String productUuid = ResponseParser.getUuidFromResponse(createProduct);
+		compareExpectedAndActualProducts(productReqDetails, createProduct);
+		Product expectedProduct = ResponseParser.parseToObjectUsingMapper(createProduct.getResponse(), Product.class);
+		RestResponse getProductRes = ProductRestUtils.getProduct(productReqDetails.getUniqueId(),
+				productManager1.getUserId());
+		ProductRestUtils.checkSuccess(getProductRes);
+		Product actualProduct = ResponseParser.parseToObjectUsingMapper(getProductRes.getResponse(), Product.class);
+		ProductValidationUtils.compareExpectedAndActualProducts(expectedProduct, actualProduct,
+				ComponentOperationEnum.GET_COMPONENT);
+		assertEquals(actualProduct.getIsActive(), new Boolean(false));
+		ExpectedProductAudit constructFieldsForAuditValidation = Convertor.constructFieldsForAuditValidation(
+				expectedProduct, CREATE_AUDIT_ACTION, productManager1, ActionStatus.CREATED, Constants.EMPTY_STRING,
+				"0.1", null, LifecycleStateEnum.NOT_CERTIFIED_CHECKOUT, productUuid);
+		AuditValidationUtils.validateAuditProduct(constructFieldsForAuditValidation, CREATE_AUDIT_ACTION);
+	}
+
+	@Test (enabled = false)
+	public void createProductDescriptionValidCharacters02() throws Exception {
+		ProductReqDetails productReqDetails = ElementFactory.getDefaultProduct();
+		// productReqDetails.setName("Abba");
+		productReqDetails.setTags(Arrays.asList(productReqDetails.getName()));
+		normalizedName = productReqDetails.getName().toLowerCase().replaceAll("\\s+", "");
+		productReqDetails.setDescription("~!@#$%^&*()_+<>?qwertyuiopasdfghjklzxcvbnm1234567890#");
+		RestResponse createProduct = ProductRestUtils.createProduct(productReqDetails, productManager1);
+		ProductRestUtils.checkCreateResponse(createProduct);
+		productReqDetails.setDescription("~!@#$%^&amp;*()_+&lt;&gt;?qwertyuiopasdfghjklzxcvbnm1234567890#");
+		String productUuid = ResponseParser.getUuidFromResponse(createProduct);
+		compareExpectedAndActualProducts(productReqDetails, createProduct);
+		Product expectedProduct = ResponseParser.parseToObjectUsingMapper(createProduct.getResponse(), Product.class);
+		RestResponse getProductRes = ProductRestUtils.getProduct(productReqDetails.getUniqueId(),
+				productManager1.getUserId());
+		ProductRestUtils.checkSuccess(getProductRes);
+		Product actualProduct = ResponseParser.parseToObjectUsingMapper(getProductRes.getResponse(), Product.class);
+		ProductValidationUtils.compareExpectedAndActualProducts(expectedProduct, actualProduct,
+				ComponentOperationEnum.GET_COMPONENT);
+		assertEquals(actualProduct.getIsActive(), new Boolean(false));
+		ExpectedProductAudit constructFieldsForAuditValidation = Convertor.constructFieldsForAuditValidation(
+				expectedProduct, CREATE_AUDIT_ACTION, productManager1, ActionStatus.CREATED, Constants.EMPTY_STRING,
+				"0.1", null, LifecycleStateEnum.NOT_CERTIFIED_CHECKOUT, productUuid);
+		AuditValidationUtils.validateAuditProduct(constructFieldsForAuditValidation, CREATE_AUDIT_ACTION);
+	}
+
+	@Test // (enabled = false)
+	public void createProductDescriptionInValidCharacters() throws Exception {
+		ProductReqDetails productReqDetails = ElementFactory.getDefaultProduct();
+		// productReqDetails.setName("Abba");
+		productReqDetails.setTags(Arrays.asList(productReqDetails.getName()));
+		normalizedName = productReqDetails.getName().toLowerCase().replaceAll("\\s+", "");
+		productReqDetails.setDescription("מה");
+		RestResponse createProduct = ProductRestUtils.createProduct(productReqDetails, productManager1);
+		assertEquals("Check response code ", BaseRestUtils.STATUS_CODE_INVALID_CONTENT,
+				createProduct.getErrorCode().intValue());
+		Product expectedProduct = Convertor.constructFieldsForRespValidation(productReqDetails, "", productManager1);
+		ExpectedProductAudit constructFieldsForAuditValidation = Convertor.constructFieldsForAuditValidation(
+				expectedProduct, CREATE_AUDIT_ACTION, productManager1, ActionStatus.COMPONENT_INVALID_DESCRIPTION,
+				Constants.EMPTY_STRING, Constants.EMPTY_STRING, null, null, Constants.EMPTY_STRING, "Product");
+		constructFieldsForAuditValidation.setCURR_VERSION("");
+		constructFieldsForAuditValidation.setCURR_STATE("");
+		AuditValidationUtils.validateAuditProduct(constructFieldsForAuditValidation, CREATE_AUDIT_ACTION);
+	}
+
+	@Test (enabled = false)
+	public void createProductDescriptionRemoveSpacesFromBeginning() throws Exception {
+		ProductReqDetails productReqDetails = ElementFactory.getDefaultProduct();
+		// productReqDetails.setName("Abba");
+		productReqDetails.setTags(Arrays.asList(productReqDetails.getName()));
+		normalizedName = productReqDetails.getName().toLowerCase().replaceAll("\\s+", "");
+		productReqDetails.setDescription("   abcd12345");
+		RestResponse createProduct = ProductRestUtils.createProduct(productReqDetails, productManager1);
+		ProductRestUtils.checkCreateResponse(createProduct);
+		productReqDetails.setDescription("abcd12345");
+		String productUuid = ResponseParser.getUuidFromResponse(createProduct);
+		compareExpectedAndActualProducts(productReqDetails, createProduct);
+		Product expectedProduct = ResponseParser.parseToObjectUsingMapper(createProduct.getResponse(), Product.class);
+		RestResponse getProductRes = ProductRestUtils.getProduct(productReqDetails.getUniqueId(),
+				productManager1.getUserId());
+		ProductRestUtils.checkSuccess(getProductRes);
+		Product actualProduct = ResponseParser.parseToObjectUsingMapper(getProductRes.getResponse(), Product.class);
+		ProductValidationUtils.compareExpectedAndActualProducts(expectedProduct, actualProduct,
+				ComponentOperationEnum.GET_COMPONENT);
+		assertEquals(actualProduct.getIsActive(), new Boolean(false));
+		ExpectedProductAudit constructFieldsForAuditValidation = Convertor.constructFieldsForAuditValidation(
+				expectedProduct, CREATE_AUDIT_ACTION, productManager1, ActionStatus.CREATED, Constants.EMPTY_STRING,
+				"0.1", null, LifecycleStateEnum.NOT_CERTIFIED_CHECKOUT, productUuid);
+		AuditValidationUtils.validateAuditProduct(constructFieldsForAuditValidation, CREATE_AUDIT_ACTION);
+	}
+
+	@Test (enabled = false)
+	public void createProductDescriptionRemoveSpacesFromTheEnd() throws Exception {
+		ProductReqDetails productReqDetails = ElementFactory.getDefaultProduct();
+		// productReqDetails.setName("Abba");
+		productReqDetails.setTags(Arrays.asList(productReqDetails.getName()));
+		normalizedName = productReqDetails.getName().toLowerCase().replaceAll("\\s+", "");
+		productReqDetails.setDescription("abcd 12345 xcvb    ");
+		RestResponse createProduct = ProductRestUtils.createProduct(productReqDetails, productManager1);
+		ProductRestUtils.checkCreateResponse(createProduct);
+		productReqDetails.setDescription("abcd 12345 xcvb");
+		String productUuid = ResponseParser.getUuidFromResponse(createProduct);
+		compareExpectedAndActualProducts(productReqDetails, createProduct);
+		Product expectedProduct = ResponseParser.parseToObjectUsingMapper(createProduct.getResponse(), Product.class);
+		RestResponse getProductRes = ProductRestUtils.getProduct(productReqDetails.getUniqueId(),
+				productManager1.getUserId());
+		ProductRestUtils.checkSuccess(getProductRes);
+		Product actualProduct = ResponseParser.parseToObjectUsingMapper(getProductRes.getResponse(), Product.class);
+		ProductValidationUtils.compareExpectedAndActualProducts(expectedProduct, actualProduct,
+				ComponentOperationEnum.GET_COMPONENT);
+		assertEquals(actualProduct.getIsActive(), new Boolean(false));
+		ExpectedProductAudit constructFieldsForAuditValidation = Convertor.constructFieldsForAuditValidation(
+				expectedProduct, CREATE_AUDIT_ACTION, productManager1, ActionStatus.CREATED, Constants.EMPTY_STRING,
+				"0.1", null, LifecycleStateEnum.NOT_CERTIFIED_CHECKOUT, productUuid);
+		AuditValidationUtils.validateAuditProduct(constructFieldsForAuditValidation, CREATE_AUDIT_ACTION);
+	}
+
+	@Test // (enabled = false)
+	public void createProductDescriptionMaxLength() throws Exception {
+		ProductReqDetails productReqDetails = ElementFactory.getDefaultProduct();
+		// productReqDetails.setName("Abba");
+		productReqDetails.setTags(Arrays.asList(productReqDetails.getName()));
+		normalizedName = productReqDetails.getName().toLowerCase().replaceAll("\\s+", "");
+		productReqDetails.setDescription(
+				"Abba1234567890asdfghjkl123zxcvbnm432asdfghjkl_-.123Abba1234567890asdfghjkl23zxcvbnm432asdfghjkl_-.12Abba1234567890asdfghjkl123zxcvbnm432asdfghjkl_-.123Abba1234567890asdfghjkl23zxcvbnm432asdfghjkl_-.12Abba1234567890asdfghjkl123zxcvbnm432asdfghjkl_-.123Abba1234567890asdfghjkl23zxcvbnm432asdfghjkl_-.12Abba1234567890asdfghjkl123zxcvbnm432asdfghjkl_-.123Abba1234567890asdfghjkl23zxcvbnm432asdfghjkl_-.12Abba1234567890asdfghjkl123zxcvbnm432asdfghjkl_-.123Abba1234567890asdfghjkl23zxcvbnm432asdfghjkl_-.12Abba1234567890asdfghjkl123zxcvbnm432asdfghjkl_-.123Abba1234567890asdfghjkl23zxcvbnm432asdfghjkl_-.12Abba1234567890asdfghjkl123zxcvbnm432asdfghjkl_-.123Abba1234567890asdfghjkl23zxcvbnm432asdfghjkl_-.12Abba1234567890asdfghjkl123zxcvbnm432asdfghjkl_-.123Abba1234567890asdfghjkl23zxcvbnm432asdfghjkl_-.12Abba1234567890asdfghjkl123zxcvbnm432asdfghjkl_-.123Abba1234567890asdfghjkl23zxcvbnm432asdfghjkl_-.12Abba1234567890asdfghjkl123zxcvbnm432asdfghjkl_-.123Abba1234567890asdfghjkl23zxcvbnm432asdfghjkl_-.12asdfghjklzxcvbnmqwertyui");
+		RestResponse createProduct = ProductRestUtils.createProduct(productReqDetails, productManager1);
+		ProductRestUtils.checkCreateResponse(createProduct);
+		String productUuid = ResponseParser.getUuidFromResponse(createProduct);
+		compareExpectedAndActualProducts(productReqDetails, createProduct);
+		Product expectedProduct = ResponseParser.parseToObjectUsingMapper(createProduct.getResponse(), Product.class);
+		RestResponse getProductRes = ProductRestUtils.getProduct(productReqDetails.getUniqueId(),
+				productManager1.getUserId());
+		ProductRestUtils.checkSuccess(getProductRes);
+		Product actualProduct = ResponseParser.parseToObjectUsingMapper(getProductRes.getResponse(), Product.class);
+		ProductValidationUtils.compareExpectedAndActualProducts(expectedProduct, actualProduct,
+				ComponentOperationEnum.GET_COMPONENT);
+		assertEquals(actualProduct.getIsActive(), new Boolean(false));
+		ExpectedProductAudit constructFieldsForAuditValidation = Convertor.constructFieldsForAuditValidation(
+				expectedProduct, CREATE_AUDIT_ACTION, productManager1, ActionStatus.CREATED, Constants.EMPTY_STRING,
+				"0.1", null, LifecycleStateEnum.NOT_CERTIFIED_CHECKOUT, productUuid);
+		AuditValidationUtils.validateAuditProduct(constructFieldsForAuditValidation, CREATE_AUDIT_ACTION);
+	}
+
+	@Test // (enabled = false)
+	public void createProductDescriptionExceedMaxLength() throws Exception {
+		ProductReqDetails productReqDetails = ElementFactory.getDefaultProduct();
+		// productReqDetails.setName("Abba");
+		productReqDetails.setTags(Arrays.asList(productReqDetails.getName()));
+		normalizedName = productReqDetails.getName().toLowerCase().replaceAll("\\s+", "");
+		productReqDetails.setDescription(
+				"Abxba1234567890asdfghjkl123zxcvbnm432asdfghjkl_-.123Abba1234567890asdfghjkl23zxcvbnm432asdfghjkl_-.12Abba1234567890asdfghjkl123zxcvbnm432asdfghjkl_-.123Abba1234567890asdfghjkl23zxcvbnm432asdfghjkl_-.12Abba1234567890asdfghjkl123zxcvbnm432asdfghjkl_-.123Abba1234567890asdfghjkl23zxcvbnm432asdfghjkl_-.12Abba1234567890asdfghjkl123zxcvbnm432asdfghjkl_-.123Abba1234567890asdfghjkl23zxcvbnm432asdfghjkl_-.12Abba1234567890asdfghjkl123zxcvbnm432asdfghjkl_-.123Abba1234567890asdfghjkl23zxcvbnm432asdfghjkl_-.12Abba1234567890asdfghjkl123zxcvbnm432asdfghjkl_-.123Abba1234567890asdfghjkl23zxcvbnm432asdfghjkl_-.12Abba1234567890asdfghjkl123zxcvbnm432asdfghjkl_-.123Abba1234567890asdfghjkl23zxcvbnm432asdfghjkl_-.12Abba1234567890asdfghjkl123zxcvbnm432asdfghjkl_-.123Abba1234567890asdfghjkl23zxcvbnm432asdfghjkl_-.12Abba1234567890asdfghjkl123zxcvbnm432asdfghjkl_-.123Abba1234567890asdfghjkl23zxcvbnm432asdfghjkl_-.12Abba1234567890asdfghjkl123zxcvbnm432asdfghjkl_-.123Abba1234567890asdfghjkl23zxcvbnm432asdfghjkl_-.12asdfghjklzxcvbnmqwertyui");
+		RestResponse createProduct = ProductRestUtils.createProduct(productReqDetails, productManager1);
+		assertEquals("Check response code ", BaseRestUtils.STATUS_CODE_INVALID_CONTENT,
+				createProduct.getErrorCode().intValue());
+		Product expectedProduct = Convertor.constructFieldsForRespValidation(productReqDetails, "", productManager1);
+		ExpectedProductAudit constructFieldsForAuditValidation = Convertor.constructFieldsForAuditValidation(
+				expectedProduct, CREATE_AUDIT_ACTION, productManager1, ActionStatus.COMPONENT_DESCRIPTION_EXCEEDS_LIMIT,
+				Constants.EMPTY_STRING, Constants.EMPTY_STRING, null, null, Constants.EMPTY_STRING, "Product", "1024");
+		constructFieldsForAuditValidation.setCURR_VERSION("");
+		constructFieldsForAuditValidation.setCURR_STATE("");
+		AuditValidationUtils.validateAuditProduct(constructFieldsForAuditValidation, CREATE_AUDIT_ACTION);
+	}
+
+	@Test
+	public void createProductTagIsEmpty() throws Exception {
+		ProductReqDetails productReqDetails = ElementFactory.getDefaultProduct();
+		productReqDetails.setName("Product");
+		productReqDetails.setTags(Arrays.asList(""));
+		normalizedName = productReqDetails.getName().toLowerCase().replaceAll("\\s+", "");
+		RestResponse createProduct = ProductRestUtils.createProduct(productReqDetails, productManager1);
+		assertEquals("Check response code ", BaseRestUtils.STATUS_CODE_INVALID_CONTENT,
+				createProduct.getErrorCode().intValue());
+		Product expectedProduct = Convertor.constructFieldsForRespValidation(productReqDetails, "", productManager1);
+		ExpectedProductAudit constructFieldsForAuditValidation = Convertor.constructFieldsForAuditValidation(
+				expectedProduct, CREATE_AUDIT_ACTION, productManager1, ActionStatus.INVALID_FIELD_FORMAT,
+				Constants.EMPTY_STRING, Constants.EMPTY_STRING, null, null, Constants.EMPTY_STRING, "Product", "tag");
+		constructFieldsForAuditValidation.setCURR_VERSION("");
+		constructFieldsForAuditValidation.setCURR_STATE("");
+		AuditValidationUtils.validateAuditProduct(constructFieldsForAuditValidation, CREATE_AUDIT_ACTION);
+	}
+
+	// DE192351
+	@Test // (enabled = false)
+	public void createProductTagValidationAllowedCharacters() throws Exception {
+		ProductReqDetails productReqDetails = ElementFactory.getDefaultProduct();
+		// productReqDetails.setName("CIProduct1"); // Bug @:&=+'#
+		productReqDetails.setTags(Arrays.asList(productReqDetails.getName(), "Acde2@3:4& m=n+b-u.j-u'g#b"));
+		normalizedName = productReqDetails.getName().toLowerCase();
+		RestResponse createProduct = ProductRestUtils.createProduct(productReqDetails, productManager1);
+		ProductRestUtils.checkCreateResponse(createProduct);
+		String productUuid = ResponseParser.getUuidFromResponse(createProduct);
+		compareExpectedAndActualProducts(productReqDetails, createProduct);
+		Product expectedProduct = ResponseParser.parseToObjectUsingMapper(createProduct.getResponse(), Product.class);
+		RestResponse getProductRes = ProductRestUtils.getProduct(productReqDetails.getUniqueId(),
+				productManager1.getUserId());
+		ProductRestUtils.checkSuccess(getProductRes);
+		Product actualProduct = ResponseParser.parseToObjectUsingMapper(getProductRes.getResponse(), Product.class);
+		ProductValidationUtils.compareExpectedAndActualProducts(expectedProduct, actualProduct,
+				ComponentOperationEnum.GET_COMPONENT);
+		assertEquals(actualProduct.getIsActive(), new Boolean(false));
+		ExpectedProductAudit constructFieldsForAuditValidation = Convertor.constructFieldsForAuditValidation(
+				expectedProduct, CREATE_AUDIT_ACTION, productManager1, ActionStatus.CREATED, Constants.EMPTY_STRING,
+				"0.1", null, LifecycleStateEnum.NOT_CERTIFIED_CHECKOUT, productUuid);
+		AuditValidationUtils.validateAuditProduct(constructFieldsForAuditValidation, CREATE_AUDIT_ACTION);
+	}
+
+	@Test // (enabled = false)
+	public void createProductTagsNameValidationProductNameIsNotInTag() throws Exception {
+		ProductReqDetails productReqDetails = ElementFactory.getDefaultProduct();
+//		productReqDetails.setName("Qwertyuiop1234567890asdfA");
+		productReqDetails.setTags(Arrays.asList("Abc"));
+		normalizedName = productReqDetails.getName().trim().toLowerCase();
+		RestResponse createProduct = ProductRestUtils.createProduct(productReqDetails, productManager1);
+		assertEquals("Check response code ", BaseRestUtils.STATUS_CODE_INVALID_CONTENT,
+				createProduct.getErrorCode().intValue());
+		Product expectedProduct = Convertor.constructFieldsForRespValidation(productReqDetails, "", productManager1);
+		ExpectedProductAudit constructFieldsForAuditValidation = Convertor.constructFieldsForAuditValidation(
+				expectedProduct, CREATE_AUDIT_ACTION, productManager1, ActionStatus.COMPONENT_INVALID_TAGS_NO_COMP_NAME,
+				Constants.EMPTY_STRING, Constants.EMPTY_STRING, null, null, Constants.EMPTY_STRING);
+		constructFieldsForAuditValidation.setCURR_VERSION("");
+		constructFieldsForAuditValidation.setCURR_STATE("");
+		AuditValidationUtils.validateAuditProduct(constructFieldsForAuditValidation, CREATE_AUDIT_ACTION);
+	}
+
+	@Test // (enabled = false)
+	public void createProductSingleTagMaxLength() throws Exception {
+		// SingleTagMaxLength = 50
+		ProductReqDetails productReqDetails = ElementFactory.getDefaultProduct();
+		// productReqDetails.setName("CIProduct1");
+		productReqDetails.setTags(
+				Arrays.asList(productReqDetails.getName(), "Abba1234567890asdfghjkl123zxcvbnm432asdfgh12345678"));
+		normalizedName = productReqDetails.getName().toLowerCase();
+		RestResponse createProduct = ProductRestUtils.createProduct(productReqDetails, productManager1);
+		ProductRestUtils.checkCreateResponse(createProduct);
+		String productUuid = ResponseParser.getUuidFromResponse(createProduct);
+		compareExpectedAndActualProducts(productReqDetails, createProduct);
+		Product expectedProduct = ResponseParser.parseToObjectUsingMapper(createProduct.getResponse(), Product.class);
+		RestResponse getProductRes = ProductRestUtils.getProduct(productReqDetails.getUniqueId(),
+				productManager1.getUserId());
+		ProductRestUtils.checkSuccess(getProductRes);
+		Product actualProduct = ResponseParser.parseToObjectUsingMapper(getProductRes.getResponse(), Product.class);
+		ProductValidationUtils.compareExpectedAndActualProducts(expectedProduct, actualProduct,
+				ComponentOperationEnum.GET_COMPONENT);
+		assertEquals(actualProduct.getIsActive(), new Boolean(false));
+		ExpectedProductAudit constructFieldsForAuditValidation = Convertor.constructFieldsForAuditValidation(
+				expectedProduct, CREATE_AUDIT_ACTION, productManager1, ActionStatus.CREATED, Constants.EMPTY_STRING,
+				"0.1", null, LifecycleStateEnum.NOT_CERTIFIED_CHECKOUT, productUuid);
+		AuditValidationUtils.validateAuditProduct(constructFieldsForAuditValidation, CREATE_AUDIT_ACTION);
+	}
+
+	@Test (enabled = false)
+	public void createProductSingleTagExceedMaxLength() throws Exception {
+		ProductReqDetails productReqDetails = ElementFactory.getDefaultProduct();
+		// productReqDetails.setName("CIProduct1"); // Bug @:&=+'#
+		productReqDetails.setTags(
+				Arrays.asList(productReqDetails.getName(), "Axbba1234567890asdfghjkl123zxcvbnm432asdfgh12345678"));
+		normalizedName = productReqDetails.getName().toLowerCase();
+		RestResponse createProduct = ProductRestUtils.createProduct(productReqDetails, productManager1);
+		assertEquals("Check response code ", BaseRestUtils.STATUS_CODE_INVALID_CONTENT,
+				createProduct.getErrorCode().intValue());
+		Product expectedProduct = Convertor.constructFieldsForRespValidation(productReqDetails, "", productManager1);
+		ExpectedProductAudit constructFieldsForAuditValidation = Convertor.constructFieldsForAuditValidation(
+				expectedProduct, CREATE_AUDIT_ACTION, productManager1, ActionStatus.COMPONENT_SINGLE_TAG_EXCEED_LIMIT,
+				Constants.EMPTY_STRING, Constants.EMPTY_STRING, null, null, Constants.EMPTY_STRING, "50");
+		constructFieldsForAuditValidation.setCURR_VERSION("");
+		constructFieldsForAuditValidation.setCURR_STATE("");
+		AuditValidationUtils.validateAuditProduct(constructFieldsForAuditValidation, CREATE_AUDIT_ACTION);
+	}
+
+	@Test (enabled = false)
+	public void createProductAllTagsMaxLength() throws Exception {
+		// AllTagsMaxLength = 1024
+		ProductReqDetails productReqDetails = ElementFactory.getDefaultProduct();
+		// productReqDetails.setName("CIProduct1");
+		productReqDetails.setTags(
+				Arrays.asList(productReqDetails.getName(), "Abba1234567890asdfghjkl123zxcvbnm432asdfgh12345601",
+						"Abba1234567890asdfghjkl123zxcvbnm432asdfgh12345602",
+						"Abba1234567890asdfghjkl123zxcvbnm432asdfgh12345603",
+						"Abba1234567890asdfghjkl123zxcvbnm432asdfgh12345604",
+						"Abba1234567890asdfghjkl123zxcvbnm432asdfgh12345605",
+						"Abba1234567890asdfghjkl123zxcvbnm432asdfgh12345606",
+						"Abba1234567890asdfghjkl123zxcvbnm432asdfgh12345607",
+						"Abba1234567890asdfghjkl123zxcvbnm432asdfgh12345608",
+						"Abba1234567890asdfghjkl123zxcvbnm432asdfgh1234569",
+						"Abba1234567890asdfghjkl123zxcvbnm432asdfgh12345610",
+						"Abba1234567890asdfghjkl123zxcvbnm432asdfgh12345611",
+						"Abba1234567890asdfghjkl123zxcvbnm432asdfgh12345612",
+						"Abba1234567890asdfghjkl123zxcvbnm432asdfgh12345613",
+						"Abba1234567890asdfghjkl123zxcvbnm432asdfgh12345614",
+						"Abba1234567890asdfghjkl123zxcvbnm432asdfgh12345615",
+						"Abba1234567890asdfghjkl123zxcvbnm432asdfgh12345616",
+						"Abba1234567890asdfghjkl123zxcvbnm432asdfgh12345617",
+						"Abba1234567890asdfghjkl123zxcvbnm432asdfgh12345618",
+						"Abba1234567890asdfghjkl123zxcvbnm432asdfgh12345619",
+						"Abba1234567890asdfghjkl123zxcvbnm432asdfgh12345"));
+		normalizedName = productReqDetails.getName().toLowerCase();
+		RestResponse createProduct = ProductRestUtils.createProduct(productReqDetails, productManager1);
+		ProductRestUtils.checkCreateResponse(createProduct);
+		String productUuid = ResponseParser.getUuidFromResponse(createProduct);
+		compareExpectedAndActualProducts(productReqDetails, createProduct);
+		Product expectedProduct = ResponseParser.parseToObjectUsingMapper(createProduct.getResponse(), Product.class);
+		RestResponse getProductRes = ProductRestUtils.getProduct(productReqDetails.getUniqueId(),
+				productManager1.getUserId());
+		ProductRestUtils.checkSuccess(getProductRes);
+		Product actualProduct = ResponseParser.parseToObjectUsingMapper(getProductRes.getResponse(), Product.class);
+		ProductValidationUtils.compareExpectedAndActualProducts(expectedProduct, actualProduct,
+				ComponentOperationEnum.GET_COMPONENT);
+		assertEquals(actualProduct.getIsActive(), new Boolean(false));
+		ExpectedProductAudit constructFieldsForAuditValidation = Convertor.constructFieldsForAuditValidation(
+				expectedProduct, CREATE_AUDIT_ACTION, productManager1, ActionStatus.CREATED, Constants.EMPTY_STRING,
+				"0.1", null, LifecycleStateEnum.NOT_CERTIFIED_CHECKOUT, productUuid);
+		AuditValidationUtils.validateAuditProduct(constructFieldsForAuditValidation, CREATE_AUDIT_ACTION);
+	}
+
+	@Test
+	public void createProductAllTagsExceedMaxLength() throws Exception {
+		// AllTagsMaxLength = 1024
+		ProductReqDetails productReqDetails = ElementFactory.getDefaultProduct();
+		// productReqDetails.setName("CIProduct1");
+		productReqDetails.setTags(
+				Arrays.asList(productReqDetails.getName(), "Abba1234567890asdfghjkl123zxcvbnm432asdfgh12345601",
+						"Abba1234567890asdfghjkl123zxcvbnm432asdfgh12345602",
+						"Abba1234567890asdfghjkl123zxcvbnm432asdfgh12345603",
+						"Abba1234567890asdfghjkl123zxcvbnm432asdfgh12345604",
+						"Abba1234567890asdfghjkl123zxcvbnm432asdfgh12345605",
+						"Abba1234567890asdfghjkl123zxcvbnm432asdfgh12345606",
+						"Abba1234567890asdfghjkl123zxcvbnm432asdfgh12345607",
+						"Abba1234567890asdfghjkl123zxcvbnm432asdfgh12345608",
+						"Abba1234567890asdfghjkl123zxcvbnm432asdfgh1234569",
+						"Abba1234567890asdfghjkl123zxcvbnm432asdfgh12345610",
+						"Abba1234567890asdfghjkl123zxcvbnm432asdfgh12345611",
+						"Abba1234567890asdfghjkl123zxcvbnm432asdfgh12345612",
+						"Abba1234567890asdfghjkl123zxcvbnm432asdfgh12345613",
+						"Abba1234567890asdfghjkl123zxcvbnm432asdfgh12345614",
+						"Abba1234567890asdfghjkl123zxcvbnm432asdfgh12345615",
+						"Abba1234567890asdfghjkl123zxcvbnm432asdfgh12345616",
+						"Abba1234567890asdfghjkl123zxcvbnm432asdfgh12345617",
+						"Abba1234567890asdfghjkl123zxcvbnm432asdfgh12345618",
+						"Abba1234567890asdfghjkl123zxcvbnm432asdfgh12345619",
+						"Abba1234567890asdfghjkl123zxcvbnm432asdfgh123456"));
+		normalizedName = productReqDetails.getName().toLowerCase();
+		RestResponse createProduct = ProductRestUtils.createProduct(productReqDetails, productManager1);
+		assertEquals("Check response code ", BaseRestUtils.STATUS_CODE_INVALID_CONTENT,
+				createProduct.getErrorCode().intValue());
+		Product expectedProduct = Convertor.constructFieldsForRespValidation(productReqDetails, "", productManager1);
+		ExpectedProductAudit constructFieldsForAuditValidation = Convertor.constructFieldsForAuditValidation(
+				expectedProduct, CREATE_AUDIT_ACTION, productManager1, ActionStatus.COMPONENT_TAGS_EXCEED_LIMIT,
+				Constants.EMPTY_STRING, Constants.EMPTY_STRING, null, null, Constants.EMPTY_STRING, "1024");
+		constructFieldsForAuditValidation.setCURR_VERSION("");
+		constructFieldsForAuditValidation.setCURR_STATE("");
+		AuditValidationUtils.validateAuditProduct(constructFieldsForAuditValidation, CREATE_AUDIT_ACTION);
+	}
+
+	@Test // (enabled = false)
+	public void createProductDuplicateTagRemoved() throws Exception {
+		ProductReqDetails productReqDetails = ElementFactory.getDefaultProduct();
+		// productReqDetails.setName("CIProduct1"); // Bug @:&=+'#
+		productReqDetails.setTags(Arrays.asList(productReqDetails.getName(), productReqDetails.getName()));
+		normalizedName = productReqDetails.getName().toLowerCase();
+		RestResponse createProduct = ProductRestUtils.createProduct(productReqDetails, productManager1);
+		ProductRestUtils.checkCreateResponse(createProduct);
+		productReqDetails.setTags(Arrays.asList(productReqDetails.getName()));
+		String productUuid = ResponseParser.getUuidFromResponse(createProduct);
+		compareExpectedAndActualProducts(productReqDetails, createProduct);
+		Product expectedProduct = ResponseParser.parseToObjectUsingMapper(createProduct.getResponse(), Product.class);
+		RestResponse getProductRes = ProductRestUtils.getProduct(productReqDetails.getUniqueId(),
+				productManager1.getUserId());
+		ProductRestUtils.checkSuccess(getProductRes);
+		Product actualProduct = ResponseParser.parseToObjectUsingMapper(getProductRes.getResponse(), Product.class);
+		ProductValidationUtils.compareExpectedAndActualProducts(expectedProduct, actualProduct,
+				ComponentOperationEnum.GET_COMPONENT);
+		assertEquals(actualProduct.getIsActive(), new Boolean(false));
+		ExpectedProductAudit constructFieldsForAuditValidation = Convertor.constructFieldsForAuditValidation(
+				expectedProduct, CREATE_AUDIT_ACTION, productManager1, ActionStatus.CREATED, Constants.EMPTY_STRING,
+				"0.1", null, LifecycleStateEnum.NOT_CERTIFIED_CHECKOUT, productUuid);
+		AuditValidationUtils.validateAuditProduct(constructFieldsForAuditValidation, CREATE_AUDIT_ACTION);
+	}
+
+	@Test // (enabled = false)
+	public void createProductContactsIsEmpty() throws Exception {
+		ProductReqDetails productReqDetails = ElementFactory.getDefaultProduct();
+		// productReqDetails.setName("CIProduct1"); // Bug @:&=+'#
+		productReqDetails.setTags(Arrays.asList(productReqDetails.getName()));
+		normalizedName = productReqDetails.getName().toLowerCase();
+		productReqDetails.setContacts(Arrays.asList(""));
+		RestResponse createProduct = ProductRestUtils.createProduct(productReqDetails, productManager1);
+		assertEquals("Check response code ", BaseRestUtils.STATUS_CODE_INVALID_CONTENT,
+				createProduct.getErrorCode().intValue());
+		Product expectedProduct = Convertor.constructFieldsForRespValidation(productReqDetails, "", productManager1);
+		ExpectedProductAudit constructFieldsForAuditValidation = Convertor.constructFieldsForAuditValidation(
+				expectedProduct, CREATE_AUDIT_ACTION, productManager1, ActionStatus.COMPONENT_INVALID_CONTACT,
+				Constants.EMPTY_STRING, Constants.EMPTY_STRING, null, null, Constants.EMPTY_STRING, "Product");
+		constructFieldsForAuditValidation.setCURR_VERSION("");
+		constructFieldsForAuditValidation.setCURR_STATE("");
+		AuditValidationUtils.validateAuditProduct(constructFieldsForAuditValidation, CREATE_AUDIT_ACTION);
+	}
+
+	@Test // (enabled = false)
+	public void createProductContactsInvalidFormat() throws Exception {
+		ProductReqDetails productReqDetails = ElementFactory.getDefaultProduct();
+		// productReqDetails.setName("CIProduct1"); // Bug @:&=+'#
+		productReqDetails.setTags(Arrays.asList(productReqDetails.getName()));
+		normalizedName = productReqDetails.getName().toLowerCase();
+		productReqDetails.setContacts(Arrays.asList("bt750345"));
+		RestResponse createProduct = ProductRestUtils.createProduct(productReqDetails, productManager1);
+		assertEquals("Check response code ", BaseRestUtils.STATUS_CODE_INVALID_CONTENT,
+				createProduct.getErrorCode().intValue());
+		Product expectedProduct = Convertor.constructFieldsForRespValidation(productReqDetails, "", productManager1);
+		ExpectedProductAudit constructFieldsForAuditValidation = Convertor.constructFieldsForAuditValidation(
+				expectedProduct, CREATE_AUDIT_ACTION, productManager1, ActionStatus.COMPONENT_INVALID_CONTACT,
+				Constants.EMPTY_STRING, Constants.EMPTY_STRING, null, null, Constants.EMPTY_STRING, "Product");
+		constructFieldsForAuditValidation.setCURR_VERSION("");
+		constructFieldsForAuditValidation.setCURR_STATE("");
+		AuditValidationUtils.validateAuditProduct(constructFieldsForAuditValidation, CREATE_AUDIT_ACTION);
+	}
+
+	@Test // (enabled = false)
+	public void createProductConvertContactsToLowerCase() throws Exception {
+		ProductReqDetails productReqDetails = ElementFactory.getDefaultProduct();
+		// productReqDetails.setName("CIProduct1"); // Bug @:&=+'#
+		productReqDetails.setTags(Arrays.asList(productReqDetails.getName()));
+		normalizedName = productReqDetails.getName().toLowerCase();
+		productReqDetails.setContacts(Arrays.asList(productManager1.getUserId().toUpperCase()));
+		RestResponse createProduct = ProductRestUtils.createProduct(productReqDetails, productManager1);
+		ProductRestUtils.checkCreateResponse(createProduct);
+		productReqDetails.setContacts(Arrays.asList(productManager1.getUserId().toLowerCase()));
+		String productUuid = ResponseParser.getUuidFromResponse(createProduct);
+		compareExpectedAndActualProducts(productReqDetails, createProduct);
+		Product expectedProduct = ResponseParser.parseToObjectUsingMapper(createProduct.getResponse(), Product.class);
+		RestResponse getProductRes = ProductRestUtils.getProduct(productReqDetails.getUniqueId(),
+				productManager1.getUserId());
+		ProductRestUtils.checkSuccess(getProductRes);
+		Product actualProduct = ResponseParser.parseToObjectUsingMapper(getProductRes.getResponse(), Product.class);
+		ProductValidationUtils.compareExpectedAndActualProducts(expectedProduct, actualProduct,
+				ComponentOperationEnum.GET_COMPONENT);
+		assertEquals(actualProduct.getIsActive(), new Boolean(false));
+		ExpectedProductAudit constructFieldsForAuditValidation = Convertor.constructFieldsForAuditValidation(
+				expectedProduct, CREATE_AUDIT_ACTION, productManager1, ActionStatus.CREATED, Constants.EMPTY_STRING,
+				"0.1", null, LifecycleStateEnum.NOT_CERTIFIED_CHECKOUT, productUuid);
+		AuditValidationUtils.validateAuditProduct(constructFieldsForAuditValidation, CREATE_AUDIT_ACTION);
+	}
+
+	@Test // (enabled = false)
+	public void createProductContactsDoexNotContainTheProductCreator() throws Exception {
+		ProductReqDetails productReqDetails = ElementFactory.getDefaultProduct();
+		// productReqDetails.setName("CIProduct1"); // Bug @:&=+'#
+		productReqDetails.setTags(Arrays.asList(productReqDetails.getName()));
+		normalizedName = productReqDetails.getName().toLowerCase();
+		productReqDetails.setContacts(Arrays.asList(productManager2.getUserId()));
+		RestResponse createProduct = ProductRestUtils.createProduct(productReqDetails, productManager1);
+		ProductRestUtils.checkCreateResponse(createProduct);
+		productReqDetails.setContacts(Arrays.asList(productManager2.getUserId(), productManager1.getUserId()));
+		String productUuid = ResponseParser.getUuidFromResponse(createProduct);
+		compareExpectedAndActualProducts(productReqDetails, createProduct);
+		Product expectedProduct = ResponseParser.parseToObjectUsingMapper(createProduct.getResponse(), Product.class);
+		RestResponse getProductRes = ProductRestUtils.getProduct(productReqDetails.getUniqueId(),
+				productManager1.getUserId());
+		ProductRestUtils.checkSuccess(getProductRes);
+		Product actualProduct = ResponseParser.parseToObjectUsingMapper(getProductRes.getResponse(), Product.class);
+		ProductValidationUtils.compareExpectedAndActualProducts(expectedProduct, actualProduct,
+				ComponentOperationEnum.GET_COMPONENT);
+		ExpectedProductAudit constructFieldsForAuditValidation = Convertor.constructFieldsForAuditValidation(
+				expectedProduct, CREATE_AUDIT_ACTION, productManager1, ActionStatus.CREATED, Constants.EMPTY_STRING,
+				"0.1", null, LifecycleStateEnum.NOT_CERTIFIED_CHECKOUT, productUuid);
+		AuditValidationUtils.validateAuditProduct(constructFieldsForAuditValidation, CREATE_AUDIT_ACTION);
+	}
+
+	@Test // (enabled = false)
+	public void createProductContactsNotAllowedAsdcUsers() throws Exception {
+		ProductReqDetails productReqDetails = ElementFactory.getDefaultProduct();
+		// productReqDetails.setName("CIProduct1"); // Bug @:&=+'#
+		productReqDetails.setTags(Arrays.asList(productReqDetails.getName()));
+		normalizedName = productReqDetails.getName().toLowerCase();
+		productReqDetails.setContacts(Arrays.asList(designerUser.getUserId()));
+		RestResponse createProduct = ProductRestUtils.createProduct(productReqDetails, productManager1);
+		assertEquals("Check response code ", BaseRestUtils.STATUS_CODE_INVALID_CONTENT,
+				createProduct.getErrorCode().intValue());
+		Product expectedProduct = Convertor.constructFieldsForRespValidation(productReqDetails, "", productManager1);
+		ExpectedProductAudit constructFieldsForAuditValidation = Convertor.constructFieldsForAuditValidation(
+				expectedProduct, CREATE_AUDIT_ACTION, productManager1, ActionStatus.INVALID_PRODUCT_CONTACT,
+				Constants.EMPTY_STRING, Constants.EMPTY_STRING, null, null, Constants.EMPTY_STRING,
+				designerUser.getUserId());
+		constructFieldsForAuditValidation.setCURR_VERSION("");
+		constructFieldsForAuditValidation.setCURR_STATE("");
+		AuditValidationUtils.validateAuditProduct(constructFieldsForAuditValidation, CREATE_AUDIT_ACTION);
+	}
+
+	@Test // (enabled = false)
+	public void createProductContactsNotAsdcUser() throws Exception {
+		ProductReqDetails productReqDetails = ElementFactory.getDefaultProduct();
+		// productReqDetails.setName("CIProduct1"); // Bug @:&=+'#
+		productReqDetails.setTags(Arrays.asList(productReqDetails.getName()));
+		normalizedName = productReqDetails.getName().toLowerCase();
+		String nonAsdcUser = "bh1234";
+		productReqDetails.setContacts(Arrays.asList(nonAsdcUser));
+		RestResponse createProduct = ProductRestUtils.createProduct(productReqDetails, productManager1);
+		assertEquals("Check response code ", BaseRestUtils.STATUS_CODE_INVALID_CONTENT,
+				createProduct.getErrorCode().intValue());
+		Product expectedProduct = Convertor.constructFieldsForRespValidation(productReqDetails, "", productManager1);
+		ExpectedProductAudit constructFieldsForAuditValidation = Convertor.constructFieldsForAuditValidation(
+				expectedProduct, CREATE_AUDIT_ACTION, productManager1, ActionStatus.INVALID_PRODUCT_CONTACT,
+				Constants.EMPTY_STRING, Constants.EMPTY_STRING, null, null, Constants.EMPTY_STRING, nonAsdcUser);
+		constructFieldsForAuditValidation.setCURR_VERSION("");
+		constructFieldsForAuditValidation.setCURR_STATE("");
+		AuditValidationUtils.validateAuditProduct(constructFieldsForAuditValidation, CREATE_AUDIT_ACTION);
+	}
+
+	@Test // (enabled = false)
+	public void createProductProjectCodeIsEmpty() throws Exception {
+		ProductReqDetails productReqDetails = ElementFactory.getDefaultProduct();
+		// productReqDetails.setName("CIProduct1");
+		productReqDetails.setTags(Arrays.asList(productReqDetails.getName()));
+		normalizedName = productReqDetails.getName().toLowerCase().replaceAll("\\s+", "");
+		productReqDetails.setProjectCode("");
+		RestResponse createProduct = ProductRestUtils.createProduct(productReqDetails, productManager1);
+		assertEquals("Check response code ", BaseRestUtils.STATUS_CODE_INVALID_CONTENT,
+				createProduct.getErrorCode().intValue());
+		Product expectedProduct = Convertor.constructFieldsForRespValidation(productReqDetails, "", productManager1);
+		ExpectedProductAudit constructFieldsForAuditValidation = Convertor.constructFieldsForAuditValidation(
+				expectedProduct, CREATE_AUDIT_ACTION, productManager1, ActionStatus.MISSING_PROJECT_CODE,
+				Constants.EMPTY_STRING, Constants.EMPTY_STRING, null, null, Constants.EMPTY_STRING);
+		constructFieldsForAuditValidation.setCURR_VERSION("");
+		constructFieldsForAuditValidation.setCURR_STATE("");
+		AuditValidationUtils.validateAuditProduct(constructFieldsForAuditValidation, CREATE_AUDIT_ACTION);
+	}
+
+	@Test // (enabled = false)
+	public void createProductProjectCodeIsNull() throws Exception {
+		ProductReqDetails productReqDetails = ElementFactory.getDefaultProduct();
+		// productReqDetails.setName("CIProduct1");
+		productReqDetails.setTags(Arrays.asList(productReqDetails.getName()));
+		normalizedName = productReqDetails.getName().toLowerCase().replaceAll("\\s+", "");
+		productReqDetails.setProjectCode(null);
+		RestResponse createProduct = ProductRestUtils.createProduct(productReqDetails, productManager1);
+		assertEquals("Check response code ", BaseRestUtils.STATUS_CODE_INVALID_CONTENT,
+				createProduct.getErrorCode().intValue());
+		Product expectedProduct = Convertor.constructFieldsForRespValidation(productReqDetails, "", productManager1);
+		ExpectedProductAudit constructFieldsForAuditValidation = Convertor.constructFieldsForAuditValidation(
+				expectedProduct, CREATE_AUDIT_ACTION, productManager1, ActionStatus.MISSING_PROJECT_CODE,
+				Constants.EMPTY_STRING, Constants.EMPTY_STRING, null, null, Constants.EMPTY_STRING);
+		constructFieldsForAuditValidation.setCURR_VERSION("");
+		constructFieldsForAuditValidation.setCURR_STATE("");
+		AuditValidationUtils.validateAuditProduct(constructFieldsForAuditValidation, CREATE_AUDIT_ACTION);
+	}
+
+	@Test // (enabled = false)
+	public void createProductProjectCodeIsNotNumeric() throws Exception {
+		ProductReqDetails productReqDetails = ElementFactory.getDefaultProduct();
+		// productReqDetails.setName("CIProduct1");
+		productReqDetails.setTags(Arrays.asList(productReqDetails.getName()));
+		normalizedName = productReqDetails.getName().toLowerCase().replaceAll("\\s+", "");
+		productReqDetails.setProjectCode("asdfgh");
+		RestResponse createProduct = ProductRestUtils.createProduct(productReqDetails, productManager1);
+		assertEquals("Check response code ", BaseRestUtils.STATUS_CODE_INVALID_CONTENT,
+				createProduct.getErrorCode().intValue());
+		Product expectedProduct = Convertor.constructFieldsForRespValidation(productReqDetails, "", productManager1);
+		ExpectedProductAudit constructFieldsForAuditValidation = Convertor.constructFieldsForAuditValidation(
+				expectedProduct, CREATE_AUDIT_ACTION, productManager1, ActionStatus.INVALID_PROJECT_CODE,
+				Constants.EMPTY_STRING, Constants.EMPTY_STRING, null, null, Constants.EMPTY_STRING);
+		constructFieldsForAuditValidation.setCURR_VERSION("");
+		constructFieldsForAuditValidation.setCURR_STATE("");
+		AuditValidationUtils.validateAuditProduct(constructFieldsForAuditValidation, CREATE_AUDIT_ACTION);
+	}
+
+	@Test // (enabled = false)
+	public void createProductProjectCodeHasnMinCharacters() throws Exception {
+		// Min =5
+		ProductReqDetails productReqDetails = ElementFactory.getDefaultProduct();
+		// productReqDetails.setName("CIProduct1");
+		productReqDetails.setTags(Arrays.asList(productReqDetails.getName()));
+		normalizedName = productReqDetails.getName().toLowerCase().replaceAll("\\s+", "");
+		productReqDetails.setProjectCode("12345");
+		RestResponse createProduct = ProductRestUtils.createProduct(productReqDetails, productManager1);
+		ProductRestUtils.checkCreateResponse(createProduct);
+		String productUuid = ResponseParser.getUuidFromResponse(createProduct);
+		compareExpectedAndActualProducts(productReqDetails, createProduct);
+		Product expectedProduct = ResponseParser.parseToObjectUsingMapper(createProduct.getResponse(), Product.class);
+		RestResponse getProductRes = ProductRestUtils.getProduct(productReqDetails.getUniqueId(),
+				productManager1.getUserId());
+		ProductRestUtils.checkSuccess(getProductRes);
+		Product actualProduct = ResponseParser.parseToObjectUsingMapper(getProductRes.getResponse(), Product.class);
+		ProductValidationUtils.compareExpectedAndActualProducts(expectedProduct, actualProduct,
+				ComponentOperationEnum.GET_COMPONENT);
+		ExpectedProductAudit constructFieldsForAuditValidation = Convertor.constructFieldsForAuditValidation(
+				expectedProduct, CREATE_AUDIT_ACTION, productManager1, ActionStatus.CREATED, Constants.EMPTY_STRING,
+				"0.1", null, LifecycleStateEnum.NOT_CERTIFIED_CHECKOUT, productUuid);
+		AuditValidationUtils.validateAuditProduct(constructFieldsForAuditValidation, CREATE_AUDIT_ACTION);
+	}
+
+	@Test // (enabled = false)
+	public void createProductProjectCodeHasnMaxCharacters() throws Exception {
+		// Max =10
+		ProductReqDetails productReqDetails = ElementFactory.getDefaultProduct();
+		// productReqDetails.setName("CIProduct1");
+		productReqDetails.setTags(Arrays.asList(productReqDetails.getName()));
+		normalizedName = productReqDetails.getName().toLowerCase().replaceAll("\\s+", "");
+		productReqDetails.setProjectCode("1234567890");
+		RestResponse createProduct = ProductRestUtils.createProduct(productReqDetails, productManager1);
+		ProductRestUtils.checkCreateResponse(createProduct);
+		String productUuid = ResponseParser.getUuidFromResponse(createProduct);
+		compareExpectedAndActualProducts(productReqDetails, createProduct);
+		Product expectedProduct = ResponseParser.parseToObjectUsingMapper(createProduct.getResponse(), Product.class);
+		RestResponse getProductRes = ProductRestUtils.getProduct(productReqDetails.getUniqueId(),
+				productManager1.getUserId());
+		ProductRestUtils.checkSuccess(getProductRes);
+		Product actualProduct = ResponseParser.parseToObjectUsingMapper(getProductRes.getResponse(), Product.class);
+		ProductValidationUtils.compareExpectedAndActualProducts(expectedProduct, actualProduct,
+				ComponentOperationEnum.GET_COMPONENT);
+		ExpectedProductAudit constructFieldsForAuditValidation = Convertor.constructFieldsForAuditValidation(
+				expectedProduct, CREATE_AUDIT_ACTION, productManager1, ActionStatus.CREATED, Constants.EMPTY_STRING,
+				"0.1", null, LifecycleStateEnum.NOT_CERTIFIED_CHECKOUT, productUuid);
+		AuditValidationUtils.validateAuditProduct(constructFieldsForAuditValidation, CREATE_AUDIT_ACTION);
+	}
+
+	@Test // (enabled = false)
+	public void createProductProjectCodeExceedMaxCharacters() throws Exception {
+		// Max =10
+		ProductReqDetails productReqDetails = ElementFactory.getDefaultProduct();
+		// productReqDetails.setName("CIProduct1");
+		productReqDetails.setTags(Arrays.asList(productReqDetails.getName()));
+		normalizedName = productReqDetails.getName().toLowerCase().replaceAll("\\s+", "");
+		productReqDetails.setProjectCode("12345678901");
+		RestResponse createProduct = ProductRestUtils.createProduct(productReqDetails, productManager1);
+		assertEquals("Check response code ", BaseRestUtils.STATUS_CODE_INVALID_CONTENT,
+				createProduct.getErrorCode().intValue());
+		Product expectedProduct = Convertor.constructFieldsForRespValidation(productReqDetails, "", productManager1);
+		ExpectedProductAudit constructFieldsForAuditValidation = Convertor.constructFieldsForAuditValidation(
+				expectedProduct, CREATE_AUDIT_ACTION, productManager1, ActionStatus.INVALID_PROJECT_CODE,
+				Constants.EMPTY_STRING, Constants.EMPTY_STRING, null, null, Constants.EMPTY_STRING);
+		constructFieldsForAuditValidation.setCURR_VERSION("");
+		constructFieldsForAuditValidation.setCURR_STATE("");
+		AuditValidationUtils.validateAuditProduct(constructFieldsForAuditValidation, CREATE_AUDIT_ACTION);
+	}
+
+	@Test // (enabled = false)
+	public void createProductProjectCodeLessThanMinCharacters() throws Exception {
+		// Max =10
+		ProductReqDetails productReqDetails = ElementFactory.getDefaultProduct();
+		// productReqDetails.setName("CIProduct1");
+		productReqDetails.setTags(Arrays.asList(productReqDetails.getName()));
+		normalizedName = productReqDetails.getName().toLowerCase().replaceAll("\\s+", "");
+		productReqDetails.setProjectCode("1234");
+		RestResponse createProduct = ProductRestUtils.createProduct(productReqDetails, productManager1);
+		assertEquals("Check response code ", BaseRestUtils.STATUS_CODE_INVALID_CONTENT,
+				createProduct.getErrorCode().intValue());
+		Product expectedProduct = Convertor.constructFieldsForRespValidation(productReqDetails, "", productManager1);
+		ExpectedProductAudit constructFieldsForAuditValidation = Convertor.constructFieldsForAuditValidation(
+				expectedProduct, CREATE_AUDIT_ACTION, productManager1, ActionStatus.INVALID_PROJECT_CODE,
+				Constants.EMPTY_STRING, Constants.EMPTY_STRING, null, null, Constants.EMPTY_STRING);
+		constructFieldsForAuditValidation.setCURR_VERSION("");
+		constructFieldsForAuditValidation.setCURR_STATE("");
+		AuditValidationUtils.validateAuditProduct(constructFieldsForAuditValidation, CREATE_AUDIT_ACTION);
+	}
+
+	@Test // (enabled = false)
+	public void createProductIconIsEmpty() throws Exception {
+		ProductReqDetails productReqDetails = ElementFactory.getDefaultProduct();
+		// productReqDetails.setName("CIProduct1");
+		productReqDetails.setTags(Arrays.asList(productReqDetails.getName()));
+		normalizedName = productReqDetails.getName().toLowerCase().replaceAll("\\s+", "");
+		productReqDetails.setIcon("");
+		RestResponse createProduct = ProductRestUtils.createProduct(productReqDetails, productManager1);
+		assertEquals("Check response code ", BaseRestUtils.STATUS_CODE_INVALID_CONTENT,
+				createProduct.getErrorCode().intValue());
+		Product expectedProduct = Convertor.constructFieldsForRespValidation(productReqDetails, "", productManager1);
+		ExpectedProductAudit constructFieldsForAuditValidation = Convertor.constructFieldsForAuditValidation(
+				expectedProduct, CREATE_AUDIT_ACTION, productManager1, ActionStatus.COMPONENT_MISSING_ICON,
+				Constants.EMPTY_STRING, Constants.EMPTY_STRING, null, null, Constants.EMPTY_STRING, "Product");
+		constructFieldsForAuditValidation.setCURR_VERSION("");
+		constructFieldsForAuditValidation.setCURR_STATE("");
+		AuditValidationUtils.validateAuditProduct(constructFieldsForAuditValidation, CREATE_AUDIT_ACTION);
+	}
+
+	@Test // (enabled = false)
+	public void createProductIconIsNull() throws Exception {
+		ProductReqDetails productReqDetails = ElementFactory.getDefaultProduct();
+		// productReqDetails.setName("CIProduct1");
+		productReqDetails.setTags(Arrays.asList(productReqDetails.getName()));
+		normalizedName = productReqDetails.getName().toLowerCase().replaceAll("\\s+", "");
+		productReqDetails.setIcon(null);
+		RestResponse createProduct = ProductRestUtils.createProduct(productReqDetails, productManager1);
+		assertEquals("Check response code ", BaseRestUtils.STATUS_CODE_INVALID_CONTENT,
+				createProduct.getErrorCode().intValue());
+		Product expectedProduct = Convertor.constructFieldsForRespValidation(productReqDetails, "", productManager1);
+		ExpectedProductAudit constructFieldsForAuditValidation = Convertor.constructFieldsForAuditValidation(
+				expectedProduct, CREATE_AUDIT_ACTION, productManager1, ActionStatus.COMPONENT_MISSING_ICON,
+				Constants.EMPTY_STRING, Constants.EMPTY_STRING, null, null, Constants.EMPTY_STRING, "Product");
+		constructFieldsForAuditValidation.setCURR_VERSION("");
+		constructFieldsForAuditValidation.setCURR_STATE("");
+		AuditValidationUtils.validateAuditProduct(constructFieldsForAuditValidation, CREATE_AUDIT_ACTION);
+	}
+
+	@Test // (enabled = false)
+	public void createProductIconMaxLength() throws Exception {
+		ProductReqDetails productReqDetails = ElementFactory.getDefaultProduct();
+		// productReqDetails.setName("CIProduct1");
+		productReqDetails.setTags(Arrays.asList(productReqDetails.getName()));
+		normalizedName = productReqDetails.getName().toLowerCase().replaceAll("\\s+", "");
+		productReqDetails.setIcon("asdfghjklqwertyuiozxcvbfv");
+		RestResponse createProduct = ProductRestUtils.createProduct(productReqDetails, productManager1);
+		ProductRestUtils.checkCreateResponse(createProduct);
+		String productUuid = ResponseParser.getUuidFromResponse(createProduct);
+		compareExpectedAndActualProducts(productReqDetails, createProduct);
+		Product expectedProduct = ResponseParser.parseToObjectUsingMapper(createProduct.getResponse(), Product.class);
+		RestResponse getProductRes = ProductRestUtils.getProduct(productReqDetails.getUniqueId(),
+				productManager1.getUserId());
+		ProductRestUtils.checkSuccess(getProductRes);
+		Product actualProduct = ResponseParser.parseToObjectUsingMapper(getProductRes.getResponse(), Product.class);
+		ProductValidationUtils.compareExpectedAndActualProducts(expectedProduct, actualProduct,
+				ComponentOperationEnum.GET_COMPONENT);
+		ExpectedProductAudit constructFieldsForAuditValidation = Convertor.constructFieldsForAuditValidation(
+				expectedProduct, CREATE_AUDIT_ACTION, productManager1, ActionStatus.CREATED, Constants.EMPTY_STRING,
+				"0.1", null, LifecycleStateEnum.NOT_CERTIFIED_CHECKOUT, productUuid);
+		AuditValidationUtils.validateAuditProduct(constructFieldsForAuditValidation, CREATE_AUDIT_ACTION);
+	}
+
+	@Test // (enabled = false)
+	public void createProductIconExceedMaxLength() throws Exception {
+		ProductReqDetails productReqDetails = ElementFactory.getDefaultProduct();
+		// productReqDetails.setName("CIProduct1");
+		productReqDetails.setTags(Arrays.asList(productReqDetails.getName()));
+		normalizedName = productReqDetails.getName().toLowerCase().replaceAll("\\s+", "");
+		productReqDetails.setIcon("asdfghjklqwertyuiozxcvbf12");
+		RestResponse createProduct = ProductRestUtils.createProduct(productReqDetails, productManager1);
+		assertEquals("Check response code ", BaseRestUtils.STATUS_CODE_INVALID_CONTENT,
+				createProduct.getErrorCode().intValue());
+		Product expectedProduct = Convertor.constructFieldsForRespValidation(productReqDetails, "", productManager1);
+		ExpectedProductAudit constructFieldsForAuditValidation = Convertor.constructFieldsForAuditValidation(
+				expectedProduct, CREATE_AUDIT_ACTION, productManager1, ActionStatus.COMPONENT_ICON_EXCEEDS_LIMIT,
+				Constants.EMPTY_STRING, Constants.EMPTY_STRING, null, null, Constants.EMPTY_STRING, "Product", "25");
+		constructFieldsForAuditValidation.setCURR_VERSION("");
+		constructFieldsForAuditValidation.setCURR_STATE("");
+		AuditValidationUtils.validateAuditProduct(constructFieldsForAuditValidation, CREATE_AUDIT_ACTION);
+	}
+
+	@Test // (enabled = false)
+	public void createProductIconAllowedCharacters() throws Exception {
+		ProductReqDetails productReqDetails = ElementFactory.getDefaultProduct();
+		// productReqDetails.setName("CIProduct1");
+		productReqDetails.setTags(Arrays.asList(productReqDetails.getName()));
+		normalizedName = productReqDetails.getName().toLowerCase().replaceAll("\\s+", "");
+		productReqDetails.setIcon("a--s-fghjk_q__r1234567890");
+		RestResponse createProduct = ProductRestUtils.createProduct(productReqDetails, productManager1);
+		ProductRestUtils.checkCreateResponse(createProduct);
+		String productUuid = ResponseParser.getUuidFromResponse(createProduct);
+		compareExpectedAndActualProducts(productReqDetails, createProduct);
+		Product expectedProduct = ResponseParser.parseToObjectUsingMapper(createProduct.getResponse(), Product.class);
+		RestResponse getProductRes = ProductRestUtils.getProduct(productReqDetails.getUniqueId(),
+				productManager1.getUserId());
+		ProductRestUtils.checkSuccess(getProductRes);
+		Product actualProduct = ResponseParser.parseToObjectUsingMapper(getProductRes.getResponse(), Product.class);
+		ProductValidationUtils.compareExpectedAndActualProducts(expectedProduct, actualProduct,
+				ComponentOperationEnum.GET_COMPONENT);
+		ExpectedProductAudit constructFieldsForAuditValidation = Convertor.constructFieldsForAuditValidation(
+				expectedProduct, CREATE_AUDIT_ACTION, productManager1, ActionStatus.CREATED, Constants.EMPTY_STRING,
+				"0.1", null, LifecycleStateEnum.NOT_CERTIFIED_CHECKOUT, productUuid);
+		AuditValidationUtils.validateAuditProduct(constructFieldsForAuditValidation, CREATE_AUDIT_ACTION);
+	}
+
+	@Test (enabled = false)
+	public void createProductIconInValidCharacters() throws Exception {
+		ProductReqDetails productReqDetails = ElementFactory.getDefaultProduct();
+		// productReqDetails.setName("CIProduct1");
+		productReqDetails.setTags(Arrays.asList(productReqDetails.getName()));
+		normalizedName = productReqDetails.getName().toLowerCase().replaceAll("\\s+", "");
+		String icon = "asdfg";
+		char invalidChars[] = { '~', '!', '$', '%', '^', '*', '(', ')', '"', '{', '}', '[', ']', '?', '>', '<', '/',
+				'|', '\\', ',' };
+		RestResponse createProduct;
+		for (int i = 0; i < invalidChars.length; i++) {
+			productReqDetails.setIcon(icon + invalidChars[i]);
+			createProduct = ProductRestUtils.createProduct(productReqDetails, productManager1);
+			assertEquals("Check response code ", BaseRestUtils.STATUS_CODE_INVALID_CONTENT,
+					createProduct.getErrorCode().intValue());
+			Product expectedProduct = Convertor.constructFieldsForRespValidation(productReqDetails, "",
+					productManager1);
+			ExpectedProductAudit constructFieldsForAuditValidation = Convertor.constructFieldsForAuditValidation(
+					expectedProduct, CREATE_AUDIT_ACTION, productManager1, ActionStatus.COMPONENT_INVALID_ICON,
+					Constants.EMPTY_STRING, Constants.EMPTY_STRING, null, null, Constants.EMPTY_STRING, "Product");
+			constructFieldsForAuditValidation.setCURR_VERSION("");
+			constructFieldsForAuditValidation.setCURR_STATE("");
+			AuditValidationUtils.validateAuditProduct(constructFieldsForAuditValidation, CREATE_AUDIT_ACTION);
+		}
+	}
+
+	@Test // (enabled = false)
+	public void createProductIsActiveisEmpty() throws Exception {
+		ProductReqDetails productReqDetails = ElementFactory.getDefaultProduct();
+		// productReqDetails.setName("CIProduct1");
+		productReqDetails.setTags(Arrays.asList(productReqDetails.getName()));
+		normalizedName = productReqDetails.getName().toLowerCase().replaceAll("\\s+", "");
+		productReqDetails.setActive("");
+		RestResponse createProduct = ProductRestUtils.createProduct(productReqDetails, productManager1);
+		ProductRestUtils.checkCreateResponse(createProduct);
+		productReqDetails.setActive("false");
+		String productUuid = ResponseParser.getUuidFromResponse(createProduct);
+		compareExpectedAndActualProducts(productReqDetails, createProduct);
+		Product expectedProduct = ResponseParser.parseToObjectUsingMapper(createProduct.getResponse(), Product.class);
+		RestResponse getProductRes = ProductRestUtils.getProduct(productReqDetails.getUniqueId(),
+				productManager1.getUserId());
+		ProductRestUtils.checkSuccess(getProductRes);
+		Product actualProduct = ResponseParser.parseToObjectUsingMapper(getProductRes.getResponse(), Product.class);
+		ProductValidationUtils.compareExpectedAndActualProducts(expectedProduct, actualProduct,
+				ComponentOperationEnum.GET_COMPONENT);
+		ExpectedProductAudit constructFieldsForAuditValidation = Convertor.constructFieldsForAuditValidation(
+				expectedProduct, CREATE_AUDIT_ACTION, productManager1, ActionStatus.CREATED, Constants.EMPTY_STRING,
+				"0.1", null, LifecycleStateEnum.NOT_CERTIFIED_CHECKOUT, productUuid);
+		AuditValidationUtils.validateAuditProduct(constructFieldsForAuditValidation, CREATE_AUDIT_ACTION);
+	}
+
+	@Test // (enabled = false)
+	public void createProductIsActiveisNull() throws Exception {
+		ProductReqDetails productReqDetails = ElementFactory.getDefaultProduct();
+		// productReqDetails.setName("CIProduct1");
+		productReqDetails.setTags(Arrays.asList(productReqDetails.getName()));
+		normalizedName = productReqDetails.getName().toLowerCase().replaceAll("\\s+", "");
+		productReqDetails.setActive("");
+		RestResponse createProduct = ProductRestUtils.createProduct(productReqDetails, productManager1);
+		ProductRestUtils.checkCreateResponse(createProduct);
+		productReqDetails.setActive("false");
+		String productUuid = ResponseParser.getUuidFromResponse(createProduct);
+		compareExpectedAndActualProducts(productReqDetails, createProduct);
+		Product expectedProduct = ResponseParser.parseToObjectUsingMapper(createProduct.getResponse(), Product.class);
+		RestResponse getProductRes = ProductRestUtils.getProduct(productReqDetails.getUniqueId(),
+				productManager1.getUserId());
+		ProductRestUtils.checkSuccess(getProductRes);
+		Product actualProduct = ResponseParser.parseToObjectUsingMapper(getProductRes.getResponse(), Product.class);
+		ProductValidationUtils.compareExpectedAndActualProducts(expectedProduct, actualProduct,
+				ComponentOperationEnum.GET_COMPONENT);
+		assertEquals(actualProduct.getIsActive(), new Boolean(false));
+		ExpectedProductAudit constructFieldsForAuditValidation = Convertor.constructFieldsForAuditValidation(
+				expectedProduct, CREATE_AUDIT_ACTION, productManager1, ActionStatus.CREATED, Constants.EMPTY_STRING,
+				"0.1", null, LifecycleStateEnum.NOT_CERTIFIED_CHECKOUT, productUuid);
+		AuditValidationUtils.validateAuditProduct(constructFieldsForAuditValidation, CREATE_AUDIT_ACTION);
+	}
+
+	@Test // (enabled = false)
+	public void createProductIsActiveisFalse() throws Exception {
+		ProductReqDetails productReqDetails = ElementFactory.getDefaultProduct();
+		// productReqDetails.setName("CIProduct1");
+		productReqDetails.setTags(Arrays.asList(productReqDetails.getName()));
+		normalizedName = productReqDetails.getName().toLowerCase().replaceAll("\\s+", "");
+		productReqDetails.setActive("false");
+		RestResponse createProduct = ProductRestUtils.createProduct(productReqDetails, productManager1);
+		ProductRestUtils.checkCreateResponse(createProduct);
+		String productUuid = ResponseParser.getUuidFromResponse(createProduct);
+		compareExpectedAndActualProducts(productReqDetails, createProduct);
+		Product expectedProduct = ResponseParser.parseToObjectUsingMapper(createProduct.getResponse(), Product.class);
+		RestResponse getProductRes = ProductRestUtils.getProduct(productReqDetails.getUniqueId(),
+				productManager1.getUserId());
+		ProductRestUtils.checkSuccess(getProductRes);
+		Product actualProduct = ResponseParser.parseToObjectUsingMapper(getProductRes.getResponse(), Product.class);
+		ProductValidationUtils.compareExpectedAndActualProducts(expectedProduct, actualProduct,
+				ComponentOperationEnum.GET_COMPONENT);
+		ExpectedProductAudit constructFieldsForAuditValidation = Convertor.constructFieldsForAuditValidation(
+				expectedProduct, CREATE_AUDIT_ACTION, productManager1, ActionStatus.CREATED, Constants.EMPTY_STRING,
+				"0.1", null, LifecycleStateEnum.NOT_CERTIFIED_CHECKOUT, productUuid);
+		AuditValidationUtils.validateAuditProduct(constructFieldsForAuditValidation, CREATE_AUDIT_ACTION);
+	}
+
+	@Test
+	public void createProductIsActiveisHasInvalidValue() throws Exception {
+		ProductReqDetails productReqDetails = ElementFactory.getDefaultProduct();
+		// productReqDetails.setName("CIProduct1");
+		productReqDetails.setTags(Arrays.asList(productReqDetails.getName()));
+		normalizedName = productReqDetails.getName().toLowerCase().replaceAll("\\s+", "");
+		productReqDetails.setActive("xfalse");
+		RestResponse createProduct = ProductRestUtils.createProduct(productReqDetails, productManager1);
+		assertEquals("Check response code ", BaseRestUtils.STATUS_CODE_INVALID_CONTENT,
+				createProduct.getErrorCode().intValue());
+		Product expectedProduct = Convertor.constructFieldsForRespValidation(productReqDetails, "", productManager1);
+		ExpectedProductAudit constructFieldsForAuditValidation = Convertor.constructFieldsForAuditValidation(
+				expectedProduct, CREATE_AUDIT_ACTION, productManager1, ActionStatus.INVALID_CONTENT,
+				Constants.EMPTY_STRING, Constants.EMPTY_STRING, null, null, Constants.EMPTY_STRING);
+		constructFieldsForAuditValidation.setCURR_VERSION("");
+		constructFieldsForAuditValidation.setCURR_STATE("");
+		constructFieldsForAuditValidation.setRESOURCE_NAME("");
+		AuditValidationUtils.validateAuditProduct(constructFieldsForAuditValidation, CREATE_AUDIT_ACTION);
+	}
+
+	@Test // (enabled = false)
+	public void createProductIsActiveisTrue() throws Exception {
+		ProductReqDetails productReqDetails = ElementFactory.getDefaultProduct();
+		// productReqDetails.setName("CIProduct1");
+		productReqDetails.setTags(Arrays.asList(productReqDetails.getName()));
+		normalizedName = productReqDetails.getName().toLowerCase().replaceAll("\\s+", "");
+		productReqDetails.setActive("true");
+		RestResponse createProduct = ProductRestUtils.createProduct(productReqDetails, productManager1);
+		ProductRestUtils.checkCreateResponse(createProduct);
+		String productUuid = ResponseParser.getUuidFromResponse(createProduct);
+		compareExpectedAndActualProducts(productReqDetails, createProduct);
+		Product expectedProduct = ResponseParser.parseToObjectUsingMapper(createProduct.getResponse(), Product.class);
+		RestResponse getProductRes = ProductRestUtils.getProduct(productReqDetails.getUniqueId(),
+				productManager1.getUserId());
+		ProductRestUtils.checkSuccess(getProductRes);
+		Product actualProduct = ResponseParser.parseToObjectUsingMapper(getProductRes.getResponse(), Product.class);
+		ProductValidationUtils.compareExpectedAndActualProducts(expectedProduct, actualProduct,
+				ComponentOperationEnum.GET_COMPONENT);
+		ExpectedProductAudit constructFieldsForAuditValidation = Convertor.constructFieldsForAuditValidation(
+				expectedProduct, CREATE_AUDIT_ACTION, productManager1, ActionStatus.CREATED, Constants.EMPTY_STRING,
+				"0.1", null, LifecycleStateEnum.NOT_CERTIFIED_CHECKOUT, productUuid);
+		AuditValidationUtils.validateAuditProduct(constructFieldsForAuditValidation, CREATE_AUDIT_ACTION);
+	}
+
+	//////////////////////////////////////////////
+	// DE192424
+	@Test // (enabled = false)
+	public void createProductNameValidationNormalizationNameWithSpaces() throws Exception {
+		ProductReqDetails productReqDetails = ElementFactory.getDefaultProduct();
+//		productReqDetails.setName("Abba Emma");
+		// productReqDetails.setName("abba emma");
+		// productReqDetails.setTags(Arrays.asList("abba emma"));
+		normalizedName = productReqDetails.getName().toLowerCase().replaceAll("\\s+", "");
+		RestResponse createProduct = ProductRestUtils.createProduct(productReqDetails, productManager1);
+		ProductRestUtils.checkCreateResponse(createProduct);
+		String actualNormalizedNameFromResponse = ResponseParser.getValueFromJsonResponse(createProduct.getResponse(),
+				"normalizedName");
+		assertTrue(actualNormalizedNameFromResponse.equals(normalizedName));
+		// productReqDetails.setName("Abba Emma");
+		String productUuid = ResponseParser.getUuidFromResponse(createProduct);
+		compareExpectedAndActualProducts(productReqDetails, createProduct);
+		Product expectedProduct = ResponseParser.parseToObjectUsingMapper(createProduct.getResponse(), Product.class);
+		RestResponse getProductRes = ProductRestUtils.getProduct(productReqDetails.getUniqueId(),
+				productManager1.getUserId());
+		ProductRestUtils.checkSuccess(getProductRes);
+		Product actualProduct = ResponseParser.parseToObjectUsingMapper(getProductRes.getResponse(), Product.class);
+		ProductValidationUtils.compareExpectedAndActualProducts(expectedProduct, actualProduct,
+				ComponentOperationEnum.GET_COMPONENT);
+		assertEquals(actualProduct.getIsActive(), new Boolean(false));
+		ExpectedProductAudit constructFieldsForAuditValidation = Convertor.constructFieldsForAuditValidation(
+				expectedProduct, CREATE_AUDIT_ACTION, productManager1, ActionStatus.CREATED, Constants.EMPTY_STRING,
+				"0.1", null, LifecycleStateEnum.NOT_CERTIFIED_CHECKOUT, productUuid);
+		AuditValidationUtils.validateAuditProduct(constructFieldsForAuditValidation, CREATE_AUDIT_ACTION);
+	}
+
+	private void compareExpectedAndActualProducts(ProductReqDetails productReqDetails, RestResponse createProduct)
+			throws JSONException {
+		String productName = ResponseParser.getNameFromResponse(createProduct);
+		assertTrue(productReqDetails.getName().equals(productName));
+		String productIcon = ResponseParser.getValueFromJsonResponse(createProduct.getResponse(), "icon");
+		assertTrue(productReqDetails.getIcon().equals(productIcon));
+		String productFullName = ResponseParser.getValueFromJsonResponse(createProduct.getResponse(), "fullName");
+		assertTrue(productReqDetails.getFullName().equals(productFullName));
+		String productProjectCode = ResponseParser.getValueFromJsonResponse(createProduct.getResponse(), "projectCode");
+		assertTrue(productReqDetails.getProjectCode().equals(productProjectCode));
+		String productIsActive = ResponseParser.getValueFromJsonResponse(createProduct.getResponse(), "isActive");
+		String expectedIsActive = (productReqDetails.getActive() != null ? productReqDetails.getActive() : "false");
+		assertTrue(productIsActive.equals(expectedIsActive));
+		String productdescription = ResponseParser.getValueFromJsonResponse(createProduct.getResponse(), "description");
+		assertTrue(productReqDetails.getDescription().equals(productdescription));
+		String productNormalizedName = ResponseParser.getValueFromJsonResponse(createProduct.getResponse(),
+				"normalizedName");
+		assertTrue(normalizedName.equals(productNormalizedName));
+		String productContacts = ResponseParser.getValueFromJsonResponse(createProduct.getResponse(), "contacts");
+		JSONArray reciviedContacts = new JSONArray(productContacts);
+		String actualContact = null;
+		for (int i = 0; i < reciviedContacts.length(); i++) {
+			actualContact = reciviedContacts.getString(i);
+			assertEquals(productReqDetails.getContacts().get(i), actualContact);
+		}
+		String productTags = ResponseParser.getValueFromJsonResponse(createProduct.getResponse(), "tags");
+		JSONArray reciviedTages = new JSONArray(productTags);
+		String actualTag = null;
+		for (int i = 0; i < reciviedTages.length(); i++) {
+			actualTag = reciviedTages.getString(i);
+			assertEquals(productReqDetails.getTags().get(i), actualTag);
+		}
+	}
+
+	// END
+	///////////////////////////////////////////////////////
+	@Test
+	public void createProductSuccessFlow() throws Exception {
+		ProductReqDetails productReqDetails = ElementFactory.getDefaultProduct();
+		RestResponse createProduct = ProductRestUtils.createProduct(productReqDetails, productManager1);
+		assertEquals("Check response code after create Product", BaseRestUtils.STATUS_CODE_CREATED,
+				createProduct.getErrorCode().intValue());
+
+		RestResponse getProductRes = ProductRestUtils.getProduct(productReqDetails.getUniqueId(),
+				productManager1.getUserId());
+		assertEquals("Check response code after getting created Product", BaseRestUtils.STATUS_CODE_SUCCESS,
+				getProductRes.getErrorCode().intValue());
+
+		Product expectedProduct = ResponseParser.parseToObjectUsingMapper(createProduct.getResponse(), Product.class);
+		Product actualProduct = ResponseParser.parseToObjectUsingMapper(getProductRes.getResponse(), Product.class);
+		ProductValidationUtils.compareExpectedAndActualProducts(expectedProduct, actualProduct,
+				ComponentOperationEnum.GET_COMPONENT);
+		assertEquals(actualProduct.getIsActive(), new Boolean(false));
+	}
+
+	@Test
+	public void createProductSetIsActive() throws Exception {
+		ProductReqDetails productReqDetails = ElementFactory.getDefaultProduct();
+		productReqDetails.setActive("true");
+		RestResponse createProduct = ProductRestUtils.createProduct(productReqDetails, productManager1);
+		assertEquals("Check response code after create Product", BaseRestUtils.STATUS_CODE_CREATED,
+				createProduct.getErrorCode().intValue());
+
+		RestResponse getProductRes = ProductRestUtils.getProduct(productReqDetails.getUniqueId(),
+				productManager1.getUserId());
+		assertEquals("Check response code after getting created Product", BaseRestUtils.STATUS_CODE_SUCCESS,
+				getProductRes.getErrorCode().intValue());
+
+		Product expectedProduct = ResponseParser.parseToObjectUsingMapper(createProduct.getResponse(), Product.class);
+		Product actualProduct = ResponseParser.parseToObjectUsingMapper(getProductRes.getResponse(), Product.class);
+		ProductValidationUtils.compareExpectedAndActualProducts(expectedProduct, actualProduct,
+				ComponentOperationEnum.GET_COMPONENT);
+		assertEquals(actualProduct.getIsActive(), new Boolean(true));
+	}
+
+	@Test
+	public void createProductNoIcon() throws Exception {
+		ProductReqDetails productReqDetails = ElementFactory.getDefaultProduct();
+		productReqDetails.setIcon(null);
+		RestResponse createProduct = ProductRestUtils.createProduct(productReqDetails, productManager1);
+		assertEquals("Check response code after create Product", BaseRestUtils.STATUS_CODE_MISSING_DATA,
+				createProduct.getErrorCode().intValue());
+
+	}
+
+	@Test
+	public void createProductNoProjectCode() throws Exception {
+		ProductReqDetails productReqDetails = ElementFactory.getDefaultProduct();
+		productReqDetails.setProjectCode(null);
+		RestResponse createProduct = ProductRestUtils.createProduct(productReqDetails, productManager1);
+		assertEquals("Check response code after create Product", BaseRestUtils.STATUS_CODE_MISSING_DATA,
+				createProduct.getErrorCode().intValue());
+
+	}
+
+}
diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/execute/product/ProductGetFollowedTest.java b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/execute/product/ProductGetFollowedTest.java
new file mode 100644
index 0000000000..a63c30e3e0
--- /dev/null
+++ b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/execute/product/ProductGetFollowedTest.java
@@ -0,0 +1,164 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * SDC
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.sdc.ci.tests.execute.product;
+
+import org.junit.Rule;
+import org.junit.rules.TestName;
+import org.openecomp.sdc.be.model.Product;
+import org.openecomp.sdc.ci.tests.datatypes.ProductReqDetails;
+import org.openecomp.sdc.ci.tests.datatypes.enums.LifeCycleStatesEnum;
+import org.openecomp.sdc.ci.tests.datatypes.http.RestResponse;
+import org.openecomp.sdc.ci.tests.utils.general.ElementFactory;
+import org.openecomp.sdc.ci.tests.utils.rest.ProductRestUtils;
+import org.openecomp.sdc.ci.tests.utils.rest.ResourceRestUtils;
+import org.openecomp.sdc.ci.tests.utils.rest.ResponseParser;
+import org.openecomp.sdc.ci.tests.utils.validation.ProductValidationUtils;
+import org.testng.annotations.BeforeMethod;
+import org.testng.annotations.Test;
+
+public class ProductGetFollowedTest extends ProductBaseTest {
+
+	protected Product product200;
+	protected Product product400;
+
+	private ProductReqDetails productDetails200;
+	private ProductReqDetails productDetails400;
+
+	@Rule
+	public static TestName name = new TestName();
+
+	public ProductGetFollowedTest() {
+		super();
+	}
+
+	@BeforeMethod
+	public void init() throws Exception {
+		createProducts();
+	}
+
+	@Test
+	public void followedPageTest() throws Exception { // Actions
+		RestResponse changeLifeCycleResponse;
+		changeLifeCycleResponse = ProductRestUtils.changeProductLifeCycle(product200, productManager1, LifeCycleStatesEnum.CHECKIN);
+		ResourceRestUtils.checkSuccess(changeLifeCycleResponse);
+		changeLifeCycleResponse = ProductRestUtils.changeProductLifeCycle(product400, productManager2, LifeCycleStatesEnum.CHECKIN);
+		ResourceRestUtils.checkSuccess(changeLifeCycleResponse);
+		// Expected users Followed page
+		ProductValidationUtils.checkUserFollowedPage(productManager1, product200);
+		ProductValidationUtils.verifyProductsNotExistInUserFollowedPage(productManager1, product400);
+		ProductValidationUtils.checkUserFollowedPage(productManager2, product400);
+		ProductValidationUtils.verifyProductsNotExistInUserFollowedPage(productManager2, product200);
+		ProductValidationUtils.verifyProductsNotExistInUserFollowedPage(adminUser, product200, product400);
+		ProductValidationUtils.verifyProductsNotExistInUserFollowedPage(designerUser, product200, product400);
+		ProductValidationUtils.verifyProductsNotExistInUserFollowedPage(productStrategistUser1, product200, product400);
+	}
+
+	@Test
+	public void followedPagePmCheckedOutProductWasCheckInByOtherPm() throws Exception {
+		ProductRestUtils.changeProductLifeCycle(product200, productManager1, LifeCycleStatesEnum.CHECKIN);
+		ProductRestUtils.changeProductLifeCycle(product400, productManager2, LifeCycleStatesEnum.CHECKIN);
+		ProductRestUtils.changeProductLifeCycle(product400, productManager1, LifeCycleStatesEnum.CHECKOUT);
+		RestResponse changeLifeCycleResponse = ProductRestUtils.changeProductLifeCycle(product200, productManager2, LifeCycleStatesEnum.CHECKOUT);
+		ResourceRestUtils.checkSuccess(changeLifeCycleResponse);
+
+		ProductValidationUtils.checkUserFollowedPage(productManager1, product400);
+		ProductValidationUtils.verifyProductsNotExistInUserFollowedPage(productManager2, product400);
+		ProductValidationUtils.verifyProductsNotExistInUserFollowedPage(adminUser, product200, product400);
+		ProductValidationUtils.verifyProductsNotExistInUserFollowedPage(designerUser, product200, product400);
+		ProductValidationUtils.verifyProductsNotExistInUserFollowedPage(productStrategistUser1, product200, product400);
+	}
+
+	@Test
+	public void followedPagePmCheckInProduct02() throws Exception {
+		ProductRestUtils.changeProductLifeCycle(product200, productManager1, LifeCycleStatesEnum.CHECKIN);
+		ProductRestUtils.changeProductLifeCycle(product400, productManager2, LifeCycleStatesEnum.CHECKIN);
+
+		ProductValidationUtils.checkUserFollowedPage(productManager1, product200);
+		ProductValidationUtils.verifyProductsNotExistInUserFollowedPage(productManager1, product400);
+		ProductValidationUtils.checkUserFollowedPage(productManager2, product400);
+		ProductValidationUtils.verifyProductsNotExistInUserFollowedPage(productManager2, product200);
+		ProductValidationUtils.verifyProductsNotExistInUserFollowedPage(adminUser, product200, product400);
+		ProductValidationUtils.verifyProductsNotExistInUserFollowedPage(designerUser, product200, product400);
+		ProductValidationUtils.verifyProductsNotExistInUserFollowedPage(productStrategistUser1, product200, product400);
+	}
+
+	@Test
+	public void followedPageAdminCheckoutProductWasCheckedinByPm() throws Exception {
+		ProductRestUtils.changeProductLifeCycle(product400, productManager2, LifeCycleStatesEnum.CHECKIN);
+		RestResponse changeLifeCycleResponse = ProductRestUtils.changeProductLifeCycle(product400, adminUser, LifeCycleStatesEnum.CHECKOUT);
+		ResourceRestUtils.checkSuccess(changeLifeCycleResponse);
+
+		ProductValidationUtils.checkUserFollowedPage(productManager1, product200);
+		ProductValidationUtils.verifyProductsNotExistInUserFollowedPage(productManager1, product400);
+		ProductValidationUtils.verifyProductsNotExistInUserFollowedPage(productManager2, product400);
+		ProductValidationUtils.verifyProductsNotExistInUserFollowedPage(adminUser, product200);
+		ProductValidationUtils.verifyProductsNotExistInUserFollowedPage(designerUser, product200, product400);
+		ProductValidationUtils.verifyProductsNotExistInUserFollowedPage(productStrategistUser1, product200, product400);
+	}
+
+	@Test
+	public void followedPageAdminCheckInProduct() throws Exception {
+		ProductRestUtils.changeProductLifeCycle(product400, productManager2, LifeCycleStatesEnum.CHECKIN);
+		ProductRestUtils.changeProductLifeCycle(product400, adminUser, LifeCycleStatesEnum.CHECKOUT);
+		RestResponse changeLifeCycleResponse = ProductRestUtils.changeProductLifeCycle(product400, adminUser, LifeCycleStatesEnum.CHECKIN);
+		ResourceRestUtils.checkSuccess(changeLifeCycleResponse);
+
+		ProductValidationUtils.checkUserFollowedPage(productManager1, product200);
+		ProductValidationUtils.verifyProductsNotExistInUserFollowedPage(productManager1, product400);
+		ProductValidationUtils.verifyProductsNotExistInUserFollowedPage(productManager2, product400);
+		ProductValidationUtils.verifyProductsNotExistInUserFollowedPage(adminUser, product200);
+		ProductValidationUtils.verifyProductsNotExistInUserFollowedPage(designerUser, product200, product400);
+		ProductValidationUtils.verifyProductsNotExistInUserFollowedPage(productStrategistUser1, product200, product400);
+	}
+
+	@Test
+	public void followedPagePmCheckoutProductWasCheckedinByAdmin() throws Exception {
+		ProductRestUtils.changeProductLifeCycle(product200, productManager1, LifeCycleStatesEnum.CHECKIN);
+		ProductRestUtils.changeProductLifeCycle(product400, productManager2, LifeCycleStatesEnum.CHECKIN);
+		ProductRestUtils.changeProductLifeCycle(product200, adminUser, LifeCycleStatesEnum.CHECKOUT);
+		ProductRestUtils.changeProductLifeCycle(product200, adminUser, LifeCycleStatesEnum.CHECKIN);
+		RestResponse changeLifeCycleResponse = ProductRestUtils.changeProductLifeCycle(product200, productManager2, LifeCycleStatesEnum.CHECKOUT);
+		ResourceRestUtils.checkSuccess(changeLifeCycleResponse);
+
+		ProductValidationUtils.verifyProductsNotExistInUserFollowedPage(productManager1, product200);
+		ProductValidationUtils.checkUserFollowedPage(productManager2, product200, product400);
+		ProductValidationUtils.verifyProductsNotExistInUserFollowedPage(adminUser, product200, product400);
+		ProductValidationUtils.verifyProductsNotExistInUserFollowedPage(designerUser, product200, product400);
+		ProductValidationUtils.verifyProductsNotExistInUserFollowedPage(productStrategistUser1, product200, product400);
+	}
+
+	private void createProducts() throws Exception {
+		// PM1 (Product manager) create :PR200 (check In State)
+		// PM2 (Product manager) create :PR400 (check In State)
+
+		productDetails200 = ElementFactory.getDefaultProduct("CiProd200", defaultCategories);
+		productDetails400 = ElementFactory.getDefaultProduct("CiProd400", defaultCategories);
+
+		RestResponse createProduct = ProductRestUtils.createProduct(productDetails200, productManager1);
+		ResourceRestUtils.checkCreateResponse(createProduct);
+		product200 = ResponseParser.parseToObjectUsingMapper(createProduct.getResponse(), Product.class);
+
+		createProduct = ProductRestUtils.createProduct(productDetails400, productManager2);
+		ResourceRestUtils.checkCreateResponse(createProduct);
+		product400 = ResponseParser.parseToObjectUsingMapper(createProduct.getResponse(), Product.class);
+	}
+
+}
diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/execute/product/ProductLifecycleTest.java b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/execute/product/ProductLifecycleTest.java
new file mode 100644
index 0000000000..61f93c7885
--- /dev/null
+++ b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/execute/product/ProductLifecycleTest.java
@@ -0,0 +1,55 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * SDC
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.sdc.ci.tests.execute.product;
+
+import org.junit.rules.TestName;
+import org.openecomp.sdc.be.model.Product;
+import org.openecomp.sdc.ci.tests.datatypes.ProductReqDetails;
+import org.openecomp.sdc.ci.tests.datatypes.http.RestResponse;
+import org.openecomp.sdc.ci.tests.utils.general.ElementFactory;
+import org.openecomp.sdc.ci.tests.utils.rest.BaseRestUtils;
+import org.openecomp.sdc.ci.tests.utils.rest.ProductRestUtils;
+import org.openecomp.sdc.ci.tests.utils.rest.ResponseParser;
+import org.testng.annotations.BeforeMethod;
+
+import static org.testng.AssertJUnit.assertEquals;
+
+public abstract class ProductLifecycleTest extends ProductBaseTest {
+
+	protected static final String CHECKIN_ACTION = "Checkin";
+	protected static final String CHECKOUT_ACTION = "Checkout";
+	protected static final String UNDO_CHECKOUT_ACTION = "UndoCheckout";
+
+	protected Product expectedProduct;
+
+	public ProductLifecycleTest(TestName testName, String className) {
+		super();
+	}
+
+	@BeforeMethod
+	public void init() throws Exception {
+		ProductReqDetails defaultProduct = ElementFactory.getDefaultProduct(defaultCategories);
+		RestResponse createProduct = ProductRestUtils.createProduct(defaultProduct, productManager1);
+		assertEquals("Check response code after create Product", BaseRestUtils.STATUS_CODE_CREATED,
+				createProduct.getErrorCode().intValue());
+		expectedProduct = ResponseParser.parseToObjectUsingMapper(createProduct.getResponse(), Product.class);
+	}
+}
diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/execute/product/ProductTestBase.java b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/execute/product/ProductTestBase.java
new file mode 100644
index 0000000000..7584078c9a
--- /dev/null
+++ b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/execute/product/ProductTestBase.java
@@ -0,0 +1,135 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * SDC
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.sdc.ci.tests.execute.product;
+
+
+import org.junit.Before;
+import org.junit.rules.TestName;
+import org.openecomp.sdc.be.datatypes.enums.ComponentTypeEnum;
+import org.openecomp.sdc.be.model.Product;
+import org.openecomp.sdc.be.model.Resource;
+import org.openecomp.sdc.be.model.Service;
+import org.openecomp.sdc.be.model.User;
+import org.openecomp.sdc.ci.tests.datatypes.*;
+import org.openecomp.sdc.ci.tests.datatypes.enums.ArtifactTypeEnum;
+import org.openecomp.sdc.ci.tests.datatypes.enums.UserRoleEnum;
+import org.openecomp.sdc.ci.tests.datatypes.http.RestResponse;
+import org.openecomp.sdc.ci.tests.utils.ArtifactUtils;
+import org.openecomp.sdc.ci.tests.utils.DbUtils;
+import org.openecomp.sdc.ci.tests.utils.general.ElementFactory;
+import org.openecomp.sdc.ci.tests.utils.rest.*;
+
+import java.io.IOException;
+
+import static org.junit.Assert.*;
+
+public class ProductTestBase extends ProductBaseTest {
+
+	public ProductTestBase(TestName testName, String className) {
+		super();
+	}
+
+	protected ResourceReqDetails downloadResourceDetails;
+	protected ServiceReqDetails serviceDetails;
+	protected ComponentInstanceReqDetails resourceInstanceReqDetails;
+	protected User sdncUserDetails;
+	protected ArtifactReqDetails heatArtifactDetails;
+	protected ArtifactReqDetails defaultArtifactDetails;
+
+	protected ArtifactUtils artifactUtils;
+	protected Resource resource;
+	protected Service service;
+	protected Product product;
+
+	// protected static ServiceUtils serviceUtils = new ServiceUtils();
+
+	@Before
+	public void before() throws Exception {
+
+		initializeMembers();
+		createComponents();
+
+	}
+
+	public void initializeMembers() throws IOException, Exception {
+
+		downloadResourceDetails = ElementFactory.getDefaultResource();
+		serviceDetails = ElementFactory.getDefaultService();
+		sdncUserDetails = ElementFactory.getDefaultUser(UserRoleEnum.DESIGNER);
+		heatArtifactDetails = ElementFactory.getDefaultDeploymentArtifactForType(ArtifactTypeEnum.HEAT.getType());
+		resourceInstanceReqDetails = ElementFactory.getDefaultComponentInstance();
+
+	}
+
+	protected void createComponents() throws Exception {
+
+		RestResponse response = ResourceRestUtils.createResource(downloadResourceDetails, sdncUserDetails);
+		assertTrue("create request returned status:" + response.getErrorCode(), response.getErrorCode() == 201);
+		assertNotNull("resource uniqueId is null:", downloadResourceDetails.getUniqueId());
+
+		ArtifactReqDetails heatArtifactDetails = ElementFactory
+				.getDefaultDeploymentArtifactForType(ArtifactTypeEnum.HEAT.getType());
+		response = ArtifactRestUtils.addInformationalArtifactToResource(heatArtifactDetails, sdncUserDetails,
+				downloadResourceDetails.getUniqueId());
+		assertTrue("add HEAT artifact to resource request returned status:" + response.getErrorCode(),
+				response.getErrorCode() == 200);
+
+		// certified resource
+		response = LifecycleRestUtils.certifyResource(downloadResourceDetails);
+		assertTrue("certify resource request returned status:" + response.getErrorCode(),
+				response.getErrorCode() == 200);
+
+		response = ResourceRestUtils.getResource(downloadResourceDetails.getUniqueId());
+		assertTrue("response code is not 200, returned: " + response.getErrorCode(), response.getErrorCode() == 200);
+		resource = ResponseParser.convertResourceResponseToJavaObject(response.getResponse());
+
+		response = ServiceRestUtils.createService(serviceDetails, sdncUserDetails);
+		assertTrue("create request returned status:" + response.getErrorCode(), response.getErrorCode() == 201);
+		assertNotNull("service uniqueId is null:", serviceDetails.getUniqueId());
+
+		// add resource instance with HEAT deployment artifact to the service
+		resourceInstanceReqDetails.setComponentUid(downloadResourceDetails.getUniqueId());
+		response = ComponentInstanceRestUtils.createComponentInstance(resourceInstanceReqDetails, sdncUserDetails,
+				serviceDetails.getUniqueId(), ComponentTypeEnum.SERVICE);
+		assertTrue("response code is not 201, returned: " + response.getErrorCode(), response.getErrorCode() == 201);
+
+		// certified service
+		response = LifecycleRestUtils.certifyService(serviceDetails);
+		assertTrue("certify service request returned status:" + response.getErrorCode(),
+				response.getErrorCode() == 200);
+
+		response = ServiceRestUtils.getService(serviceDetails, sdncUserDetails);
+		assertTrue("response code is not 200, returned: " + response.getErrorCode(), response.getErrorCode() == 200);
+		service = ResponseParser.convertServiceResponseToJavaObject(response.getResponse());
+
+		DbUtils.cleanAllAudits();
+
+		ProductReqDetails defaultProduct = ElementFactory.getDefaultProduct(defaultCategories);
+		RestResponse createProduct = ProductRestUtils.createProduct(defaultProduct, productStrategistUser1);
+		assertEquals("Check response code after create Product", BaseRestUtils.STATUS_CODE_CREATED,
+				createProduct.getErrorCode().intValue());
+		product = ResponseParser.parseToObjectUsingMapper(createProduct.getResponse(), Product.class);
+
+		// add service instance to product
+		//
+
+	}
+}
diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/execute/product/ProductToscaYamlGenerationTest.java b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/execute/product/ProductToscaYamlGenerationTest.java
new file mode 100644
index 0000000000..0c74f255fd
--- /dev/null
+++ b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/execute/product/ProductToscaYamlGenerationTest.java
@@ -0,0 +1,82 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * SDC
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.sdc.ci.tests.execute.product;
+
+import com.google.gson.Gson;
+import org.junit.Rule;
+import org.junit.rules.TestName;
+import org.openecomp.sdc.be.model.ArtifactUiDownloadData;
+import org.openecomp.sdc.ci.tests.utils.Decoder;
+import org.openecomp.sdc.ci.tests.utils.Utils;
+import org.testng.annotations.Test;
+
+import java.io.ByteArrayInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+
+public class ProductToscaYamlGenerationTest extends ProductTestBase {
+
+	@Rule
+	public static TestName name = new TestName();
+
+	public ProductToscaYamlGenerationTest() {
+		super(name, ProductToscaYamlGenerationTest.class.getName());
+	}
+
+	@Test
+	public void productToscaYamlFormat() throws IOException {
+
+		String heatEnvArtifactHeader = (String) Utils.parseYamlConfig("heatEnvArtifactHeader");
+		// System.out.println("heatEnvArtifactHeader = \n" +
+		// heatEnvArtifactHeader);
+
+		String heatEnvArtifactFooter = (String) Utils.parseYamlConfig("heatEnvArtifactFooter");
+		// System.out.println("heatEnvArtifactFooter = \n" +
+		// heatEnvArtifactFooter);
+
+		// temporary commented
+		// RestResponse downloadResourceInstanceHeatArtifact =
+		// ArtifactRestUtils.downloadResourceInstanceArtifact(service.getUniqueId(),
+		// resourceInstanceId, sdncUserDetails,
+		// heatArtifactDefinition.getUniqueId());
+		// assertTrue("expected request returned status:" + 200 + ", actual: " +
+		// downloadResourceInstanceHeatArtifact.getErrorCode(),
+		// downloadResourceInstanceHeatArtifact.getErrorCode()==200);
+
+		// InputStream stream =
+		// getDecodedSteramFromString(downloadResourceInstanceHeatArtifact.getResponse());
+		// System.out.println(Utils.getParamValueFromYamlByKey(stream,
+		// "description", String.class));
+
+		// node_types
+
+	}
+
+	private InputStream getDecodedSteramFromString(String encoded64Payload) throws IOException {
+
+		Gson gson = new Gson();
+		ArtifactUiDownloadData artifactUiDownloadData = gson.fromJson(encoded64Payload, ArtifactUiDownloadData.class);
+		String decodedPayload = Decoder.decode(artifactUiDownloadData.getBase64Contents());
+		return new ByteArrayInputStream(decodedPayload.getBytes());
+
+	}
+
+}
diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/execute/product/ProductUndoCheckoutTest.java b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/execute/product/ProductUndoCheckoutTest.java
new file mode 100644
index 0000000000..4bd1dffeff
--- /dev/null
+++ b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/execute/product/ProductUndoCheckoutTest.java
@@ -0,0 +1,216 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * SDC
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.sdc.ci.tests.execute.product;
+
+import org.junit.Rule;
+import org.junit.rules.TestName;
+import org.openecomp.sdc.be.dao.api.ActionStatus;
+import org.openecomp.sdc.be.model.LifecycleStateEnum;
+import org.openecomp.sdc.be.model.Product;
+import org.openecomp.sdc.be.model.User;
+import org.openecomp.sdc.ci.tests.datatypes.enums.LifeCycleStatesEnum;
+import org.openecomp.sdc.ci.tests.datatypes.expected.ExpectedProductAudit;
+import org.openecomp.sdc.ci.tests.datatypes.http.RestResponse;
+import org.openecomp.sdc.ci.tests.utils.general.Convertor;
+import org.openecomp.sdc.ci.tests.utils.rest.LifecycleRestUtils;
+import org.openecomp.sdc.ci.tests.utils.rest.ProductRestUtils;
+import org.openecomp.sdc.ci.tests.utils.rest.ResponseParser;
+import org.openecomp.sdc.ci.tests.utils.validation.AuditValidationUtils;
+import org.openecomp.sdc.ci.tests.utils.validation.ProductValidationUtils;
+import org.openecomp.sdc.common.api.Constants;
+import org.testng.annotations.BeforeClass;
+import org.testng.annotations.Test;
+
+import java.io.FileNotFoundException;
+
+import static org.testng.AssertJUnit.assertEquals;
+import static org.testng.AssertJUnit.assertNull;
+
+public class ProductUndoCheckoutTest extends ProductLifecycleTest {
+
+	@Rule
+	public static TestName name = new TestName();
+
+	@BeforeClass
+	public static void staticInit() {
+		auditAction = UNDO_CHECKOUT_ACTION;
+		operation = ComponentOperationEnum.CHANGE_STATE_UNDO_CHECKOUT;
+	}
+
+	public ProductUndoCheckoutTest() {
+		super(name, ProductUndoCheckoutTest.class.getName());
+	}
+
+	@Test
+	public void undoCheckOutProductByPm() throws Exception {
+		undoCheckOutProductSuccess(productManager1, false);
+	}
+
+	@Test
+	public void undoCheckOutProductByAdmin() throws Exception {
+		undoCheckOutProductSuccess(adminUser, true);
+	}
+
+	@Test
+	public void undoCheckOutAfterCreate() throws Exception {
+		RestResponse lcsResponse = LifecycleRestUtils.changeProductState(expectedProduct, productManager1,
+				LifeCycleStatesEnum.UNDOCHECKOUT);
+		assertEquals("Check response code after undo checkout product", 200, lcsResponse.getErrorCode().intValue());
+
+		// Verify version was removed
+		lcsResponse = ProductRestUtils.getProduct(expectedProduct.getUniqueId(), productManager1.getUserId());
+		assertEquals("Check response code after get undone product", 404, lcsResponse.getErrorCode().intValue());
+
+		Product emptyProduct = ResponseParser.parseToObjectUsingMapper(lcsResponse.getResponse(), Product.class);
+		assertNull(emptyProduct);
+		ExpectedProductAudit expectedProductAudit = Convertor.constructFieldsForAuditValidation(emptyProduct,
+				auditAction, productManager1, ActionStatus.OK, "0.1", Constants.EMPTY_STRING,
+				LifecycleStateEnum.NOT_CERTIFIED_CHECKOUT, null, Constants.EMPTY_STRING);
+		AuditValidationUtils.validateAuditProduct(expectedProductAudit, auditAction);
+
+	}
+
+	@Test
+	public void undoCheckOutNotExist() throws Exception {
+		String notExistId = "1234";
+		expectedProduct.setUniqueId(notExistId);
+		RestResponse lcsResponse = LifecycleRestUtils.changeProductState(expectedProduct, productManager1,
+				LifeCycleStatesEnum.UNDOCHECKOUT);
+		assertEquals("Check response code after undo checkout product", 404, lcsResponse.getErrorCode().intValue());
+		expectedProduct.setName(notExistId);
+		String[] auditParameters = new String[] { Constants.EMPTY_STRING };
+		ExpectedProductAudit expectedProductAudit = Convertor.constructFieldsForAuditValidation(expectedProduct,
+				auditAction, productManager1, ActionStatus.PRODUCT_NOT_FOUND, Constants.EMPTY_STRING,
+				Constants.EMPTY_STRING, null, null, Constants.EMPTY_STRING, auditParameters);
+		AuditValidationUtils.validateAuditProduct(expectedProductAudit, auditAction);
+
+	}
+
+	@Test
+	public void undoCheckOutNotInCheckout() throws Exception {
+		RestResponse lcsResponse = LifecycleRestUtils.changeProductState(expectedProduct, productManager1,
+				LifeCycleStatesEnum.CHECKIN);
+		assertEquals("Check response code after checkin product", 200, lcsResponse.getErrorCode().intValue());
+
+		lcsResponse = LifecycleRestUtils.changeProductState(expectedProduct, productManager1,
+				LifeCycleStatesEnum.UNDOCHECKOUT);
+		assertEquals("Check response code after undo checkout product", 409, lcsResponse.getErrorCode().intValue());
+
+		String[] auditParameters = new String[] { expectedProduct.getName(), "product", productManager1.getFirstName(),
+				productManager1.getLastName(), productManager1.getUserId() };
+
+		ExpectedProductAudit expectedProductAudit = Convertor.constructFieldsForAuditValidation(expectedProduct,
+				auditAction, productManager1, ActionStatus.COMPONENT_ALREADY_CHECKED_IN, "0.1", "0.1",
+				LifecycleStateEnum.NOT_CERTIFIED_CHECKIN, LifecycleStateEnum.NOT_CERTIFIED_CHECKIN,
+				expectedProduct.getUUID(), auditParameters);
+		AuditValidationUtils.validateAuditProduct(expectedProductAudit, auditAction);
+
+	}
+
+	@Test
+	public void undoCheckOutProductByPsRoleNotAllowed() throws Exception {
+		undoCheckOutProductRestricted(productStrategistUser1);
+	}
+
+	@Test
+	public void undoCheckOutProductByPmNotStateOwner() throws Exception {
+		undoCheckOutProductForbidden(productManager2);
+	}
+
+	private void undoCheckOutProductSuccess(User user, boolean isAdmin) throws Exception, FileNotFoundException {
+		RestResponse lcsResponse = LifecycleRestUtils.changeProductState(expectedProduct, productManager1,
+				LifeCycleStatesEnum.CHECKIN);
+		assertEquals("Check response code after checkin product", 200, lcsResponse.getErrorCode().intValue());
+
+		// Checking undo checkout of admin even if not state owner
+		User checkoutUser = isAdmin ? productManager1 : user;
+
+		lcsResponse = LifecycleRestUtils.changeProductState(expectedProduct, checkoutUser,
+				LifeCycleStatesEnum.CHECKOUT);
+		assertEquals("Check response code after checkout product", 200, lcsResponse.getErrorCode().intValue());
+		Product productToBeUndone = ResponseParser.parseToObjectUsingMapper(lcsResponse.getResponse(), Product.class);
+
+		lcsResponse = LifecycleRestUtils.changeProductState(productToBeUndone, user, LifeCycleStatesEnum.UNDOCHECKOUT);
+		assertEquals("Check response code after undo checkout product", 200, lcsResponse.getErrorCode().intValue());
+
+		// Verify version was removed
+		lcsResponse = ProductRestUtils.getProduct(productToBeUndone.getUniqueId(), user.getUserId());
+		assertEquals("Check response code after get undone product", 404, lcsResponse.getErrorCode().intValue());
+
+		lcsResponse = ProductRestUtils.getProduct(expectedProduct.getUniqueId(), user.getUserId());
+		assertEquals("Check response code after get latest version", 200, lcsResponse.getErrorCode().intValue());
+
+		Product latestProduct = ResponseParser.parseToObjectUsingMapper(lcsResponse.getResponse(), Product.class);
+
+		expectedProduct.setLifecycleState(LifecycleStateEnum.NOT_CERTIFIED_CHECKIN);
+		ProductValidationUtils.compareExpectedAndActualProducts(expectedProduct, latestProduct, operation);
+
+		ExpectedProductAudit expectedProductAudit = Convertor.constructFieldsForAuditValidation(latestProduct,
+				auditAction, user, ActionStatus.OK, "0.2", "0.1", LifecycleStateEnum.NOT_CERTIFIED_CHECKOUT,
+				LifecycleStateEnum.NOT_CERTIFIED_CHECKIN, latestProduct.getUUID());
+		AuditValidationUtils.validateAuditProduct(expectedProductAudit, auditAction);
+	}
+
+	private void undoCheckOutProductRestricted(User undoCheckoutUser) throws Exception, FileNotFoundException {
+		RestResponse lcsResponse = LifecycleRestUtils.changeProductState(expectedProduct, productManager1,
+				LifeCycleStatesEnum.CHECKIN);
+		assertEquals("Check response code after checkin product", 200, lcsResponse.getErrorCode().intValue());
+
+		lcsResponse = LifecycleRestUtils.changeProductState(expectedProduct, productManager1,
+				LifeCycleStatesEnum.CHECKOUT);
+		assertEquals("Check response code after checkout product", 200, lcsResponse.getErrorCode().intValue());
+		Product productToBeUndone = ResponseParser.parseToObjectUsingMapper(lcsResponse.getResponse(), Product.class);
+
+		lcsResponse = LifecycleRestUtils.changeProductState(productToBeUndone, undoCheckoutUser,
+				LifeCycleStatesEnum.UNDOCHECKOUT);
+		assertEquals("Check response code after undocheckout product", 409, lcsResponse.getErrorCode().intValue());
+
+		ExpectedProductAudit expectedProductAudit = Convertor.constructFieldsForAuditValidation(productToBeUndone,
+				auditAction, undoCheckoutUser, ActionStatus.RESTRICTED_OPERATION, "0.2", "0.2",
+				LifecycleStateEnum.NOT_CERTIFIED_CHECKOUT, LifecycleStateEnum.NOT_CERTIFIED_CHECKOUT,
+				productToBeUndone.getUUID());
+		AuditValidationUtils.validateAuditProduct(expectedProductAudit, auditAction);
+	}
+
+	private void undoCheckOutProductForbidden(User undoCheckoutUser) throws Exception, FileNotFoundException {
+		RestResponse lcsResponse = LifecycleRestUtils.changeProductState(expectedProduct, productManager1,
+				LifeCycleStatesEnum.CHECKIN);
+		assertEquals("Check response code after checkin product", 200, lcsResponse.getErrorCode().intValue());
+
+		lcsResponse = LifecycleRestUtils.changeProductState(expectedProduct, productManager1,
+				LifeCycleStatesEnum.CHECKOUT);
+		assertEquals("Check response code after checkout product", 200, lcsResponse.getErrorCode().intValue());
+		Product productToBeUndone = ResponseParser.parseToObjectUsingMapper(lcsResponse.getResponse(), Product.class);
+
+		lcsResponse = LifecycleRestUtils.changeProductState(productToBeUndone, undoCheckoutUser,
+				LifeCycleStatesEnum.UNDOCHECKOUT);
+		assertEquals("Check response code after undocheckout product", 403, lcsResponse.getErrorCode().intValue());
+		String[] auditParameters = new String[] { productToBeUndone.getName(), "product",
+				productManager1.getFirstName(), productManager1.getLastName(), productManager1.getUserId() };
+
+		ExpectedProductAudit expectedProductAudit = Convertor.constructFieldsForAuditValidation(expectedProduct,
+				auditAction, undoCheckoutUser, ActionStatus.COMPONENT_CHECKOUT_BY_ANOTHER_USER, "0.2", "0.2",
+				LifecycleStateEnum.NOT_CERTIFIED_CHECKOUT, LifecycleStateEnum.NOT_CERTIFIED_CHECKOUT,
+				productToBeUndone.getUUID(), auditParameters);
+		AuditValidationUtils.validateAuditProduct(expectedProductAudit, auditAction);
+	}
+
+}
diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/execute/property/AdditionalInformationServletTest.java b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/execute/property/AdditionalInformationServletTest.java
new file mode 100644
index 0000000000..d745e3680c
--- /dev/null
+++ b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/execute/property/AdditionalInformationServletTest.java
@@ -0,0 +1,2005 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * SDC
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.sdc.ci.tests.execute.property;
+
+import com.google.gson.Gson;
+import com.google.gson.GsonBuilder;
+import com.google.gson.reflect.TypeToken;
+import org.json.simple.parser.JSONParser;
+import org.junit.Rule;
+import org.junit.rules.TestName;
+import org.openecomp.sdc.be.datatypes.elements.AdditionalInfoParameterInfo;
+import org.openecomp.sdc.be.datatypes.enums.ComponentTypeEnum;
+import org.openecomp.sdc.be.model.AdditionalInformationDefinition;
+import org.openecomp.sdc.be.model.PropertyConstraint;
+import org.openecomp.sdc.be.model.Resource;
+import org.openecomp.sdc.be.model.User;
+import org.openecomp.sdc.be.model.operations.impl.PropertyOperation.PropertyConstraintDeserialiser;
+import org.openecomp.sdc.ci.tests.api.ComponentBaseTest;
+import org.openecomp.sdc.ci.tests.api.Urls;
+import org.openecomp.sdc.ci.tests.config.Config;
+import org.openecomp.sdc.ci.tests.datatypes.ArtifactReqDetails;
+import org.openecomp.sdc.ci.tests.datatypes.ComponentInstanceReqDetails;
+import org.openecomp.sdc.ci.tests.datatypes.ResourceReqDetails;
+import org.openecomp.sdc.ci.tests.datatypes.ServiceReqDetails;
+import org.openecomp.sdc.ci.tests.datatypes.enums.*;
+import org.openecomp.sdc.ci.tests.datatypes.http.HttpHeaderEnum;
+import org.openecomp.sdc.ci.tests.datatypes.http.HttpRequest;
+import org.openecomp.sdc.ci.tests.datatypes.http.RestResponse;
+import org.openecomp.sdc.ci.tests.execute.resource.ResourceApiTest;
+import org.openecomp.sdc.ci.tests.utils.Utils;
+import org.openecomp.sdc.ci.tests.utils.general.ElementFactory;
+import org.openecomp.sdc.ci.tests.utils.rest.*;
+import org.testng.AssertJUnit;
+import org.testng.annotations.Test;
+
+import java.io.IOException;
+import java.lang.reflect.Type;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import static org.testng.AssertJUnit.*;
+
+public class AdditionalInformationServletTest extends ComponentBaseTest {
+
+	protected Type constraintType = new TypeToken<PropertyConstraint>() {
+	}.getType();
+
+	protected Gson gson = new GsonBuilder().registerTypeAdapter(constraintType, new PropertyConstraintDeserialiser()).create();
+
+	@Rule
+	public static TestName name = new TestName();
+
+	protected String contentTypeHeaderData = "application/json";
+	protected String acceptHeaderDate = "application/json";
+
+	protected JSONParser jsonParser = new JSONParser();
+
+	// @Before
+	// public void deleteResources() {
+	// //TODO Evg : will be new API added for delete by name and version
+	//
+	// ResourceReqDetails resource = getResource();
+	// User user = getUser();
+	//
+	// try {
+	// String resourceName = resource.getResourceName();
+	// ResourceRestUtils.deleteResourceByNameAndVersion(user, resourceName,
+	// "0.1");
+	// ResourceRestUtils.deleteResourceByNameAndVersion(user, resourceName,
+	// "0.2");
+	// ResourceRestUtils.deleteResourceByNameAndVersion(user, resourceName,
+	// "1.0");
+	// ResourceRestUtils.deleteResourceByNameAndVersion(user, resourceName,
+	// "1.1");
+	// ResourceRestUtils.deleteResourceByNameAndVersion(user, resourceName +
+	// "aa", "0.1");
+	// resourceUtils.deleteResource_allVersions(resource, user);
+	//
+	// } catch (IOException e) {
+	// assertTrue(false);
+	// }
+	//
+	// try {
+	// ServiceReqDetails serviceDetails = getServiceDetails();
+	//
+	// RestResponse deleteServiceResponse =
+	// serviceUtils.deleteServiceByNameAndVersion(UserUtils.getAdminDetails(),
+	// serviceDetails.getServiceName(), "0.1");
+	//
+	// assertNotNull("check response object is not null after delete
+	// service",deleteServiceResponse);
+	// assertNotNull("check error code exists in response after delete
+	// service",deleteServiceResponse.getErrorCode());
+	// assertTrue("delete service failed status:" +
+	// deleteServiceResponse.getErrorCode(),
+	// deleteServiceResponse.getErrorCode() != 500);
+	//
+	// deleteServiceResponse =
+	// serviceUtils.deleteServiceByNameAndVersion(UserUtils.getAdminDetails(),
+	// serviceDetails.getServiceName(), "1.0");
+	//
+	// assertNotNull("check response object is not null after delete
+	// service",deleteServiceResponse);
+	// assertNotNull("check error code exists in response after delete
+	// service",deleteServiceResponse.getErrorCode());
+	// assertTrue("delete service failed status:" +
+	// deleteServiceResponse.getErrorCode(),
+	// deleteServiceResponse.getErrorCode() != 500);
+	//
+	// serviceUtils.deleteService_allVersions(serviceDetails, user);
+	//
+	// } catch (IOException e) {
+	// assertTrue(false);
+	// }
+	// }
+
+	@Test
+	public void updateResourceAdditionalInformationTest() throws Exception {
+		User user = getUser();
+		ResourceReqDetails resource = getResource();
+
+		// deleteResource(resourceId, user);
+		RestResponse createResourceResponse = createResource(resource, user);
+
+		String resourceId = ResponseParser.getUniqueIdFromResponse(createResourceResponse);
+
+		AssertJUnit.assertNotNull("check response object is not null after create resource", createResourceResponse);
+		AssertJUnit.assertNotNull("check error code exists in response after create resource", createResourceResponse.getErrorCode());
+		AssertJUnit.assertEquals("Check response code after create resource", 201, createResourceResponse.getErrorCode().intValue());
+
+		String key = "AAA  AAA";
+		String value = "BBBB";
+
+		String updatedKey = "ZZZ  ZZZ";
+		String updatedValue = "JJJJ";
+
+		AdditionalInfoParameterInfo additionalInfoParameterInfo = new AdditionalInfoParameterInfo(null, key, value);
+
+		RestResponse createProperty = createResourceAdditionalInformation(resourceId, additionalInfoParameterInfo, user);
+		AssertJUnit.assertNotNull("check response object is not null after create property", createProperty);
+		AssertJUnit.assertNotNull("check error code exists in response after create property", createProperty.getErrorCode());
+		AssertJUnit.assertEquals("Check response code after create property", 201, createProperty.getErrorCode().intValue());
+
+		AdditionalInfoParameterInfo fromJson = gson.fromJson(createProperty.getResponse(), AdditionalInfoParameterInfo.class);
+		AssertJUnit.assertFalse("check number of spaces", fromJson.getKey().contains("  "));
+		AssertJUnit.assertEquals("check returned key", "AAA AAA", fromJson.getKey());
+
+		fromJson.setKey(updatedKey);
+		fromJson.setValue(updatedValue);
+
+		RestResponse updatedProperty = updateAdditionalInformation(resourceId, fromJson, user, fromJson.getUniqueId());
+		AssertJUnit.assertNotNull("check response object is not null after update additional information", updatedProperty);
+		AssertJUnit.assertNotNull("check error code exists in response after additional information", updatedProperty.getErrorCode());
+		AssertJUnit.assertEquals("Check response code after additional information", 200, updatedProperty.getErrorCode().intValue());
+
+		AdditionalInfoParameterInfo updatedJson = gson.fromJson(updatedProperty.getResponse(), AdditionalInfoParameterInfo.class);
+		AssertJUnit.assertFalse("check number of spaces", updatedJson.getKey().contains("  "));
+		AssertJUnit.assertEquals("check returned key", "ZZZ ZZZ", updatedJson.getKey());
+		AssertJUnit.assertEquals("check returned value", updatedValue, updatedJson.getValue());
+		AssertJUnit.assertEquals("check returned id", fromJson.getUniqueId(), updatedJson.getUniqueId());
+
+	}
+
+	@Test
+	public void deleteResourceAdditionalInformationTest() throws Exception {
+		User user = getUser();
+		ResourceReqDetails resource = getResource();
+
+		RestResponse createResourceResponse = createResource(resource, user);
+
+		String resourceId = ResponseParser.getUniqueIdFromResponse(createResourceResponse);
+
+		AssertJUnit.assertNotNull("check response object is not null after create resource", createResourceResponse);
+		AssertJUnit.assertNotNull("check error code exists in response after create resource", createResourceResponse.getErrorCode());
+		AssertJUnit.assertEquals("Check response code after create resource", 201, createResourceResponse.getErrorCode().intValue());
+
+		String key = "AAA  AAA";
+		String value = "BBBB";
+
+		AdditionalInfoParameterInfo additionalInfoParameterInfo = new AdditionalInfoParameterInfo(null, key, value);
+
+		RestResponse createProperty = createResourceAdditionalInformation(resourceId, additionalInfoParameterInfo, user);
+		AssertJUnit.assertNotNull("check response object is not null after create property", createProperty);
+		AssertJUnit.assertNotNull("check error code exists in response after create property", createProperty.getErrorCode());
+		AssertJUnit.assertEquals("Check response code after create property", 201, createProperty.getErrorCode().intValue());
+
+		AdditionalInfoParameterInfo fromJson = gson.fromJson(createProperty.getResponse(), AdditionalInfoParameterInfo.class);
+		AssertJUnit.assertFalse("check number of spaces", fromJson.getKey().contains("  "));
+		AssertJUnit.assertEquals("check returned key", "AAA AAA", fromJson.getKey());
+
+		RestResponse deletedProperty = deleteAdditionalInformation(resourceId, fromJson.getUniqueId(), user);
+		AssertJUnit.assertNotNull("check response object is not null after update additional information", deletedProperty);
+		AssertJUnit.assertNotNull("check error code exists in response after additional information", deletedProperty.getErrorCode());
+		AssertJUnit.assertEquals("Check response code after additional information", 200, deletedProperty.getErrorCode().intValue());
+
+		AdditionalInfoParameterInfo updatedJson = gson.fromJson(deletedProperty.getResponse(), AdditionalInfoParameterInfo.class);
+		AssertJUnit.assertFalse("check number of spaces", updatedJson.getKey().contains("  "));
+		AssertJUnit.assertEquals("check returned key", "AAA AAA", updatedJson.getKey());
+		AssertJUnit.assertEquals("check returned value", value, updatedJson.getValue());
+		AssertJUnit.assertEquals("check returned id", fromJson.getUniqueId(), updatedJson.getUniqueId());
+
+		deletedProperty = deleteAdditionalInformation(resourceId, fromJson.getUniqueId(), user);
+		AssertJUnit.assertNotNull("check response object is not null after update additional information", deletedProperty);
+		AssertJUnit.assertNotNull("check error code exists in response after additional information", deletedProperty.getErrorCode());
+		AssertJUnit.assertEquals("Check response code after additional information", 409, deletedProperty.getErrorCode().intValue());
+
+	}
+
+	@Test
+	public void createResourceAdditionalInformationTestDuringLifecycle() throws Exception {
+		User user = getUser();
+		ResourceReqDetails resource = getResource();
+
+		// deleteResource(resourceId, user);
+		RestResponse createResourceResponse = createResource(resource, user);
+
+		String resourceId = ResponseParser.getUniqueIdFromResponse(createResourceResponse);
+
+		AssertJUnit.assertNotNull("check response object is not null after create resource", createResourceResponse);
+		AssertJUnit.assertNotNull("check error code exists in response after create resource", createResourceResponse.getErrorCode());
+		AssertJUnit.assertEquals("Check response code after create resource", 201, createResourceResponse.getErrorCode().intValue());
+
+		String key = "AAA  AAA";
+		String value = "BBBB";
+
+		AdditionalInfoParameterInfo additionalInfoParameterInfo = new AdditionalInfoParameterInfo(null, key, value);
+
+		RestResponse createProperty = createResourceAdditionalInformation(resourceId, additionalInfoParameterInfo, user);
+		AssertJUnit.assertNotNull("check response object is not null after create property", createProperty);
+		AssertJUnit.assertNotNull("check error code exists in response after create property", createProperty.getErrorCode());
+		AssertJUnit.assertEquals("Check response code after create property", 201, createProperty.getErrorCode().intValue());
+
+		AdditionalInfoParameterInfo fromJson = gson.fromJson(createProperty.getResponse(), AdditionalInfoParameterInfo.class);
+		AssertJUnit.assertFalse("check number of spaces", fromJson.getKey().contains("  "));
+		AssertJUnit.assertEquals("check returned key", "AAA AAA", fromJson.getKey());
+
+		resource.setUniqueId(resourceId);
+
+		// resourceUtils.addResourceMandatoryArtifacts(user,
+		// createResourceResponse);
+
+		certifyResource(user, resource, null, 1);
+
+	}
+
+	public RestResponse createService() {
+
+		User user = getUser();
+		ServiceReqDetails serviceDetails = getServiceDetails();
+
+		RestResponse createServiceResponse = null;
+		try {
+			createServiceResponse = ServiceRestUtils.createService(serviceDetails, user);
+			AssertJUnit.assertNotNull("check response object is not null after create user", createServiceResponse);
+			AssertJUnit.assertNotNull("check error code exists in response after create resource", createServiceResponse.getErrorCode());
+			AssertJUnit.assertEquals("Check response code after checkout resource", 201, createServiceResponse.getErrorCode().intValue());
+		} catch (Exception e) {
+			AssertJUnit.assertTrue(false);
+		}
+
+		return createServiceResponse;
+
+	}
+
+	protected User getUser() {
+		String adminFirstName = "Jimmy";
+		String adminLastName = "Hendrix";
+		String adminUserId = "jh0003";
+		return new User(adminFirstName, adminLastName, adminUserId, null, null, null);
+	}
+
+	protected ResourceReqDetails getResource() {
+		String resourceName = "ciResourceforproperty4";
+		String description = "description";
+		ArrayList<String> resourceTags = new ArrayList<String>();
+		resourceTags.add(resourceName);
+		ArrayList<String> derivedFrom = new ArrayList<String>();
+		derivedFrom.add("tosca.nodes.Root");
+		String vendorName = "Oracle";
+		String vendorRelease = "1.5";
+		String contactId = "pe0123";
+		String icon = "myICON";
+		ResourceReqDetails resource = new ResourceReqDetails(resourceName, description, resourceTags, null, derivedFrom, vendorName, vendorRelease, contactId, icon);
+		resource.addCategoryChain(ResourceCategoryEnum.GENERIC_DATABASE.getCategory(), ResourceCategoryEnum.GENERIC_DATABASE.getSubCategory());
+		return resource;
+	}
+
+	protected RestResponse createResource(ResourceReqDetails resourceDetails, User sdncModifierDetails) throws IOException {
+
+		ResourceApiTest rat = new ResourceApiTest();
+		ResourceReqDetails resourceObj = rat.getResourceObj();
+
+		Config config = Utils.getConfig();
+
+		Map<String, String> headersMap = new HashMap<String, String>();
+		headersMap.put(HttpHeaderEnum.CONTENT_TYPE.getValue(), contentTypeHeaderData);
+		headersMap.put(HttpHeaderEnum.ACCEPT.getValue(), acceptHeaderDate);
+		headersMap.put(HttpHeaderEnum.USER_ID.getValue(), sdncModifierDetails.getUserId());
+
+		Gson gson = new Gson();
+		String userBodyJson = gson.toJson(resourceDetails);
+		HttpRequest http = new HttpRequest();
+		String url = String.format(Urls.CREATE_RESOURCE, config.getCatalogBeHost(), config.getCatalogBePort());
+		RestResponse createResourceResponse = http.httpSendPost(url, userBodyJson, headersMap);
+
+		return createResourceResponse;
+
+	}
+
+	protected RestResponse getResource(User sdncModifierDetails, String resourceUid) throws IOException {
+
+		ResourceApiTest rat = new ResourceApiTest();
+		ResourceReqDetails resourceObj = rat.getResourceObj();
+
+		Config config = Utils.getConfig();
+
+		Map<String, String> headersMap = new HashMap<String, String>();
+		headersMap.put(HttpHeaderEnum.CONTENT_TYPE.getValue(), contentTypeHeaderData);
+		headersMap.put(HttpHeaderEnum.ACCEPT.getValue(), acceptHeaderDate);
+		headersMap.put(HttpHeaderEnum.USER_ID.getValue(), sdncModifierDetails.getUserId());
+
+		Gson gson = new Gson();
+		HttpRequest http = new HttpRequest();
+		String url = String.format(Urls.GET_RESOURCE, config.getCatalogBeHost(), config.getCatalogBePort(), resourceUid);
+		RestResponse createResourceResponse = http.httpSendGet(url, headersMap);
+
+		return createResourceResponse;
+
+	}
+
+	protected RestResponse deleteResource(String resourceName, String resourceVersion, User sdncModifierDetails) throws IOException {
+		RestResponse deleteResourceResponse = ResourceRestUtils.deleteResourceByNameAndVersion(sdncModifierDetails, resourceName, resourceVersion);
+
+		return deleteResourceResponse;
+
+	}
+
+	protected RestResponse updateAdditionalInformation(String resourceId, AdditionalInfoParameterInfo additionalInfo, User sdncModifierDetails, String id) throws IOException {
+		Config config = Utils.getConfig();
+
+		Map<String, String> headersMap = new HashMap<String, String>();
+		headersMap.put(HttpHeaderEnum.CONTENT_TYPE.getValue(), contentTypeHeaderData);
+		headersMap.put(HttpHeaderEnum.ACCEPT.getValue(), acceptHeaderDate);
+		headersMap.put(HttpHeaderEnum.USER_ID.getValue(), sdncModifierDetails.getUserId());
+
+		Gson gson = new Gson();
+		String body = gson.toJson(additionalInfo);
+		HttpRequest http = new HttpRequest();
+		String url = String.format(Urls.UPDATE_ADDITIONAL_INFORMATION_RESOURCE, config.getCatalogBeHost(), config.getCatalogBePort(), resourceId, id);
+		return http.httpSendPut(url, body, headersMap);
+
+	}
+
+	protected RestResponse updateServiceAdditionalInformation(String resourceId, AdditionalInfoParameterInfo additionalInfo, User sdncModifierDetails, String id) throws IOException {
+		Config config = Utils.getConfig();
+
+		Map<String, String> headersMap = new HashMap<String, String>();
+		headersMap.put(HttpHeaderEnum.CONTENT_TYPE.getValue(), contentTypeHeaderData);
+		headersMap.put(HttpHeaderEnum.ACCEPT.getValue(), acceptHeaderDate);
+		headersMap.put(HttpHeaderEnum.USER_ID.getValue(), sdncModifierDetails.getUserId());
+
+		Gson gson = new Gson();
+		String body = gson.toJson(additionalInfo);
+		HttpRequest http = new HttpRequest();
+		String url = String.format(Urls.UPDATE_ADDITIONAL_INFORMATION_SERVICE, config.getCatalogBeHost(), config.getCatalogBePort(), resourceId, id);
+		return http.httpSendPut(url, body, headersMap);
+
+	}
+
+	protected RestResponse deleteAdditionalInformation(String resourceId, String id, User sdncModifierDetails) throws IOException {
+		Config config = Utils.getConfig();
+
+		Map<String, String> headersMap = new HashMap<String, String>();
+		headersMap.put(HttpHeaderEnum.CONTENT_TYPE.getValue(), contentTypeHeaderData);
+		headersMap.put(HttpHeaderEnum.ACCEPT.getValue(), acceptHeaderDate);
+		headersMap.put(HttpHeaderEnum.USER_ID.getValue(), sdncModifierDetails.getUserId());
+
+		Gson gson = new Gson();
+		HttpRequest http = new HttpRequest();
+		String url = String.format(Urls.DELETE_ADDITIONAL_INFORMATION_RESOURCE, config.getCatalogBeHost(), config.getCatalogBePort(), resourceId, id);
+		return http.httpSendDelete(url, headersMap);
+
+	}
+
+	protected RestResponse deleteServiceAdditionalInformation(String resourceId, String id, User sdncModifierDetails) throws IOException {
+		Config config = Utils.getConfig();
+
+		Map<String, String> headersMap = new HashMap<String, String>();
+		headersMap.put(HttpHeaderEnum.CONTENT_TYPE.getValue(), contentTypeHeaderData);
+		headersMap.put(HttpHeaderEnum.ACCEPT.getValue(), acceptHeaderDate);
+		headersMap.put(HttpHeaderEnum.USER_ID.getValue(), sdncModifierDetails.getUserId());
+
+		HttpRequest http = new HttpRequest();
+		String url = String.format(Urls.DELETE_ADDITIONAL_INFORMATION_SERVICE, config.getCatalogBeHost(), config.getCatalogBePort(), resourceId, id);
+		return http.httpSendDelete(url, headersMap);
+
+	}
+
+	protected RestResponse getAdditionalInformation(String resourceId, String id, User sdncModifierDetails) throws IOException {
+		Config config = Utils.getConfig();
+
+		Map<String, String> headersMap = new HashMap<String, String>();
+		headersMap.put(HttpHeaderEnum.CONTENT_TYPE.getValue(), contentTypeHeaderData);
+		headersMap.put(HttpHeaderEnum.ACCEPT.getValue(), acceptHeaderDate);
+		headersMap.put(HttpHeaderEnum.USER_ID.getValue(), sdncModifierDetails.getUserId());
+
+		HttpRequest http = new HttpRequest();
+		String url = String.format(Urls.GET_ADDITIONAL_INFORMATION_RESOURCE, config.getCatalogBeHost(), config.getCatalogBePort(), resourceId, id);
+		return http.httpSendGet(url, headersMap);
+
+	}
+
+	protected RestResponse getServiceAdditionalInformation(String resourceId, String id, User sdncModifierDetails) throws IOException {
+		Config config = Utils.getConfig();
+
+		Map<String, String> headersMap = new HashMap<String, String>();
+		headersMap.put(HttpHeaderEnum.CONTENT_TYPE.getValue(), contentTypeHeaderData);
+		headersMap.put(HttpHeaderEnum.ACCEPT.getValue(), acceptHeaderDate);
+		headersMap.put(HttpHeaderEnum.USER_ID.getValue(), sdncModifierDetails.getUserId());
+
+		HttpRequest http = new HttpRequest();
+		String url = String.format(Urls.GET_ADDITIONAL_INFORMATION_SERVICE, config.getCatalogBeHost(), config.getCatalogBePort(), resourceId, id);
+		return http.httpSendGet(url, headersMap);
+
+	}
+
+	protected RestResponse getResourceAllAdditionalInformation(String resourceId, User sdncModifierDetails) throws IOException {
+		Config config = Utils.getConfig();
+
+		Map<String, String> headersMap = new HashMap<String, String>();
+		headersMap.put(HttpHeaderEnum.CONTENT_TYPE.getValue(), contentTypeHeaderData);
+		headersMap.put(HttpHeaderEnum.ACCEPT.getValue(), acceptHeaderDate);
+		headersMap.put(HttpHeaderEnum.USER_ID.getValue(), sdncModifierDetails.getUserId());
+
+		Gson gson = new Gson();
+		HttpRequest http = new HttpRequest();
+		String url = String.format(Urls.GET_ALL_ADDITIONAL_INFORMATION_RESOURCE, config.getCatalogBeHost(), config.getCatalogBePort(), resourceId);
+		return http.httpSendGet(url, headersMap);
+
+	}
+
+	protected RestResponse getServiceAllAdditionalInformation(String resourceId, User sdncModifierDetails) throws IOException {
+		Config config = Utils.getConfig();
+
+		Map<String, String> headersMap = new HashMap<String, String>();
+		headersMap.put(HttpHeaderEnum.CONTENT_TYPE.getValue(), contentTypeHeaderData);
+		headersMap.put(HttpHeaderEnum.ACCEPT.getValue(), acceptHeaderDate);
+		headersMap.put(HttpHeaderEnum.USER_ID.getValue(), sdncModifierDetails.getUserId());
+
+		Gson gson = new Gson();
+		HttpRequest http = new HttpRequest();
+		String url = String.format(Urls.GET_ALL_ADDITIONAL_INFORMATION_SERVICE, config.getCatalogBeHost(), config.getCatalogBePort(), resourceId);
+		return http.httpSendGet(url, headersMap);
+
+	}
+
+	protected RestResponse createResourceAdditionalInformation(String resourceId, AdditionalInfoParameterInfo additionalInfo, User sdncModifierDetails) throws IOException {
+		Config config = Utils.getConfig();
+
+		Map<String, String> headersMap = new HashMap<String, String>();
+		headersMap.put(HttpHeaderEnum.CONTENT_TYPE.getValue(), contentTypeHeaderData);
+		headersMap.put(HttpHeaderEnum.ACCEPT.getValue(), acceptHeaderDate);
+		headersMap.put(HttpHeaderEnum.USER_ID.getValue(), sdncModifierDetails.getUserId());
+
+		Gson gson = new Gson();
+		String body = gson.toJson(additionalInfo);
+		HttpRequest http = new HttpRequest();
+		String url = String.format(Urls.CREATE_ADDITIONAL_INFORMATION_RESOURCE, config.getCatalogBeHost(), config.getCatalogBePort(), resourceId);
+		return http.httpSendPost(url, body, headersMap);
+
+	}
+
+	protected RestResponse createServiceAdditionalInformation(String serviceId, AdditionalInfoParameterInfo additionalInfo, User sdncModifierDetails) throws IOException {
+		Config config = Utils.getConfig();
+
+		Map<String, String> headersMap = new HashMap<String, String>();
+		headersMap.put(HttpHeaderEnum.CONTENT_TYPE.getValue(), contentTypeHeaderData);
+		headersMap.put(HttpHeaderEnum.ACCEPT.getValue(), acceptHeaderDate);
+		headersMap.put(HttpHeaderEnum.USER_ID.getValue(), sdncModifierDetails.getUserId());
+
+		Gson gson = new Gson();
+		String body = gson.toJson(additionalInfo);
+		HttpRequest http = new HttpRequest();
+		String url = String.format(Urls.CREATE_ADDITIONAL_INFORMATION_SERVICE, config.getCatalogBeHost(), config.getCatalogBePort(), serviceId);
+		return http.httpSendPost(url, body, headersMap);
+
+	}
+
+	protected ServiceReqDetails getServiceDetails() {
+		String serviceName = "ciNewTestService21";
+		String category = ServiceCategoriesEnum.MOBILITY.getValue();
+		ArrayList<String> tags = new ArrayList<String>();
+		tags.add("serviceTag");
+		tags.add(serviceName);
+		String description = "service Description";
+		String vendorName = "Oracle";
+		String vendorRelease = "0.1";
+		String contactId = "al1976";
+		String icon = "myIcon";
+		String instantiationType = ServiceInstantiationType.A_LA_CARTE.getValue();
+
+		return new ServiceReqDetails(serviceName, category, tags, description, contactId, icon, instantiationType);
+	}
+
+	// TODO Tal: Since Cashing change partial resource returned that causes null
+	// pointer exception in line:
+	// commented out till fixing
+	protected Resource certifyResource(User user, ResourceReqDetails resource, String resourceVersion, int numberOfAI) throws IOException {
+		RestResponse checkInResponse = LifecycleRestUtils.changeResourceState(resource, user, resourceVersion, LifeCycleStatesEnum.CHECKIN);
+
+		AssertJUnit.assertNotNull("check response object is not null after create user", checkInResponse);
+		AssertJUnit.assertNotNull("check error code exists in response after create user", checkInResponse.getErrorCode());
+		AssertJUnit.assertEquals("Check response code after create user", 200, checkInResponse.getErrorCode().intValue());
+
+		Resource resourceAfterOperation = gson.fromJson(checkInResponse.getResponse(), Resource.class);
+		/*// TODO Tal: Since Cashing change partial resource returned that causes
+		// null pointer exception
+		*//*
+		 * AssertJUnit.assertEquals("check size of additional information", 1, resourceAfterOperation.getAdditionalInformation().size());
+		 *//*
+		*//*
+		 * AssertJUnit.assertEquals("check size of additional information", numberOfAI, resourceAfterOperation.getAdditionalInformation().get(0). getParameters().size());
+		 *//*
+
+		RestResponse req4certResponse = LifecycleRestUtils.changeResourceState(resource, user, resourceVersion, LifeCycleStatesEnum.CERTIFICATIONREQUEST);
+
+		AssertJUnit.assertNotNull("check response object is not null after create user", req4certResponse);
+		AssertJUnit.assertEquals("Check response code after checkout resource", 200, req4certResponse.getErrorCode().intValue());
+
+		resourceAfterOperation = gson.fromJson(req4certResponse.getResponse(), Resource.class);
+		// TODO Tal: Since Cashing change partial resource returned that causes
+		// null pointer exception
+		*//*
+		 * AssertJUnit.assertEquals("check size of additional information", 1, resourceAfterOperation.getAdditionalInformation().size());
+		 *//*
+		*//*
+		 * AssertJUnit.assertEquals("check size of additional information", numberOfAI, resourceAfterOperation.getAdditionalInformation().get(0). getParameters().size());
+		 *//*
+
+		// change modifier
+		user.setUserId(UserRoleEnum.TESTER.getUserId());
+		// start certification
+
+		RestResponse startCertResourceResponse3 = LifecycleRestUtils.changeResourceState(resource, user, resourceVersion, LifeCycleStatesEnum.STARTCERTIFICATION);
+		AssertJUnit.assertNotNull("check response object is not null after create user", startCertResourceResponse3);
+		AssertJUnit.assertEquals("Check response code after checkout resource", 200, startCertResourceResponse3.getErrorCode().intValue());
+
+		resourceAfterOperation = gson.fromJson(startCertResourceResponse3.getResponse(), Resource.class);
+		// TODO Tal: Since Cashing change partial resource returned that causes
+		// null pointer exception
+		*//*
+		 * AssertJUnit.assertEquals("check size of additional information", 1, resourceAfterOperation.getAdditionalInformation().size());
+		 *//*
+		*//*
+		 * AssertJUnit.assertEquals("check size of additional information", numberOfAI, resourceAfterOperation.getAdditionalInformation().get(0). getParameters().size());
+		 */
+
+		// certify
+
+		RestResponse certifyResponse = LifecycleRestUtils.changeResourceState(resource, user, resourceVersion, LifeCycleStatesEnum.CERTIFY);
+		AssertJUnit.assertNotNull("check response object is not null after create user", certifyResponse);
+		AssertJUnit.assertEquals("Check response code after checkout resource", 200, certifyResponse.getErrorCode().intValue());
+
+		resourceAfterOperation = gson.fromJson(certifyResponse.getResponse(), Resource.class);
+		AssertJUnit.assertEquals("check size of additional information", 1, resourceAfterOperation.getAdditionalInformation().size());
+		AssertJUnit.assertEquals("check size of additional information", numberOfAI, resourceAfterOperation.getAdditionalInformation().get(0).getParameters().size());
+
+		Resource certifyResource = gson.fromJson(certifyResponse.getResponse(), Resource.class);
+		return certifyResource;
+	}
+
+	protected Resource certifyService(User user, ServiceReqDetails service, String resourceVersion) throws Exception {
+		RestResponse checkInResponse = LifecycleRestUtils.changeServiceState(service, user, resourceVersion, LifeCycleStatesEnum.CHECKIN);
+
+		AssertJUnit.assertNotNull("check response object is not null after create user", checkInResponse);
+		AssertJUnit.assertNotNull("check error code exists in response after create user", checkInResponse.getErrorCode());
+		AssertJUnit.assertEquals("Check response code after create user", 200, checkInResponse.getErrorCode().intValue());
+
+		Resource resourceAfterOperation = gson.fromJson(checkInResponse.getResponse(), Resource.class);
+		AssertJUnit.assertEquals("check size of additional information", 1, resourceAfterOperation.getAdditionalInformation().size());
+		AssertJUnit.assertEquals("check size of additional information", 1, resourceAfterOperation.getAdditionalInformation().get(0).getParameters().size());
+
+		RestResponse req4certResponse = LifecycleRestUtils.changeServiceState(service, user, resourceVersion, LifeCycleStatesEnum.CERTIFICATIONREQUEST);
+
+		AssertJUnit.assertNotNull("check response object is not null after create user", req4certResponse);
+		AssertJUnit.assertEquals("Check response code after checkout resource", 200, req4certResponse.getErrorCode().intValue());
+
+		resourceAfterOperation = gson.fromJson(req4certResponse.getResponse(), Resource.class);
+		AssertJUnit.assertEquals("check size of additional information", 1, resourceAfterOperation.getAdditionalInformation().size());
+		AssertJUnit.assertEquals("check size of additional information", 1, resourceAfterOperation.getAdditionalInformation().get(0).getParameters().size());
+
+		// change modifier
+		user.setUserId(UserRoleEnum.TESTER.getUserId());
+		// start certification
+
+		RestResponse startCertResourceResponse3 = LifecycleRestUtils.changeServiceState(service, user, resourceVersion, LifeCycleStatesEnum.STARTCERTIFICATION);
+		AssertJUnit.assertNotNull("check response object is not null after create user", startCertResourceResponse3);
+		AssertJUnit.assertEquals("Check response code after checkout resource", 200, startCertResourceResponse3.getErrorCode().intValue());
+
+		resourceAfterOperation = gson.fromJson(startCertResourceResponse3.getResponse(), Resource.class);
+		AssertJUnit.assertEquals("check size of additional information", 1, resourceAfterOperation.getAdditionalInformation().size());
+		AssertJUnit.assertEquals("check size of additional information", 1, resourceAfterOperation.getAdditionalInformation().get(0).getParameters().size());
+
+		// certify
+
+		RestResponse certifyResponse = LifecycleRestUtils.changeServiceState(service, user, resourceVersion, LifeCycleStatesEnum.CERTIFY);
+		AssertJUnit.assertNotNull("check response object is not null after create user", certifyResponse);
+		AssertJUnit.assertEquals("Check response code after checkout resource", 200, certifyResponse.getErrorCode().intValue());
+
+		resourceAfterOperation = gson.fromJson(certifyResponse.getResponse(), Resource.class);
+		AssertJUnit.assertEquals("check size of additional information", 1, resourceAfterOperation.getAdditionalInformation().size());
+		AssertJUnit.assertEquals("check size of additional information", 1, resourceAfterOperation.getAdditionalInformation().get(0).getParameters().size());
+
+		Resource certifyResource = gson.fromJson(certifyResponse.getResponse(), Resource.class);
+		return certifyResource;
+	}
+
+	@Test
+	public void createResourceAdditionalInformationTest() throws Exception {
+		User user = getUser();
+		ResourceReqDetails resource = getResource();
+
+		// deleteResource(resourceId, user);
+		RestResponse createResourceResponse = createResource(resource, user);
+
+		String resourceId = ResponseParser.getUniqueIdFromResponse(createResourceResponse);
+
+		assertNotNull("check response object is not null after create resource", createResourceResponse);
+		assertNotNull("check error code exists in response after create resource", createResourceResponse.getErrorCode());
+		assertEquals("Check response code after create resource", 201, createResourceResponse.getErrorCode().intValue());
+
+		String key = "AAA  AAA";
+		String value = "BBBB";
+
+		AdditionalInfoParameterInfo additionalInfoParameterInfo = new AdditionalInfoParameterInfo(null, key, value);
+
+		RestResponse createProperty = createResourceAdditionalInformation(resourceId, additionalInfoParameterInfo, user);
+		assertNotNull("check response object is not null after create property", createProperty);
+		assertNotNull("check error code exists in response after create property", createProperty.getErrorCode());
+		assertEquals("Check response code after create property", 201, createProperty.getErrorCode().intValue());
+
+		AdditionalInfoParameterInfo fromJson = gson.fromJson(createProperty.getResponse(), AdditionalInfoParameterInfo.class);
+		assertFalse("check number of spaces", fromJson.getKey().contains("  "));
+		assertEquals("check returned key", "AAA AAA", fromJson.getKey());
+
+		createProperty = createResourceAdditionalInformation(resourceId, additionalInfoParameterInfo, user);
+		assertNotNull("check response object is not null after create property", createProperty);
+		assertNotNull("check error code exists in response after create property", createProperty.getErrorCode());
+		assertEquals("Check response code after create property", 409, createProperty.getErrorCode().intValue());
+
+	}
+
+	@Test
+	public void createResourceAdditionalInfoFormatWithTags() throws Exception {
+		User user = getUser();
+		ResourceReqDetails resource = getResource();
+
+		// deleteResource(resourceId, user);
+		RestResponse createResourceResponse = createResource(resource, user);
+
+		String resourceId = ResponseParser.getUniqueIdFromResponse(createResourceResponse);
+
+		assertNotNull("check response object is not null after create resource", createResourceResponse);
+		assertNotNull("check error code exists in response after create resource", createResourceResponse.getErrorCode());
+		assertEquals("Check response code after create resource", 201, createResourceResponse.getErrorCode().intValue());
+
+		String key = "AAA  AAA";
+		String value = "<b>Bold<</b>";
+
+		AdditionalInfoParameterInfo additionalInfoParameterInfo = new AdditionalInfoParameterInfo(null, key, value);
+
+		RestResponse createProperty = createResourceAdditionalInformation(resourceId, additionalInfoParameterInfo, user);
+		assertNotNull("check response object is not null after create property", createProperty);
+		assertNotNull("check error code exists in response after create property", createProperty.getErrorCode());
+		assertEquals("Check response code after create property", 201, createProperty.getErrorCode().intValue());
+
+		AdditionalInfoParameterInfo fromJson = gson.fromJson(createProperty.getResponse(), AdditionalInfoParameterInfo.class);
+		assertEquals("check returned key", "Bold&amp;lt;", fromJson.getValue());
+
+	}
+
+	@Test
+	public void createServiceAdditionalInfoFormatWithTags() throws Exception {
+		User user = getUser();
+		RestResponse createServiceResponse = createService();
+
+		String serviceId = ResponseParser.convertServiceResponseToJavaObject(createServiceResponse.getResponse()).getUniqueId();
+
+		assertNotNull("check response object is not null after create resource", createServiceResponse);
+		assertNotNull("check error code exists in response after create resource", createServiceResponse.getErrorCode());
+		assertEquals("Check response code after create resource", 201, createServiceResponse.getErrorCode().intValue());
+
+		String key = "AAA  AAA";
+		String value = "<b>Bold<</b>";
+
+		AdditionalInfoParameterInfo additionalInfoParameterInfo = new AdditionalInfoParameterInfo(null, key, value);
+
+		RestResponse createProperty = createServiceAdditionalInformation(serviceId, additionalInfoParameterInfo, user);
+		assertNotNull("check response object is not null after create property", createProperty);
+		assertNotNull("check error code exists in response after create property", createProperty.getErrorCode());
+		assertEquals("Check response code after create property", 201, createProperty.getErrorCode().intValue());
+
+		AdditionalInfoParameterInfo fromJson = gson.fromJson(createProperty.getResponse(), AdditionalInfoParameterInfo.class);
+		assertEquals("check returned key", "Bold&amp;lt;", fromJson.getValue());
+
+	}
+
+	@Test
+	public void createResourceAdditionalInfoFormatWithWhiteSpaces() throws Exception {
+		User user = getUser();
+		ResourceReqDetails resource = getResource();
+
+		// deleteResource(resourceId, user);
+		RestResponse createResourceResponse = createResource(resource, user);
+
+		String resourceId = ResponseParser.getUniqueIdFromResponse(createResourceResponse);
+
+		assertNotNull("check response object is not null after create resource", createResourceResponse);
+		assertNotNull("check error code exists in response after create resource", createResourceResponse.getErrorCode());
+		assertEquals("Check response code after create resource", 201, createResourceResponse.getErrorCode().intValue());
+
+		String key = "AAA  AAA";
+		String value = "      ";
+
+		AdditionalInfoParameterInfo additionalInfoParameterInfo = new AdditionalInfoParameterInfo(null, key, value);
+
+		RestResponse createProperty = createResourceAdditionalInformation(resourceId, additionalInfoParameterInfo, user);
+		assertNotNull("check response object is not null after create property", createProperty);
+		assertNotNull("check error code exists in response after create property", createProperty.getErrorCode());
+		assertEquals("Check response code after create property", 400, createProperty.getErrorCode().intValue());
+
+		key = "    ";
+		value = "AAA  AAA";
+
+		additionalInfoParameterInfo = new AdditionalInfoParameterInfo(null, key, value);
+
+		createProperty = createResourceAdditionalInformation(resourceId, additionalInfoParameterInfo, user);
+		assertNotNull("check response object is not null after create property", createProperty);
+		assertNotNull("check error code exists in response after create property", createProperty.getErrorCode());
+		assertEquals("Check response code after create property", 400, createProperty.getErrorCode().intValue());
+
+	}
+
+	@Test
+	public void createServiceAdditionalInfoFormatWithWhiteSpaces() throws Exception {
+		User user = getUser();
+
+		RestResponse createServiceResponse = createService();
+		ResponseParser.convertServiceResponseToJavaObject(createServiceResponse.getResponse()).getUniqueId();
+
+		String serviceId = ResponseParser.convertServiceResponseToJavaObject(createServiceResponse.getResponse()).getUniqueId();
+
+		assertNotNull("check response object is not null after create resource", createServiceResponse);
+		assertNotNull("check error code exists in response after create resource", createServiceResponse.getErrorCode());
+		assertEquals("Check response code after create resource", 201, createServiceResponse.getErrorCode().intValue());
+
+		String key = "AAA  AAA";
+		String value = "      ";
+
+		AdditionalInfoParameterInfo additionalInfoParameterInfo = new AdditionalInfoParameterInfo(null, key, value);
+
+		RestResponse createProperty = createServiceAdditionalInformation(serviceId, additionalInfoParameterInfo, user);
+		assertNotNull("check response object is not null after create property", createProperty);
+		assertNotNull("check error code exists in response after create property", createProperty.getErrorCode());
+		assertEquals("Check response code after create property", 400, createProperty.getErrorCode().intValue());
+
+		key = "    ";
+		value = "AAA  AAA";
+
+		additionalInfoParameterInfo = new AdditionalInfoParameterInfo(null, key, value);
+
+		createProperty = createServiceAdditionalInformation(serviceId, additionalInfoParameterInfo, user);
+		assertNotNull("check response object is not null after create property", createProperty);
+		assertNotNull("check error code exists in response after create property", createProperty.getErrorCode());
+		assertEquals("Check response code after create property", 400, createProperty.getErrorCode().intValue());
+
+	}
+
+	@Test
+	public void createResourceAndUpdateAdditionalInfo() throws Exception {
+		User user = getUser();
+		ResourceReqDetails resource = getResource();
+
+		// deleteResource(resourceId, user);
+		RestResponse createResourceResponse = createResource(resource, user);
+
+		String resourceId = ResponseParser.getUniqueIdFromResponse(createResourceResponse);
+
+		assertNotNull("check response object is not null after create resource", createResourceResponse);
+		assertNotNull("check error code exists in response after create resource", createResourceResponse.getErrorCode());
+		assertEquals("Check response code after create resource", 201, createResourceResponse.getErrorCode().intValue());
+
+		String key = "AAA  AAA";
+		String value = "BBBB";
+
+		AdditionalInfoParameterInfo additionalInfoParameterInfo = new AdditionalInfoParameterInfo(null, key, value);
+
+		RestResponse createProperty = createResourceAdditionalInformation(resourceId, additionalInfoParameterInfo, user);
+		assertNotNull("check response object is not null after create property", createProperty);
+		assertNotNull("check error code exists in response after create property", createProperty.getErrorCode());
+		assertEquals("Check response code after create property", 201, createProperty.getErrorCode().intValue());
+
+		AdditionalInfoParameterInfo fromJson = gson.fromJson(createProperty.getResponse(), AdditionalInfoParameterInfo.class);
+		assertFalse("check number of spaces", fromJson.getKey().contains("  "));
+		assertEquals("check returned key", "AAA AAA", fromJson.getKey());
+
+		key = "BBB  BBB";
+		value = "BBBB";
+
+		additionalInfoParameterInfo = new AdditionalInfoParameterInfo(null, key, value);
+
+		createProperty = createResourceAdditionalInformation(resourceId, additionalInfoParameterInfo, user);
+		assertNotNull("check response object is not null after create property", createProperty);
+		assertNotNull("check error code exists in response after create property", createProperty.getErrorCode());
+		assertEquals("Check response code after create property", 201, createProperty.getErrorCode().intValue());
+
+		fromJson = gson.fromJson(createProperty.getResponse(), AdditionalInfoParameterInfo.class);
+		assertFalse("check number of spaces", fromJson.getKey().contains("  "));
+		assertEquals("check returned key", "BBB BBB", fromJson.getKey());
+
+		String updatedKey = "AAA  AAA";
+		String updatedValue = "JJJJ";
+
+		fromJson.setKey(updatedKey);
+		fromJson.setValue(updatedValue);
+
+		RestResponse updatedProperty = updateAdditionalInformation(resourceId, fromJson, user, fromJson.getUniqueId());
+		assertNotNull("check response object is not null after update additional information", updatedProperty);
+		assertNotNull("check error code exists in response after additional information", updatedProperty.getErrorCode());
+		assertEquals("Check response code after additional information", 409, updatedProperty.getErrorCode().intValue());
+
+	}
+
+	@Test
+	public void createServiceAdditionalInformationTest() throws Exception {
+		User user = getUser();
+
+		RestResponse createServiceResponse = createService();
+
+		String serviceId = ResponseParser.convertServiceResponseToJavaObject(createServiceResponse.getResponse()).getUniqueId();
+
+		String key = "AAA  AAA";
+		String value = "BBBB";
+
+		AdditionalInfoParameterInfo additionalInfoParameterInfo = new AdditionalInfoParameterInfo(null, key, value);
+
+		RestResponse createProperty = createServiceAdditionalInformation(serviceId, additionalInfoParameterInfo, user);
+		assertNotNull("check response object is not null after create property", createProperty);
+		assertNotNull("check error code exists in response after create property", createProperty.getErrorCode());
+		assertEquals("Check response code after create property", 201, createProperty.getErrorCode().intValue());
+
+		AdditionalInfoParameterInfo fromJson = gson.fromJson(createProperty.getResponse(), AdditionalInfoParameterInfo.class);
+		assertFalse("check number of spaces", fromJson.getKey().contains("  "));
+		assertEquals("check returned key", "AAA AAA", fromJson.getKey());
+
+		createProperty = createServiceAdditionalInformation(serviceId, additionalInfoParameterInfo, user);
+		assertNotNull("check response object is not null after create property", createProperty);
+		assertNotNull("check error code exists in response after create property", createProperty.getErrorCode());
+		assertEquals("Check response code after create property", 409, createProperty.getErrorCode().intValue());
+
+	}
+
+	@Test
+	public void createResourceEmptyAdditionalInformationTest() throws Exception {
+		User user = getUser();
+		ResourceReqDetails resource = getResource();
+
+		// deleteResource(resourceId, user);
+		RestResponse createResourceResponse = createResource(resource, user);
+
+		String resourceId = ResponseParser.getUniqueIdFromResponse(createResourceResponse);
+
+		assertNotNull("check response object is not null after create resource", createResourceResponse);
+		assertNotNull("check error code exists in response after create resource", createResourceResponse.getErrorCode());
+		assertEquals("Check response code after create resource", 201, createResourceResponse.getErrorCode().intValue());
+
+		String key = "";
+		String value = "BBBB";
+
+		AdditionalInfoParameterInfo additionalInfoParameterInfo = new AdditionalInfoParameterInfo(null, key, value);
+
+		RestResponse createProperty = createResourceAdditionalInformation(resourceId, additionalInfoParameterInfo, user);
+		assertNotNull("check response object is not null after create property", createProperty);
+		assertNotNull("check error code exists in response after create property", createProperty.getErrorCode());
+		assertEquals("Check response code after create property", 400, createProperty.getErrorCode().intValue());
+
+		key = "BBBB";
+		value = "";
+
+		additionalInfoParameterInfo = new AdditionalInfoParameterInfo(null, key, value);
+
+		createProperty = createResourceAdditionalInformation(resourceId, additionalInfoParameterInfo, user);
+		assertNotNull("check response object is not null after create property", createProperty);
+		assertNotNull("check error code exists in response after create property", createProperty.getErrorCode());
+		assertEquals("Check response code after create property", 400, createProperty.getErrorCode().intValue());
+
+	}
+
+	@Test
+	public void createServiceEmptyAdditionalInformationTest() throws Exception {
+
+		User user = getUser();
+
+		RestResponse createServiceResponse = createService();
+
+		String serviceId = ResponseParser.convertServiceResponseToJavaObject(createServiceResponse.getResponse()).getUniqueId();
+
+		String key = "";
+		String value = "BBBB";
+
+		AdditionalInfoParameterInfo additionalInfoParameterInfo = new AdditionalInfoParameterInfo(null, key, value);
+
+		RestResponse createProperty = createServiceAdditionalInformation(serviceId, additionalInfoParameterInfo, user);
+		assertNotNull("check response object is not null after create property", createProperty);
+		assertNotNull("check error code exists in response after create property", createProperty.getErrorCode());
+		assertEquals("Check response code after create property", 400, createProperty.getErrorCode().intValue());
+
+	}
+
+	@Test
+	public void createResourceAllSpacesAdditionalInformationTest() throws Exception {
+		User user = getUser();
+		ResourceReqDetails resource = getResource();
+
+		// deleteResource(resourceId, user);
+		RestResponse createResourceResponse = createResource(resource, user);
+
+		String resourceId = ResponseParser.getUniqueIdFromResponse(createResourceResponse);
+
+		assertNotNull("check response object is not null after create resource", createResourceResponse);
+		assertNotNull("check error code exists in response after create resource", createResourceResponse.getErrorCode());
+		assertEquals("Check response code after create resource", 201, createResourceResponse.getErrorCode().intValue());
+
+		String key = "           ";
+		String value = "BBBB";
+
+		AdditionalInfoParameterInfo additionalInfoParameterInfo = new AdditionalInfoParameterInfo(null, key, value);
+
+		RestResponse createProperty = createResourceAdditionalInformation(resourceId, additionalInfoParameterInfo, user);
+		assertNotNull("check response object is not null after create property", createProperty);
+		assertNotNull("check error code exists in response after create property", createProperty.getErrorCode());
+		assertEquals("Check response code after create property", 400, createProperty.getErrorCode().intValue());
+
+	}
+
+	@Test
+	public void createServiceAllSpacesAdditionalInformationTest() throws Exception {
+		User user = getUser();
+
+		RestResponse createServiceResponse = createService();
+
+		String serviceId = ResponseParser.convertServiceResponseToJavaObject(createServiceResponse.getResponse()).getUniqueId();
+
+		String key = "           ";
+		String value = "BBBB";
+
+		AdditionalInfoParameterInfo additionalInfoParameterInfo = new AdditionalInfoParameterInfo(null, key, value);
+
+		RestResponse createProperty = createServiceAdditionalInformation(serviceId, additionalInfoParameterInfo, user);
+		assertNotNull("check response object is not null after create property", createProperty);
+		assertNotNull("check error code exists in response after create property", createProperty.getErrorCode());
+		assertEquals("Check response code after create property", 400, createProperty.getErrorCode().intValue());
+
+	}
+
+	@Test
+	public void createResourceInvalidKeyAdditionalInformationTest() throws Exception {
+		User user = getUser();
+		ResourceReqDetails resource = getResource();
+
+		// deleteResource(resourceId, user);
+		RestResponse createResourceResponse = createResource(resource, user);
+
+		String resourceId = ResponseParser.getUniqueIdFromResponse(createResourceResponse);
+
+		assertNotNull("check response object is not null after create resource", createResourceResponse);
+		assertNotNull("check error code exists in response after create resource", createResourceResponse.getErrorCode());
+		assertEquals("Check response code after create resource", 201, createResourceResponse.getErrorCode().intValue());
+
+		String key = "abc?";
+		String value = "BBBB";
+
+		AdditionalInfoParameterInfo additionalInfoParameterInfo = new AdditionalInfoParameterInfo(null, key, value);
+
+		RestResponse createProperty = createResourceAdditionalInformation(resourceId, additionalInfoParameterInfo, user);
+		assertNotNull("check response object is not null after create property", createProperty);
+		assertNotNull("check error code exists in response after create property", createProperty.getErrorCode());
+		assertEquals("Check response code after create property", 400, createProperty.getErrorCode().intValue());
+
+	}
+
+	@Test
+	public void createServiceInvalidKeyAdditionalInformationTest() throws Exception {
+		User user = getUser();
+
+		RestResponse createServiceResponse = createService();
+
+		String serviceId = ResponseParser.convertServiceResponseToJavaObject(createServiceResponse.getResponse()).getUniqueId();
+
+		String key = "abc?";
+		String value = "BBBB";
+
+		AdditionalInfoParameterInfo additionalInfoParameterInfo = new AdditionalInfoParameterInfo(null, key, value);
+
+		RestResponse createProperty = createServiceAdditionalInformation(serviceId, additionalInfoParameterInfo, user);
+		assertNotNull("check response object is not null after create property", createProperty);
+		assertNotNull("check error code exists in response after create property", createProperty.getErrorCode());
+		assertEquals("Check response code after create property", 400, createProperty.getErrorCode().intValue());
+
+	}
+
+	@Test
+	public void createResourceAdditionalInformationNullKeyTest() throws Exception {
+
+		User user = getUser();
+		ResourceReqDetails resource = getResource();
+
+		RestResponse createResourceResponse = createResource(resource, user);
+
+		assertNotNull("check response object is not null after create resource", createResourceResponse);
+		assertNotNull("check error code exists in response after create resource", createResourceResponse.getErrorCode());
+		assertEquals("Check response code after create resource", 201, createResourceResponse.getErrorCode().intValue());
+
+		String resourceId = ResponseParser.getUniqueIdFromResponse(createResourceResponse);
+
+		String key = null;
+		String value = "BBBB";
+
+		AdditionalInfoParameterInfo additionalInfoParameterInfo = new AdditionalInfoParameterInfo(null, key, value);
+
+		RestResponse createProperty = createResourceAdditionalInformation(resourceId, additionalInfoParameterInfo, user);
+		assertNotNull("check response object is not null after create property", createProperty);
+		assertNotNull("check error code exists in response after create property", createProperty.getErrorCode());
+		assertEquals("Check response code after create property", 400, createProperty.getErrorCode().intValue());
+
+	}
+
+	@Test
+	public void createServiceAdditionalInformationNullKeyTest() throws Exception {
+		User user = getUser();
+
+		RestResponse createServiceResponse = createService();
+
+		String serviceId = ResponseParser.convertServiceResponseToJavaObject(createServiceResponse.getResponse()).getUniqueId();
+
+		String key = null;
+		String value = "BBBB";
+
+		AdditionalInfoParameterInfo additionalInfoParameterInfo = new AdditionalInfoParameterInfo(null, key, value);
+
+		RestResponse createProperty = createServiceAdditionalInformation(serviceId, additionalInfoParameterInfo, user);
+		assertNotNull("check response object is not null after create property", createProperty);
+		assertNotNull("check error code exists in response after create property", createProperty.getErrorCode());
+		assertEquals("Check response code after create property", 400, createProperty.getErrorCode().intValue());
+
+	}
+
+	@Test
+	public void createResourceMaximumInformationTest() throws Exception {
+		User user = getUser();
+		ResourceReqDetails resource = getResource();
+
+		// deleteResource(resourceId, user);
+		RestResponse createResourceResponse = createResource(resource, user);
+
+		String resourceId = ResponseParser.getUniqueIdFromResponse(createResourceResponse);
+
+		assertNotNull("check response object is not null after create resource", createResourceResponse);
+		assertNotNull("check error code exists in response after create resource", createResourceResponse.getErrorCode());
+		assertEquals("Check response code after create resource", 201, createResourceResponse.getErrorCode().intValue());
+
+		String key = "AAA  AAA";
+		String value = "BBBB";
+
+		for (int i = 0; i < 50; i++) {
+
+			AdditionalInfoParameterInfo additionalInfoParameterInfo = new AdditionalInfoParameterInfo(null, key + i, value);
+
+			RestResponse createProperty = createResourceAdditionalInformation(resourceId, additionalInfoParameterInfo, user);
+			assertNotNull("check response object is not null after create property", createProperty);
+			assertNotNull("check error code exists in response after create property", createProperty.getErrorCode());
+			assertEquals("Check response code after create property", 201, createProperty.getErrorCode().intValue());
+
+		}
+
+		AdditionalInfoParameterInfo additionalInfoParameterInfo = new AdditionalInfoParameterInfo(null, key, value);
+		RestResponse createProperty = createResourceAdditionalInformation(resourceId, additionalInfoParameterInfo, user);
+
+		assertNotNull("check response object is not null after create property", createProperty);
+		assertNotNull("check error code exists in response after create property", createProperty.getErrorCode());
+		assertEquals("Check response code after create property", 409, createProperty.getErrorCode().intValue());
+
+	}
+
+	@Test
+	public void createResourceLifeCycleAndMaximumInformationTest() throws Exception {
+		User user = getUser();
+		ResourceReqDetails resource = getResource();
+
+		// deleteResource(resourceId, user);
+		RestResponse createResourceResponse = createResource(resource, user);
+
+		assertNotNull("check response object is not null after create resource", createResourceResponse);
+		assertNotNull("check error code exists in response after create resource", createResourceResponse.getErrorCode());
+		assertEquals("Check response code after create resource", 201, createResourceResponse.getErrorCode().intValue());
+
+		String resourceId = ResponseParser.getUniqueIdFromResponse(createResourceResponse);
+		resource.setUniqueId(resourceId);
+
+		String key = "AAA  AAA";
+		String value = "BBBB";
+
+		for (int i = 0; i < 49; i++) {
+
+			AdditionalInfoParameterInfo additionalInfoParameterInfo = new AdditionalInfoParameterInfo(null, key + i, value);
+
+			RestResponse createProperty = createResourceAdditionalInformation(resourceId, additionalInfoParameterInfo, user);
+			assertNotNull("check response object is not null after create property", createProperty);
+			assertNotNull("check error code exists in response after create property", createProperty.getErrorCode());
+			assertEquals("Check response code after create property", 201, createProperty.getErrorCode().intValue());
+
+		}
+
+		String resourceVersion = "0.1";
+		String checkinComment = "good checkin";
+		String checkinComentJson = "{\"userRemarks\": \"" + checkinComment + "\"}";
+		RestResponse checkInResponse = LifecycleRestUtils.changeResourceState(resource, user, resourceVersion, LifeCycleStatesEnum.CHECKIN, checkinComentJson);
+
+		assertNotNull("check response object is not null after create property", checkInResponse);
+		assertNotNull("check error code exists in response after create property", checkInResponse.getErrorCode());
+		assertEquals("Check response code after create property", 200, checkInResponse.getErrorCode().intValue());
+
+		resourceVersion = "0.2";
+
+		RestResponse checkOutResponse = LifecycleRestUtils.changeResourceState(resource, user, resourceVersion, LifeCycleStatesEnum.CHECKOUT, null);
+
+		resourceId = ResponseParser.getUniqueIdFromResponse(checkOutResponse);
+		resource.setUniqueId(resourceId);
+
+		AdditionalInfoParameterInfo additionalInfoParameterInfo = new AdditionalInfoParameterInfo(null, key + 50, value);
+		RestResponse createProperty = createResourceAdditionalInformation(resourceId, additionalInfoParameterInfo, user);
+
+		assertNotNull("check response object is not null after create property", createProperty);
+		assertNotNull("check error code exists in response after create property", createProperty.getErrorCode());
+		assertEquals("Check response code after create property", 201, createProperty.getErrorCode().intValue());
+
+		additionalInfoParameterInfo = new AdditionalInfoParameterInfo(null, key + 51, value);
+		createProperty = createResourceAdditionalInformation(resourceId, additionalInfoParameterInfo, user);
+
+		assertNotNull("check response object is not null after create property", createProperty);
+		assertNotNull("check error code exists in response after create property", createProperty.getErrorCode());
+		assertEquals("Check response code after create property", 409, createProperty.getErrorCode().intValue());
+
+		RestResponse checkUndoOutResponse = LifecycleRestUtils.changeResourceState(resource, user, resourceVersion, LifeCycleStatesEnum.UNDOCHECKOUT, null);
+
+		resourceVersion = "0.1";
+
+		checkOutResponse = LifecycleRestUtils.changeResourceState(resource, user, resourceVersion, LifeCycleStatesEnum.CHECKOUT, null);
+		resourceId = ResponseParser.getUniqueIdFromResponse(checkOutResponse);
+		resource.setUniqueId(resourceId);
+
+		additionalInfoParameterInfo = new AdditionalInfoParameterInfo(null, key + 50, value);
+		createProperty = createResourceAdditionalInformation(resourceId, additionalInfoParameterInfo, user);
+
+		assertNotNull("check response object is not null after create property", createProperty);
+		assertNotNull("check error code exists in response after create property", createProperty.getErrorCode());
+		assertEquals("Check response code after create property", 201, createProperty.getErrorCode().intValue());
+
+		additionalInfoParameterInfo = new AdditionalInfoParameterInfo(null, key + 51, value);
+		createProperty = createResourceAdditionalInformation(resourceId, additionalInfoParameterInfo, user);
+
+		assertNotNull("check response object is not null after create property", createProperty);
+		assertNotNull("check error code exists in response after create property", createProperty.getErrorCode());
+		assertEquals("Check response code after create property", 409, createProperty.getErrorCode().intValue());
+
+	}
+
+	@Test
+	public void createResourceLifeCycleCertifyAndMaximumInformationTest() throws Exception {
+		User user = getUser();
+		ResourceReqDetails resource = getResource();
+
+		// deleteResource(resourceId, user);
+		RestResponse createResourceResponse = createResource(resource, user);
+
+		assertNotNull("check response object is not null after create resource", createResourceResponse);
+		assertNotNull("check error code exists in response after create resource", createResourceResponse.getErrorCode());
+		assertEquals("Check response code after create resource", 201, createResourceResponse.getErrorCode().intValue());
+
+		String resourceId = ResponseParser.getUniqueIdFromResponse(createResourceResponse);
+		resource.setUniqueId(resourceId);
+
+		String key = "AAA  AAA";
+		String value = "BBBB";
+
+		for (int i = 0; i < 49; i++) {
+
+			AdditionalInfoParameterInfo additionalInfoParameterInfo = new AdditionalInfoParameterInfo(null, key + i, value);
+
+			RestResponse createProperty = createResourceAdditionalInformation(resourceId, additionalInfoParameterInfo, user);
+			assertNotNull("check response object is not null after create property", createProperty);
+			assertNotNull("check error code exists in response after create property", createProperty.getErrorCode());
+			assertEquals("Check response code after create property", 201, createProperty.getErrorCode().intValue());
+
+		}
+
+		String resourceVersion = "0.1";
+		String checkinComment = "good checkin";
+		String checkinComentJson = "{\"userRemarks\": \"" + checkinComment + "\"}";
+
+		// resourceUtils.addResourceMandatoryArtifacts(user,
+		// createResourceResponse);
+
+		RestResponse checkInResponse = LifecycleRestUtils.changeResourceState(resource, user, resourceVersion, LifeCycleStatesEnum.CHECKIN, checkinComentJson);
+
+		assertNotNull("check response object is not null after create property", checkInResponse);
+		assertNotNull("check error code exists in response after create property", checkInResponse.getErrorCode());
+		assertEquals("Check response code after create property", 200, checkInResponse.getErrorCode().intValue());
+
+		/*RestResponse changeStateResponse = LifecycleRestUtils.changeResourceState(resource, user, resourceVersion, LifeCycleStatesEnum.CERTIFICATIONREQUEST, null);
+		changeStateResponse = LifecycleRestUtils.changeResourceState(resource, user, resourceVersion, LifeCycleStatesEnum.STARTCERTIFICATION, null);*/
+		RestResponse changeStateResponse = LifecycleRestUtils.changeResourceState(resource, user, resourceVersion, LifeCycleStatesEnum.CERTIFY, null);
+
+		assertNotNull("check response object is not null after create property", checkInResponse);
+		assertNotNull("check error code exists in response after create property", checkInResponse.getErrorCode());
+		assertEquals("Check response code after create property", 200, checkInResponse.getErrorCode().intValue());
+
+		resourceId = ResponseParser.getUniqueIdFromResponse(changeStateResponse);
+		resource.setUniqueId(resourceId);
+
+		resourceVersion = "1.0";
+
+		changeStateResponse = LifecycleRestUtils.changeResourceState(resource, user, resourceVersion, LifeCycleStatesEnum.CHECKOUT, null);
+		resourceId = ResponseParser.getUniqueIdFromResponse(changeStateResponse);
+		resource.setUniqueId(resourceId);
+
+		AdditionalInfoParameterInfo additionalInfoParameterInfo = new AdditionalInfoParameterInfo(null, key + 50, value);
+		RestResponse createProperty = createResourceAdditionalInformation(resourceId, additionalInfoParameterInfo, user);
+
+		assertNotNull("check response object is not null after create property", createProperty);
+		assertNotNull("check error code exists in response after create property", createProperty.getErrorCode());
+		assertEquals("Check response code after create property", 201, createProperty.getErrorCode().intValue());
+
+		additionalInfoParameterInfo = new AdditionalInfoParameterInfo(null, key + 51, value);
+		createProperty = createResourceAdditionalInformation(resourceId, additionalInfoParameterInfo, user);
+
+		assertNotNull("check response object is not null after create property", createProperty);
+		assertNotNull("check error code exists in response after create property", createProperty.getErrorCode());
+		assertEquals("Check response code after create property", 409, createProperty.getErrorCode().intValue());
+
+	}
+
+	@Test
+	public void createServiceCycleAndMaximumInformationTest() throws Exception {
+
+		User user = getUser();
+
+		ServiceReqDetails service = getServiceDetails();
+
+		RestResponse createServiceResponse = createService();
+
+		String serviceId = ResponseParser.convertServiceResponseToJavaObject(createServiceResponse.getResponse()).getUniqueId();
+
+		assertNotNull("check response object is not null after create resource", createServiceResponse);
+		assertNotNull("check error code exists in response after create resource", createServiceResponse.getErrorCode());
+		assertEquals("Check response code after create resource", 201, createServiceResponse.getErrorCode().intValue());
+
+		service.setUniqueId(serviceId);
+
+		String key = "AAA  AAA";
+		String value = "BBBB";
+
+		for (int i = 0; i < 49; i++) {
+
+			AdditionalInfoParameterInfo additionalInfoParameterInfo = new AdditionalInfoParameterInfo(null, key + i, value);
+
+			RestResponse createProperty = createServiceAdditionalInformation(serviceId, additionalInfoParameterInfo, user);
+			assertNotNull("check response object is not null after create property", createProperty);
+			assertNotNull("check error code exists in response after create property", createProperty.getErrorCode());
+			assertEquals("Check response code after create property", 201, createProperty.getErrorCode().intValue());
+
+		}
+
+		String resourceVersion = "0.1";
+		String checkinComment = "good checkin";
+		String checkinComentJson = "{\"userRemarks\": \"" + checkinComment + "\"}";
+		RestResponse checkInResponse = LifecycleRestUtils.changeServiceState(service, user, resourceVersion, LifeCycleStatesEnum.CHECKIN, checkinComentJson);
+
+		assertNotNull("check response object is not null after create property", checkInResponse);
+		assertNotNull("check error code exists in response after create property", checkInResponse.getErrorCode());
+		assertEquals("Check response code after create property", 200, checkInResponse.getErrorCode().intValue());
+
+		resourceVersion = "0.2";
+
+		RestResponse checkOutResponse = LifecycleRestUtils.changeServiceState(service, user, resourceVersion, LifeCycleStatesEnum.CHECKOUT, null);
+
+		serviceId = ResponseParser.convertServiceResponseToJavaObject(checkOutResponse.getResponse()).getUniqueId();
+		service.setUniqueId(serviceId);
+
+		AdditionalInfoParameterInfo additionalInfoParameterInfo = new AdditionalInfoParameterInfo(null, key + 50, value);
+		RestResponse createProperty = createServiceAdditionalInformation(serviceId, additionalInfoParameterInfo, user);
+
+		assertNotNull("check response object is not null after create property", createProperty);
+		assertNotNull("check error code exists in response after create property", createProperty.getErrorCode());
+		assertEquals("Check response code after create property", 201, createProperty.getErrorCode().intValue());
+
+		additionalInfoParameterInfo = new AdditionalInfoParameterInfo(null, key + 51, value);
+		createProperty = createServiceAdditionalInformation(serviceId, additionalInfoParameterInfo, user);
+
+		assertNotNull("check response object is not null after create property", createProperty);
+		assertNotNull("check error code exists in response after create property", createProperty.getErrorCode());
+		assertEquals("Check response code after create property", 409, createProperty.getErrorCode().intValue());
+
+		RestResponse checkUndoOutResponse = LifecycleRestUtils.changeServiceState(service, user, resourceVersion, LifeCycleStatesEnum.UNDOCHECKOUT, null);
+
+		resourceVersion = "0.1";
+
+		checkOutResponse = LifecycleRestUtils.changeServiceState(service, user, resourceVersion, LifeCycleStatesEnum.CHECKOUT, null);
+		serviceId = ResponseParser.convertServiceResponseToJavaObject(checkOutResponse.getResponse()).getUniqueId();
+		service.setUniqueId(serviceId);
+
+		additionalInfoParameterInfo = new AdditionalInfoParameterInfo(null, key + 50, value);
+		createProperty = createServiceAdditionalInformation(serviceId, additionalInfoParameterInfo, user);
+
+		assertNotNull("check response object is not null after create property", createProperty);
+		assertNotNull("check error code exists in response after create property", createProperty.getErrorCode());
+		assertEquals("Check response code after create property", 201, createProperty.getErrorCode().intValue());
+
+		additionalInfoParameterInfo = new AdditionalInfoParameterInfo(null, key + 51, value);
+		createProperty = createServiceAdditionalInformation(serviceId, additionalInfoParameterInfo, user);
+
+		assertNotNull("check response object is not null after create property", createProperty);
+		assertNotNull("check error code exists in response after create property", createProperty.getErrorCode());
+		assertEquals("Check response code after create property", 409, createProperty.getErrorCode().intValue());
+
+	}
+
+	@Test
+	public void createServiceMaximumInformationTest() throws Exception {
+		User user = getUser();
+
+		RestResponse createServiceResponse = createService();
+
+		String serviceId = ResponseParser.convertServiceResponseToJavaObject(createServiceResponse.getResponse()).getUniqueId();
+
+		String key = "AAA  AAA";
+		String value = "BBBB";
+
+		String lastCreatedProperty = null;
+
+		for (int i = 0; i < 50; i++) {
+
+			AdditionalInfoParameterInfo additionalInfoParameterInfo = new AdditionalInfoParameterInfo(null, key + i, value);
+
+			RestResponse createProperty = createServiceAdditionalInformation(serviceId, additionalInfoParameterInfo, user);
+			assertNotNull("check response object is not null after create property", createProperty);
+			assertNotNull("check error code exists in response after create property", createProperty.getErrorCode());
+			assertEquals("Check response code after create property", 201, createProperty.getErrorCode().intValue());
+
+			AdditionalInfoParameterInfo fromJson = gson.fromJson(createProperty.getResponse(), AdditionalInfoParameterInfo.class);
+			lastCreatedProperty = fromJson.getUniqueId();
+
+		}
+
+		AdditionalInfoParameterInfo additionalInfoParameterInfo = new AdditionalInfoParameterInfo(null, key, value);
+		RestResponse createProperty = createServiceAdditionalInformation(serviceId, additionalInfoParameterInfo, user);
+
+		assertNotNull("check response object is not null after create property", createProperty);
+		assertNotNull("check error code exists in response after create property", createProperty.getErrorCode());
+		assertEquals("Check response code after create property", 409, createProperty.getErrorCode().intValue());
+
+		RestResponse deletedProperty = deleteServiceAdditionalInformation(serviceId, lastCreatedProperty, user);
+		assertNotNull("check response object is not null after update additional information", deletedProperty);
+		assertNotNull("check error code exists in response after additional information", deletedProperty.getErrorCode());
+		assertEquals("Check response code after additional information", 200, deletedProperty.getErrorCode().intValue());
+
+		additionalInfoParameterInfo = new AdditionalInfoParameterInfo(null, key, value);
+		createProperty = createServiceAdditionalInformation(serviceId, additionalInfoParameterInfo, user);
+
+		assertNotNull("check response object is not null after create property", createProperty);
+		assertNotNull("check error code exists in response after create property", createProperty.getErrorCode());
+		assertEquals("Check response code after create property", 201, createProperty.getErrorCode().intValue());
+
+	}
+
+	@Test
+	public void updateServiceAdditionalInformationTest() throws Exception {
+		User user = getUser();
+
+		RestResponse createServiceResponse = createService();
+
+		String serviceId = ResponseParser.convertServiceResponseToJavaObject(createServiceResponse.getResponse()).getUniqueId();
+
+		String key = "AAA  AAA";
+		String value = "BBBB";
+
+		String updatedKey = "ZZZ  ZZZ";
+		String updatedValue = "JJJJ";
+
+		AdditionalInfoParameterInfo additionalInfoParameterInfo = new AdditionalInfoParameterInfo(null, key, value);
+
+		RestResponse createProperty = createServiceAdditionalInformation(serviceId, additionalInfoParameterInfo, user);
+		assertNotNull("check response object is not null after create property", createProperty);
+		assertNotNull("check error code exists in response after create property", createProperty.getErrorCode());
+		assertEquals("Check response code after create property", 201, createProperty.getErrorCode().intValue());
+
+		AdditionalInfoParameterInfo fromJson = gson.fromJson(createProperty.getResponse(), AdditionalInfoParameterInfo.class);
+		assertFalse("check number of spaces", fromJson.getKey().contains("  "));
+		assertEquals("check returned key", "AAA AAA", fromJson.getKey());
+
+		fromJson.setKey(updatedKey);
+		fromJson.setValue(updatedValue);
+
+		RestResponse updatedProperty = updateServiceAdditionalInformation(serviceId, fromJson, user, fromJson.getUniqueId());
+		assertNotNull("check response object is not null after update additional information", updatedProperty);
+		assertNotNull("check error code exists in response after additional information", updatedProperty.getErrorCode());
+		assertEquals("Check response code after additional information", 200, updatedProperty.getErrorCode().intValue());
+
+		AdditionalInfoParameterInfo updatedJson = gson.fromJson(updatedProperty.getResponse(), AdditionalInfoParameterInfo.class);
+		assertFalse("check number of spaces", updatedJson.getKey().contains("  "));
+		assertEquals("check returned key", "ZZZ ZZZ", updatedJson.getKey());
+		assertEquals("check returned value", updatedValue, updatedJson.getValue());
+		assertEquals("check returned id", fromJson.getUniqueId(), updatedJson.getUniqueId());
+
+		fromJson.setKey(updatedKey);
+		fromJson.setValue("\uC2B5");
+
+		updatedProperty = updateServiceAdditionalInformation(serviceId, fromJson, user, fromJson.getUniqueId());
+		assertNotNull("check response object is not null after update additional information", updatedProperty);
+		assertNotNull("check error code exists in response after additional information", updatedProperty.getErrorCode());
+		assertEquals("Check response code after additional information", 400, updatedProperty.getErrorCode().intValue());
+
+	}
+
+	@Test
+	public void deleteServiceAdditionalInformationTest() throws Exception {
+		User user = getUser();
+
+		RestResponse createServiceResponse = createService();
+
+		String serviceId = ResponseParser.convertServiceResponseToJavaObject(createServiceResponse.getResponse()).getUniqueId();
+
+		String key = "AAA  AAA";
+		String value = "BBBB";
+
+		AdditionalInfoParameterInfo additionalInfoParameterInfo = new AdditionalInfoParameterInfo(null, key, value);
+
+		RestResponse createProperty = createServiceAdditionalInformation(serviceId, additionalInfoParameterInfo, user);
+		assertNotNull("check response object is not null after create property", createProperty);
+		assertNotNull("check error code exists in response after create property", createProperty.getErrorCode());
+		assertEquals("Check response code after create property", 201, createProperty.getErrorCode().intValue());
+
+		AdditionalInfoParameterInfo fromJson = gson.fromJson(createProperty.getResponse(), AdditionalInfoParameterInfo.class);
+		assertFalse("check number of spaces", fromJson.getKey().contains("  "));
+		assertEquals("check returned key", "AAA AAA", fromJson.getKey());
+
+		RestResponse deletedProperty = deleteServiceAdditionalInformation(serviceId, fromJson.getUniqueId(), user);
+		assertNotNull("check response object is not null after update additional information", deletedProperty);
+		assertNotNull("check error code exists in response after additional information", deletedProperty.getErrorCode());
+		assertEquals("Check response code after additional information", 200, deletedProperty.getErrorCode().intValue());
+
+		AdditionalInfoParameterInfo updatedJson = gson.fromJson(deletedProperty.getResponse(), AdditionalInfoParameterInfo.class);
+		assertFalse("check number of spaces", updatedJson.getKey().contains("  "));
+		assertEquals("check returned key", "AAA AAA", updatedJson.getKey());
+		assertEquals("check returned value", value, updatedJson.getValue());
+		assertEquals("check returned id", fromJson.getUniqueId(), updatedJson.getUniqueId());
+
+		deletedProperty = deleteServiceAdditionalInformation(serviceId, fromJson.getUniqueId(), user);
+		assertNotNull("check response object is not null after update additional information", deletedProperty);
+		assertNotNull("check error code exists in response after additional information", deletedProperty.getErrorCode());
+		assertEquals("Check response code after additional information", 409, deletedProperty.getErrorCode().intValue());
+
+	}
+
+	@Test
+	public void getResourceAdditionalInformationTest() throws Exception {
+		User user = getUser();
+		ResourceReqDetails resource = getResource();
+
+		RestResponse createResourceResponse = createResource(resource, user);
+
+		String resourceId = ResponseParser.getUniqueIdFromResponse(createResourceResponse);
+
+		assertNotNull("check response object is not null after create resource", createResourceResponse);
+		assertNotNull("check error code exists in response after create resource", createResourceResponse.getErrorCode());
+		assertEquals("Check response code after create resource", 201, createResourceResponse.getErrorCode().intValue());
+
+		String key = "AAA  AAA";
+		String value = "BBBB";
+
+		AdditionalInfoParameterInfo additionalInfoParameterInfo = new AdditionalInfoParameterInfo(null, key, value);
+
+		RestResponse createProperty = createResourceAdditionalInformation(resourceId, additionalInfoParameterInfo, user);
+		assertNotNull("check response object is not null after create property", createProperty);
+		assertNotNull("check error code exists in response after create property", createProperty.getErrorCode());
+		assertEquals("Check response code after create property", 201, createProperty.getErrorCode().intValue());
+
+		AdditionalInfoParameterInfo fromJson = gson.fromJson(createProperty.getResponse(), AdditionalInfoParameterInfo.class);
+		assertFalse("check number of spaces", fromJson.getKey().contains("  "));
+		assertEquals("check returned key", "AAA AAA", fromJson.getKey());
+
+		RestResponse deletedProperty = getAdditionalInformation(resourceId, fromJson.getUniqueId(), user);
+		assertNotNull("check response object is not null after update additional information", deletedProperty);
+		assertNotNull("check error code exists in response after additional information", deletedProperty.getErrorCode());
+		assertEquals("Check response code after additional information", 200, deletedProperty.getErrorCode().intValue());
+
+		AdditionalInfoParameterInfo updatedJson = gson.fromJson(deletedProperty.getResponse(), AdditionalInfoParameterInfo.class);
+		assertFalse("check number of spaces", updatedJson.getKey().contains("  "));
+		assertEquals("check returned key", "AAA AAA", updatedJson.getKey());
+		assertEquals("check returned value", value, updatedJson.getValue());
+		assertEquals("check returned id", fromJson.getUniqueId(), updatedJson.getUniqueId());
+
+	}
+
+	@Test
+	public void getServiceAdditionalInformationTest() throws Exception {
+		User user = getUser();
+
+		RestResponse createServiceResponse = createService();
+
+		String serviceId = ResponseParser.convertServiceResponseToJavaObject(createServiceResponse.getResponse()).getUniqueId();
+
+		String key = "AAA  AAA";
+		String value = "BBBB";
+
+		AdditionalInfoParameterInfo additionalInfoParameterInfo = new AdditionalInfoParameterInfo(null, key, value);
+
+		RestResponse createProperty = createServiceAdditionalInformation(serviceId, additionalInfoParameterInfo, user);
+		assertNotNull("check response object is not null after create property", createProperty);
+		assertNotNull("check error code exists in response after create property", createProperty.getErrorCode());
+		assertEquals("Check response code after create property", 201, createProperty.getErrorCode().intValue());
+
+		AdditionalInfoParameterInfo fromJson = gson.fromJson(createProperty.getResponse(), AdditionalInfoParameterInfo.class);
+		assertFalse("check number of spaces", fromJson.getKey().contains("  "));
+		assertEquals("check returned key", "AAA AAA", fromJson.getKey());
+
+		RestResponse deletedProperty = getServiceAdditionalInformation(serviceId, fromJson.getUniqueId(), user);
+		assertNotNull("check response object is not null after update additional information", deletedProperty);
+		assertNotNull("check error code exists in response after additional information", deletedProperty.getErrorCode());
+		assertEquals("Check response code after additional information", 200, deletedProperty.getErrorCode().intValue());
+
+		AdditionalInfoParameterInfo updatedJson = gson.fromJson(deletedProperty.getResponse(), AdditionalInfoParameterInfo.class);
+		assertFalse("check number of spaces", updatedJson.getKey().contains("  "));
+		assertEquals("check returned key", "AAA AAA", updatedJson.getKey());
+		assertEquals("check returned value", value, updatedJson.getValue());
+		assertEquals("check returned id", fromJson.getUniqueId(), updatedJson.getUniqueId());
+
+	}
+
+	@Test
+	public void getResourceAllAdditionalInformationTest() throws Exception {
+		User user = getUser();
+		ResourceReqDetails resource = getResource();
+
+		RestResponse createResourceResponse = createResource(resource, user);
+
+		String resourceId = ResponseParser.getUniqueIdFromResponse(createResourceResponse);
+
+		assertNotNull("check response object is not null after create resource", createResourceResponse);
+		assertNotNull("check error code exists in response after create resource", createResourceResponse.getErrorCode());
+		assertEquals("Check response code after create resource", 201, createResourceResponse.getErrorCode().intValue());
+
+		String key = "AAA  AAA";
+		String value = "BBBB";
+
+		AdditionalInfoParameterInfo additionalInfoParameterInfo = new AdditionalInfoParameterInfo(null, key, value);
+
+		RestResponse createProperty = createResourceAdditionalInformation(resourceId, additionalInfoParameterInfo, user);
+		assertNotNull("check response object is not null after create property", createProperty);
+		assertNotNull("check error code exists in response after create property", createProperty.getErrorCode());
+		assertEquals("Check response code after create property", 201, createProperty.getErrorCode().intValue());
+
+		AdditionalInfoParameterInfo fromJson = gson.fromJson(createProperty.getResponse(), AdditionalInfoParameterInfo.class);
+		assertFalse("check number of spaces", fromJson.getKey().contains("  "));
+		assertEquals("check returned key", "AAA AAA", fromJson.getKey());
+
+		RestResponse deletedProperty = getResourceAllAdditionalInformation(resourceId, user);
+		assertNotNull("check response object is not null after update additional information", deletedProperty);
+		assertNotNull("check error code exists in response after additional information", deletedProperty.getErrorCode());
+		assertEquals("Check response code after additional information", 200, deletedProperty.getErrorCode().intValue());
+
+		AdditionalInformationDefinition updatedJson = gson.fromJson(deletedProperty.getResponse(), AdditionalInformationDefinition.class);
+		assertEquals("check number of parameters", 1, updatedJson.getParameters().size());
+		AdditionalInfoParameterInfo info = updatedJson.getParameters().iterator().next();
+
+		assertFalse("check number of spaces", info.getKey().contains("  "));
+		assertEquals("check returned key", "AAA AAA", info.getKey());
+		assertEquals("check returned value", value, info.getValue());
+		assertEquals("check returned id", fromJson.getUniqueId(), info.getUniqueId());
+
+	}
+
+	@Test
+	public void getServiceAllAdditionalInformationTest() throws Exception {
+		User user = getUser();
+
+		RestResponse createServiceResponse = createService();
+
+		String serviceId = ResponseParser.convertServiceResponseToJavaObject(createServiceResponse.getResponse()).getUniqueId();
+
+		String key = "AAA  AAA";
+		String value = "BBBB";
+
+		AdditionalInfoParameterInfo additionalInfoParameterInfo = new AdditionalInfoParameterInfo(null, key, value);
+
+		RestResponse createProperty = createServiceAdditionalInformation(serviceId, additionalInfoParameterInfo, user);
+		assertNotNull("check response object is not null after create property", createProperty);
+		assertNotNull("check error code exists in response after create property", createProperty.getErrorCode());
+		assertEquals("Check response code after create property", 201, createProperty.getErrorCode().intValue());
+
+		AdditionalInfoParameterInfo fromJson = gson.fromJson(createProperty.getResponse(), AdditionalInfoParameterInfo.class);
+		assertFalse("check number of spaces", fromJson.getKey().contains("  "));
+		assertEquals("check returned key", "AAA AAA", fromJson.getKey());
+
+		RestResponse deletedProperty = getServiceAllAdditionalInformation(serviceId, user);
+		assertNotNull("check response object is not null after update additional information", deletedProperty);
+		assertNotNull("check error code exists in response after additional information", deletedProperty.getErrorCode());
+		assertEquals("Check response code after additional information", 200, deletedProperty.getErrorCode().intValue());
+
+		AdditionalInformationDefinition updatedJson = gson.fromJson(deletedProperty.getResponse(), AdditionalInformationDefinition.class);
+		assertEquals("check number of parameters", 1, updatedJson.getParameters().size());
+		AdditionalInfoParameterInfo info = updatedJson.getParameters().iterator().next();
+
+		assertFalse("check number of spaces", info.getKey().contains("  "));
+		assertEquals("check returned key", "AAA AAA", info.getKey());
+		assertEquals("check returned value", value, info.getValue());
+		assertEquals("check returned id", fromJson.getUniqueId(), info.getUniqueId());
+
+	}
+
+	@Test
+	public void createServiceAdditionalInformationTestDuringLifecycle() throws Exception {
+
+		User user = getUser();
+		RestResponse createServiceResponse = createService();
+		String serviceId = ResponseParser.convertServiceResponseToJavaObject(createServiceResponse.getResponse()).getUniqueId();
+		String key = "AAA  AAA";
+		String value = "BBBB";
+		AdditionalInfoParameterInfo additionalInfoParameterInfo = new AdditionalInfoParameterInfo(null, key, value);
+
+		RestResponse createProperty = createServiceAdditionalInformation(serviceId, additionalInfoParameterInfo, user);
+		assertNotNull("check response object is not null after create property", createProperty);
+		assertNotNull("check error code exists in response after create property", createProperty.getErrorCode());
+		assertEquals("Check response code after create property", 201, createProperty.getErrorCode().intValue());
+
+		AdditionalInfoParameterInfo fromJson = gson.fromJson(createProperty.getResponse(), AdditionalInfoParameterInfo.class);
+		assertFalse("check number of spaces", fromJson.getKey().contains("  "));
+		assertEquals("check returned key", "AAA AAA", fromJson.getKey());
+
+		ServiceReqDetails serviceDetails = getServiceDetails();
+
+		serviceDetails.setUniqueId(serviceId);
+
+		// serviceUtils.addServiceMandatoryArtifacts(user,
+		// createServiceResponse);
+
+		certifyService(user, serviceDetails, null);
+
+	}
+
+	@Test
+	public void createCascadeResource() {
+
+		// TODO: to check after rebase
+
+		User user = getUser();
+		ResourceReqDetails resource = getResource();
+		String newResourceNameSuffix = "aa";
+
+		RestResponse createResourceResponse = null;
+		try {
+
+			createResourceResponse = createResource(resource, user);
+			assertEquals("check invalid type", 201, createResourceResponse.getErrorCode().intValue());
+			String resourceId = ResponseParser.getUniqueIdFromResponse(createResourceResponse);
+
+			String resourceVersion = "0.1";
+			// resourceUtils.addResourceMandatoryArtifacts(user,
+			// createResourceResponse);
+
+			String key = "AAA  AAA";
+			String value = "BBBB";
+
+			AdditionalInfoParameterInfo additionalInfoParameterInfo = new AdditionalInfoParameterInfo(null, key, value);
+
+			RestResponse createProperty = createResourceAdditionalInformation(resourceId, additionalInfoParameterInfo, user);
+			assertNotNull("check response object is not null after create property", createProperty);
+			assertNotNull("check error code exists in response after create property", createProperty.getErrorCode());
+			assertEquals("Check response code after create property", 201, createProperty.getErrorCode().intValue());
+
+			resource.setUniqueId(resourceId);
+			Resource certifiedResource = certifyResource(user, resource, resourceVersion, 1);
+
+			ResourceReqDetails newResourceDetails = getResource();
+			String newResourceName = newResourceDetails.getName() + newResourceNameSuffix;
+			newResourceDetails.setName(newResourceName);
+			List<String> derivedFrom = new ArrayList<>();
+			derivedFrom.add(certifiedResource.getName());
+			newResourceDetails.setDerivedFrom(derivedFrom);
+			newResourceDetails.getTags().add(newResourceName);
+
+			user.setUserId(UserRoleEnum.ADMIN.getUserId());
+			RestResponse newCreateResourceResponse = createResource(newResourceDetails, user);
+			assertEquals("Check response code after creating resource", 201, newCreateResourceResponse.getErrorCode().intValue());
+			Resource newResource = gson.fromJson(newCreateResourceResponse.getResponse(), Resource.class);
+
+			RestResponse allAdditionalInformation = getResourceAllAdditionalInformation(newResource.getUniqueId(), user);
+
+			assertNotNull("check response object is not null after update additional information", allAdditionalInformation);
+			assertNotNull("check error code exists in response after additional information", allAdditionalInformation.getErrorCode());
+			assertEquals("Check response code after additional information", 200, allAdditionalInformation.getErrorCode().intValue());
+
+			AdditionalInformationDefinition updatedJson = gson.fromJson(allAdditionalInformation.getResponse(), AdditionalInformationDefinition.class);
+			assertEquals("check number of parameters", 0, updatedJson.getParameters().size());
+			// AdditionalInfoParameterInfo info =
+			// updatedJson.getParameters().iterator().next();
+
+			String newResourceId = newResource.getUniqueId();
+			createProperty = createResourceAdditionalInformation(newResourceId, additionalInfoParameterInfo, user);
+			assertNotNull("check response object is not null after create property", createProperty);
+			assertNotNull("check error code exists in response after create property", createProperty.getErrorCode());
+			assertEquals("Check response code after create property", 201, createProperty.getErrorCode().intValue());
+
+			allAdditionalInformation = getResourceAllAdditionalInformation(newResourceId, user);
+
+			assertNotNull("check response object is not null after update additional information", allAdditionalInformation);
+			assertNotNull("check error code exists in response after additional information", allAdditionalInformation.getErrorCode());
+			assertEquals("Check response code after additional information", 200, allAdditionalInformation.getErrorCode().intValue());
+
+			updatedJson = gson.fromJson(allAdditionalInformation.getResponse(), AdditionalInformationDefinition.class);
+			assertEquals("check number of parameters", 1, updatedJson.getParameters().size());
+
+		} catch (IOException e) {
+			assertTrue(false);
+		}
+
+	}
+
+	@Test
+	public void createSamePropertyAfterCiCOResource() {
+
+		User user = getUser();
+		ResourceReqDetails resource = getResource();
+
+		RestResponse createResourceResponse = null;
+		try {
+
+			createResourceResponse = createResource(resource, user);
+			assertEquals("check invalid type", 201, createResourceResponse.getErrorCode().intValue());
+			String resourceId = ResponseParser.getUniqueIdFromResponse(createResourceResponse);
+
+			String resourceVersion = "0.1";
+			// resourceUtils.addResourceMandatoryArtifacts(user,
+			// createResourceResponse);
+
+			String key = "AAA  AAA";
+			String value = "BBBB";
+
+			AdditionalInfoParameterInfo additionalInfoParameterInfo = new AdditionalInfoParameterInfo(null, key, value);
+
+			RestResponse createProperty = createResourceAdditionalInformation(resourceId, additionalInfoParameterInfo, user);
+			assertNotNull("check response object is not null after create property", createProperty);
+			assertNotNull("check error code exists in response after create property", createProperty.getErrorCode());
+			assertEquals("Check response code after create property", 201, createProperty.getErrorCode().intValue());
+
+			resource.setUniqueId(resourceId);
+			RestResponse checkInResponse = LifecycleRestUtils.changeResourceState(resource, user, resourceVersion, LifeCycleStatesEnum.CHECKIN);
+
+			assertNotNull("check response object is not null after create user", checkInResponse);
+			assertNotNull("check error code exists in response after create user", checkInResponse.getErrorCode());
+			assertEquals("Check response code after create user", 200, checkInResponse.getErrorCode().intValue());
+
+			Resource resourceAfterOperation = gson.fromJson(checkInResponse.getResponse(), Resource.class);
+			assertEquals("check size of additional information", 1, resourceAfterOperation.getAdditionalInformation().size());
+			assertEquals("check size of additional information", 1, resourceAfterOperation.getAdditionalInformation().get(0).getParameters().size());
+
+			RestResponse checkOutResponse = LifecycleRestUtils.changeResourceState(resource, user, resourceVersion, LifeCycleStatesEnum.CHECKOUT);
+
+			assertNotNull("check response object is not null after create user", checkOutResponse);
+			assertNotNull("check error code exists in response after create user", checkOutResponse.getErrorCode());
+			assertEquals("Check response code after create user", 200, checkOutResponse.getErrorCode().intValue());
+
+			Resource resourceAfterCoOperation = gson.fromJson(checkOutResponse.getResponse(), Resource.class);
+			assertEquals("check size of additional information", 1, resourceAfterCoOperation.getAdditionalInformation().size());
+			assertEquals("check size of additional information", 1, resourceAfterCoOperation.getAdditionalInformation().get(0).getParameters().size());
+
+			String newResourceId = ResponseParser.getUniqueIdFromResponse(checkOutResponse);
+
+			String key2 = "ZZZ";
+			String value2 = "BBBB";
+
+			AdditionalInfoParameterInfo additionalInfoParameterInfo2 = new AdditionalInfoParameterInfo(null, key2, value2);
+
+			RestResponse createProperty2 = createResourceAdditionalInformation(newResourceId, additionalInfoParameterInfo2, user);
+			assertNotNull("check response object is not null after create property", createProperty2);
+			assertNotNull("check error code exists in response after create property", createProperty2.getErrorCode());
+			assertEquals("Check response code after create property", 201, createProperty2.getErrorCode().intValue());
+
+			RestResponse afterCreateAI = ResourceRestUtils.getResource(user, newResourceId);
+			Resource resourceNew = gson.fromJson(afterCreateAI.getResponse(), Resource.class);
+			assertEquals("check size of additional information", 1, resourceNew.getAdditionalInformation().size());
+			assertEquals("check size of additional information", 2, resourceNew.getAdditionalInformation().get(0).getParameters().size());
+
+			resource.setUniqueId(newResourceId);
+			Resource certifiedResource = certifyResource(user, resource, resourceVersion, 2);
+			assertEquals("check size of additional information", 1, certifiedResource.getAdditionalInformation().size());
+			assertEquals("check size of additional information", 2, certifiedResource.getAdditionalInformation().get(0).getParameters().size());
+
+			user.setUserId(UserRoleEnum.DESIGNER.getUserId());
+			resource.setUniqueId(certifiedResource.getUniqueId());
+			RestResponse checkOutResponseAfterCertify = LifecycleRestUtils.changeResourceState(resource, user, resourceVersion, LifeCycleStatesEnum.CHECKOUT);
+
+			assertNotNull("check response object is not null after create user", checkOutResponseAfterCertify);
+			assertNotNull("check error code exists in response after create user", checkOutResponseAfterCertify.getErrorCode());
+			assertEquals("Check response code after create user", 200, checkOutResponseAfterCertify.getErrorCode().intValue());
+
+			Resource resourceAfterCertifyCoOperation = gson.fromJson(checkOutResponseAfterCertify.getResponse(), Resource.class);
+			assertEquals("check size of additional information", 1, resourceAfterCertifyCoOperation.getAdditionalInformation().size());
+			assertEquals("check size of additional information", 2, resourceAfterCertifyCoOperation.getAdditionalInformation().get(0).getParameters().size());
+
+		} catch (IOException e) {
+			assertTrue(false);
+		}
+
+	}
+
+	// public Resource certifyService(User user, ServiceReqDetails service,
+	// String resourceVersion) throws Exception {
+	//
+	// RestResponse checkInResponse =
+	// LifecycleRestUtils.changeServiceState(service, user, resourceVersion,
+	// LifeCycleStates.CHECKIN);
+	//
+	// assertNotNull("check response object is not null after create user",
+	// checkInResponse);
+	// assertNotNull("check error code exists in response after create user",
+	// checkInResponse.getErrorCode());
+	// assertEquals("Check response code after create user", 200,
+	// checkInResponse.getErrorCode().intValue());
+	//
+	// Resource resourceAfterOperation =
+	// gson.fromJson(checkInResponse.getResponse(), Resource.class);
+	// assertEquals("check size of additional information", 1,
+	// resourceAfterOperation.getAdditionalInformation().size());
+	// assertEquals("check size of additional information", 1,
+	// resourceAfterOperation.getAdditionalInformation().get(0).getParameters().size());
+	//
+	//// TODO Andrey
+	// createAndAddCertResourceToService(service, user);
+	//
+	// RestResponse req4certResponse =
+	// LifecycleRestUtils.changeServiceState(service, user, resourceVersion,
+	// LifeCycleStates.CERTIFICATIONREQUEST);
+	//
+	// assertNotNull("check response object is not null after create user",
+	// req4certResponse);
+	// assertEquals("Check response code after checkout resource", 200,
+	// req4certResponse.getErrorCode().intValue());
+	//
+	// resourceAfterOperation = gson.fromJson(req4certResponse.getResponse(),
+	// Resource.class);
+	// assertEquals("check size of additional information", 1,
+	// resourceAfterOperation.getAdditionalInformation().size());
+	// assertEquals("check size of additional information", 1,
+	// resourceAfterOperation.getAdditionalInformation().get(0).getParameters().size());
+	//
+	// //change modifier
+	// user.setUserId(UserRoleEnum.TESTER.getUserId());
+	//
+	// //start certification
+	// RestResponse startCertResourceResponse3 =
+	// LifecycleRestUtils.changeServiceState(service, user, resourceVersion,
+	// LifeCycleStates.STARTCERTIFICATION);
+	// assertNotNull("check response object is not null after create user",
+	// startCertResourceResponse3);
+	// assertEquals("Check response code after checkout resource", 200,
+	// startCertResourceResponse3.getErrorCode().intValue());
+	//
+	// resourceAfterOperation =
+	// gson.fromJson(startCertResourceResponse3.getResponse(), Resource.class);
+	// assertEquals("check size of additional information", 1,
+	// resourceAfterOperation.getAdditionalInformation().size());
+	// assertEquals("check size of additional information", 1,
+	// resourceAfterOperation.getAdditionalInformation().get(0).getParameters().size());
+	//
+	// //certify
+	//
+	// RestResponse certifyResponse =
+	// LifecycleRestUtils.changeServiceState(service, user, resourceVersion,
+	// LifeCycleStates.CERTIFY);
+	// assertNotNull("check response object is not null after create user",
+	// certifyResponse);
+	// assertEquals("Check response code after checkout resource", 200,
+	// certifyResponse.getErrorCode().intValue());
+	//
+	// resourceAfterOperation = gson.fromJson(certifyResponse.getResponse(),
+	// Resource.class);
+	// assertEquals("check size of additional information", 1,
+	// resourceAfterOperation.getAdditionalInformation().size());
+	// assertEquals("check size of additional information", 1,
+	// resourceAfterOperation.getAdditionalInformation().get(0).getParameters().size());
+	//
+	// Resource certifyResource = gson.fromJson(certifyResponse.getResponse(),
+	// Resource.class);
+	// return certifyResource;
+	// }
+
+	private void createAndAddCertResourceToService(ServiceReqDetails serviceDetails, User user) throws Exception {
+
+		User sdncTesterUser = ElementFactory.getDefaultUser(UserRoleEnum.TESTER);
+
+		ResourceReqDetails resourceDetails = ElementFactory.getDefaultResource();
+		ComponentInstanceReqDetails resourceInstanceReqDetails = ElementFactory.getDefaultComponentInstance();
+
+		RestResponse response = ResourceRestUtils.createResource(resourceDetails, user);
+		assertTrue("create request returned status:" + response.getErrorCode(), response.getErrorCode() == 201);
+		assertNotNull("resource uniqueId is null:", resourceDetails.getUniqueId());
+
+		ArtifactReqDetails heatArtifactDetails = ElementFactory.getDefaultDeploymentArtifactForType(ArtifactTypeEnum.HEAT.getType());
+		response = ArtifactRestUtils.addInformationalArtifactToResource(heatArtifactDetails, user, resourceDetails.getUniqueId());
+		assertTrue("add HEAT artifact to resource request returned status:" + response.getErrorCode(), response.getErrorCode() == 200);
+
+		// certified resource
+		// response = LCSbaseTest.certifyResource(resourceDetails);
+		RestResponse restResponseResource = LifecycleRestUtils.changeResourceState(resourceDetails, user, LifeCycleStatesEnum.CHECKIN);
+		assertTrue("certify resource request returned status:" + restResponseResource.getErrorCode(), response.getErrorCode() == 200);
+		/*restResponseResource = LifecycleRestUtils.changeResourceState(resourceDetails, user, LifeCycleStatesEnum.CERTIFICATIONREQUEST);
+		assertTrue("certify resource request returned status:" + restResponseResource.getErrorCode(), response.getErrorCode() == 200);
+		restResponseResource = LifecycleRestUtils.changeResourceState(resourceDetails, sdncTesterUser, LifeCycleStatesEnum.STARTCERTIFICATION);
+		assertTrue("certify resource request returned status:" + restResponseResource.getErrorCode(), response.getErrorCode() == 200);*/
+		restResponseResource = LifecycleRestUtils.changeResourceState(resourceDetails, user, LifeCycleStatesEnum.CERTIFY);
+		assertTrue("certify resource request returned status:" + restResponseResource.getErrorCode(), response.getErrorCode() == 200);
+
+		// add resource instance with HEAT deployment artifact to the service
+		restResponseResource = LifecycleRestUtils.changeServiceState(serviceDetails, user, serviceDetails.getVersion(), LifeCycleStatesEnum.CHECKOUT);
+		assertTrue("certify resource request returned status:" + restResponseResource.getErrorCode(), response.getErrorCode() == 200);
+		resourceInstanceReqDetails.setComponentUid(resourceDetails.getUniqueId());
+		response = ComponentInstanceRestUtils.createComponentInstance(resourceInstanceReqDetails, user, serviceDetails.getUniqueId(), ComponentTypeEnum.SERVICE);
+		assertTrue("response code is not 201, returned: " + response.getErrorCode(), response.getErrorCode() == 201);
+	}
+
+	@Test
+	public void createResourceAdditionalInformationTestAddValue() throws Exception {
+		User user = getUser();
+		ResourceReqDetails resource = getResource();
+
+		// deleteResource(resourceId, user);
+		RestResponse createResourceResponse = createResource(resource, user);
+
+		String resourceId = ResponseParser.getUniqueIdFromResponse(createResourceResponse);
+
+		assertNotNull("check response object is not null after create resource", createResourceResponse);
+		assertNotNull("check error code exists in response after create resource", createResourceResponse.getErrorCode());
+		assertEquals("Check response code after create resource", 201, createResourceResponse.getErrorCode().intValue());
+
+		String key = "AAA  AAA";
+		String value = "\uC2B5";
+
+		AdditionalInfoParameterInfo additionalInfoParameterInfo = new AdditionalInfoParameterInfo(null, key, value);
+
+		RestResponse createProperty = createResourceAdditionalInformation(resourceId, additionalInfoParameterInfo, user);
+		assertNotNull("check response object is not null after create property", createProperty);
+		assertNotNull("check error code exists in response after create property", createProperty.getErrorCode());
+		assertEquals("Check response code after create property", 400, createProperty.getErrorCode().intValue());
+
+		value = "";
+
+		additionalInfoParameterInfo = new AdditionalInfoParameterInfo(null, key, value);
+
+		createProperty = createResourceAdditionalInformation(resourceId, additionalInfoParameterInfo, user);
+		assertNotNull("check response object is not null after create property", createProperty);
+		assertNotNull("check error code exists in response after create property", createProperty.getErrorCode());
+		assertEquals("Check response code after create property", 400, createProperty.getErrorCode().intValue());
+
+		value = "----<b></b><>;";
+
+		additionalInfoParameterInfo = new AdditionalInfoParameterInfo(null, key, value);
+
+		createProperty = createResourceAdditionalInformation(resourceId, additionalInfoParameterInfo, user);
+		assertNotNull("check response object is not null after create property", createProperty);
+		assertNotNull("check error code exists in response after create property", createProperty.getErrorCode());
+		assertEquals("Check response code after create property", 201, createProperty.getErrorCode().intValue());
+
+	}
+}
diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/execute/property/ComponentInstancePropertyTest.java b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/execute/property/ComponentInstancePropertyTest.java
new file mode 100644
index 0000000000..7c0d0e3150
--- /dev/null
+++ b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/execute/property/ComponentInstancePropertyTest.java
@@ -0,0 +1,1254 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * SDC
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.sdc.ci.tests.execute.property;
+
+import fj.data.Either;
+import org.junit.Rule;
+import org.junit.rules.TestName;
+import org.openecomp.sdc.be.datatypes.elements.PropertyDataDefinition;
+import org.openecomp.sdc.be.datatypes.enums.ResourceTypeEnum;
+import org.openecomp.sdc.be.model.ComponentInstance;
+import org.openecomp.sdc.be.model.ComponentInstanceProperty;
+import org.openecomp.sdc.be.model.Resource;
+import org.openecomp.sdc.be.model.Service;
+import org.openecomp.sdc.ci.tests.api.ComponentBaseTest;
+import org.openecomp.sdc.ci.tests.datatypes.PropertyReqDetails;
+import org.openecomp.sdc.ci.tests.datatypes.enums.*;
+import org.openecomp.sdc.ci.tests.datatypes.http.RestResponse;
+import org.openecomp.sdc.ci.tests.utils.general.AtomicOperationUtils;
+import org.openecomp.sdc.ci.tests.utils.general.ElementFactory;
+import org.openecomp.sdc.ci.tests.utils.rest.BaseRestUtils;
+import org.openecomp.sdc.ci.tests.utils.rest.ComponentInstanceRestUtils;
+import org.openecomp.sdc.ci.tests.utils.rest.PropertyRestUtils;
+import org.testng.annotations.BeforeMethod;
+import org.testng.annotations.Test;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import static org.testng.AssertJUnit.assertTrue;
+
+// open bug for this class: DE199108 - closed, DE199741
+public class ComponentInstancePropertyTest extends ComponentBaseTest {
+
+	protected Resource basicVFC;
+	protected Resource vfc1FromBasicVFC;
+	protected Resource vfc2FromVfc1;
+	protected Resource vfResource;
+
+	private List<ComponentInstanceProperty> expectedPropertyList;
+	private List<ComponentInstanceProperty> actualPropertyList;
+	// protected String updatedStringValue = "{Not Default String Value}";
+	protected String updatedStringValue = "Not Default String Value";
+	protected String updatedIntegerValue = "666";
+	protected String updatedBooleanValue = "false";
+	protected String newStringPropName = "stringProp2";
+	protected String newIntegerPropName = "integerProp2";
+	protected String newBooleanPropName = "booleanProp2";
+	// bug DE199741 protected String newStringPropValue = "<second string
+	// value>";
+	protected String newStringPropValue = "second string value";
+	protected String newIntegerPropValue = "888";
+	protected String newBooleanPropValue = "false";
+
+	@BeforeMethod
+	public void init() {
+		expectedPropertyList = new ArrayList<>();
+		actualPropertyList = new ArrayList<>();
+	}
+
+	@Rule
+	public static TestName name = new TestName();
+
+	// --------------Regular
+	// resource-------------------------------------------------------------------------------
+
+	@Test
+	public void nestedResourceProperty3Levels() throws Exception {
+
+		// first res
+		basicVFC = createResourceWithProperty(ElementFactory.getDefaultStringProperty(), LifeCycleStatesEnum.CERTIFY);
+		// second resource
+		vfc1FromBasicVFC = createResourceWithPropertyDerivedFromOtherResource(
+				ElementFactory.getDefaultIntegerProperty(), LifeCycleStatesEnum.CERTIFY, basicVFC);
+		// third resource
+		vfc2FromVfc1 = createResourceWithPropertyDerivedFromOtherResource(ElementFactory.getDefaultBooleanProperty(),
+				LifeCycleStatesEnum.CHECKIN, vfc1FromBasicVFC);
+		// verify property
+		vfc2FromVfc1 = AtomicOperationUtils.getResourceObject(vfc2FromVfc1, UserRoleEnum.DESIGNER);
+		actualPropertyList = PropertyRestUtils.addResourcePropertiesToList(vfc2FromVfc1, actualPropertyList);
+		assertTrue("check list size failed, expected 3", actualPropertyList.size() == 3);
+
+	}
+
+	// --------------VF
+	// resource-----------------------------------------------------------
+
+	@Test
+	public void nestedVfResourceProperty3Levels() throws Exception {
+
+		basicVFC = createResourceWithProperty(ElementFactory.getDefaultStringProperty(), LifeCycleStatesEnum.CERTIFY);
+		vfc1FromBasicVFC = createResourceWithPropertyDerivedFromOtherResource(
+				ElementFactory.getDefaultIntegerProperty(), LifeCycleStatesEnum.CERTIFY, basicVFC);
+		vfc2FromVfc1 = createResourceWithPropertyDerivedFromOtherResource(ElementFactory.getDefaultBooleanProperty(),
+				LifeCycleStatesEnum.CHECKIN, vfc1FromBasicVFC);
+
+		vfc2FromVfc1 = AtomicOperationUtils.getResourceObject(vfc2FromVfc1, UserRoleEnum.DESIGNER);
+		expectedPropertyList = PropertyRestUtils.addResourcePropertiesToList(vfc2FromVfc1, expectedPropertyList);
+
+		// create VF + add RI
+		vfResource = AtomicOperationUtils.createResourceByType(ResourceTypeEnum.VF, UserRoleEnum.DESIGNER, true).left()
+				.value();
+		ComponentInstance componentInstDetails = AtomicOperationUtils
+				.addComponentInstanceToComponentContainer(vfc2FromVfc1, vfResource, UserRoleEnum.DESIGNER, true).left()
+				.value();
+		vfResource = AtomicOperationUtils.getResourceObject(vfResource, UserRoleEnum.DESIGNER);
+		PropertyRestUtils.updatePropertyListWithPathOnResource(componentInstDetails, vfc2FromVfc1, expectedPropertyList,
+				vfResource);
+		// verify property
+		vfResource = AtomicOperationUtils.getResourceObject(vfResource, UserRoleEnum.DESIGNER);
+		actualPropertyList = PropertyRestUtils.addComponentInstPropertiesToList(vfResource, actualPropertyList, null);
+		PropertyRestUtils.comparePropertyLists(expectedPropertyList, actualPropertyList, false);
+	}
+
+	@Test
+	public void nestedVfResourceProperty3LevelsAndCpWithProp() throws Exception {
+
+		basicVFC = createResourceWithProperty(ElementFactory.getDefaultStringProperty(), LifeCycleStatesEnum.CERTIFY);
+		vfc1FromBasicVFC = createResourceWithPropertyDerivedFromOtherResource(
+				ElementFactory.getDefaultIntegerProperty(), LifeCycleStatesEnum.CERTIFY, basicVFC);
+		vfc2FromVfc1 = createResourceWithPropertyDerivedFromOtherResource(ElementFactory.getDefaultBooleanProperty(),
+				LifeCycleStatesEnum.CHECKIN, vfc1FromBasicVFC);
+
+		vfc2FromVfc1 = AtomicOperationUtils.getResourceObject(vfc2FromVfc1, UserRoleEnum.DESIGNER);
+		expectedPropertyList = PropertyRestUtils.addResourcePropertiesToList(vfc2FromVfc1, expectedPropertyList);
+
+		// four resource
+		Resource cp = AtomicOperationUtils.createResourcesByTypeNormTypeAndCatregory(ResourceTypeEnum.CP,
+				NormativeTypesEnum.NETWORK, ResourceCategoryEnum.GENERIC_ABSTRACT, UserRoleEnum.DESIGNER, true).left()
+				.value();
+		PropertyReqDetails cpStringProperty = ElementFactory.getDefaultStringProperty();
+		cpStringProperty.setName("Different Name");
+		cpStringProperty.setPropertyDefaultValue("Different value from default");
+		AtomicOperationUtils.addCustomPropertyToResource(cpStringProperty, cp, UserRoleEnum.DESIGNER, true);
+		AtomicOperationUtils.changeComponentState(basicVFC, UserRoleEnum.DESIGNER, LifeCycleStatesEnum.CERTIFY, true);
+		cp = AtomicOperationUtils.getResourceObject(cp, UserRoleEnum.DESIGNER);
+		expectedPropertyList = PropertyRestUtils.addResourcePropertiesToList(cp, expectedPropertyList);
+		// create VF + add RI
+		vfResource = AtomicOperationUtils.createResourceByType(ResourceTypeEnum.VF, UserRoleEnum.DESIGNER, true).left()
+				.value();
+		ComponentInstance componentInstDetails = AtomicOperationUtils
+				.addComponentInstanceToComponentContainer(vfc2FromVfc1, vfResource, UserRoleEnum.DESIGNER, true).left()
+				.value();
+		vfResource = AtomicOperationUtils.getResourceObject(vfResource, UserRoleEnum.DESIGNER);
+		PropertyRestUtils.updatePropertyListWithPathOnResource(componentInstDetails, vfc2FromVfc1, expectedPropertyList,
+				vfResource);
+		componentInstDetails = AtomicOperationUtils
+				.addComponentInstanceToComponentContainer(cp, vfResource, UserRoleEnum.DESIGNER, true).left().value();
+		vfResource = AtomicOperationUtils.getResourceObject(vfResource, UserRoleEnum.DESIGNER);
+		PropertyRestUtils.updatePropertyListWithPathOnResource(componentInstDetails, cp, expectedPropertyList,
+				vfResource);
+		// verify property
+		vfResource = AtomicOperationUtils.getResourceObject(vfResource, UserRoleEnum.DESIGNER);
+		actualPropertyList = PropertyRestUtils.addComponentInstPropertiesToList(vfResource, actualPropertyList, null);
+		PropertyRestUtils.comparePropertyLists(expectedPropertyList, actualPropertyList, false);
+	}
+
+	@Test
+	public void nestedCertifiedVfResourceProperty3Levels() throws Exception {
+		basicVFC = createResourceWithProperty(ElementFactory.getDefaultStringProperty(), LifeCycleStatesEnum.CERTIFY);
+		vfc1FromBasicVFC = createResourceWithPropertyDerivedFromOtherResource(
+				ElementFactory.getDefaultIntegerProperty(), LifeCycleStatesEnum.CERTIFY, basicVFC);
+		vfc2FromVfc1 = createResourceWithPropertyDerivedFromOtherResource(ElementFactory.getDefaultBooleanProperty(),
+				LifeCycleStatesEnum.CERTIFY, vfc1FromBasicVFC);
+
+		vfc2FromVfc1 = AtomicOperationUtils.getResourceObject(vfc2FromVfc1, UserRoleEnum.DESIGNER);
+		expectedPropertyList = PropertyRestUtils.addResourcePropertiesToList(vfc2FromVfc1, expectedPropertyList);
+		// create VF + add RI
+		vfResource = AtomicOperationUtils.createResourceByType(ResourceTypeEnum.VF, UserRoleEnum.DESIGNER, true).left()
+				.value();
+		ComponentInstance componentInstDetails = AtomicOperationUtils
+				.addComponentInstanceToComponentContainer(vfc2FromVfc1, vfResource, UserRoleEnum.DESIGNER, true).left()
+				.value();
+		vfResource = AtomicOperationUtils.getResourceObject(vfResource, UserRoleEnum.DESIGNER);
+		PropertyRestUtils.updatePropertyListWithPathOnResource(componentInstDetails, vfc2FromVfc1, expectedPropertyList,
+				vfResource);
+		// verify property
+		vfResource = AtomicOperationUtils.getResourceObject(vfResource, UserRoleEnum.DESIGNER);
+		AtomicOperationUtils.changeComponentState(vfResource, UserRoleEnum.DESIGNER, LifeCycleStatesEnum.CERTIFY, true);
+		vfResource = AtomicOperationUtils.getResourceObject(vfResource, UserRoleEnum.DESIGNER);
+		PropertyRestUtils.updatePropertyListWithPathOnResource(componentInstDetails, vfc2FromVfc1, expectedPropertyList,
+				vfResource);
+		actualPropertyList = PropertyRestUtils.addComponentInstPropertiesToList(vfResource, actualPropertyList, null);
+		PropertyRestUtils.comparePropertyLists(expectedPropertyList, actualPropertyList, false);
+	}
+
+	@Test
+	public void nestedVfResourceProperty3Levels2SameResInstances() throws Exception {
+
+		basicVFC = createResourceWithProperty(ElementFactory.getDefaultStringProperty(), LifeCycleStatesEnum.CERTIFY);
+		vfc1FromBasicVFC = createResourceWithPropertyDerivedFromOtherResource(
+				ElementFactory.getDefaultIntegerProperty(), LifeCycleStatesEnum.CERTIFY, basicVFC);
+		vfc2FromVfc1 = createResourceWithPropertyDerivedFromOtherResource(ElementFactory.getDefaultBooleanProperty(),
+				LifeCycleStatesEnum.CHECKIN, vfc1FromBasicVFC);
+
+		vfc2FromVfc1 = AtomicOperationUtils.getResourceObject(vfc2FromVfc1, UserRoleEnum.DESIGNER);
+		expectedPropertyList = PropertyRestUtils.addResourcePropertiesToList(vfc2FromVfc1, expectedPropertyList);
+		expectedPropertyList = PropertyRestUtils.addResourcePropertiesToList(vfc2FromVfc1, expectedPropertyList);
+		// create VF + add RI
+		vfResource = AtomicOperationUtils.createResourceByType(ResourceTypeEnum.VF, UserRoleEnum.DESIGNER, true).left()
+				.value();
+		ComponentInstance componentInstDetails = AtomicOperationUtils
+				.addComponentInstanceToComponentContainer(vfc2FromVfc1, vfResource, UserRoleEnum.DESIGNER, true).left()
+				.value();
+		vfResource = AtomicOperationUtils.getResourceObject(vfResource, UserRoleEnum.DESIGNER);
+		// verify property
+		PropertyRestUtils.updatePropertyListWithPathOnResource(componentInstDetails, vfc2FromVfc1, expectedPropertyList,
+				vfResource);
+
+		componentInstDetails = AtomicOperationUtils
+				.addComponentInstanceToComponentContainer(vfc2FromVfc1, vfResource, UserRoleEnum.DESIGNER, true).left()
+				.value();
+		vfResource = AtomicOperationUtils.getResourceObject(vfResource, UserRoleEnum.DESIGNER);
+		PropertyRestUtils.updatePropertyListWithPathOnResource(componentInstDetails, vfc2FromVfc1, expectedPropertyList,
+				vfResource);
+		vfResource = AtomicOperationUtils.getResourceObject(vfResource, UserRoleEnum.DESIGNER);
+		actualPropertyList = PropertyRestUtils.addComponentInstPropertiesToList(vfResource, actualPropertyList, null);
+		PropertyRestUtils.comparePropertyLists(expectedPropertyList, actualPropertyList, false);
+	}
+
+	// ------------------update resource
+	// property-----------------------------------
+
+	@Test
+	public void nestedVfResourceProperty3LevelsUpdateFirstLevelProperty() throws Exception {
+		// first res
+		basicVFC = AtomicOperationUtils.createResourcesByTypeNormTypeAndCatregory(ResourceTypeEnum.VFC,
+				NormativeTypesEnum.ROOT, ResourceCategoryEnum.GENERIC_ABSTRACT, UserRoleEnum.DESIGNER, true).left()
+				.value();
+		Either<ComponentInstanceProperty, RestResponse> propDetailsToUpdate = AtomicOperationUtils
+				.addDefaultPropertyToResource(PropertyTypeEnum.STRING, basicVFC, UserRoleEnum.DESIGNER, true);
+		String propNameToUpdate = propDetailsToUpdate.left().value().getName();
+		String propTypeToUpdate = propDetailsToUpdate.left().value().getType();
+		AtomicOperationUtils.changeComponentState(basicVFC, UserRoleEnum.DESIGNER, LifeCycleStatesEnum.CERTIFY, true);
+
+		vfc1FromBasicVFC = createResourceWithPropertyDerivedFromOtherResource(
+				ElementFactory.getDefaultIntegerProperty(), LifeCycleStatesEnum.CERTIFY, basicVFC);
+		vfc2FromVfc1 = createResourceWithPropertyDerivedFromOtherResource(ElementFactory.getDefaultBooleanProperty(),
+				LifeCycleStatesEnum.CHECKIN, vfc1FromBasicVFC);
+
+		vfc2FromVfc1 = AtomicOperationUtils.getResourceObject(vfc2FromVfc1, UserRoleEnum.DESIGNER);
+		expectedPropertyList = PropertyRestUtils.addResourcePropertiesToList(vfc2FromVfc1, expectedPropertyList);
+
+		// create VF + add RI
+		vfResource = AtomicOperationUtils.createResourceByType(ResourceTypeEnum.VF, UserRoleEnum.DESIGNER, true).left()
+				.value();
+		ComponentInstance componentInstDetails = AtomicOperationUtils
+				.addComponentInstanceToComponentContainer(vfc2FromVfc1, vfResource, UserRoleEnum.DESIGNER, true).left()
+				.value();
+		vfResource = AtomicOperationUtils.getResourceObject(vfResource, UserRoleEnum.DESIGNER);
+		PropertyRestUtils.updatePropertyListWithPathOnResource(componentInstDetails, vfc2FromVfc1, expectedPropertyList,
+				vfResource);
+
+		vfResource = AtomicOperationUtils.getResourceObject(vfResource, UserRoleEnum.DESIGNER);
+		actualPropertyList = PropertyRestUtils.addComponentInstPropertiesToList(vfResource, actualPropertyList, null);
+
+		// verify property
+		PropertyRestUtils.comparePropertyLists(expectedPropertyList, actualPropertyList, false);
+
+		// update property
+		ComponentInstanceProperty expectedUpdatePropDetails = PropertyRestUtils
+				.getPropFromListByPropNameAndType(actualPropertyList, propNameToUpdate, propTypeToUpdate);
+		expectedUpdatePropDetails.setValue(updatedStringValue);
+		String propUniqeId = expectedUpdatePropDetails.getUniqueId();
+		RestResponse updatePropertyValueOnResourceInstance = ComponentInstanceRestUtils
+				.updatePropertyValueOnResourceInstance(vfResource, componentInstDetails,
+						ElementFactory.getDefaultUser(UserRoleEnum.DESIGNER), expectedUpdatePropDetails);
+		assertTrue("expected updatePropertyValueOnResourceInstance response code: " + BaseRestUtils.STATUS_CODE_SUCCESS,
+				updatePropertyValueOnResourceInstance.getErrorCode() == BaseRestUtils.STATUS_CODE_SUCCESS);
+
+		vfResource = AtomicOperationUtils.getResourceObject(vfResource, UserRoleEnum.DESIGNER);
+
+		actualPropertyList = new ArrayList<>();
+		actualPropertyList = PropertyRestUtils.addComponentInstPropertiesToList(vfResource, actualPropertyList, null);
+
+		ComponentInstanceProperty actualUpdatedPropDetails = PropertyRestUtils
+				.getPropFromListByPropIdAndPath(actualPropertyList, propUniqeId, null);
+		assertTrue("property was not updated propely",
+				PropertyRestUtils.comparePropertyObjects(expectedUpdatePropDetails, actualUpdatedPropDetails, true));
+
+	}
+
+	@Test
+	public void nestedVfResourceProperty3LevelsUpdateSecondLevelProperty() throws Exception {
+		basicVFC = createResourceWithProperty(ElementFactory.getDefaultStringProperty(), LifeCycleStatesEnum.CERTIFY);
+
+		// second resource
+		vfc1FromBasicVFC = AtomicOperationUtils.createResourcesByCustomNormativeTypeAndCatregory(ResourceTypeEnum.VFC,
+				basicVFC, ResourceCategoryEnum.APPLICATION_L4_BORDER, UserRoleEnum.DESIGNER, true).left().value();
+		Either<ComponentInstanceProperty, RestResponse> propDetailsToUpdate = AtomicOperationUtils
+				.addCustomPropertyToResource(ElementFactory.getDefaultIntegerProperty(), vfc1FromBasicVFC,
+						UserRoleEnum.DESIGNER, true);
+		String propNameToUpdate = propDetailsToUpdate.left().value().getName();
+		String propTypeToUpdate = propDetailsToUpdate.left().value().getType();
+		AtomicOperationUtils.changeComponentState(vfc1FromBasicVFC, UserRoleEnum.DESIGNER, LifeCycleStatesEnum.CERTIFY,
+				true);
+
+		vfc2FromVfc1 = createResourceWithPropertyDerivedFromOtherResource(ElementFactory.getDefaultBooleanProperty(),
+				LifeCycleStatesEnum.CHECKIN, vfc1FromBasicVFC);
+
+		vfc2FromVfc1 = AtomicOperationUtils.getResourceObject(vfc2FromVfc1, UserRoleEnum.DESIGNER);
+		expectedPropertyList = PropertyRestUtils.addResourcePropertiesToList(vfc2FromVfc1, expectedPropertyList);
+
+		// create VF + add RI
+		vfResource = AtomicOperationUtils.createResourceByType(ResourceTypeEnum.VF, UserRoleEnum.DESIGNER, true).left()
+				.value();
+		ComponentInstance componentInstDetails = AtomicOperationUtils
+				.addComponentInstanceToComponentContainer(vfc2FromVfc1, vfResource, UserRoleEnum.DESIGNER, true).left()
+				.value();
+		vfResource = AtomicOperationUtils.getResourceObject(vfResource, UserRoleEnum.DESIGNER);
+		PropertyRestUtils.updatePropertyListWithPathOnResource(componentInstDetails, vfc2FromVfc1, expectedPropertyList,
+				vfResource);
+		vfResource = AtomicOperationUtils.getResourceObject(vfResource, UserRoleEnum.DESIGNER);
+		actualPropertyList = PropertyRestUtils.addComponentInstPropertiesToList(vfResource, actualPropertyList, null);
+
+		// verify property
+		PropertyRestUtils.comparePropertyLists(expectedPropertyList, actualPropertyList, false);
+
+		// update property
+		ComponentInstanceProperty expectedUpdatePropDetails = PropertyRestUtils
+				.getPropFromListByPropNameAndType(actualPropertyList, propNameToUpdate, propTypeToUpdate);
+		expectedUpdatePropDetails.setValue(updatedIntegerValue);
+		String propUniqeId = expectedUpdatePropDetails.getUniqueId();
+		RestResponse updatePropertyValueOnResourceInstance = ComponentInstanceRestUtils
+				.updatePropertyValueOnResourceInstance(vfResource, componentInstDetails,
+						ElementFactory.getDefaultUser(UserRoleEnum.DESIGNER), expectedUpdatePropDetails);
+		assertTrue(
+				"expected updatePropertyValueOnResourceInstance response code: " + BaseRestUtils.STATUS_CODE_SUCCESS
+						+ " ,but was " + updatePropertyValueOnResourceInstance.getErrorCode(),
+				updatePropertyValueOnResourceInstance.getErrorCode() == BaseRestUtils.STATUS_CODE_SUCCESS);
+
+		vfResource = AtomicOperationUtils.getResourceObject(vfResource, UserRoleEnum.DESIGNER);
+
+		actualPropertyList = new ArrayList<>();
+		actualPropertyList = PropertyRestUtils.addComponentInstPropertiesToList(vfResource, actualPropertyList, null);
+		ComponentInstanceProperty actualUpdatedPropDetails = PropertyRestUtils
+				.getPropFromListByPropIdAndPath(actualPropertyList, propUniqeId, null);
+		assertTrue("property was not updated properly",
+				PropertyRestUtils.comparePropertyObjects(expectedUpdatePropDetails, actualUpdatedPropDetails, true));
+
+	}
+
+	@Test
+	public void nestedVfResourceProperty3LevelsUpdateThirdLevelProperty() throws Exception {
+
+		basicVFC = createResourceWithProperty(ElementFactory.getDefaultStringProperty(), LifeCycleStatesEnum.CERTIFY);
+		vfc1FromBasicVFC = createResourceWithPropertyDerivedFromOtherResource(
+				ElementFactory.getDefaultIntegerProperty(), LifeCycleStatesEnum.CERTIFY, basicVFC);
+
+		// third resource
+		vfc2FromVfc1 = AtomicOperationUtils.createResourcesByCustomNormativeTypeAndCatregory(ResourceTypeEnum.VFC,
+				vfc1FromBasicVFC, ResourceCategoryEnum.GENERIC_DATABASE, UserRoleEnum.DESIGNER, true).left().value();
+		Either<ComponentInstanceProperty, RestResponse> propDetailsToUpdate = AtomicOperationUtils
+				.addCustomPropertyToResource(ElementFactory.getDefaultBooleanProperty(), vfc2FromVfc1,
+						UserRoleEnum.DESIGNER, true);
+		String propNameToUpdate = propDetailsToUpdate.left().value().getName();
+		String propTypeToUpdate = propDetailsToUpdate.left().value().getType();
+		AtomicOperationUtils.changeComponentState(vfc2FromVfc1, UserRoleEnum.DESIGNER, LifeCycleStatesEnum.CHECKIN,
+				true);
+
+		vfc2FromVfc1 = AtomicOperationUtils.getResourceObject(vfc2FromVfc1, UserRoleEnum.DESIGNER);
+		expectedPropertyList = PropertyRestUtils.addResourcePropertiesToList(vfc2FromVfc1, expectedPropertyList);
+
+		// create VF + add RI
+		vfResource = AtomicOperationUtils.createResourceByType(ResourceTypeEnum.VF, UserRoleEnum.DESIGNER, true).left()
+				.value();
+		ComponentInstance componentInstDetails = AtomicOperationUtils
+				.addComponentInstanceToComponentContainer(vfc2FromVfc1, vfResource, UserRoleEnum.DESIGNER, true).left()
+				.value();
+		vfResource = AtomicOperationUtils.getResourceObject(vfResource, UserRoleEnum.DESIGNER);
+		PropertyRestUtils.updatePropertyListWithPathOnResource(componentInstDetails, vfc2FromVfc1, expectedPropertyList,
+				vfResource);
+		vfResource = AtomicOperationUtils.getResourceObject(vfResource, UserRoleEnum.DESIGNER);
+		actualPropertyList = PropertyRestUtils.addComponentInstPropertiesToList(vfResource, actualPropertyList, null);
+
+		// verify property
+		PropertyRestUtils.comparePropertyLists(expectedPropertyList, actualPropertyList, false);
+
+		// update property
+		ComponentInstanceProperty expectedUpdatePropDetails = PropertyRestUtils
+				.getPropFromListByPropNameAndType(actualPropertyList, propNameToUpdate, propTypeToUpdate);
+		expectedUpdatePropDetails.setValue(updatedBooleanValue);
+		String propUniqeId = expectedUpdatePropDetails.getUniqueId();
+		RestResponse updatePropertyValueOnResourceInstance = ComponentInstanceRestUtils
+				.updatePropertyValueOnResourceInstance(vfResource, componentInstDetails,
+						ElementFactory.getDefaultUser(UserRoleEnum.DESIGNER), expectedUpdatePropDetails);
+		assertTrue("expected updatePropertyValueOnResourceInstance response code: " + BaseRestUtils.STATUS_CODE_SUCCESS,
+				updatePropertyValueOnResourceInstance.getErrorCode() == BaseRestUtils.STATUS_CODE_SUCCESS);
+
+		vfResource = AtomicOperationUtils.getResourceObject(vfResource, UserRoleEnum.DESIGNER);
+
+		actualPropertyList = new ArrayList<>();
+		actualPropertyList = PropertyRestUtils.addComponentInstPropertiesToList(vfResource, actualPropertyList, null);
+		ComponentInstanceProperty actualUpdatedPropDetails = PropertyRestUtils
+				.getPropFromListByPropIdAndPath(actualPropertyList, propUniqeId, null);
+		assertTrue("property was not updated propely",
+				PropertyRestUtils.comparePropertyObjects(expectedUpdatePropDetails, actualUpdatedPropDetails, true));
+
+	}
+
+	// ---------------------Service------------------------------------------------------------------------
+
+	/**
+	 * Service-->VF1(inst)-->VF-->(VFC(inst)-->VFC-->VFC-->VFC) (p3) (p2) (p1)
+	 */
+	@Test
+	public void serviceWithNestedResourceProperty3Levels() throws Exception {
+
+		basicVFC = createResourceWithProperty(ElementFactory.getDefaultStringProperty(), LifeCycleStatesEnum.CERTIFY);
+		vfc1FromBasicVFC = createResourceWithPropertyDerivedFromOtherResource(
+				ElementFactory.getDefaultIntegerProperty(), LifeCycleStatesEnum.CERTIFY, basicVFC);
+		vfc2FromVfc1 = createResourceWithPropertyDerivedFromOtherResource(ElementFactory.getDefaultBooleanProperty(),
+				LifeCycleStatesEnum.CHECKIN, vfc1FromBasicVFC);
+		vfc2FromVfc1 = AtomicOperationUtils.getResourceObject(vfc2FromVfc1, UserRoleEnum.DESIGNER);
+		expectedPropertyList = PropertyRestUtils.addResourcePropertiesToList(vfc2FromVfc1, expectedPropertyList);
+
+		vfResource = AtomicOperationUtils.createResourceByType(ResourceTypeEnum.VF, UserRoleEnum.DESIGNER, true).left()
+				.value();
+		ComponentInstance componentInstDetails = AtomicOperationUtils
+				.addComponentInstanceToComponentContainer(vfc2FromVfc1, vfResource, UserRoleEnum.DESIGNER, true).left()
+				.value();
+		AtomicOperationUtils.changeComponentState(vfResource, UserRoleEnum.DESIGNER, LifeCycleStatesEnum.CHECKIN, true);
+		vfResource = AtomicOperationUtils.getResourceObject(vfResource, UserRoleEnum.DESIGNER);
+		PropertyRestUtils.updatePropertyListWithPathOnResource(componentInstDetails, vfc2FromVfc1, expectedPropertyList,
+				vfResource);
+		Service service = AtomicOperationUtils.createDefaultService(UserRoleEnum.DESIGNER, true).left().value();
+		componentInstDetails = AtomicOperationUtils
+				.addComponentInstanceToComponentContainer(vfResource, service, UserRoleEnum.DESIGNER, true).left()
+				.value();
+		service = AtomicOperationUtils.getServiceObject(service, UserRoleEnum.DESIGNER);
+		PropertyRestUtils.updatePropertyListWithPathOnComponentInstance(componentInstDetails, service,
+				expectedPropertyList);
+		actualPropertyList = PropertyRestUtils.addComponentInstPropertiesToList(service, actualPropertyList, null);
+		PropertyRestUtils.comparePropertyLists(expectedPropertyList, actualPropertyList, false);
+
+	}
+
+	/**
+	 * Service-->VF1(inst)-->VF-->(VFC(inst)-->VFC-->VFC-->VFC) (p4) (p3) (p2)
+	 * (p1)
+	 */
+	@Test
+	public void serviceWithNestedResourceProperty3LevelsAndVfProperty() throws Exception {
+
+		basicVFC = createResourceWithProperty(ElementFactory.getDefaultStringProperty(), LifeCycleStatesEnum.CERTIFY);
+		vfc1FromBasicVFC = createResourceWithPropertyDerivedFromOtherResource(
+				ElementFactory.getDefaultIntegerProperty(), LifeCycleStatesEnum.CERTIFY, basicVFC);
+		vfc2FromVfc1 = createResourceWithPropertyDerivedFromOtherResource(ElementFactory.getDefaultBooleanProperty(),
+				LifeCycleStatesEnum.CHECKIN, vfc1FromBasicVFC);
+		vfc2FromVfc1 = AtomicOperationUtils.getResourceObject(vfc2FromVfc1, UserRoleEnum.DESIGNER);
+		expectedPropertyList = PropertyRestUtils.addResourcePropertiesToList(vfc2FromVfc1, expectedPropertyList);
+
+		vfResource = AtomicOperationUtils.createResourceByType(ResourceTypeEnum.VF, UserRoleEnum.DESIGNER, true).left()
+				.value();
+		ComponentInstance componentInstDetails = AtomicOperationUtils
+				.addComponentInstanceToComponentContainer(vfc2FromVfc1, vfResource, UserRoleEnum.DESIGNER, true).left()
+				.value();
+		vfResource = AtomicOperationUtils.getResourceObject(vfResource, UserRoleEnum.DESIGNER);
+		PropertyRestUtils.updatePropertyListWithPathOnResource(componentInstDetails, vfc2FromVfc1, expectedPropertyList,
+				vfResource);
+		PropertyReqDetails propDetails = ElementFactory.getDefaultBooleanProperty();
+		propDetails.setName(newBooleanPropName);
+		propDetails.setPropertyDefaultValue(newBooleanPropValue);
+		AtomicOperationUtils.addCustomPropertyToResource(propDetails, vfResource, UserRoleEnum.DESIGNER, true);
+		propDetails = ElementFactory.getDefaultStringProperty();
+		propDetails.setName(newStringPropName);
+		propDetails.setPropertyDefaultValue(newStringPropValue);
+		AtomicOperationUtils.addCustomPropertyToResource(propDetails, vfResource, UserRoleEnum.DESIGNER, true);
+		propDetails = ElementFactory.getDefaultIntegerProperty();
+		propDetails.setName(newIntegerPropName);
+		propDetails.setPropertyDefaultValue(newIntegerPropValue);
+		AtomicOperationUtils.addCustomPropertyToResource(propDetails, vfResource, UserRoleEnum.DESIGNER, true);
+		AtomicOperationUtils.changeComponentState(vfResource, UserRoleEnum.DESIGNER, LifeCycleStatesEnum.CHECKIN, true);
+		vfResource = AtomicOperationUtils.getResourceObject(vfResource, UserRoleEnum.DESIGNER);
+		expectedPropertyList = PropertyRestUtils.addResourcePropertiesToList(vfResource, expectedPropertyList);
+
+		Service service = AtomicOperationUtils.createDefaultService(UserRoleEnum.DESIGNER, true).left().value();
+		componentInstDetails = AtomicOperationUtils
+				.addComponentInstanceToComponentContainer(vfResource, service, UserRoleEnum.DESIGNER, true).left()
+				.value();
+		service = AtomicOperationUtils.getServiceObject(service, UserRoleEnum.DESIGNER);
+		PropertyRestUtils.updatePropertyListWithPathOnComponentInstance(componentInstDetails, service,
+				expectedPropertyList);
+		actualPropertyList = PropertyRestUtils.addComponentInstPropertiesToList(service, actualPropertyList, null);
+		PropertyRestUtils.comparePropertyLists(expectedPropertyList, actualPropertyList, false);
+
+	}
+
+	/**
+	 * Service-->VF1(inst)-->VF-->(VFC(inst)-->VFC-->VFC-->VFC) (p4) (p3) (p2)
+	 * (p1) CP(VF inst) (p5)
+	 */
+	@Test
+	public void serviceWithNestedResourceProperty3LevelsAndCp() throws Exception {
+
+		basicVFC = createResourceWithProperty(ElementFactory.getDefaultStringProperty(), LifeCycleStatesEnum.CERTIFY);
+		vfc1FromBasicVFC = createResourceWithPropertyDerivedFromOtherResource(
+				ElementFactory.getDefaultIntegerProperty(), LifeCycleStatesEnum.CERTIFY, basicVFC);
+		vfc2FromVfc1 = createResourceWithPropertyDerivedFromOtherResource(ElementFactory.getDefaultBooleanProperty(),
+				LifeCycleStatesEnum.CHECKIN, vfc1FromBasicVFC);
+		vfc2FromVfc1 = AtomicOperationUtils.getResourceObject(vfc2FromVfc1, UserRoleEnum.DESIGNER);
+		expectedPropertyList = PropertyRestUtils.addResourcePropertiesToList(vfc2FromVfc1, expectedPropertyList);
+
+		// four resource
+		Resource cp = AtomicOperationUtils.createResourcesByTypeNormTypeAndCatregory(ResourceTypeEnum.CP,
+				NormativeTypesEnum.NETWORK, ResourceCategoryEnum.GENERIC_ABSTRACT, UserRoleEnum.DESIGNER, true).left()
+				.value();
+		PropertyReqDetails cpStringProperty = ElementFactory.getDefaultStringProperty();
+		cpStringProperty.setName("Different Name");
+		cpStringProperty.setPropertyDefaultValue("Different value from default");
+		AtomicOperationUtils.addCustomPropertyToResource(cpStringProperty, cp, UserRoleEnum.DESIGNER, true);
+		AtomicOperationUtils.changeComponentState(basicVFC, UserRoleEnum.DESIGNER, LifeCycleStatesEnum.CERTIFY, true);
+		cp = AtomicOperationUtils.getResourceObject(cp, UserRoleEnum.DESIGNER);
+		expectedPropertyList = PropertyRestUtils.addResourcePropertiesToList(cp, expectedPropertyList);
+		// create VF + add RI
+		vfResource = AtomicOperationUtils.createResourceByType(ResourceTypeEnum.VF, UserRoleEnum.DESIGNER, true).left()
+				.value();
+		ComponentInstance componentInstDetails = AtomicOperationUtils
+				.addComponentInstanceToComponentContainer(vfc2FromVfc1, vfResource, UserRoleEnum.DESIGNER, true).left()
+				.value();
+		vfResource = AtomicOperationUtils.getResourceObject(vfResource, UserRoleEnum.DESIGNER);
+		PropertyRestUtils.updatePropertyListWithPathOnResource(componentInstDetails, vfc2FromVfc1, expectedPropertyList,
+				vfResource);
+		componentInstDetails = AtomicOperationUtils
+				.addComponentInstanceToComponentContainer(cp, vfResource, UserRoleEnum.DESIGNER, true).left().value();
+		AtomicOperationUtils.changeComponentState(vfResource, UserRoleEnum.DESIGNER, LifeCycleStatesEnum.CHECKIN, true);
+		vfResource = AtomicOperationUtils.getResourceObject(vfResource, UserRoleEnum.DESIGNER);
+		PropertyRestUtils.updatePropertyListWithPathOnResource(componentInstDetails, cp, expectedPropertyList,
+				vfResource);
+
+		Service service = AtomicOperationUtils.createDefaultService(UserRoleEnum.DESIGNER, true).left().value();
+		componentInstDetails = AtomicOperationUtils
+				.addComponentInstanceToComponentContainer(vfResource, service, UserRoleEnum.DESIGNER, true).left()
+				.value();
+		service = AtomicOperationUtils.getServiceObject(service, UserRoleEnum.DESIGNER);
+		PropertyRestUtils.updatePropertyListWithPathOnComponentInstance(componentInstDetails, service,
+				expectedPropertyList);
+		actualPropertyList = PropertyRestUtils.addComponentInstPropertiesToList(service, actualPropertyList, null);
+		PropertyRestUtils.comparePropertyLists(expectedPropertyList, actualPropertyList, false);
+
+	}
+
+	/**
+	 * Service-->VF1(inst)-->VF-->(VFC(inst)-->VFC-->VFC-->VFC) (p4) (p3) (p2)
+	 * (p1) CP(inst) (p5)
+	 */
+	@Test
+	public void serviceWithNestedResourceProperty3LevelsAndCpResInst() throws Exception {
+
+		basicVFC = createResourceWithProperty(ElementFactory.getDefaultStringProperty(), LifeCycleStatesEnum.CERTIFY);
+		vfc1FromBasicVFC = createResourceWithPropertyDerivedFromOtherResource(
+				ElementFactory.getDefaultIntegerProperty(), LifeCycleStatesEnum.CERTIFY, basicVFC);
+		vfc2FromVfc1 = createResourceWithPropertyDerivedFromOtherResource(ElementFactory.getDefaultBooleanProperty(),
+				LifeCycleStatesEnum.CHECKIN, vfc1FromBasicVFC);
+		vfc2FromVfc1 = AtomicOperationUtils.getResourceObject(vfc2FromVfc1, UserRoleEnum.DESIGNER);
+		// expectedPropertyList =
+		// PropertyRestUtils.addResourcePropertiesToList(vfc2FromVfc1,
+		// expectedPropertyList);
+
+		// four resource
+		Resource cp = AtomicOperationUtils.createResourcesByTypeNormTypeAndCatregory(ResourceTypeEnum.CP,
+				NormativeTypesEnum.NETWORK, ResourceCategoryEnum.GENERIC_ABSTRACT, UserRoleEnum.DESIGNER, true).left()
+				.value();
+		PropertyReqDetails cpStringProperty = ElementFactory.getDefaultStringProperty();
+		cpStringProperty.setName("Different Name");
+		cpStringProperty.setPropertyDefaultValue("Different value from default");
+		AtomicOperationUtils.addCustomPropertyToResource(cpStringProperty, cp, UserRoleEnum.DESIGNER, true);
+		AtomicOperationUtils.changeComponentState(cp, UserRoleEnum.DESIGNER, LifeCycleStatesEnum.CERTIFY, true);
+		cp = AtomicOperationUtils.getResourceObject(cp, UserRoleEnum.DESIGNER);
+		// create VF + add RI
+		vfResource = AtomicOperationUtils.createResourceByType(ResourceTypeEnum.VF, UserRoleEnum.DESIGNER, true).left()
+				.value();
+		ComponentInstance componentInstDetails = AtomicOperationUtils
+				.addComponentInstanceToComponentContainer(vfc2FromVfc1, vfResource, UserRoleEnum.DESIGNER, true).left()
+				.value();
+		AtomicOperationUtils.changeComponentState(vfResource, UserRoleEnum.DESIGNER, LifeCycleStatesEnum.CHECKIN, true);
+		vfResource = AtomicOperationUtils.getResourceObject(vfResource, UserRoleEnum.DESIGNER);
+
+		// Service
+		expectedPropertyList = new ArrayList<ComponentInstanceProperty>();
+		actualPropertyList = new ArrayList<ComponentInstanceProperty>();
+		expectedPropertyList = PropertyRestUtils.addComponentInstPropertiesToList(vfResource, expectedPropertyList,
+				null);
+		expectedPropertyList = PropertyRestUtils.addResourcePropertiesToList(cp, expectedPropertyList);
+
+		Service service = AtomicOperationUtils.createDefaultService(UserRoleEnum.DESIGNER, true).left().value();
+		componentInstDetails = AtomicOperationUtils
+				.addComponentInstanceToComponentContainer(vfResource, service, UserRoleEnum.DESIGNER, true).left()
+				.value();
+		service = AtomicOperationUtils.getServiceObject(service, UserRoleEnum.DESIGNER);
+		PropertyRestUtils.updatePropertyListWithPathOnComponentInstance(componentInstDetails, service,
+				expectedPropertyList);
+		componentInstDetails = AtomicOperationUtils
+				.addComponentInstanceToComponentContainer(cp, service, UserRoleEnum.DESIGNER, true).left().value();
+		service = AtomicOperationUtils.getServiceObject(service, UserRoleEnum.DESIGNER);
+		PropertyRestUtils.updatePropertyListWithPathOnComponentInstance(componentInstDetails, service,
+				expectedPropertyList);
+		actualPropertyList = PropertyRestUtils.addComponentInstPropertiesToList(service, actualPropertyList, null);
+		PropertyRestUtils.comparePropertyLists(expectedPropertyList, actualPropertyList, false);
+
+	}
+
+	/**
+	 * Service-->VF1(inst)-->VF-->(VFC(inst)-->VFC-->VFC-->VFC) | (p3) (p2) (p1)
+	 * | (VFC(inst)-->VFC-->VFC-->VFC) (p3) (p2) (p1)
+	 * 
+	 * VF2(inst)-->VF-->(VFC(inst)-->VFC-->VFC-->VFC) | (p3') (p2') (p1') |
+	 * (VFC(inst)-->VFC-->VFC-->VFC) (p3) (p2) (p1)
+	 */
+	@Test
+	public void serviceNestedVfResourceProperty3Levels2SameResInstances() throws Exception {
+
+		basicVFC = createResourceWithProperty(ElementFactory.getDefaultStringProperty(), LifeCycleStatesEnum.CERTIFY);
+		vfc1FromBasicVFC = createResourceWithPropertyDerivedFromOtherResource(
+				ElementFactory.getDefaultIntegerProperty(), LifeCycleStatesEnum.CERTIFY, basicVFC);
+		vfc2FromVfc1 = createResourceWithPropertyDerivedFromOtherResource(ElementFactory.getDefaultBooleanProperty(),
+				LifeCycleStatesEnum.CHECKIN, vfc1FromBasicVFC);
+		vfc2FromVfc1 = AtomicOperationUtils.getResourceObject(vfc2FromVfc1, UserRoleEnum.DESIGNER);
+
+		expectedPropertyList = PropertyRestUtils.addResourcePropertiesToList(vfc2FromVfc1, expectedPropertyList);
+		expectedPropertyList = PropertyRestUtils.addResourcePropertiesToList(vfc2FromVfc1, expectedPropertyList);
+
+		// create VF + add RI
+		vfResource = AtomicOperationUtils.createResourceByType(ResourceTypeEnum.VF, UserRoleEnum.DESIGNER, true).left()
+				.value();
+		ComponentInstance componentInstDetails = AtomicOperationUtils
+				.addComponentInstanceToComponentContainer(vfc2FromVfc1, vfResource, UserRoleEnum.DESIGNER, true).left()
+				.value();
+		vfResource = AtomicOperationUtils.getResourceObject(vfResource, UserRoleEnum.DESIGNER);
+		// verify property
+		PropertyRestUtils.updatePropertyListWithPathOnResource(componentInstDetails, vfc2FromVfc1, expectedPropertyList,
+				vfResource);
+
+		componentInstDetails = AtomicOperationUtils
+				.addComponentInstanceToComponentContainer(vfc2FromVfc1, vfResource, UserRoleEnum.DESIGNER, true).left()
+				.value();
+		vfResource = AtomicOperationUtils.getResourceObject(vfResource, UserRoleEnum.DESIGNER);
+		PropertyRestUtils.updatePropertyListWithPathOnResource(componentInstDetails, vfc2FromVfc1, expectedPropertyList,
+				vfResource);
+		AtomicOperationUtils.changeComponentState(vfResource, UserRoleEnum.DESIGNER, LifeCycleStatesEnum.CHECKIN, true);
+		vfResource = AtomicOperationUtils.getResourceObject(vfResource, UserRoleEnum.DESIGNER);
+		actualPropertyList = PropertyRestUtils.addComponentInstPropertiesToList(vfResource, actualPropertyList, null);
+		PropertyRestUtils.comparePropertyLists(expectedPropertyList, actualPropertyList, false);
+
+		// Service
+		expectedPropertyList = new ArrayList<ComponentInstanceProperty>();
+		actualPropertyList = new ArrayList<ComponentInstanceProperty>();
+		expectedPropertyList = PropertyRestUtils.addComponentInstPropertiesToList(vfResource, expectedPropertyList,
+				null);
+		expectedPropertyList = PropertyRestUtils.addComponentInstPropertiesToList(vfResource, expectedPropertyList,
+				null);
+		Service service = AtomicOperationUtils.createDefaultService(UserRoleEnum.DESIGNER, true).left().value();
+		componentInstDetails = AtomicOperationUtils
+				.addComponentInstanceToComponentContainer(vfResource, service, UserRoleEnum.DESIGNER, true).left()
+				.value();
+		service = AtomicOperationUtils.getServiceObject(service, UserRoleEnum.DESIGNER);
+		PropertyRestUtils.updatePropertyListWithPathOnComponentInstance(componentInstDetails, service,
+				expectedPropertyList);
+		componentInstDetails = AtomicOperationUtils
+				.addComponentInstanceToComponentContainer(vfResource, service, UserRoleEnum.DESIGNER, true).left()
+				.value();
+		service = AtomicOperationUtils.getServiceObject(service, UserRoleEnum.DESIGNER);
+		PropertyRestUtils.updatePropertyListWithPathOnComponentInstance(componentInstDetails, service,
+				expectedPropertyList);
+		service = AtomicOperationUtils.getServiceObject(service, UserRoleEnum.DESIGNER);
+		actualPropertyList = PropertyRestUtils.addComponentInstPropertiesToList(service, actualPropertyList, null);
+		PropertyRestUtils.comparePropertyLists(expectedPropertyList, actualPropertyList, false);
+
+	}
+
+	// service test template
+	/**
+	 * Service-->VF(inst)-->VF-->(VFC(inst)-->VFC-->VFC-->VFC) (p4) (p3) (p2)
+	 * (p1)
+	 */
+	@Test
+	public void serviceNestedVfResourceProperty3LevelsAndSelfVfProperty() throws Exception {
+
+		basicVFC = createResourceWithProperty(ElementFactory.getDefaultStringProperty(), LifeCycleStatesEnum.CERTIFY);
+		vfc1FromBasicVFC = createResourceWithPropertyDerivedFromOtherResource(
+				ElementFactory.getDefaultIntegerProperty(), LifeCycleStatesEnum.CERTIFY, basicVFC);
+		vfc2FromVfc1 = createResourceWithPropertyDerivedFromOtherResource(ElementFactory.getDefaultBooleanProperty(),
+				LifeCycleStatesEnum.CHECKIN, vfc1FromBasicVFC);
+		vfc2FromVfc1 = AtomicOperationUtils.getResourceObject(vfc2FromVfc1, UserRoleEnum.DESIGNER);
+
+		// create VF + add RI
+		vfResource = AtomicOperationUtils.createResourceByType(ResourceTypeEnum.VF, UserRoleEnum.DESIGNER, true).left()
+				.value();
+		ComponentInstance componentInstDetails = AtomicOperationUtils
+				.addComponentInstanceToComponentContainer(vfc2FromVfc1, vfResource, UserRoleEnum.DESIGNER, true).left()
+				.value();
+		vfResource = AtomicOperationUtils.getResourceObject(vfResource, UserRoleEnum.DESIGNER);
+		PropertyReqDetails newProp = ElementFactory.getDefaultStringProperty();
+		newProp.setName(newStringPropName);
+		newProp.setPropertyDefaultValue(newStringPropValue);
+		AtomicOperationUtils.addCustomPropertyToResource(newProp, vfResource, UserRoleEnum.DESIGNER, true);
+		AtomicOperationUtils.changeComponentState(vfResource, UserRoleEnum.DESIGNER, LifeCycleStatesEnum.CHECKIN, true);
+		vfResource = AtomicOperationUtils.getResourceObject(vfResource, UserRoleEnum.DESIGNER);
+
+		// Service
+		expectedPropertyList = new ArrayList<ComponentInstanceProperty>();
+		actualPropertyList = new ArrayList<ComponentInstanceProperty>();
+		expectedPropertyList = PropertyRestUtils.addComponentInstPropertiesToList(vfResource, expectedPropertyList,
+				null);
+		Service service = AtomicOperationUtils.createDefaultService(UserRoleEnum.DESIGNER, true).left().value();
+		componentInstDetails = AtomicOperationUtils
+				.addComponentInstanceToComponentContainer(vfResource, service, UserRoleEnum.DESIGNER, true).left()
+				.value();
+		service = AtomicOperationUtils.getServiceObject(service, UserRoleEnum.DESIGNER);
+		PropertyRestUtils.updatePropertyListWithPathOnComponentInstance(componentInstDetails, service,
+				expectedPropertyList);
+		service = AtomicOperationUtils.getServiceObject(service, UserRoleEnum.DESIGNER);
+		actualPropertyList = PropertyRestUtils.addComponentInstPropertiesToList(service, actualPropertyList, null);
+		PropertyRestUtils.comparePropertyLists(expectedPropertyList, actualPropertyList, false);
+
+	}
+
+	/**
+	 * update property(p4)
+	 * 
+	 * 
+	 * VFC(p1) ^ | VFC(p2) ^ | Service-->VF(inst)-->VF-->(VFC(inst)-->VFC(p3)
+	 * (p4)
+	 */
+	@Test
+	public void serviceNestedVfResourceProperty3LevelsAndSelfVfProperty_UpdateVfproperty() throws Exception {
+		// Create VFC(check-in state) derived from another resource
+		basicVFC = createResourceWithProperty(ElementFactory.getDefaultStringProperty(), LifeCycleStatesEnum.CERTIFY);
+		vfc1FromBasicVFC = createResourceWithPropertyDerivedFromOtherResource(
+				ElementFactory.getDefaultIntegerProperty(), LifeCycleStatesEnum.CERTIFY, basicVFC);
+		vfc2FromVfc1 = createResourceWithPropertyDerivedFromOtherResource(ElementFactory.getDefaultBooleanProperty(),
+				LifeCycleStatesEnum.CHECKIN, vfc1FromBasicVFC);
+		vfc2FromVfc1 = AtomicOperationUtils.getResourceObject(vfc2FromVfc1, UserRoleEnum.DESIGNER);
+
+		// create VF + add RI
+		vfResource = AtomicOperationUtils.createResourceByType(ResourceTypeEnum.VF, UserRoleEnum.DESIGNER, true).left()
+				.value();
+		ComponentInstance componentInstDetails = AtomicOperationUtils
+				.addComponentInstanceToComponentContainer(vfc2FromVfc1, vfResource, UserRoleEnum.DESIGNER, true).left()
+				.value();
+
+		// add property to VF
+		PropertyReqDetails newProp = ElementFactory.getDefaultStringProperty();
+		newProp.setName(newStringPropName);
+		newProp.setPropertyDefaultValue(newStringPropValue);
+		Either<ComponentInstanceProperty, RestResponse> propDetailsToUpdate = AtomicOperationUtils
+				.addCustomPropertyToResource(newProp, vfResource, UserRoleEnum.DESIGNER, true);
+		String propNameToUpdate = propDetailsToUpdate.left().value().getName();
+		String propTypeToUpdate = propDetailsToUpdate.left().value().getType();
+		AtomicOperationUtils.changeComponentState(vfResource, UserRoleEnum.DESIGNER, LifeCycleStatesEnum.CHECKIN, true);
+		vfResource = AtomicOperationUtils.getResourceObject(vfResource, UserRoleEnum.DESIGNER);
+
+		// Service
+		expectedPropertyList = new ArrayList<ComponentInstanceProperty>();
+		actualPropertyList = new ArrayList<ComponentInstanceProperty>();
+		expectedPropertyList = PropertyRestUtils.addComponentInstPropertiesToList(vfResource, expectedPropertyList,
+				null);
+		Service service = AtomicOperationUtils.createDefaultService(UserRoleEnum.DESIGNER, true).left().value();
+		componentInstDetails = AtomicOperationUtils
+				.addComponentInstanceToComponentContainer(vfResource, service, UserRoleEnum.DESIGNER, true).left()
+				.value();
+		service = AtomicOperationUtils.getServiceObject(service, UserRoleEnum.DESIGNER);
+		PropertyRestUtils.updatePropertyListWithPathOnComponentInstance(componentInstDetails, service,
+				expectedPropertyList);
+
+		service = AtomicOperationUtils.getServiceObject(service, UserRoleEnum.DESIGNER);
+		actualPropertyList = PropertyRestUtils.addComponentInstPropertiesToList(service, actualPropertyList, null);
+		PropertyRestUtils.comparePropertyLists(expectedPropertyList, actualPropertyList, false);
+
+		// update VF instance property
+		ComponentInstanceProperty expectedUpdatePropDetails = PropertyRestUtils
+				.getPropFromListByPropNameAndType(actualPropertyList, propNameToUpdate, propTypeToUpdate);
+		expectedUpdatePropDetails.setValue(updatedStringValue);
+		String propUniqeId = expectedUpdatePropDetails.getUniqueId();
+		RestResponse updatePropertyValueOnResourceInstance = ComponentInstanceRestUtils
+				.updatePropertyValueOnResourceInstance(service, componentInstDetails,
+						ElementFactory.getDefaultUser(UserRoleEnum.DESIGNER), expectedUpdatePropDetails);
+		assertTrue("expected updatePropertyValueOnResourceInstance response code: " + BaseRestUtils.STATUS_CODE_SUCCESS,
+				updatePropertyValueOnResourceInstance.getErrorCode() == BaseRestUtils.STATUS_CODE_SUCCESS);
+
+		service = AtomicOperationUtils.getServiceObject(service, UserRoleEnum.DESIGNER);
+
+		actualPropertyList = new ArrayList<>();
+		actualPropertyList = PropertyRestUtils.addComponentInstPropertiesToList(service, actualPropertyList, null);
+
+		ComponentInstanceProperty actualUpdatedPropDetails = PropertyRestUtils
+				.getPropFromListByPropIdAndPath(actualPropertyList, propUniqeId, null);
+		assertTrue("property was not updated propely",
+				PropertyRestUtils.comparePropertyObjects(expectedUpdatePropDetails, actualUpdatedPropDetails, true));
+
+	}
+
+	/**
+	 * update property(p1)
+	 * Service-->VF(inst)-->VF-->(VFC(inst)-->VFC-->VFC-->VFC) (p4) (p3) (p2)
+	 * (p1)
+	 */
+	@Test
+	public void serviceNestedVfResourceProperty3LevelsAndSelfVfPropertyUpdateVfInheritance1LevelProperty()
+			throws Exception {
+
+		basicVFC = AtomicOperationUtils.createResourcesByTypeNormTypeAndCatregory(ResourceTypeEnum.VFC,
+				NormativeTypesEnum.ROOT, ResourceCategoryEnum.GENERIC_ABSTRACT, UserRoleEnum.DESIGNER, true).left()
+				.value();
+		Either<ComponentInstanceProperty, RestResponse> propDetailsToUpdate = AtomicOperationUtils
+				.addDefaultPropertyToResource(PropertyTypeEnum.STRING, basicVFC, UserRoleEnum.DESIGNER, true);
+		String propNameToUpdate = propDetailsToUpdate.left().value().getName();
+		String propTypeToUpdate = propDetailsToUpdate.left().value().getType();
+		AtomicOperationUtils.changeComponentState(basicVFC, UserRoleEnum.DESIGNER, LifeCycleStatesEnum.CERTIFY, true);
+		vfc1FromBasicVFC = createResourceWithPropertyDerivedFromOtherResource(
+				ElementFactory.getDefaultIntegerProperty(), LifeCycleStatesEnum.CERTIFY, basicVFC);
+		vfc2FromVfc1 = createResourceWithPropertyDerivedFromOtherResource(ElementFactory.getDefaultBooleanProperty(),
+				LifeCycleStatesEnum.CHECKIN, vfc1FromBasicVFC);
+		vfc2FromVfc1 = AtomicOperationUtils.getResourceObject(vfc2FromVfc1, UserRoleEnum.DESIGNER);
+
+		// create VF + add RI
+		vfResource = AtomicOperationUtils.createResourceByType(ResourceTypeEnum.VF, UserRoleEnum.DESIGNER, true).left()
+				.value();
+		ComponentInstance componentInstDetails = AtomicOperationUtils
+				.addComponentInstanceToComponentContainer(vfc2FromVfc1, vfResource, UserRoleEnum.DESIGNER, true).left()
+				.value();
+		// verify property
+		PropertyReqDetails newProp = ElementFactory.getDefaultStringProperty();
+		newProp.setName(newStringPropName);
+		newProp.setPropertyDefaultValue(newStringPropValue);
+		AtomicOperationUtils.addCustomPropertyToResource(newProp, vfResource, UserRoleEnum.DESIGNER, true);
+		AtomicOperationUtils.changeComponentState(vfResource, UserRoleEnum.DESIGNER, LifeCycleStatesEnum.CHECKIN, true);
+		vfResource = AtomicOperationUtils.getResourceObject(vfResource, UserRoleEnum.DESIGNER);
+
+		// Service
+		expectedPropertyList = new ArrayList<ComponentInstanceProperty>();
+		actualPropertyList = new ArrayList<ComponentInstanceProperty>();
+		expectedPropertyList = PropertyRestUtils.addComponentInstPropertiesToList(vfResource, expectedPropertyList,
+				null);
+		Service service = AtomicOperationUtils.createDefaultService(UserRoleEnum.DESIGNER, true).left().value();
+		componentInstDetails = AtomicOperationUtils
+				.addComponentInstanceToComponentContainer(vfResource, service, UserRoleEnum.DESIGNER, true).left()
+				.value();
+		service = AtomicOperationUtils.getServiceObject(service, UserRoleEnum.DESIGNER);
+		PropertyRestUtils.updatePropertyListWithPathOnComponentInstance(componentInstDetails, service,
+				expectedPropertyList);
+
+		service = AtomicOperationUtils.getServiceObject(service, UserRoleEnum.DESIGNER);
+		actualPropertyList = PropertyRestUtils.addComponentInstPropertiesToList(service, actualPropertyList, null);
+		PropertyRestUtils.comparePropertyLists(expectedPropertyList, actualPropertyList, false);
+
+		// update VF property
+		ComponentInstanceProperty expectedUpdatePropDetails = PropertyRestUtils
+				.getPropFromListByPropNameAndType(actualPropertyList, propNameToUpdate, propTypeToUpdate);
+		expectedUpdatePropDetails.setValue(updatedStringValue);
+		String propUniqeId = expectedUpdatePropDetails.getUniqueId();
+		RestResponse updatePropertyValueOnResourceInstance = ComponentInstanceRestUtils
+				.updatePropertyValueOnResourceInstance(service, componentInstDetails,
+						ElementFactory.getDefaultUser(UserRoleEnum.DESIGNER), expectedUpdatePropDetails);
+		assertTrue("expected updatePropertyValueOnResourceInstance response code: " + BaseRestUtils.STATUS_CODE_SUCCESS,
+				updatePropertyValueOnResourceInstance.getErrorCode() == BaseRestUtils.STATUS_CODE_SUCCESS);
+
+		service = AtomicOperationUtils.getServiceObject(service, UserRoleEnum.DESIGNER);
+
+		actualPropertyList = new ArrayList<>();
+		actualPropertyList = PropertyRestUtils.addComponentInstPropertiesToList(service, actualPropertyList, null);
+
+		ComponentInstanceProperty actualUpdatedPropDetails = PropertyRestUtils
+				.getPropFromListByPropIdAndPath(actualPropertyList, propUniqeId, null);
+		assertTrue("property was not updated propely",
+				PropertyRestUtils.comparePropertyObjects(expectedUpdatePropDetails, actualUpdatedPropDetails, true));
+
+	}
+
+	/**
+	 * update property(p2)
+	 * Service-->VF(inst)-->VF-->(VFC(inst)-->VFC-->VFC-->VFC) (p4) (p3) (p2)
+	 * (p1)
+	 */
+	@Test
+	public void serviceNestedVfResourceProperty3LevelsAndSelfVfPropertyUpdateVfInheritance2LevelProperty()
+			throws Exception {
+
+		basicVFC = createResourceWithProperty(ElementFactory.getDefaultStringProperty(), LifeCycleStatesEnum.CERTIFY);
+		vfc1FromBasicVFC = AtomicOperationUtils.createResourcesByCustomNormativeTypeAndCatregory(ResourceTypeEnum.VFC,
+				basicVFC, ResourceCategoryEnum.APPLICATION_L4_BORDER, UserRoleEnum.DESIGNER, true).left().value();
+		Either<ComponentInstanceProperty, RestResponse> propDetailsToUpdate = AtomicOperationUtils
+				.addCustomPropertyToResource(ElementFactory.getDefaultIntegerProperty(), vfc1FromBasicVFC,
+						UserRoleEnum.DESIGNER, true);
+		String propNameToUpdate = propDetailsToUpdate.left().value().getName();
+		String propTypeToUpdate = propDetailsToUpdate.left().value().getType();
+		AtomicOperationUtils.changeComponentState(vfc1FromBasicVFC, UserRoleEnum.DESIGNER, LifeCycleStatesEnum.CERTIFY,
+				true);
+		vfc2FromVfc1 = createResourceWithPropertyDerivedFromOtherResource(ElementFactory.getDefaultBooleanProperty(),
+				LifeCycleStatesEnum.CHECKIN, vfc1FromBasicVFC);
+		vfc2FromVfc1 = AtomicOperationUtils.getResourceObject(vfc2FromVfc1, UserRoleEnum.DESIGNER);
+
+		// create VF + add RI
+		vfResource = AtomicOperationUtils.createResourceByType(ResourceTypeEnum.VF, UserRoleEnum.DESIGNER, true).left()
+				.value();
+		ComponentInstance componentInstDetails = AtomicOperationUtils
+				.addComponentInstanceToComponentContainer(vfc2FromVfc1, vfResource, UserRoleEnum.DESIGNER, true).left()
+				.value();
+
+		// verify property
+		PropertyReqDetails newProp = ElementFactory.getDefaultStringProperty();
+		newProp.setName(newStringPropName);
+		newProp.setPropertyDefaultValue(newStringPropValue);
+		AtomicOperationUtils.addCustomPropertyToResource(newProp, vfResource, UserRoleEnum.DESIGNER, true);
+		AtomicOperationUtils.changeComponentState(vfResource, UserRoleEnum.DESIGNER, LifeCycleStatesEnum.CHECKIN, true);
+		vfResource = AtomicOperationUtils.getResourceObject(vfResource, UserRoleEnum.DESIGNER);
+
+		// Service
+		expectedPropertyList = new ArrayList<ComponentInstanceProperty>();
+		actualPropertyList = new ArrayList<ComponentInstanceProperty>();
+		expectedPropertyList = PropertyRestUtils.addComponentInstPropertiesToList(vfResource, expectedPropertyList,
+				null);
+		Service service = AtomicOperationUtils.createDefaultService(UserRoleEnum.DESIGNER, true).left().value();
+		componentInstDetails = AtomicOperationUtils
+				.addComponentInstanceToComponentContainer(vfResource, service, UserRoleEnum.DESIGNER, true).left()
+				.value();
+		service = AtomicOperationUtils.getServiceObject(service, UserRoleEnum.DESIGNER);
+		PropertyRestUtils.updatePropertyListWithPathOnComponentInstance(componentInstDetails, service,
+				expectedPropertyList);
+
+		service = AtomicOperationUtils.getServiceObject(service, UserRoleEnum.DESIGNER);
+		actualPropertyList = PropertyRestUtils.addComponentInstPropertiesToList(service, actualPropertyList, null);
+		PropertyRestUtils.comparePropertyLists(expectedPropertyList, actualPropertyList, false);
+
+		// update VF property
+		ComponentInstanceProperty expectedUpdatePropDetails = PropertyRestUtils
+				.getPropFromListByPropNameAndType(actualPropertyList, propNameToUpdate, propTypeToUpdate);
+		expectedUpdatePropDetails.setValue(updatedIntegerValue);
+		String propUniqeId = expectedUpdatePropDetails.getUniqueId();
+		RestResponse updatePropertyValueOnResourceInstance = ComponentInstanceRestUtils
+				.updatePropertyValueOnResourceInstance(service, componentInstDetails,
+						ElementFactory.getDefaultUser(UserRoleEnum.DESIGNER), expectedUpdatePropDetails);
+		assertTrue("expected updatePropertyValueOnResourceInstance response code: " + BaseRestUtils.STATUS_CODE_SUCCESS,
+				updatePropertyValueOnResourceInstance.getErrorCode() == BaseRestUtils.STATUS_CODE_SUCCESS);
+
+		service = AtomicOperationUtils.getServiceObject(service, UserRoleEnum.DESIGNER);
+		actualPropertyList = new ArrayList<>();
+		actualPropertyList = PropertyRestUtils.addComponentInstPropertiesToList(service, actualPropertyList, null);
+		ComponentInstanceProperty actualUpdatedPropDetails = PropertyRestUtils
+				.getPropFromListByPropIdAndPath(actualPropertyList, propUniqeId, null);
+		assertTrue("property was not updated propely",
+				PropertyRestUtils.comparePropertyObjects(expectedUpdatePropDetails, actualUpdatedPropDetails, true));
+
+	}
+
+	/**
+	 * update property(p3)
+	 * Service-->VF(inst)-->VF-->(VFC(inst)-->VFC-->VFC-->VFC) (p4) (p3) (p2)
+	 * (p1)
+	 */
+	@Test
+	public void serviceNestedVfResourceProperty3LevelsAndSelfVfPropertyUpdateVfInheritance3LevelProperty()
+			throws Exception {
+
+		basicVFC = createResourceWithProperty(ElementFactory.getDefaultStringProperty(), LifeCycleStatesEnum.CERTIFY);
+		vfc1FromBasicVFC = createResourceWithPropertyDerivedFromOtherResource(
+				ElementFactory.getDefaultIntegerProperty(), LifeCycleStatesEnum.CERTIFY, basicVFC);
+		vfc2FromVfc1 = AtomicOperationUtils.createResourcesByCustomNormativeTypeAndCatregory(ResourceTypeEnum.VFC,
+				vfc1FromBasicVFC, ResourceCategoryEnum.GENERIC_DATABASE, UserRoleEnum.DESIGNER, true).left().value();
+		Either<ComponentInstanceProperty, RestResponse> propDetailsToUpdate = AtomicOperationUtils
+				.addCustomPropertyToResource(ElementFactory.getDefaultBooleanProperty(), vfc2FromVfc1,
+						UserRoleEnum.DESIGNER, true);
+		String propNameToUpdate = propDetailsToUpdate.left().value().getName();
+		String propTypeToUpdate = propDetailsToUpdate.left().value().getType();
+		AtomicOperationUtils.changeComponentState(vfc2FromVfc1, UserRoleEnum.DESIGNER, LifeCycleStatesEnum.CHECKIN,
+				true);
+		vfc2FromVfc1 = AtomicOperationUtils.getResourceObject(vfc2FromVfc1, UserRoleEnum.DESIGNER);
+
+		// create VF + add RI
+		vfResource = AtomicOperationUtils.createResourceByType(ResourceTypeEnum.VF, UserRoleEnum.DESIGNER, true).left()
+				.value();
+		ComponentInstance componentInstDetails = AtomicOperationUtils
+				.addComponentInstanceToComponentContainer(vfc2FromVfc1, vfResource, UserRoleEnum.DESIGNER, true).left()
+				.value();
+		// verify property
+		PropertyReqDetails newProp = ElementFactory.getDefaultStringProperty();
+		newProp.setName(newStringPropName);
+		newProp.setPropertyDefaultValue(newStringPropValue);
+		AtomicOperationUtils.addCustomPropertyToResource(newProp, vfResource, UserRoleEnum.DESIGNER, true);
+		AtomicOperationUtils.changeComponentState(vfResource, UserRoleEnum.DESIGNER, LifeCycleStatesEnum.CHECKIN, true);
+		vfResource = AtomicOperationUtils.getResourceObject(vfResource, UserRoleEnum.DESIGNER);
+
+		// Service
+		expectedPropertyList = new ArrayList<ComponentInstanceProperty>();
+		actualPropertyList = new ArrayList<ComponentInstanceProperty>();
+		expectedPropertyList = PropertyRestUtils.addComponentInstPropertiesToList(vfResource, expectedPropertyList,
+				null);
+		Service service = AtomicOperationUtils.createDefaultService(UserRoleEnum.DESIGNER, true).left().value();
+		componentInstDetails = AtomicOperationUtils
+				.addComponentInstanceToComponentContainer(vfResource, service, UserRoleEnum.DESIGNER, true).left()
+				.value();
+		service = AtomicOperationUtils.getServiceObject(service, UserRoleEnum.DESIGNER);
+		PropertyRestUtils.updatePropertyListWithPathOnComponentInstance(componentInstDetails, service,
+				expectedPropertyList);
+
+		service = AtomicOperationUtils.getServiceObject(service, UserRoleEnum.DESIGNER);
+		actualPropertyList = PropertyRestUtils.addComponentInstPropertiesToList(service, actualPropertyList, null);
+		PropertyRestUtils.comparePropertyLists(expectedPropertyList, actualPropertyList, false);
+
+		// update VF property
+		ComponentInstanceProperty expectedUpdatePropDetails = PropertyRestUtils
+				.getPropFromListByPropNameAndType(actualPropertyList, propNameToUpdate, propTypeToUpdate);
+		expectedUpdatePropDetails.setValue(updatedBooleanValue);
+		String propUniqeId = expectedUpdatePropDetails.getUniqueId();
+		RestResponse updatePropertyValueOnResourceInstance = ComponentInstanceRestUtils
+				.updatePropertyValueOnResourceInstance(service, componentInstDetails,
+						ElementFactory.getDefaultUser(UserRoleEnum.DESIGNER), expectedUpdatePropDetails);
+		assertTrue("expected updatePropertyValueOnResourceInstance response code: " + BaseRestUtils.STATUS_CODE_SUCCESS,
+				updatePropertyValueOnResourceInstance.getErrorCode() == BaseRestUtils.STATUS_CODE_SUCCESS);
+
+		service = AtomicOperationUtils.getServiceObject(service, UserRoleEnum.DESIGNER);
+
+		actualPropertyList = new ArrayList<>();
+		actualPropertyList = PropertyRestUtils.addComponentInstPropertiesToList(service, actualPropertyList, null);
+
+		ComponentInstanceProperty actualUpdatedPropDetails = PropertyRestUtils
+				.getPropFromListByPropIdAndPath(actualPropertyList, propUniqeId, null);
+		assertTrue("property was not updated propely",
+				PropertyRestUtils.comparePropertyObjects(expectedUpdatePropDetails, actualUpdatedPropDetails, true));
+
+	}
+
+	/**
+	 * update property p5'
+	 * Service-->VF1(inst)-->VF-->(VFC(inst)-->VFC-->VFC-->VFC) (p4) (p3) (p2)
+	 * (p1) CP(inst on VF) (p5) CP(inst) (p5')
+	 */
+	@Test
+	public void serviceWithNestedResourceProperty3LevelsAndCpOnVfUpdateCpInstanceOfService() throws Exception {
+		basicVFC = createResourceWithProperty(ElementFactory.getDefaultStringProperty(), LifeCycleStatesEnum.CERTIFY);
+		vfc1FromBasicVFC = createResourceWithPropertyDerivedFromOtherResource(
+				ElementFactory.getDefaultIntegerProperty(), LifeCycleStatesEnum.CERTIFY, basicVFC);
+		vfc2FromVfc1 = createResourceWithPropertyDerivedFromOtherResource(ElementFactory.getDefaultBooleanProperty(),
+				LifeCycleStatesEnum.CHECKIN, vfc1FromBasicVFC);
+		vfc2FromVfc1 = AtomicOperationUtils.getResourceObject(vfc2FromVfc1, UserRoleEnum.DESIGNER);
+		// expectedPropertyList =
+		// PropertyRestUtils.addResourcePropertiesToList(vfc2FromVfc1,
+		// expectedPropertyList);
+
+		// four resource
+		Resource cp = AtomicOperationUtils.createResourcesByTypeNormTypeAndCatregory(ResourceTypeEnum.CP,
+				NormativeTypesEnum.NETWORK, ResourceCategoryEnum.GENERIC_ABSTRACT, UserRoleEnum.DESIGNER, true).left()
+				.value();
+		PropertyReqDetails cpStringProperty = ElementFactory.getDefaultStringProperty();
+		cpStringProperty.setName("Different Name");
+		cpStringProperty.setPropertyDefaultValue("Different value from default");
+		AtomicOperationUtils.addCustomPropertyToResource(cpStringProperty, cp, UserRoleEnum.DESIGNER, true);
+		AtomicOperationUtils.changeComponentState(cp, UserRoleEnum.DESIGNER, LifeCycleStatesEnum.CERTIFY, true);
+		cp = AtomicOperationUtils.getResourceObject(cp, UserRoleEnum.DESIGNER);
+		// create VF + add RI
+		vfResource = AtomicOperationUtils.createResourceByType(ResourceTypeEnum.VF, UserRoleEnum.DESIGNER, true).left()
+				.value();
+		ComponentInstance componentInstDetails = AtomicOperationUtils
+				.addComponentInstanceToComponentContainer(vfc2FromVfc1, vfResource, UserRoleEnum.DESIGNER, true).left()
+				.value();
+		componentInstDetails = AtomicOperationUtils
+				.addComponentInstanceToComponentContainer(cp, vfResource, UserRoleEnum.DESIGNER, true).left().value();
+		AtomicOperationUtils.changeComponentState(vfResource, UserRoleEnum.DESIGNER, LifeCycleStatesEnum.CHECKIN, true);
+		vfResource = AtomicOperationUtils.getResourceObject(vfResource, UserRoleEnum.DESIGNER);
+
+		// Service
+		expectedPropertyList = new ArrayList<ComponentInstanceProperty>();
+		actualPropertyList = new ArrayList<ComponentInstanceProperty>();
+		expectedPropertyList = PropertyRestUtils.addComponentInstPropertiesToList(vfResource, expectedPropertyList,
+				null);
+		expectedPropertyList = PropertyRestUtils.addResourcePropertiesToList(cp, expectedPropertyList);
+
+		Service service = AtomicOperationUtils.createDefaultService(UserRoleEnum.DESIGNER, true).left().value();
+		componentInstDetails = AtomicOperationUtils
+				.addComponentInstanceToComponentContainer(vfResource, service, UserRoleEnum.DESIGNER, true).left()
+				.value();
+		service = AtomicOperationUtils.getServiceObject(service, UserRoleEnum.DESIGNER);
+		PropertyRestUtils.updatePropertyListWithPathOnComponentInstance(componentInstDetails, service,
+				expectedPropertyList);
+
+		componentInstDetails = AtomicOperationUtils
+				.addComponentInstanceToComponentContainer(cp, service, UserRoleEnum.DESIGNER, true).left().value();
+		service = AtomicOperationUtils.getServiceObject(service, UserRoleEnum.DESIGNER);
+		PropertyRestUtils.updatePropertyListWithPathOnComponentInstance(componentInstDetails, service,
+				expectedPropertyList);
+
+		// service = AtomicOperationUtils.getServiceObject(service,
+		// UserRoleEnum.DESIGNER);
+		actualPropertyList = PropertyRestUtils.addComponentInstPropertiesToList(service, actualPropertyList, null);
+		PropertyRestUtils.comparePropertyLists(expectedPropertyList, actualPropertyList, false);
+
+		String propNameToUpdate = "cidr";
+		String propTypeToUpdate = "string";
+
+		// update CP property
+		ComponentInstanceProperty expectedUpdatePropDetails = PropertyRestUtils.getCompPropInstListByInstIdAndPropName(
+				service, componentInstDetails, propNameToUpdate, propTypeToUpdate);
+		expectedUpdatePropDetails.setValue(updatedStringValue);
+		String propUniqeId = expectedUpdatePropDetails.getUniqueId();
+		List<String> path = expectedUpdatePropDetails.getPath();
+		RestResponse updatePropertyValueOnResourceInstance = ComponentInstanceRestUtils
+				.updatePropertyValueOnResourceInstance(service, componentInstDetails,
+						ElementFactory.getDefaultUser(UserRoleEnum.DESIGNER), expectedUpdatePropDetails);
+		assertTrue("expected updatePropertyValueOnResourceInstance response code: " + BaseRestUtils.STATUS_CODE_SUCCESS,
+				updatePropertyValueOnResourceInstance.getErrorCode() == BaseRestUtils.STATUS_CODE_SUCCESS);
+
+		service = AtomicOperationUtils.getServiceObject(service, UserRoleEnum.DESIGNER);
+
+		actualPropertyList = new ArrayList<>();
+		actualPropertyList = PropertyRestUtils.addComponentInstPropertiesToList(service, actualPropertyList, null);
+
+		ComponentInstanceProperty actualUpdatedPropDetails = PropertyRestUtils
+				.getPropFromListByPropIdAndPath(actualPropertyList, propUniqeId, path);
+		assertTrue("property was not updated propely",
+				PropertyRestUtils.comparePropertyObjects(expectedUpdatePropDetails, actualUpdatedPropDetails, true));
+	}
+
+	/**
+	 * update property p5
+	 * Service-->VF1(inst)-->VF-->(VFC(inst)-->VFC-->VFC-->VFC) (p4) (p3) (p2)
+	 * (p1) CP(inst on VF) (p5) CP(inst) (p5')
+	 */
+	@Test
+	public void serviceWithNestedResourceProperty3LevelsAndCpOnVfUpdateCpInstanceOfVf() throws Exception {
+		basicVFC = createResourceWithProperty(ElementFactory.getDefaultStringProperty(), LifeCycleStatesEnum.CERTIFY);
+		vfc1FromBasicVFC = createResourceWithPropertyDerivedFromOtherResource(
+				ElementFactory.getDefaultIntegerProperty(), LifeCycleStatesEnum.CERTIFY, basicVFC);
+		vfc2FromVfc1 = createResourceWithPropertyDerivedFromOtherResource(ElementFactory.getDefaultBooleanProperty(),
+				LifeCycleStatesEnum.CERTIFY, vfc1FromBasicVFC);
+		vfc2FromVfc1 = AtomicOperationUtils.getResourceObject(vfc2FromVfc1, UserRoleEnum.DESIGNER);
+		// expectedPropertyList =
+		// PropertyRestUtils.addResourcePropertiesToList(vfc2FromVfc1,
+		// expectedPropertyList);
+
+		// four resource
+		Resource cp = AtomicOperationUtils.createResourcesByTypeNormTypeAndCatregory(ResourceTypeEnum.CP,
+				NormativeTypesEnum.NETWORK, ResourceCategoryEnum.GENERIC_ABSTRACT, UserRoleEnum.DESIGNER, true).left()
+				.value();
+		PropertyReqDetails cpStringProperty = ElementFactory.getDefaultStringProperty();
+		cpStringProperty.setName("Different Name");
+		cpStringProperty.setPropertyDefaultValue("Different value from default");
+		AtomicOperationUtils.addCustomPropertyToResource(cpStringProperty, cp, UserRoleEnum.DESIGNER, true);
+		AtomicOperationUtils.changeComponentState(cp, UserRoleEnum.DESIGNER, LifeCycleStatesEnum.CERTIFY, true);
+		// create VF + add RI
+		cp = AtomicOperationUtils.getResourceObject(cp, UserRoleEnum.DESIGNER);
+		vfResource = AtomicOperationUtils.createResourceByType(ResourceTypeEnum.VF, UserRoleEnum.DESIGNER, true).left()
+				.value();
+		ComponentInstance componentInstDetails = AtomicOperationUtils
+				.addComponentInstanceToComponentContainer(vfc2FromVfc1, vfResource, UserRoleEnum.DESIGNER, true).left()
+				.value();
+		componentInstDetails = AtomicOperationUtils
+				.addComponentInstanceToComponentContainer(cp, vfResource, UserRoleEnum.DESIGNER, true).left().value();
+		AtomicOperationUtils.changeComponentState(vfResource, UserRoleEnum.DESIGNER, LifeCycleStatesEnum.CHECKIN, true);
+		vfResource = AtomicOperationUtils.getResourceObject(vfResource, UserRoleEnum.DESIGNER);
+
+		// Service
+		expectedPropertyList = new ArrayList<ComponentInstanceProperty>();
+		actualPropertyList = new ArrayList<ComponentInstanceProperty>();
+		expectedPropertyList = PropertyRestUtils.addComponentInstPropertiesToList(vfResource, expectedPropertyList,
+				null);
+		expectedPropertyList = PropertyRestUtils.addResourcePropertiesToList(cp, expectedPropertyList);
+
+		Service service = AtomicOperationUtils.createDefaultService(UserRoleEnum.DESIGNER, true).left().value();
+		componentInstDetails = AtomicOperationUtils
+				.addComponentInstanceToComponentContainer(vfResource, service, UserRoleEnum.DESIGNER, true).left()
+				.value();
+		service = AtomicOperationUtils.getServiceObject(service, UserRoleEnum.DESIGNER);
+		PropertyRestUtils.updatePropertyListWithPathOnComponentInstance(componentInstDetails, service,
+				expectedPropertyList);
+
+		componentInstDetails = AtomicOperationUtils
+				.addComponentInstanceToComponentContainer(cp, service, UserRoleEnum.DESIGNER, true).left().value();
+		service = AtomicOperationUtils.getServiceObject(service, UserRoleEnum.DESIGNER);
+		PropertyRestUtils.updatePropertyListWithPathOnComponentInstance(componentInstDetails, service,
+				expectedPropertyList);
+
+		service = AtomicOperationUtils.getServiceObject(service, UserRoleEnum.DESIGNER);
+		actualPropertyList = PropertyRestUtils.addComponentInstPropertiesToList(service, actualPropertyList, null);
+		PropertyRestUtils.comparePropertyLists(expectedPropertyList, actualPropertyList, false);
+
+		String propNameToUpdate = "cidr";
+		String propTypeToUpdate = "string";
+
+		// update CP property
+		ComponentInstanceProperty expectedUpdatePropDetails = PropertyRestUtils.getCompPropInstListByInstIdAndPropName(
+				service, componentInstDetails, propNameToUpdate, propTypeToUpdate);
+		expectedUpdatePropDetails.setValue(updatedStringValue);
+		String propUniqeId = expectedUpdatePropDetails.getUniqueId();
+		List<String> path = expectedUpdatePropDetails.getPath();
+		RestResponse updatePropertyValueOnResourceInstance = ComponentInstanceRestUtils
+				.updatePropertyValueOnResourceInstance(service, componentInstDetails,
+						ElementFactory.getDefaultUser(UserRoleEnum.DESIGNER), expectedUpdatePropDetails);
+		assertTrue("expected updatePropertyValueOnResourceInstance response code: " + BaseRestUtils.STATUS_CODE_SUCCESS,
+				updatePropertyValueOnResourceInstance.getErrorCode() == BaseRestUtils.STATUS_CODE_SUCCESS);
+
+		service = AtomicOperationUtils.getServiceObject(service, UserRoleEnum.DESIGNER);
+
+		actualPropertyList = new ArrayList<>();
+		actualPropertyList = PropertyRestUtils.addComponentInstPropertiesToList(service, actualPropertyList, null);
+
+		ComponentInstanceProperty actualUpdatedPropDetails = PropertyRestUtils
+				.getPropFromListByPropIdAndPath(actualPropertyList, propUniqeId, path);
+		assertTrue("property was not updated propely",
+				PropertyRestUtils.comparePropertyObjects(expectedUpdatePropDetails, actualUpdatedPropDetails, true));
+	}
+
+	// -------------------Methods--------------------------
+	public static PropertyDataDefinition convertToPropertyDataDefinitionObject(PropertyReqDetails prop) {
+		PropertyDataDefinition propDataDef = new PropertyDataDefinition();
+		propDataDef.setDefaultValue(prop.getPropertyDefaultValue());
+		propDataDef.setType(prop.getPropertyType());
+		propDataDef.setPassword(prop.getPropertyPassword());
+		propDataDef.setDescription(prop.getPropertyDescription());
+		return propDataDef;
+	}
+
+	protected Resource createResourceWithPropertyDerivedFromOtherResource(PropertyReqDetails propertyReqDetails,
+			LifeCycleStatesEnum state, Resource derivedFromResource) throws Exception {
+		Resource resource = AtomicOperationUtils.createResourcesByCustomNormativeTypeAndCatregory(ResourceTypeEnum.VFC,
+				derivedFromResource, ResourceCategoryEnum.APPLICATION_L4_BORDER, UserRoleEnum.DESIGNER, true).left()
+				.value();
+		if (propertyReqDetails != null) {
+			AtomicOperationUtils.addCustomPropertyToResource(propertyReqDetails, resource, UserRoleEnum.DESIGNER, true);
+		}
+		AtomicOperationUtils.changeComponentState(resource, UserRoleEnum.DESIGNER, state, true);
+		return AtomicOperationUtils.getResourceObject(resource, UserRoleEnum.DESIGNER);
+		// return resource;
+	}
+
+	protected Resource createResourceWithProperty(PropertyReqDetails propertyReqDetails, LifeCycleStatesEnum state)
+			throws Exception {
+		Resource resource = AtomicOperationUtils.createResourcesByTypeNormTypeAndCatregory(ResourceTypeEnum.VFC,
+				NormativeTypesEnum.ROOT, ResourceCategoryEnum.GENERIC_ABSTRACT, UserRoleEnum.DESIGNER, true).left()
+				.value();
+		if (propertyReqDetails != null) {
+			AtomicOperationUtils.addCustomPropertyToResource(propertyReqDetails, resource, UserRoleEnum.DESIGNER, true);
+		}
+		AtomicOperationUtils.changeComponentState(resource, UserRoleEnum.DESIGNER, state, true);
+		return AtomicOperationUtils.getResourceObject(resource, UserRoleEnum.DESIGNER);
+	}
+
+}
diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/execute/property/PropertyApisTest.java b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/execute/property/PropertyApisTest.java
new file mode 100644
index 0000000000..a705db7729
--- /dev/null
+++ b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/execute/property/PropertyApisTest.java
@@ -0,0 +1,367 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * SDC
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.sdc.ci.tests.execute.property;
+
+import static org.testng.AssertJUnit.assertTrue;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.databind.DeserializationFeature;
+import com.fasterxml.jackson.databind.ObjectMapper;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.json.simple.JSONObject;
+import org.json.simple.JSONValue;
+import org.junit.Rule;
+import org.junit.rules.TestName;
+import org.openecomp.sdc.be.dao.api.ActionStatus;
+import org.openecomp.sdc.be.model.User;
+import org.openecomp.sdc.be.model.operations.impl.UniqueIdBuilder;
+import org.openecomp.sdc.ci.tests.api.Urls;
+import org.openecomp.sdc.ci.tests.config.Config;
+import org.openecomp.sdc.ci.tests.datatypes.PropertyReqDetails;
+import org.openecomp.sdc.ci.tests.datatypes.ResourceReqDetails;
+import org.openecomp.sdc.ci.tests.datatypes.enums.ResourceCategoryEnum;
+import org.openecomp.sdc.ci.tests.datatypes.enums.UserRoleEnum;
+import org.openecomp.sdc.ci.tests.datatypes.http.HttpHeaderEnum;
+import org.openecomp.sdc.ci.tests.datatypes.http.HttpRequest;
+import org.openecomp.sdc.ci.tests.datatypes.http.RestResponse;
+import org.openecomp.sdc.ci.tests.preRequisites.SimpleOneRsrcOneServiceTest;
+import org.openecomp.sdc.ci.tests.utils.general.ElementFactory;
+import org.openecomp.sdc.ci.tests.utils.rest.PropertyRestUtils;
+import org.openecomp.sdc.ci.tests.utils.rest.ResourceRestUtils;
+import org.openecomp.sdc.ci.tests.utils.rest.ResponseParser;
+import org.openecomp.sdc.ci.tests.utils.rest.UserRestUtils;
+import org.openecomp.sdc.ci.tests.utils.validation.ErrorValidationUtils;
+import org.testng.AssertJUnit;
+import org.testng.annotations.BeforeMethod;
+import org.testng.annotations.Test;
+
+public class PropertyApisTest extends SimpleOneRsrcOneServiceTest {
+
+	protected static final String RESOURCE_CATEGORY = "Generic/Databases";
+	protected Config config = Config.instance();
+	protected String contentTypeHeaderData = "application/json";
+	protected String acceptHeaderDate = "application/json";;
+	protected PropertyReqDetails property;
+	protected String body;
+
+	protected HttpRequest httpRequest = new HttpRequest();
+	protected Map<String, String> headersMap = new HashMap<String, String>();
+
+	@Rule
+	public static TestName testName = new TestName();
+
+	public PropertyApisTest() {
+		super();
+	}
+
+	@BeforeMethod
+	public void init() throws Exception {
+		property = ElementFactory.getDefaultProperty();
+		body = property.propertyToJsonString();
+		headersMap.put(HttpHeaderEnum.CONTENT_TYPE.getValue(), contentTypeHeaderData);
+		headersMap.put(HttpHeaderEnum.ACCEPT.getValue(), acceptHeaderDate);
+		headersMap.put(HttpHeaderEnum.USER_ID.getValue(), sdncDesignerDetails.getUserId());
+
+	}
+
+	@Test
+	public void validateValidValueConstraintFailTest() throws Exception {
+		body = "{\"SubnetProp\": {\"schema\": {\"property\": {\"type\": \"\"}},\"type\": \"org.openecomp.datatypes.heat.network.neutron.Subnet\",\"name\": \"SubnetProp\"}}";
+		RestResponse createPropertyResponse = PropertyRestUtils.createProperty(getResourceId(resourceDetails), body,
+				sdncDesignerDetails);
+		AssertJUnit.assertEquals("Expected result code - 200, received - " + createPropertyResponse.getErrorCode(), 200,
+				(int) createPropertyResponse.getErrorCode());
+
+		ObjectMapper mapper = new ObjectMapper();
+		mapper.setSerializationInclusion(JsonInclude.Include.NON_NULL);
+		mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
+		try {
+			PropertyReqDetails propertyResponseObject = mapper.readValue(createPropertyResponse.getResponse(),
+					PropertyReqDetails.class);
+
+			PropertyReqDetails propertyReqDetails = new PropertyReqDetails();
+			propertyReqDetails.setPropertyType("org.openecomp.datatypes.heat.network.neutron.Subnet");
+			propertyReqDetails.setName(propertyResponseObject.getName());
+			propertyReqDetails.setValue(mapper.writeValueAsString(Collections.singletonMap("ipv6_address_mode", "Fail")));
+			propertyReqDetails.setParentUniqueId(propertyResponseObject.getParentUniqueId());
+			propertyReqDetails.setUniqueId(propertyResponseObject.getUniqueId());
+
+			body = mapper.writerWithDefaultPrettyPrinter().writeValueAsString(Collections.singletonList(propertyReqDetails));
+			body = body.replace("propertyType", "type");
+			RestResponse addValueToPropertyResponse =
+					PropertyRestUtils.addValueToProperty(getResourceId(resourceDetails), body, sdncDesignerDetails);
+
+			AssertJUnit.assertEquals("Expected result code - 400, received - " + addValueToPropertyResponse.getErrorCode(),
+					400, (int) addValueToPropertyResponse.getErrorCode());
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
+	}
+
+	@Test
+	public void validateValidValueConstraintSuccessTest() throws Exception {
+		body = "{\"SubnetProp\": {\"schema\": {\"property\": {\"type\": \"\"}},\"type\": \"org.openecomp.datatypes.heat.network.neutron.Subnet\",\"name\": \"SubnetProp\"}}";
+		RestResponse createPropertyResponse = PropertyRestUtils.createProperty(getResourceId(resourceDetails), body,
+				sdncDesignerDetails);
+		AssertJUnit.assertEquals("Expected result code - 201, received - " + createPropertyResponse.getErrorCode(), 200,
+				(int) createPropertyResponse.getErrorCode());
+
+		ObjectMapper mapper = new ObjectMapper();
+		mapper.setSerializationInclusion(JsonInclude.Include.NON_NULL);
+		mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
+		try {
+			PropertyReqDetails propertyResponseObject = mapper.readValue(createPropertyResponse.getResponse(),
+					PropertyReqDetails.class);
+
+			PropertyReqDetails propertyReqDetails = new PropertyReqDetails();
+			propertyReqDetails.setPropertyType("org.openecomp.datatypes.heat.network.neutron.Subnet");
+			propertyReqDetails.setName(propertyResponseObject.getName());
+			propertyReqDetails.setValue(mapper.writeValueAsString(Collections.singletonMap("ipv6_address_mode", "slaac")));
+			propertyReqDetails.setParentUniqueId(propertyResponseObject.getParentUniqueId());
+			propertyReqDetails.setUniqueId(propertyResponseObject.getUniqueId());
+
+			body = mapper.writerWithDefaultPrettyPrinter().writeValueAsString(Collections.singletonList(propertyReqDetails));
+			body = body.replace("propertyType", "type");
+			RestResponse addValueToPropertyResponse =
+					PropertyRestUtils.addValueToProperty(getResourceId(resourceDetails), body, sdncDesignerDetails);
+
+			AssertJUnit.assertEquals("Expected result code - 200, received - " + addValueToPropertyResponse.getErrorCode(),
+					200, (int) addValueToPropertyResponse.getErrorCode());
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
+	}
+
+	@Test
+	public void testPropertyApis() throws Exception {
+		String propertyId = UniqueIdBuilder.buildComponentPropertyUniqueId(getResourceId(resourceDetails), property.getName());
+
+		PropertyRestUtils.deleteProperty(getResourceId(resourceDetails), propertyId, sdncDesignerDetails);
+		RestResponse createPropertyResponse = PropertyRestUtils.createProperty(getResourceId(resourceDetails), body,
+				sdncDesignerDetails);
+		AssertJUnit.assertTrue("Expected result code - 201, received - " + createPropertyResponse.getErrorCode(),
+				createPropertyResponse.getErrorCode() == 201);
+
+		// Get property
+		RestResponse getPropertyResponse = PropertyRestUtils.getProperty(getResourceId(resourceDetails), propertyId,
+				sdncDesignerDetails);
+		AssertJUnit.assertTrue("Expected result code - 200, received - " + getPropertyResponse.getErrorCode(),
+				getPropertyResponse.getErrorCode() == 200);
+
+		JSONObject jsonResp = (JSONObject) JSONValue.parse(getPropertyResponse.getResponse());
+
+		// Update property
+		property.setPropertyDescription("Updated description");
+		body = property.propertyToJsonString();
+
+		RestResponse updatePropertyResponse = PropertyRestUtils.updateProperty(getResourceId(resourceDetails),
+				propertyId, body, sdncDesignerDetails);
+		AssertJUnit.assertTrue("Expected result code - 200, received - " + updatePropertyResponse.getErrorCode(),
+				updatePropertyResponse.getErrorCode() == 200);
+
+		// Get property
+		getPropertyResponse = PropertyRestUtils.getProperty(getResourceId(resourceDetails), propertyId,
+				sdncDesignerDetails);
+		AssertJUnit.assertTrue("Expected result code - 200, received - " + getPropertyResponse.getErrorCode(),
+				getPropertyResponse.getErrorCode() == 200);
+
+		jsonResp = (JSONObject) JSONValue.parse(getPropertyResponse.getResponse());
+
+		// Delete property
+		RestResponse deletePropertyResponse = PropertyRestUtils.deleteProperty(getResourceId(resourceDetails),
+				propertyId, sdncDesignerDetails);
+		AssertJUnit.assertTrue("Expected result code - 204, received - " + deletePropertyResponse.getErrorCode(),
+				deletePropertyResponse.getErrorCode() == 204);
+
+		// Get property - verify that the property doesn't exist.
+		getPropertyResponse = PropertyRestUtils.getProperty(getResourceId(resourceDetails), propertyId,
+				sdncDesignerDetails);
+		List<String> variables = Arrays.asList("");
+		ErrorValidationUtils.checkBodyResponseOnError(ActionStatus.PROPERTY_NOT_FOUND.name(), variables,
+				getPropertyResponse.getResponse());
+
+	}
+
+	// --------------------------------------------------------------------------------------
+
+	protected String getPropertyId(ResourceReqDetails resource, PropertyReqDetails property) {
+		return UniqueIdBuilder.buildComponentPropertyUniqueId(resource.getUniqueId(), property.getName());
+	}
+
+	protected String getResourceId(ResourceReqDetails resource) {
+		return resource.getUniqueId();
+	}
+
+	protected User createUser(String cspUserId, String firstName, String lastName, String email, String role)
+			throws Exception {
+		User sdncUserDetails = new User(firstName, lastName, cspUserId, email, role, null);
+
+		User adminUser = ElementFactory.getDefaultUser(UserRoleEnum.ADMIN);
+		UserRestUtils.createUser(sdncUserDetails, adminUser);
+
+		return sdncUserDetails;
+	}
+
+	protected ResourceReqDetails createResource(User sdncUserDetails, String resourceName) throws Exception {
+		String description = "description";
+		ArrayList<String> resourceTags = new ArrayList<String>();
+		resourceTags.add(resourceName);
+		ArrayList<String> derivedFrom = new ArrayList<String>();
+		derivedFrom.add("tosca.nodes.Root");
+		String vendorName = "Oracle";
+		String vendorRelease = "1.0";
+		String contactId = sdncUserDetails.getUserId();
+		String icon = "myICON";
+
+		ResourceReqDetails resourceDetails = new ResourceReqDetails(resourceName, description, resourceTags, null,
+				derivedFrom, vendorName, vendorRelease, contactId, icon);
+		resourceDetails.addCategoryChain(ResourceCategoryEnum.GENERIC_DATABASE.getCategory(),
+				ResourceCategoryEnum.GENERIC_DATABASE.getSubCategory());
+		// TODO delete by name
+		// deleteResource(UniqueIdBuilder.buildResourceUniqueId(resourceName,
+		// "0.1"), sdncUserDetails.getUserId());
+		RestResponse createResource = ResourceRestUtils.createResource(resourceDetails, sdncUserDetails);
+		AssertJUnit.assertTrue(createResource.getErrorCode().intValue() == 201);
+		String resourceId = ResponseParser.getUniqueIdFromResponse(createResource);
+		resourceDetails.setUniqueId(resourceId);
+
+		return resourceDetails;
+
+	}
+
+	@Test
+	public void putReqToCreateUriNotAllowed() throws Exception {
+		String url = String.format(Urls.CREATE_PROPERTY, config.getCatalogBeHost(), config.getCatalogBePort(),
+				getResourceId(resourceDetails));
+		RestResponse propertyErrorResponse = httpRequest.httpSendByMethod(url, "PUT", body, headersMap);
+		List<String> variables = Arrays.asList();
+		ErrorValidationUtils.checkBodyResponseOnError(ActionStatus.NOT_ALLOWED.name(), variables,
+				propertyErrorResponse.getResponse());
+	}
+
+	@Test
+	public void getReqToCreateUriNotAllowed() throws Exception {
+		String url = String.format(Urls.CREATE_PROPERTY, config.getCatalogBeHost(), config.getCatalogBePort(),
+				getResourceId(resourceDetails));
+		RestResponse propertyErrorResponse = httpRequest.httpSendGet(url, headersMap);
+		List<String> variables = Arrays.asList();
+		ErrorValidationUtils.checkBodyResponseOnError(ActionStatus.NOT_ALLOWED.name(), variables,
+				propertyErrorResponse.getResponse());
+	}
+
+	@Test
+	public void deleteReqToCreateUriNotAllowed() throws Exception {
+		String url = String.format(Urls.CREATE_PROPERTY, config.getCatalogBeHost(), config.getCatalogBePort(),
+				getResourceId(resourceDetails));
+		RestResponse propertyErrorResponse = httpRequest.httpSendDelete(url, headersMap);
+		List<String> variables = Arrays.asList();
+		ErrorValidationUtils.checkBodyResponseOnError(ActionStatus.NOT_ALLOWED.name(), variables,
+				propertyErrorResponse.getResponse());
+	}
+
+	@Test
+	public void postReqToUpdateUriNotAllowed() throws Exception {
+		String url = String.format(Urls.UPDATE_PROPERTY, config.getCatalogBeHost(), config.getCatalogBePort(),
+				getResourceId(resourceDetails), getPropertyId(resourceDetails, property));
+		RestResponse propertyErrorResponse = httpRequest.httpSendPost(url, body, headersMap);
+		List<String> variables = Arrays.asList();
+		ErrorValidationUtils.checkBodyResponseOnError(ActionStatus.NOT_ALLOWED.name(), variables,
+				propertyErrorResponse.getResponse());
+	}
+
+	@Test
+	public void deleteReqPropertyNotFound() throws Exception {
+		String unknownPropertyId = getPropertyId(resourceDetails, property) + "111";
+		String url = String.format(Urls.DELETE_PROPERTY, config.getCatalogBeHost(), config.getCatalogBePort(),
+				getResourceId(resourceDetails), unknownPropertyId);
+		RestResponse propertyErrorResponse = httpRequest.httpSendDelete(url, headersMap);
+		List<String> variables = Arrays.asList("");
+		ErrorValidationUtils.checkBodyResponseOnError(ActionStatus.PROPERTY_NOT_FOUND.name(), variables,
+				propertyErrorResponse.getResponse());
+	}
+
+	@Test
+	public void updateReqPropertyNotFound() throws Exception {
+		String unknownPropertyId = getPropertyId(resourceDetails, property) + "111";
+		String url = String.format(Urls.UPDATE_PROPERTY, config.getCatalogBeHost(), config.getCatalogBePort(),
+				getResourceId(resourceDetails), unknownPropertyId);
+		RestResponse propertyErrorResponse = httpRequest.httpSendByMethod(url, "PUT", body, headersMap);
+		List<String> variables = Arrays.asList("");
+		ErrorValidationUtils.checkBodyResponseOnError(ActionStatus.PROPERTY_NOT_FOUND.name(), variables,
+				propertyErrorResponse.getResponse());
+	}
+
+	@Test
+	public void modifierNotTheStateOwner() throws Exception {
+		// Operation Not Allowed ----");
+		User sdncUserDetails2 = createUser("tu5555", "Test", "User", "tu5555@intl.sdc.com", "DESIGNER");
+		headersMap.put(HttpHeaderEnum.USER_ID.getValue(), sdncUserDetails2.getUserId());
+		property.setPropertyDescription("new description");
+		body = property.propertyToJsonString();
+		String url = String.format(Urls.UPDATE_PROPERTY, config.getCatalogBeHost(), config.getCatalogBePort(),
+				getResourceId(resourceDetails), getPropertyId(resourceDetails, property));
+		RestResponse propertyErrorResponse = httpRequest.httpSendByMethod(url, "PUT", body, headersMap);
+		List<String> variables = Arrays.asList();
+		ErrorValidationUtils.checkBodyResponseOnError(ActionStatus.RESTRICTED_OPERATION.name(), variables,
+				propertyErrorResponse.getResponse());
+
+	}
+
+	@Test
+	public void postReqInvalidContent() throws Exception {
+		body = "invalid";
+		String url = String.format(Urls.CREATE_PROPERTY, config.getCatalogBeHost(), config.getCatalogBePort(),
+				getResourceId(resourceDetails), getPropertyId(resourceDetails, property));
+		RestResponse propertyErrorResponse = httpRequest.httpSendPost(url, body, headersMap);
+
+		List<String> variables = Arrays.asList();
+		ErrorValidationUtils.checkBodyResponseOnError(ActionStatus.INVALID_CONTENT.name(), variables,
+				propertyErrorResponse.getResponse());
+	}
+
+	@Test
+	public void putReqInvalidContent() throws Exception {
+
+		// Create property
+		RestResponse createPropertyResponse = PropertyRestUtils.createProperty(getResourceId(resourceDetails), body,
+				sdncDesignerDetails);
+		assertTrue("Expected result code - 201, received - " + createPropertyResponse.getErrorCode(),
+				createPropertyResponse.getErrorCode() == 201);
+
+		body = "invalid";
+
+		String url = String.format(Urls.UPDATE_PROPERTY, config.getCatalogBeHost(), config.getCatalogBePort(),
+				getResourceId(resourceDetails), getPropertyId(resourceDetails, property));
+
+		RestResponse propertyErrorResponse = httpRequest.httpSendByMethod(url, "PUT", body, headersMap);
+
+		List<String> variables = Arrays.asList();
+		ErrorValidationUtils.checkBodyResponseOnError(ActionStatus.INVALID_CONTENT.name(), variables,
+				propertyErrorResponse.getResponse());
+	}
+}
diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/execute/resource/CheckGetResource.java b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/execute/resource/CheckGetResource.java
new file mode 100644
index 0000000000..6bae08b2bd
--- /dev/null
+++ b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/execute/resource/CheckGetResource.java
@@ -0,0 +1,51 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * SDC
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.sdc.ci.tests.execute.resource;
+
+import fj.data.Either;
+import org.openecomp.sdc.be.model.Resource;
+import org.openecomp.sdc.ci.tests.datatypes.http.RestResponse;
+import org.openecomp.sdc.ci.tests.utils.rest.ResourceRestUtils;
+import org.openecomp.sdc.ci.tests.utils.rest.ResponseParser;
+import org.openecomp.sdc.common.util.SerializationUtils;
+
+public class CheckGetResource {
+
+	public void checkGetVmmsc6() throws Exception {
+
+		try {
+
+			System.out.println("dddd");
+			RestResponse getResource = ResourceRestUtils.getResource("96eb6583-2822-448b-a284-bfc144fa627e");
+
+			Resource resource = ResponseParser.parseToObjectUsingMapper(getResource.getResponse(), Resource.class);
+
+			Either<byte[], Boolean> serialize = SerializationUtils.serializeExt(resource);
+
+			SerializationUtils.deserializeExt(serialize.left().value(), Resource.class, "ffff");
+
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
+
+	}
+
+}
diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/execute/resource/CreateResourceApiTest.java b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/execute/resource/CreateResourceApiTest.java
new file mode 100644
index 0000000000..2e6c9f9532
--- /dev/null
+++ b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/execute/resource/CreateResourceApiTest.java
@@ -0,0 +1,2190 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * SDC
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.sdc.ci.tests.execute.resource;
+
+import com.google.gson.Gson;
+import org.junit.Rule;
+import org.junit.rules.TestName;
+import org.openecomp.sdc.be.dao.api.ActionStatus;
+import org.openecomp.sdc.be.datatypes.enums.ComponentTypeEnum;
+import org.openecomp.sdc.be.datatypes.enums.ResourceTypeEnum;
+import org.openecomp.sdc.be.model.LifecycleStateEnum;
+import org.openecomp.sdc.be.model.Resource;
+import org.openecomp.sdc.be.model.User;
+import org.openecomp.sdc.ci.tests.api.ComponentBaseTest;
+import org.openecomp.sdc.ci.tests.api.Urls;
+import org.openecomp.sdc.ci.tests.config.Config;
+import org.openecomp.sdc.ci.tests.datatypes.*;
+import org.openecomp.sdc.ci.tests.datatypes.enums.*;
+import org.openecomp.sdc.ci.tests.datatypes.expected.ExpectedResourceAuditJavaObject;
+import org.openecomp.sdc.ci.tests.datatypes.http.HttpHeaderEnum;
+import org.openecomp.sdc.ci.tests.datatypes.http.HttpRequest;
+import org.openecomp.sdc.ci.tests.datatypes.http.RestResponse;
+import org.openecomp.sdc.ci.tests.utils.DbUtils;
+import org.openecomp.sdc.ci.tests.utils.Utils;
+import org.openecomp.sdc.ci.tests.utils.general.Convertor;
+import org.openecomp.sdc.ci.tests.utils.general.ElementFactory;
+import org.openecomp.sdc.ci.tests.utils.rest.*;
+import org.openecomp.sdc.ci.tests.utils.validation.AuditValidationUtils;
+import org.openecomp.sdc.ci.tests.utils.validation.ErrorValidationUtils;
+import org.openecomp.sdc.ci.tests.utils.validation.ResourceValidationUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.testng.annotations.Test;
+
+import java.util.*;
+
+import static org.openecomp.sdc.ci.tests.utils.rest.BaseRestUtils.STATUS_CODE_SUCCESS;
+import static org.testng.AssertJUnit.assertEquals;
+import static org.testng.AssertJUnit.assertNotNull;
+
+/**
+ * @author yshlosberg
+ * 
+ */
+public class CreateResourceApiTest extends ComponentBaseTest {
+
+	private static Logger log = LoggerFactory.getLogger(CreateResourceApiTest.class.getName());
+
+	String contentTypeHeaderData = "application/json";
+	String acceptHeaderDate = "application/json";
+	String resourceVersion = "0.1";
+
+	@Rule
+	public static TestName name = new TestName();
+
+	@Test
+	public void createResourceTest() throws Exception {
+
+		// init ADMIN user
+		User sdncModifierDetails = ElementFactory.getDefaultUser(UserRoleEnum.ADMIN);
+
+		// ResourceReqDetails resourceDetails = new
+		// ResourceReqDetails(resourceName, description, resourceTags, category,
+		// derivedFrom, vendorName, vendorRelease, contactId, icon);
+		ResourceReqDetails resourceDetails = ElementFactory.getDefaultResource();
+		String resourceName = resourceDetails.getName();
+		resourceDetails.setTags(Arrays.asList(resourceName, resourceName, resourceName, resourceName, "tag2", "tag2"));
+		// create resource
+		RestResponse createResponse = ResourceRestUtils.createResource(resourceDetails, sdncModifierDetails);
+
+		// validate response
+		assertNotNull("check response object is not null after create resource", createResponse);
+		assertNotNull("check error code exists in response after create resource", createResponse.getErrorCode());
+		assertEquals("Check response code after create resource", 201, createResponse.getErrorCode().intValue());
+
+		// validate response
+		ResourceRespJavaObject resourceRespJavaObject = Convertor.constructFieldsForRespValidation(resourceDetails,
+				resourceVersion);
+		resourceRespJavaObject.setLifecycleState((LifecycleStateEnum.NOT_CERTIFIED_CHECKOUT).toString());
+		resourceRespJavaObject.setAbstractt("false");
+		ResourceValidationUtils.validateResp(createResponse, resourceRespJavaObject);
+
+		// validate get response
+		RestResponse resourceGetResponse = ResourceRestUtils.getResource(sdncModifierDetails,
+				resourceDetails.getUniqueId());
+		ResourceValidationUtils.validateResp(resourceGetResponse, resourceRespJavaObject);
+
+		// validate audit
+		ExpectedResourceAuditJavaObject expectedResourceAuditJavaObject = Convertor
+				.constructFieldsForAuditValidation(resourceDetails, resourceVersion);
+		String auditAction = "Create";
+		expectedResourceAuditJavaObject.setAction(auditAction);
+		expectedResourceAuditJavaObject.setPrevVersion("");
+		expectedResourceAuditJavaObject.setPrevState("");
+		expectedResourceAuditJavaObject.setStatus("201");
+		expectedResourceAuditJavaObject.setDesc("OK");
+
+		AuditValidationUtils.validateAudit(expectedResourceAuditJavaObject, auditAction, null, false);
+	}
+
+	@Test
+	public void createResourceNonDefaultResourceTypeTest() throws Exception {
+
+		// init ADMIN user
+		User sdncModifierDetails = ElementFactory.getDefaultUser(UserRoleEnum.ADMIN);
+
+		ResourceReqDetails resourceDetails = ElementFactory.getDefaultResource();
+		String resourceType = ResourceTypeEnum.CP.toString();
+		resourceDetails.setResourceType(resourceType);
+		// create resource
+		RestResponse createResponse = ResourceRestUtils.createResource(resourceDetails, sdncModifierDetails);
+
+		// validate response
+		assertNotNull("check response object is not null after create resource", createResponse);
+		assertNotNull("check error code exists in response after create resource", createResponse.getErrorCode());
+		assertEquals("Check response code after create resource", 201, createResponse.getErrorCode().intValue());
+
+		// validate response
+		ResourceRespJavaObject resourceRespJavaObject = Convertor.constructFieldsForRespValidation(resourceDetails,
+				resourceVersion);
+		resourceRespJavaObject.setLifecycleState((LifecycleStateEnum.NOT_CERTIFIED_CHECKOUT).toString());
+		resourceRespJavaObject.setAbstractt("false");
+		resourceRespJavaObject.setResourceType(resourceType);
+		ResourceValidationUtils.validateResp(createResponse, resourceRespJavaObject);
+
+		// validate get response
+		RestResponse resourceGetResponse = ResourceRestUtils.getResource(sdncModifierDetails,
+				resourceDetails.getUniqueId());
+		ResourceValidationUtils.validateResp(resourceGetResponse, resourceRespJavaObject);
+
+		// validate audit
+		ExpectedResourceAuditJavaObject expectedResourceAuditJavaObject = Convertor
+				.constructFieldsForAuditValidation(resourceDetails, resourceVersion);
+		String auditAction = "Create";
+		expectedResourceAuditJavaObject.setAction(auditAction);
+		expectedResourceAuditJavaObject.setPrevVersion("");
+		expectedResourceAuditJavaObject.setPrevState("");
+		expectedResourceAuditJavaObject.setStatus("201");
+		expectedResourceAuditJavaObject.setDesc("OK");
+
+		AuditValidationUtils.validateAudit(expectedResourceAuditJavaObject, auditAction, null, false);
+	}
+
+	@Test
+	public void createResourceTest_costAndLicenseType() throws Exception {
+
+		// init ADMIN user
+
+		User sdncModifierDetails = ElementFactory.getDefaultUser(UserRoleEnum.ADMIN);
+
+		// set resource details
+		String resourceName = "CISCO4572";
+		String description = "description";
+		// Duplicate tags are allowed and should be de-duplicated by the server
+		// side
+		ArrayList<String> resourceTags = new ArrayList<String>();
+		resourceTags.add(resourceName);
+		resourceTags.add(resourceName);
+		resourceTags.add(resourceName);
+		resourceTags.add("tag2");
+		resourceTags.add("tag2");
+		String category = ServiceCategoriesEnum.VOIP.getValue();
+		ArrayList<String> derivedFrom = new ArrayList<String>();
+		derivedFrom.add(NormativeTypesEnum.ROOT.getNormativeName());
+		String vendorName = "Oracle";
+		String vendorRelease = "1.5";
+		String contactId = "jh0003";
+		String icon = "myICON";
+
+		ResourceReqDetails resourceDetails = new ResourceReqDetails(resourceName, description, resourceTags, category,
+				derivedFrom, vendorName, vendorRelease, contactId, icon);
+		// Adding cost and licenseType
+		resourceDetails.setCost("12355.345");
+		resourceDetails.setLicenseType("User");
+
+		// create resource
+		RestResponse createResponse = ResourceRestUtils.createResource(resourceDetails, sdncModifierDetails);
+
+		// validate response
+		assertNotNull("check response object is not null after create resource", createResponse);
+		assertNotNull("check error code exists in response after create resource", createResponse.getErrorCode());
+		assertEquals("Check response code after create resource", 201, createResponse.getErrorCode().intValue());
+
+		// validate response
+		String resourceVersion = "0.1";
+		ResourceRespJavaObject resourceRespJavaObject = Convertor.constructFieldsForRespValidation(resourceDetails,
+				resourceVersion);
+		resourceRespJavaObject.setLifecycleState((LifecycleStateEnum.NOT_CERTIFIED_CHECKOUT).toString());
+		resourceRespJavaObject.setAbstractt("false");
+		ResourceValidationUtils.validateResp(createResponse, resourceRespJavaObject);
+
+		// validate get response
+
+		RestResponse resourceGetResponse = ResourceRestUtils.getResource(sdncModifierDetails,
+				resourceDetails.getUniqueId());
+		ResourceValidationUtils.validateResp(resourceGetResponse, resourceRespJavaObject);
+
+	}
+
+	// ////Benny
+	@Test
+	public void createResourceTest_CostIsMissing() throws Exception {
+
+		User sdncModifierDetails = ElementFactory.getDefaultUser(UserRoleEnum.ADMIN);
+		// set resource details
+		String resourceName = "CISCO4572";
+		String description = "description";
+		// Duplicate tags are allowed and should be de-duplicated by the server
+		// side
+		ArrayList<String> resourceTags = new ArrayList<String>();
+		resourceTags.add(resourceName);
+		resourceTags.add(resourceName);
+		resourceTags.add(resourceName);
+		resourceTags.add("tag2");
+		resourceTags.add("tag2");
+		String category = ServiceCategoriesEnum.VOIP.getValue();
+		ArrayList<String> derivedFrom = new ArrayList<String>();
+		derivedFrom.add(NormativeTypesEnum.ROOT.getNormativeName());
+		String vendorName = "Oracle";
+		String vendorRelease = "1.5";
+		String contactId = "jh0003";
+		String icon = "myICON";
+
+		ResourceReqDetails resourceDetails = new ResourceReqDetails(resourceName, description, resourceTags, category,
+				derivedFrom, vendorName, vendorRelease, contactId, icon);
+		// Adding cost and licenseType
+		// resourceDetails.setCost("12355.345");
+		resourceDetails.setLicenseType("User");
+
+		// create resource
+		RestResponse createResponse = ResourceRestUtils.createResource(resourceDetails, sdncModifierDetails);
+		assertNotNull("check response object is not null after create resource", createResponse);
+		assertNotNull("check error code exists in response after create resource", createResponse.getErrorCode());
+		assertEquals("Check response code after create resource", 201, createResponse.getErrorCode().intValue());
+
+		// validate response
+		String resourceVersion = "0.1";
+		ResourceRespJavaObject resourceRespJavaObject = Convertor.constructFieldsForRespValidation(resourceDetails,
+				resourceVersion);
+		resourceRespJavaObject.setLifecycleState((LifecycleStateEnum.NOT_CERTIFIED_CHECKOUT).toString());
+		resourceRespJavaObject.setAbstractt("false");
+		ResourceValidationUtils.validateResp(createResponse, resourceRespJavaObject);
+
+		// validate get response
+		RestResponse resourceGetResponse = ResourceRestUtils.getResource(sdncModifierDetails,
+				resourceDetails.getUniqueId());
+		ResourceValidationUtils.validateResp(resourceGetResponse, resourceRespJavaObject);
+	}
+
+	@Test
+	public void createResourceTest_LicenseTypeMissing() throws Exception {
+
+		User sdncModifierDetails = ElementFactory.getDefaultUser(UserRoleEnum.ADMIN);
+		// set resource details
+		String resourceName = "CISCO4572";
+		String description = "description";
+		// Duplicate tags are allowed and should be de-duplicated by the server
+		// side
+		ArrayList<String> resourceTags = new ArrayList<String>();
+		resourceTags.add(resourceName);
+		resourceTags.add(resourceName);
+		resourceTags.add(resourceName);
+		resourceTags.add("tag2");
+		resourceTags.add("tag2");
+		String category = ServiceCategoriesEnum.VOIP.getValue();
+		ArrayList<String> derivedFrom = new ArrayList<String>();
+		derivedFrom.add(NormativeTypesEnum.ROOT.getNormativeName());
+		String vendorName = "Oracle";
+		String vendorRelease = "1.5";
+		String contactId = "jh0003";
+		String icon = "myICON";
+
+		ResourceReqDetails resourceDetails = new ResourceReqDetails(resourceName, description, resourceTags, category,
+				derivedFrom, vendorName, vendorRelease, contactId, icon);
+		// Adding cost and licenseType
+		resourceDetails.setCost("12355.345");
+		// resourceDetails.setLicenseType("User");
+
+		// create resource
+		RestResponse createResponse = ResourceRestUtils.createResource(resourceDetails, sdncModifierDetails);
+		assertNotNull("check response object is not null after create resource", createResponse);
+		assertNotNull("check error code exists in response after create resource", createResponse.getErrorCode());
+		assertEquals("Check response code after create resource", 201, createResponse.getErrorCode().intValue());
+
+		// validate response
+		String resourceVersion = "0.1";
+		ResourceRespJavaObject resourceRespJavaObject = Convertor.constructFieldsForRespValidation(resourceDetails,
+				resourceVersion);
+		resourceRespJavaObject.setLifecycleState((LifecycleStateEnum.NOT_CERTIFIED_CHECKOUT).toString());
+		resourceRespJavaObject.setAbstractt("false");
+		ResourceValidationUtils.validateResp(createResponse, resourceRespJavaObject);
+
+		// validate get response
+		RestResponse resourceGetResponse = ResourceRestUtils.getResource(sdncModifierDetails,
+				resourceDetails.getUniqueId());
+		ResourceValidationUtils.validateResp(resourceGetResponse, resourceRespJavaObject);
+	}
+
+	@Test
+	public void createResourceTest_LicenseType_Installation() throws Exception {
+
+		User sdncModifierDetails = ElementFactory.getDefaultUser(UserRoleEnum.ADMIN);
+		// set resource details
+		String resourceName = "CISCO4572";
+		String description = "description";
+		// Duplicate tags are allowed and should be de-duplicated by the server
+		// side
+		ArrayList<String> resourceTags = new ArrayList<String>();
+		resourceTags.add(resourceName);
+		resourceTags.add(resourceName);
+		resourceTags.add(resourceName);
+		resourceTags.add("tag2");
+		resourceTags.add("tag2");
+		String category = ServiceCategoriesEnum.VOIP.getValue();
+		ArrayList<String> derivedFrom = new ArrayList<String>();
+		derivedFrom.add(NormativeTypesEnum.ROOT.getNormativeName());
+		String vendorName = "Oracle";
+		String vendorRelease = "1.5";
+		String contactId = "jh0003";
+		String icon = "myICON";
+
+		ResourceReqDetails resourceDetails = new ResourceReqDetails(resourceName, description, resourceTags, category,
+				derivedFrom, vendorName, vendorRelease, contactId, icon);
+		// Adding cost and licenseType
+		resourceDetails.setCost("99999.999");
+		resourceDetails.setLicenseType("Installation");
+
+		// create resource
+		RestResponse createResponse = ResourceRestUtils.createResource(resourceDetails, sdncModifierDetails);
+		assertNotNull("check response object is not null after create resource", createResponse);
+		assertNotNull("check error code exists in response after create resource", createResponse.getErrorCode());
+		assertEquals("Check response code after create resource", 201, createResponse.getErrorCode().intValue());
+
+		// validate response
+		String resourceVersion = "0.1";
+		ResourceRespJavaObject resourceRespJavaObject = Convertor.constructFieldsForRespValidation(resourceDetails,
+				resourceVersion);
+		resourceRespJavaObject.setLifecycleState((LifecycleStateEnum.NOT_CERTIFIED_CHECKOUT).toString());
+		resourceRespJavaObject.setAbstractt("false");
+		ResourceValidationUtils.validateResp(createResponse, resourceRespJavaObject);
+
+		// validate get response
+		RestResponse resourceGetResponse = ResourceRestUtils.getResource(sdncModifierDetails,
+				resourceDetails.getUniqueId());
+		ResourceValidationUtils.validateResp(resourceGetResponse, resourceRespJavaObject);
+	}
+
+	@Test
+	public void createResourceTest_LicenseType_CPU() throws Exception {
+
+		User sdncModifierDetails = ElementFactory.getDefaultUser(UserRoleEnum.ADMIN);
+		// set resource details
+		String resourceName = "CISCO4572";
+		String description = "description";
+		// Duplicate tags are allowed and should be de-duplicated by the server
+		// side
+		ArrayList<String> resourceTags = new ArrayList<String>();
+		resourceTags.add(resourceName);
+		resourceTags.add(resourceName);
+		resourceTags.add(resourceName);
+		resourceTags.add("tag2");
+		resourceTags.add("tag2");
+		String category = ServiceCategoriesEnum.VOIP.getValue();
+		ArrayList<String> derivedFrom = new ArrayList<String>();
+		derivedFrom.add(NormativeTypesEnum.ROOT.getNormativeName());
+		String vendorName = "Oracle";
+		String vendorRelease = "1.5";
+		String contactId = "jh0003";
+		String icon = "myICON";
+
+		ResourceReqDetails resourceDetails = new ResourceReqDetails(resourceName, description, resourceTags, category,
+				derivedFrom, vendorName, vendorRelease, contactId, icon);
+		// Adding cost and licenseType
+		resourceDetails.setCost("0.0");
+		resourceDetails.setLicenseType("CPU");
+
+		// create resource
+		RestResponse createResponse = ResourceRestUtils.createResource(resourceDetails, sdncModifierDetails);
+		assertNotNull("check response object is not null after create resource", createResponse);
+		assertNotNull("check error code exists in response after create resource", createResponse.getErrorCode());
+		assertEquals("Check response code after create resource", 201, createResponse.getErrorCode().intValue());
+
+		// validate response
+		String resourceVersion = "0.1";
+		ResourceRespJavaObject resourceRespJavaObject = Convertor.constructFieldsForRespValidation(resourceDetails,
+				resourceVersion);
+		resourceRespJavaObject.setLifecycleState((LifecycleStateEnum.NOT_CERTIFIED_CHECKOUT).toString());
+		resourceRespJavaObject.setAbstractt("false");
+		ResourceValidationUtils.validateResp(createResponse, resourceRespJavaObject);
+
+		// validate get response
+		RestResponse resourceGetResponse = ResourceRestUtils.getResource(sdncModifierDetails,
+				resourceDetails.getUniqueId());
+		ResourceValidationUtils.validateResp(resourceGetResponse, resourceRespJavaObject);
+	}
+
+	@Test
+	public void createResourceTest_LicenseType_Uppercase() throws Exception {
+
+		User sdncModifierDetails = ElementFactory.getDefaultUser(UserRoleEnum.ADMIN);
+		// set resource details
+		String resourceName = "CISCO4572";
+		String description = "description";
+		// Duplicate tags are allowed and should be de-duplicated by the server
+		// side
+		ArrayList<String> resourceTags = new ArrayList<String>();
+		resourceTags.add(resourceName);
+		resourceTags.add(resourceName);
+		resourceTags.add(resourceName);
+		resourceTags.add("tag2");
+		resourceTags.add("tag2");
+		String category = ServiceCategoriesEnum.VOIP.getValue();
+		ArrayList<String> derivedFrom = new ArrayList<String>();
+		derivedFrom.add(NormativeTypesEnum.ROOT.getNormativeName());
+		String vendorName = "Oracle";
+		String vendorRelease = "1.5";
+		String contactId = "jh0003";
+		String icon = "myICON";
+
+		ResourceReqDetails resourceDetails = new ResourceReqDetails(resourceName, description, resourceTags, category,
+				derivedFrom, vendorName, vendorRelease, contactId, icon);
+		// Adding cost and licenseType
+		resourceDetails.setCost("0.0");
+		resourceDetails.setLicenseType("INSTALLATION");
+
+		// create resource
+		RestResponse createResponse = ResourceRestUtils.createResource(resourceDetails, sdncModifierDetails);
+		assertNotNull("check response object is not null after create resource", createResponse);
+		assertNotNull("check error code exists in response after create resource", createResponse.getErrorCode());
+		assertEquals("Check response code after create resource", 400, createResponse.getErrorCode().intValue());
+		assertEquals("Check response code after create resource", "Bad Request", createResponse.getResponseMessage());
+	}
+
+	@Test
+	public void createResourceTest_LicenseType_Invalid() throws Exception {
+
+		User sdncModifierDetails = ElementFactory.getDefaultUser(UserRoleEnum.ADMIN);
+		// set resource details
+		String resourceName = "CISCO4572";
+		String description = "description";
+		// Duplicate tags are allowed and should be de-duplicated by the server
+		// side
+		ArrayList<String> resourceTags = new ArrayList<String>();
+		resourceTags.add(resourceName);
+		resourceTags.add(resourceName);
+		resourceTags.add(resourceName);
+		resourceTags.add("tag2");
+		resourceTags.add("tag2");
+		String category = ServiceCategoriesEnum.VOIP.getValue();
+		ArrayList<String> derivedFrom = new ArrayList<String>();
+		derivedFrom.add(NormativeTypesEnum.ROOT.getNormativeName());
+		String vendorName = "Oracle";
+		String vendorRelease = "1.5";
+		String contactId = "jh0003";
+		String icon = "myICON";
+
+		ResourceReqDetails resourceDetails = new ResourceReqDetails(resourceName, description, resourceTags, category,
+				derivedFrom, vendorName, vendorRelease, contactId, icon);
+		// Adding cost and licenseType
+		resourceDetails.setCost("0.0");
+		resourceDetails.setLicenseType("CPUUU");
+
+		// create resource
+		RestResponse createResponse = ResourceRestUtils.createResource(resourceDetails, sdncModifierDetails);
+		assertNotNull("check response object is not null after create resource", createResponse);
+		assertNotNull("check error code exists in response after create resource", createResponse.getErrorCode());
+		assertEquals("Check response code after create resource", 400, createResponse.getErrorCode().intValue());
+		assertEquals("Check response code after create resource", "Bad Request", createResponse.getResponseMessage());
+	}
+
+	@Test
+	public void createResourceTest_CostValidation_noNumeric() throws Exception {
+
+		User sdncModifierDetails = ElementFactory.getDefaultUser(UserRoleEnum.ADMIN);
+		// set resource details
+		String resourceName = "CISCO4572";
+		String description = "description";
+		// Duplicate tags are allowed and should be de-duplicated by the server
+		// side
+		ArrayList<String> resourceTags = new ArrayList<String>();
+		resourceTags.add(resourceName);
+		resourceTags.add(resourceName);
+		resourceTags.add(resourceName);
+		resourceTags.add("tag2");
+		resourceTags.add("tag2");
+		String category = ServiceCategoriesEnum.VOIP.getValue();
+		ArrayList<String> derivedFrom = new ArrayList<String>();
+		derivedFrom.add(NormativeTypesEnum.ROOT.getNormativeName());
+		String vendorName = "Oracle";
+		String vendorRelease = "1.5";
+		String contactId = "jh0003";
+		String icon = "myICON";
+
+		ResourceReqDetails resourceDetails = new ResourceReqDetails(resourceName, description, resourceTags, category,
+				derivedFrom, vendorName, vendorRelease, contactId, icon);
+		// Adding cost and licenseType
+		resourceDetails.setCost("12355.345");
+		resourceDetails.setLicenseType("User");
+		resourceDetails.setCost("12355.34b");
+		// create resource
+		RestResponse createResponse = ResourceRestUtils.createResource(resourceDetails, sdncModifierDetails);
+		assertNotNull("check response object is not null after create resource", createResponse);
+		assertNotNull("check error code exists in response after create resource", createResponse.getErrorCode());
+		assertEquals("Check response code after create resource", 400, createResponse.getErrorCode().intValue());
+		assertEquals("Check response code after create resource", "Bad Request",
+				createResponse.getResponseMessage().toString());
+
+	}
+
+	@Test
+	public void createResourceTest_CostValidation_valueLength() throws Exception {
+
+		User sdncModifierDetails = ElementFactory.getDefaultUser(UserRoleEnum.ADMIN);
+		// set resource details
+		String resourceName = "CISCO4572";
+		String description = "description";
+		// Duplicate tags are allowed and should be de-duplicated by the server
+		// side
+		ArrayList<String> resourceTags = new ArrayList<String>();
+		resourceTags.add(resourceName);
+		resourceTags.add(resourceName);
+		resourceTags.add(resourceName);
+		resourceTags.add("tag2");
+		resourceTags.add("tag2");
+		String category = ServiceCategoriesEnum.VOIP.getValue();
+		ArrayList<String> derivedFrom = new ArrayList<String>();
+		derivedFrom.add(NormativeTypesEnum.ROOT.getNormativeName());
+		String vendorName = "Oracle";
+		String vendorRelease = "1.5";
+		String contactId = "jh0003";
+		String icon = "myICON";
+		ResourceReqDetails resourceDetails = new ResourceReqDetails(resourceName, description, resourceTags, category,
+				derivedFrom, vendorName, vendorRelease, contactId, icon);
+		// Adding cost and licenseType
+		resourceDetails.setCost("12355.345");
+		resourceDetails.setLicenseType("User");
+
+		// Adding invalid cost
+		resourceDetails.setCost("12355.3434");
+		// create resource
+		RestResponse createResponse = ResourceRestUtils.createResource(resourceDetails, sdncModifierDetails);
+		assertNotNull("check response object is not null after create resource", createResponse);
+		assertNotNull("check error code exists in response after create resource", createResponse.getErrorCode());
+		assertEquals("Check response code after create resource", 400, createResponse.getErrorCode().intValue());
+		assertEquals("Check response code after create resource", "Bad Request",
+				createResponse.getResponseMessage().toString());
+	}
+
+	@Test
+	public void createResourceTest_CostValidation_PriceLimitations() throws Exception {
+
+		User sdncModifierDetails = ElementFactory.getDefaultUser(UserRoleEnum.ADMIN);
+		// set resource details
+		String resourceName = "CISCO4572";
+		String description = "description";
+		// Duplicate tags are allowed and should be de-duplicated by the server
+		// side
+		ArrayList<String> resourceTags = new ArrayList<String>();
+		resourceTags.add(resourceName);
+		resourceTags.add(resourceName);
+		resourceTags.add(resourceName);
+		resourceTags.add("tag2");
+		resourceTags.add("tag2");
+		String category = ServiceCategoriesEnum.VOIP.getValue();
+		ArrayList<String> derivedFrom = new ArrayList<String>();
+		derivedFrom.add(NormativeTypesEnum.ROOT.getNormativeName());
+		String vendorName = "Oracle";
+		String vendorRelease = "1.5";
+		String contactId = "jh0003";
+		String icon = "myICON";
+		ResourceReqDetails resourceDetails = new ResourceReqDetails(resourceName, description, resourceTags, category,
+				derivedFrom, vendorName, vendorRelease, contactId, icon);
+		// Adding cost and licenseType
+		resourceDetails.setCost("12355.345");
+		resourceDetails.setLicenseType("User");
+
+		// Adding invalid cost
+		RestResponse createResponse;
+		// create resource
+
+		resourceDetails.setCost("000000.000");
+		createResponse = ResourceRestUtils.createResource(resourceDetails, sdncModifierDetails);
+		createResponse = ResourceRestUtils.createResource(resourceDetails, sdncModifierDetails);
+		assertNotNull("check response object is not null after create resource", createResponse);
+		assertNotNull("check error code exists in response after create resource", createResponse.getErrorCode());
+		assertEquals("Check response code after create resource", 400, createResponse.getErrorCode().intValue());
+		assertEquals("Check response code after create resource", "Bad Request",
+				createResponse.getResponseMessage().toString());
+
+		/*
+		 * resourceDetails.setCost("0550.457"); createResponse =
+		 * resourceUtils.createResource(resourceDetails, sdncModifierDetails);
+		 * assertNotNull("check response object is not null after create resource"
+		 * , createResponse);
+		 * assertNotNull("check error code exists in response after create resource"
+		 * , createResponse.getErrorCode());
+		 * assertEquals("Check response code after create resource", 400,
+		 * createResponse.getErrorCode().intValue());
+		 * assertEquals("Check response code after create resource",
+		 * "Bad Request", createResponse.getResponseMessage().toString());
+		 */
+
+		resourceDetails.setCost("1");
+		createResponse = ResourceRestUtils.createResource(resourceDetails, sdncModifierDetails);
+		assertNotNull("check response object is not null after create resource", createResponse);
+		assertNotNull("check error code exists in response after create resource", createResponse.getErrorCode());
+		assertEquals("Check response code after create resource", 400, createResponse.getErrorCode().intValue());
+		assertEquals("Check response code after create resource", "Bad Request",
+				createResponse.getResponseMessage().toString());
+
+		resourceDetails.setCost("123555.340");
+		createResponse = ResourceRestUtils.createResource(resourceDetails, sdncModifierDetails);
+		createResponse = ResourceRestUtils.createResource(resourceDetails, sdncModifierDetails);
+		assertNotNull("check response object is not null after create resource", createResponse);
+		assertNotNull("check error code exists in response after create resource", createResponse.getErrorCode());
+		assertEquals("Check response code after create resource", 400, createResponse.getErrorCode().intValue());
+		assertEquals("Check response code after create resource", "Bad Request",
+				createResponse.getResponseMessage().toString());
+
+		resourceDetails.setCost("123.4570");
+		createResponse = ResourceRestUtils.createResource(resourceDetails, sdncModifierDetails);
+		assertNotNull("check response object is not null after create resource", createResponse);
+		assertNotNull("check error code exists in response after create resource", createResponse.getErrorCode());
+		assertEquals("Check response code after create resource", 400, createResponse.getErrorCode().intValue());
+		assertEquals("Check response code after create resource", "Bad Request",
+				createResponse.getResponseMessage().toString());
+
+		resourceDetails.setCost("123555.30");
+		createResponse = ResourceRestUtils.createResource(resourceDetails, sdncModifierDetails);
+		assertNotNull("check response object is not null after create resource", createResponse);
+		assertNotNull("check error code exists in response after create resource", createResponse.getErrorCode());
+		assertEquals("Check response code after create resource", 400, createResponse.getErrorCode().intValue());
+		assertEquals("Check response code after create resource", "Bad Request",
+				createResponse.getResponseMessage().toString());
+
+		resourceDetails.setCost("123.5550");
+		createResponse = ResourceRestUtils.createResource(resourceDetails, sdncModifierDetails);
+		assertNotNull("check response object is not null after create resource", createResponse);
+		assertNotNull("check error code exists in response after create resource", createResponse.getErrorCode());
+		assertEquals("Check response code after create resource", 400, createResponse.getErrorCode().intValue());
+		assertEquals("Check response code after create resource", "Bad Request",
+				createResponse.getResponseMessage().toString());
+
+	}
+
+	@Test
+	public void createResourceTest_CostIsNull() throws Exception {
+
+		User sdncModifierDetails = ElementFactory.getDefaultUser(UserRoleEnum.ADMIN);
+		// set resource details
+		String resourceName = "CISCO4572";
+		String description = "description";
+		// Duplicate tags are allowed and should be de-duplicated by the server
+		// side
+		ArrayList<String> resourceTags = new ArrayList<String>();
+		resourceTags.add(resourceName);
+		resourceTags.add(resourceName);
+		resourceTags.add(resourceName);
+		resourceTags.add("tag2");
+		resourceTags.add("tag2");
+		String category = ServiceCategoriesEnum.VOIP.getValue();
+		ArrayList<String> derivedFrom = new ArrayList<String>();
+		derivedFrom.add(NormativeTypesEnum.ROOT.getNormativeName());
+		String vendorName = "Oracle";
+		String vendorRelease = "1.5";
+		String contactId = "jh0003";
+		String icon = "myICON";
+
+		ResourceReqDetails resourceDetails = new ResourceReqDetails(resourceName, description, resourceTags, category,
+				derivedFrom, vendorName, vendorRelease, contactId, icon);
+		// Adding cost and licenseType
+		resourceDetails.setCost("12355.345");
+		resourceDetails.setLicenseType("User");
+		resourceDetails.setCost("");
+		// create resource
+		RestResponse createResponse = ResourceRestUtils.createResource(resourceDetails, sdncModifierDetails);
+		assertNotNull("check response object is not null after create resource", createResponse);
+		assertNotNull("check error code exists in response after create resource", createResponse.getErrorCode());
+		assertEquals("Check response code after create resource", 400, createResponse.getErrorCode().intValue());
+		assertEquals("Check response code after create resource", "Bad Request", createResponse.getResponseMessage());
+
+	}
+
+	@Test
+	public void createResourceTest_LicenseIsNull() throws Exception {
+
+		User sdncModifierDetails = ElementFactory.getDefaultUser(UserRoleEnum.ADMIN);
+		// set resource details
+		String resourceName = "CISCO4572";
+		String description = "description";
+		// Duplicate tags are allowed and should be de-duplicated by the server
+		// side
+		ArrayList<String> resourceTags = new ArrayList<String>();
+		resourceTags.add(resourceName);
+		resourceTags.add(resourceName);
+		resourceTags.add(resourceName);
+		resourceTags.add("tag2");
+		resourceTags.add("tag2");
+		String category = ServiceCategoriesEnum.VOIP.getValue();
+		ArrayList<String> derivedFrom = new ArrayList<String>();
+		derivedFrom.add(NormativeTypesEnum.ROOT.getNormativeName());
+		String vendorName = "Oracle";
+		String vendorRelease = "1.5";
+		String contactId = "jh0003";
+		String icon = "myICON";
+
+		ResourceReqDetails resourceDetails = new ResourceReqDetails(resourceName, description, resourceTags, category,
+				derivedFrom, vendorName, vendorRelease, contactId, icon);
+		// Adding cost and licenseType
+		resourceDetails.setCost("12355.345");
+		resourceDetails.setLicenseType("User");
+		resourceDetails.setLicenseType("");
+		// create resource
+		RestResponse createResponse = ResourceRestUtils.createResource(resourceDetails, sdncModifierDetails);
+		assertNotNull("check response object is not null after create resource", createResponse);
+		assertNotNull("check error code exists in response after create resource", createResponse.getErrorCode());
+		assertEquals("Check response code after create resource", 400, createResponse.getErrorCode().intValue());
+		assertEquals("Check response code after create resource", "Bad Request", createResponse.getResponseMessage());
+
+	}
+
+	@Test
+	public void createResourceTest_uri_methods() throws Exception {
+
+		// init ADMIN user
+		User sdncModifierDetails = ElementFactory.getDefaultUser(UserRoleEnum.ADMIN);
+
+		// set resource details
+		ResourceReqDetails resourceDetails = createRandomResource();
+
+		Config config = Utils.getConfig();
+
+		Map<String, String> headersMap = new HashMap<String, String>();
+		headersMap.put(HttpHeaderEnum.CONTENT_TYPE.getValue(), contentTypeHeaderData);
+		headersMap.put(HttpHeaderEnum.ACCEPT.getValue(), acceptHeaderDate);
+		headersMap.put(HttpHeaderEnum.USER_ID.getValue(), sdncModifierDetails.getUserId());
+
+		Gson gson = new Gson();
+		String userBodyJson = gson.toJson(resourceDetails);
+		log.debug(userBodyJson);
+		HttpRequest http = new HttpRequest();
+		String url = String.format(Urls.CREATE_RESOURCE, config.getCatalogBeHost(), config.getCatalogBePort());
+
+		RestResponse createResourceResponse2 = http.httpSendByMethod(url, "PUT", userBodyJson, headersMap);
+
+		// validate response
+		ErrorInfo errorInfo = ErrorValidationUtils.parseErrorConfigYaml(ActionStatus.NOT_ALLOWED.name());
+
+		assertNotNull("check response object is not null after create resource", createResourceResponse2);
+		assertNotNull("check error code exists in response after create resource",
+				createResourceResponse2.getErrorCode());
+		assertEquals("Check response code after create resource", errorInfo.getCode(),
+				createResourceResponse2.getErrorCode());
+
+		List<String> variables = Arrays.asList();
+		ErrorValidationUtils.checkBodyResponseOnError(ActionStatus.NOT_ALLOWED.name(), variables,
+				createResourceResponse2.getResponse());
+
+	}
+
+	private ResourceReqDetails createRandomResource() {
+		String resourceName = "CISCO4";
+		String description = "description";
+		ArrayList<String> resourceTags = new ArrayList<String>();
+		resourceTags.add(resourceName);
+		String category = ServiceCategoriesEnum.VOIP.getValue();
+		ArrayList<String> derivedFrom = new ArrayList<String>();
+		derivedFrom.add(NormativeTypesEnum.ROOT.getNormativeName());
+		String vendorName = "Oracle";
+		String vendorRelease = "1.5";
+		String contactId = "jh0003";
+		String icon = "myICON";
+
+		ResourceReqDetails resourceDetails = new ResourceReqDetails(resourceName, description, resourceTags, category,
+				derivedFrom, vendorName, vendorRelease, contactId, icon);
+		return resourceDetails;
+	}
+
+	@Test
+	public void createResource_role_tester() throws Exception {
+
+		// init TESTER user
+		User sdncModifierDetails = ElementFactory.getDefaultUser(UserRoleEnum.TESTER);
+
+		ResourceReqDetails resourceDetails2 = createRandomResource();
+
+		// create resource
+		RestResponse restResponse2 = ResourceRestUtils.createResource(resourceDetails2, sdncModifierDetails);
+
+		// validate response
+		ErrorInfo errorInfo = ErrorValidationUtils.parseErrorConfigYaml(ActionStatus.RESTRICTED_OPERATION.name());
+
+		assertNotNull("check response object is not null after create resouce", restResponse2);
+		assertNotNull("check error code exists in response after create resource", restResponse2.getErrorCode());
+		assertEquals("Check response code after create service", errorInfo.getCode(), restResponse2.getErrorCode());
+
+		List<String> variables = Arrays.asList();
+		ErrorValidationUtils.checkBodyResponseOnError(ActionStatus.RESTRICTED_OPERATION.name(), variables,
+				restResponse2.getResponse());
+
+		// validate audit
+		ExpectedResourceAuditJavaObject expectedResourceAuditJavaObject = Convertor
+				.constructFieldsForAuditValidation(resourceDetails2, resourceVersion);
+		String auditAction = "Create";
+		expectedResourceAuditJavaObject.setAction(auditAction);
+		expectedResourceAuditJavaObject.setModifierUid(UserRoleEnum.TESTER.getUserId());
+		expectedResourceAuditJavaObject.setModifierName(UserRoleEnum.TESTER.getUserName());
+		expectedResourceAuditJavaObject.setPrevState("");
+		expectedResourceAuditJavaObject.setCurrState("");
+		expectedResourceAuditJavaObject.setPrevVersion("");
+		expectedResourceAuditJavaObject.setCurrVersion("");
+		expectedResourceAuditJavaObject.setStatus(errorInfo.getCode().toString());
+
+		String auditDesc = AuditValidationUtils.buildAuditDescription(errorInfo, variables);
+		expectedResourceAuditJavaObject.setDesc(auditDesc);
+
+		AuditValidationUtils.validateAudit(expectedResourceAuditJavaObject, auditAction, null, false);
+
+	}
+
+	// TODO DE171450(to check)
+	@Test
+	public void createResource_role_DESIGNER() throws Exception {
+
+		User sdncModifierDetails = ElementFactory.getDefaultUser(UserRoleEnum.DESIGNER);
+		ResourceReqDetails resourceDetails = createRandomResource();
+		RestResponse restResponse = ResourceRestUtils.createResource(resourceDetails, sdncModifierDetails);
+		// validate response
+		assertNotNull("check response object is not null after create resource", restResponse);
+		assertNotNull("check error code exists in response after create resource", restResponse.getErrorCode());
+		assertEquals(
+				"Check response code after create resource, response message is: " + restResponse.getResponseMessage(),
+				201, restResponse.getErrorCode().intValue());
+
+	}
+
+	@Test
+	public void createResource_missing_header() throws Exception {
+		// init ADMIN user
+
+		User sdncModifierDetails = ElementFactory.getDefaultUser(UserRoleEnum.ADMIN);
+
+		ResourceReqDetails resourceDetails = createRandomResource();
+
+		// set null in userId header
+		sdncModifierDetails.setUserId(null);
+
+		// create resource
+
+		RestResponse restResponse2 = ResourceRestUtils.createResource(resourceDetails, sdncModifierDetails);
+
+		// validate response
+
+		ErrorInfo errorInfo = ErrorValidationUtils.parseErrorConfigYaml(ActionStatus.MISSING_INFORMATION.name());
+
+		assertNotNull("check response object is not null after create resouce", restResponse2);
+		assertNotNull("check error code exists in response after create resource", restResponse2.getErrorCode());
+		assertEquals("Check response code after create service", errorInfo.getCode(), restResponse2.getErrorCode());
+
+		List<String> variables = Arrays.asList();
+		ErrorValidationUtils.checkBodyResponseOnError(ActionStatus.MISSING_INFORMATION.name(), variables,
+				restResponse2.getResponse());
+
+		// //validate audit
+		//
+		// ExpectedResourceAuditJavaObject expectedResourceAuditJavaObject =
+		// resourceUtils.constructFieldsForAuditValidation(resourceDetails,resourceVersion);
+		//
+		// String auditAction="Create";
+		// expectedResourceAuditJavaObject.setAction(auditAction);
+		// expectedResourceAuditJavaObject.setModifierUid("null null");
+		// expectedResourceAuditJavaObject.setModifierName("null null");
+		// expectedResourceAuditJavaObject.setPrevState("");
+		// expectedResourceAuditJavaObject.setCurrState("");
+		// expectedResourceAuditJavaObject.setPrevVersion("");
+		// expectedResourceAuditJavaObject.setCurrVersion("");
+		// expectedResourceAuditJavaObject.setStatus(errorInfo.getCode().toString());
+		//
+		// String auditDesc =
+		// AuditValidationUtils.buildAuditDescription(errorInfo, variables);
+		// expectedResourceAuditJavaObject.setDesc(auditDesc);
+		//
+		// AuditValidationUtils.validateAudit(expectedResourceAuditJavaObject,
+		// auditAction);
+		// TODO: yshlosberg enable back
+
+	}
+
+	@Test
+	public void createResource_existing_resource() throws Exception {
+		// init ADMIN user
+
+		User sdncModifierDetails = ElementFactory.getDefaultUser(UserRoleEnum.ADMIN);
+
+		// ResourceReqDetails resourceDetails = createRandomResource();
+		ResourceReqDetails resourceDetails = ElementFactory.getDefaultResource();
+
+		// create resource
+		RestResponse restResponse = ResourceRestUtils.createResource(resourceDetails, sdncModifierDetails);
+
+		// validate response
+		assertNotNull("check response object is not null after create resource", restResponse);
+		assertNotNull("check error code exists in response after create resource", restResponse.getErrorCode());
+		assertEquals("Check response code after create resource", 201, restResponse.getErrorCode().intValue());
+
+		// set resource details
+		ResourceReqDetails resourceDetails2 = ElementFactory.getDefaultResource();
+		resourceDetails2.setName(resourceDetails.getName());
+		
+		// clean ES DB
+		DbUtils.cleanAllAudits();
+
+		// create resource
+		RestResponse restResponse2 = ResourceRestUtils.createResource(resourceDetails2, sdncModifierDetails);
+
+		// validate response
+
+		ErrorInfo errorInfo = ErrorValidationUtils
+				.parseErrorConfigYaml(ActionStatus.COMPONENT_NAME_ALREADY_EXIST.name());
+
+		assertNotNull("check response object is not null after create resouce", restResponse2);
+		assertNotNull("check error code exists in response after create resource", restResponse2.getErrorCode());
+		assertEquals("Check response code after create service", errorInfo.getCode(), restResponse2.getErrorCode());
+
+		List<String> variables = Arrays.asList("Resource", resourceDetails2.getName());
+		ErrorValidationUtils.checkBodyResponseOnError(ActionStatus.COMPONENT_NAME_ALREADY_EXIST.name(), variables,
+				restResponse2.getResponse());
+
+		// validate audit
+
+		ExpectedResourceAuditJavaObject expectedResourceAuditJavaObject = Convertor
+				.constructFieldsForAuditValidation(resourceDetails, resourceVersion);
+
+		String auditAction = "Create";
+		expectedResourceAuditJavaObject.setAction(auditAction);
+		expectedResourceAuditJavaObject.setCurrState("");
+		expectedResourceAuditJavaObject.setCurrVersion("");
+		expectedResourceAuditJavaObject.setPrevState("");
+		expectedResourceAuditJavaObject.setPrevVersion("");
+		expectedResourceAuditJavaObject.setStatus(errorInfo.getCode().toString());
+
+		String auditDesc = AuditValidationUtils.buildAuditDescription(errorInfo, variables);
+		expectedResourceAuditJavaObject.setDesc(auditDesc);
+
+		AuditValidationUtils.validateAudit(expectedResourceAuditJavaObject, auditAction, null, false);
+
+	}
+
+	@Test
+	public void createResourceTest_without_category() throws Exception {
+
+		// init ADMIN user
+
+		User sdncModifierDetails = ElementFactory.getDefaultUser(UserRoleEnum.ADMIN);
+		;
+
+		// set resource details
+		String resourceName = "CISCO4";
+		String description = "description";
+		ArrayList<String> resourceTags = new ArrayList<String>();
+		resourceTags.add(resourceName);
+		String category = ServiceCategoriesEnum.VOIP.getValue();
+		ArrayList<String> derivedFrom = new ArrayList<String>();
+		derivedFrom.add(NormativeTypesEnum.ROOT.getNormativeName());
+		String vendorName = "Oracle";
+		String vendorRelease = "1.5";
+		String contactId = "jh0003";
+		String icon = "myICON";
+
+		// set resource details
+		category = null;
+
+		ResourceReqDetails resourceDetails = new ResourceReqDetails(resourceName, description, resourceTags, category,
+				derivedFrom, vendorName, vendorRelease, contactId, icon);
+
+		// create resource
+
+		RestResponse restResponse2 = ResourceRestUtils.createResource(resourceDetails, sdncModifierDetails);
+
+		// validate response
+
+		ErrorInfo errorInfo = ErrorValidationUtils.parseErrorConfigYaml(ActionStatus.COMPONENT_MISSING_CATEGORY.name());
+
+		assertNotNull("check response object is not null after create resouce", restResponse2);
+		assertNotNull("check error code exists in response after create resource", restResponse2.getErrorCode());
+		assertEquals("Check response code after create service", errorInfo.getCode(), restResponse2.getErrorCode());
+
+		List<String> variables = Arrays.asList("Resource");
+		ErrorValidationUtils.checkBodyResponseOnError(ActionStatus.COMPONENT_MISSING_CATEGORY.name(), variables,
+				restResponse2.getResponse());
+
+		// validate audit
+
+		ExpectedResourceAuditJavaObject expectedResourceAuditJavaObject = Convertor
+				.constructFieldsForAuditValidation(resourceDetails, resourceVersion);
+
+		String auditAction = "Create";
+		expectedResourceAuditJavaObject.setAction(auditAction);
+		expectedResourceAuditJavaObject.setCurrState("");
+		expectedResourceAuditJavaObject.setCurrVersion("");
+		expectedResourceAuditJavaObject.setPrevState("");
+		expectedResourceAuditJavaObject.setPrevVersion("");
+		expectedResourceAuditJavaObject.setStatus(errorInfo.getCode().toString());
+
+		String auditDesc = AuditValidationUtils.buildAuditDescription(errorInfo, variables);
+		expectedResourceAuditJavaObject.setDesc(auditDesc);
+
+		AuditValidationUtils.validateAudit(expectedResourceAuditJavaObject, auditAction, null, false);
+
+	}
+
+	@Test
+	public void createResourceTest_empty_category() throws Exception {
+
+		// init ADMIN user
+
+		User sdncModifierDetails = ElementFactory.getDefaultUser(UserRoleEnum.ADMIN);
+
+		// set resource details
+		String resourceName = "CISCO4";
+		String description = "description";
+		ArrayList<String> resourceTags = new ArrayList<String>();
+		resourceTags.add(resourceName);
+		String category = ServiceCategoriesEnum.VOIP.getValue();
+		ArrayList<String> derivedFrom = new ArrayList<String>();
+		derivedFrom.add(NormativeTypesEnum.ROOT.getNormativeName());
+		String vendorName = "Oracle";
+		String vendorRelease = "1.5";
+		String contactId = "jh0003";
+		String icon = "myICON";
+
+		// set resource details
+		category = "";
+
+		ResourceReqDetails resourceDetails2 = new ResourceReqDetails(resourceName, description, resourceTags, category,
+				derivedFrom, vendorName, vendorRelease, contactId, icon);
+
+		// create resource
+
+		RestResponse restResponse2 = ResourceRestUtils.createResource(resourceDetails2, sdncModifierDetails);
+
+		// validate response
+
+		ErrorInfo errorInfo = ErrorValidationUtils.parseErrorConfigYaml(ActionStatus.COMPONENT_MISSING_CATEGORY.name());
+
+		assertNotNull("check response object is not null after create resouce", restResponse2);
+		assertNotNull("check error code exists in response after create resource", restResponse2.getErrorCode());
+		assertEquals("Check response code after create service", errorInfo.getCode(), restResponse2.getErrorCode());
+
+		List<String> variables = Arrays.asList("Resource");
+		ErrorValidationUtils.checkBodyResponseOnError(ActionStatus.COMPONENT_MISSING_CATEGORY.name(), variables,
+				restResponse2.getResponse());
+
+		// validate audit
+
+		ExpectedResourceAuditJavaObject expectedResourceAuditJavaObject = Convertor
+				.constructFieldsForAuditValidation(resourceDetails2, resourceVersion);
+
+		String auditAction = "Create";
+		expectedResourceAuditJavaObject.setAction(auditAction);
+		expectedResourceAuditJavaObject.setCurrState("");
+		expectedResourceAuditJavaObject.setCurrVersion("");
+		expectedResourceAuditJavaObject.setPrevState("");
+		expectedResourceAuditJavaObject.setPrevVersion("");
+		expectedResourceAuditJavaObject.setStatus(errorInfo.getCode().toString());
+
+		String auditDesc = AuditValidationUtils.buildAuditDescription(errorInfo, variables);
+		expectedResourceAuditJavaObject.setDesc(auditDesc);
+
+		AuditValidationUtils.validateAudit(expectedResourceAuditJavaObject, auditAction, null, false);
+
+	}
+
+	@Test
+	public void createResourceTest_without_tags() throws Exception {
+
+		// init ADMIN user
+
+		User sdncModifierDetails = ElementFactory.getDefaultUser(UserRoleEnum.ADMIN);
+		;
+
+		// set resource details
+		String resourceName = "CISCO4";
+		String description = "description";
+		ArrayList<String> resourceTags = new ArrayList<String>();
+
+		String category = ServiceCategoriesEnum.VOIP.getValue();
+		ArrayList<String> derivedFrom = new ArrayList<String>();
+		derivedFrom.add(NormativeTypesEnum.ROOT.getNormativeName());
+		String vendorName = "Oracle";
+		String vendorRelease = "1.5";
+		String contactId = "jh0003";
+		String icon = "myICON";
+
+		ResourceReqDetails resourceDetails2 = new ResourceReqDetails(resourceName, description, resourceTags, category,
+				derivedFrom, vendorName, vendorRelease, contactId, icon);
+
+		// create resource
+		RestResponse restResponse2 = ResourceRestUtils.createResource(resourceDetails2, sdncModifierDetails);
+
+		// validate response
+
+		ErrorInfo errorInfo = ErrorValidationUtils.parseErrorConfigYaml(ActionStatus.COMPONENT_MISSING_TAGS.name());
+
+		assertNotNull("check response object is not null after create resouce", restResponse2);
+		assertNotNull("check error code exists in response after create resource", restResponse2.getErrorCode());
+		assertEquals("Check response code after create service", errorInfo.getCode(), restResponse2.getErrorCode());
+
+		List<String> variables = Arrays.asList();
+		ErrorValidationUtils.checkBodyResponseOnError(ActionStatus.COMPONENT_MISSING_TAGS.name(), variables,
+				restResponse2.getResponse());
+
+		// validate audit
+
+		ExpectedResourceAuditJavaObject expectedResourceAuditJavaObject = Convertor
+				.constructFieldsForAuditValidation(resourceDetails2, resourceVersion);
+
+		String auditAction = "Create";
+		expectedResourceAuditJavaObject.setAction(auditAction);
+		expectedResourceAuditJavaObject.setCurrState("");
+		expectedResourceAuditJavaObject.setCurrVersion("");
+		expectedResourceAuditJavaObject.setPrevState("");
+		expectedResourceAuditJavaObject.setPrevVersion("");
+		expectedResourceAuditJavaObject.setStatus(errorInfo.getCode().toString());
+
+		String auditDesc = AuditValidationUtils.buildAuditDescription(errorInfo, variables);
+		expectedResourceAuditJavaObject.setDesc(auditDesc);
+
+		AuditValidationUtils.validateAudit(expectedResourceAuditJavaObject, auditAction, null, false);
+
+	}
+
+	// TODO DE171450(to check)
+	@Test
+	public void createResourceTest_with_multiple_tags() throws Exception {
+
+		// init ADMIN user
+		User sdncModifierDetails = ElementFactory.getDefaultUser(UserRoleEnum.ADMIN);
+
+		// // set resource details
+		// String resourceName = "CISCO4";
+		// String description = "description";
+		// ArrayList<String> resourceTags = new ArrayList<String>();
+		// resourceTags.add(resourceName);
+		// resourceTags.add("tag2");
+		// String category = ResourceServiceCategoriesEnum.VOIP.getValue();
+		// ArrayList<String> derivedFrom = new ArrayList<String>();
+		// derivedFrom.add(NormativeTypesEnum.ROOT.getNormativeName());
+		// String vendorName = "Oracle";
+		// String vendorRelease = "1.5";
+		// String icon = "myICON";
+		ResourceReqDetails resourceDetails = ElementFactory.getDefaultResource();
+		resourceDetails.setTags(Arrays.asList(resourceDetails.getName(), "tag2"));
+
+		// create resource
+		RestResponse restResponse = ResourceRestUtils.createResource(resourceDetails, sdncModifierDetails);
+
+		// validate response
+		assertNotNull("check response object is not null after create resource", restResponse);
+		assertNotNull("check error code exists in response after create resource", restResponse.getErrorCode());
+		assertEquals("Check response code after create resource", 201, restResponse.getErrorCode().intValue());
+
+	}
+
+	@Test
+	public void createResourceTest_empty_tag() throws Exception {
+
+		// init ADMIN user
+
+		User sdncModifierDetails = ElementFactory.getDefaultUser(UserRoleEnum.ADMIN);
+
+		// set resource details
+		String resourceName = "CISCO4";
+		String description = "description";
+		ArrayList<String> resourceTags = new ArrayList<String>();
+		resourceTags.add("");
+		String category = ServiceCategoriesEnum.VOIP.getValue();
+		ArrayList<String> derivedFrom = new ArrayList<String>();
+		derivedFrom.add(NormativeTypesEnum.ROOT.getNormativeName());
+		String vendorName = "Oracle";
+		String vendorRelease = "1.5";
+		String contactId = "jh0003";
+		String icon = "myICON";
+
+		ResourceReqDetails resourceDetails = new ResourceReqDetails(resourceName, description, resourceTags, category,
+				derivedFrom, vendorName, vendorRelease, contactId, icon);
+
+		// create resource
+		RestResponse restResponse = ResourceRestUtils.createResource(resourceDetails, sdncModifierDetails);
+
+		// validate response
+		ErrorInfo errorInfo = ErrorValidationUtils.parseErrorConfigYaml(ActionStatus.INVALID_FIELD_FORMAT.name());
+
+		assertNotNull("check response object is not null after create resouce", restResponse);
+		assertNotNull("check error code exists in response after create resource", restResponse.getErrorCode());
+		assertEquals("Check response code after create resource", errorInfo.getCode(), restResponse.getErrorCode());
+
+		List<String> variables = Arrays.asList("Resource", "tag");
+		ErrorValidationUtils.checkBodyResponseOnError(ActionStatus.INVALID_FIELD_FORMAT.name(), variables,
+				restResponse.getResponse());
+
+		// validate audit
+		ExpectedResourceAuditJavaObject expectedResourceAuditJavaObject = Convertor
+				.constructFieldsForAuditValidation(resourceDetails, resourceVersion);
+
+		String auditAction = "Create";
+		expectedResourceAuditJavaObject.setAction(auditAction);
+		expectedResourceAuditJavaObject.setPrevState("");
+		expectedResourceAuditJavaObject.setPrevVersion("");
+		expectedResourceAuditJavaObject.setCurrState("");
+		expectedResourceAuditJavaObject.setCurrVersion("");
+		expectedResourceAuditJavaObject.setStatus(errorInfo.getCode().toString());
+
+		String auditDesc = AuditValidationUtils.buildAuditDescription(errorInfo, variables);
+		expectedResourceAuditJavaObject.setDesc(auditDesc);
+
+		AuditValidationUtils.validateAudit(expectedResourceAuditJavaObject, auditAction, null, false);
+
+	}
+
+	@Test
+	public void createResourceTest_with_empty_vendorName() throws Exception {
+		// init ADMIN user
+		User sdncModifierDetails = ElementFactory.getDefaultUser(UserRoleEnum.ADMIN);
+
+		// set resource details
+		String resourceName = "CISCO4";
+		String description = "description";
+		ArrayList<String> resourceTags = new ArrayList<String>();
+		resourceTags.add(resourceName);
+		String category = ServiceCategoriesEnum.VOIP.getValue();
+		ArrayList<String> derivedFrom = new ArrayList<String>();
+		derivedFrom.add(NormativeTypesEnum.ROOT.getNormativeName());
+		String vendorName = "Oracle";
+		String vendorRelease = "1.5";
+		String contactId = "jh0003";
+		String icon = "myICON";
+
+		// set resource details
+		vendorName = "";
+
+		ResourceReqDetails resourceDetails2 = new ResourceReqDetails(resourceName, description, resourceTags, category,
+				derivedFrom, vendorName, vendorRelease, contactId, icon);
+
+		// create resource
+		RestResponse restResponse2 = ResourceRestUtils.createResource(resourceDetails2, sdncModifierDetails);
+
+		// validate response
+		ErrorInfo errorInfo = ErrorValidationUtils.parseErrorConfigYaml(ActionStatus.MISSING_VENDOR_NAME.name());
+
+		assertNotNull("check response object is not null after create resouce", restResponse2);
+		assertNotNull("check error code exists in response after create resource", restResponse2.getErrorCode());
+		assertEquals("Check response code after create service", errorInfo.getCode(), restResponse2.getErrorCode());
+
+		List<String> variables = Arrays.asList();
+		ErrorValidationUtils.checkBodyResponseOnError(ActionStatus.MISSING_VENDOR_NAME.name(), variables,
+				restResponse2.getResponse());
+
+		// validate audit
+		ExpectedResourceAuditJavaObject expectedResourceAuditJavaObject = Convertor
+				.constructFieldsForAuditValidation(resourceDetails2, resourceVersion);
+		String auditAction = "Create";
+		expectedResourceAuditJavaObject.setAction(auditAction);
+		expectedResourceAuditJavaObject.setPrevState("");
+		expectedResourceAuditJavaObject.setPrevVersion("");
+		expectedResourceAuditJavaObject.setCurrState("");
+		expectedResourceAuditJavaObject.setCurrVersion("");
+		expectedResourceAuditJavaObject.setStatus(errorInfo.getCode().toString());
+
+		String auditDesc = AuditValidationUtils.buildAuditDescription(errorInfo, variables);
+		expectedResourceAuditJavaObject.setDesc(auditDesc);
+
+		AuditValidationUtils.validateAudit(expectedResourceAuditJavaObject, auditAction, null, false);
+
+	}
+
+	@Test
+	public void createResourceTest_without_vendorName() throws Exception {
+		// init ADMIN user
+		User sdncModifierDetails = ElementFactory.getDefaultUser(UserRoleEnum.ADMIN);
+
+		// set resource details
+		String resourceName = "CISCO4";
+		String description = "description";
+		ArrayList<String> resourceTags = new ArrayList<String>();
+		resourceTags.add(resourceName);
+		String category = ServiceCategoriesEnum.VOIP.getValue();
+		ArrayList<String> derivedFrom = new ArrayList<String>();
+		derivedFrom.add(NormativeTypesEnum.ROOT.getNormativeName());
+		String vendorName = "Oracle";
+		String vendorRelease = "1.5";
+		String contactId = "jh0003";
+		String icon = "myICON";
+
+		// set resource details
+		vendorName = null;
+
+		ResourceReqDetails resourceDetails2 = new ResourceReqDetails(resourceName, description, resourceTags, category,
+				derivedFrom, vendorName, vendorRelease, contactId, icon);
+
+		// create resource
+
+		RestResponse restResponse2 = ResourceRestUtils.createResource(resourceDetails2, sdncModifierDetails);
+
+		// validate response
+		assertNotNull("check response object is not null after create resource", restResponse2);
+		assertNotNull("check error code exists in response after create resource", restResponse2.getErrorCode());
+		assertEquals("Check response code after create resource", 400, restResponse2.getErrorCode().intValue());
+
+		List<String> variables = Arrays.asList();
+		ErrorValidationUtils.checkBodyResponseOnError(ActionStatus.MISSING_VENDOR_NAME.name(), variables,
+				restResponse2.getResponse());
+
+	}
+
+	@Test
+	public void createResourceTest_with_empty_vendorRelease() throws Exception {
+		// init ADMIN user
+		User sdncModifierDetails = ElementFactory.getDefaultUser(UserRoleEnum.ADMIN);
+
+		// set resource details
+		String resourceName = "CISCO4";
+		String description = "description";
+		ArrayList<String> resourceTags = new ArrayList<String>();
+		resourceTags.add(resourceName);
+		String category = ServiceCategoriesEnum.VOIP.getValue();
+		ArrayList<String> derivedFrom = new ArrayList<String>();
+		derivedFrom.add("root");
+		String vendorName = "Oracle";
+		String vendorRelease = "1.5";
+		String contactId = "jh0003";
+		String icon = "myICON";
+
+		// set resource details
+		vendorRelease = "";
+
+		ResourceReqDetails resourceDetails2 = new ResourceReqDetails(resourceName, description, resourceTags, category,
+				derivedFrom, vendorName, vendorRelease, contactId, icon);
+
+		// create resource
+
+		RestResponse restResponse2 = ResourceRestUtils.createResource(resourceDetails2, sdncModifierDetails);
+
+		// validate response
+
+		ErrorInfo errorInfo = ErrorValidationUtils.parseErrorConfigYaml(ActionStatus.MISSING_VENDOR_RELEASE.name());
+
+		assertNotNull("check response object is not null after create resouce", restResponse2);
+		assertNotNull("check error code exists in response after create resource", restResponse2.getErrorCode());
+		assertEquals("Check response code after create service", errorInfo.getCode(), restResponse2.getErrorCode());
+
+		List<String> variables = Arrays.asList();
+		ErrorValidationUtils.checkBodyResponseOnError(ActionStatus.MISSING_VENDOR_RELEASE.name(), variables,
+				restResponse2.getResponse());
+
+		// validate audit
+
+		ExpectedResourceAuditJavaObject expectedResourceAuditJavaObject = Convertor
+				.constructFieldsForAuditValidation(resourceDetails2, resourceVersion);
+
+		String auditAction = "Create";
+		expectedResourceAuditJavaObject.setAction(auditAction);
+		expectedResourceAuditJavaObject.setPrevState("");
+		expectedResourceAuditJavaObject.setPrevVersion("");
+		expectedResourceAuditJavaObject.setCurrState("");
+		expectedResourceAuditJavaObject.setCurrVersion("");
+		expectedResourceAuditJavaObject.setStatus(errorInfo.getCode().toString());
+
+		String auditDesc = AuditValidationUtils.buildAuditDescription(errorInfo, variables);
+		expectedResourceAuditJavaObject.setDesc(auditDesc);
+
+		AuditValidationUtils.validateAudit(expectedResourceAuditJavaObject, auditAction, null, false);
+
+	}
+
+	@Test
+	public void createResourceTest_without_vendorRelease() throws Exception {
+		// init ADMIN user
+		User sdncModifierDetails = ElementFactory.getDefaultUser(UserRoleEnum.ADMIN);
+
+		// set resource details
+		String resourceName = "CISCO4";
+		String description = "description";
+		ArrayList<String> resourceTags = new ArrayList<String>();
+		resourceTags.add(resourceName);
+		String category = ServiceCategoriesEnum.VOIP.getValue();
+		ArrayList<String> derivedFrom = new ArrayList<String>();
+		derivedFrom.add(NormativeTypesEnum.ROOT.getNormativeName());
+		String vendorName = "Oracle";
+		String vendorRelease = "1.5";
+		String contactId = "jh0003";
+		String icon = "myICON";
+
+		// set resource details
+		vendorRelease = null;
+
+		ResourceReqDetails resourceDetails2 = new ResourceReqDetails(resourceName, description, resourceTags, category,
+				derivedFrom, vendorName, vendorRelease, contactId, icon);
+
+		// create resource
+
+		RestResponse restResponse2 = ResourceRestUtils.createResource(resourceDetails2, sdncModifierDetails);
+
+		// validate response
+
+		ErrorInfo errorInfo = ErrorValidationUtils.parseErrorConfigYaml(ActionStatus.MISSING_VENDOR_RELEASE.name());
+
+		assertNotNull("check response object is not null after create resouce", restResponse2);
+		assertNotNull("check error code exists in response after create resource", restResponse2.getErrorCode());
+		assertEquals("Check response code after create service", errorInfo.getCode(), restResponse2.getErrorCode());
+
+		List<String> variables = Arrays.asList();
+		ErrorValidationUtils.checkBodyResponseOnError(ActionStatus.MISSING_VENDOR_RELEASE.name(), variables,
+				restResponse2.getResponse());
+
+		// validate audit
+
+		ExpectedResourceAuditJavaObject expectedResourceAuditJavaObject = Convertor
+				.constructFieldsForAuditValidation(resourceDetails2, resourceVersion);
+
+		String auditAction = "Create";
+		expectedResourceAuditJavaObject.setAction(auditAction);
+		expectedResourceAuditJavaObject.setPrevState("");
+		expectedResourceAuditJavaObject.setPrevVersion("");
+		expectedResourceAuditJavaObject.setCurrState("");
+		expectedResourceAuditJavaObject.setCurrVersion("");
+		expectedResourceAuditJavaObject.setStatus(errorInfo.getCode().toString());
+
+		String auditDesc = AuditValidationUtils.buildAuditDescription(errorInfo, variables);
+		expectedResourceAuditJavaObject.setDesc(auditDesc);
+
+		AuditValidationUtils.validateAudit(expectedResourceAuditJavaObject, auditAction, null, false);
+
+	}
+
+	@Test
+	public void createResourceTest_with_empty_contactId() throws Exception {
+		// init ADMIN user
+		User sdncModifierDetails = ElementFactory.getDefaultUser(UserRoleEnum.ADMIN);
+
+		// set resource details
+		String resourceName = "CISCO4";
+		String description = "description";
+		ArrayList<String> resourceTags = new ArrayList<String>();
+		resourceTags.add(resourceName);
+		String category = ServiceCategoriesEnum.VOIP.getValue();
+		ArrayList<String> derivedFrom = new ArrayList<String>();
+		derivedFrom.add(NormativeTypesEnum.ROOT.getNormativeName());
+		String vendorName = "Oracle";
+		String vendorRelease = "1.5";
+		String contactId = "jh0003";
+		String icon = "myICON";
+
+		// set resource details
+		contactId = "";
+
+		ResourceReqDetails resourceDetails2 = new ResourceReqDetails(resourceName, description, resourceTags, category,
+				derivedFrom, vendorName, vendorRelease, contactId, icon);
+
+		// create resource
+
+		RestResponse restResponse2 = ResourceRestUtils.createResource(resourceDetails2, sdncModifierDetails);
+
+		// validate response
+
+		ErrorInfo errorInfo = ErrorValidationUtils
+				.parseErrorConfigYaml(ActionStatus.COMPONENT_MISSING_CONTACT.name());
+
+		assertNotNull("check response object is not null after create resouce", restResponse2);
+		assertNotNull("check error code exists in response after create resource", restResponse2.getErrorCode());
+		assertEquals("Check response code after create service", errorInfo.getCode(), restResponse2.getErrorCode());
+
+		List<String> variables = Arrays.asList("Resource");
+		ErrorValidationUtils.checkBodyResponseOnError(ActionStatus.COMPONENT_MISSING_CONTACT.name(), variables,
+				restResponse2.getResponse());
+
+		// validate audit
+
+		ExpectedResourceAuditJavaObject expectedResourceAuditJavaObject = Convertor
+				.constructFieldsForAuditValidation(resourceDetails2, resourceVersion);
+
+		String auditAction = "Create";
+		expectedResourceAuditJavaObject.setAction(auditAction);
+		expectedResourceAuditJavaObject.setPrevState("");
+		expectedResourceAuditJavaObject.setPrevVersion("");
+		expectedResourceAuditJavaObject.setCurrState("");
+		expectedResourceAuditJavaObject.setCurrVersion("");
+		expectedResourceAuditJavaObject.setStatus(errorInfo.getCode().toString());
+
+		String auditDesc = AuditValidationUtils.buildAuditDescription(errorInfo, variables);
+		expectedResourceAuditJavaObject.setDesc(auditDesc);
+
+		AuditValidationUtils.validateAudit(expectedResourceAuditJavaObject, auditAction, null, false);
+
+	}
+
+	@Test
+	public void createResourceTest_without_contactId() throws Exception {
+		// init ADMIN user
+		User sdncModifierDetails = ElementFactory.getDefaultUser(UserRoleEnum.ADMIN);
+
+		// set resource details
+		String resourceName = "CISCO4";
+		String description = "description";
+		ArrayList<String> resourceTags = new ArrayList<String>();
+		resourceTags.add(resourceName);
+		String category = ServiceCategoriesEnum.VOIP.getValue();
+		ArrayList<String> derivedFrom = new ArrayList<String>();
+		derivedFrom.add(NormativeTypesEnum.ROOT.getNormativeName());
+		String vendorName = "Oracle";
+		String vendorRelease = "1.5";
+		String contactId = "jh0003";
+		String icon = "myICON";
+
+		// set resource details
+		contactId = null;
+
+		ResourceReqDetails resourceDetails2 = new ResourceReqDetails(resourceName, description, resourceTags, category,
+				derivedFrom, vendorName, vendorRelease, contactId, icon);
+
+		// create resource
+
+		RestResponse restResponse2 = ResourceRestUtils.createResource(resourceDetails2, sdncModifierDetails);
+
+		// validate response
+
+		ErrorInfo errorInfo = ErrorValidationUtils
+				.parseErrorConfigYaml(ActionStatus.COMPONENT_MISSING_CONTACT.name());
+
+		assertNotNull("check response object is not null after create resouce", restResponse2);
+		assertNotNull("check error code exists in response after create resource", restResponse2.getErrorCode());
+		assertEquals("Check response code after create service", errorInfo.getCode(), restResponse2.getErrorCode());
+
+		List<String> variables = Arrays.asList("Resource");
+		ErrorValidationUtils.checkBodyResponseOnError(ActionStatus.COMPONENT_MISSING_CONTACT.name(), variables,
+				restResponse2.getResponse());
+
+		// validate audit
+
+		ExpectedResourceAuditJavaObject expectedResourceAuditJavaObject = Convertor
+				.constructFieldsForAuditValidation(resourceDetails2, resourceVersion);
+
+		String auditAction = "Create";
+		expectedResourceAuditJavaObject.setAction(auditAction);
+		expectedResourceAuditJavaObject.setPrevState("");
+		expectedResourceAuditJavaObject.setPrevVersion("");
+		expectedResourceAuditJavaObject.setCurrState("");
+		expectedResourceAuditJavaObject.setCurrVersion("");
+		expectedResourceAuditJavaObject.setStatus(errorInfo.getCode().toString());
+
+		String auditDesc = AuditValidationUtils.buildAuditDescription(errorInfo, variables);
+		expectedResourceAuditJavaObject.setDesc(auditDesc);
+
+		AuditValidationUtils.validateAudit(expectedResourceAuditJavaObject, auditAction, null, false);
+
+	}
+
+	@Test
+	public void createResourceTest_with_empty_icon() throws Exception {
+		// init ADMIN user
+		User sdncModifierDetails = ElementFactory.getDefaultUser(UserRoleEnum.ADMIN);
+
+		// set resource details
+		String resourceName = "CISCO4";
+		String description = "description";
+		ArrayList<String> resourceTags = new ArrayList<String>();
+		resourceTags.add(resourceName);
+		String category = ServiceCategoriesEnum.VOIP.getValue();
+		ArrayList<String> derivedFrom = new ArrayList<String>();
+		derivedFrom.add(NormativeTypesEnum.ROOT.getNormativeName());
+		String vendorName = "Oracle";
+		String vendorRelease = "1.5";
+		String contactId = "jh0003";
+		String icon = "myICON";
+
+		// set resource details
+		icon = "";
+
+		ResourceReqDetails resourceDetails2 = new ResourceReqDetails(resourceName, description, resourceTags, category,
+				derivedFrom, vendorName, vendorRelease, contactId, icon);
+
+		// create resource
+
+		RestResponse restResponse2 = ResourceRestUtils.createResource(resourceDetails2, sdncModifierDetails);
+
+		// validate response
+
+		ErrorInfo errorInfo = ErrorValidationUtils.parseErrorConfigYaml(ActionStatus.COMPONENT_MISSING_ICON.name());
+
+		assertNotNull("check response object is not null after create resouce", restResponse2);
+		assertNotNull("check error code exists in response after create resource", restResponse2.getErrorCode());
+		assertEquals("Check response code after create service", errorInfo.getCode(), restResponse2.getErrorCode());
+
+		List<String> variables = Arrays.asList("Resource");
+		ErrorValidationUtils.checkBodyResponseOnError(ActionStatus.COMPONENT_MISSING_ICON.name(), variables,
+				restResponse2.getResponse());
+
+		// validate audit
+
+		ExpectedResourceAuditJavaObject expectedResourceAuditJavaObject = Convertor
+				.constructFieldsForAuditValidation(resourceDetails2, resourceVersion);
+
+		String auditAction = "Create";
+		expectedResourceAuditJavaObject.setAction(auditAction);
+		expectedResourceAuditJavaObject.setPrevState("");
+		expectedResourceAuditJavaObject.setPrevVersion("");
+		expectedResourceAuditJavaObject.setCurrState("");
+		expectedResourceAuditJavaObject.setCurrVersion("");
+		expectedResourceAuditJavaObject.setStatus(errorInfo.getCode().toString());
+
+		String auditDesc = AuditValidationUtils.buildAuditDescription(errorInfo, variables);
+		expectedResourceAuditJavaObject.setDesc(auditDesc);
+
+		AuditValidationUtils.validateAudit(expectedResourceAuditJavaObject, auditAction, null, false);
+
+	}
+
+	@Test
+	public void createResourceTest_without_icon() throws Exception {
+		// init ADMIN user
+		User sdncModifierDetails = ElementFactory.getDefaultUser(UserRoleEnum.ADMIN);
+
+		// set resource details
+		String resourceName = "CISCO4";
+		String description = "description";
+		ArrayList<String> resourceTags = new ArrayList<String>();
+		resourceTags.add(resourceName);
+		String category = ServiceCategoriesEnum.VOIP.getValue();
+		ArrayList<String> derivedFrom = new ArrayList<String>();
+		derivedFrom.add(NormativeTypesEnum.ROOT.getNormativeName());
+		String vendorName = "Oracle";
+		String vendorRelease = "1.5";
+		String contactId = "jh0003";
+		String icon = "myICON";
+
+		// set resource details
+		icon = null;
+
+		ResourceReqDetails resourceDetails2 = new ResourceReqDetails(resourceName, description, resourceTags, category,
+				derivedFrom, vendorName, vendorRelease, contactId, icon);
+
+		// create resource
+
+		RestResponse restResponse2 = ResourceRestUtils.createResource(resourceDetails2, sdncModifierDetails);
+
+		// validate response
+
+		ErrorInfo errorInfo = ErrorValidationUtils.parseErrorConfigYaml(ActionStatus.COMPONENT_MISSING_ICON.name());
+
+		assertNotNull("check response object is not null after create resouce", restResponse2);
+		assertNotNull("check error code exists in response after create resource", restResponse2.getErrorCode());
+		assertEquals("Check response code after create service", errorInfo.getCode(), restResponse2.getErrorCode());
+
+		List<String> variables = Arrays.asList("Resource");
+		ErrorValidationUtils.checkBodyResponseOnError(ActionStatus.COMPONENT_MISSING_ICON.name(), variables,
+				restResponse2.getResponse());
+
+		// validate audit
+
+		ExpectedResourceAuditJavaObject expectedResourceAuditJavaObject = Convertor
+				.constructFieldsForAuditValidation(resourceDetails2, resourceVersion);
+
+		String auditAction = "Create";
+		expectedResourceAuditJavaObject.setAction(auditAction);
+		expectedResourceAuditJavaObject.setPrevState("");
+		expectedResourceAuditJavaObject.setPrevVersion("");
+		expectedResourceAuditJavaObject.setCurrState("");
+		expectedResourceAuditJavaObject.setCurrVersion("");
+		expectedResourceAuditJavaObject.setStatus(errorInfo.getCode().toString());
+
+		String auditDesc = AuditValidationUtils.buildAuditDescription(errorInfo, variables);
+		expectedResourceAuditJavaObject.setDesc(auditDesc);
+
+		AuditValidationUtils.validateAudit(expectedResourceAuditJavaObject, auditAction, null, false);
+
+	}
+
+	@Test
+	public void createResourceTest_with_empty_description() throws Exception {
+		// init ADMIN user
+		User sdncModifierDetails = ElementFactory.getDefaultUser(UserRoleEnum.ADMIN);
+
+		// set resource details
+		String resourceName = "CISCO4";
+		String description = "description";
+		ArrayList<String> resourceTags = new ArrayList<String>();
+		resourceTags.add(resourceName);
+		String category = ServiceCategoriesEnum.VOIP.getValue();
+		ArrayList<String> derivedFrom = new ArrayList<String>();
+		derivedFrom.add(NormativeTypesEnum.ROOT.getNormativeName());
+		String vendorName = "Oracle";
+		String vendorRelease = "1.5";
+		String contactId = "jh0003";
+		String icon = "myICON";
+
+		// set resource details
+		description = "";
+
+		ResourceReqDetails resourceDetails2 = new ResourceReqDetails(resourceName, description, resourceTags, category,
+				derivedFrom, vendorName, vendorRelease, contactId, icon);
+
+		// create resource
+
+		RestResponse restResponse2 = ResourceRestUtils.createResource(resourceDetails2, sdncModifierDetails);
+
+		// validate response
+
+		ErrorInfo errorInfo = ErrorValidationUtils
+				.parseErrorConfigYaml(ActionStatus.COMPONENT_MISSING_DESCRIPTION.name());
+
+		assertNotNull("check response object is not null after create resouce", restResponse2);
+		assertNotNull("check error code exists in response after create resource", restResponse2.getErrorCode());
+		assertEquals("Check response code after create service", errorInfo.getCode(), restResponse2.getErrorCode());
+
+		List<String> variables = Arrays.asList("Resource");
+		ErrorValidationUtils.checkBodyResponseOnError(ActionStatus.COMPONENT_MISSING_DESCRIPTION.name(), variables,
+				restResponse2.getResponse());
+
+		// validate audit
+
+		ExpectedResourceAuditJavaObject expectedResourceAuditJavaObject = Convertor
+				.constructFieldsForAuditValidation(resourceDetails2, resourceVersion);
+
+		String auditAction = "Create";
+		expectedResourceAuditJavaObject.setAction(auditAction);
+		expectedResourceAuditJavaObject.setPrevState("");
+		expectedResourceAuditJavaObject.setPrevVersion("");
+		expectedResourceAuditJavaObject.setCurrState("");
+		expectedResourceAuditJavaObject.setCurrVersion("");
+		expectedResourceAuditJavaObject.setStatus(errorInfo.getCode().toString());
+
+		String auditDesc = AuditValidationUtils.buildAuditDescription(errorInfo, variables);
+		expectedResourceAuditJavaObject.setDesc(auditDesc);
+
+		AuditValidationUtils.validateAudit(expectedResourceAuditJavaObject, auditAction, null, false);
+
+	}
+
+	@Test
+	public void createResourceTest_without_description() throws Exception {
+		// init ADMIN user
+		User sdncModifierDetails = ElementFactory.getDefaultUser(UserRoleEnum.ADMIN);
+
+		// set resource details
+		String resourceName = "CISCO4";
+		String description = "description";
+		ArrayList<String> resourceTags = new ArrayList<String>();
+		resourceTags.add(resourceName);
+		String category = ServiceCategoriesEnum.VOIP.getValue();
+		ArrayList<String> derivedFrom = new ArrayList<String>();
+		derivedFrom.add(NormativeTypesEnum.ROOT.getNormativeName());
+		String vendorName = "Oracle";
+		String vendorRelease = "1.5";
+		String contactId = "jh0003";
+		String icon = "myICON";
+
+		// set resource details
+		description = null;
+
+		ResourceReqDetails resourceDetails2 = new ResourceReqDetails(resourceName, description, resourceTags, category,
+				derivedFrom, vendorName, vendorRelease, contactId, icon);
+
+		// create resource
+
+		RestResponse restResponse2 = ResourceRestUtils.createResource(resourceDetails2, sdncModifierDetails);
+
+		// validate response
+
+		ErrorInfo errorInfo = ErrorValidationUtils
+				.parseErrorConfigYaml(ActionStatus.COMPONENT_MISSING_DESCRIPTION.name());
+
+		assertNotNull("check response object is not null after create resouce", restResponse2);
+		assertNotNull("check error code exists in response after create resource", restResponse2.getErrorCode());
+		assertEquals("Check response code after create service", errorInfo.getCode(), restResponse2.getErrorCode());
+
+		List<String> variables = Arrays.asList("Resource");
+		ErrorValidationUtils.checkBodyResponseOnError(ActionStatus.COMPONENT_MISSING_DESCRIPTION.name(), variables,
+				restResponse2.getResponse());
+
+		// validate audit
+
+		ExpectedResourceAuditJavaObject expectedResourceAuditJavaObject = Convertor
+				.constructFieldsForAuditValidation(resourceDetails2, resourceVersion);
+
+		String auditAction = "Create";
+		expectedResourceAuditJavaObject.setAction(auditAction);
+		expectedResourceAuditJavaObject.setPrevState("");
+		expectedResourceAuditJavaObject.setPrevVersion("");
+		expectedResourceAuditJavaObject.setCurrState("");
+		expectedResourceAuditJavaObject.setCurrVersion("");
+		expectedResourceAuditJavaObject.setStatus(errorInfo.getCode().toString());
+
+		String auditDesc = AuditValidationUtils.buildAuditDescription(errorInfo, variables);
+		expectedResourceAuditJavaObject.setDesc(auditDesc);
+
+		AuditValidationUtils.validateAudit(expectedResourceAuditJavaObject, auditAction, null, false);
+
+	}
+
+	@Test
+	public void createAndGetResourceByNameAndVersion() throws Exception {
+
+		User sdncModifierDetails = ElementFactory.getDefaultUser(UserRoleEnum.ADMIN);
+		ResourceReqDetails resourceDetailsComp = ElementFactory.getDefaultResource("testresourceComp",
+				NormativeTypesEnum.COMPUTE, ResourceCategoryEnum.NETWORK_L2_3_ROUTERS, sdncModifierDetails.getUserId());
+
+		// create resource
+		RestResponse createResponse = ResourceRestUtils.createResource(resourceDetailsComp, sdncModifierDetails);
+		// validate response
+		assertEquals("Check response code after create resource", 201, createResponse.getErrorCode().intValue());
+
+		String resourceVersion = "0.1";
+		ResourceRespJavaObject resourceRespJavaObject = Convertor.constructFieldsForRespValidation(resourceDetailsComp,
+				resourceVersion);
+		resourceRespJavaObject.setLifecycleState((LifecycleStateEnum.NOT_CERTIFIED_CHECKOUT).toString());
+		resourceRespJavaObject.setAbstractt("false");
+		ResourceValidationUtils.validateResp(createResponse, resourceRespJavaObject);
+
+		// validate get response
+		RestResponse resourceGetResponse = ResourceRestUtils.getResourceByNameAndVersion(
+				sdncModifierDetails.getUserId(), resourceDetailsComp.getName(), resourceDetailsComp.getVersion());
+		assertEquals("Check response code after delete resource", 200, resourceGetResponse.getErrorCode().intValue());
+		// Resource resource =
+		// ResourceRestUtils.parseResourceFromListResp(resourceGetResponse);
+		ResourceValidationUtils.validateResp(resourceGetResponse, resourceRespJavaObject);
+		// resourceDetailsComp.setUniqueId(resource.getUniqueId());
+
+	}
+
+	@Test
+	public void createResourceResourceTypeNotExistsTest() throws Exception {
+
+		// init ADMIN user
+		User sdncModifierDetails = ElementFactory.getDefaultUser(UserRoleEnum.ADMIN);
+
+		ResourceReqDetails resourceDetails = ElementFactory.getDefaultResource();
+		String resourceType = "NOT EXISTS";
+		resourceDetails.setResourceType(resourceType);
+		// create resource
+		RestResponse createResponse = ResourceRestUtils.createResource(resourceDetails, sdncModifierDetails);
+
+		ErrorInfo errorInfo = ErrorValidationUtils.parseErrorConfigYaml(ActionStatus.INVALID_CONTENT.name());
+
+		assertNotNull("check response object is not null after create resouce", createResponse);
+		assertNotNull("check error code exists in response after create resource", createResponse.getErrorCode());
+		assertEquals("Check response code after create service", errorInfo.getCode(), createResponse.getErrorCode());
+
+		List<String> variables = new ArrayList<>();
+		ErrorValidationUtils.checkBodyResponseOnError(ActionStatus.INVALID_CONTENT.name(), variables,
+				createResponse.getResponse());
+
+		// validate audit
+		ExpectedResourceAuditJavaObject expectedResourceAuditJavaObject = Convertor
+				.constructFieldsForAuditValidation(resourceDetails, resourceVersion);
+		String auditAction = "Create";
+		expectedResourceAuditJavaObject.setAction(auditAction);
+		expectedResourceAuditJavaObject.setPrevState("");
+		expectedResourceAuditJavaObject.setPrevVersion("");
+		expectedResourceAuditJavaObject.setCurrState("");
+		expectedResourceAuditJavaObject.setCurrVersion("");
+		expectedResourceAuditJavaObject.setStatus(errorInfo.getCode().toString());
+
+		String auditDesc = AuditValidationUtils.buildAuditDescription(errorInfo, variables);
+		expectedResourceAuditJavaObject.setDesc(auditDesc);
+		AuditValidationUtils.validateAudit(expectedResourceAuditJavaObject, auditAction, null, false);
+	}
+
+	@Test
+	public void createResourceResourceTypeEmptyTest() throws Exception {
+
+		// init ADMIN user
+		User sdncModifierDetails = ElementFactory.getDefaultUser(UserRoleEnum.ADMIN);
+
+		ResourceReqDetails resourceDetails = ElementFactory.getDefaultResource();
+		// String resourceType = "";
+		// resourceDetails.setResourceType(resourceType);
+		// create resource
+		RestResponse createResponse = ResourceRestUtils.createResource(resourceDetails, sdncModifierDetails);
+
+		// ErrorInfo errorInfo =
+		// ErrorValidationUtils.parseErrorConfigYaml(ActionStatus.INVALID_CONTENT.name());
+		//
+		// assertNotNull("check response object is not null after create
+		// resouce", createResponse);
+		// assertNotNull("check error code exists in response after create
+		// resource", createResponse.getErrorCode());
+		// assertEquals("Check response code after create service",
+		// errorInfo.getCode(), createResponse.getErrorCode());
+		//
+		// List<String> variables = new ArrayList<>();
+		// ErrorValidationUtils.checkBodyResponseOnError(ActionStatus.INVALID_CONTENT.name(),
+		// variables, createResponse.getResponse());
+		//
+		// // validate audit
+		// ExpectedResourceAuditJavaObject expectedResourceAuditJavaObject =
+		// Convertor.constructFieldsForAuditValidation(resourceDetails,
+		// resourceVersion);
+		// String auditAction = "Create";
+		// expectedResourceAuditJavaObject.setAction(auditAction);
+		// expectedResourceAuditJavaObject.setPrevState("");
+		// expectedResourceAuditJavaObject.setPrevVersion("");
+		// expectedResourceAuditJavaObject.setCurrState("");
+		// expectedResourceAuditJavaObject.setCurrVersion("");
+		// expectedResourceAuditJavaObject.setResourceName("");
+		// expectedResourceAuditJavaObject.setModifierUid(ElementFactory.getDefaultUser(UserRoleEnum.ADMIN).getUserId());
+		// expectedResourceAuditJavaObject.setModifierName(ElementFactory.getDefaultUser(UserRoleEnum.ADMIN).getFullName());
+		// expectedResourceAuditJavaObject.setStatus(errorInfo.getCode().toString());
+		//
+		// String auditDesc =
+		// AuditValidationUtils.buildAuditDescription(errorInfo, variables);
+		// expectedResourceAuditJavaObject.setDesc(auditDesc);
+		// AuditValidationUtils.validateAudit(expectedResourceAuditJavaObject,
+		// auditAction, null, false);
+	}
+
+	@Test
+	public void checkInvariantUuidIsImmutable() throws Exception {
+		// choose the user to create resource
+		User sdncUserDetails = ElementFactory.getDefaultUser(UserRoleEnum.ADMIN);
+		ResourceReqDetails resourceDetails = ElementFactory.getDefaultResource();
+		String invariantUuidDefinedByUser = "!!!!!!!!!!!!!!!!!!!!!!!!";
+		resourceDetails.setInvariantUUID(invariantUuidDefinedByUser);
+		String resourceName = resourceDetails.getName();
+		resourceDetails.setTags(Arrays.asList(resourceName, resourceName, resourceName, resourceName, "tag2", "tag2"));
+		// create resource
+		RestResponse createResponse = ResourceRestUtils.createResource(resourceDetails, sdncUserDetails);
+		BaseRestUtils.checkStatusCode(createResponse, "create request failed", false, 201);
+		// validate response
+		assertNotNull("check response object is not null after create resource", createResponse);
+		assertNotNull("check error code exists in response after create resource", createResponse.getErrorCode());
+		assertEquals("Check response code after create resource", 201, createResponse.getErrorCode().intValue());
+
+		Resource resourceCreation = ResponseParser.convertResourceResponseToJavaObject(createResponse.getResponse());
+		String invariantUUIDcreation = resourceCreation.getInvariantUUID();
+		// validate response
+		ResourceRespJavaObject resourceRespJavaObject = Convertor.constructFieldsForRespValidation(resourceDetails,
+				resourceVersion);
+		resourceRespJavaObject.setLifecycleState((LifecycleStateEnum.NOT_CERTIFIED_CHECKOUT).toString());
+		resourceRespJavaObject.setAbstractt("false");
+		ResourceValidationUtils.validateResp(createResponse, resourceRespJavaObject);
+
+		// validate get response
+		RestResponse resourceGetResponse = ResourceRestUtils.getResource(sdncUserDetails,
+				resourceDetails.getUniqueId());
+		BaseRestUtils.checkSuccess(resourceGetResponse);
+		Resource resourceGetting = ResponseParser
+				.convertResourceResponseToJavaObject(resourceGetResponse.getResponse());
+		ResourceValidationUtils.validateResp(resourceGetResponse, resourceRespJavaObject);
+		String invariantUUIDgetting = resourceGetting.getInvariantUUID();
+		assertEquals(invariantUUIDcreation, invariantUUIDgetting);
+
+		// Update resource with new invariant UUID
+		RestResponse restResponseUpdate = ResourceRestUtils.updateResourceMetadata(resourceDetails, sdncUserDetails,
+				resourceDetails.getUniqueId());
+		BaseRestUtils.checkSuccess(restResponseUpdate);
+		Resource updatedResource = ResponseParser.convertResourceResponseToJavaObject(restResponseUpdate.getResponse());
+		String invariantUUIDupdating = updatedResource.getInvariantUUID();
+		assertEquals(invariantUUIDcreation, invariantUUIDupdating);
+
+		// Do checkin
+		RestResponse restResponseCheckin = LifecycleRestUtils.changeResourceState(resourceDetails, sdncUserDetails,
+				resourceDetails.getVersion(), LifeCycleStatesEnum.CHECKIN);
+		BaseRestUtils.checkSuccess(restResponseCheckin);
+		Resource checkinResource = ResponseParser
+				.convertResourceResponseToJavaObject(restResponseCheckin.getResponse());
+		String invariantUUIDcheckin = checkinResource.getInvariantUUID();
+		String version = checkinResource.getVersion();
+		assertEquals(invariantUUIDcreation, invariantUUIDcheckin);
+		assertEquals(version, "0.1");
+
+		// Do checkout
+		RestResponse restResponseCheckout = LifecycleRestUtils.changeResourceState(resourceDetails, sdncUserDetails,
+				resourceDetails.getVersion(), LifeCycleStatesEnum.CHECKOUT);
+		BaseRestUtils.checkSuccess(restResponseCheckout);
+		Resource ResourceResource = ResponseParser
+				.convertResourceResponseToJavaObject(restResponseCheckout.getResponse());
+		String invariantUUIDcheckout = ResourceResource.getInvariantUUID();
+		version = ResourceResource.getVersion();
+		assertEquals(invariantUUIDcreation, invariantUUIDcheckout);
+		assertEquals(version, "0.2");
+
+		/*// do certification request
+		RestResponse restResponseCertificationRequest = LifecycleRestUtils.changeResourceState(resourceDetails,
+				sdncUserDetails, resourceDetails.getVersion(), LifeCycleStatesEnum.CERTIFICATIONREQUEST);
+		BaseRestUtils.checkSuccess(restResponseCertificationRequest);
+		Resource certificationRequestResource = ResponseParser
+				.convertResourceResponseToJavaObject(restResponseCertificationRequest.getResponse());
+		String invariantUUIDcertificationRequest = certificationRequestResource.getInvariantUUID();
+		version = certificationRequestResource.getVersion();
+		assertEquals(invariantUUIDcreation, invariantUUIDcertificationRequest);
+		assertEquals(version, "0.2");
+
+		// start certification
+		RestResponse restResponseStartCertification = LifecycleRestUtils.changeResourceState(resourceDetails,
+				sdncUserDetails, resourceDetails.getVersion(), LifeCycleStatesEnum.STARTCERTIFICATION);
+		BaseRestUtils.checkSuccess(restResponseStartCertification);
+		Resource startCertificationRequestResource = ResponseParser
+				.convertResourceResponseToJavaObject(restResponseStartCertification.getResponse());
+		String invariantUUIDStartCertification = startCertificationRequestResource.getInvariantUUID();
+		version = startCertificationRequestResource.getVersion();
+		assertEquals(invariantUUIDcreation, invariantUUIDStartCertification);
+		assertEquals(version, "0.2");*/
+
+		// certify
+		RestResponse restResponseCertify = LifecycleRestUtils.changeResourceState(resourceDetails, sdncUserDetails,
+				resourceDetails.getVersion(), LifeCycleStatesEnum.CERTIFY);
+		BaseRestUtils.checkSuccess(restResponseCertify);
+		Resource certifyResource = ResponseParser
+				.convertResourceResponseToJavaObject(restResponseCertify.getResponse());
+		String invariantUUIDcertify = certifyResource.getInvariantUUID();
+		version = certifyResource.getVersion();
+		assertEquals(invariantUUIDcreation, invariantUUIDcertify);
+		assertEquals(version, "1.0");
+
+	}
+
+	// US672129 BENNY
+
+	private void getResourceValidateInvariantUuid(String resourceUniqueId, String invariantUUIDcreation)
+			throws Exception {
+		RestResponse getResource = ResourceRestUtils.getResource(ElementFactory.getDefaultUser(UserRoleEnum.DESIGNER),
+				resourceUniqueId);
+		BaseRestUtils.checkSuccess(getResource);
+		Resource resource = ResponseParser.parseToObjectUsingMapper(getResource.getResponse(), Resource.class);
+		assertEquals(invariantUUIDcreation, resource.getInvariantUUID());
+	}
+
+	@Test
+	public void resourceInvariantUuid() throws Exception {
+
+		User designerUser = ElementFactory.getDefaultUser(UserRoleEnum.DESIGNER);
+		User testerUser = ElementFactory.getDefaultUser(UserRoleEnum.TESTER);
+		ResourceReqDetails resourceDetails = ElementFactory.getDefaultResourceByType("VF200", NormativeTypesEnum.ROOT,
+				ResourceCategoryEnum.GENERIC_INFRASTRUCTURE, designerUser.getUserId(), ResourceTypeEnum.VF.toString());
+		ServiceReqDetails serviceDetails = ElementFactory.getDefaultService("newtestservice1",
+				ServiceCategoriesEnum.MOBILITY, designerUser.getUserId(),
+				ServiceInstantiationType.A_LA_CARTE.getValue());
+
+		// ResourceReqDetails resourceDetails =
+		// ElementFactory.getDefaultResource();
+		resourceDetails.setInvariantUUID("kokomoko");
+		RestResponse createResponse = ResourceRestUtils.createResource(resourceDetails, designerUser);
+		assertEquals("Check response code after create resource", BaseRestUtils.STATUS_CODE_CREATED,
+				createResponse.getErrorCode().intValue());
+		Resource resource = ResponseParser.parseToObjectUsingMapper(createResponse.getResponse(), Resource.class);
+		String invariantUUIDcreation = resource.getInvariantUUID(); // generated
+																	// when the
+																	// component
+																	// is
+																	// created
+																	// and never
+																	// changed
+		// get resource and verify InvariantUuid is not changed
+		getResourceValidateInvariantUuid(resource.getUniqueId(), invariantUUIDcreation);
+
+		// Update resource with new invariant UUID
+		resourceDetails.setInvariantUUID("1234567890");
+		RestResponse updateResponse = ResourceRestUtils.updateResourceMetadata(resourceDetails, designerUser,
+				resourceDetails.getUniqueId());
+		assertEquals("Check response code ", BaseRestUtils.STATUS_CODE_SUCCESS,
+				updateResponse.getErrorCode().intValue());
+		getResourceValidateInvariantUuid(resource.getUniqueId(), invariantUUIDcreation);
+
+		// checkIn resource
+		RestResponse restResponse = LifecycleRestUtils.changeResourceState(resourceDetails, designerUser,
+				resourceDetails.getVersion(), LifeCycleStatesEnum.CHECKIN);
+		assertEquals("Check response code ", BaseRestUtils.STATUS_CODE_SUCCESS, restResponse.getErrorCode().intValue());
+		assertEquals(invariantUUIDcreation, ResponseParser.getInvariantUuid(restResponse));
+		getResourceValidateInvariantUuid(resource.getUniqueId(), invariantUUIDcreation);
+
+		// checkIn resource
+		restResponse = LifecycleRestUtils.changeResourceState(resourceDetails, designerUser,
+				resourceDetails.getVersion(), LifeCycleStatesEnum.CHECKOUT);
+		assertEquals("Check response code ", BaseRestUtils.STATUS_CODE_SUCCESS, restResponse.getErrorCode().intValue());
+		assertEquals(invariantUUIDcreation, ResponseParser.getInvariantUuid(restResponse));
+		getResourceValidateInvariantUuid(resource.getUniqueId(), invariantUUIDcreation);
+		/*// certification request
+		restResponse = LifecycleRestUtils.changeResourceState(resourceDetails, designerUser,
+				LifeCycleStatesEnum.CERTIFICATIONREQUEST);
+		assertEquals("Check response code ", BaseRestUtils.STATUS_CODE_SUCCESS, restResponse.getErrorCode().intValue());
+		assertEquals(invariantUUIDcreation, ResponseParser.getInvariantUuid(restResponse));
+		getResourceValidateInvariantUuid(resource.getUniqueId(), invariantUUIDcreation);
+		// start certification
+		restResponse = LifecycleRestUtils.changeResourceState(resourceDetails, testerUser,
+				LifeCycleStatesEnum.STARTCERTIFICATION);
+		assertEquals("Check response code ", BaseRestUtils.STATUS_CODE_SUCCESS, restResponse.getErrorCode().intValue());
+		assertEquals(invariantUUIDcreation, ResponseParser.getInvariantUuid(restResponse));
+		getResourceValidateInvariantUuid(resource.getUniqueId(), invariantUUIDcreation);*/
+		// certify
+		restResponse = LifecycleRestUtils.changeResourceState(resourceDetails, designerUser, LifeCycleStatesEnum.CERTIFY);
+		assertEquals("Check response code ", BaseRestUtils.STATUS_CODE_SUCCESS, restResponse.getErrorCode().intValue());
+		assertEquals(invariantUUIDcreation, ResponseParser.getInvariantUuid(restResponse));
+		getResourceValidateInvariantUuid(resource.getUniqueId(), invariantUUIDcreation);
+		// update resource
+		restResponse = LifecycleRestUtils.changeResourceState(resourceDetails, designerUser,
+				LifeCycleStatesEnum.CHECKOUT);
+		assertEquals("Check response code ", BaseRestUtils.STATUS_CODE_SUCCESS, restResponse.getErrorCode().intValue());
+		resourceDetails.setDescription("updatedDescription");
+		resourceDetails.setVendorRelease("1.2.3.4");
+		updateResponse = ResourceRestUtils.updateResourceMetadata(resourceDetails, designerUser,
+				resourceDetails.getUniqueId());
+		assertEquals(BaseRestUtils.STATUS_CODE_SUCCESS, updateResponse.getErrorCode().intValue());
+		getResourceValidateInvariantUuid(resourceDetails.getUniqueId(), invariantUUIDcreation);
+
+		/*// certification request
+		restResponse = LifecycleRestUtils.changeResourceState(resourceDetails, designerUser,
+				LifeCycleStatesEnum.CERTIFICATIONREQUEST);
+		assertEquals(BaseRestUtils.STATUS_CODE_SUCCESS, restResponse.getErrorCode().intValue());
+		getResourceValidateInvariantUuid(resourceDetails.getUniqueId(), invariantUUIDcreation);*/
+
+		// checkout resource
+		restResponse = LifecycleRestUtils.changeResourceState(resourceDetails, designerUser,
+				LifeCycleStatesEnum.CHECKOUT);
+		assertEquals(BaseRestUtils.STATUS_CODE_SUCCESS, restResponse.getErrorCode().intValue());
+		getResourceValidateInvariantUuid(resourceDetails.getUniqueId(), invariantUUIDcreation);
+
+		/*// certification request
+		restResponse = LifecycleRestUtils.changeResourceState(resourceDetails, designerUser,
+				LifeCycleStatesEnum.CERTIFICATIONREQUEST);
+		assertEquals(BaseRestUtils.STATUS_CODE_SUCCESS, restResponse.getErrorCode().intValue());
+		getResourceValidateInvariantUuid(resourceDetails.getUniqueId(), invariantUUIDcreation);
+		// start certification
+		restResponse = LifecycleRestUtils.changeResourceState(resourceDetails, testerUser,
+				LifeCycleStatesEnum.STARTCERTIFICATION);
+		assertEquals(STATUS_CODE_SUCCESS, restResponse.getErrorCode().intValue());
+		getResourceValidateInvariantUuid(resourceDetails.getUniqueId(), invariantUUIDcreation);
+
+		// cancel certification
+		restResponse = LifecycleRestUtils.changeResourceState(resourceDetails, testerUser,
+				LifeCycleStatesEnum.CANCELCERTIFICATION);
+		assertEquals(STATUS_CODE_SUCCESS, restResponse.getErrorCode().intValue());
+		getResourceValidateInvariantUuid(resourceDetails.getUniqueId(), invariantUUIDcreation);
+
+		// start certification
+		restResponse = LifecycleRestUtils.changeResourceState(resourceDetails, testerUser,
+				LifeCycleStatesEnum.STARTCERTIFICATION);
+		assertEquals(STATUS_CODE_SUCCESS, restResponse.getErrorCode().intValue());
+		getResourceValidateInvariantUuid(resourceDetails.getUniqueId(), invariantUUIDcreation);
+
+		// failure
+		restResponse = LifecycleRestUtils.changeResourceState(resourceDetails, testerUser,
+				LifeCycleStatesEnum.FAILCERTIFICATION);
+		assertEquals(STATUS_CODE_SUCCESS, restResponse.getErrorCode().intValue());
+		getResourceValidateInvariantUuid(resourceDetails.getUniqueId(), invariantUUIDcreation);*/
+
+		// upload artifact
+		restResponse = LifecycleRestUtils.changeResourceState(resourceDetails, designerUser,
+				LifeCycleStatesEnum.CHECKOUT);
+		ArtifactReqDetails artifactDetails = ElementFactory.getDefaultArtifact();
+		ArtifactRestUtils.addInformationalArtifactToResource(artifactDetails, designerUser,
+				resourceDetails.getUniqueId());
+		assertEquals(STATUS_CODE_SUCCESS, restResponse.getErrorCode().intValue());
+		getResourceValidateInvariantUuid(resourceDetails.getUniqueId(), invariantUUIDcreation);
+
+		// checkIn resource
+		restResponse = LifecycleRestUtils.changeResourceState(resourceDetails, designerUser,
+				resourceDetails.getVersion(), LifeCycleStatesEnum.CHECKIN);
+		assertEquals("Check response code ", BaseRestUtils.STATUS_CODE_SUCCESS, restResponse.getErrorCode().intValue());
+		// create instance
+		RestResponse createServiceResponse = ServiceRestUtils.createService(serviceDetails, designerUser);
+		ResourceRestUtils.checkCreateResponse(createServiceResponse);
+		ComponentInstanceReqDetails resourceInstanceReqDetails = ElementFactory
+				.getComponentResourceInstance(resourceDetails);
+		RestResponse createResourceInstanceResponse = ComponentInstanceRestUtils.createComponentInstance(
+				resourceInstanceReqDetails, designerUser, serviceDetails.getUniqueId(), ComponentTypeEnum.SERVICE);
+		assertEquals("Check response code ", BaseRestUtils.STATUS_CODE_CREATED,
+				createResourceInstanceResponse.getErrorCode().intValue());
+		getResourceValidateInvariantUuid(resourceDetails.getUniqueId(), invariantUUIDcreation);
+
+	}
+
+}
diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/execute/resource/GetAllResourceVersions.java b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/execute/resource/GetAllResourceVersions.java
new file mode 100644
index 0000000000..77c5c3b274
--- /dev/null
+++ b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/execute/resource/GetAllResourceVersions.java
@@ -0,0 +1,575 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * SDC
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.sdc.ci.tests.execute.resource;
+
+import org.junit.rules.TestName;
+import org.openecomp.sdc.be.model.Resource;
+import org.openecomp.sdc.be.model.User;
+import org.openecomp.sdc.ci.tests.api.ComponentBaseTest;
+import org.openecomp.sdc.ci.tests.datatypes.ResourceReqDetails;
+import org.openecomp.sdc.ci.tests.datatypes.enums.LifeCycleStatesEnum;
+import org.openecomp.sdc.ci.tests.datatypes.enums.ResourceCategoryEnum;
+import org.openecomp.sdc.ci.tests.datatypes.enums.UserRoleEnum;
+import org.openecomp.sdc.ci.tests.datatypes.http.RestResponse;
+import org.openecomp.sdc.ci.tests.utils.DbUtils;
+import org.openecomp.sdc.ci.tests.utils.general.ElementFactory;
+import org.openecomp.sdc.ci.tests.utils.rest.LifecycleRestUtils;
+import org.openecomp.sdc.ci.tests.utils.rest.ResourceRestUtils;
+import org.openecomp.sdc.ci.tests.utils.rest.ResponseParser;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.testng.AssertJUnit;
+import org.testng.annotations.AfterMethod;
+import org.testng.annotations.BeforeMethod;
+import org.testng.annotations.Test;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Map;
+
+import static org.testng.AssertJUnit.assertEquals;
+import static org.testng.AssertJUnit.assertTrue;
+
+public class GetAllResourceVersions extends ComponentBaseTest {
+
+	private static Logger logger = LoggerFactory.getLogger(GetAllResourceVersions.class.getName());
+	protected User designerDetails = ElementFactory.getDefaultUser(UserRoleEnum.DESIGNER);
+	protected User adminModifierDetails = ElementFactory.getDefaultUser(UserRoleEnum.ADMIN);
+
+	protected ResourceReqDetails resourceDetails;
+
+	public static TestName name = new TestName();
+
+	//// NEW
+
+	protected void deleteAllVersionOfResource() throws Exception {
+		RestResponse response = null;
+
+		String[] versions = { "0.1", "0.2", "0.3", "0.4", "0.5", "0.6", "1.0", "1.1", "1.2", "1.3", "1.4", "1.5", "2.0",
+				"2.1", "2.2", "2.3", "2.4", "2.5", "3.0", "4.0", "4.1" };
+
+		for (String version : versions) {
+
+			response = ResourceRestUtils.deleteResourceByNameAndVersion(designerDetails,
+					resourceDetails.getName().toUpperCase(), version);
+			AssertJUnit.assertTrue("delete request returned status:" + response.getErrorCode(),
+					response.getErrorCode() == 204 || response.getErrorCode() == 404);
+
+			response = ResourceRestUtils.deleteResourceByNameAndVersion(designerDetails, resourceDetails.getName(),
+					version);
+			AssertJUnit.assertTrue("delete request returned status:" + response.getErrorCode(),
+					response.getErrorCode() == 204 || response.getErrorCode() == 404);
+
+		}
+	}
+
+	@BeforeMethod
+	public void init() throws Exception {
+		resourceDetails = defineResourse();
+		deleteAllVersionOfResource();
+
+	}
+
+	@AfterMethod
+	public void endOfTests() throws Exception {
+		deleteAllVersionOfResource();
+	}
+
+	protected ResourceReqDetails defineResourse() {
+		String resourceName = "cisco4";
+		String description = "description";
+		ArrayList<String> resourceTags = new ArrayList<String>();
+		resourceTags.add(resourceName);
+		// String category = ServiceCategoriesEnum.MOBILITY.getValue();
+		ArrayList<String> derivedFrom = new ArrayList<String>();
+		derivedFrom.add("tosca.nodes.Root");
+		String vendorName = "Oracle";
+		String vendorRelease = "1.5";
+		String contactId = "jh0003";
+		String icon = "myICON";
+
+		ResourceReqDetails resourceDetails = new ResourceReqDetails(resourceName, description, resourceTags, null,
+				derivedFrom, vendorName, vendorRelease, contactId, icon);
+		resourceDetails.addCategoryChain(ResourceCategoryEnum.GENERIC_INFRASTRUCTURE.getCategory(),
+				ResourceCategoryEnum.GENERIC_INFRASTRUCTURE.getSubCategory());
+
+		return resourceDetails;
+	}
+
+	@Test
+	public void getResourceAllVersions_version15() throws Exception {
+		// create resource
+		Map<String, String> origVersionsMap = new HashMap<String, String>();
+		RestResponse restResponse = createResource(designerDetails, resourceDetails);
+		AssertJUnit.assertTrue("create request returned status:" + restResponse.getErrorCode(),
+				restResponse.getErrorCode() == 201);
+		String resourceName = resourceDetails.getName();
+		// resourceUtils.addResourceMandatoryArtifacts(designerDetails,
+		// restResponse);
+
+		// change resource version to 0.5
+		RestResponse checkoutResource;
+		for (int x = 0; x < 4; x++) {
+			logger.debug("Changing resource life cycle ");
+			checkoutResource = LifecycleRestUtils.changeResourceState(resourceDetails, designerDetails,
+					resourceDetails.getVersion(), LifeCycleStatesEnum.CHECKIN);
+			AssertJUnit.assertEquals("Check response code after checkout resource", 200,
+					checkoutResource.getErrorCode().intValue());
+
+			logger.debug("Changing resource life cycle ");
+			checkoutResource = LifecycleRestUtils.changeResourceState(resourceDetails, designerDetails,
+					resourceDetails.getVersion(), LifeCycleStatesEnum.CHECKOUT);
+			AssertJUnit.assertEquals("Check response code after checkout resource", 200,
+					checkoutResource.getErrorCode().intValue());
+		}
+
+		logger.debug("Changing resource life cycle ");
+		checkoutResource = LifecycleRestUtils.changeResourceState(resourceDetails, designerDetails,
+				resourceDetails.getVersion(), LifeCycleStatesEnum.CHECKIN);
+		AssertJUnit.assertEquals("Check response code after checkout resource", 200,
+				checkoutResource.getErrorCode().intValue());
+		/*checkoutResource = LifecycleRestUtils.changeResourceState(resourceDetails, adminModifierDetails,
+				resourceDetails.getVersion(), LifeCycleStatesEnum.CERTIFICATIONREQUEST);
+		AssertJUnit.assertEquals("Check response code after checkout resource", 200,
+				checkoutResource.getErrorCode().intValue());
+		checkoutResource = LifecycleRestUtils.changeResourceState(resourceDetails, adminModifierDetails,
+				resourceDetails.getVersion(), LifeCycleStatesEnum.STARTCERTIFICATION);
+		AssertJUnit.assertEquals("Check response code after checkout resource", 200,
+				checkoutResource.getErrorCode().intValue());*/
+		checkoutResource = LifecycleRestUtils.changeResourceState(resourceDetails, adminModifierDetails,
+				resourceDetails.getVersion(), LifeCycleStatesEnum.CERTIFY);
+		AssertJUnit.assertEquals("Check response code after checkout resource", 200,
+				checkoutResource.getErrorCode().intValue());
+		origVersionsMap.put(resourceDetails.getVersion(), resourceDetails.getUniqueId());
+		// change resource version to 1.5
+		for (int x = 0; x < 5; x++) {
+			logger.debug("Changing resource life cycle ");
+			checkoutResource = LifecycleRestUtils.changeResourceState(resourceDetails, adminModifierDetails,
+					resourceDetails.getVersion(), LifeCycleStatesEnum.CHECKOUT);
+			origVersionsMap.put(resourceDetails.getVersion(), resourceDetails.getUniqueId());
+			AssertJUnit.assertEquals("Check response code after checkout resource", 200,
+					checkoutResource.getErrorCode().intValue());
+			checkoutResource = LifecycleRestUtils.changeResourceState(resourceDetails, adminModifierDetails,
+					resourceDetails.getVersion(), LifeCycleStatesEnum.CHECKIN);
+			AssertJUnit.assertEquals("Check response code after checkout resource", 200,
+					checkoutResource.getErrorCode().intValue());
+		}
+
+		// validate get response
+		RestResponse resourceGetResponse = ResourceRestUtils.getResource(designerDetails,
+				resourceDetails.getUniqueId());
+		Resource res = ResponseParser.convertResourceResponseToJavaObject(resourceGetResponse.getResponse());
+		Map<String, String> getVersionsMap = res.getAllVersions();
+		AssertJUnit.assertTrue(origVersionsMap.equals(getVersionsMap));
+
+	}
+
+	protected RestResponse createResource(User sdncModifierDetails, ResourceReqDetails resourceDetails)
+			throws Exception {
+		// clean ES DB
+		DbUtils.cleanAllAudits();
+
+		// create resource
+		RestResponse restResponse = ResourceRestUtils.createResource(resourceDetails, sdncModifierDetails);
+
+		// validate response
+		AssertJUnit.assertNotNull("check response object is not null after create resource", restResponse);
+		AssertJUnit.assertNotNull("check error code exists in response after create resource",
+				restResponse.getErrorCode());
+		AssertJUnit.assertEquals("Check response code after create resource", 201,
+				restResponse.getErrorCode().intValue());
+
+		return restResponse;
+	}
+
+	@Test
+	public void getResourceAllVersions_version05() throws Exception {
+
+		// create resource
+		RestResponse restResponse = createResource(designerDetails, resourceDetails);
+		Map<String, String> origVersionsMap = new HashMap<String, String>();
+		origVersionsMap.put(resourceDetails.getVersion(), resourceDetails.getUniqueId());
+		// resourceUtils.addResourceMandatoryArtifacts(designerDetails,
+		// restResponse);
+		// change resource version to 0.5
+		RestResponse checkoutResource;
+
+		logger.debug("Changing resource life cycle ");
+		for (int x = 0; x < 4; x++) {
+			checkoutResource = LifecycleRestUtils.changeResourceState(resourceDetails, designerDetails,
+					resourceDetails.getVersion(), LifeCycleStatesEnum.CHECKIN);
+			assertEquals("Check response code after checkout resource", 200,
+					checkoutResource.getErrorCode().intValue());
+			checkoutResource = LifecycleRestUtils.changeResourceState(resourceDetails, designerDetails,
+					resourceDetails.getVersion(), LifeCycleStatesEnum.CHECKOUT);
+			assertEquals("Check response code after checkout resource", 200,
+					checkoutResource.getErrorCode().intValue());
+			origVersionsMap.put(resourceDetails.getVersion(), resourceDetails.getUniqueId());
+		}
+		// validate get response
+		RestResponse resourceGetResponse = ResourceRestUtils.getResource(designerDetails,
+				resourceDetails.getUniqueId());
+		Resource res = ResponseParser.convertResourceResponseToJavaObject(resourceGetResponse.getResponse());
+		Map<String, String> getVersionsMap = res.getAllVersions();
+		assertTrue(origVersionsMap.equals(getVersionsMap));
+
+	}
+
+	@Test
+	public void getResourceAllVersions_version01() throws Exception {
+		// create resource
+		RestResponse restResponse = createResource(designerDetails, resourceDetails);
+		String resourceName = resourceDetails.getName();
+
+		Map<String, String> origVersionsMap = new HashMap<String, String>();
+		origVersionsMap.put(resourceDetails.getVersion(), resourceDetails.getUniqueId());
+
+		// resourceUtils.addResourceMandatoryArtifacts(designerDetails,
+		// restResponse);
+
+		// validate get response
+		RestResponse resourceGetResponse = ResourceRestUtils.getResource(designerDetails,
+				resourceDetails.getUniqueId());
+		Resource res = ResponseParser.convertResourceResponseToJavaObject(resourceGetResponse.getResponse());
+		Map<String, String> getVersionsMap = res.getAllVersions();
+		assertTrue(origVersionsMap.equals(getVersionsMap));
+
+	}
+
+	@Test
+	public void getResourceAllVersions_version25() throws Exception {
+
+		Map<String, String> origVersionsMap = new HashMap<String, String>();
+
+		// create resource
+		RestResponse restResponse = createResource(designerDetails, resourceDetails);
+		assertTrue("create request returned status:" + restResponse.getErrorCode(), restResponse.getErrorCode() == 201);
+		String resourceName = resourceDetails.getName();
+		// resourceUtils.addResourceMandatoryArtifacts(designerDetails,
+		// restResponse);
+
+		// change resource version to 0.5
+		RestResponse checkoutResource;
+		for (int x = 0; x < 4; x++) {
+			logger.debug("Changing resource life cycle ");
+			checkoutResource = LifecycleRestUtils.changeResourceState(resourceDetails, designerDetails,
+					resourceDetails.getVersion(), LifeCycleStatesEnum.CHECKIN);
+			assertEquals("Check response code after checkout resource", 200,
+					checkoutResource.getErrorCode().intValue());
+
+			logger.debug("Changing resource life cycle ");
+			checkoutResource = LifecycleRestUtils.changeResourceState(resourceDetails, designerDetails,
+					resourceDetails.getVersion(), LifeCycleStatesEnum.CHECKOUT);
+			assertEquals("Check response code after checkout resource", 200,
+					checkoutResource.getErrorCode().intValue());
+		}
+
+		// resource version 1.0
+		logger.debug("Changing resource life cycle ");
+		checkoutResource = LifecycleRestUtils.changeResourceState(resourceDetails, designerDetails,
+				resourceDetails.getVersion(), LifeCycleStatesEnum.CHECKIN);
+		assertEquals("Check response code after checkout resource", 200, checkoutResource.getErrorCode().intValue());
+/*		checkoutResource = LifecycleRestUtils.changeResourceState(resourceDetails, adminModifierDetails,
+				resourceDetails.getVersion(), LifeCycleStatesEnum.CERTIFICATIONREQUEST);
+		assertEquals("Check response code after checkout resource", 200, checkoutResource.getErrorCode().intValue());
+		checkoutResource = LifecycleRestUtils.changeResourceState(resourceDetails, adminModifierDetails,
+				resourceDetails.getVersion(), LifeCycleStatesEnum.STARTCERTIFICATION);
+		assertEquals("Check response code after checkout resource", 200, checkoutResource.getErrorCode().intValue());*/
+		checkoutResource = LifecycleRestUtils.changeResourceState(resourceDetails, adminModifierDetails,
+				resourceDetails.getVersion(), LifeCycleStatesEnum.CERTIFY);
+		assertEquals("Check response code after checkout resource", 200, checkoutResource.getErrorCode().intValue());
+		origVersionsMap.put(resourceDetails.getVersion(), resourceDetails.getUniqueId());
+
+		// change resource version to 1.5
+		for (int x = 0; x < 5; x++) {
+			logger.debug("Changing resource life cycle ");
+			checkoutResource = LifecycleRestUtils.changeResourceState(resourceDetails, adminModifierDetails,
+					resourceDetails.getVersion(), LifeCycleStatesEnum.CHECKOUT);
+			assertEquals("Check response code after checkout resource", 200,
+					checkoutResource.getErrorCode().intValue());
+			checkoutResource = LifecycleRestUtils.changeResourceState(resourceDetails, adminModifierDetails,
+					resourceDetails.getVersion(), LifeCycleStatesEnum.CHECKIN);
+			assertEquals("Check response code after checkout resource", 200,
+					checkoutResource.getErrorCode().intValue());
+		}
+
+		// resource version 2.0
+/*		checkoutResource = LifecycleRestUtils.changeResourceState(resourceDetails, adminModifierDetails,
+				resourceDetails.getVersion(), LifeCycleStatesEnum.CERTIFICATIONREQUEST);
+		assertEquals("Check response code after checkout resource", 200, checkoutResource.getErrorCode().intValue());
+		checkoutResource = LifecycleRestUtils.changeResourceState(resourceDetails, adminModifierDetails,
+				resourceDetails.getVersion(), LifeCycleStatesEnum.STARTCERTIFICATION);
+		assertEquals("Check response code after checkout resource", 200, checkoutResource.getErrorCode().intValue());*/
+		checkoutResource = LifecycleRestUtils.changeResourceState(resourceDetails, adminModifierDetails,
+				resourceDetails.getVersion(), LifeCycleStatesEnum.CERTIFY);
+		assertEquals("Check response code after checkout resource", 200, checkoutResource.getErrorCode().intValue());
+		origVersionsMap.put(resourceDetails.getVersion(), resourceDetails.getUniqueId());
+
+		// change resource version to 2.5
+		for (int x = 0; x < 5; x++) {
+			logger.debug("Changing resource life cycle ");
+			checkoutResource = LifecycleRestUtils.changeResourceState(resourceDetails, adminModifierDetails,
+					resourceDetails.getVersion(), LifeCycleStatesEnum.CHECKOUT);
+			assertEquals("Check response code after checkout resource", 200,
+					checkoutResource.getErrorCode().intValue());
+			origVersionsMap.put(resourceDetails.getVersion(), resourceDetails.getUniqueId());
+
+			checkoutResource = LifecycleRestUtils.changeResourceState(resourceDetails, adminModifierDetails,
+					resourceDetails.getVersion(), LifeCycleStatesEnum.CHECKIN);
+			assertEquals("Check response code after checkout resource", 200,
+					checkoutResource.getErrorCode().intValue());
+		}
+
+		// validate get response
+		RestResponse resourceGetResponse = ResourceRestUtils.getResource(designerDetails,
+				resourceDetails.getUniqueId());
+		Resource res = ResponseParser.convertResourceResponseToJavaObject(resourceGetResponse.getResponse());
+		Map<String, String> getVersionsMap = res.getAllVersions();
+		assertTrue(origVersionsMap.equals(getVersionsMap));
+
+	}
+
+	@Test
+	public void getResourceAllVersions_ReadyForCertification_version05() throws Exception {
+		Map<String, String> origVersionsMap = new HashMap<String, String>();
+		// create resource
+		RestResponse restResponse = createResource(designerDetails, resourceDetails);
+		assertTrue("create request returned status:" + restResponse.getErrorCode(), restResponse.getErrorCode() == 201);
+		origVersionsMap.put(resourceDetails.getVersion(), resourceDetails.getUniqueId());
+		String resourceName = resourceDetails.getName();
+		// resourceUtils.addResourceMandatoryArtifacts(designerDetails,
+		// restResponse);
+
+		// change resource version to 0.5
+		RestResponse checkoutResource;
+		for (int x = 0; x < 4; x++) {
+			logger.debug("Changing resource life cycle ");
+			checkoutResource = LifecycleRestUtils.changeResourceState(resourceDetails, designerDetails,
+					resourceDetails.getVersion(), LifeCycleStatesEnum.CHECKIN);
+			assertEquals("Check response code after checkout resource", 200,
+					checkoutResource.getErrorCode().intValue());
+
+			logger.debug("Changing resource life cycle ");
+			checkoutResource = LifecycleRestUtils.changeResourceState(resourceDetails, designerDetails,
+					resourceDetails.getVersion(), LifeCycleStatesEnum.CHECKOUT);
+			assertEquals("Check response code after checkout resource", 200,
+					checkoutResource.getErrorCode().intValue());
+			origVersionsMap.put(resourceDetails.getVersion(), resourceDetails.getUniqueId());
+		}
+
+		logger.debug("Changing resource life cycle ");
+		checkoutResource = LifecycleRestUtils.changeResourceState(resourceDetails, designerDetails,
+				resourceDetails.getVersion(), LifeCycleStatesEnum.CHECKIN);
+		assertEquals("Check response code after checkout resource", 200, checkoutResource.getErrorCode().intValue());
+		/*checkoutResource = LifecycleRestUtils.changeResourceState(resourceDetails, adminModifierDetails,
+				resourceDetails.getVersion(), LifeCycleStatesEnum.CERTIFICATIONREQUEST);
+		assertEquals("Check response code after checkout resource", 200, checkoutResource.getErrorCode().intValue());*/
+
+		// validate get response
+		RestResponse resourceGetResponse = ResourceRestUtils.getResource(designerDetails,
+				resourceDetails.getUniqueId());
+		Resource res = ResponseParser.convertResourceResponseToJavaObject(resourceGetResponse.getResponse());
+		Map<String, String> getVersionsMap = res.getAllVersions();
+		assertTrue(origVersionsMap.equals(getVersionsMap));
+
+	}
+
+	@Test
+	public void getResourceAllVersions_CertifactionInProgress_version05() throws Exception {
+		Map<String, String> origVersionsMap = new HashMap<>();
+		// create resource
+		RestResponse restResponse = createResource(designerDetails, resourceDetails);
+		assertTrue("create request returned status:" + restResponse.getErrorCode(), restResponse.getErrorCode() == 201);
+		origVersionsMap.put(resourceDetails.getVersion(), resourceDetails.getUniqueId());
+
+		String resourceName = resourceDetails.getName();
+		// resourceUtils.addResourceMandatoryArtifacts(designerDetails,
+		// restResponse);
+
+		// change resource version to 0.5
+		RestResponse checkoutResource;
+		for (int x = 0; x < 4; x++) {
+			logger.debug("Changing resource life cycle ");
+			checkoutResource = LifecycleRestUtils.changeResourceState(resourceDetails, designerDetails,
+					resourceDetails.getVersion(), LifeCycleStatesEnum.CHECKIN);
+			assertEquals("Check response code after checkout resource", 200,
+					checkoutResource.getErrorCode().intValue());
+
+			logger.debug("Changing resource life cycle ");
+			checkoutResource = LifecycleRestUtils.changeResourceState(resourceDetails, designerDetails,
+					resourceDetails.getVersion(), LifeCycleStatesEnum.CHECKOUT);
+			assertEquals("Check response code after checkout resource", 200,
+					checkoutResource.getErrorCode().intValue());
+			origVersionsMap.put(resourceDetails.getVersion(), resourceDetails.getUniqueId());
+		}
+
+		logger.debug("Changing resource life cycle ");
+		checkoutResource = LifecycleRestUtils.changeResourceState(resourceDetails, designerDetails,
+				resourceDetails.getVersion(), LifeCycleStatesEnum.CHECKIN);
+		assertEquals("Check response code after checkout resource", 200, checkoutResource.getErrorCode().intValue());
+/*		checkoutResource = LifecycleRestUtils.changeResourceState(resourceDetails, adminModifierDetails,
+				resourceDetails.getVersion(), LifeCycleStatesEnum.CERTIFICATIONREQUEST);
+		assertEquals("Check response code after checkout resource", 200, checkoutResource.getErrorCode().intValue());
+		checkoutResource = LifecycleRestUtils.changeResourceState(resourceDetails, adminModifierDetails,
+				resourceDetails.getVersion(), LifeCycleStatesEnum.STARTCERTIFICATION);
+		assertEquals("Check response code after checkout resource", 200, checkoutResource.getErrorCode().intValue());*/
+
+		// validate get response
+		RestResponse resourceGetResponse = ResourceRestUtils.getResource(designerDetails,
+				resourceDetails.getUniqueId());
+		Resource res = ResponseParser.convertResourceResponseToJavaObject(resourceGetResponse.getResponse());
+		Map<String, String> getVersionsMap = res.getAllVersions();
+		assertTrue(origVersionsMap.equals(getVersionsMap));
+
+	}
+
+	@Test
+	public void getResourceAllVersions_Certified_version10() throws Exception {
+
+		Map<String, String> origVersionsMap = new HashMap<String, String>();
+
+		// create resource
+		RestResponse restResponse = createResource(designerDetails, resourceDetails);
+		assertTrue("create request returned status:" + restResponse.getErrorCode(), restResponse.getErrorCode() == 201);
+		String resourceName = resourceDetails.getName();
+		// resourceUtils.addResourceMandatoryArtifacts(designerDetails,
+		// restResponse);
+
+		// change resource version to 0.5
+		RestResponse checkoutResource;
+		for (int x = 0; x < 4; x++) {
+			logger.debug("Changing resource life cycle ");
+			checkoutResource = LifecycleRestUtils.changeResourceState(resourceDetails, designerDetails,
+					resourceDetails.getVersion(), LifeCycleStatesEnum.CHECKIN);
+			assertEquals("Check response code after checkout resource", 200,
+					checkoutResource.getErrorCode().intValue());
+			checkoutResource = LifecycleRestUtils.changeResourceState(resourceDetails, designerDetails,
+					resourceDetails.getVersion(), LifeCycleStatesEnum.CHECKOUT);
+			assertEquals("Check response code after checkout resource", 200,
+					checkoutResource.getErrorCode().intValue());
+
+		}
+		logger.debug("Changing resource life cycle ");
+		checkoutResource = LifecycleRestUtils.changeResourceState(resourceDetails, designerDetails,
+				resourceDetails.getVersion(), LifeCycleStatesEnum.CHECKIN);
+		assertEquals("Check response code after checkout resource", 200, checkoutResource.getErrorCode().intValue());
+/*		checkoutResource = LifecycleRestUtils.changeResourceState(resourceDetails, adminModifierDetails,
+				resourceDetails.getVersion(), LifeCycleStatesEnum.CERTIFICATIONREQUEST);
+		assertEquals("Check response code after checkout resource", 200, checkoutResource.getErrorCode().intValue());
+		checkoutResource = LifecycleRestUtils.changeResourceState(resourceDetails, adminModifierDetails,
+				resourceDetails.getVersion(), LifeCycleStatesEnum.STARTCERTIFICATION);
+		assertEquals("Check response code after checkout resource", 200, checkoutResource.getErrorCode().intValue());*/
+		checkoutResource = LifecycleRestUtils.changeResourceState(resourceDetails, adminModifierDetails,
+				resourceDetails.getVersion(), LifeCycleStatesEnum.CERTIFY);
+		assertEquals("Check response code after checkout resource", 200, checkoutResource.getErrorCode().intValue());
+		origVersionsMap.put(resourceDetails.getVersion(), resourceDetails.getUniqueId());
+		// validate get response
+		RestResponse resourceGetResponse = ResourceRestUtils.getResource(designerDetails,
+				resourceDetails.getUniqueId());
+		Resource res = ResponseParser.convertResourceResponseToJavaObject(resourceGetResponse.getResponse());
+		Map<String, String> getVersionsMap = res.getAllVersions();
+		assertTrue(origVersionsMap.equals(getVersionsMap));
+
+	}
+
+	@Test
+	public void getResourceAllVersions_Certified_version20() throws Exception {
+
+		Map<String, String> origVersionsMap = new HashMap<String, String>();
+
+		// create resource
+		RestResponse restResponse = createResource(designerDetails, resourceDetails);
+		assertTrue("create request returned status:" + restResponse.getErrorCode(), restResponse.getErrorCode() == 201);
+		String resourceName = resourceDetails.getName();
+		// resourceUtils.addResourceMandatoryArtifacts(designerDetails,
+		// restResponse);
+
+		// change resource version to 0.5
+		RestResponse checkoutResource;
+		for (int x = 0; x < 4; x++) {
+			logger.debug("Changing resource life cycle ");
+			checkoutResource = LifecycleRestUtils.changeResourceState(resourceDetails, designerDetails,
+					resourceDetails.getVersion(), LifeCycleStatesEnum.CHECKIN);
+			assertEquals("Check response code after checkout resource", 200,
+					checkoutResource.getErrorCode().intValue());
+			checkoutResource = LifecycleRestUtils.changeResourceState(resourceDetails, designerDetails,
+					resourceDetails.getVersion(), LifeCycleStatesEnum.CHECKOUT);
+			assertEquals("Check response code after checkout resource", 200,
+					checkoutResource.getErrorCode().intValue());
+		}
+
+		// get to version 1.0
+		checkoutResource = LifecycleRestUtils.changeResourceState(resourceDetails, designerDetails,
+				resourceDetails.getVersion(), LifeCycleStatesEnum.CHECKIN);
+		assertEquals("Check response code after checkout resource", 200, checkoutResource.getErrorCode().intValue());
+/*		checkoutResource = LifecycleRestUtils.changeResourceState(resourceDetails, adminModifierDetails,
+				resourceDetails.getVersion(), LifeCycleStatesEnum.CERTIFICATIONREQUEST);
+		assertEquals("Check response code after checkout resource", 200, checkoutResource.getErrorCode().intValue());
+		checkoutResource = LifecycleRestUtils.changeResourceState(resourceDetails, adminModifierDetails,
+				resourceDetails.getVersion(), LifeCycleStatesEnum.STARTCERTIFICATION);
+		assertEquals("Check response code after checkout resource", 200, checkoutResource.getErrorCode().intValue());*/
+		checkoutResource = LifecycleRestUtils.changeResourceState(resourceDetails, adminModifierDetails,
+				resourceDetails.getVersion(), LifeCycleStatesEnum.CERTIFY);
+		assertEquals("Check response code after checkout resource", 200, checkoutResource.getErrorCode().intValue());
+		origVersionsMap.put(resourceDetails.getVersion(), resourceDetails.getUniqueId());
+
+		// change resource version to 1.5
+		for (int x = 0; x < 4; x++) {
+			checkoutResource = LifecycleRestUtils.changeResourceState(resourceDetails, designerDetails,
+					resourceDetails.getVersion(), LifeCycleStatesEnum.CHECKOUT);
+			assertEquals("Check response code after checkout resource", 200,
+					checkoutResource.getErrorCode().intValue());
+			checkoutResource = LifecycleRestUtils.changeResourceState(resourceDetails, designerDetails,
+					resourceDetails.getVersion(), LifeCycleStatesEnum.CHECKIN);
+			assertEquals("Check response code after checkout resource", 200,
+					checkoutResource.getErrorCode().intValue());
+		}
+
+		// get to version 1.0
+/*		checkoutResource = LifecycleRestUtils.changeResourceState(resourceDetails, adminModifierDetails,
+				resourceDetails.getVersion(), LifeCycleStatesEnum.CERTIFICATIONREQUEST);
+		assertEquals("Check response code after checkout resource", 200, checkoutResource.getErrorCode().intValue());
+		checkoutResource = LifecycleRestUtils.changeResourceState(resourceDetails, adminModifierDetails,
+				resourceDetails.getVersion(), LifeCycleStatesEnum.STARTCERTIFICATION);
+		assertEquals("Check response code after checkout resource", 200, checkoutResource.getErrorCode().intValue());*/
+		checkoutResource = LifecycleRestUtils.changeResourceState(resourceDetails, adminModifierDetails,
+				resourceDetails.getVersion(), LifeCycleStatesEnum.CERTIFY);
+		assertEquals("Check response code after checkout resource", 200, checkoutResource.getErrorCode().intValue());
+		origVersionsMap.put(resourceDetails.getVersion(), resourceDetails.getUniqueId());
+
+		// validate get response
+		RestResponse resourceGetResponse = ResourceRestUtils.getResource(designerDetails,
+				resourceDetails.getUniqueId());
+		Resource res = ResponseParser.convertResourceResponseToJavaObject(resourceGetResponse.getResponse());
+		Map<String, String> getVersionsMap = res.getAllVersions();
+		assertTrue(origVersionsMap.equals(getVersionsMap));
+
+	}
+
+	@Test
+	public void getResourceAllVersions_ResourceNotFound() throws Exception {
+
+		RestResponse resourceGetResponse = ResourceRestUtils.getResource(designerDetails, "123456789");
+		assertEquals("Check response code after checkout resource", 404, resourceGetResponse.getErrorCode().intValue());
+
+	}
+
+}
diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/execute/resource/ResourceApiTest.java b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/execute/resource/ResourceApiTest.java
new file mode 100644
index 0000000000..290220671c
--- /dev/null
+++ b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/execute/resource/ResourceApiTest.java
@@ -0,0 +1,364 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * SDC
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.sdc.ci.tests.execute.resource;
+
+import com.google.gson.Gson;
+import org.apache.http.client.methods.CloseableHttpResponse;
+import org.apache.http.client.methods.HttpGet;
+import org.apache.http.impl.client.CloseableHttpClient;
+import org.apache.http.impl.client.HttpClients;
+import org.apache.http.util.EntityUtils;
+import org.json.simple.JSONArray;
+import org.json.simple.JSONObject;
+import org.json.simple.JSONValue;
+import org.junit.Rule;
+import org.junit.rules.TestName;
+import org.openecomp.sdc.be.model.Resource;
+import org.openecomp.sdc.be.model.User;
+import org.openecomp.sdc.ci.tests.api.ComponentBaseTest;
+import org.openecomp.sdc.ci.tests.api.Urls;
+import org.openecomp.sdc.ci.tests.config.Config;
+import org.openecomp.sdc.ci.tests.datatypes.ResourceReqDetails;
+import org.openecomp.sdc.ci.tests.datatypes.enums.ResourceCategoryEnum;
+import org.openecomp.sdc.ci.tests.datatypes.enums.ServiceCategoriesEnum;
+import org.openecomp.sdc.ci.tests.datatypes.enums.UserRoleEnum;
+import org.openecomp.sdc.ci.tests.datatypes.http.HttpHeaderEnum;
+import org.openecomp.sdc.ci.tests.datatypes.http.HttpRequest;
+import org.openecomp.sdc.ci.tests.datatypes.http.RestResponse;
+import org.openecomp.sdc.ci.tests.utils.Utils;
+import org.openecomp.sdc.ci.tests.utils.general.ElementFactory;
+import org.openecomp.sdc.ci.tests.utils.rest.CatalogRestUtils;
+import org.openecomp.sdc.ci.tests.utils.rest.ResourceRestUtils;
+import org.openecomp.sdc.ci.tests.utils.rest.ResponseParser;
+import org.openecomp.sdc.ci.tests.utils.validation.ResourceValidationUtils;
+import org.testng.annotations.Test;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Map;
+
+import static org.testng.AssertJUnit.*;
+
+public class ResourceApiTest extends ComponentBaseTest {
+
+	protected final String contentTypeHeaderData = "application/json";
+	protected final String acceptHeaderDate = "application/json";
+
+	@Rule
+	public static TestName name = new TestName();
+
+	// Keep
+	@Test
+	public void updateResourceMetadataSuccess() throws Exception {
+		User sdncModifierDetails = ElementFactory.getDefaultUser(UserRoleEnum.ADMIN);
+		sdncModifierDetails.setUserId("jh0003");
+		RestResponse restResponse = createResourceForUpdate(sdncModifierDetails);
+		Resource resourceRespJavaObject = ResponseParser
+				.convertResourceResponseToJavaObject(restResponse.getResponse());
+
+		Config config = Utils.getConfig();
+		Map<String, String> headersMap = new HashMap<String, String>();
+		headersMap.put(HttpHeaderEnum.CONTENT_TYPE.getValue(), contentTypeHeaderData);
+		headersMap.put(HttpHeaderEnum.ACCEPT.getValue(), acceptHeaderDate);
+		headersMap.put(HttpHeaderEnum.USER_ID.getValue(), sdncModifierDetails.getUserId());
+
+		// set resource details
+		ResourceReqDetails resourceDetails = new ResourceReqDetails();
+		resourceDetails.setDescription("updatedDescription");
+		ArrayList<String> resourceTags = new ArrayList<String>();
+		// Duplicate tags are allowed and should be de-duplicated by the server
+		// side
+		resourceTags.add(resourceRespJavaObject.getName());
+		resourceTags.add("tag1");
+		resourceTags.add("tag1");
+		resourceTags.add("tag2");
+		resourceTags.add("tag2");
+		resourceDetails.setTags(resourceTags);
+		resourceDetails.addCategoryChain(ResourceCategoryEnum.NETWORK_L2_3_ROUTERS.getCategory(),
+				ResourceCategoryEnum.NETWORK_L2_3_ROUTERS.getSubCategory());
+		resourceDetails.setVendorName("OracleUp");
+		resourceDetails.setVendorRelease("1.5Up");
+		resourceDetails.setContactId("pe1116");
+
+		resourceDetails.setIcon(resourceRespJavaObject.getIcon());
+		resourceDetails.setName(resourceRespJavaObject.getName());
+		resourceDetails.setDerivedFrom(resourceRespJavaObject.getDerivedFrom());
+
+		// ResourceReqDetails resourceDetails = new
+		// ResourceReqDetails(resourceName, description, resourceTags, category,
+		// derivedFrom, vendorName, vendorRelease, contactId, null);
+
+		Gson gson = new Gson();
+		String userBodyJson = gson.toJson(resourceDetails);
+		HttpRequest http = new HttpRequest();
+		String url = String.format(Urls.UPDATE_RESOURCE_METADATA, config.getCatalogBeHost(), config.getCatalogBePort(),
+				resourceRespJavaObject.getUniqueId());
+		RestResponse updateResourceResponse = http.httpSendByMethod(url, "PUT", userBodyJson, headersMap);
+
+		// resourceDetails.setResourceName(resourceRespJavaObject.getResourceName());
+		ResourceValidationUtils.validateResourceReqVsResp(resourceDetails,
+				ResponseParser.convertResourceResponseToJavaObject(updateResourceResponse.getResponse()));
+
+		// Delete resource
+		deleteResource(resourceRespJavaObject.getUniqueId(), sdncModifierDetails.getUserId());
+
+	}
+
+	protected void deleteResource(String resourceUniqueId, String httpCspUserId) throws Exception {
+		RestResponse res = ResourceRestUtils.deleteResource(resourceUniqueId, httpCspUserId);
+
+		// System.out.println("Delete resource was finished with response: " +
+		// res.getErrorCode());
+	}
+
+	protected RestResponse createResourceForUpdate(User sdncModifierDetails) throws Exception {
+
+		ResourceReqDetails resourceDetails = getResourceObj();
+
+		// create resource
+		return ResourceRestUtils.createResource(resourceDetails, sdncModifierDetails);
+
+	}
+
+	public ResourceReqDetails getResourceObj() {
+		// set resource details
+		String resourceName = "ResourceForUpdate" + (int) (Math.random() * 100);
+		String description = "description";
+		ArrayList<String> resourceTags = new ArrayList<String>();
+		resourceTags.add(resourceName);
+		// String category = ResourceCategoriesEnum.MOBILITY.getValue();
+		ArrayList<String> derivedFrom = new ArrayList<String>();
+		derivedFrom.add("tosca.nodes.Root");
+		String vendorName = "Oracle";
+		String vendorRelease = "1.5";
+		String contactId = "pe1116";
+		String icon = "myICON";
+
+		ResourceReqDetails resourceDetails = new ResourceReqDetails(resourceName, description, resourceTags, null,
+				derivedFrom, vendorName, vendorRelease, contactId, icon);
+		resourceDetails.addCategoryChain(ResourceCategoryEnum.GENERIC_INFRASTRUCTURE.getCategory(),
+				ResourceCategoryEnum.GENERIC_INFRASTRUCTURE.getSubCategory());
+		return resourceDetails;
+	}
+
+	// -------------------------------------------------------------------
+
+	protected ResourceReqDetails defineResourse_Benny(int n) {
+		String resourceName = "cisco" + String.valueOf(n);
+		String description = "description";
+		ArrayList<String> resourceTags = new ArrayList<String>();
+		resourceTags.add("tag1");
+		String category = ServiceCategoriesEnum.MOBILITY.getValue();
+		ArrayList<String> derivedFrom = new ArrayList<String>();
+		derivedFrom.add("tosca.nodes.Root");
+		String vendorName = "Oracle";
+		String vendorRelease = "1.5";
+		String contactId = "jh0003";
+		String icon = "borderElement";
+
+		ResourceReqDetails resourceDetails = new ResourceReqDetails(resourceName, description, resourceTags, category,
+				derivedFrom, vendorName, vendorRelease, contactId, icon);
+
+		return resourceDetails;
+	}
+
+	@Test
+	public void getAllAbstractResources() throws Exception {
+		RestResponse abstractResources = CatalogRestUtils.getAbstractResources();
+
+		int status = abstractResources.getErrorCode();
+		assertTrue(status == 200);
+		String json = abstractResources.getResponse();
+		JSONArray array = (JSONArray) JSONValue.parse(json);
+		for (Object o : array) {
+			JSONObject value = (JSONObject) o;
+			Boolean element = (Boolean) value.get("abstract");
+			assertTrue(element);
+		}
+
+	}
+
+	@Test
+	public void getAllNotAbstractResources() throws Exception {
+		CloseableHttpClient httpclient = HttpClients.createDefault();
+		try {
+			String url = String.format(Urls.GET_ALL_NOT_ABSTRACT_RESOURCES, config.getCatalogBeHost(),
+					config.getCatalogBePort());
+			HttpGet httpget = new HttpGet(url);
+
+			httpget.addHeader(HttpHeaderEnum.CONTENT_TYPE.getValue(), contentTypeHeaderData);
+
+			httpget.addHeader(HttpHeaderEnum.ACCEPT.getValue(), acceptHeaderDate);
+
+			httpget.addHeader(HttpHeaderEnum.USER_ID.getValue(),
+					ElementFactory.getDefaultUser(UserRoleEnum.DESIGNER).getUserId());
+
+			// System.out.println("Executing request " +
+			// httpget.getRequestLine());
+			CloseableHttpResponse response = httpclient.execute(httpget);
+			int status = response.getStatusLine().getStatusCode();
+			assertTrue(status == 200);
+			try {
+				String json = EntityUtils.toString(response.getEntity());
+				JSONArray array = (JSONArray) JSONValue.parse(json);
+				for (Object o : array) {
+					JSONObject value = (JSONObject) o;
+					Boolean element = (Boolean) value.get("abstract");
+					assertTrue(!element);
+				}
+
+			} finally {
+				response.close();
+			}
+		} finally {
+			httpclient.close();
+		}
+	}
+
+	@Test
+	public void updateResourceMetadata_methodNotAllowed() throws Exception {
+		User sdncModifierDetails = ElementFactory.getDefaultUser(UserRoleEnum.ADMIN);
+		Config config = Utils.getConfig();
+		Map<String, String> headersMap = new HashMap<String, String>();
+		headersMap.put(HttpHeaderEnum.CONTENT_TYPE.getValue(), contentTypeHeaderData);
+		headersMap.put(HttpHeaderEnum.ACCEPT.getValue(), acceptHeaderDate);
+		headersMap.put(HttpHeaderEnum.USER_ID.getValue(), sdncModifierDetails.getUserId());
+
+		// set resource details
+		String resourceName = "ResForUpdate";
+		String description = "updatedDescription";
+		ArrayList<String> resourceTags = new ArrayList<String>();
+		resourceTags.add("tag1");
+		resourceTags.add("tag2");
+		ArrayList<String> derivedFrom = new ArrayList<String>();
+		derivedFrom.add("tosca.nodes.root");
+		String category = ServiceCategoriesEnum.VOIP.getValue();
+		String vendorName = "OracleUp";
+		String vendorRelease = "1.5Up";
+		String contactId = "pe1117";
+		String icon = "myICON.jpgUp";
+
+		ResourceReqDetails resourceDetails = new ResourceReqDetails(resourceName, description, resourceTags, category,
+				derivedFrom, vendorName, vendorRelease, contactId, icon);
+
+		Gson gson = new Gson();
+		String userBodyJson = gson.toJson(resourceDetails);
+		HttpRequest http = new HttpRequest();
+		String url = String.format(Urls.UPDATE_RESOURCE_METADATA, config.getCatalogBeHost(), config.getCatalogBePort(),
+				"NotExistsId");
+
+		RestResponse updateResourceResponse = http.httpSendByMethod(url, "POST", userBodyJson, headersMap);
+
+		assertNotNull("Check error code exists in response after wrong update resource",
+				updateResourceResponse.getErrorCode());
+		assertEquals("Check error code after update resource", 405, updateResourceResponse.getErrorCode().intValue());
+	}
+
+	@Test
+	public void validateResourceNameTest() throws Exception {
+		User sdncModifierDetails = ElementFactory.getDefaultUser(UserRoleEnum.ADMIN);
+		sdncModifierDetails.setUserId("jh0003");
+
+		ResourceReqDetails resourceDetails = getResourceObj();
+
+		// create resource
+		RestResponse restResponse = ResourceRestUtils.createResource(resourceDetails, sdncModifierDetails);
+		Resource resourceRespJavaObject = ResponseParser
+				.convertResourceResponseToJavaObject(restResponse.getResponse());
+		CloseableHttpClient httpclient = HttpClients.createDefault();
+		try {
+
+			// check invalid
+			String url = String.format(Urls.VALIDATE_RESOURCE_NAME, config.getCatalogBeHost(),
+					config.getCatalogBePort(), resourceDetails.getName());
+
+			HttpGet httpget = new HttpGet(url);
+
+			httpget.addHeader(HttpHeaderEnum.CONTENT_TYPE.getValue(), contentTypeHeaderData);
+
+			httpget.addHeader(HttpHeaderEnum.ACCEPT.getValue(), acceptHeaderDate);
+
+			httpget.addHeader(HttpHeaderEnum.USER_ID.getValue(), sdncModifierDetails.getUserId());
+
+			// System.out.println("Executing request " +
+			// httpget.getRequestLine());
+			CloseableHttpResponse response = httpclient.execute(httpget);
+			int status = response.getStatusLine().getStatusCode();
+			assertTrue(status == 200);
+			try {
+				String json = EntityUtils.toString(response.getEntity());
+				JSONObject object = (JSONObject) JSONValue.parse(json);
+				Boolean element = (Boolean) object.get("isValid");
+				assertTrue(!element);
+
+			} finally {
+				response.close();
+			}
+			// check valid
+			url = String.format(Urls.VALIDATE_RESOURCE_NAME, config.getCatalogBeHost(), config.getCatalogBePort(),
+					resourceDetails.getName() + "temp");
+
+			httpget = new HttpGet(url);
+
+			httpget.addHeader(HttpHeaderEnum.CONTENT_TYPE.getValue(), contentTypeHeaderData);
+
+			httpget.addHeader(HttpHeaderEnum.ACCEPT.getValue(), acceptHeaderDate);
+
+			httpget.addHeader(HttpHeaderEnum.USER_ID.getValue(), sdncModifierDetails.getUserId());
+
+			// System.out.println("Executing request " +
+			// httpget.getRequestLine());
+			response = httpclient.execute(httpget);
+			status = response.getStatusLine().getStatusCode();
+			assertTrue(status == 200);
+			try {
+				String json = EntityUtils.toString(response.getEntity());
+				JSONObject object = (JSONObject) JSONValue.parse(json);
+				Boolean element = (Boolean) object.get("isValid");
+				assertTrue(element);
+
+			} finally {
+				response.close();
+			}
+		} finally {
+			httpclient.close();
+		}
+
+		// Delete resource
+		ResourceRestUtils.deleteResource(resourceDetails, sdncModifierDetails, "0.1");
+
+	}
+
+	// -------------------------------------------------------------------
+	// //Benny Tal
+	// @Test
+	// public void createResource_Benny() throws Exception {
+	// for (int i = 0; i < 100; i++) {
+	// ResourceReqDetails resourceDetails = defineResourse_Benny(i);
+	//
+	// ResourceRestUtils.createResource(resourceDetails,
+	// UserUtils.getDesignerDetails());
+	// // resourceUtils.deleteResource(resourceDetails,
+	// UserUtils.getDesignerDetails(), "0.1");
+	// }
+	// }
+
+}
diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/execute/resource/SampleDataProvider.java b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/execute/resource/SampleDataProvider.java
new file mode 100644
index 0000000000..8b8c6533cb
--- /dev/null
+++ b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/execute/resource/SampleDataProvider.java
@@ -0,0 +1,41 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * SDC
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.sdc.ci.tests.execute.resource;
+
+import org.openecomp.sdc.be.datatypes.enums.ResourceTypeEnum;
+import org.openecomp.sdc.ci.tests.datatypes.enums.UserRoleEnum;
+import org.openecomp.sdc.ci.tests.utils.general.AtomicOperationUtils;
+import org.testng.ITestContext;
+import org.testng.annotations.DataProvider;
+
+import java.io.IOException;
+
+public class SampleDataProvider {
+
+	@DataProvider
+	public static Object[][] getResourceByType(ITestContext context) throws IOException, Exception {
+		return new Object[][] {
+				{ AtomicOperationUtils.createResourceByType(ResourceTypeEnum.VFC, UserRoleEnum.DESIGNER, true) },
+				{ AtomicOperationUtils.createResourceByType(ResourceTypeEnum.CP, UserRoleEnum.DESIGNER, true) },
+				{ AtomicOperationUtils.createResourceByType(ResourceTypeEnum.VL, UserRoleEnum.DESIGNER, true) } };
+	}
+
+}
diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/execute/resource/SimultaneousApiTest.java b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/execute/resource/SimultaneousApiTest.java
new file mode 100644
index 0000000000..e9a996c6e3
--- /dev/null
+++ b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/execute/resource/SimultaneousApiTest.java
@@ -0,0 +1,119 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * SDC
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.sdc.ci.tests.execute.resource;
+
+import org.junit.Rule;
+import org.junit.rules.TestName;
+import org.openecomp.sdc.ci.tests.api.ComponentBaseTest;
+import org.openecomp.sdc.ci.tests.datatypes.ResourceReqDetails;
+import org.openecomp.sdc.ci.tests.datatypes.enums.UserRoleEnum;
+import org.openecomp.sdc.ci.tests.datatypes.http.RestResponse;
+import org.openecomp.sdc.ci.tests.utils.general.ElementFactory;
+import org.openecomp.sdc.ci.tests.utils.rest.ResourceRestUtils;
+import org.openecomp.sdc.ci.tests.utils.rest.ResponseParser;
+import org.testng.annotations.Test;
+
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+
+public class SimultaneousApiTest extends ComponentBaseTest {
+
+	protected static ResourceReqDetails resourceDetails = ElementFactory.getDefaultResource();
+
+	@Rule
+	public static TestName name = new TestName();
+
+	static String httpCspUserId = "km2000";
+	static String userFirstName = "Kot";
+	static String userLastName = "Matroskin";
+	static String email = "km2000@intl.sdc.com";
+	static String role = ElementFactory.getDefaultUser(UserRoleEnum.ADMIN).getRole();
+
+	public static class WorkerThread implements Runnable {
+		CountDownLatch countDownLatch;
+		int threadIndex;
+
+		public WorkerThread(int threadIndex, CountDownLatch countDownLatch) {
+			this.threadIndex = threadIndex;
+			this.countDownLatch = countDownLatch;
+		}
+
+		@Override
+		public void run() {
+			System.out.println("**** Thread started " + threadIndex);
+			try {
+				RestResponse createResource = ResourceRestUtils.createResource(resourceDetails,
+						ElementFactory.getDefaultUser(UserRoleEnum.DESIGNER));
+				String id = ResponseParser.getUniqueIdFromResponse(createResource);
+				// System.out.println("**** Thread " + threadIndex + " create
+				// resource status " + createResource.getErrorCode() + " id = "
+				// + id + " error " + createResource.getResponse());
+				// assertEquals("**** create resource: " +
+				// createResource.getErrorCode() + " thread " + threadIndex,
+				// 201, status);
+			} catch (Exception e) {
+				// System.out.println("**** Thread " + threadIndex + " exception
+				// " + e);
+			}
+			countDownLatch.countDown();
+			// System.out.println("**** Thread finished " + threadIndex);
+
+		}
+
+		// public void run_() {
+		// System.out.println("**** Thread started " + threadIndex);
+		// try {
+		// UserUtils userUtils = new UserUtils();
+		// User userDetails = new User(userFirstName, userLastName,
+		// httpCspUserId, email, role , 0L);
+		// RestResponse response =
+		// userUtils.createUserTowardsCatalogBe(userDetails,
+		// userUtils.getUserDetailesAdmin());
+		// System.out.println("**** Thread " + threadIndex + " create resource
+		// status " + response.getErrorCode() + " response " +
+		// response.getResponse());
+		//// assertEquals("**** create resource: " +
+		// createResource.getErrorCode() + " thread " + threadIndex, 201,
+		// status);
+		// } catch (Exception e) {
+		// System.out.println("**** Thread " + threadIndex + " exception " + e);
+		// }
+		// countDownLatch.countDown();
+		// System.out.println("**** Thread finished " + threadIndex);
+		//
+		// }
+	}
+
+	@Test
+	public void create2Resources() throws InterruptedException {
+		int threadCount = 5;
+		CountDownLatch countDownLatch = new CountDownLatch(threadCount);
+		ExecutorService executor = Executors.newFixedThreadPool(threadCount);
+		for (int i = 0; i < threadCount; i++) {
+			Runnable worker = new WorkerThread(i + 1, countDownLatch);
+			executor.execute(worker);
+		}
+		countDownLatch.await();
+		// System.out.println(" finished ");
+
+	}
+}
diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/execute/resource/UpdateResourceMetadataTest.java b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/execute/resource/UpdateResourceMetadataTest.java
new file mode 100644
index 0000000000..a204954ceb
--- /dev/null
+++ b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/execute/resource/UpdateResourceMetadataTest.java
@@ -0,0 +1,2630 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * SDC
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.sdc.ci.tests.execute.resource;
+
+import com.google.gson.Gson;
+import org.json.JSONException;
+import org.json.JSONObject;
+import org.junit.rules.TestName;
+import org.openecomp.sdc.be.dao.api.ActionStatus;
+import org.openecomp.sdc.be.datatypes.enums.ResourceTypeEnum;
+import org.openecomp.sdc.be.model.LifecycleStateEnum;
+import org.openecomp.sdc.be.model.Resource;
+import org.openecomp.sdc.be.model.User;
+import org.openecomp.sdc.ci.tests.api.ComponentBaseTest;
+import org.openecomp.sdc.ci.tests.api.Urls;
+import org.openecomp.sdc.ci.tests.config.Config;
+import org.openecomp.sdc.ci.tests.datatypes.ResourceReqDetails;
+import org.openecomp.sdc.ci.tests.datatypes.enums.*;
+import org.openecomp.sdc.ci.tests.datatypes.expected.ExpectedResourceAuditJavaObject;
+import org.openecomp.sdc.ci.tests.datatypes.http.HttpHeaderEnum;
+import org.openecomp.sdc.ci.tests.datatypes.http.HttpRequest;
+import org.openecomp.sdc.ci.tests.datatypes.http.RestResponse;
+import org.openecomp.sdc.ci.tests.utils.DbUtils;
+import org.openecomp.sdc.ci.tests.utils.Utils;
+import org.openecomp.sdc.ci.tests.utils.general.ElementFactory;
+import org.openecomp.sdc.ci.tests.utils.rest.BaseRestUtils;
+import org.openecomp.sdc.ci.tests.utils.rest.LifecycleRestUtils;
+import org.openecomp.sdc.ci.tests.utils.rest.ResourceRestUtils;
+import org.openecomp.sdc.ci.tests.utils.rest.ResponseParser;
+import org.openecomp.sdc.ci.tests.utils.validation.ErrorValidationUtils;
+import org.openecomp.sdc.ci.tests.utils.validation.ResourceValidationUtils;
+import org.openecomp.sdc.common.util.ValidationUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.testng.AssertJUnit;
+import org.testng.annotations.BeforeMethod;
+import org.testng.annotations.Test;
+
+import java.io.FileNotFoundException;
+import java.util.*;
+
+import static org.testng.AssertJUnit.*;
+
+public class UpdateResourceMetadataTest extends ComponentBaseTest {
+    private static Logger logger = LoggerFactory.getLogger(UpdateResourceMetadataTest.class.getName());
+    protected List<String> Empty_List = new ArrayList<String>();
+    protected String extendedChars;
+
+    protected final String contentTypeHeaderData = "application/json";
+    protected final String acceptHeaderDate = "application/json";
+    protected final String CHARSET_ISO_8859 = "charset=ISO-8859-1";
+
+    public static TestName name = new TestName();
+    protected User sdncModifierDetails;
+    protected ResourceReqDetails resourceDetails;
+
+    public String extendedCharsStringBuilder() throws Exception {
+        char[] extendedCharsArray = new char[128];
+        char ch = 128;
+        for (int i = 0; i < extendedCharsArray.length - 1; i++) {
+            extendedCharsArray[i] = ch;
+            ch++;
+        }
+        extendedChars = new String(extendedCharsArray);
+        return extendedChars;
+
+    }
+
+    @BeforeMethod
+    public void setup() throws Exception {
+        sdncModifierDetails = ElementFactory.getDefaultUser(UserRoleEnum.DESIGNER);
+        resourceDetails = defineResourse();
+
+    }
+
+    // Keep
+    @Test
+    public void UpdateDerivedFromSuccess() throws Exception {
+
+        String oldDerivedFromName = NormativeTypesEnum.ROOT.getNormativeName();
+        String newDerivedFromName = NormativeTypesEnum.SOFTWARE_COMPONENT.getNormativeName();
+
+        // Getting both derived from resources for validation
+        /*
+		 * RestResponse resourceByNameAndVersion =
+		 * resourceUtils.getResourceByNameAndVersion(sdncModifierDetails,
+		 * oldDerivedFromName, "1.0");
+		 * assertEquals("Check response code after get database normative", 200,
+		 * resourceByNameAndVersion.getErrorCode().intValue()); Resource
+		 * databaseNormative =
+		 * resourceUtils.parseResourceResp(resourceByNameAndVersion);
+		 * 
+		 * resourceByNameAndVersion =
+		 * resourceUtils.getResourceByNameAndVersion(sdncModifierDetails,
+		 * newDerivedFromName, "1.0");
+		 * assertEquals("Check response code after get database normative", 200,
+		 * resourceByNameAndVersion.getErrorCode().intValue()); Resource
+		 * lbNormative =
+		 * resourceUtils.parseResourceResp(resourceByNameAndVersion);
+		 */
+
+        // Derived from set to Database
+        List<String> derivedFrom = new ArrayList<>();
+        derivedFrom.add(oldDerivedFromName);
+        resourceDetails.setDerivedFrom(derivedFrom);
+
+        RestResponse restResponse = createResource(sdncModifierDetails, resourceDetails);
+        AssertJUnit.assertEquals("Check response code after create resource", 201,
+                restResponse.getErrorCode().intValue());
+        Resource currentResource = ResponseParser.convertResourceResponseToJavaObject(restResponse.getResponse());
+
+        derivedFrom.clear();
+        derivedFrom.add(newDerivedFromName);
+        RestResponse updatedRestResponse = ResourceRestUtils.updateResourceMetadata(resourceDetails,
+                sdncModifierDetails, currentResource.getUniqueId(), "");
+        AssertJUnit.assertEquals("Check response code after create resource", 200,
+                updatedRestResponse.getErrorCode().intValue());
+
+    }
+
+    protected ResourceReqDetails defineUpdateResourceWithNonUpdatableFields(Resource resourceBeforeUpdate) {
+        ResourceReqDetails updatedResourceDetails = defineUpdatedResourse(resourceBeforeUpdate.getName());
+
+        updatedResourceDetails.setVersion("mumu");
+        updatedResourceDetails.setIsAbstract(true);
+        updatedResourceDetails.setIsHighestVersion(true);
+        updatedResourceDetails.setCreatorUserId("df4444");
+        updatedResourceDetails.setCreatorFullName("John Doe");
+        updatedResourceDetails.setLastUpdaterUserId("gf5646");
+        updatedResourceDetails.setLastUpdaterFullName("Viktor Tzoy");
+        updatedResourceDetails.setCreationDate(new Long(4444));
+        updatedResourceDetails.setLastUpdateDate(new Long("534535"));
+        updatedResourceDetails.setLifecycleState(LifecycleStateEnum.NOT_CERTIFIED_CHECKIN);
+        updatedResourceDetails.setCost("6.1");
+        updatedResourceDetails.setLicenseType("Installation");
+        updatedResourceDetails.setUUID("dfsfsdf");
+        return updatedResourceDetails;
+    }
+
+    public void UpdateResourceNotFoundTest() throws Exception {
+        // init ADMIN user
+        User sdncModifierDetails = ElementFactory.getDefaultUser(UserRoleEnum.ADMIN);
+
+        String resourceName = "cisco4";
+        // update resource
+        String description = "updatedDescription";
+        ArrayList<String> resourceTags = new ArrayList<String>();
+        resourceTags.add("tag2");
+        String category = ServiceCategoriesEnum.MOBILITY.getValue();
+        ArrayList<String> derivedFrom = new ArrayList<String>();
+        derivedFrom.add(NormativeTypesEnum.ROOT.getNormativeName());
+        String vendorName = "newOracle";
+        String vendorRelease = "2.5";
+        String contactId = "jh0003";
+        String icon = "myICON";
+
+        ResourceReqDetails updatedResourceDetails = new ResourceReqDetails(resourceName, description, resourceTags,
+                category, derivedFrom, vendorName, vendorRelease, contactId, icon);
+        updatedResourceDetails.setUniqueId("dummyId");
+        RestResponse updatedRestResponse = ResourceRestUtils.updateResourceMetadata(updatedResourceDetails,
+                sdncModifierDetails, "0.1");
+
+        // validate response
+        AssertJUnit.assertNotNull("check response object is not null after update resource", updatedRestResponse);
+        AssertJUnit.assertNotNull("check error code exists in response after update resource",
+                updatedRestResponse.getErrorCode());
+        AssertJUnit.assertEquals("Check response code after update resource", 404,
+                updatedRestResponse.getErrorCode().intValue());
+        // String resourceId =
+        // UniqueIdBuilder.buildResourceUniqueId(resourceName, "0.1");
+        ErrorValidationUtils.checkBodyResponseOnError(ActionStatus.RESOURCE_NOT_FOUND.name(), Arrays.asList("dummyId"),
+                updatedRestResponse.getResponse());
+
+        resourceName = "";
+        // resourceId = UniqueIdBuilder.buildResourceUniqueId(resourceName,
+        // "0.1");
+        updatedResourceDetails = defineUpdatedResourse(resourceName);
+        updatedResourceDetails.setUniqueId("dummyId");
+        updatedRestResponse = ResourceRestUtils.updateResourceMetadata(updatedResourceDetails, sdncModifierDetails,
+                "0.1");
+        AssertJUnit.assertNotNull("check response object is not null after update resource", updatedRestResponse);
+        AssertJUnit.assertNotNull("check error code exists in response after update resource",
+                updatedRestResponse.getErrorCode());
+        ErrorValidationUtils.checkBodyResponseOnError(ActionStatus.RESOURCE_NOT_FOUND.name(), Arrays.asList("dummyId"),
+                updatedRestResponse.getResponse());
+
+    }
+
+    public char[] getInValidChars() throws Exception {
+
+        char[] extendedCharsArray = new char[59];
+        char ch = 1;
+        for (int i = 0; i < 44; i++) {
+            extendedCharsArray[i] = ch;
+            ch++;
+        }
+        ch = 58;
+        for (int i = 44; i < 51; i++) {
+            extendedCharsArray[i] = ch;
+            ch++;
+        }
+        ch = 91;
+        for (int i = 51; i < 55; i++) {
+            extendedCharsArray[i] = ch;
+            ch++;
+        }
+        ch = 123;
+        for (int i = 55; i < 59; i++) {
+            extendedCharsArray[i] = ch;
+            ch++;
+        }
+        return extendedCharsArray;
+    }
+
+    public char[] getTagInValidFormatChars() throws Exception {
+        // Tag format is the same as defined for "Resource Name" :
+        // Allowed characters: Alphanumeric (a-zA-Z0-9), space (' '), underscore
+        // ('_'), dash ('-'), dot ('.')
+        char[] notValidCharsArray = new char[30];
+        char ch = 33;
+        for (int i = 0; i < 12; i++) {
+            notValidCharsArray[i] = ch;
+            ch++;
+        }
+        notValidCharsArray[13] = 47;
+        ch = 58;
+        for (int i = 14; i < 21; i++) {
+            notValidCharsArray[i] = ch;
+            ch++;
+        }
+        ch = 91;
+        for (int i = 21; i < 24; i++) {
+            notValidCharsArray[i] = ch;
+            ch++;
+        }
+        notValidCharsArray[24] = 96;
+        ch = 123;
+        for (int i = 25; i < 30; i++) {
+            notValidCharsArray[i] = ch;
+            ch++;
+        }
+        return notValidCharsArray;
+    }
+
+    public void Validation_UpdateWithIncompleteJsonBodyTest() throws Exception {
+        // init ADMIN user
+        User sdncModifierDetails = ElementFactory.getDefaultUser(UserRoleEnum.ADMIN);
+
+        // define and create resource
+        ResourceReqDetails resourceDetails = defineResourse();
+        ResourceRestUtils.deleteResourceByNameAndVersion(sdncModifierDetails, resourceDetails.getName(), "0.1");
+        ResourceRestUtils.deleteResourceByNameAndVersion(sdncModifierDetails, resourceDetails.getName(), "1.0");
+        ResourceRestUtils.deleteResourceByNameAndVersion(sdncModifierDetails, resourceDetails.getName(), "1.1");
+
+        RestResponse restResponse = createResource(sdncModifierDetails, resourceDetails);
+        String resourceId = resourceDetails.getUniqueId();
+        resourceDetails.setUniqueId(ResponseParser.getUniqueIdFromResponse(restResponse));
+
+        // build Json Object
+        JSONObject jsonObject = JsonObjectBuilder(resourceDetails);
+
+        List<String> resource = new ArrayList<>();
+        resource.add("Resource");
+
+        // remove Description
+        UpdateAndValidateWithIncompletedJsonBody(sdncModifierDetails, jsonObject, resourceId, "description",
+                ActionStatus.COMPONENT_MISSING_DESCRIPTION.name(), resource);
+        // remove Tags
+        UpdateAndValidateWithIncompletedJsonBody(sdncModifierDetails, jsonObject, resourceId, "tags",
+                ActionStatus.COMPONENT_MISSING_TAGS.name(), Empty_List);
+        // remove Category
+        UpdateAndValidateWithIncompletedJsonBody(sdncModifierDetails, jsonObject, resourceId, "category",
+                ActionStatus.COMPONENT_MISSING_CATEGORY.name(), resource);
+        // remove VendorName
+        UpdateAndValidateWithIncompletedJsonBody(sdncModifierDetails, jsonObject, resourceId, "vendorName",
+                ActionStatus.MISSING_VENDOR_NAME.name(), Empty_List);
+        // remove VendorRelease
+        UpdateAndValidateWithIncompletedJsonBody(sdncModifierDetails, jsonObject, resourceId, "vendorRelease",
+                ActionStatus.MISSING_VENDOR_RELEASE.name(), Empty_List);
+        // remove AT&T Contact
+        UpdateAndValidateWithIncompletedJsonBody(sdncModifierDetails, jsonObject, resourceId, "contactId",
+                ActionStatus.COMPONENT_MISSING_CONTACT.name(), resource);
+
+        // get resource with original name. original metadata should be returned
+        RestResponse getRestResponse = ResourceRestUtils.getResource(sdncModifierDetails, "0.1");
+        // validate response
+        AssertJUnit.assertNotNull("check response object is not null after get resource", getRestResponse);
+        AssertJUnit.assertNotNull("check error code exists in response after get resource",
+                getRestResponse.getErrorCode());
+        AssertJUnit.assertEquals("Check response code after update resource", 200,
+                getRestResponse.getErrorCode().intValue());
+
+        // parse updated response to javaObject
+        Resource getResourceRespJavaObject = ResponseParser
+                .convertResourceResponseToJavaObject(getRestResponse.getResponse());
+        // validate that metadata was not changed
+        ResourceValidationUtils.validateResourceReqVsResp(resourceDetails, getResourceRespJavaObject);
+
+        ResourceRestUtils.deleteResourceByNameAndVersion(sdncModifierDetails, resourceDetails.getName(), "0.1");
+        ResourceRestUtils.deleteResourceByNameAndVersion(sdncModifierDetails, resourceDetails.getName(), "1.0");
+        ResourceRestUtils.deleteResourceByNameAndVersion(sdncModifierDetails, resourceDetails.getName(), "1.1");
+    }
+
+    // End of validation tests
+    // ///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+
+    protected ResourceReqDetails defineUpdatedResourse(String resourceName) {
+        String description = "updatedDescription";
+        ArrayList<String> resourceTags = new ArrayList<String>();
+        // Duplicate tags are allowed and should be de-duplicated by server side
+        resourceTags.add(resourceName);
+        resourceTags.add("tag1");
+        resourceTags.add("tag1");
+        resourceTags.add("tag2");
+        resourceTags.add("tag2");
+        String category = ServiceCategoriesEnum.VOIP.getValue();
+        ArrayList<String> derivedFrom = new ArrayList<String>();
+        derivedFrom.add(NormativeTypesEnum.ROOT.getNormativeName());
+        String vendorName = "updatedOracle";
+        String vendorRelease = "3.5";
+        String contactId = "jh0001";
+        String icon = "myUpdatedICON";
+
+        ResourceReqDetails resourceDetails = new ResourceReqDetails(resourceName, description, resourceTags, category,
+                derivedFrom, vendorName, vendorRelease, contactId, icon);
+        resourceDetails.addCategoryChain(ResourceCategoryEnum.GENERIC_INFRASTRUCTURE.getCategory(),
+                ResourceCategoryEnum.GENERIC_INFRASTRUCTURE.getSubCategory());
+
+        return resourceDetails;
+    }
+
+    protected ResourceReqDetails defineResourse() {
+        String resourceName = "cisco4";
+        String description = "description";
+        ArrayList<String> resourceTags = new ArrayList<String>();
+        resourceTags.add(resourceName);
+        ArrayList<String> derivedFrom = new ArrayList<String>();
+        derivedFrom.add(NormativeTypesEnum.ROOT.getNormativeName());// "tosca.nodes.Root");
+        String vendorName = "Oracle";
+        String vendorRelease = "1.5";
+        String contactId = "jh0003";
+        String icon = "objectStorage";
+
+        ResourceReqDetails resourceDetails = new ResourceReqDetails(resourceName, description, resourceTags, null,
+                derivedFrom, vendorName, vendorRelease, contactId, icon);
+        resourceDetails.addCategoryChain(ResourceCategoryEnum.GENERIC_INFRASTRUCTURE.getCategory(),
+                ResourceCategoryEnum.GENERIC_INFRASTRUCTURE.getSubCategory());
+
+        return resourceDetails;
+    }
+
+    protected RestResponse createResource(User sdncModifierDetails, ResourceReqDetails resourceDetails)
+            throws Exception {
+        // clean ES DB
+        DbUtils.cleanAllAudits();
+
+        // create resource
+        RestResponse restResponse = ResourceRestUtils.createResource(resourceDetails, sdncModifierDetails);
+
+        // validate response
+        AssertJUnit.assertNotNull("check response object is not null after create resource", restResponse);
+        AssertJUnit.assertNotNull("check error code exists in response after create resource",
+                restResponse.getErrorCode());
+        AssertJUnit.assertEquals("Check response code after create resource", 201,
+                restResponse.getErrorCode().intValue());
+
+        return restResponse;
+    }
+
+    protected RestResponse TryUpdateByAnotherVerb(ResourceReqDetails updatedResourceDetails, User sdncModifierDetails,
+                                                  String uri) throws Exception {
+        // delete resource
+        Config config;
+        RestResponse ResourceResponse;
+        try {
+            config = Utils.getConfig();
+            Map<String, String> headersMap = new HashMap<String, String>();
+            headersMap.put(HttpHeaderEnum.CONTENT_TYPE.getValue(), contentTypeHeaderData);
+            headersMap.put(HttpHeaderEnum.ACCEPT.getValue(), acceptHeaderDate);
+            headersMap.put(HttpHeaderEnum.USER_ID.getValue(), sdncModifierDetails.getUserId());
+            HttpRequest http = new HttpRequest();
+            String url = String.format(Urls.UPDATE_RESOURCE_METADATA, config.getCatalogBeHost(),
+                    config.getCatalogBePort(), updatedResourceDetails.getName() + ".0.1");
+
+            if (uri == "GET") {
+                ResourceResponse = http.httpSendGet(url, headersMap);
+            } else if (uri == "POST") {
+                Gson gson = new Gson();
+                String userBodyJson = gson.toJson(updatedResourceDetails);
+                ResourceResponse = http.httpSendPost(url, userBodyJson, headersMap);
+            } else if (uri == "DELETE") {
+                ResourceResponse = http.httpSendDelete(url, headersMap);
+            } else
+                return null;
+
+            return ResourceResponse;
+        } catch (FileNotFoundException e) {
+            e.printStackTrace();
+        }
+
+        return null;
+
+    }
+
+    protected JSONObject JsonObjectBuilder(ResourceReqDetails resourceDetails) throws JSONException {
+        // json object: resourceName and icon are must
+        JSONObject jObject = new JSONObject();
+
+        List<String> tagsList = Arrays.asList(resourceDetails.getName());
+        List<String> derivedFromList = Arrays.asList("[tosca.nodes.Root]");
+
+        jObject.put("name", resourceDetails.getName());
+        jObject.put("description", "updatedDescription");
+        jObject.put("tags", tagsList);
+        jObject.put("category", ServiceCategoriesEnum.VOIP.getValue());
+        jObject.put("derivedFrom", derivedFromList);
+        jObject.put("vendorName", "newOracle");
+        jObject.put("vendorRelease", "1.5");
+        jObject.put("contactId", "jh0003");
+        jObject.put("icon", resourceDetails.getIcon());
+
+        return jObject;
+    }
+
+    protected JSONObject RemoveFromJsonObject(JSONObject jObject, String removedPropery) {
+        jObject.remove(removedPropery);
+
+        return jObject;
+    }
+
+    // purpose: function for controlling json body fields and validating
+    // response
+    protected void UpdateAndValidateWithIncompletedJsonBody(User sdncModifierDetails, JSONObject jsonObject,
+                                                            String resourceId, String removedField, String errorMessage, List<String> variables) throws Exception {
+
+        JSONObject jObject = new JSONObject(jsonObject, JSONObject.getNames(jsonObject));
+        // remove description from jsonObject
+        jObject = RemoveFromJsonObject(jObject, removedField);
+        // update with incomplete body.
+        RestResponse updatedRestResponse = ResourceRestUtils.updateResourceMetadata(jObject.toString(),
+                sdncModifierDetails, resourceId);
+        // validate response
+        AssertJUnit.assertNotNull("check response object is not null after update resource", updatedRestResponse);
+        AssertJUnit.assertNotNull("check error code exists in response after update resource",
+                updatedRestResponse.getErrorCode());
+        ErrorValidationUtils.checkBodyResponseOnError(errorMessage, variables, updatedRestResponse.getResponse());
+
+    }
+
+    // purpose: function for validating error response
+    protected void UpdateAndValidate(User sdncModifierDetails, ResourceReqDetails resourceDetails,
+                                     String recievedMessage, List<String> variables) throws Exception {
+        RestResponse updatedRestResponse = ResourceRestUtils.updateResourceMetadata(resourceDetails,
+                sdncModifierDetails, "0.1");
+        // validate response
+        AssertJUnit.assertNotNull("check response object is not null after update resource", updatedRestResponse);
+        AssertJUnit.assertNotNull("check error code exists in response after update resource",
+                updatedRestResponse.getErrorCode());
+        ErrorValidationUtils.checkBodyResponseOnError(recievedMessage, variables, updatedRestResponse.getResponse());
+
+    }
+
+    protected void parseResponseAndValidateNonUpdatable(ResourceReqDetails resourceDetails, RestResponse restResponse)
+            throws Exception {
+        // parse response to javaObject
+        Resource updatedResourceRespJavaObject = ResponseParser
+                .convertResourceResponseToJavaObject(restResponse.getResponse());
+        AssertJUnit.assertTrue(
+                !resourceDetails.getIsHighestVersion().equals(updatedResourceRespJavaObject.isHighestVersion()));
+        AssertJUnit.assertTrue(!resourceDetails.getVersion().equals(updatedResourceRespJavaObject.getName()));
+        AssertJUnit.assertTrue(!resourceDetails.getIsAbstract().equals(updatedResourceRespJavaObject.isAbstract()));
+        AssertJUnit.assertTrue(
+                !resourceDetails.getCreatorUserId().equals(updatedResourceRespJavaObject.getCreatorUserId()));
+        AssertJUnit.assertTrue(
+                !resourceDetails.getCreatorFullName().equals(updatedResourceRespJavaObject.getCreatorFullName()));
+        AssertJUnit.assertTrue(
+                !resourceDetails.getLastUpdateDate().equals(updatedResourceRespJavaObject.getLastUpdateDate()));
+        AssertJUnit
+                .assertTrue(!resourceDetails.getCreationDate().equals(updatedResourceRespJavaObject.getCreationDate()));
+        AssertJUnit.assertTrue(
+                !resourceDetails.getLastUpdaterUserId().equals(updatedResourceRespJavaObject.getLastUpdaterUserId()));
+        AssertJUnit.assertTrue(!resourceDetails.getLastUpdaterFullName()
+                .equals(updatedResourceRespJavaObject.getLastUpdaterFullName()));
+        AssertJUnit.assertTrue(
+                !resourceDetails.getLifecycleState().equals(updatedResourceRespJavaObject.getLifecycleState()));
+        AssertJUnit.assertTrue(!resourceDetails.getCost().equals(updatedResourceRespJavaObject.getCost()));
+        AssertJUnit
+                .assertTrue(!resourceDetails.getLicenseType().equals(updatedResourceRespJavaObject.getLicenseType()));
+        AssertJUnit.assertTrue(!resourceDetails.getUUID().equals(updatedResourceRespJavaObject.getUUID()));
+
+    }
+
+    protected void parseResponseAndValidate(ResourceReqDetails ResourceDetails, RestResponse restResponse)
+            throws Exception {
+        // parse response to javaObject
+        Resource updatedResourceRespJavaObject = ResponseParser
+                .convertResourceResponseToJavaObject(restResponse.getResponse());
+        // validate request vs response
+        ResourceValidationUtils.validateResourceReqVsResp(ResourceDetails, updatedResourceRespJavaObject);
+    }
+
+    public ExpectedResourceAuditJavaObject constructFieldsForAuditValidation(ResourceReqDetails resourceDetails,
+                                                                             String resourceVersion) {
+
+        ExpectedResourceAuditJavaObject expectedResourceAuditJavaObject = new ExpectedResourceAuditJavaObject();
+
+        expectedResourceAuditJavaObject.setAction("Checkout");
+        expectedResourceAuditJavaObject.setModifierUid(UserRoleEnum.ADMIN.getUserId());
+        expectedResourceAuditJavaObject.setModifierName(UserRoleEnum.ADMIN.getUserName());
+        expectedResourceAuditJavaObject.setStatus("200.0");
+        expectedResourceAuditJavaObject.setDesc("OK");
+        expectedResourceAuditJavaObject.setResourceName(resourceDetails.getName().toLowerCase());
+        expectedResourceAuditJavaObject.setResourceType("Resource");
+        expectedResourceAuditJavaObject.setPrevVersion(String.valueOf(Float.parseFloat(resourceVersion) - 0.1f));
+        expectedResourceAuditJavaObject.setCurrVersion(resourceVersion);
+        expectedResourceAuditJavaObject.setPrevState((LifecycleStateEnum.NOT_CERTIFIED_CHECKOUT).toString());
+        expectedResourceAuditJavaObject.setCurrState((LifecycleStateEnum.NOT_CERTIFIED_CHECKOUT).toString());
+
+        return expectedResourceAuditJavaObject;
+
+    }
+
+    public enum FieldToValidate {
+        contactId, Tags, VendorName, VendorRelease, Description
+    }
+
+    @Test
+    public void UpdateBy_postTest() throws Exception {
+
+        RestResponse restResponse = createResource(sdncModifierDetails, resourceDetails);
+        String resourceName = resourceDetails.getName();
+
+        // update resource - without changing resourceName
+        ResourceReqDetails updatedResourceDetails = defineUpdatedResourse(resourceName);
+
+        RestResponse updatedRestResponse = TryUpdateByAnotherVerb(updatedResourceDetails, sdncModifierDetails, "POST");
+
+        // validate response
+        assertNotNull("check response object is not null after update resource", updatedRestResponse);
+        assertNotNull("check error code exists in response after update resource", updatedRestResponse.getErrorCode());
+        ErrorValidationUtils.checkBodyResponseOnError(ActionStatus.NOT_ALLOWED.name(), Empty_List,
+                updatedRestResponse.getResponse());
+
+        RestResponse getRestResponse = ResourceRestUtils.getResource(sdncModifierDetails,
+                resourceDetails.getUniqueId());
+        assertNotNull("check response object is not null after update resource", getRestResponse);
+        parseResponseAndValidate(resourceDetails, getRestResponse);
+
+    }
+
+    @Test
+    public void UpdateBy_getTest() throws Exception {
+
+        RestResponse restResponse = createResource(sdncModifierDetails, resourceDetails);
+        String resourceName = resourceDetails.getName();
+
+        // update resource - without changing resourceName
+        ResourceReqDetails updatedResourceDetails = defineUpdatedResourse(resourceName);
+        RestResponse updatedRestResponse = TryUpdateByAnotherVerb(updatedResourceDetails, sdncModifierDetails, "GET");
+
+        // validate response
+        assertNotNull("check response object is not null after update resource", updatedRestResponse);
+        assertNotNull("check error code exists in response after update resource", updatedRestResponse.getErrorCode());
+        ErrorValidationUtils.checkBodyResponseOnError(ActionStatus.NOT_ALLOWED.name(), Empty_List,
+                updatedRestResponse.getResponse());
+
+        RestResponse getRestResponse = ResourceRestUtils.getResource(sdncModifierDetails,
+                resourceDetails.getUniqueId());
+        assertNotNull("check response object is not null after update resource", getRestResponse);
+        parseResponseAndValidate(resourceDetails, getRestResponse);
+
+    }
+
+    @Test
+    public void UpdateBy_deleteTest() throws Exception {
+
+        RestResponse restResponse = createResource(sdncModifierDetails, resourceDetails);
+        String resourceName = resourceDetails.getName();
+
+        // update resource - without changing resourceName
+        ResourceReqDetails updatedResourceDetails = defineUpdatedResourse(resourceName);
+        RestResponse updatedRestResponse = TryUpdateByAnotherVerb(updatedResourceDetails, sdncModifierDetails,
+                "DELETE");
+
+        // validate response
+        assertNotNull("check response object is not null after update resource", updatedRestResponse);
+        assertNotNull("check error code exists in response after update resource", updatedRestResponse.getErrorCode());
+        ErrorValidationUtils.checkBodyResponseOnError(ActionStatus.NOT_ALLOWED.name(), Empty_List,
+                updatedRestResponse.getResponse());
+
+        RestResponse getRestResponse = ResourceRestUtils.updateResourceMetadata(resourceDetails, sdncModifierDetails,
+                resourceDetails.getUniqueId(), "");
+        assertNotNull("check response object is not null after update resource", getRestResponse);
+        parseResponseAndValidate(resourceDetails, getRestResponse);
+
+    }
+
+    // TODO DE
+    // @Ignore("")
+    @Test
+    public void UpdateWithInvaldJsonBodyTest() throws Exception {
+
+        RestResponse restResponse = createResource(sdncModifierDetails, resourceDetails);
+        resourceDetails.setUniqueId(ResponseParser.getUniqueIdFromResponse(restResponse));
+        String resourceId = resourceDetails.getUniqueId();
+
+        // update Descirption value
+        String description = "updatedDescription";
+
+        // send update with incompleted json, only description string
+        RestResponse updatedRestResponse = ResourceRestUtils.updateResourceMetadata(description, sdncModifierDetails,
+                resourceId);
+
+        // validate response
+        assertNotNull("check response object is not null after update resource", updatedRestResponse);
+        assertNotNull("check error code exists in response after update resource", updatedRestResponse.getErrorCode());
+        assertEquals("check error code after update resource", 400, updatedRestResponse.getErrorCode().intValue());
+
+        RestResponse getRestResponse = ResourceRestUtils.getResource(sdncModifierDetails,
+                resourceDetails.getUniqueId());
+        assertNotNull("check response object is not null after update resource", getRestResponse);
+        parseResponseAndValidate(resourceDetails, getRestResponse);
+
+    }
+
+    // @Test
+    // public void UpdateResourceModifierNotOwnerStateTest() throws Exception {
+    //
+    //
+    // RestResponse restResponse = createResource(sdncModifierDetails,
+    // resourceDetails);
+    // String resourceName = resourceDetails.getName();
+    //
+    // // new user parameters
+    // String userFirstName = "Kot";
+    // String userLastName = "Matroskin";
+    // String role = "ADMIN";
+    // User sdncUserDetails = new User(userFirstName, userLastName,
+    // httpCspUserId, email, role,null);
+    // RestResponse deleteUserResponse = userUtils.deleteUser(sdncUserDetails,
+    // ElementFactory.getDefaultUser(UserRoleEnum.ADMIN));
+    //
+    // RestResponse createUserResponse = UserUtils.createUser(sdncUserDetails,
+    // ElementFactory.getDefaultUser(UserRoleEnum.ADMIN));
+    //
+    // User updatedSdncModifierDetails = new User(userFirstName, userLastName,
+    // httpCspUserId, email,role,null);
+    // ResourceReqDetails updatedResourceDetails =
+    // defineUpdatedResourse(resourceName);
+    // RestResponse updatedRestResponse =
+    // ResourceRestUtils.updateResource(updatedResourceDetails,
+    // updatedSdncModifierDetails, resourceDetails.getUniqueId(), "");
+    //
+    // // validate response
+    // assertNotNull("check response object is not null after update resource",
+    // updatedRestResponse);
+    // assertNotNull("check error code exists in response after update
+    // resource", updatedRestResponse.getErrorCode());
+    // ErrorValidationUtils.checkBodyResponseOnError(ActionStatus.RESTRICTED_OPERATION.name(),
+    // Empty_List, updatedRestResponse.getResponse());
+    //
+    // RestResponse getRestResponse =
+    // ResourceRestUtils.getResource(sdncModifierDetails,
+    // resourceDetails.getUniqueId());
+    // assertNotNull("check response object is not null after update resource",
+    // getRestResponse);
+    // parseResponseAndValidate(resourceDetails, getRestResponse);
+    //
+    //
+    // }
+
+    @Test
+    public void UpdateResourceNameSensitiveTest() throws Exception {
+        User sdncModifierDetails = ElementFactory.getDefaultUser(UserRoleEnum.ADMIN);
+        String resourceBaseVersion = "0.1";
+        String resourceName = "Ab";
+        ResourceReqDetails updatedResourceDetails = defineUpdatedResourse(resourceName);
+        // Delete resources
+        RestResponse response = null;
+        response = ResourceRestUtils.deleteResourceByNameAndVersion(sdncModifierDetails,
+                updatedResourceDetails.getName(), "0.1");
+        BaseRestUtils.checkDeleteResponse(response);
+        response = ResourceRestUtils.deleteResourceByNameAndVersion(sdncModifierDetails,
+                updatedResourceDetails.getName(), "0.2");
+        BaseRestUtils.checkDeleteResponse(response);
+
+        RestResponse restResponse = createResource(sdncModifierDetails, updatedResourceDetails);
+        assertEquals("create resource failed", 201, restResponse.getErrorCode().intValue());
+
+        // check-in Resource
+        logger.debug("Changing resource life cycle ");
+        RestResponse checkoutResource = LifecycleRestUtils.changeResourceState(updatedResourceDetails,
+                sdncModifierDetails, resourceBaseVersion, LifeCycleStatesEnum.CHECKIN);
+        assertEquals("Check response code after checkout resource", 200, checkoutResource.getErrorCode().intValue());
+
+        // String resourceCertifyVersion = "0.1";
+        logger.debug("Changing resource life cycle ");
+        checkoutResource = LifecycleRestUtils.changeResourceState(updatedResourceDetails, sdncModifierDetails,
+                resourceBaseVersion, LifeCycleStatesEnum.CHECKOUT);
+        assertEquals("Check response code after checkout resource", 200, checkoutResource.getErrorCode().intValue());
+
+        updatedResourceDetails.setName("ABC_-bt.aT");
+        ArrayList<String> resourceTag = new ArrayList<String>();
+        resourceTag.add(0, "ABC_-bt.aT");
+        updatedResourceDetails.setTags(resourceTag);
+        RestResponse updatedRestResponse = ResourceRestUtils.updateResourceMetadata(updatedResourceDetails,
+                sdncModifierDetails, updatedResourceDetails.getUniqueId(), "");
+        assertNotNull("check response object is not null after update resource", updatedRestResponse);
+        assertNotNull("check error code exists in response after update resource", updatedRestResponse.getErrorCode());
+        assertEquals("Check response code after update resource", 200, updatedRestResponse.getErrorCode().intValue());
+        parseResponseAndValidate(updatedResourceDetails, updatedRestResponse);
+
+        // Delete resources
+        response = ResourceRestUtils.deleteResourceByNameAndVersion(sdncModifierDetails,
+                updatedResourceDetails.getName(), "0.1");
+        BaseRestUtils.checkDeleteResponse(response);
+        response = ResourceRestUtils.deleteResourceByNameAndVersion(sdncModifierDetails,
+                updatedResourceDetails.getName(), "0.2");
+        BaseRestUtils.checkDeleteResponse(response);
+
+    }
+
+    @Test
+    public void UpdateIcon_InegativeFlow() throws Exception {
+
+        RestResponse restResponse = createResource(sdncModifierDetails, resourceDetails);
+        String resourceName = resourceDetails.getName();
+
+        List<String> resourceList = new ArrayList<String>();
+        resourceList.add(0, "Resource");
+        // check InValid Characters
+        char[] notValidCharsArray = new char[59];
+        notValidCharsArray = getInValidChars();
+        // update metadata details
+        ResourceReqDetails updatedResourceDetails = defineUpdatedResourse(resourceName);
+        RestResponse updatedRestResponse;
+
+        for (int i = 0; i < notValidCharsArray.length; i++) {
+            // change icon of metadata
+            updatedResourceDetails.setIcon("MyIcon" + notValidCharsArray[i]);
+            // PUT request
+            updatedRestResponse = ResourceRestUtils.updateResourceMetadata(updatedResourceDetails, sdncModifierDetails,
+                    resourceDetails.getUniqueId(), "");
+            // validate response
+            assertNotNull("check response object is not null after update resource", updatedRestResponse);
+            assertNotNull("check error code exists in response after update resource",
+                    updatedRestResponse.getErrorCode());
+            ErrorValidationUtils.checkBodyResponseOnError(ActionStatus.COMPONENT_INVALID_ICON.name(), resourceList,
+                    updatedRestResponse.getResponse());
+            assertEquals("Check response code after updating resource icon", 400,
+                    updatedRestResponse.getErrorCode().intValue());
+            assertEquals("Check response code after updating resource icon", "Bad Request",
+                    updatedRestResponse.getResponseMessage().toString());
+
+        }
+
+        // empty icon
+        String updateIcon = "";
+        updatedResourceDetails.setIcon(updateIcon);
+        updatedRestResponse = ResourceRestUtils.updateResourceMetadata(updatedResourceDetails, sdncModifierDetails,
+                resourceDetails.getUniqueId(), "");
+        assertNotNull("check response object is not null after update resource", updatedRestResponse);
+        assertNotNull("check error code exists in response after update resource", updatedRestResponse.getErrorCode());
+        ErrorValidationUtils.checkBodyResponseOnError(ActionStatus.COMPONENT_MISSING_ICON.name(), resourceList,
+                updatedRestResponse.getResponse());
+
+        // Icon length more then 25 characters
+        resourceList.add(1, "25");
+        updatedResourceDetails.setIcon("1234567890_-qwertyuiopASDNNN");
+        updatedRestResponse = ResourceRestUtils.updateResourceMetadata(updatedResourceDetails, sdncModifierDetails,
+                resourceDetails.getUniqueId(), "");
+        // validate response
+        assertNotNull("check response object is not null after update resource", updatedRestResponse);
+        assertNotNull("check error code exists in response after update resource", updatedRestResponse.getErrorCode());
+        ErrorValidationUtils.checkBodyResponseOnError(ActionStatus.COMPONENT_ICON_EXCEEDS_LIMIT.name(), resourceList,
+                updatedRestResponse.getResponse());
+        assertEquals("Check response code after create resource", 400, updatedRestResponse.getErrorCode().intValue());
+        assertEquals("Check response code after updating resource icon", "Bad Request",
+                updatedRestResponse.getResponseMessage().toString());
+
+        // get resource with original name. original metadata should be returned
+        RestResponse getRestResponse = ResourceRestUtils.getResource(sdncModifierDetails,
+                resourceDetails.getUniqueId());
+        // validate response
+        assertNotNull("check response object is not null after get resource", getRestResponse);
+        assertNotNull("check error code exists in response after get resource", getRestResponse.getErrorCode());
+        assertEquals("Check response code after update resource", 200, getRestResponse.getErrorCode().intValue());
+
+        // parse updated response to javaObject
+        Resource getResourceRespJavaObject = ResponseParser
+                .convertResourceResponseToJavaObject(getRestResponse.getResponse());
+        // validate that metadata was not changed
+        ResourceValidationUtils.validateResourceReqVsResp(resourceDetails, getResourceRespJavaObject);
+
+    }
+
+    @Test
+    public void UpdateResource_NoTagsEqualToResourceName() throws Exception {
+
+        User adminModifierDetails = ElementFactory.getDefaultUser(UserRoleEnum.ADMIN);
+        String resourceBaseVersion = "0.1";
+
+        // create resource
+        RestResponse restResponse = createResource(sdncModifierDetails, resourceDetails);
+        String resourceName = resourceDetails.getName();
+
+        ResourceReqDetails updatedResourceDetails = defineResourse();
+        updatedResourceDetails.setName("updatedResourceName");
+        List<String> tags = updatedResourceDetails.getTags();
+
+        for (Iterator<String> iter = tags.listIterator(); iter.hasNext(); ) {
+            String a = iter.next();
+            if (a.equals("updatedResourceName")) {
+                iter.remove();
+            }
+        }
+
+        RestResponse updatedRestResponse = ResourceRestUtils.updateResourceMetadata(updatedResourceDetails,
+                sdncModifierDetails, resourceDetails.getUniqueId(), "");
+        // validate response
+        List<String> resourceList = new ArrayList<String>();
+        assertNotNull("check response object is not null after update resource", updatedRestResponse);
+        assertNotNull("check error code exists in response after update resource", updatedRestResponse.getErrorCode());
+        ErrorValidationUtils.checkBodyResponseOnError(ActionStatus.COMPONENT_INVALID_TAGS_NO_COMP_NAME.name(),
+                resourceList, updatedRestResponse.getResponse());
+        assertEquals("Check response code after updating resource icon", 400,
+                updatedRestResponse.getErrorCode().intValue());
+
+        // get resource with original name. original metadata should be returned
+        RestResponse getRestResponse = ResourceRestUtils.getResource(sdncModifierDetails,
+                resourceDetails.getUniqueId());
+        // validate response
+        assertNotNull("check response object is not null after get resource", getRestResponse);
+        assertNotNull("check error code exists in response after get resource", getRestResponse.getErrorCode());
+        assertEquals("Check response code after update resource", 200, getRestResponse.getErrorCode().intValue());
+        // parse updated response to javaObject
+        Resource getResourceRespJavaObject = ResponseParser
+                .convertResourceResponseToJavaObject(getRestResponse.getResponse());
+        // validate that metadata was not changed
+        ResourceValidationUtils.validateResourceReqVsResp(resourceDetails, getResourceRespJavaObject);
+
+    }
+
+    @Test
+    public void UpdateResourceName_negativeFlow() throws Exception {
+        // The validation are done in Tag's validation
+        User sdncAdminModifierDetails = ElementFactory.getDefaultUser(UserRoleEnum.ADMIN);
+
+        RestResponse updatedRestResponse;
+        RestResponse restResponse = createResource(sdncAdminModifierDetails, resourceDetails);
+        assertEquals("create resource failed", 201, restResponse.getErrorCode().intValue());
+        String uniqueId = resourceDetails.getUniqueId();
+        String resourceName = resourceDetails.getName();
+        // check InValid Characters
+        char[] notValidCharsArray = new char[59];
+        notValidCharsArray = getInValidChars();
+        ArrayList<String> resource_Name = new ArrayList<String>();
+        List<String> resourceList = new ArrayList<String>();
+
+        ArrayList<String> resourceTags = new ArrayList<String>();
+        resourceList.add(0, "Resource");
+
+        // update metadata details
+        ResourceReqDetails updatedResourceDetails = defineUpdatedResourse(resourceName);
+        for (int i = 0; i < notValidCharsArray.length; i++, resource_Name.clear()) {
+            if (i != 1 && i != 46
+                    && /*
+						 * i != 8 && i != 9 && i != 10 && i != 11 && i != 12 &&
+						 */ i != 31) // space ("") and dot(.)
+            {
+                // change resourceName parameter
+                updatedResourceDetails.setName("UpdatedResourceName" + notValidCharsArray[i]);
+                resource_Name.add("UpdatedResourceName" + notValidCharsArray[i]);
+                updatedResourceDetails.setTags(resource_Name);
+                updatedRestResponse = ResourceRestUtils.updateResourceMetadata(updatedResourceDetails,
+                        sdncAdminModifierDetails, uniqueId, "");
+                // validate response
+                // ErrorValidationUtils.checkBodyResponseOnError(ActionStatus.COMPONENT_INVALID_TAG.name(),
+                // Empty_List, updatedRestResponse.getResponse());
+                ErrorValidationUtils.checkBodyResponseOnError(ActionStatus.INVALID_COMPONENT_NAME.name(), resourceList,
+                        updatedRestResponse.getResponse());
+
+            }
+        }
+
+        // resourceName length more then 50 characters
+        // Duplicate tags are allowed and should be de-duplicated by server side
+        resource_Name.add(resourceName);
+        resource_Name.add("tag1");
+        resource_Name.add("tag1");
+        resource_Name.add("tag2");
+        resource_Name.add("tag2");
+
+        resourceList.add(1, "1024");
+        // updatedResourceDetails.setName("123456789012345678901234567890123456789012345678901");
+        updatedResourceDetails.setName(new String(new char[1025]).replace("\0", "a"));
+        // resource_Name.add("123456789012345678901234567890123456789012345678901");
+        updatedResourceDetails.setTags(resource_Name);
+        updatedRestResponse = ResourceRestUtils.updateResourceMetadata(updatedResourceDetails, sdncAdminModifierDetails,
+                uniqueId, "");
+        // validate response
+        ErrorValidationUtils.checkBodyResponseOnError(ActionStatus.COMPONENT_NAME_EXCEEDS_LIMIT.name(), resourceList,
+                updatedRestResponse.getResponse());
+
+        // get resource with original name. original metadata should be returned
+        RestResponse getRestResponse = ResourceRestUtils.getResource(sdncAdminModifierDetails,
+                resourceDetails.getUniqueId());
+        // validate response
+        assertNotNull("check response object is not null after get resource", getRestResponse);
+        assertNotNull("check error code exists in response after get resource", getRestResponse.getErrorCode());
+        assertEquals("Check response code after update resource", 200, getRestResponse.getErrorCode().intValue());
+        // parse updated response to javaObject
+        Resource getResourceRespJavaObject = ResponseParser
+                .convertResourceResponseToJavaObject(getRestResponse.getResponse());
+        // validate that metadata was not changed
+        ResourceValidationUtils.validateResourceReqVsResp(resourceDetails, getResourceRespJavaObject);
+
+        // delete resource
+        RestResponse response = ResourceRestUtils.deleteResourceByNameAndVersion(sdncAdminModifierDetails,
+                updatedResourceDetails.getName(), "0.1");
+        BaseRestUtils.checkDeleteResponse(response);
+    }
+
+    @Test
+    public void UpdateResourceInformation_NotCheckedOut() throws Exception {
+
+        String resourceBaseVersion = "0.1";
+        List<String> resourceList = new ArrayList<String>();
+
+        RestResponse restResponse = createResource(sdncModifierDetails, resourceDetails);
+        String resourceName = resourceDetails.getName();
+
+        // CheckIn Resource
+        logger.debug("Changing resource life cycle ");
+        RestResponse checkoutResource = LifecycleRestUtils.changeResourceState(resourceDetails, sdncModifierDetails,
+                resourceBaseVersion, LifeCycleStatesEnum.CHECKIN); // NOT_CERTIFIED_CHECKIN
+        assertNotNull("check response object is not null after checkout resource", checkoutResource);
+        assertNotNull("check error code exists in response after checkIn resource", checkoutResource.getErrorCode());
+        assertEquals("Check response code after checkin resource", 200, checkoutResource.getErrorCode().intValue());
+
+        ResourceReqDetails updatedResourceDetails = defineUpdatedResourse(resourceName);
+
+        RestResponse updatedRestResponse = ResourceRestUtils.updateResourceMetadata(updatedResourceDetails,
+                sdncModifierDetails, resourceDetails.getUniqueId(), "");
+        assertNotNull("check response object is not null after update resource", updatedRestResponse);
+        assertNotNull("check error code exists in response after update resource", updatedRestResponse.getErrorCode());
+        ErrorValidationUtils.checkBodyResponseOnError(ActionStatus.RESTRICTED_OPERATION.name(), resourceList,
+                updatedRestResponse.getResponse());
+        assertEquals("Check response code after updating resource icon", 409,
+                updatedRestResponse.getErrorCode().intValue());
+
+        // get resource with original name. original metadata should be returned
+        RestResponse getRestResponse = ResourceRestUtils.getResource(sdncModifierDetails,
+                resourceDetails.getUniqueId());
+        // validate response
+        assertNotNull("check response object is not null after get resource", getRestResponse);
+        assertNotNull("check error code exists in response after get resource", getRestResponse.getErrorCode());
+        assertEquals("Check response code after update resource", 200, getRestResponse.getErrorCode().intValue());
+
+        // parse updated response to javaObject
+        Resource getResourceRespJavaObject = ResponseParser
+                .convertResourceResponseToJavaObject(getRestResponse.getResponse());
+        // validate that metadata was not changed
+        ResourceValidationUtils.validateResourceReqVsResp(resourceDetails, getResourceRespJavaObject);
+
+    }
+
+    @Test
+    public void UpdateResourceInformation_resourceVersion_11() throws Exception {
+
+        User adminModifierDetails = ElementFactory.getDefaultUser(UserRoleEnum.ADMIN);
+        String resourceBaseVersion = "0.1";
+
+        // create resource
+        RestResponse restResponse = createResource(sdncModifierDetails, resourceDetails);
+        String resourceName = resourceDetails.getName();
+
+        // resourceUtils.addResourceMandatoryArtifacts(sdncModifierDetails,
+        // restResponse);
+
+        // Certify Resource
+        logger.debug("Changing resource life cycle ");
+        RestResponse checkoutResource = LifecycleRestUtils.changeResourceState(resourceDetails, sdncModifierDetails,
+                resourceBaseVersion, LifeCycleStatesEnum.CHECKIN);
+        assertEquals("Check response code after checkout resource", 200, checkoutResource.getErrorCode().intValue());
+
+        /*logger.debug("Changing resource life cycle ");
+        checkoutResource = LifecycleRestUtils.changeResourceState(resourceDetails, sdncModifierDetails,
+                resourceBaseVersion, LifeCycleStatesEnum.CERTIFICATIONREQUEST);
+        assertEquals("Check response code after checkout resource", 200, checkoutResource.getErrorCode().intValue());
+
+        logger.debug("Changing resource life cycle ");
+        checkoutResource = LifecycleRestUtils.changeResourceState(resourceDetails, adminModifierDetails,
+                resourceBaseVersion, LifeCycleStatesEnum.STARTCERTIFICATION);
+        assertEquals("Check response code after checkout resource", 200, checkoutResource.getErrorCode().intValue());*/
+
+        logger.debug("Changing resource life cycle ");
+        checkoutResource = LifecycleRestUtils.changeResourceState(resourceDetails, adminModifierDetails,
+                resourceBaseVersion, LifeCycleStatesEnum.CERTIFY);
+        assertEquals("Check response code after checkout resource", 200, checkoutResource.getErrorCode().intValue());
+
+        String resourceCertifyVersion = "1.0";
+        logger.debug("Changing resource life cycle ");
+        checkoutResource = LifecycleRestUtils.changeResourceState(resourceDetails, adminModifierDetails,
+                resourceDetails.getVersion(), LifeCycleStatesEnum.CHECKOUT);
+        assertEquals("Check response code after checkout resource", 200, checkoutResource.getErrorCode().intValue());
+
+        ResourceReqDetails updatedResourceDetails = defineUpdatedResourse(resourceName);
+
+        RestResponse updatedRestResponse = ResourceRestUtils.updateResourceMetadata(updatedResourceDetails,
+                sdncModifierDetails, resourceDetails.getUniqueId(), "");
+        // validate response
+        List<String> resourceList = new ArrayList<String>();
+        assertNotNull("check response object is not null after update resource", updatedRestResponse);
+        assertNotNull("check error code exists in response after update resource", updatedRestResponse.getErrorCode());
+        ErrorValidationUtils.checkBodyResponseOnError(ActionStatus.RESTRICTED_OPERATION.name(), resourceList,
+                updatedRestResponse.getResponse());
+        // assertEquals("Check response code after updating resource icon", 409,
+        // updatedRestResponse.getErrorCode().intValue());
+
+        // get resource with original name. original metadata should be returned
+        RestResponse getRestResponse = ResourceRestUtils.getResource(sdncModifierDetails,
+                resourceDetails.getUniqueId());
+        // validate response
+        assertNotNull("check response object is not null after get resource", getRestResponse);
+
+        assertNotNull("check error code exists in response after get resource", getRestResponse.getErrorCode());
+
+        assertEquals("Check response code after update resource", 200, getRestResponse.getErrorCode().intValue());
+        // parse updated response to javaObject
+        Resource getResourceRespJavaObject = ResponseParser
+                .convertResourceResponseToJavaObject(getRestResponse.getResponse());
+        // validate that metadata was not changed
+        ResourceValidationUtils.validateResourceReqVsResp(resourceDetails, getResourceRespJavaObject);
+
+    }
+
+    @Test
+    public void UpdateResourceInformation_resourceVersion_02() throws Exception {
+
+        String resourceBaseVersion = "0.1";
+
+        // create resource
+        RestResponse restResponse = createResource(sdncModifierDetails, resourceDetails);
+        String resourceName = resourceDetails.getName();
+
+        // resourceUtils.addResourceMandatoryArtifacts(sdncModifierDetails,
+        // restResponse);
+
+        // Certify Resource
+        logger.debug("Changing resource life cycle ");
+        RestResponse checkoutResource = LifecycleRestUtils.changeResourceState(resourceDetails, sdncModifierDetails,
+                resourceBaseVersion, LifeCycleStatesEnum.CHECKIN);
+        assertEquals("Check response code after checkout resource", 200, checkoutResource.getErrorCode().intValue());
+
+        // String resourceCertifyVersion = "0.1";
+        logger.debug("Changing resource life cycle ");
+        checkoutResource = LifecycleRestUtils.changeResourceState(resourceDetails, sdncModifierDetails,
+                resourceBaseVersion, LifeCycleStatesEnum.CHECKOUT);
+        assertEquals("Check response code after checkout resource", 200, checkoutResource.getErrorCode().intValue());
+
+        ResourceReqDetails updatedResourceDetails = defineUpdatedResourse(resourceName);
+
+        RestResponse updatedRestResponse = ResourceRestUtils.updateResourceMetadata(updatedResourceDetails,
+                sdncModifierDetails, resourceDetails.getUniqueId(), "");
+        // validate response
+        assertNotNull("check response object is not null after update resource", updatedRestResponse);
+        assertNotNull("check error code exists in response after update resource", updatedRestResponse.getErrorCode());
+        assertEquals("Check response code after updating resource icon", 200,
+                updatedRestResponse.getErrorCode().intValue());
+
+        // get resource with original name. original metadata should be returned
+        RestResponse getRestResponse = ResourceRestUtils.getResource(sdncModifierDetails,
+                resourceDetails.getUniqueId());
+        // validate response
+        assertNotNull("check response object is not null after get resource", getRestResponse);
+        assertNotNull("check error code exists in response after get resource", getRestResponse.getErrorCode());
+        assertEquals("Check response code after update resource", 200, getRestResponse.getErrorCode().intValue());
+
+        // parse updated response to javaObject
+        Resource getResourceRespJavaObject = ResponseParser
+                .convertResourceResponseToJavaObject(getRestResponse.getResponse());
+        // validate that metadata was not changed
+        ResourceValidationUtils.validateResourceReqVsResp(updatedResourceDetails, getResourceRespJavaObject);
+
+        // delete resource
+        RestResponse response = ResourceRestUtils.deleteResourceByNameAndVersion(sdncModifierDetails,
+                updatedResourceDetails.getName(), "0.1");
+        BaseRestUtils.checkDeleteResponse(response);
+        response = ResourceRestUtils.deleteResourceByNameAndVersion(sdncModifierDetails,
+                updatedResourceDetails.getName(), "0.2");
+        BaseRestUtils.checkDeleteResponse(response);
+
+    }
+
+    @Test
+    public void UpdateResourceIcon_resourceVersion_11() throws Exception {
+        // Can be changed only if major version is "0".
+
+        User adminModifierDetails = ElementFactory.getDefaultUser(UserRoleEnum.ADMIN);
+        String resourceBaseVersion = "0.1";
+
+        // create resource
+        RestResponse restResponse = createResource(sdncModifierDetails, resourceDetails);
+        String resourceName = resourceDetails.getName();
+
+        // resourceUtils.addResourceMandatoryArtifacts(sdncModifierDetails,
+        // restResponse);
+
+        // Certify Resource
+        logger.debug("Changing resource life cycle ");
+        RestResponse checkoutResource = LifecycleRestUtils.changeResourceState(resourceDetails, sdncModifierDetails,
+                resourceBaseVersion, LifeCycleStatesEnum.CHECKIN);
+        assertEquals("Check response code after checkout resource", 200, checkoutResource.getErrorCode().intValue());
+
+        /*logger.debug("Changing resource life cycle ");
+        checkoutResource = LifecycleRestUtils.changeResourceState(resourceDetails, sdncModifierDetails,
+                resourceBaseVersion, LifeCycleStatesEnum.CERTIFICATIONREQUEST);
+        assertEquals("Check response code after checkout resource", 200, checkoutResource.getErrorCode().intValue());
+
+        logger.debug("Changing resource life cycle ");
+        checkoutResource = LifecycleRestUtils.changeResourceState(resourceDetails, adminModifierDetails,
+                resourceBaseVersion, LifeCycleStatesEnum.STARTCERTIFICATION);
+        assertEquals("Check response code after checkout resource", 200, checkoutResource.getErrorCode().intValue());*/
+
+        logger.debug("Changing resource life cycle ");
+        checkoutResource = LifecycleRestUtils.changeResourceState(resourceDetails, adminModifierDetails,
+                resourceBaseVersion, LifeCycleStatesEnum.CERTIFY);
+        assertEquals("Check response code after checkout resource", 200, checkoutResource.getErrorCode().intValue());
+
+        String resourceCertifyVersion = "1.0";
+        logger.debug("Changing resource life cycle ");
+        checkoutResource = LifecycleRestUtils.changeResourceState(resourceDetails, sdncModifierDetails,
+                resourceCertifyVersion, LifeCycleStatesEnum.CHECKOUT);
+        assertEquals("Check response code after checkout resource", 200, checkoutResource.getErrorCode().intValue());
+
+        // ResourceReqDetails updatedResourceDetails =
+        // defineUpdatedResourse(resourceName);
+        ResourceReqDetails updatedResourceDetails = defineResourse();
+        // updatedResourceDetails.setVendorName("updatedVandorName");
+        updatedResourceDetails.setIcon("updatedIcon");
+
+        RestResponse updatedRestResponse = ResourceRestUtils.updateResourceMetadata(updatedResourceDetails,
+                sdncModifierDetails, resourceDetails.getUniqueId(), "");
+        // validate response
+        List<String> resourceList = new ArrayList<String>();
+        ErrorValidationUtils.checkBodyResponseOnError(ActionStatus.RESOURCE_ICON_CANNOT_BE_CHANGED.name(), resourceList,
+                updatedRestResponse.getResponse());
+
+        // get resource with original name. original metadata should be returned
+        RestResponse getRestResponse = ResourceRestUtils.getResource(sdncModifierDetails,
+                resourceDetails.getUniqueId());
+        // validate response
+        assertNotNull("check response object is not null after get resource", getRestResponse);
+        assertNotNull("check error code exists in response after get resource", getRestResponse.getErrorCode());
+        assertEquals("Check response code after update resource", 200, getRestResponse.getErrorCode().intValue());
+        // parse updated response to javaObject
+        Resource getResourceRespJavaObject = ResponseParser
+                .convertResourceResponseToJavaObject(getRestResponse.getResponse());
+        // validate that metadata was not changed
+        ResourceValidationUtils.validateResourceReqVsResp(resourceDetails, getResourceRespJavaObject);
+
+    }
+
+    @Test
+    public void UpdateResourceVandorName_resourceVersion_11() throws Exception {
+        // Can be changed only if the major resource version is "0".
+        User adminModifierDetails = ElementFactory.getDefaultUser(UserRoleEnum.ADMIN);
+        String resourceBaseVersion = "0.1";
+
+        // create resource
+        RestResponse restResponse = createResource(sdncModifierDetails, resourceDetails);
+        String resourceName = resourceDetails.getName();
+
+        // resourceUtils.addResourceMandatoryArtifacts(sdncModifierDetails,
+        // restResponse);
+
+        // Certify Resource
+        logger.debug("Changing resource life cycle ");
+        RestResponse checkoutResource = LifecycleRestUtils.changeResourceState(resourceDetails, sdncModifierDetails,
+                resourceBaseVersion, LifeCycleStatesEnum.CHECKIN);
+        assertEquals("Check response code after checkout resource", 200, checkoutResource.getErrorCode().intValue());
+
+        /*logger.debug("Changing resource life cycle ");
+        checkoutResource = LifecycleRestUtils.changeResourceState(resourceDetails, sdncModifierDetails,
+                resourceBaseVersion, LifeCycleStatesEnum.CERTIFICATIONREQUEST);
+        assertEquals("Check response code after checkout resource", 200, checkoutResource.getErrorCode().intValue());
+
+        logger.debug("Changing resource life cycle ");
+        checkoutResource = LifecycleRestUtils.changeResourceState(resourceDetails, adminModifierDetails,
+                resourceBaseVersion, LifeCycleStatesEnum.STARTCERTIFICATION);
+        assertEquals("Check response code after checkout resource", 200, checkoutResource.getErrorCode().intValue());*/
+
+        logger.debug("Changing resource life cycle ");
+        checkoutResource = LifecycleRestUtils.changeResourceState(resourceDetails, adminModifierDetails,
+                resourceBaseVersion, LifeCycleStatesEnum.CERTIFY);
+        assertEquals("Check response code after checkout resource", 200, checkoutResource.getErrorCode().intValue());
+
+        String resourceCertifyVersion = "1.0";
+        logger.debug("Changing resource life cycle ");
+        checkoutResource = LifecycleRestUtils.changeResourceState(resourceDetails, sdncModifierDetails,
+                resourceCertifyVersion, LifeCycleStatesEnum.CHECKOUT);
+        assertEquals("Check response code after checkout resource", 200, checkoutResource.getErrorCode().intValue());
+
+        // ResourceReqDetails updatedResourceDetails =
+        // defineUpdatedResourse(resourceName);
+        ResourceReqDetails updatedResourceDetails = defineResourse();
+
+        updatedResourceDetails.setVendorName("updatedVandorName");
+
+        RestResponse updatedRestResponse = ResourceRestUtils.updateResourceMetadata(updatedResourceDetails,
+                sdncModifierDetails, resourceDetails.getUniqueId(), "");
+        // validate response
+        List<String> resourceList = new ArrayList<String>();
+        assertNotNull("check response object is not null after update resource", updatedRestResponse);
+        assertNotNull("check error code exists in response after update resource", updatedRestResponse.getErrorCode());
+        ErrorValidationUtils.checkBodyResponseOnError(ActionStatus.RESOURCE_VENDOR_NAME_CANNOT_BE_CHANGED.name(),
+                resourceList, updatedRestResponse.getResponse());
+        assertEquals("Check response code after updating resource icon", 400,
+                updatedRestResponse.getErrorCode().intValue());
+
+        // get resource with original name. original metadata should be returned
+        RestResponse getRestResponse = ResourceRestUtils.getResource(sdncModifierDetails,
+                resourceDetails.getUniqueId());
+        // validate response
+        assertNotNull("check response object is not null after get resource", getRestResponse);
+        assertNotNull("check error code exists in response after get resource", getRestResponse.getErrorCode());
+        assertEquals("Check response code after update resource", 200, getRestResponse.getErrorCode().intValue());
+        // parse updated response to javaObject
+        Resource getResourceRespJavaObject = ResponseParser
+                .convertResourceResponseToJavaObject(getRestResponse.getResponse());
+        // validate that metadata was not changed
+        ResourceValidationUtils.validateResourceReqVsResp(resourceDetails, getResourceRespJavaObject);
+
+    }
+
+    @Test
+    public void UpdateResourceName_resourceVersion_11() throws Exception {
+        // Can be changed only if the major resource version is "0".
+        User adminModifierDetails = ElementFactory.getDefaultUser(UserRoleEnum.ADMIN);
+        String resourceBaseVersion = "0.1";
+
+        // create resource
+        RestResponse restResponse = createResource(sdncModifierDetails, resourceDetails);
+        assertEquals("create resource failed", 201, restResponse.getErrorCode().intValue());
+        String resourceName = resourceDetails.getName();
+
+        // resourceUtils.addResourceMandatoryArtifacts(sdncModifierDetails,
+        // restResponse);
+
+        // Certify Resource
+        logger.debug("Changing resource life cycle ");
+        RestResponse checkoutResource = LifecycleRestUtils.changeResourceState(resourceDetails, sdncModifierDetails,
+                resourceBaseVersion, LifeCycleStatesEnum.CHECKIN);
+        assertEquals("Check response code after checkout resource", 200, checkoutResource.getErrorCode().intValue());
+
+        /*logger.debug("Changing resource life cycle ");
+        checkoutResource = LifecycleRestUtils.changeResourceState(resourceDetails, sdncModifierDetails,
+                resourceBaseVersion, LifeCycleStatesEnum.CERTIFICATIONREQUEST);
+        assertEquals("Check response code after checkout resource", 200, checkoutResource.getErrorCode().intValue());
+
+        logger.debug("Changing resource life cycle ");
+        checkoutResource = LifecycleRestUtils.changeResourceState(resourceDetails, adminModifierDetails,
+                resourceBaseVersion, LifeCycleStatesEnum.STARTCERTIFICATION);
+        assertEquals("Check response code after checkout resource", 200, checkoutResource.getErrorCode().intValue());*/
+
+        logger.debug("Changing resource life cycle ");
+        checkoutResource = LifecycleRestUtils.changeResourceState(resourceDetails, adminModifierDetails,
+                resourceBaseVersion, LifeCycleStatesEnum.CERTIFY);
+        assertEquals("Check response code after checkout resource", 200, checkoutResource.getErrorCode().intValue());
+
+        String resourceCertifyVersion = "1.0";
+        logger.debug("Changing resource life cycle ");
+        checkoutResource = LifecycleRestUtils.changeResourceState(resourceDetails, sdncModifierDetails,
+                resourceCertifyVersion, LifeCycleStatesEnum.CHECKOUT);
+        assertEquals("Check response code after checkout resource", 200, checkoutResource.getErrorCode().intValue());
+
+		/*
+		 * //ResourceReqDetails updatedResourceDetails =
+		 * defineUpdatedResourse(resourceName); ResourceReqDetails
+		 * updatedResourceDetails = defineResourse();
+		 * 
+		 * updatedResourceDetails.setResourceName("updatedResourceName");
+		 * updatedResourceDetails.setIcon("updatedResourceName");
+		 */
+        resourceDetails.setName("updatedResourceName");
+        List<String> tagList = new ArrayList<String>();
+        tagList.add(0, "updatedResourceName");
+        resourceDetails.setTags(tagList);
+
+        RestResponse updatedRestResponse = ResourceRestUtils.updateResourceMetadata(resourceDetails,
+                sdncModifierDetails, resourceDetails.getUniqueId(), "");
+        // validate response
+        List<String> resourceList = new ArrayList<String>();
+        assertNotNull("check response object is not null after update resource", updatedRestResponse);
+        assertNotNull("check error code exists in response after update resource", updatedRestResponse.getErrorCode());
+        ErrorValidationUtils.checkBodyResponseOnError(ActionStatus.RESOURCE_NAME_CANNOT_BE_CHANGED.name(), resourceList,
+                updatedRestResponse.getResponse());
+
+    }
+
+    @Test
+    public void UpdateResourceTag_resourceVersion_11() throws Exception {
+        // Tag Can be updated when major version is "0".
+        User adminModifierDetails = ElementFactory.getDefaultUser(UserRoleEnum.ADMIN);
+        String resourceBaseVersion = "0.1";
+
+        // create resource
+        RestResponse restResponse = createResource(sdncModifierDetails, resourceDetails);
+        String resourceName = resourceDetails.getName();
+
+        // resourceUtils.addResourceMandatoryArtifacts(sdncModifierDetails,
+        // restResponse);
+
+        // Certify Resource
+        logger.debug("Changing resource life cycle ");
+        RestResponse checkoutResource = LifecycleRestUtils.changeResourceState(resourceDetails, sdncModifierDetails,
+                resourceBaseVersion, LifeCycleStatesEnum.CHECKIN);
+        assertEquals("Check response code after checkout resource", 200, checkoutResource.getErrorCode().intValue());
+
+        /*logger.debug("Changing resource life cycle ");
+        checkoutResource = LifecycleRestUtils.changeResourceState(resourceDetails, sdncModifierDetails,
+                resourceBaseVersion, LifeCycleStatesEnum.CERTIFICATIONREQUEST);
+        assertEquals("Check response code after checkout resource", 200, checkoutResource.getErrorCode().intValue());
+
+        logger.debug("Changing resource life cycle ");
+        checkoutResource = LifecycleRestUtils.changeResourceState(resourceDetails, adminModifierDetails,
+                resourceBaseVersion, LifeCycleStatesEnum.STARTCERTIFICATION);
+        assertEquals("Check response code after checkout resource", 200, checkoutResource.getErrorCode().intValue());*/
+
+        logger.debug("Changing resource life cycle ");
+        checkoutResource = LifecycleRestUtils.changeResourceState(resourceDetails, adminModifierDetails,
+                resourceBaseVersion, LifeCycleStatesEnum.CERTIFY);
+        assertEquals("Check response code after checkout resource", 200, checkoutResource.getErrorCode().intValue());
+
+        String resourceCertifyVersion = "1.0";
+        logger.debug("Changing resource life cycle ");
+        checkoutResource = LifecycleRestUtils.changeResourceState(resourceDetails, sdncModifierDetails,
+                resourceCertifyVersion, LifeCycleStatesEnum.CHECKOUT);
+        assertEquals("Check response code after checkout resource", 200, checkoutResource.getErrorCode().intValue());
+
+        // ResourceReqDetails updatedResourceDetails =
+        // defineUpdatedResourse(resourceName);
+        ResourceReqDetails updatedResourceDetails = defineResourse();
+        // updatedResourceDetails.setVendorName("updatedVandorName");
+
+        ArrayList<String> resourceTags = new ArrayList<String>();
+        resourceTags.add("NewTag");
+        resourceTags.add(resourceDetails.getName());
+
+        updatedResourceDetails.setTags(resourceTags);
+
+        RestResponse updatedRestResponse = ResourceRestUtils.updateResourceMetadata(updatedResourceDetails,
+                sdncModifierDetails, resourceDetails.getUniqueId(), "");
+        // validate response
+        assertNotNull("check response object is not null after update resource", updatedRestResponse);
+        assertNotNull("check error code exists in response after update resource", updatedRestResponse.getErrorCode());
+        assertEquals("Check response code after update resource", 200, updatedRestResponse.getErrorCode().intValue());
+
+        RestResponse getRestResponse = ResourceRestUtils.getResource(sdncModifierDetails,
+                resourceDetails.getUniqueId());
+        assertNotNull("check response object is not null after update resource", getRestResponse);
+        parseResponseAndValidate(updatedResourceDetails, getRestResponse);
+
+    }
+
+    @Test
+    public void UpdateAllowedParames_resourceVersion_11() throws Exception {
+
+        // Tag, contactId, vendorRelease,tags And description - Can be also
+        // updated when major version is NOT "0".
+        User adminModifierDetails = ElementFactory.getDefaultUser(UserRoleEnum.ADMIN);
+        String resourceBaseVersion = "0.1";
+
+        // create resource
+        RestResponse restResponse = createResource(sdncModifierDetails, resourceDetails);
+
+        // resourceUtils.addResourceMandatoryArtifacts(sdncModifierDetails,
+        // restResponse);
+
+        // Certify Resource
+        logger.debug("Changing resource life cycle ");
+        RestResponse checkoutResource = LifecycleRestUtils.changeResourceState(resourceDetails, sdncModifierDetails,
+                resourceBaseVersion, LifeCycleStatesEnum.CHECKIN);
+        assertEquals("Check response code after checkout resource", 200, checkoutResource.getErrorCode().intValue());
+
+        /*logger.debug("Changing resource life cycle ");
+        checkoutResource = LifecycleRestUtils.changeResourceState(resourceDetails, sdncModifierDetails,
+                resourceBaseVersion, LifeCycleStatesEnum.CERTIFICATIONREQUEST);
+        assertEquals("Check response code after checkout resource", 200, checkoutResource.getErrorCode().intValue());
+
+        logger.debug("Changing resource life cycle ");
+        checkoutResource = LifecycleRestUtils.changeResourceState(resourceDetails, adminModifierDetails,
+                resourceBaseVersion, LifeCycleStatesEnum.STARTCERTIFICATION);
+        assertEquals("Check response code after checkout resource", 200, checkoutResource.getErrorCode().intValue());*/
+
+        logger.debug("Changing resource life cycle ");
+        checkoutResource = LifecycleRestUtils.changeResourceState(resourceDetails, adminModifierDetails,
+                resourceBaseVersion, LifeCycleStatesEnum.CERTIFY);
+        assertEquals("Check response code after checkout resource", 200, checkoutResource.getErrorCode().intValue());
+
+        String resourceCertifyVersion = "1.0";
+        logger.debug("Changing resource life cycle ");
+        checkoutResource = LifecycleRestUtils.changeResourceState(resourceDetails, sdncModifierDetails,
+                resourceCertifyVersion, LifeCycleStatesEnum.CHECKOUT);
+        assertEquals("Check response code after checkout resource", 200, checkoutResource.getErrorCode().intValue());
+
+        // ResourceReqDetails updatedResourceDetails =
+        // defineUpdatedResourse(resourceName);
+        ResourceReqDetails updatedResourceDetails = defineResourse();
+        // updatedResourceDetails.setVendorName("updatedVandorName");
+
+        // updated allowed parameters when major resource version is NOT "0"
+        ArrayList<String> resourceTags = new ArrayList<String>();
+        resourceTags.add("NewTag");
+        resourceTags.add(resourceDetails.getName());
+        updatedResourceDetails.setTags(resourceTags);
+        updatedResourceDetails.setDescription("UpdatedDescription");
+        updatedResourceDetails.setVendorRelease("5.1");
+        updatedResourceDetails.setContactId("bt750h");
+
+        RestResponse updatedRestResponse = ResourceRestUtils.updateResourceMetadata(updatedResourceDetails,
+                sdncModifierDetails, resourceDetails.getUniqueId(), "");
+        // validate response
+        assertNotNull("check response object is not null after update resource", updatedRestResponse);
+        assertNotNull("check error code exists in response after update resource", updatedRestResponse.getErrorCode());
+        assertEquals("Check response code after update resource", 200, updatedRestResponse.getErrorCode().intValue());
+
+        RestResponse getRestResponse = ResourceRestUtils.getResource(sdncModifierDetails,
+                resourceDetails.getUniqueId());
+        assertNotNull("check response object is not null after update resource", getRestResponse);
+        parseResponseAndValidate(updatedResourceDetails, getRestResponse);
+
+    }
+
+    @Test
+    public void UpdateResourceDerivedFrom_resourceVersion_11() throws Exception {
+        // DerivedFrom parameter - Can be updated when major version is "0".
+        User adminModifierDetails = ElementFactory.getDefaultUser(UserRoleEnum.ADMIN);
+        String resourceBaseVersion = "0.1";
+
+        // create resource
+        RestResponse restResponse = createResource(sdncModifierDetails, resourceDetails);
+        String resourceName = resourceDetails.getName();
+
+        // resourceUtils.addResourceMandatoryArtifacts(sdncModifierDetails,
+        // restResponse);
+
+        // Certify Resource
+        logger.debug("Changing resource life cycle ");
+        RestResponse checkoutResource = LifecycleRestUtils.changeResourceState(resourceDetails, sdncModifierDetails,
+                resourceBaseVersion, LifeCycleStatesEnum.CHECKIN);
+        assertEquals("Check response code after checkout resource", 200, checkoutResource.getErrorCode().intValue());
+
+        /*logger.debug("Changing resource life cycle ");
+        checkoutResource = LifecycleRestUtils.changeResourceState(resourceDetails, sdncModifierDetails,
+                resourceBaseVersion, LifeCycleStatesEnum.CERTIFICATIONREQUEST);
+        assertEquals("Check response code after checkout resource", 200, checkoutResource.getErrorCode().intValue());
+
+        logger.debug("Changing resource life cycle ");
+        checkoutResource = LifecycleRestUtils.changeResourceState(resourceDetails, adminModifierDetails,
+                resourceBaseVersion, LifeCycleStatesEnum.STARTCERTIFICATION);
+        assertEquals("Check response code after checkout resource", 200, checkoutResource.getErrorCode().intValue());*/
+
+        logger.debug("Changing resource life cycle ");
+        checkoutResource = LifecycleRestUtils.changeResourceState(resourceDetails, adminModifierDetails,
+                resourceBaseVersion, LifeCycleStatesEnum.CERTIFY);
+        assertEquals("Check response code after checkout resource", 200, checkoutResource.getErrorCode().intValue());
+
+        String resourceCertifyVersion = "1.0";
+        logger.debug("Changing resource life cycle ");
+        checkoutResource = LifecycleRestUtils.changeResourceState(resourceDetails, sdncModifierDetails,
+                resourceCertifyVersion, LifeCycleStatesEnum.CHECKOUT);
+        assertEquals("Check response code after checkout resource", 200, checkoutResource.getErrorCode().intValue());
+
+        // ResourceReqDetails updatedResourceDetails =
+        // defineUpdatedResourse(resourceName);
+        ResourceReqDetails updatedResourceDetails = defineResourse();
+        ArrayList<String> drivenFrom = new ArrayList<String>();
+        drivenFrom.add(0, "tosca.nodes.Container.Application");
+        updatedResourceDetails.setDerivedFrom(drivenFrom);
+
+        RestResponse updatedRestResponse = ResourceRestUtils.updateResourceMetadata(updatedResourceDetails,
+                sdncModifierDetails, resourceDetails.getUniqueId(), "");
+        // validate response
+        List<String> resourceList = new ArrayList<String>();
+        ResourceRestUtils.checkSuccess(updatedRestResponse);
+
+        // get resource with original name. original metadata should be returned
+        RestResponse getRestResponse = ResourceRestUtils.getResource(sdncModifierDetails,
+                resourceDetails.getUniqueId());
+        // validate response
+        assertNotNull("check response object is not null after get resource", getRestResponse);
+        assertNotNull("check error code exists in response after get resource", getRestResponse.getErrorCode());
+        assertEquals("Check response code after update resource", 200, getRestResponse.getErrorCode().intValue());
+        // parse updated response to javaObject
+        Resource getResourceRespJavaObject = ResponseParser
+                .convertResourceResponseToJavaObject(getRestResponse.getResponse());
+        // validate that metadata was not changed
+        ResourceValidationUtils.validateResourceReqVsResp(resourceDetails, getResourceRespJavaObject);
+
+    }
+
+    @Test
+    public void UpdateResource_vendorNameValidation() throws Exception {
+
+        RestResponse restResponse = createResource(sdncModifierDetails, resourceDetails);
+        assertEquals("Check response code after create resource", 201, restResponse.getErrorCode().intValue());
+        String updatedVendorName = "";
+        String uniqueId = resourceDetails.getUniqueId();
+        resourceDetails.setVendorName(updatedVendorName);
+        RestResponse updatedRestResponse = ResourceRestUtils.updateResourceMetadata(resourceDetails,
+                sdncModifierDetails, uniqueId, "");
+        assertNotNull("check response object is not null after update resource", updatedRestResponse);
+        assertNotNull("check error code exists in response after update resource", updatedRestResponse.getErrorCode());
+        ErrorValidationUtils.checkBodyResponseOnError(ActionStatus.MISSING_VENDOR_NAME.name(), Empty_List,
+                updatedRestResponse.getResponse());
+
+        // update resource vendorName metadata: 1 characters
+        updatedVendorName = "	";
+        // set vendorName
+        resourceDetails.setVendorName(updatedVendorName);
+        updatedRestResponse = ResourceRestUtils.updateResourceMetadata(resourceDetails, sdncModifierDetails, uniqueId,
+                "");
+        assertNotNull("check response object is not null after update resource", updatedRestResponse);
+        assertNotNull("check error code exists in response after update resource", updatedRestResponse.getErrorCode());
+        ErrorValidationUtils.checkBodyResponseOnError(ActionStatus.MISSING_VENDOR_NAME.name(), Empty_List,
+                updatedRestResponse.getResponse());
+
+        // update resource vendorName metadata: 25 characters
+        updatedVendorName = "Verification and validati";
+        // set vendorName
+        resourceDetails.setVendorName(updatedVendorName);
+        updatedRestResponse = ResourceRestUtils.updateResourceMetadata(resourceDetails, sdncModifierDetails, uniqueId,
+                "");
+        assertNotNull("check response object is not null after update resource", updatedRestResponse);
+        assertNotNull("check error code exists in response after update resource", updatedRestResponse.getErrorCode());
+        assertEquals("Check response code after update resource", 200, updatedRestResponse.getErrorCode().intValue());
+        parseResponseAndValidate(resourceDetails, updatedRestResponse);
+
+        // update resource vendorName metadata: 26 characters
+        updatedVendorName = "Verification and validatii";
+        // set vendorName
+        List<String> myList = new ArrayList<String>();
+        myList.add(0, "25");
+        resourceDetails.setVendorName(updatedVendorName);
+        updatedRestResponse = ResourceRestUtils.updateResourceMetadata(resourceDetails, sdncModifierDetails, uniqueId,
+                "");
+        assertNotNull("check response object is not null after update resource", updatedRestResponse);
+        ErrorValidationUtils.checkBodyResponseOnError(ActionStatus.VENDOR_NAME_EXCEEDS_LIMIT.name(), myList,
+                updatedRestResponse.getResponse());
+
+        // update resource VendorRelease metadata: forbidden characters
+        updatedVendorName = "A1<";
+        // set vendorName
+        resourceDetails.setVendorName(updatedVendorName);
+        updatedRestResponse = ResourceRestUtils.updateResourceMetadata(resourceDetails, sdncModifierDetails, uniqueId,
+                "");
+        assertNotNull("check response object is not null after update resource", updatedRestResponse);
+        ErrorValidationUtils.checkBodyResponseOnError(ActionStatus.INVALID_VENDOR_NAME.name(), Empty_List,
+                updatedRestResponse.getResponse());
+
+        updatedVendorName = "A1>";
+        // set vendorName
+        resourceDetails.setVendorName(updatedVendorName);
+        updatedRestResponse = ResourceRestUtils.updateResourceMetadata(resourceDetails, sdncModifierDetails, uniqueId,
+                "");
+        assertNotNull("check response object is not null after update resource", updatedRestResponse);
+        ErrorValidationUtils.checkBodyResponseOnError(ActionStatus.INVALID_VENDOR_NAME.name(), Empty_List,
+                updatedRestResponse.getResponse());
+
+        updatedVendorName = "A1:";
+        // set vendorName
+        resourceDetails.setVendorName(updatedVendorName);
+        updatedRestResponse = ResourceRestUtils.updateResourceMetadata(resourceDetails, sdncModifierDetails, uniqueId,
+                "");
+        assertNotNull("check response object is not null after update resource", updatedRestResponse);
+        ErrorValidationUtils.checkBodyResponseOnError(ActionStatus.INVALID_VENDOR_NAME.name(), Empty_List,
+                updatedRestResponse.getResponse());
+
+        updatedVendorName = "A1\"";
+        // set vendorName
+        resourceDetails.setVendorName(updatedVendorName);
+        updatedRestResponse = ResourceRestUtils.updateResourceMetadata(resourceDetails, sdncModifierDetails, uniqueId,
+                "");
+        assertNotNull("check response object is not null after update resource", updatedRestResponse);
+        ErrorValidationUtils.checkBodyResponseOnError(ActionStatus.INVALID_VENDOR_NAME.name(), Empty_List,
+                updatedRestResponse.getResponse());
+
+        updatedVendorName = "A1/";
+        // set vendorName
+        resourceDetails.setVendorName(updatedVendorName);
+        updatedRestResponse = ResourceRestUtils.updateResourceMetadata(resourceDetails, sdncModifierDetails, uniqueId,
+                "");
+        assertNotNull("check response object is not null after update resource", updatedRestResponse);
+        ErrorValidationUtils.checkBodyResponseOnError(ActionStatus.INVALID_VENDOR_NAME.name(), Empty_List,
+                updatedRestResponse.getResponse());
+
+        updatedVendorName = "A1\\";
+        // set vendorName
+        resourceDetails.setVendorName(updatedVendorName);
+        updatedRestResponse = ResourceRestUtils.updateResourceMetadata(resourceDetails, sdncModifierDetails, uniqueId,
+                "");
+        assertNotNull("check response object is not null after update resource", updatedRestResponse);
+        ErrorValidationUtils.checkBodyResponseOnError(ActionStatus.INVALID_VENDOR_NAME.name(), Empty_List,
+                updatedRestResponse.getResponse());
+
+        updatedVendorName = "A1|";
+        // set vendorName
+        resourceDetails.setVendorName(updatedVendorName);
+        updatedRestResponse = ResourceRestUtils.updateResourceMetadata(resourceDetails, sdncModifierDetails, uniqueId,
+                "");
+        assertNotNull("check response object is not null after update resource", updatedRestResponse);
+        ErrorValidationUtils.checkBodyResponseOnError(ActionStatus.INVALID_VENDOR_NAME.name(), Empty_List,
+                updatedRestResponse.getResponse());
+
+        updatedVendorName = "A1?";
+        // set vendorName
+        resourceDetails.setVendorName(updatedVendorName);
+        updatedRestResponse = ResourceRestUtils.updateResourceMetadata(resourceDetails, sdncModifierDetails, uniqueId,
+                "");
+        assertNotNull("check response object is not null after update resource", updatedRestResponse);
+        ErrorValidationUtils.checkBodyResponseOnError(ActionStatus.INVALID_VENDOR_NAME.name(), Empty_List,
+                updatedRestResponse.getResponse());
+
+        updatedVendorName = "A1*";
+        // set vendorName
+        resourceDetails.setVendorName(updatedVendorName);
+        updatedRestResponse = ResourceRestUtils.updateResourceMetadata(resourceDetails, sdncModifierDetails, uniqueId,
+                "");
+        assertNotNull("check response object is not null after update resource", updatedRestResponse);
+        ErrorValidationUtils.checkBodyResponseOnError(ActionStatus.INVALID_VENDOR_NAME.name(), Empty_List,
+                updatedRestResponse.getResponse());
+
+        // update resource vendorName metadata: null
+        updatedVendorName = null;
+        // set vendorName
+        resourceDetails.setVendorName(updatedVendorName);
+        updatedRestResponse = ResourceRestUtils.updateResourceMetadata(resourceDetails, sdncModifierDetails, uniqueId,
+                "");
+        assertNotNull("check response object is not null after update resource", updatedRestResponse);
+        ErrorValidationUtils.checkBodyResponseOnError(ActionStatus.MISSING_VENDOR_NAME.name(), Empty_List,
+                updatedRestResponse.getResponse());
+
+    }
+
+    @Test
+    public void UpdateResource_vendorReleaseValidation() throws Exception {
+
+        RestResponse restResponse = createResource(sdncModifierDetails, resourceDetails);
+        assertEquals("Check response code after create resource", 201, restResponse.getErrorCode().intValue());
+        RestResponse updatedRestResponse;
+        String uniqueId = resourceDetails.getUniqueId();
+        String updatedVendorRelease;
+        // set VendorRelease
+
+        // update resource VendorRelease metadata: 1 characters
+        updatedVendorRelease = "1";
+        // set VendorRelease
+        resourceDetails.setVendorRelease(updatedVendorRelease);
+        updatedRestResponse = ResourceRestUtils.updateResourceMetadata(resourceDetails, sdncModifierDetails, uniqueId,
+                "");
+        assertNotNull("check response object is not null after update resource", updatedRestResponse);
+        assertNotNull("check error code exists in response after update resource", updatedRestResponse.getErrorCode());
+        assertEquals("Check response code after update resource", 200, updatedRestResponse.getErrorCode().intValue());
+        parseResponseAndValidate(resourceDetails, updatedRestResponse);
+
+        // update resource VendorRelease metadata: 25 characters
+        updatedVendorRelease = "(!#1.00000000000000000000";
+        // set VendorRelease
+        resourceDetails.setVendorRelease(updatedVendorRelease);
+        updatedRestResponse = ResourceRestUtils.updateResourceMetadata(resourceDetails, sdncModifierDetails, uniqueId,
+                "");
+        assertNotNull("check response object is not null after update resource", updatedRestResponse);
+        assertNotNull("check error code exists in response after update resource", updatedRestResponse.getErrorCode());
+        assertEquals("Check response code after update resource", 200, updatedRestResponse.getErrorCode().intValue());
+        parseResponseAndValidate(resourceDetails, updatedRestResponse);
+
+        // update resource VendorRelease metadata: 26 characters
+        updatedVendorRelease = "(!#1.000000000000000000005";// set VendorRelease
+        resourceDetails.setVendorRelease(updatedVendorRelease);
+        updatedRestResponse = ResourceRestUtils.updateResourceMetadata(resourceDetails, sdncModifierDetails, uniqueId,
+                "");
+        ErrorValidationUtils.checkBodyResponseOnError(ActionStatus.VENDOR_RELEASE_EXCEEDS_LIMIT.name(),
+                Arrays.asList("" + ValidationUtils.VENDOR_RELEASE_MAX_LENGTH), updatedRestResponse.getResponse());
+
+        // UpdateAndValidate(sdncModifierDetails, resourceDetails,
+        // ActionStatus.VENDOR_RELEASE_EXCEEDS_LIMIT.name(),
+        // Arrays.asList(""+ValidationUtils.VENDOR_RELEASE_MAX_LENGTH));
+
+        // update resource VendorRelease metadata: forbidden characters
+        updatedVendorRelease = "A1<";
+        // set VendorRelease
+        resourceDetails.setVendorRelease(updatedVendorRelease);
+        updatedRestResponse = ResourceRestUtils.updateResourceMetadata(resourceDetails, sdncModifierDetails, uniqueId,
+                "");
+        ErrorValidationUtils.checkBodyResponseOnError(ActionStatus.INVALID_VENDOR_RELEASE.name(), Empty_List,
+                updatedRestResponse.getResponse());
+
+        updatedVendorRelease = "A1>";
+        // set VendorRelease
+        resourceDetails.setVendorRelease(updatedVendorRelease);
+        updatedRestResponse = ResourceRestUtils.updateResourceMetadata(resourceDetails, sdncModifierDetails, uniqueId,
+                "");
+        ErrorValidationUtils.checkBodyResponseOnError(ActionStatus.INVALID_VENDOR_RELEASE.name(), Empty_List,
+                updatedRestResponse.getResponse());
+
+        updatedVendorRelease = "A1:";
+        // set VendorRelease
+        resourceDetails.setVendorRelease(updatedVendorRelease);
+        updatedRestResponse = ResourceRestUtils.updateResourceMetadata(resourceDetails, sdncModifierDetails, uniqueId,
+                "");
+        ErrorValidationUtils.checkBodyResponseOnError(ActionStatus.INVALID_VENDOR_RELEASE.name(), Empty_List,
+                updatedRestResponse.getResponse());
+
+        updatedVendorRelease = "A1\"";
+        // set VendorRelease
+        resourceDetails.setVendorRelease(updatedVendorRelease);
+        updatedRestResponse = ResourceRestUtils.updateResourceMetadata(resourceDetails, sdncModifierDetails, uniqueId,
+                "");
+        ErrorValidationUtils.checkBodyResponseOnError(ActionStatus.INVALID_VENDOR_RELEASE.name(), Empty_List,
+                updatedRestResponse.getResponse());
+
+        updatedVendorRelease = "A1/";
+        // set VendorRelease
+        resourceDetails.setVendorRelease(updatedVendorRelease);
+        updatedRestResponse = ResourceRestUtils.updateResourceMetadata(resourceDetails, sdncModifierDetails, uniqueId,
+                "");
+        ErrorValidationUtils.checkBodyResponseOnError(ActionStatus.INVALID_VENDOR_RELEASE.name(), Empty_List,
+                updatedRestResponse.getResponse());
+
+        updatedVendorRelease = "A1\\";
+        // set VendorRelease
+        resourceDetails.setVendorRelease(updatedVendorRelease);
+        updatedRestResponse = ResourceRestUtils.updateResourceMetadata(resourceDetails, sdncModifierDetails, uniqueId,
+                "");
+        ErrorValidationUtils.checkBodyResponseOnError(ActionStatus.INVALID_VENDOR_RELEASE.name(), Empty_List,
+                updatedRestResponse.getResponse());
+
+        updatedVendorRelease = "A1|";
+        // set VendorRelease
+        resourceDetails.setVendorRelease(updatedVendorRelease);
+        updatedRestResponse = ResourceRestUtils.updateResourceMetadata(resourceDetails, sdncModifierDetails, uniqueId,
+                "");
+        ErrorValidationUtils.checkBodyResponseOnError(ActionStatus.INVALID_VENDOR_RELEASE.name(), Empty_List,
+                updatedRestResponse.getResponse());
+
+        updatedVendorRelease = "A1?";
+        // set VendorRelease
+        resourceDetails.setVendorRelease(updatedVendorRelease);
+        updatedRestResponse = ResourceRestUtils.updateResourceMetadata(resourceDetails, sdncModifierDetails, uniqueId,
+                "");
+        ErrorValidationUtils.checkBodyResponseOnError(ActionStatus.INVALID_VENDOR_RELEASE.name(), Empty_List,
+                updatedRestResponse.getResponse());
+
+        updatedVendorRelease = "A1*";
+        // set VendorRelease
+        resourceDetails.setVendorRelease(updatedVendorRelease);
+        updatedRestResponse = ResourceRestUtils.updateResourceMetadata(resourceDetails, sdncModifierDetails, uniqueId,
+                "");
+        ErrorValidationUtils.checkBodyResponseOnError(ActionStatus.INVALID_VENDOR_RELEASE.name(), Empty_List,
+                updatedRestResponse.getResponse());
+
+        // update resource VendorRelease metadata: null
+        updatedVendorRelease = null;
+        // set VendorRelease
+        resourceDetails.setVendorRelease(updatedVendorRelease);
+        updatedRestResponse = ResourceRestUtils.updateResourceMetadata(resourceDetails, sdncModifierDetails, uniqueId,
+                "");
+        assertNotNull("check response object is not null after update resource", updatedRestResponse);
+        ErrorValidationUtils.checkBodyResponseOnError(ActionStatus.MISSING_VENDOR_RELEASE.name(), Empty_List,
+                updatedRestResponse.getResponse());
+
+    }
+
+    @Test
+    public void UpdateResource_contactIdValidation() throws Exception { // [a-zA-Z]{2}[0-9]{3}[a-zA-Z0-9]{1}
+        // (6
+        // characters
+        // now,
+        // may
+        // be
+        // expanded
+        // up
+        // to
+        // 8
+        // characters
+        // in
+        // the
+        // future).
+        // Convert
+        // Upper
+        // case
+        // character
+        // to
+        // lower
+        // case
+        RestResponse updatedRestResponse;
+
+        RestResponse restResponse = createResource(sdncModifierDetails, resourceDetails);
+        assertEquals("Check response code after create resource", 201, restResponse.getErrorCode().intValue());
+        String uniqueId = resourceDetails.getUniqueId();
+
+        List<String> myList = new ArrayList<String>();
+        myList.add(0, "Resource");
+        String updatedcontactId = "";
+        resourceDetails.setContactId(updatedcontactId);
+
+        updatedRestResponse = ResourceRestUtils.updateResourceMetadata(resourceDetails, sdncModifierDetails, uniqueId,
+                "");
+        ErrorValidationUtils.checkBodyResponseOnError(ActionStatus.COMPONENT_MISSING_CONTACT.name(), myList,
+                updatedRestResponse.getResponse());
+
+        updatedcontactId = "ab12345";
+        resourceDetails.setContactId(updatedcontactId);
+        updatedRestResponse = ResourceRestUtils.updateResourceMetadata(resourceDetails, sdncModifierDetails, uniqueId,
+                "");
+        ErrorValidationUtils.checkBodyResponseOnError(ActionStatus.COMPONENT_INVALID_CONTACT.name(), myList,
+                updatedRestResponse.getResponse());
+
+        updatedcontactId = "      ";
+        resourceDetails.setContactId(updatedcontactId);
+        updatedRestResponse = ResourceRestUtils.updateResourceMetadata(resourceDetails, sdncModifierDetails, uniqueId,
+                "");
+        ErrorValidationUtils.checkBodyResponseOnError(ActionStatus.COMPONENT_MISSING_CONTACT.name(), myList,
+                updatedRestResponse.getResponse());
+
+        updatedcontactId = "ab 50h";
+        resourceDetails.setContactId(updatedcontactId);
+        updatedRestResponse = ResourceRestUtils.updateResourceMetadata(resourceDetails, sdncModifierDetails, uniqueId,
+                "");
+        ErrorValidationUtils.checkBodyResponseOnError(ActionStatus.COMPONENT_INVALID_CONTACT.name(), myList,
+                updatedRestResponse.getResponse());
+
+        updatedcontactId = "ab123c";
+        resourceDetails.setContactId(updatedcontactId);
+        updatedRestResponse = ResourceRestUtils.updateResourceMetadata(resourceDetails, sdncModifierDetails, uniqueId,
+                "");
+        assertNotNull("check response object is not null after update resource", updatedRestResponse);
+        assertEquals("Check response code after update resource", 200, updatedRestResponse.getErrorCode().intValue());
+        parseResponseAndValidate(resourceDetails, updatedRestResponse);
+
+        updatedcontactId = "cd789E";
+        resourceDetails.setContactId(updatedcontactId);
+        updatedRestResponse = ResourceRestUtils.updateResourceMetadata(resourceDetails, sdncModifierDetails, uniqueId,
+                "");
+        assertNotNull("check response object is not null after update resource", updatedRestResponse);
+        assertEquals("Check response code after update resource", 200, updatedRestResponse.getErrorCode().intValue());
+
+        resourceDetails.setContactId(updatedcontactId.toLowerCase());
+        parseResponseAndValidate(resourceDetails, updatedRestResponse);
+
+        updatedcontactId = "ef4567";
+        resourceDetails.setContactId(updatedcontactId);
+        updatedRestResponse = ResourceRestUtils.updateResourceMetadata(resourceDetails, sdncModifierDetails, uniqueId,
+                "");
+        assertNotNull("check response object is not null after update resource", updatedRestResponse);
+        assertNotNull("check error code exists in response after update resource", updatedRestResponse.getErrorCode());
+        assertEquals("Check response code after update resource", 200, updatedRestResponse.getErrorCode().intValue());
+        parseResponseAndValidate(resourceDetails, updatedRestResponse);
+
+        updatedcontactId = "AA012A";
+        resourceDetails.setContactId(updatedcontactId);
+        updatedRestResponse = ResourceRestUtils.updateResourceMetadata(resourceDetails, sdncModifierDetails, uniqueId,
+                "");
+        assertNotNull("check response object is not null after update resource", updatedRestResponse);
+        assertNotNull("check error code exists in response after update resource", updatedRestResponse.getErrorCode());
+        assertEquals("Check response code after update resource", 200, updatedRestResponse.getErrorCode().intValue());
+
+        resourceDetails.setContactId(updatedcontactId.toLowerCase());
+        parseResponseAndValidate(resourceDetails, updatedRestResponse);
+
+        updatedcontactId = "CD012c";
+        resourceDetails.setContactId(updatedcontactId);
+        updatedRestResponse = ResourceRestUtils.updateResourceMetadata(resourceDetails, sdncModifierDetails, uniqueId,
+                "");
+        assertNotNull("check response object is not null after update resource", updatedRestResponse);
+        assertNotNull("check error code exists in response after update resource", updatedRestResponse.getErrorCode());
+        assertEquals("Check response code after update resource", 200, updatedRestResponse.getErrorCode().intValue());
+
+        resourceDetails.setContactId(updatedcontactId.toLowerCase());
+        parseResponseAndValidate(resourceDetails, updatedRestResponse);
+
+        updatedcontactId = "EF0123";
+        resourceDetails.setContactId(updatedcontactId);
+        updatedRestResponse = ResourceRestUtils.updateResourceMetadata(resourceDetails, sdncModifierDetails, uniqueId,
+                "");
+        assertNotNull("check response object is not null after update resource", updatedRestResponse);
+        assertNotNull("check error code exists in response after update resource", updatedRestResponse.getErrorCode());
+        assertEquals("Check response code after update resource", 200, updatedRestResponse.getErrorCode().intValue());
+
+        resourceDetails.setContactId(updatedcontactId.toLowerCase());
+        parseResponseAndValidate(resourceDetails, updatedRestResponse);
+
+        ////////////////////////////// **************//////////////////////////////
+        List<String> resource = Arrays.asList("Resource");
+        updatedcontactId = "01345a";
+        resourceDetails.setContactId(updatedcontactId);
+        updatedRestResponse = ResourceRestUtils.updateResourceMetadata(resourceDetails, sdncModifierDetails, uniqueId,
+                "");
+        ErrorValidationUtils.checkBodyResponseOnError(ActionStatus.COMPONENT_INVALID_CONTACT.name(), myList,
+                updatedRestResponse.getResponse());
+
+        updatedcontactId = "0y000B";
+        resourceDetails.setContactId(updatedcontactId);
+        updatedRestResponse = ResourceRestUtils.updateResourceMetadata(resourceDetails, sdncModifierDetails, uniqueId,
+                "");
+        ErrorValidationUtils.checkBodyResponseOnError(ActionStatus.COMPONENT_INVALID_CONTACT.name(), myList,
+                updatedRestResponse.getResponse());
+
+        updatedcontactId = "Y1000b";
+        resourceDetails.setContactId(updatedcontactId);
+        updatedRestResponse = ResourceRestUtils.updateResourceMetadata(resourceDetails, sdncModifierDetails, uniqueId,
+                "");
+        ErrorValidationUtils.checkBodyResponseOnError(ActionStatus.COMPONENT_INVALID_CONTACT.name(), myList,
+                updatedRestResponse.getResponse());
+
+        updatedcontactId = "abxyzC";
+        resourceDetails.setContactId(updatedcontactId);
+        updatedRestResponse = ResourceRestUtils.updateResourceMetadata(resourceDetails, sdncModifierDetails, uniqueId,
+                "");
+        ErrorValidationUtils.checkBodyResponseOnError(ActionStatus.COMPONENT_INVALID_CONTACT.name(), myList,
+                updatedRestResponse.getResponse());
+
+        updatedcontactId = "cdXYZc";
+        resourceDetails.setContactId(updatedcontactId);
+        updatedRestResponse = ResourceRestUtils.updateResourceMetadata(resourceDetails, sdncModifierDetails, uniqueId,
+                "");
+        ErrorValidationUtils.checkBodyResponseOnError(ActionStatus.COMPONENT_INVALID_CONTACT.name(), myList,
+                updatedRestResponse.getResponse());
+
+        updatedcontactId = "efXY1D";
+        resourceDetails.setContactId(updatedcontactId);
+        updatedRestResponse = ResourceRestUtils.updateResourceMetadata(resourceDetails, sdncModifierDetails, uniqueId,
+                "");
+        ErrorValidationUtils.checkBodyResponseOnError(ActionStatus.COMPONENT_INVALID_CONTACT.name(), myList,
+                updatedRestResponse.getResponse());
+
+        updatedcontactId = "EFabcD";
+        resourceDetails.setContactId(updatedcontactId);
+        updatedRestResponse = ResourceRestUtils.updateResourceMetadata(resourceDetails, sdncModifierDetails, uniqueId,
+                "");
+        ErrorValidationUtils.checkBodyResponseOnError(ActionStatus.COMPONENT_INVALID_CONTACT.name(), myList,
+                updatedRestResponse.getResponse());
+
+        updatedcontactId = "EFABCD";
+        resourceDetails.setContactId(updatedcontactId);
+        updatedRestResponse = ResourceRestUtils.updateResourceMetadata(resourceDetails, sdncModifierDetails, uniqueId,
+                "");
+        ErrorValidationUtils.checkBodyResponseOnError(ActionStatus.COMPONENT_INVALID_CONTACT.name(), myList,
+                updatedRestResponse.getResponse());
+
+        updatedcontactId = "EFABC1";
+        resourceDetails.setContactId(updatedcontactId);
+        updatedRestResponse = ResourceRestUtils.updateResourceMetadata(resourceDetails, sdncModifierDetails, uniqueId,
+                "");
+        ErrorValidationUtils.checkBodyResponseOnError(ActionStatus.COMPONENT_INVALID_CONTACT.name(), myList,
+                updatedRestResponse.getResponse());
+
+        updatedcontactId = "efui1D";
+        resourceDetails.setContactId(updatedcontactId);
+        updatedRestResponse = ResourceRestUtils.updateResourceMetadata(resourceDetails, sdncModifierDetails, uniqueId,
+                "");
+        ErrorValidationUtils.checkBodyResponseOnError(ActionStatus.COMPONENT_INVALID_CONTACT.name(), myList,
+                updatedRestResponse.getResponse());
+
+        updatedcontactId = "efui1!";
+        resourceDetails.setContactId(updatedcontactId);
+        updatedRestResponse = ResourceRestUtils.updateResourceMetadata(resourceDetails, sdncModifierDetails, uniqueId,
+                "");
+        ErrorValidationUtils.checkBodyResponseOnError(ActionStatus.COMPONENT_INVALID_CONTACT.name(), myList,
+                updatedRestResponse.getResponse());
+
+        updatedcontactId = "ef555!";
+        resourceDetails.setContactId(updatedcontactId);
+        updatedRestResponse = ResourceRestUtils.updateResourceMetadata(resourceDetails, sdncModifierDetails, uniqueId,
+                "");
+        ErrorValidationUtils.checkBodyResponseOnError(ActionStatus.COMPONENT_INVALID_CONTACT.name(), myList,
+                updatedRestResponse.getResponse());
+
+        updatedcontactId = ",f555";
+        resourceDetails.setContactId(updatedcontactId);
+        updatedRestResponse = ResourceRestUtils.updateResourceMetadata(resourceDetails, sdncModifierDetails, uniqueId,
+                "");
+        ErrorValidationUtils.checkBodyResponseOnError(ActionStatus.COMPONENT_INVALID_CONTACT.name(), myList,
+                updatedRestResponse.getResponse());
+
+        updatedcontactId = "EF55.5";
+        resourceDetails.setContactId(updatedcontactId);
+        updatedRestResponse = ResourceRestUtils.updateResourceMetadata(resourceDetails, sdncModifierDetails, uniqueId,
+                "");
+        ErrorValidationUtils.checkBodyResponseOnError(ActionStatus.COMPONENT_INVALID_CONTACT.name(), myList,
+                updatedRestResponse.getResponse());
+
+        // update resource contactId metadata: extended character set (128–255)
+        resourceDetails.setContactId(extendedCharsStringBuilder());
+        updatedRestResponse = ResourceRestUtils.updateResourceMetadata(resourceDetails, sdncModifierDetails, uniqueId,
+                "");
+        ErrorValidationUtils.checkBodyResponseOnError(ActionStatus.COMPONENT_INVALID_CONTACT.name(), myList,
+                updatedRestResponse.getResponse());
+
+        // update resource contactId metadata: null
+        updatedcontactId = null;
+        resourceDetails.setContactId(updatedcontactId);
+        updatedRestResponse = ResourceRestUtils.updateResourceMetadata(resourceDetails, sdncModifierDetails, uniqueId,
+                "");
+        ErrorValidationUtils.checkBodyResponseOnError(ActionStatus.COMPONENT_MISSING_CONTACT.name(), myList,
+                updatedRestResponse.getResponse());
+
+    }
+
+    @Test
+    public void UpdateResource_TagsFieldValidation() throws Exception {
+        RestResponse updatedRestResponse;
+        // define and create resource
+
+        RestResponse restResponse = createResource(sdncModifierDetails, resourceDetails);
+        assertEquals("Check response code after create resource", 201, restResponse.getErrorCode().intValue());
+        String uniqueId = resourceDetails.getUniqueId();
+
+        String updatedTagField = "";
+        ArrayList<String> resourceTags = new ArrayList<String>();
+        resourceTags.add(updatedTagField);
+        // set description
+        resourceDetails.setTags(resourceTags);
+        List<String> variables = Arrays.asList("Resource", "tag");
+        updatedRestResponse = ResourceRestUtils.updateResourceMetadata(resourceDetails, sdncModifierDetails, uniqueId,
+                "");
+        ErrorValidationUtils.checkBodyResponseOnError(ActionStatus.INVALID_FIELD_FORMAT.name(), variables,
+                updatedRestResponse.getResponse());
+
+        // update resource tags metadata: empty
+        resourceTags = new ArrayList<String>();
+        // set Tags
+        resourceDetails.setTags(resourceTags);
+        updatedRestResponse = ResourceRestUtils.updateResourceMetadata(resourceDetails, sdncModifierDetails, uniqueId,
+                "");
+        ErrorValidationUtils.checkBodyResponseOnError(ActionStatus.COMPONENT_MISSING_TAGS.name(), Empty_List,
+                updatedRestResponse.getResponse());
+
+        // update resource description metadata: 1 characters
+        updatedTagField = "A";
+        resourceTags = new ArrayList<String>();
+        resourceTags.add(updatedTagField);
+        resourceTags.add(resourceDetails.getName());
+        // set description
+        resourceDetails.setTags(resourceTags);
+        updatedRestResponse = ResourceRestUtils.updateResourceMetadata(resourceDetails, sdncModifierDetails, uniqueId,
+                "");
+        assertNotNull("check response object is not null after update resource", updatedRestResponse);
+        assertNotNull("check error code exists in response after update resource", updatedRestResponse.getErrorCode());
+        assertEquals("Check response code after update resource", 200, updatedRestResponse.getErrorCode().intValue());
+        parseResponseAndValidate(resourceDetails, updatedRestResponse);
+
+        // OK - tag up to 50 chars
+        updatedTagField = "The Indian-crested.porcupine_The Indian cresteddds";
+        resourceTags.add(updatedTagField);
+        resourceDetails.setTags(resourceTags);
+        updatedRestResponse = ResourceRestUtils.updateResourceMetadata(resourceDetails, sdncModifierDetails, uniqueId,
+                "");
+        assertNotNull("check response object is not null after update resource", updatedRestResponse);
+        assertNotNull("check error code exists in response after update resource", updatedRestResponse.getErrorCode());
+        assertEquals("Check response code after update resource", 200, updatedRestResponse.getErrorCode().intValue());
+        parseResponseAndValidate(resourceDetails, updatedRestResponse);
+
+        // OK - sum is 1024, 50x20+48+20(commas)+6(cisco4 - resource name)
+        String updatedTagField1 = "The Indian-crested.porcupine_The Indian crestedd01";
+        String updatedTagField2 = "The Indian-crested.porcupine_The Indian crestedd02";
+        String updatedTagField3 = "The Indian-crested.porcupine_The Indian crestedd03";
+        String updatedTagField4 = "The Indian-crested.porcupine_The Indian crestedd04";
+        String updatedTagField5 = "The Indian-crested.porcupine_The Indian crestedd05";
+        String updatedTagField6 = "The Indian-crested.porcupine_The Indian crestedd06";
+        String updatedTagField7 = "The Indian-crested.porcupine_The Indian crestedd07";
+        String updatedTagField8 = "The Indian-crested.porcupine_The Indian crestedd08";
+        String updatedTagField9 = "The Indian-crested.porcupine_The Indian crestedd09";
+        String updatedTagField10 = "The Indian-crested.porcupine_The Indian crestedd10";
+        String updatedTagField11 = "The Indian-crested.porcupine_The Indian crestedd11";
+        String updatedTagField12 = "The Indian-crested.porcupine_The Indian crestedd12";
+        String updatedTagField13 = "The Indian-crested.porcupine_The Indian crestedd13";
+        String updatedTagField14 = "The Indian-crested.porcupine_The Indian crestedd14";
+        String updatedTagField15 = "The Indian-crested.porcupine_The Indian crestedd15";
+        String updatedTagField16 = "The Indian-crested.porcupine_The Indian crestedd16";
+        String updatedTagField17 = "The Indian-crested.porcupine_The Indian crestedd17";
+        String updatedTagField18 = "The Indian-crested.porcupine_The Indian crestedd18";
+        String updatedTagField19 = "The Indian-crested.porcupine_The Indian crestaa";
+
+        resourceTags = new ArrayList<String>();
+        resourceTags.add(updatedTagField);
+        resourceTags.add(updatedTagField1);
+        resourceTags.add(updatedTagField2);
+        resourceTags.add(updatedTagField3);
+        resourceTags.add(updatedTagField4);
+        resourceTags.add(updatedTagField5);
+        resourceTags.add(updatedTagField6);
+        resourceTags.add(updatedTagField7);
+        resourceTags.add(updatedTagField8);
+        resourceTags.add(updatedTagField9);
+        resourceTags.add(updatedTagField10);
+        resourceTags.add(updatedTagField11);
+        resourceTags.add(updatedTagField12);
+        resourceTags.add(updatedTagField13);
+        resourceTags.add(updatedTagField14);
+        resourceTags.add(updatedTagField15);
+        resourceTags.add(updatedTagField16);
+        resourceTags.add(updatedTagField17);
+        resourceTags.add(updatedTagField18);
+        resourceTags.add(updatedTagField19);
+        resourceTags.add(resourceDetails.getName());
+        // set description
+        resourceDetails.setTags(resourceTags);
+        updatedRestResponse = ResourceRestUtils.updateResourceMetadata(resourceDetails, sdncModifierDetails, uniqueId,
+                "");
+        assertNotNull("check response object is not null after update resource", updatedRestResponse);
+        assertNotNull("check error code exists in response after update resource", updatedRestResponse.getErrorCode());
+        assertEquals("Check response code after update resource", 200, updatedRestResponse.getErrorCode().intValue());
+        parseResponseAndValidate(resourceDetails, updatedRestResponse);
+
+        // Add another tag-exceeds limit
+        resourceTags.add("d");
+        resourceDetails.setTags(resourceTags);
+        ArrayList<String> myArray = new ArrayList<String>();
+        myArray.add(0, "1024");
+        updatedRestResponse = ResourceRestUtils.updateResourceMetadata(resourceDetails, sdncModifierDetails, uniqueId,
+                "");
+        ErrorValidationUtils.checkBodyResponseOnError(ActionStatus.COMPONENT_TAGS_EXCEED_LIMIT.name(), myArray,
+                updatedRestResponse.getResponse());
+
+        // Tag exceeds limit - 51
+        resourceTags = new ArrayList<String>();
+        updatedTagField = "The Indian-crested.porcupine_The Indian crestedddsw";
+        resourceTags.add(updatedTagField);
+        resourceTags.add(resourceDetails.getName());
+        // set description
+        resourceDetails.setTags(resourceTags);
+        myArray.remove(0);
+        myArray.add(0, "50");
+        updatedRestResponse = ResourceRestUtils.updateResourceMetadata(resourceDetails, sdncModifierDetails, uniqueId,
+                "");
+        ErrorValidationUtils.checkBodyResponseOnError(ActionStatus.COMPONENT_SINGLE_TAG_EXCEED_LIMIT.name(), myArray,
+                updatedRestResponse.getResponse());
+
+    }
+
+    @Test
+    public void UpdateResource_DesriptionFieldValidation() throws Exception {
+        // define and create resource
+        RestResponse updatedRestResponse;
+
+        RestResponse restResponse = createResource(sdncModifierDetails, resourceDetails);
+        String uniqueId = resourceDetails.getUniqueId();
+        assertEquals("Check response code after create resource", 201, restResponse.getErrorCode().intValue());
+        List<String> resource = new ArrayList<>();
+        resource.add("Resource");
+        // update resource description metadata: 0 characters
+        String updatedDescription = "";
+        // set description
+        resourceDetails.setDescription(updatedDescription);
+        updatedRestResponse = ResourceRestUtils.updateResourceMetadata(resourceDetails, sdncModifierDetails, uniqueId,
+                "");
+        ErrorValidationUtils.checkBodyResponseOnError(ActionStatus.COMPONENT_MISSING_DESCRIPTION.name(), resource,
+                updatedRestResponse.getResponse());
+
+        // update resource description metadata: null
+        updatedDescription = null;
+        // set description
+        resourceDetails.setDescription(updatedDescription);
+        updatedRestResponse = ResourceRestUtils.updateResourceMetadata(resourceDetails, sdncModifierDetails, uniqueId,
+                "");
+        ErrorValidationUtils.checkBodyResponseOnError(ActionStatus.COMPONENT_MISSING_DESCRIPTION.name(), resource,
+                updatedRestResponse.getResponse());
+
+        // update resource description metadata: 1 characters
+        updatedDescription = "A";
+        // set description
+        resourceDetails.setDescription(updatedDescription);
+        updatedRestResponse = ResourceRestUtils.updateResourceMetadata(resourceDetails, sdncModifierDetails, uniqueId,
+                "");
+        assertNotNull("check response object is not null after update resource", updatedRestResponse);
+        assertNotNull("check error code exists in response after update resource", updatedRestResponse.getErrorCode());
+        assertEquals("Check response code after update resource", 200, updatedRestResponse.getErrorCode().intValue());
+        parseResponseAndValidate(resourceDetails, updatedRestResponse);
+
+        // update resource description metadata: 1024 characters
+        updatedDescription = "The Indian crested porcupine *{Hystrix indica}*, or Indian porcupine is a member of the Old World porcupines."
+                + "It is quite an adaptable rodent, found throughout southern Asia and the Middle East."
+                + "It is tolerant of several different habitats: mountains, tropical and subtropical grasslands, scrublands, and forests."
+                + "It is a large rodent, growing more than 0.9 m = (3 ft) long and weighing 14.5 kg = (32 lb)! [citation needed] It is covered in multiple layers of quills."
+                + "The longest quills grow from its shoulders to about a third of the animal's length."
+                + "Its tail is covered in short, hollow quills that can rattle when threatened."
+                + "It has broad feet and long claws for digging. When attacked, the Indian crested porcupine raises its quills and rattles the hollow quills on its tail."
+                + "If the predator persists past these threats, the porcupine launches a backwards assault, hoping to stab its attacker with its quills."
+                + "It does this so effectively that most brushes between predators and the Indian porcupine end in death or severe injury";
+        // set description
+        resourceDetails.setDescription(updatedDescription);
+        updatedRestResponse = ResourceRestUtils.updateResourceMetadata(resourceDetails, sdncModifierDetails, uniqueId,
+                "");
+        assertNotNull("check response object is not null after update resource", updatedRestResponse);
+        assertNotNull("check error code exists in response after update resource", updatedRestResponse.getErrorCode());
+        assertEquals("Check response code after update resource", 200, updatedRestResponse.getErrorCode().intValue());
+        parseResponseAndValidate(resourceDetails, updatedRestResponse);
+
+        // update resource description metadata: 1025 characters
+        updatedDescription = "The Indian crested porcupine *{Hystrix indica}*, or Indian porcupine is a member of the Old World porcupines."
+                + "It is quite an adaptable rodent, found throughout southern Asia and the Middle East."
+                + "It is tolerant of several different habitats: mountains, tropical and subtropical grasslands, scrublands, and forests."
+                + "It is a large rodent, growing more than 0.9 m = (3 ft) long and weighing 14.5 kg = (32 lb)! [citation needed] It is covered in multiple layers of quills."
+                + "The longest quills grow from its shoulders to about a third of the animal's length."
+                + "Its tail is covered in short, hollow quills that can rattle when threatened."
+                + "It has broad feet and long claws for digging. When attacked, the Indian crested porcupine raises its quills and rattles the hollow quills on its tail."
+                + "If the predator persists past these threats, the porcupine launches a backwards assault, hoping to stab its attacker with its quills."
+                + "It does this so effectively that most brushes between predators and the Indian porcupine end in death or severe injury.";
+        // set description
+        resourceDetails.setDescription(updatedDescription);
+        resource.add(1, "1024");
+        updatedRestResponse = ResourceRestUtils.updateResourceMetadata(resourceDetails, sdncModifierDetails, uniqueId,
+                "");
+        ErrorValidationUtils.checkBodyResponseOnError(ActionStatus.COMPONENT_DESCRIPTION_EXCEEDS_LIMIT.name(), resource,
+                updatedRestResponse.getResponse());
+
+    }
+
+    @Test
+    public void UpdateResource_TagsFormatValidation() throws Exception {
+        char[] notValidCharsArray = getTagInValidFormatChars();
+
+        RestResponse restResponse = createResource(sdncModifierDetails, resourceDetails);
+        assertEquals("Check recourse created ", 201, restResponse.getErrorCode().intValue());
+        String resourceName = resourceDetails.getName();
+
+        // update tag details
+        ResourceReqDetails updatedResourceDetails = defineUpdatedResourse(resourceName);
+        ArrayList<String> resourceTags = new ArrayList<String>();
+
+        String updatedTagField;
+        RestResponse updatedRestResponse;
+        List<String> variables = Arrays.asList("Resource", "tag");
+
+        for (int i = 0; i < notValidCharsArray.length; i++) {
+            updatedTagField = "UpdatedTag" + notValidCharsArray[i];
+            resourceTags = new ArrayList<String>();
+            resourceTags.add(updatedTagField);
+            resourceTags.add(resourceDetails.getName());
+            // set description
+            updatedResourceDetails.setTags(resourceTags);
+
+            updatedRestResponse = ResourceRestUtils.updateResourceMetadata(updatedResourceDetails, sdncModifierDetails,
+                    resourceDetails.getUniqueId(), "");
+            // validate response
+            assertNotNull("check response object is not null after update resource", updatedRestResponse);
+            assertNotNull("check error code exists in response after update resource",
+                    updatedRestResponse.getErrorCode());
+            ErrorValidationUtils.checkBodyResponseOnError(ActionStatus.INVALID_FIELD_FORMAT.name(), variables,
+                    updatedRestResponse.getResponse());
+            assertEquals("Check response code after updating resource icon", 400,
+                    updatedRestResponse.getErrorCode().intValue());
+            assertEquals("Check response code after updating resource icon", "Bad Request",
+                    updatedRestResponse.getResponseMessage().toString());
+
+        }
+
+    }
+
+    @Test
+    public void UpdateResourceCategory_negativeFlow() throws Exception {
+
+        RestResponse restResponse = createResource(sdncModifierDetails, resourceDetails);
+        assertEquals("Check response code after update resource", 201, restResponse.getErrorCode().intValue());
+        Resource resourceBeforeUpdate = ResponseParser.convertResourceResponseToJavaObject(restResponse.getResponse());
+        String uniqueID = resourceDetails.getUniqueId();
+
+        // Update resource Category Successfully
+        ResourceReqDetails updatedResourceDetails = resourceDetails;
+
+        updatedResourceDetails.removeAllCategories();
+        updatedResourceDetails.addCategoryChain(ServiceCategoriesEnum.MOBILITY.getValue(),
+                ResourceCategoryEnum.APPLICATION_L4_DATABASE.getSubCategory());
+        RestResponse updatedRestResponse = ResourceRestUtils.updateResourceMetadata(updatedResourceDetails,
+                sdncModifierDetails, resourceDetails.getUniqueId(), "");
+
+        // validate response
+        List<String> resourceList = new ArrayList<String>();
+        resourceList.add(0, "Resource");
+        assertNotNull("check response object is not null after update resource", updatedRestResponse);
+        assertNotNull("check error code exists in response after update resource", updatedRestResponse.getErrorCode());
+        ErrorValidationUtils.checkBodyResponseOnError(ActionStatus.COMPONENT_INVALID_CATEGORY.name(), resourceList,
+                updatedRestResponse.getResponse());
+        assertEquals("Check response code after updating resource", 400, updatedRestResponse.getErrorCode().intValue());
+
+        // Updating resource category
+        updatedResourceDetails = defineUpdateResourceWithNonUpdatableFields(resourceBeforeUpdate);
+        updatedResourceDetails.addCategory("");
+        updatedRestResponse = ResourceRestUtils.updateResourceMetadata(updatedResourceDetails, sdncModifierDetails,
+                resourceDetails.getUniqueId(), "");
+        // validate response
+        resourceList = new ArrayList<String>();
+        resourceList.add(0, "Resource");
+        assertNotNull("check response object is not null after update resource", updatedRestResponse);
+        assertNotNull("check error code exists in response after update resource", updatedRestResponse.getErrorCode());
+        ErrorValidationUtils.checkBodyResponseOnError(ActionStatus.COMPONENT_MISSING_CATEGORY.name(), resourceList,
+                updatedRestResponse.getResponse());
+        assertEquals("Check response code after updating resource", 400, updatedRestResponse.getErrorCode().intValue());
+
+        // Updating resource category
+        updatedResourceDetails = defineUpdateResourceWithNonUpdatableFields(resourceBeforeUpdate);
+        updatedResourceDetails.addCategory("XXXXXX");
+        updatedRestResponse = ResourceRestUtils.updateResourceMetadata(updatedResourceDetails, sdncModifierDetails,
+                resourceDetails.getUniqueId(), "");
+        // validate response
+        resourceList = new ArrayList<String>();
+        resourceList.add(0, "Resource");
+        assertNotNull("check response object is not null after update resource", updatedRestResponse);
+        assertNotNull("check error code exists in response after update resource", updatedRestResponse.getErrorCode());
+        ErrorValidationUtils.checkBodyResponseOnError(ActionStatus.COMPONENT_INVALID_CATEGORY.name(), resourceList,
+                updatedRestResponse.getResponse());
+        assertEquals("Check response code after updating resource", 400, updatedRestResponse.getErrorCode().intValue());
+
+        // CheckIn Resource
+        logger.debug("Changing resource life cycle ");
+        RestResponse checkoutResource = LifecycleRestUtils.changeResourceState(resourceDetails, sdncModifierDetails,
+                resourceDetails.getVersion(), LifeCycleStatesEnum.CHECKIN); // NOT_CERTIFIED_CHECKIN
+        assertEquals("Check response code after checkin resource", 200, checkoutResource.getErrorCode().intValue());
+
+        // Update resource Category
+        updatedResourceDetails = defineUpdateResourceWithNonUpdatableFields(resourceBeforeUpdate);
+        updatedResourceDetails.addCategory(ServiceCategoriesEnum.VOIP.getValue());
+        updatedRestResponse = ResourceRestUtils.updateResourceMetadata(updatedResourceDetails, sdncModifierDetails,
+                resourceDetails.getUniqueId(), "");
+        // verify response
+        assertNotNull("check response object is not null after update resource", updatedRestResponse);
+        assertNotNull("check error code exists in response after update resource", updatedRestResponse.getErrorCode());
+        ErrorValidationUtils.checkBodyResponseOnError(ActionStatus.RESTRICTED_OPERATION.name(), Empty_List,
+                updatedRestResponse.getResponse());
+        assertEquals("Check response code after updating resource", 409, updatedRestResponse.getErrorCode().intValue());
+
+        // CheckIn Resource
+        logger.debug("Changing resource life cycle ");
+        RestResponse checkinResource = LifecycleRestUtils.changeResourceState(resourceDetails, sdncModifierDetails,
+                resourceDetails.getVersion(), LifeCycleStatesEnum.CHECKOUT); // NOT_CERTIFIED_CHECKIN
+        assertNotNull("check response object is not null after checkout resource", checkoutResource);
+        assertNotNull("check error code exists in response after checkIn resource", checkoutResource.getErrorCode());
+        assertEquals("Check response code after checkin resource", 200, checkoutResource.getErrorCode().intValue());
+
+        RestResponse getRestResponse = ResourceRestUtils.getResource(sdncModifierDetails, uniqueID);
+        assertNotNull("check response object is not null after update resource", getRestResponse);
+        parseResponseAndValidate(resourceDetails, getRestResponse);
+
+    }
+
+    @Test
+    public void UpdateResourceCategorySuccessfully() throws Exception {
+
+        RestResponse restResponse = createResource(sdncModifierDetails, resourceDetails);
+        assertEquals("Check response code after update resource", 201, restResponse.getErrorCode().intValue());
+        Resource resourceBeforeUpdate = ResponseParser.convertResourceResponseToJavaObject(restResponse.getResponse());
+
+        // Update resource Category Successfully
+        ResourceReqDetails updatedResourceDetails = resourceDetails;
+
+        updatedResourceDetails.removeAllCategories();
+        updatedResourceDetails.addCategoryChain(ResourceCategoryEnum.APPLICATION_L4_DATABASE.getCategory(),
+                ResourceCategoryEnum.APPLICATION_L4_DATABASE.getSubCategory());
+        RestResponse updatedRestResponse = ResourceRestUtils.updateResourceMetadata(updatedResourceDetails,
+                sdncModifierDetails, resourceDetails.getUniqueId(), "");
+
+        // validate response
+        assertNotNull("check response object is not null after update resource", updatedRestResponse);
+        assertNotNull("check error code exists in response after update resource", updatedRestResponse.getErrorCode());
+        assertEquals("Check response code after update resource", 200, updatedRestResponse.getErrorCode().intValue());
+        // parseResponseAndValidateNonUpdatable(updatedResourceDetails,
+        // updatedRestResponse);
+        parseResponseAndValidate(updatedResourceDetails, updatedRestResponse);
+
+        // validate category updated
+        assertTrue(updatedResourceDetails.getCategories().get(0).getName()
+                .equals(ResourceCategoryEnum.APPLICATION_L4_DATABASE.getCategory()));
+
+        RestResponse getRestResponse = ResourceRestUtils.getResource(sdncModifierDetails,
+                resourceDetails.getUniqueId());
+        assertNotNull("check response object is not null after update resource", getRestResponse);
+        parseResponseAndValidate(updatedResourceDetails, getRestResponse);
+
+        ResourceRestUtils.deleteResourceByNameAndVersion(sdncModifierDetails, updatedResourceDetails.getName(), "0.1");
+    }
+
+    // Benny
+
+    @Test
+    public void Validation_UpdateIcon() throws Exception {
+        // Fields to update (Forbidden)
+        String _updatedIcon = "mySecondIcon.Jpg";
+
+        // administrator permissions
+        User sdncAdminModifierDetails = ElementFactory.getDefaultUser(UserRoleEnum.ADMIN);
+
+        // define and create resource
+        ResourceRestUtils.deleteResourceByNameAndVersion(sdncAdminModifierDetails, resourceDetails.getName(), "0.1");
+
+        RestResponse restResponse = createResource(sdncAdminModifierDetails, resourceDetails);
+        assertEquals("Check response code after create resource", 201, restResponse.getErrorCode().intValue());
+        String resourceName = resourceDetails.getName();
+
+        // update metadata details
+        ResourceReqDetails updatedResourceDetails = defineUpdatedResourse(resourceName);
+        // change icon of metadata
+        updatedResourceDetails.setIcon(_updatedIcon);
+        // PUT request
+        RestResponse updatedRestResponse = ResourceRestUtils.updateResourceMetadata(updatedResourceDetails,
+                sdncAdminModifierDetails, resourceDetails.getUniqueId(), "");
+
+        // validate response
+        assertNotNull("check response object is not null after update resource", updatedRestResponse);
+        assertNotNull("check error code exists in response after update resource", updatedRestResponse.getErrorCode());
+        ErrorValidationUtils.checkBodyResponseOnError(ActionStatus.COMPONENT_INVALID_ICON.name(),
+                Arrays.asList("Resource"), updatedRestResponse.getResponse());
+
+        // empty icon
+        _updatedIcon = "";
+        updatedResourceDetails.setIcon(_updatedIcon);
+        updatedRestResponse = ResourceRestUtils.updateResourceMetadata(updatedResourceDetails, sdncAdminModifierDetails,
+                resourceDetails.getUniqueId(), "");
+        assertNotNull("check response object is not null after update resource", updatedRestResponse);
+        assertNotNull("check error code exists in response after update resource", updatedRestResponse.getErrorCode());
+        ErrorValidationUtils.checkBodyResponseOnError(ActionStatus.COMPONENT_MISSING_ICON.name(),
+                Arrays.asList("Resource"), updatedRestResponse.getResponse());
+
+        // get resource with original name. original metadata should be returned
+        RestResponse getRestResponse = ResourceRestUtils.getResource(sdncAdminModifierDetails,
+                resourceDetails.getUniqueId());
+        // validate response
+        assertNotNull("check response object is not null after get resource", getRestResponse);
+        assertNotNull("check error code exists in response after get resource", getRestResponse.getErrorCode());
+        assertEquals("Check response code after update resource", 200, getRestResponse.getErrorCode().intValue());
+
+        // parse updated response to javaObject
+        Resource getResourceRespJavaObject = ResponseParser
+                .convertResourceResponseToJavaObject(getRestResponse.getResponse());
+        // validate that metadata was not changed
+        ResourceValidationUtils.validateResourceReqVsResp(resourceDetails, getResourceRespJavaObject);
+
+        ResourceRestUtils.deleteResourceByNameAndVersion(sdncAdminModifierDetails, updatedResourceDetails.getName(),
+                "0.1");
+
+    }
+
+    @Test
+    public void UpdateResourceTypeSuccess() throws Exception {
+        // LCS is CheckOut
+        String newResourceType = ResourceTypeEnum.VL.toString();
+        String currentResourceType = resourceDetails.getResourceType();
+        RestResponse restResponse = createResource(sdncModifierDetails, resourceDetails);
+        assertEquals("Check response code after create resource", 201, restResponse.getErrorCode().intValue());
+        Resource currentResourceJavaObject = ResponseParser
+                .convertResourceResponseToJavaObject(restResponse.getResponse());
+
+        resourceDetails.setResourceType(newResourceType);
+        RestResponse updatedRestResponse = ResourceRestUtils.updateResourceMetadata(resourceDetails,
+                sdncModifierDetails, currentResourceJavaObject.getUniqueId(), "");
+        assertEquals("Check response code after create resource", 200, updatedRestResponse.getErrorCode().intValue());
+        Resource updatedResourceJavaObject = ResponseParser
+                .convertResourceResponseToJavaObject(updatedRestResponse.getResponse());
+        // assertTrue("Check resource type after update resource",
+        // updatedResourceJavaObject.getResourceType().toString().equals(resourceType));
+        assertTrue("Check resource type after update resource",
+                updatedResourceJavaObject.getResourceType().toString().equals(currentResourceType));
+
+    }
+
+    @Test
+    public void UpdateResourceTypeAndNameSuccess() throws Exception {
+        // LCS is CheckOut
+        String newResourceType = ResourceTypeEnum.VL.toString();
+        String currentResourceType = resourceDetails.getResourceType();
+        String newResourceName = "new Name";
+
+        RestResponse restResponse = createResource(sdncModifierDetails, resourceDetails);
+        assertEquals("Check response code after create resource", 201, restResponse.getErrorCode().intValue());
+        Resource currentResourceJavaObject = ResponseParser
+                .convertResourceResponseToJavaObject(restResponse.getResponse());
+
+        resourceDetails.setResourceType(newResourceType);
+        resourceDetails.setName(newResourceName);
+        List<String> tags = resourceDetails.getTags();
+        tags.add(newResourceName);
+        resourceDetails.setTags(tags);
+
+        RestResponse updatedRestResponse = ResourceRestUtils.updateResourceMetadata(resourceDetails,
+                sdncModifierDetails, currentResourceJavaObject.getUniqueId(), "");
+        assertEquals("Check response code after create resource", 200, updatedRestResponse.getErrorCode().intValue());
+        Resource updatedResourceJavaObject = ResponseParser
+                .convertResourceResponseToJavaObject(updatedRestResponse.getResponse());
+        assertTrue("Check resource type after update resource",
+                updatedResourceJavaObject.getResourceType().toString().equals(currentResourceType));
+        assertTrue("Check resource name after update resource",
+                updatedResourceJavaObject.getName().equals(newResourceName));
+
+    }
+
+    @Test
+    public void UpdateResourceTypeAfterResourceCertification() throws Exception {
+
+        String newResourceType = ResourceTypeEnum.VF.toString();
+        String currentResourceType = resourceDetails.getResourceType();
+        RestResponse restResponse = createResource(sdncModifierDetails, resourceDetails);
+        assertEquals("Check response code after create resource", 201, restResponse.getErrorCode().intValue());
+        Resource currentResourceJavaObject = ResponseParser
+                .convertResourceResponseToJavaObject(restResponse.getResponse());
+
+        resourceDetails.setResourceType(newResourceType);
+        restResponse = LifecycleRestUtils.certifyResource(resourceDetails);
+        assertEquals("Check response code after resource CheckIn", 200, restResponse.getErrorCode().intValue());
+        restResponse = LifecycleRestUtils.changeResourceState(resourceDetails, sdncModifierDetails,
+                LifeCycleStatesEnum.CHECKOUT);
+        assertEquals("Check response code after resource CheckIn", 200, restResponse.getErrorCode().intValue());
+        currentResourceJavaObject = ResponseParser.convertResourceResponseToJavaObject(restResponse.getResponse());
+
+        RestResponse updatedRestResponse = ResourceRestUtils.updateResourceMetadata(resourceDetails,
+                sdncModifierDetails, currentResourceJavaObject.getUniqueId(), "");
+        assertEquals("Check response code after create resource", 200, updatedRestResponse.getErrorCode().intValue());
+        Resource updatedResourceJavaObject = ResponseParser
+                .convertResourceResponseToJavaObject(updatedRestResponse.getResponse());
+        // assertTrue("Check resource type after update resource",
+        // updatedResourceJavaObject.getResourceType().toString().equals(newResourceType));
+        assertTrue("Check resource type after update resource",
+                updatedResourceJavaObject.getResourceType().toString().equals(currentResourceType));
+
+    }
+
+    @Test
+    public void UpdateResourceTypeCheckInLCS() throws Exception {
+
+        String resourceType = ResourceTypeEnum.VL.toString();
+        RestResponse restResponse = createResource(sdncModifierDetails, resourceDetails);
+        assertEquals("Check response code after create resource", 201, restResponse.getErrorCode().intValue());
+        Resource currentResourceJavaObject = ResponseParser
+                .convertResourceResponseToJavaObject(restResponse.getResponse());
+
+        resourceDetails.setResourceType(resourceType);
+        restResponse = LifecycleRestUtils.changeResourceState(resourceDetails, sdncModifierDetails,
+                LifeCycleStatesEnum.CHECKIN);
+        assertEquals("Check response code after resource CheckIn", 200, restResponse.getErrorCode().intValue());
+
+        RestResponse updatedRestResponse = ResourceRestUtils.updateResourceMetadata(resourceDetails,
+                sdncModifierDetails, currentResourceJavaObject.getUniqueId(), "");
+
+        ErrorInfo errorInfo = ErrorValidationUtils.parseErrorConfigYaml(ActionStatus.RESTRICTED_OPERATION.name());
+
+        assertNotNull("check response object is not null after create resouce", updatedRestResponse);
+        assertNotNull("check error code exists in response after create resource", updatedRestResponse.getErrorCode());
+        assertEquals("Check response code after create resource", errorInfo.getCode(),
+                updatedRestResponse.getErrorCode());
+
+        List<String> variables = new ArrayList<>();
+        ErrorValidationUtils.checkBodyResponseOnError(ActionStatus.RESTRICTED_OPERATION.name(), variables,
+                updatedRestResponse.getResponse());
+
+    }
+
+    @Test
+    public void UpdateResourceTypeCertifiedLCS() throws Exception {
+
+        String resourceType = ResourceTypeEnum.VL.toString();
+        RestResponse restResponse = createResource(sdncModifierDetails, resourceDetails);
+        assertEquals("Check response code after create resource", 201, restResponse.getErrorCode().intValue());
+        Resource currentResourceJavaObject = ResponseParser
+                .convertResourceResponseToJavaObject(restResponse.getResponse());
+
+        restResponse = LifecycleRestUtils.certifyResource(resourceDetails);
+        assertEquals("Check response code after resource CheckIn", 200, restResponse.getErrorCode().intValue());
+
+        resourceDetails.setResourceType(resourceType);
+        RestResponse updatedRestResponse = ResourceRestUtils.updateResourceMetadata(resourceDetails,
+                sdncModifierDetails, currentResourceJavaObject.getUniqueId(), "");
+
+        ErrorInfo errorInfo = ErrorValidationUtils.parseErrorConfigYaml(ActionStatus.RESTRICTED_OPERATION.name());
+
+        assertNotNull("check response object is not null after create resouce", updatedRestResponse);
+        assertNotNull("check error code exists in response after create resource", updatedRestResponse.getErrorCode());
+        assertEquals("Check response code after create resource", errorInfo.getCode(),
+                updatedRestResponse.getErrorCode());
+
+        List<String> variables = new ArrayList<>();
+        ErrorValidationUtils.checkBodyResponseOnError(ActionStatus.RESTRICTED_OPERATION.name(), variables,
+                updatedRestResponse.getResponse());
+
+    }
+
+    @Test
+    public void UpdateResourceTypeInvalidType() throws Exception {
+
+        String resourceType = "INVALID TYPE";
+        RestResponse restResponse = createResource(sdncModifierDetails, resourceDetails);
+        assertEquals("Check response code after create resource", 201, restResponse.getErrorCode().intValue());
+        Resource currentResourceJavaObject = ResponseParser
+                .convertResourceResponseToJavaObject(restResponse.getResponse());
+
+        resourceDetails.setResourceType(resourceType);
+        RestResponse updatedRestResponse = ResourceRestUtils.updateResourceMetadata(resourceDetails,
+                sdncModifierDetails, currentResourceJavaObject.getUniqueId(), "");
+
+        ErrorInfo errorInfo = ErrorValidationUtils.parseErrorConfigYaml(ActionStatus.INVALID_CONTENT.name());
+
+        assertNotNull("check response object is not null after update resouce", updatedRestResponse);
+        assertNotNull("check error code exists in response after update resource", updatedRestResponse.getErrorCode());
+        assertEquals("Check response code after update resource", errorInfo.getCode(),
+                updatedRestResponse.getErrorCode());
+
+        List<String> variables = new ArrayList<>();
+        ErrorValidationUtils.checkBodyResponseOnError(ActionStatus.INVALID_CONTENT.name(), variables,
+                updatedRestResponse.getResponse());
+
+    }
+}
diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/execute/resource/VFResourceInstanceNameCRUD.java b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/execute/resource/VFResourceInstanceNameCRUD.java
new file mode 100644
index 0000000000..0ac667aeda
--- /dev/null
+++ b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/execute/resource/VFResourceInstanceNameCRUD.java
@@ -0,0 +1,468 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * SDC
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.sdc.ci.tests.execute.resource;
+
+import com.google.gson.Gson;
+import fj.data.Either;
+import org.junit.Rule;
+import org.junit.rules.TestName;
+import org.openecomp.sdc.be.dao.api.ActionStatus;
+import org.openecomp.sdc.be.datatypes.enums.ComponentTypeEnum;
+import org.openecomp.sdc.be.datatypes.enums.ResourceTypeEnum;
+import org.openecomp.sdc.be.model.ComponentInstance;
+import org.openecomp.sdc.be.model.Resource;
+import org.openecomp.sdc.be.model.User;
+import org.openecomp.sdc.ci.tests.api.ComponentBaseTest;
+import org.openecomp.sdc.ci.tests.datatypes.ArtifactReqDetails;
+import org.openecomp.sdc.ci.tests.datatypes.ComponentInstanceReqDetails;
+import org.openecomp.sdc.ci.tests.datatypes.ResourceReqDetails;
+import org.openecomp.sdc.ci.tests.datatypes.ServiceReqDetails;
+import org.openecomp.sdc.ci.tests.datatypes.enums.ArtifactTypeEnum;
+import org.openecomp.sdc.ci.tests.datatypes.enums.ErrorInfo;
+import org.openecomp.sdc.ci.tests.datatypes.enums.LifeCycleStatesEnum;
+import org.openecomp.sdc.ci.tests.datatypes.enums.UserRoleEnum;
+import org.openecomp.sdc.ci.tests.datatypes.http.RestResponse;
+import org.openecomp.sdc.ci.tests.utils.Utils;
+import org.openecomp.sdc.ci.tests.utils.general.AtomicOperationUtils;
+import org.openecomp.sdc.ci.tests.utils.general.ElementFactory;
+import org.openecomp.sdc.ci.tests.utils.rest.*;
+import org.openecomp.sdc.ci.tests.utils.validation.ErrorValidationUtils;
+import org.testng.annotations.BeforeMethod;
+import org.testng.annotations.Test;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+import static org.testng.AssertJUnit.assertEquals;
+import static org.testng.AssertJUnit.assertTrue;
+
+public class VFResourceInstanceNameCRUD extends ComponentBaseTest {
+
+	protected static ServiceReqDetails serviceDetails;
+	protected static ResourceReqDetails resourceDetailsVFC;
+	protected static ResourceReqDetails resourceDetailsVL;
+	protected static ResourceReqDetails resourceDetailsVF;
+	protected static ResourceReqDetails resourceDetailsCP;
+	protected static ComponentInstanceReqDetails resourceInstanceReqDetailsVF;
+	protected static ComponentInstanceReqDetails resourceInstanceReqDetailsVFC;
+	protected static ComponentInstanceReqDetails resourceInstanceReqDetailsVL;
+	protected static ComponentInstanceReqDetails resourceInstanceReqDetailsCP;
+	protected static User sdncDesignerDetails1;
+	protected static User sdncTesterDeatails1;
+	protected static User sdncAdminDetails1;
+	protected static ArtifactReqDetails heatArtifactDetails;
+	protected static ArtifactReqDetails defaultArtifactDetails;
+	protected static int maxLength = 50;
+	protected static Resource resourceVF = null;
+
+	@Rule
+	public static TestName name = new TestName();
+
+	@BeforeMethod
+	public void init() throws Exception {
+
+		// serviceDetails = ElementFactory.getDefaultService();
+		// resourceDetailsVFC =
+		// ElementFactory.getDefaultResourceByType(ResourceTypeEnum.VFC.toString(),
+		// "resourceVFC");
+		// resourceDetailsVF =
+		// ElementFactory.getDefaultResourceByType(ResourceTypeEnum.VF.toString(),
+		// "resourceVF3");
+		// resourceDetailsVL =
+		// ElementFactory.getDefaultResourceByType(ResourceTypeEnum.VL.toString(),
+		// "resourceVL");
+		// resourceDetailsCP =
+		// ElementFactory.getDefaultResourceByType(ResourceTypeEnum.CP.toString(),
+		// "resourceCP");
+		sdncDesignerDetails1 = ElementFactory.getDefaultUser(UserRoleEnum.DESIGNER);
+		sdncTesterDeatails1 = ElementFactory.getDefaultUser(UserRoleEnum.TESTER);
+		sdncAdminDetails1 = ElementFactory.getDefaultUser(UserRoleEnum.ADMIN);
+		// heatArtifactDetails =
+		// ElementFactory.getDefaultDeploymentArtifactForType(ArtifactTypeEnum.HEAT.getType());
+
+		Either<Resource, RestResponse> resourceDetailsCP_01e = AtomicOperationUtils
+				.createResourceByType(ResourceTypeEnum.CP, UserRoleEnum.DESIGNER, true);
+		AtomicOperationUtils.changeComponentState(resourceDetailsCP_01e.left().value(), UserRoleEnum.DESIGNER,
+				LifeCycleStatesEnum.CHECKIN, true);
+		resourceDetailsCP = new ResourceReqDetails(resourceDetailsCP_01e.left().value());
+		Either<Resource, RestResponse> resourceDetailsVL_01e = AtomicOperationUtils
+				.createResourceByType(ResourceTypeEnum.VL, UserRoleEnum.DESIGNER, true);
+		AtomicOperationUtils.changeComponentState(resourceDetailsVL_01e.left().value(), UserRoleEnum.DESIGNER,
+				LifeCycleStatesEnum.CHECKIN, true);
+		resourceDetailsVL = new ResourceReqDetails(resourceDetailsVL_01e.left().value());
+		Either<Resource, RestResponse> resourceDetailsVF_01e = AtomicOperationUtils
+				.createResourceByType(ResourceTypeEnum.VF, UserRoleEnum.DESIGNER, true);
+		resourceDetailsVF = new ResourceReqDetails(resourceDetailsVF_01e.left().value());
+		Either<Resource, RestResponse> resourceDetailsVFC_01e = AtomicOperationUtils
+				.createResourceByType(ResourceTypeEnum.VFC, UserRoleEnum.DESIGNER, true);
+		AtomicOperationUtils.changeComponentState(resourceDetailsVFC_01e.left().value(), UserRoleEnum.DESIGNER,
+				LifeCycleStatesEnum.CHECKIN, true);
+		resourceDetailsVFC = new ResourceReqDetails(resourceDetailsVFC_01e.left().value());
+
+		resourceInstanceReqDetailsVFC = ElementFactory.getDefaultComponentInstance("VFC", resourceDetailsVFC);
+		resourceInstanceReqDetailsVF = ElementFactory.getDefaultComponentInstance("VF", resourceDetailsVF);
+		resourceInstanceReqDetailsVL = ElementFactory.getDefaultComponentInstance("VL", resourceDetailsVL);
+		resourceInstanceReqDetailsCP = ElementFactory.getDefaultComponentInstance("CP", resourceDetailsCP);
+		sdncDesignerDetails1 = ElementFactory.getDefaultUser(UserRoleEnum.DESIGNER);
+		sdncTesterDeatails1 = ElementFactory.getDefaultUser(UserRoleEnum.TESTER);
+		sdncAdminDetails1 = ElementFactory.getDefaultUser(UserRoleEnum.ADMIN);
+
+	}
+
+	@Test
+	public void addResourceInstanceToVF() throws Exception {
+
+		createVFWithCertifiedResourceInstance(resourceDetailsCP, resourceInstanceReqDetailsCP);
+		// validate RI name
+		List<ComponentInstance> resourceInstances = resourceVF.getComponentInstances();
+		List<String> resourceInstanceListName = new ArrayList<String>();
+		for (int i = 0; i < resourceInstances.size(); i++) {
+			resourceInstanceListName.add(resourceInstances.get(i).getName());
+		}
+		List<String> resourceInstanceExpectedListName = new ArrayList<String>();
+		resourceInstanceExpectedListName.add(resourceInstanceReqDetailsCP.getName() + " 1");
+		String message = "resource instance name";
+		Utils.compareArrayLists(resourceInstanceListName, resourceInstanceExpectedListName, message);
+
+	}
+
+	@Test
+	public void updateResourceInstanceName() throws Exception {
+
+		// update resource instance name
+		String resourceInstanceUpdatedName = "resource New 2";
+
+		ResourceReqDetails updatedResourceDetailsVLC = changeResouceName(resourceDetailsVFC,
+				resourceInstanceUpdatedName);
+		createVFWithCertifiedResourceInstance(updatedResourceDetailsVLC, resourceInstanceReqDetailsVFC);
+
+		resourceInstanceReqDetailsVFC.setName(resourceInstanceUpdatedName);
+		RestResponse updateResourceInstanceResponse = ComponentInstanceRestUtils.updateComponentInstance(
+				resourceInstanceReqDetailsVFC, sdncDesignerDetails1, resourceVF.getUniqueId(),
+				ComponentTypeEnum.RESOURCE);
+		assertTrue(updateResourceInstanceResponse.getErrorCode() == BaseRestUtils.STATUS_CODE_SUCCESS);
+
+		resourceVF = convertResourceGetResponseToJavaObject(resourceDetailsVF);
+
+		// validate RI name
+		List<ComponentInstance> resourceInstances = resourceVF.getComponentInstances();
+		List<String> resourceInstanceListName = new ArrayList<String>();
+		for (int i = 0; i < resourceInstances.size(); i++) {
+			resourceInstanceListName.add(resourceInstances.get(i).getName());
+		}
+		List<String> resourceInstanceExpectedListName = new ArrayList<String>();
+		resourceInstanceExpectedListName.add(resourceInstanceUpdatedName);
+		String message = "resource instance name";
+		Utils.compareArrayLists(resourceInstanceListName, resourceInstanceExpectedListName, message);
+
+	}
+
+	@Test
+	public void updateResourceInstanceNameToNextGeneratedName() throws Exception {
+
+		// update resource instance name
+		String resourceInstanceUpdatedName = resourceInstanceReqDetailsCP.getName() + " 2";
+
+		ResourceReqDetails updatedResourceDetailsVL = changeResouceName(resourceDetailsVL, resourceInstanceUpdatedName);
+		createVFWithCertifiedResourceInstance(updatedResourceDetailsVL, resourceInstanceReqDetailsVL);
+		resourceInstanceReqDetailsCP.setName(resourceInstanceUpdatedName);
+
+		// add second resource instance
+		RestResponse response = ComponentInstanceRestUtils.createComponentInstance(resourceInstanceReqDetailsCP,
+				sdncDesignerDetails1, resourceVF);
+		assertEquals("Check response code after create RI", 201, response.getErrorCode().intValue());
+		resourceVF = convertResourceGetResponseToJavaObject(resourceDetailsVF);
+
+		// validate RI name
+		List<ComponentInstance> resourceInstances = resourceVF.getComponentInstances();
+		List<String> resourceInstanceListName = new ArrayList<String>();
+		for (int i = 0; i < resourceInstances.size(); i++) {
+			resourceInstanceListName.add(resourceInstances.get(i).getName());
+		}
+		List<String> resourceInstanceExpectedListName = new ArrayList<String>();
+		resourceInstanceExpectedListName.add(resourceInstanceReqDetailsVL.getName() + " 1");
+		resourceInstanceExpectedListName.add(resourceInstanceReqDetailsCP.getName() + " 2");
+		String message = "resource instance name";
+		Utils.compareArrayLists(resourceInstanceListName, resourceInstanceExpectedListName, message);
+
+	}
+
+	@Test
+	public void normolizeUpdatedResourceInstanceName() throws Exception {
+
+		String resourceInstanceUpdatedName = "resource   new -  .2";
+		String normalizedName = "resourcenew2";
+
+		ResourceReqDetails updatedResourceDetailsVL = changeResouceName(resourceDetailsVL, resourceInstanceUpdatedName);
+
+		createVFWithCertifiedResourceInstance(updatedResourceDetailsVL, resourceInstanceReqDetailsVL);
+		// update resource instance name
+		resourceInstanceReqDetailsCP.setName(resourceInstanceUpdatedName);
+
+		// add second resource instance
+		RestResponse response = ComponentInstanceRestUtils.createComponentInstance(resourceInstanceReqDetailsCP,
+				sdncDesignerDetails1, resourceVF);
+		assertEquals("Check response code after create RI", 201, response.getErrorCode().intValue());
+		resourceVF = convertResourceGetResponseToJavaObject(resourceDetailsVF);
+
+		// validate RI name
+		List<ComponentInstance> resourceInstances = resourceVF.getComponentInstances();
+		List<String> resourceInstanceListName = new ArrayList<String>();
+		for (int i = 0; i < resourceInstances.size(); i++) {
+			resourceInstanceListName.add(resourceInstances.get(i).getName());
+		}
+		List<String> resourceInstanceExpectedListName = new ArrayList<String>();
+		resourceInstanceExpectedListName.add(resourceInstanceReqDetailsVL.getName() + " 1");
+		resourceInstanceExpectedListName.add(resourceInstanceReqDetailsCP.getName() + " 2");
+		String message = "resource instance name";
+		Utils.compareArrayLists(resourceInstanceListName, resourceInstanceExpectedListName, message);
+
+	}
+
+	@Test
+	public void updatedResourceInstanceNameToEmpty() throws Exception {
+
+		createVFWithCertifiedResourceInstance(resourceDetailsVL, resourceInstanceReqDetailsVL);
+		String resourceInstanceUpdatedName = "";
+		String resourceInstancePreviousName = resourceDetailsCP.getName();
+
+		// add second resource instance
+		RestResponse response = ComponentInstanceRestUtils.createComponentInstance(resourceInstanceReqDetailsCP,
+				sdncDesignerDetails1, resourceVF);
+		assertEquals("Check response code after create RI", 201, response.getErrorCode().intValue());
+		resourceVF = convertResourceGetResponseToJavaObject(resourceDetailsVF);
+
+		resourceInstanceReqDetailsCP.setName(resourceInstanceUpdatedName);
+		RestResponse updateResourceInstanceResponse = ComponentInstanceRestUtils.updateComponentInstance(
+				resourceInstanceReqDetailsCP, sdncDesignerDetails1, resourceVF.getUniqueId(),
+				ComponentTypeEnum.RESOURCE);
+		assertEquals("Check response code after RI update request", 200,
+				updateResourceInstanceResponse.getErrorCode().intValue());
+		// change request
+		// ErrorInfo errorInfo =
+		// Utils.parseYaml(ActionStatus.MISSING_COMPONENT_NAME.name());
+		// utils.validateResponseCode(updateResourceInstanceResponse,
+		// errorInfo.getCode(), "update resource instance");
+		//
+		// List<String> variables = Arrays.asList("Resource Instance");
+		// ErrorValidationUtils.checkBodyResponseOnError(ActionStatus.MISSING_COMPONENT_NAME.name(),
+		// variables, updateResourceInstanceResponse.getResponse());
+
+		resourceVF = convertResourceGetResponseToJavaObject(resourceDetailsVF);
+
+		// validate RI name
+		List<ComponentInstance> resourceInstances = resourceVF.getComponentInstances();
+		List<String> resourceInstanceListName = new ArrayList<String>();
+		for (int i = 0; i < resourceInstances.size(); i++) {
+			resourceInstanceListName.add(resourceInstances.get(i).getName());
+		}
+		List<String> resourceInstanceExpectedListName = new ArrayList<String>();
+		resourceInstanceExpectedListName.add(resourceInstanceReqDetailsVL.getName() + " 1");
+		resourceInstanceExpectedListName.add(resourceInstancePreviousName + " 3");
+		String message = "resource instance name";
+		Utils.compareArrayLists(resourceInstanceListName, resourceInstanceExpectedListName, message);
+
+	}
+
+	@Test
+	public void updatedResourceNameLengthExceedMaximumCharacters() throws Exception {
+
+		String resourceInstancePreviousName = resourceDetailsCP.getName();
+		// update resource instance name
+		String resourceInstanceUpdatedName = "a";
+		for (int i = 0; i < maxLength; i++) {
+			resourceInstanceUpdatedName += "b";
+		}
+		// ResourceReqDetails updatedResourceDetailsVL =
+		// changeResouceName(resourceDetailsVL, resourceInstanceUpdatedName);
+
+		createVFWithCertifiedResourceInstance(resourceDetailsVL, resourceInstanceReqDetailsVL);
+		// add second resource instance
+		RestResponse response = ComponentInstanceRestUtils.createComponentInstance(resourceInstanceReqDetailsCP,
+				sdncDesignerDetails1, resourceVF);
+		assertEquals("Check response code after create RI", 201, response.getErrorCode().intValue());
+		resourceVF = convertResourceGetResponseToJavaObject(resourceDetailsVF);
+
+		String prevName = resourceInstanceReqDetailsCP.getName();
+		resourceInstanceReqDetailsCP.setName(resourceInstanceUpdatedName);
+		RestResponse updateResourceInstanceResponse = ComponentInstanceRestUtils.updateComponentInstance(
+				resourceInstanceReqDetailsCP, sdncDesignerDetails1, resourceVF.getUniqueId(),
+				ComponentTypeEnum.RESOURCE);
+		ErrorInfo errorInfo = ErrorValidationUtils
+				.parseErrorConfigYaml(ActionStatus.COMPONENT_NAME_EXCEEDS_LIMIT.name());
+		// utils.validateResponseCode(updateResourceInstanceResponse,
+		// errorInfo.getCode(), "update resource instance");
+
+		List<String> variables = Arrays.asList("Resource Instance", "50");
+		ErrorValidationUtils.checkBodyResponseOnError(ActionStatus.COMPONENT_NAME_EXCEEDS_LIMIT.name(), variables,
+				updateResourceInstanceResponse.getResponse());
+
+		resourceInstanceReqDetailsCP.setName(prevName);
+		// validate RI name
+		List<ComponentInstance> resourceInstances = resourceVF.getComponentInstances();
+		List<String> resourceInstanceListName = new ArrayList<String>();
+		for (int i = 0; i < resourceInstances.size(); i++) {
+			resourceInstanceListName.add(resourceInstances.get(i).getName());
+		}
+		List<String> resourceInstanceExpectedListName = new ArrayList<String>();
+		resourceInstanceExpectedListName.add(resourceInstanceReqDetailsVL.getName() + " 1");
+		resourceInstanceExpectedListName.add(resourceInstanceReqDetailsCP.getName() + " 2");
+		String message = "resource instance name";
+		Utils.compareArrayLists(resourceInstanceListName, resourceInstanceExpectedListName, message);
+
+	}
+
+	@Test
+	public void updatedResourceNameWithUnSupportedCharacters() throws Exception {
+
+		createVFWithCertifiedResourceInstance(resourceDetailsVL, resourceInstanceReqDetailsVL);
+		String resourceInstancePreviousName = resourceDetailsCP.getName();
+		// update resource instance name
+		String resourceInstanceUpdatedName = "a???<>";
+
+		// add second resource instance
+		RestResponse response = ComponentInstanceRestUtils.createComponentInstance(resourceInstanceReqDetailsCP,
+				sdncDesignerDetails1, resourceVF);
+		assertEquals("Check response code after create RI", 201, response.getErrorCode().intValue());
+		resourceVF = convertResourceGetResponseToJavaObject(resourceDetailsVF);
+
+		String prevValue = resourceInstanceReqDetailsCP.getName();
+		resourceInstanceReqDetailsCP.setName(resourceInstanceUpdatedName);
+		RestResponse updateResourceInstanceResponse = ComponentInstanceRestUtils.updateComponentInstance(
+				resourceInstanceReqDetailsCP, sdncDesignerDetails1, resourceVF.getUniqueId(),
+				ComponentTypeEnum.RESOURCE);
+		ErrorInfo errorInfo = ErrorValidationUtils.parseErrorConfigYaml(ActionStatus.INVALID_COMPONENT_NAME.name());
+		// ResourceRestUtils.validateResponseCode(updateResourceInstanceResponse,
+		// errorInfo.getCode(), "update resource instance");
+
+		List<String> variables = Arrays.asList("Resource Instance");
+		ErrorValidationUtils.checkBodyResponseOnError(ActionStatus.INVALID_COMPONENT_NAME.name(), variables,
+				updateResourceInstanceResponse.getResponse());
+
+		resourceInstanceReqDetailsCP.setName(prevValue);
+
+		// validate RI name
+		List<ComponentInstance> resourceInstances = resourceVF.getComponentInstances();
+		List<String> resourceInstanceListName = new ArrayList<String>();
+		for (int i = 0; i < resourceInstances.size(); i++) {
+			resourceInstanceListName.add(resourceInstances.get(i).getName());
+		}
+		List<String> resourceInstanceExpectedListName = new ArrayList<String>();
+		resourceInstanceExpectedListName.add(resourceInstanceReqDetailsVL.getName() + " 1");
+		resourceInstanceExpectedListName.add(resourceInstanceReqDetailsCP.getName() + " 2");
+		String message = "resource instance name";
+		Utils.compareArrayLists(resourceInstanceListName, resourceInstanceExpectedListName, message);
+
+	}
+
+	private static ResourceReqDetails changeResouceName(ResourceReqDetails resourceDet,
+			String resourceInstanceUpdatedName) throws Exception {
+
+		ResourceReqDetails updatedResourceDetails = new ResourceReqDetails();
+		updatedResourceDetails = resourceDet;
+		updatedResourceDetails.setName(resourceInstanceUpdatedName);
+		List<String> tags = new ArrayList<String>();
+		tags.add(resourceInstanceUpdatedName);
+		updatedResourceDetails.setTags(tags);
+		Gson gson = new Gson();
+		String updatedResourceBodyJson = gson.toJson(updatedResourceDetails);
+		RestResponse response = LifecycleRestUtils.changeResourceState(resourceDet, sdncDesignerDetails1,
+				resourceDet.getVersion(), LifeCycleStatesEnum.CHECKOUT);
+		assertTrue("change LS state to CHECKOUT, returned status:" + response.getErrorCode(),
+				response.getErrorCode() == 200);
+		response = ResourceRestUtils.updateResourceMetadata(updatedResourceBodyJson, sdncDesignerDetails1,
+				updatedResourceDetails.getUniqueId());
+		assertEquals("Check response code after updateresource name", 200, response.getErrorCode().intValue());
+		response = LifecycleRestUtils.changeResourceState(updatedResourceDetails, sdncDesignerDetails1,
+				resourceDet.getVersion(), LifeCycleStatesEnum.CHECKIN);
+
+		return updatedResourceDetails;
+
+	}
+
+	// private Component changeResouceName(Resource resourceDet, String
+	// resourceInstanceUpdatedName) throws Exception{
+	//
+	// User defaultUser = ElementFactory.getDefaultUser(UserRoleEnum.DESIGNER);
+	// Resource updatedResourceDetails = resourceDet;
+	// RestResponse response =
+	// LifecycleRestUtils.changeComponentState(updatedResourceDetails,
+	// defaultUser, LifeCycleStatesEnum.CHECKOUT, "state changed");
+	// assertTrue("change LS state to CHECKOUT, returned status:" +
+	// response.getErrorCode(),response.getErrorCode() == 200);
+	// updatedResourceDetails.setName(resourceInstanceUpdatedName);
+	// List<String> tags = new ArrayList<String>();
+	// tags.add(resourceInstanceUpdatedName);
+	// updatedResourceDetails.setTags(tags);
+	// Gson gson = new Gson();
+	// ResourceReqDetails resourceReqDetails = new
+	// ResourceReqDetails(updatedResourceDetails);
+	// String updatedResourceBodyJson = gson.toJson(resourceReqDetails);
+	// response = ResourceRestUtils.updateResource(updatedResourceBodyJson,
+	// defaultUser, updatedResourceDetails.getUniqueId());
+	// assertEquals("Check response code after updateresource name", 200,
+	// response.getErrorCode().intValue());
+	// response =
+	// LifecycleRestUtils.changeComponentState(updatedResourceDetails,
+	// defaultUser, LifeCycleStatesEnum.CHECKIN, "state changed");
+	// assertEquals("Check response code after updateresource name", 200,
+	// response.getErrorCode().intValue());
+	//
+	// return updatedResourceDetails;
+	//
+	// }
+
+	private void createVFWithCertifiedResourceInstance(ResourceReqDetails resourceDetails,
+			ComponentInstanceReqDetails resourceInstanceReqDetails) throws Exception {
+
+		RestResponse response = LifecycleRestUtils.changeResourceState(resourceDetails, sdncDesignerDetails1,
+				resourceDetails.getVersion(), LifeCycleStatesEnum.CHECKOUT);
+		assertEquals("Check response code after CHECKOUT", 200, response.getErrorCode().intValue());
+
+		// add heat artifact to resource and certify
+		ArtifactReqDetails heatArtifactDetails = ElementFactory
+				.getDefaultDeploymentArtifactForType(ArtifactTypeEnum.HEAT.getType());
+		response = ArtifactRestUtils.addInformationalArtifactToResource(heatArtifactDetails, sdncDesignerDetails1,
+				resourceDetails.getUniqueId());
+		assertTrue("add HEAT artifact to resource request returned status:" + response.getErrorCode(),
+				response.getErrorCode() == 200);
+		response = LifecycleRestUtils.certifyResource(resourceDetails);
+		assertEquals("Check response code after CERTIFY request", 200, response.getErrorCode().intValue());
+
+		resourceVF = convertResourceGetResponseToJavaObject(resourceDetailsVF);
+
+		resourceInstanceReqDetails.setComponentUid(resourceDetails.getUniqueId());
+		response = ComponentInstanceRestUtils.createComponentInstance(resourceInstanceReqDetails, sdncDesignerDetails1,
+				resourceVF);
+		assertEquals("Check response code after create RI", 201, response.getErrorCode().intValue());
+
+		resourceVF = convertResourceGetResponseToJavaObject(resourceDetailsVF);
+	}
+
+	protected Resource convertResourceGetResponseToJavaObject(ResourceReqDetails resourceDetails) throws IOException {
+		RestResponse response = ResourceRestUtils.getResource(resourceDetails, sdncDesignerDetails1);
+		assertEquals("Check response code after get resource", 200, response.getErrorCode().intValue());
+		return ResponseParser.convertResourceResponseToJavaObject(response.getResponse());
+	}
+
+}
diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/execute/resource/ValidateExtendedVfData.java b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/execute/resource/ValidateExtendedVfData.java
new file mode 100644
index 0000000000..13b34134a2
--- /dev/null
+++ b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/execute/resource/ValidateExtendedVfData.java
@@ -0,0 +1,305 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * SDC
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.sdc.ci.tests.execute.resource;
+
+import fj.data.Either;
+import org.json.simple.JSONArray;
+import org.json.simple.JSONObject;
+import org.json.simple.JSONValue;
+import org.junit.Rule;
+import org.junit.rules.TestName;
+import org.openecomp.sdc.be.datatypes.enums.ResourceTypeEnum;
+import org.openecomp.sdc.be.model.ComponentInstance;
+import org.openecomp.sdc.be.model.Resource;
+import org.openecomp.sdc.be.model.User;
+import org.openecomp.sdc.ci.tests.api.ComponentBaseTest;
+import org.openecomp.sdc.ci.tests.datatypes.ResourceReqDetails;
+import org.openecomp.sdc.ci.tests.datatypes.enums.*;
+import org.openecomp.sdc.ci.tests.datatypes.http.RestResponse;
+import org.openecomp.sdc.ci.tests.utils.general.AtomicOperationUtils;
+import org.openecomp.sdc.ci.tests.utils.general.ElementFactory;
+import org.openecomp.sdc.ci.tests.utils.rest.LifecycleRestUtils;
+import org.openecomp.sdc.ci.tests.utils.rest.ResourceRestUtils;
+import org.openecomp.sdc.ci.tests.utils.rest.ResponseParser;
+import org.testng.annotations.BeforeMethod;
+import org.testng.annotations.Test;
+
+import java.util.List;
+
+import static org.testng.AssertJUnit.assertNotNull;
+import static org.testng.AssertJUnit.assertTrue;
+
+public class ValidateExtendedVfData extends ComponentBaseTest {
+
+	protected Resource resourceDetailsVF;
+	protected Resource resourceDetailsCP_01;
+	protected Resource resourceDetailsVL_01;
+	protected Resource resourceDetailsVFCcomp;
+
+	protected User sdncUserDetails;
+
+	@Rule
+	public static TestName name = new TestName();
+
+	@BeforeMethod
+	public void create() throws Exception {
+
+		sdncUserDetails = ElementFactory.getDefaultUser(UserRoleEnum.DESIGNER);
+
+		Either<Resource, RestResponse> resourceDetailsVFe = AtomicOperationUtils
+				.createResourceByType(ResourceTypeEnum.VF, UserRoleEnum.DESIGNER, true);
+		resourceDetailsVF = resourceDetailsVFe.left().value();
+		Either<Resource, RestResponse> resourceDetailsCP_01e = AtomicOperationUtils
+				.createResourcesByTypeNormTypeAndCatregory(ResourceTypeEnum.CP, NormativeTypesEnum.PORT,
+						ResourceCategoryEnum.GENERIC_DATABASE, UserRoleEnum.DESIGNER, true);
+		resourceDetailsCP_01 = resourceDetailsCP_01e.left().value();
+		AtomicOperationUtils.uploadArtifactByType(ArtifactTypeEnum.HEAT, resourceDetailsCP_01, UserRoleEnum.DESIGNER,
+				true, true);
+		AtomicOperationUtils.uploadArtifactByType(ArtifactTypeEnum.HEAT_VOL, resourceDetailsCP_01,
+				UserRoleEnum.DESIGNER, true, true);
+		AtomicOperationUtils.uploadArtifactByType(ArtifactTypeEnum.HEAT_VOL, resourceDetailsCP_01,
+				UserRoleEnum.DESIGNER, true, true);
+		AtomicOperationUtils.uploadArtifactByType(ArtifactTypeEnum.HEAT_NET, resourceDetailsCP_01,
+				UserRoleEnum.DESIGNER, true, true);
+		AtomicOperationUtils.uploadArtifactByType(ArtifactTypeEnum.OTHER, resourceDetailsCP_01, UserRoleEnum.DESIGNER,
+				true, true);
+		AtomicOperationUtils.changeComponentState(resourceDetailsCP_01, UserRoleEnum.DESIGNER,
+				LifeCycleStatesEnum.CERTIFY, true);
+		Either<Resource, RestResponse> resourceDetailsVL_01e = AtomicOperationUtils
+				.createResourcesByTypeNormTypeAndCatregory(ResourceTypeEnum.VL, NormativeTypesEnum.NETWORK,
+						ResourceCategoryEnum.GENERIC_NETWORK_ELEMENTS, UserRoleEnum.DESIGNER, true);
+		resourceDetailsVL_01 = resourceDetailsVL_01e.left().value();
+		AtomicOperationUtils.uploadArtifactByType(ArtifactTypeEnum.HEAT, resourceDetailsVL_01, UserRoleEnum.DESIGNER,
+				true, true);
+		AtomicOperationUtils.uploadArtifactByType(ArtifactTypeEnum.HEAT_VOL, resourceDetailsVL_01,
+				UserRoleEnum.DESIGNER, true, true);
+		AtomicOperationUtils.uploadArtifactByType(ArtifactTypeEnum.HEAT_VOL, resourceDetailsVL_01,
+				UserRoleEnum.DESIGNER, true, true);
+		AtomicOperationUtils.uploadArtifactByType(ArtifactTypeEnum.HEAT_NET, resourceDetailsVL_01,
+				UserRoleEnum.DESIGNER, true, true);
+		AtomicOperationUtils.uploadArtifactByType(ArtifactTypeEnum.OTHER, resourceDetailsVL_01, UserRoleEnum.DESIGNER,
+				true, true);
+		AtomicOperationUtils.changeComponentState(resourceDetailsVL_01, UserRoleEnum.DESIGNER,
+				LifeCycleStatesEnum.CERTIFY, true);
+
+		Either<Resource, RestResponse> resourceDetailsVFCcompE = AtomicOperationUtils
+				.createResourcesByTypeNormTypeAndCatregory(ResourceTypeEnum.VFC, NormativeTypesEnum.COMPUTE,
+						ResourceCategoryEnum.GENERIC_INFRASTRUCTURE, UserRoleEnum.DESIGNER, true);
+		resourceDetailsVFCcomp = resourceDetailsVFCcompE.left().value();
+		AtomicOperationUtils.changeComponentState(resourceDetailsVFCcomp, UserRoleEnum.DESIGNER,
+				LifeCycleStatesEnum.CERTIFY, true);
+
+		ComponentInstance resourceDetailsCP_01ins = AtomicOperationUtils
+				.addComponentInstanceToComponentContainer(resourceDetailsCP_01, resourceDetailsVF,
+						UserRoleEnum.DESIGNER, true)
+				.left().value();
+		ComponentInstance resourceDetailsVL_01ins = AtomicOperationUtils
+				.addComponentInstanceToComponentContainer(resourceDetailsVL_01, resourceDetailsVF,
+						UserRoleEnum.DESIGNER, true)
+				.left().value();
+		ComponentInstance resourceDetailsVFCcomp_ins = AtomicOperationUtils
+				.addComponentInstanceToComponentContainer(resourceDetailsVFCcomp, resourceDetailsVF,
+						UserRoleEnum.DESIGNER, true)
+				.left().value();
+
+		resourceDetailsVF = AtomicOperationUtils.getResourceObject(resourceDetailsVF, UserRoleEnum.DESIGNER);
+		AtomicOperationUtils.associate2ResourceInstances(resourceDetailsVF, resourceDetailsCP_01ins,
+				resourceDetailsVL_01ins, AssocType.LINKABLE.getAssocType(), UserRoleEnum.DESIGNER, true);
+		AtomicOperationUtils.associate2ResourceInstances(resourceDetailsVF, resourceDetailsCP_01ins,
+				resourceDetailsVFCcomp_ins, AssocType.BINDABLE.getAssocType(), UserRoleEnum.DESIGNER, true);
+
+	}
+
+	@Test
+	public void getResourceLatestVersion() throws Exception {
+
+		RestResponse response = LifecycleRestUtils.changeComponentState(resourceDetailsVF, sdncUserDetails,
+				LifeCycleStatesEnum.CHECKIN);
+		assertTrue("change LC state to CHECKIN, returned status:" + response.getErrorCode(),
+				response.getErrorCode() == 200);
+		// resourceDetailsVF =
+		// AtomicOperationUtils.getResourceObject(resourceDetailsVF,
+		// UserRoleEnum.DESIGNER);
+		RestResponse getResourceLatestVersionResponse = ResourceRestUtils.getResourceLatestVersionList(sdncUserDetails);
+		assertTrue("response code is not 200, returned :" + getResourceLatestVersionResponse.getErrorCode(),
+				getResourceLatestVersionResponse.getErrorCode() == 200);
+
+		List<Resource> resourceList = ResourceRestUtils
+				.restResponseToResourceObjectList(getResourceLatestVersionResponse.getResponse());
+		Resource resource = ResourceRestUtils.getResourceObjectFromResourceListByUid(resourceList,
+				resourceDetailsVF.getUniqueId());
+
+		callAllCheckMethods(resource);
+	}
+
+	@Test
+	public void getFollowedResources() throws Exception {
+
+		RestResponse response = LifecycleRestUtils.changeComponentState(resourceDetailsVF, sdncUserDetails,
+				LifeCycleStatesEnum.CHECKIN);
+		assertTrue("change LC state to CHECKIN, returned status:" + response.getErrorCode(),
+				response.getErrorCode() == 200);
+		// resourceDetailsVF =
+		// AtomicOperationUtils.getResourceObject(resourceDetailsVF,
+		// UserRoleEnum.DESIGNER);
+		resourceDetailsVF = AtomicOperationUtils.getResourceObject(resourceDetailsVF, UserRoleEnum.DESIGNER);
+
+		RestResponse getFollowedResourcesResponse = ResourceRestUtils.getFollowedList(sdncUserDetails);
+		String json = getFollowedResourcesResponse.getResponse();
+		JSONObject jsonResp = (JSONObject) JSONValue.parse(json);
+		JSONArray resources = (JSONArray) jsonResp.get("resources");
+
+		List<Resource> resourceList = ResourceRestUtils.restResponseToResourceObjectList(resources.toString());
+		Resource resource = ResourceRestUtils.getResourceObjectFromResourceListByUid(resourceList,
+				resourceDetailsVF.getUniqueId());
+		// TODO if get followed list Api should return full object data?
+		// callAllCheckMethods(resource);
+	}
+
+	@Test
+	public void lifeCycleChekInRequest() throws Exception {
+
+		RestResponse response = LifecycleRestUtils.changeComponentState(resourceDetailsVF, sdncUserDetails,
+				LifeCycleStatesEnum.CHECKIN);
+		assertTrue("change LC state to CHECKIN, returned status:" + response.getErrorCode(),
+				response.getErrorCode() == 200);
+		// resourceDetailsVF =
+		// AtomicOperationUtils.getResourceObject(resourceDetailsVF,
+		// UserRoleEnum.DESIGNER);
+		resourceDetailsVF = AtomicOperationUtils.getResourceObject(resourceDetailsVF, UserRoleEnum.DESIGNER);
+
+		Resource resource = ResponseParser.convertResourceResponseToJavaObject(response.getResponse());
+		callAllCheckMethods(resource);
+	}
+
+	@Test
+	public void lifeCycleChekOutRequest() throws Exception {
+
+		RestResponse response = LifecycleRestUtils.changeComponentState(resourceDetailsVF, sdncUserDetails,
+				LifeCycleStatesEnum.CHECKIN);
+		assertTrue("change LC state to CHECKIN, returned status:" + response.getErrorCode(),
+				response.getErrorCode() == 200);
+		response = LifecycleRestUtils.changeComponentState(resourceDetailsVF, sdncUserDetails,
+				LifeCycleStatesEnum.CHECKOUT);
+		assertTrue("change LC state to CHECKOUT, returned status:" + response.getErrorCode(),
+				response.getErrorCode() == 200);
+		resourceDetailsVF = AtomicOperationUtils.getResourceObject(resourceDetailsVF, UserRoleEnum.DESIGNER);
+
+		Resource resource = ResponseParser.convertResourceResponseToJavaObject(response.getResponse());
+		callAllCheckMethods(resource);
+	}
+
+	/*@Test
+	public void lifeCycleRequestForCertification() throws Exception {
+
+		RestResponse response = LifecycleRestUtils.changeComponentState(resourceDetailsVF, sdncUserDetails,
+				LifeCycleStatesEnum.CHECKIN);
+		assertTrue("change LC state to CHECKIN, returned status:" + response.getErrorCode(),
+				response.getErrorCode() == 200);
+		response = LifecycleRestUtils.changeComponentState(resourceDetailsVF, sdncUserDetails,
+				LifeCycleStatesEnum.CERTIFICATIONREQUEST);
+		assertTrue("change LC state to CERTIFICATIONREQUEST, returned status:" + response.getErrorCode(),
+				response.getErrorCode() == 200);
+		resourceDetailsVF = AtomicOperationUtils.getResourceObject(resourceDetailsVF, UserRoleEnum.DESIGNER);
+
+		Resource resource = ResponseParser.convertResourceResponseToJavaObject(response.getResponse());
+		callAllCheckMethods(resource);
+	}*/
+
+	@Test
+	public void lifeCycleCertificationRequest() throws Exception {
+
+		RestResponse response = AtomicOperationUtils
+				.changeComponentState(resourceDetailsVF, UserRoleEnum.DESIGNER, LifeCycleStatesEnum.CERTIFY, false)
+				.getRight();
+		assertTrue("change LC state to CERTIFY, returned status:" + response.getErrorCode(),
+				response.getErrorCode() == 200);
+		resourceDetailsVF = AtomicOperationUtils.getResourceObject(resourceDetailsVF, UserRoleEnum.DESIGNER);
+
+		Resource resource = ResponseParser.convertResourceResponseToJavaObject(response.getResponse());
+		callAllCheckMethods(resource);
+	}
+
+	@Test
+	public void checkGetResourceAfterCertificationRequest() throws Exception {
+
+		RestResponse response = AtomicOperationUtils
+				.changeComponentState(resourceDetailsVF, UserRoleEnum.DESIGNER, LifeCycleStatesEnum.CERTIFY, false)
+				.getRight();
+		assertTrue("change LC state to CERTIFY, returned status:" + response.getErrorCode(),
+				response.getErrorCode() == 200);
+		resourceDetailsVF = AtomicOperationUtils.getResourceObject(resourceDetailsVF, UserRoleEnum.DESIGNER);
+
+		callAllCheckMethods(resourceDetailsVF);
+	}
+
+	@Test
+	public void updateResourceMetadata() throws Exception {
+
+		resourceDetailsVF.setDescription("stamStam");
+		ResourceReqDetails resourceDetailsVFreqD = new ResourceReqDetails(resourceDetailsVF);
+		RestResponse updateResourceResponse = ResourceRestUtils.updateResourceMetadata(resourceDetailsVFreqD,
+				sdncUserDetails, resourceDetailsVF.getUniqueId());
+		assertTrue("response code is not 200, returned :" + updateResourceResponse.getErrorCode(),
+				updateResourceResponse.getErrorCode() == 200);
+
+		Resource resource = ResponseParser.convertResourceResponseToJavaObject(updateResourceResponse.getResponse());
+
+		callAllCheckMethods(resource);
+	}
+
+	private void checkResourceInstances(Resource resource) {
+		assertNotNull("resource component Instances list is null ", resource.getComponentInstances());
+		assertTrue("resource component Instances list is empty ", !resource.getComponentInstances().equals(""));
+	}
+
+	private void checkResourceInstancesProperties(Resource resource) {
+		assertNotNull("component Instances properies list is null ", resource.getComponentInstancesProperties());
+		assertTrue("component Instances properies list is empty ",
+				!resource.getComponentInstancesProperties().equals(""));
+	}
+
+	private void checkResourceInstancesRelations(Resource resource) {
+		assertNotNull("component Instances Relations list is null ", resource.getComponentInstancesRelations());
+		assertTrue("component Instances Relations list is empty ",
+				!resource.getComponentInstancesRelations().equals(""));
+	}
+
+	private void checkResourceCapabilities(Resource resource) {
+		assertNotNull("component Instances Capabilities list is null ", resource.getCapabilities());
+		assertTrue("component Instances Capabilities list is empty ", !resource.getCapabilities().equals(""));
+	}
+
+	private void checkResourceRequirements(Resource resource) {
+		assertNotNull("component Instances Requirements list is null ", resource.getRequirements());
+		assertTrue("component Instances Requirements list is empty ", !resource.getRequirements().equals(""));
+	}
+
+	private void callAllCheckMethods(Resource resource) {
+
+		checkResourceInstances(resource);
+		checkResourceInstancesProperties(resource);
+		checkResourceInstancesRelations(resource);
+		checkResourceCapabilities(resource);
+		checkResourceRequirements(resource);
+	}
+
+}
diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/execute/service/GetAllServiceVersions.java b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/execute/service/GetAllServiceVersions.java
new file mode 100644
index 0000000000..aa20d7f062
--- /dev/null
+++ b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/execute/service/GetAllServiceVersions.java
@@ -0,0 +1,345 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * SDC
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.sdc.ci.tests.execute.service;
+
+import org.junit.Rule;
+import org.junit.rules.TestName;
+import org.openecomp.sdc.be.dao.api.ActionStatus;
+import org.openecomp.sdc.be.datatypes.enums.ResourceTypeEnum;
+import org.openecomp.sdc.be.model.Component;
+import org.openecomp.sdc.be.model.Service;
+import org.openecomp.sdc.be.model.User;
+import org.openecomp.sdc.ci.tests.api.ComponentBaseTest;
+import org.openecomp.sdc.ci.tests.datatypes.ComponentInstanceReqDetails;
+import org.openecomp.sdc.ci.tests.datatypes.ResourceReqDetails;
+import org.openecomp.sdc.ci.tests.datatypes.ServiceReqDetails;
+import org.openecomp.sdc.ci.tests.datatypes.enums.ArtifactTypeEnum;
+import org.openecomp.sdc.ci.tests.datatypes.enums.ErrorInfo;
+import org.openecomp.sdc.ci.tests.datatypes.enums.LifeCycleStatesEnum;
+import org.openecomp.sdc.ci.tests.datatypes.enums.UserRoleEnum;
+import org.openecomp.sdc.ci.tests.datatypes.http.RestResponse;
+import org.openecomp.sdc.ci.tests.execute.lifecycle.LCSbaseTest;
+import org.openecomp.sdc.ci.tests.utils.general.AtomicOperationUtils;
+import org.openecomp.sdc.ci.tests.utils.general.ElementFactory;
+import org.openecomp.sdc.ci.tests.utils.rest.LifecycleRestUtils;
+import org.openecomp.sdc.ci.tests.utils.rest.ResponseParser;
+import org.openecomp.sdc.ci.tests.utils.rest.ServiceRestUtils;
+import org.openecomp.sdc.ci.tests.utils.validation.ErrorValidationUtils;
+import org.testng.annotations.BeforeMethod;
+import org.testng.annotations.Test;
+
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import static org.testng.AssertJUnit.assertEquals;
+import static org.testng.AssertJUnit.assertTrue;
+
+public class GetAllServiceVersions extends ComponentBaseTest {
+	protected ResourceReqDetails resourceDetails;
+	protected ServiceReqDetails serviceDetails;
+	protected User sdncDesignerDetails;
+	protected User sdncDesignerDetails2;
+	protected User sdncAdminDetails;
+	protected User sdncGovernorDeatails;
+	protected User sdncTesterDetails;
+	protected User sdncOpsDetails;
+	protected ComponentInstanceReqDetails resourceInstanceReqDetails;
+	protected Component resourceDetailsVFCcomp;
+	protected Service serviceServ;
+
+	@Rule
+	public static TestName name = new TestName();
+
+	@BeforeMethod
+	public void setUp() throws Exception {
+
+		sdncDesignerDetails = ElementFactory.getDefaultUser(UserRoleEnum.DESIGNER);
+		sdncDesignerDetails2 = ElementFactory.getDefaultUser(UserRoleEnum.DESIGNER2);
+		sdncAdminDetails = ElementFactory.getDefaultUser(UserRoleEnum.ADMIN);
+		sdncGovernorDeatails = ElementFactory.getDefaultUser(UserRoleEnum.GOVERNOR);
+		sdncTesterDetails = ElementFactory.getDefaultUser(UserRoleEnum.TESTER);
+		sdncOpsDetails = ElementFactory.getDefaultUser(UserRoleEnum.OPS);
+		resourceDetailsVFCcomp = AtomicOperationUtils
+				.createResourceByType(ResourceTypeEnum.VFC, UserRoleEnum.DESIGNER, true).left().value();
+		AtomicOperationUtils.uploadArtifactByType(ArtifactTypeEnum.HEAT, resourceDetailsVFCcomp, UserRoleEnum.DESIGNER,
+				true, true);
+
+		AtomicOperationUtils.changeComponentState(resourceDetailsVFCcomp, UserRoleEnum.DESIGNER,
+				LifeCycleStatesEnum.CERTIFY, true);
+		serviceServ = AtomicOperationUtils.createDefaultService(UserRoleEnum.DESIGNER, true).left().value();
+		AtomicOperationUtils.addComponentInstanceToComponentContainer(resourceDetailsVFCcomp, serviceServ,
+				UserRoleEnum.DESIGNER, true);
+
+		serviceDetails = new ServiceReqDetails(serviceServ);
+
+	}
+
+	@Test
+	public void GetAllServiceVersions_Version05() throws Exception {
+
+		Map<String, String> origVersionsMap = new HashMap<String, String>();
+		origVersionsMap.put(serviceDetails.getVersion(), serviceDetails.getUniqueId());
+		for (int x = 0; x < 4; x++) {
+			LifecycleRestUtils.changeServiceState(serviceDetails, sdncDesignerDetails, serviceDetails.getVersion(),
+					LifeCycleStatesEnum.CHECKIN);
+			LifecycleRestUtils.changeServiceState(serviceDetails, sdncDesignerDetails, serviceDetails.getVersion(),
+					LifeCycleStatesEnum.CHECKOUT);
+			origVersionsMap.put(serviceDetails.getVersion(), serviceDetails.getUniqueId());
+
+		}
+		// validate get response
+		RestResponse serviceGetResponse = ServiceRestUtils.getService(serviceDetails, sdncDesignerDetails);
+		Service res = ResponseParser.convertServiceResponseToJavaObject(serviceGetResponse.getResponse());
+		Map<String, String> getVersionsMap = res.getAllVersions();
+		assertTrue(origVersionsMap.equals(getVersionsMap));
+
+	}
+
+	@Test
+	public void GetAllServiceVersions_Version01() throws Exception {
+
+		Map<String, String> origVersionsMap = new HashMap<String, String>();
+		origVersionsMap.put(serviceDetails.getVersion(), serviceDetails.getUniqueId());
+
+		RestResponse serviceGetResponse = ServiceRestUtils.getService(serviceDetails, sdncDesignerDetails);
+		Service res = ResponseParser.convertServiceResponseToJavaObject(serviceGetResponse.getResponse());
+		Map<String, String> getVersionsMap = res.getAllVersions();
+		assertTrue(origVersionsMap.equals(getVersionsMap));
+	}
+
+	@Test
+	public void GetAllServiceVersions_Version15() throws Exception {
+		// addMandatoryArtifactsToService();
+		Map<String, String> origVersionsMap = new HashMap<String, String>();
+		for (int x = 0; x < 4; x++) {
+			LifecycleRestUtils.changeServiceState(serviceDetails, sdncDesignerDetails, serviceDetails.getVersion(),
+					LifeCycleStatesEnum.CHECKIN);
+			LifecycleRestUtils.changeServiceState(serviceDetails, sdncDesignerDetails, serviceDetails.getVersion(),
+					LifeCycleStatesEnum.CHECKOUT);
+		}
+
+		RestResponse changeServiceState = LCSbaseTest.certifyService(serviceDetails, sdncDesignerDetails);
+		// serviceServ.setUniqueId(serviceDetails.getUniqueId());
+		// RestResponse changeServiceState =
+		// AtomicOperationUtils.changeComponentState(serviceServ,
+		// UserRoleEnum.ADMIN, LifeCycleStatesEnum.CERTIFY, false).getRight();
+
+		assertTrue("certify service request returned status:" + changeServiceState.getErrorCode(),
+				changeServiceState.getErrorCode() == 200);
+		origVersionsMap.put(serviceDetails.getVersion(), serviceDetails.getUniqueId());
+
+		for (int x = 0; x < 5; x++) {
+			LifecycleRestUtils.changeServiceState(serviceDetails, sdncAdminDetails, serviceDetails.getVersion(),
+					LifeCycleStatesEnum.CHECKOUT);
+			LifecycleRestUtils.changeServiceState(serviceDetails, sdncAdminDetails, serviceDetails.getVersion(),
+					LifeCycleStatesEnum.CHECKIN);
+			origVersionsMap.put(serviceDetails.getVersion(), serviceDetails.getUniqueId());
+
+		}
+
+		// validate get response
+		RestResponse serviceGetResponse = ServiceRestUtils.getService(serviceDetails, sdncAdminDetails);
+		Service res = ResponseParser.convertServiceResponseToJavaObject(serviceGetResponse.getResponse());
+		Map<String, String> getVersionsMap = res.getAllVersions();
+		assertTrue(origVersionsMap.equals(getVersionsMap));
+	}
+
+	@Test
+	public void GetAllServiceVersions_Version25() throws Exception {
+		// addMandatoryArtifactsToService();
+		Map<String, String> origVersionsMap = new HashMap<String, String>();
+		for (int x = 0; x < 4; x++) {
+			LifecycleRestUtils.changeServiceState(serviceDetails, sdncDesignerDetails, serviceDetails.getVersion(),
+					LifeCycleStatesEnum.CHECKIN);
+			LifecycleRestUtils.changeServiceState(serviceDetails, sdncDesignerDetails, serviceDetails.getVersion(),
+					LifeCycleStatesEnum.CHECKOUT);
+		}
+
+		// getting to version 1.0
+		RestResponse changeServiceState = LCSbaseTest.certifyService(serviceDetails, sdncDesignerDetails);
+		assertTrue("certify service request returned status:" + changeServiceState.getErrorCode(),
+				changeServiceState.getErrorCode() == 200);
+		origVersionsMap.put(serviceDetails.getVersion(), serviceDetails.getUniqueId());
+
+		// getting to version 1.5
+		for (int x = 0; x < 5; x++) {
+			LifecycleRestUtils.changeServiceState(serviceDetails, sdncDesignerDetails, serviceDetails.getVersion(),
+					LifeCycleStatesEnum.CHECKIN);
+			LifecycleRestUtils.changeServiceState(serviceDetails, sdncDesignerDetails, serviceDetails.getVersion(),
+					LifeCycleStatesEnum.CHECKOUT);
+		}
+
+		// getting to version 2.0
+		changeServiceState = LCSbaseTest.certifyService(serviceDetails, sdncDesignerDetails);
+		assertTrue("certify service request returned status:" + changeServiceState.getErrorCode(),
+				changeServiceState.getErrorCode() == 200);
+		origVersionsMap.put(serviceDetails.getVersion(), serviceDetails.getUniqueId());
+
+		// getting to version 2.5
+		for (int x = 0; x < 5; x++) {
+			LifecycleRestUtils.changeServiceState(serviceDetails, sdncAdminDetails, serviceDetails.getVersion(),
+					LifeCycleStatesEnum.CHECKIN);
+			LifecycleRestUtils.changeServiceState(serviceDetails, sdncAdminDetails, serviceDetails.getVersion(),
+					LifeCycleStatesEnum.CHECKOUT);
+			origVersionsMap.put(serviceDetails.getVersion(), serviceDetails.getUniqueId());
+		}
+
+		// validate get response
+		RestResponse serviceGetResponse = ServiceRestUtils.getService(serviceDetails, sdncAdminDetails);
+		Service res = ResponseParser.convertServiceResponseToJavaObject(serviceGetResponse.getResponse());
+		Map<String, String> getVersionsMap = res.getAllVersions();
+		assertTrue(origVersionsMap.equals(getVersionsMap));
+	}
+
+	@Test
+	public void GetAllServiceVersions_ReadyForCertification_version05() throws Exception {
+		// addMandatoryArtifactsToService();
+		Map<String, String> origVersionsMap = new HashMap<String, String>();
+		origVersionsMap.put(serviceDetails.getVersion(), serviceDetails.getUniqueId());
+		for (int x = 0; x < 4; x++) {
+			LifecycleRestUtils.changeServiceState(serviceDetails, sdncDesignerDetails, serviceDetails.getVersion(),
+					LifeCycleStatesEnum.CHECKIN);
+			LifecycleRestUtils.changeServiceState(serviceDetails, sdncDesignerDetails, serviceDetails.getVersion(),
+					LifeCycleStatesEnum.CHECKOUT);
+			origVersionsMap.put(serviceDetails.getVersion(), serviceDetails.getUniqueId());
+		}
+
+		LifecycleRestUtils.changeServiceState(serviceDetails, sdncDesignerDetails, serviceDetails.getVersion(),
+				LifeCycleStatesEnum.CHECKIN);
+		LifecycleRestUtils.changeServiceState(serviceDetails, sdncAdminDetails, serviceDetails.getVersion(),
+				LifeCycleStatesEnum.CERTIFICATIONREQUEST);
+
+		// validate get response
+		RestResponse serviceGetResponse = ServiceRestUtils.getService(serviceDetails, sdncAdminDetails);
+		Service res = ResponseParser.convertServiceResponseToJavaObject(serviceGetResponse.getResponse());
+		Map<String, String> getVersionsMap = res.getAllVersions();
+		assertTrue(origVersionsMap.equals(getVersionsMap));
+	}
+
+	@Test
+	public void GetAllServiceVersions_CertifactionInProgress_version05() throws Exception {
+		// addMandatoryArtifactsToService();
+		Map<String, String> origVersionsMap = new HashMap<String, String>();
+		origVersionsMap.put(serviceDetails.getVersion(), serviceDetails.getUniqueId());
+		for (int x = 0; x < 4; x++) {
+			LifecycleRestUtils.changeServiceState(serviceDetails, sdncDesignerDetails, serviceDetails.getVersion(),
+					LifeCycleStatesEnum.CHECKIN);
+			LifecycleRestUtils.changeServiceState(serviceDetails, sdncDesignerDetails, serviceDetails.getVersion(),
+					LifeCycleStatesEnum.CHECKOUT);
+			origVersionsMap.put(serviceDetails.getVersion(), serviceDetails.getUniqueId());
+		}
+
+		LifecycleRestUtils.changeServiceState(serviceDetails, sdncDesignerDetails, serviceDetails.getVersion(),
+				LifeCycleStatesEnum.CHECKIN);
+		LifecycleRestUtils.changeServiceState(serviceDetails, sdncAdminDetails, serviceDetails.getVersion(),
+				LifeCycleStatesEnum.CERTIFICATIONREQUEST);
+		LifecycleRestUtils.changeServiceState(serviceDetails, sdncAdminDetails, serviceDetails.getVersion(),
+				LifeCycleStatesEnum.STARTCERTIFICATION);
+
+		// validate get response
+		RestResponse serviceGetResponse = ServiceRestUtils.getService(serviceDetails, sdncAdminDetails);
+		Service res = ResponseParser.convertServiceResponseToJavaObject(serviceGetResponse.getResponse());
+		Map<String, String> getVersionsMap = res.getAllVersions();
+		assertTrue(origVersionsMap.equals(getVersionsMap));
+	}
+
+	@Test
+	public void GetAllServiceVersions_Certified_version10() throws Exception {
+		// addMandatoryArtifactsToService();
+		Map<String, String> origVersionsMap = new HashMap<String, String>();
+		// get to version 0.5
+		for (int x = 0; x < 4; x++) {
+			LifecycleRestUtils.changeServiceState(serviceDetails, sdncDesignerDetails, serviceDetails.getVersion(),
+					LifeCycleStatesEnum.CHECKIN);
+			LifecycleRestUtils.changeServiceState(serviceDetails, sdncDesignerDetails, serviceDetails.getVersion(),
+					LifeCycleStatesEnum.CHECKOUT);
+
+		}
+
+		// get version 1.0
+		RestResponse changeServiceState = LCSbaseTest.certifyService(serviceDetails, sdncDesignerDetails);
+		assertTrue("certify service request returned status:" + changeServiceState.getErrorCode(),
+				changeServiceState.getErrorCode() == 200);
+		origVersionsMap.put(serviceDetails.getVersion(), serviceDetails.getUniqueId());
+
+		// validate get response
+		RestResponse serviceGetResponse = ServiceRestUtils.getService(serviceDetails, sdncAdminDetails);
+		Service res = ResponseParser.convertServiceResponseToJavaObject(serviceGetResponse.getResponse());
+		Map<String, String> getVersionsMap = res.getAllVersions();
+		assertTrue(origVersionsMap.equals(getVersionsMap));
+	}
+
+	@Test
+	public void GetAllServiceVersions_Certified_version20() throws Exception {
+		// addMandatoryArtifactsToService();
+		Map<String, String> origVersionsMap = new HashMap<String, String>();
+		// get to version 0.5
+		for (int x = 0; x < 4; x++) {
+			LifecycleRestUtils.changeServiceState(serviceDetails, sdncDesignerDetails, serviceDetails.getVersion(),
+					LifeCycleStatesEnum.CHECKIN);
+			LifecycleRestUtils.changeServiceState(serviceDetails, sdncDesignerDetails, serviceDetails.getVersion(),
+					LifeCycleStatesEnum.CHECKOUT);
+		}
+
+		// get version 1.0
+		RestResponse changeServiceState = LCSbaseTest.certifyService(serviceDetails, sdncDesignerDetails);
+		assertTrue("certify service request returned status:" + changeServiceState.getErrorCode(),
+				changeServiceState.getErrorCode() == 200);
+		origVersionsMap.put(serviceDetails.getVersion(), serviceDetails.getUniqueId());
+
+		// get version 1.5
+		for (int x = 0; x < 4; x++) {
+			LifecycleRestUtils.changeServiceState(serviceDetails, sdncDesignerDetails, serviceDetails.getVersion(),
+					LifeCycleStatesEnum.CHECKIN);
+			LifecycleRestUtils.changeServiceState(serviceDetails, sdncDesignerDetails, serviceDetails.getVersion(),
+					LifeCycleStatesEnum.CHECKOUT);
+		}
+
+		// get version 2.0
+		changeServiceState = LCSbaseTest.certifyService(serviceDetails, sdncDesignerDetails);
+		assertTrue("certify service request returned status:" + changeServiceState.getErrorCode(),
+				changeServiceState.getErrorCode() == 200);
+		origVersionsMap.put(serviceDetails.getVersion(), serviceDetails.getUniqueId());
+
+		// validate get response
+		RestResponse serviceGetResponse = ServiceRestUtils.getService(serviceDetails, sdncAdminDetails);
+		Service res = ResponseParser.convertServiceResponseToJavaObject(serviceGetResponse.getResponse());
+		Map<String, String> getVersionsMap = res.getAllVersions();
+		assertTrue(origVersionsMap.equals(getVersionsMap));
+	}
+
+	@Test
+	public void GetAllServiceVersions_ServiceNotFound() throws Exception {
+
+		RestResponse serviceGetResponse = ServiceRestUtils.getService("123456789", sdncAdminDetails);
+		ErrorInfo errorInfo = ErrorValidationUtils.parseErrorConfigYaml(ActionStatus.SERVICE_NOT_FOUND.name());
+		assertEquals("Check response code after get service without cache", errorInfo.getCode(),
+				serviceGetResponse.getErrorCode());
+
+		List<String> variables = Arrays.asList("123456789");
+		ErrorValidationUtils.checkBodyResponseOnError(ActionStatus.SERVICE_NOT_FOUND.name(), variables,
+				serviceGetResponse.getResponse());
+
+	}
+
+}
diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/execute/service/GetComponentAuditApiTest.java b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/execute/service/GetComponentAuditApiTest.java
new file mode 100644
index 0000000000..42045f06a4
--- /dev/null
+++ b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/execute/service/GetComponentAuditApiTest.java
@@ -0,0 +1,358 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * SDC
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.sdc.ci.tests.execute.service;
+
+import com.google.gson.JsonArray;
+import com.google.gson.JsonElement;
+import fj.data.Either;
+import org.apache.http.HttpStatus;
+import org.junit.Rule;
+import org.junit.rules.TestName;
+import org.openecomp.sdc.be.datatypes.enums.ComponentTypeEnum;
+import org.openecomp.sdc.be.datatypes.enums.ResourceTypeEnum;
+import org.openecomp.sdc.be.model.Resource;
+import org.openecomp.sdc.be.model.User;
+import org.openecomp.sdc.be.resources.data.auditing.AuditingActionEnum;
+import org.openecomp.sdc.ci.tests.api.ComponentBaseTest;
+import org.openecomp.sdc.ci.tests.api.Urls;
+import org.openecomp.sdc.ci.tests.datatypes.ArtifactReqDetails;
+import org.openecomp.sdc.ci.tests.datatypes.ComponentInstanceReqDetails;
+import org.openecomp.sdc.ci.tests.datatypes.ResourceReqDetails;
+import org.openecomp.sdc.ci.tests.datatypes.ServiceReqDetails;
+import org.openecomp.sdc.ci.tests.datatypes.enums.ArtifactTypeEnum;
+import org.openecomp.sdc.ci.tests.datatypes.enums.LifeCycleStatesEnum;
+import org.openecomp.sdc.ci.tests.datatypes.enums.UserRoleEnum;
+import org.openecomp.sdc.ci.tests.datatypes.http.HttpRequest;
+import org.openecomp.sdc.ci.tests.datatypes.http.RestResponse;
+import org.openecomp.sdc.ci.tests.utils.general.AtomicOperationUtils;
+import org.openecomp.sdc.ci.tests.utils.general.ElementFactory;
+import org.openecomp.sdc.ci.tests.utils.general.FileUtils;
+import org.openecomp.sdc.ci.tests.utils.rest.*;
+import org.openecomp.sdc.common.api.Constants;
+import org.openecomp.sdc.common.datastructure.AuditingFieldsKey;
+import org.openecomp.sdc.common.datastructure.Wrapper;
+import org.testng.AssertJUnit;
+import org.testng.annotations.BeforeMethod;
+import org.testng.annotations.Test;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import static org.testng.AssertJUnit.assertTrue;
+
+public class GetComponentAuditApiTest extends ComponentBaseTest {
+
+	public static final String SERVICES_API = "services";
+	public static final String RESOURCES_API = "resources";
+
+	protected User sdncAdminUser;
+	protected User sdncDesignerUser;
+	protected User sdncTesterUser;
+
+	@Rule
+	public static TestName name = new TestName();
+
+	// in case tests fail, run this method as test to create mapping in ES
+	public void updateElasticSearchMapping() throws IOException {
+		Either<String, Exception> fileContentUTF8 = FileUtils
+				.getFileContentUTF8("src\\test\\resources\\CI\\other\\mapping.json");
+		AssertJUnit.assertTrue(fileContentUTF8.isLeft());
+
+		final String ES_TEMPLATE_URL = "http://%s:%s/_template/audit_template";
+		String url = String.format(ES_TEMPLATE_URL, config.getEsHost(), config.getEsPort());
+
+//		RestResponse sendHttpPost = new HttpRequest().sendHttpPost(url, fileContentUTF8.left().value(), null);
+		RestResponse sendHttpPost = new HttpRequest().httpSendPost(url, fileContentUTF8.left().value(), null);
+		AssertJUnit.assertTrue(sendHttpPost.getErrorCode() == HttpStatus.SC_OK);
+	}
+
+	@BeforeMethod
+	public void init() {
+		sdncAdminUser = ElementFactory.getDefaultUser(UserRoleEnum.ADMIN);
+		sdncDesignerUser = ElementFactory.getDefaultUser(UserRoleEnum.DESIGNER);
+		sdncTesterUser = ElementFactory.getDefaultUser(UserRoleEnum.TESTER);
+		;
+
+	}
+
+	@Test
+	public void testServiceAuditCertifiedVersion() throws Exception {
+
+		ServiceReqDetails serviceDetails = ElementFactory.getDefaultService();
+		Wrapper<String> versionZeroOneIDWrapper = new Wrapper<String>(),
+				versionZeroTwoIDWrapper = new Wrapper<String>();
+
+		createBasicServiceForAudit(versionZeroOneIDWrapper, versionZeroTwoIDWrapper, serviceDetails, true);
+		// First Certification
+
+		LifecycleRestUtils.certifyService(serviceDetails);
+		// LCSbaseTest.certifyService(serviceDetails);
+		AssertJUnit.assertTrue(serviceDetails.getVersion().equals("1.0"));
+
+		// Second Certification
+		increaseServiceVersion(serviceDetails, "1.1");
+		increaseServiceVersion(serviceDetails, "1.2");
+		increaseServiceVersion(serviceDetails, "1.3");
+		increaseServiceVersion(serviceDetails, "1.4");
+		LifecycleRestUtils.certifyService(serviceDetails);
+		AssertJUnit.assertTrue(serviceDetails.getVersion().equals("2.0"));
+		String certifiedId = serviceDetails.getUniqueId();
+		LifecycleRestUtils.changeServiceState(serviceDetails, sdncDesignerUser, LifeCycleStatesEnum.CHECKOUT);
+		LifecycleRestUtils.changeServiceState(serviceDetails, sdncDesignerUser, LifeCycleStatesEnum.CHECKIN);
+
+		JsonElement element = getAuditJson(SERVICES_API, certifiedId);
+		// audits kept: 5*check ins + 4*check outs + 2*artifact payload
+		// updates(tosca) + certification request + certification start +
+		// certification success
+		// + 3 A&AI(ArtifactDelete, ArtifactUpload, ArtifactUpdate)
+		List<String> actions = new ArrayList<>();
+		JsonArray jsonArray = element.getAsJsonArray();
+		for( int i =0 ; i < jsonArray.size(); i++){
+			actions.add(jsonArray.get(i).getAsJsonObject().get(AuditingFieldsKey.AUDIT_ACTION.getDisplayName()).getAsString());
+		}
+		long checkinCount = actions.stream().filter( e -> e.equals(AuditingActionEnum.CHECKIN_RESOURCE.getName())).count();
+		assertTrue(checkinCount == 5);
+		
+		long checkOutCount = actions.stream().filter( e -> e.equals(AuditingActionEnum.CHECKOUT_RESOURCE.getName())).count();
+		assertTrue(checkOutCount == 4);
+		
+		long certificationRequestCount = actions.stream().filter( e -> e.equals(AuditingActionEnum.CERTIFICATION_REQUEST_RESOURCE.getName())).count();
+		assertTrue(certificationRequestCount == 1);
+		
+		long certificationStartCount = actions.stream().filter( e -> e.equals(AuditingActionEnum.START_CERTIFICATION_RESOURCE.getName())).count();
+		assertTrue(certificationStartCount == 1);
+		
+		long certificationSuccessCount = actions.stream().filter( e -> e.equals(AuditingActionEnum.CERTIFICATION_SUCCESS_RESOURCE.getName())).count();
+		assertTrue(certificationSuccessCount == 1);
+		
+
+	}
+
+	protected void certifyResource(ResourceReqDetails defaultResource) throws IOException {
+/*		RestResponse response = LifecycleRestUtils.changeResourceState(defaultResource, sdncDesignerUser,
+				LifeCycleStatesEnum.CERTIFICATIONREQUEST);
+		AssertJUnit.assertTrue(response.getErrorCode() == HttpStatus.SC_OK);
+		response = LifecycleRestUtils.changeResourceState(defaultResource, sdncTesterUser,
+				LifeCycleStatesEnum.STARTCERTIFICATION);
+		AssertJUnit.assertTrue(response.getErrorCode() == HttpStatus.SC_OK);*/
+		RestResponse response = LifecycleRestUtils.changeResourceState(defaultResource, sdncTesterUser, LifeCycleStatesEnum.CERTIFY);
+		AssertJUnit.assertTrue(response.getErrorCode() == HttpStatus.SC_OK);
+	}
+
+	protected JsonElement getAuditJson(String componentType, String componentId) throws IOException {
+		Map<String, String> headers = new HashMap<String, String>() {
+			{
+				put(Constants.USER_ID_HEADER, UserRoleEnum.ADMIN.getUserId());
+			}
+		};
+		String url = String.format(Urls.GET_COMPONENT_AUDIT_RECORDS, config.getCatalogBeHost(),
+				config.getCatalogBePort(), componentType, componentId);
+
+		RestResponse httpSendGet = new HttpRequest().httpSendGet(url, headers);
+		AssertJUnit.assertTrue(httpSendGet.getErrorCode() == HttpStatus.SC_OK);
+		JsonElement element = ResponseParser.parseToObject(httpSendGet.getResponse(), JsonElement.class);
+		AssertJUnit.assertTrue(element.isJsonArray());
+		return element;
+	}
+
+	protected void createBasicServiceForAudit(Wrapper<String> versionZeroOneIDWrapper,
+			Wrapper<String> versionZeroTwoIDWrapper, ServiceReqDetails serviceDetails, Boolean withResInst)
+			throws Exception {
+
+		User designerUser = sdncDesignerUser;
+
+		RestResponse response = ServiceRestUtils.createService(serviceDetails, designerUser);
+		AssertJUnit.assertTrue(response.getErrorCode() == HttpStatus.SC_CREATED);
+		versionZeroOneIDWrapper.setInnerElement(serviceDetails.getUniqueId());
+
+		if (withResInst) {
+			Resource resourceObj = AtomicOperationUtils
+					.createResourceByType(ResourceTypeEnum.VFC, UserRoleEnum.DESIGNER, true).left().value();
+			AtomicOperationUtils.uploadArtifactByType(ArtifactTypeEnum.HEAT, resourceObj, UserRoleEnum.DESIGNER, true,
+					true);
+			AtomicOperationUtils.changeComponentState(resourceObj, UserRoleEnum.DESIGNER, LifeCycleStatesEnum.CERTIFY,
+					true);
+			ResourceReqDetails resource = new ResourceReqDetails(resourceObj);
+			ComponentInstanceReqDetails resourceInstanceReqDetails = ElementFactory.getDefaultComponentInstance();
+			resourceInstanceReqDetails.setComponentUid(resource.getUniqueId());
+			ComponentInstanceRestUtils.createComponentInstance(resourceInstanceReqDetails, sdncDesignerUser,
+					serviceDetails.getUniqueId(), ComponentTypeEnum.SERVICE);
+
+			// ServiceUtils.createCertResourceWithDeploymentArt(serviceDetails,
+			// "myResource");
+		}
+
+		response = LifecycleRestUtils.changeServiceState(serviceDetails, designerUser, LifeCycleStatesEnum.CHECKIN);
+		AssertJUnit.assertTrue(response.getErrorCode() == HttpStatus.SC_OK);
+		AssertJUnit.assertTrue(serviceDetails.getVersion().equals("0.1"));
+
+		response = LifecycleRestUtils.changeServiceState(serviceDetails, designerUser, LifeCycleStatesEnum.CHECKOUT);
+		AssertJUnit.assertTrue(response.getErrorCode() == HttpStatus.SC_OK);
+		// ServiceUtils.addServiceDeploymentArtifact(serviceDetails.getUniqueId(),
+		// designerUser);
+		versionZeroTwoIDWrapper.setInnerElement(serviceDetails.getUniqueId());
+		AssertJUnit.assertTrue(serviceDetails.getVersion().equals("0.2"));
+		response = LifecycleRestUtils.changeServiceState(serviceDetails, designerUser, LifeCycleStatesEnum.CHECKIN);
+		AssertJUnit.assertTrue(response.getErrorCode() == HttpStatus.SC_OK);
+
+		increaseServiceVersion(serviceDetails, "0.3");
+
+		increaseServiceVersion(serviceDetails, "0.4");
+
+		increaseServiceVersion(serviceDetails, "0.5");
+
+	}
+
+	protected void increaseServiceVersion(ServiceReqDetails serviceDetails, String excpectedVersion) throws Exception {
+		RestResponse response = LifecycleRestUtils.changeServiceState(serviceDetails, sdncDesignerUser,
+				LifeCycleStatesEnum.CHECKOUT);
+		AssertJUnit.assertTrue(response.getErrorCode() == HttpStatus.SC_OK);
+		AssertJUnit.assertTrue(serviceDetails.getVersion().equals(excpectedVersion));
+		response = LifecycleRestUtils.changeServiceState(serviceDetails, sdncDesignerUser, LifeCycleStatesEnum.CHECKIN);
+		AssertJUnit.assertTrue(response.getErrorCode() == HttpStatus.SC_OK);
+	}
+
+	protected void createBasicResourceForAudit(Wrapper<String> versionOnePointTwoIDWrapper,
+			ResourceReqDetails defaultResource) throws Exception {
+
+		RestResponse response = ResourceRestUtils.createResource(defaultResource, sdncDesignerUser);
+		AssertJUnit.assertTrue(response.getErrorCode() == HttpStatus.SC_CREATED);
+
+		// ArtifactDefinition artifactDef = new
+		// ArtifactUtils().constructDefaultArtifactInfo();
+		// response = resourceUtils.add_artifact(defaultResource,
+		// sdncDesignerUser, defaultResource.getVersion(), artifactDef);
+		// assertTrue(response.getErrorCode() == HttpStatus.SC_OK);
+
+		ArtifactReqDetails heatArtifactDetails = ElementFactory
+				.getDefaultDeploymentArtifactForType(ArtifactTypeEnum.HEAT.getType());
+		response = ArtifactRestUtils.addInformationalArtifactToResource(heatArtifactDetails, sdncDesignerUser,
+				defaultResource.getUniqueId());
+		AssertJUnit.assertTrue("add HEAT artifact to resource request returned status:" + response.getErrorCode(),
+				response.getErrorCode() == 200);
+
+		response = LifecycleRestUtils.changeResourceState(defaultResource, sdncDesignerUser,
+				LifeCycleStatesEnum.CHECKIN);
+
+		increaseResourceVersion(defaultResource, "0.2");
+
+		increaseResourceVersion(defaultResource, "0.3");
+
+		increaseResourceVersion(defaultResource, "0.4");
+
+		increaseResourceVersion(defaultResource, "0.5");
+
+		certifyResource(defaultResource);
+		AssertJUnit.assertTrue(response.getErrorCode() == HttpStatus.SC_OK);
+		AssertJUnit.assertTrue(defaultResource.getVersion().equals("1.0"));
+
+		increaseResourceVersion(defaultResource, "1.1");
+
+		increaseResourceVersion(defaultResource, "1.2");
+		versionOnePointTwoIDWrapper.setInnerElement(defaultResource.getUniqueId());
+
+		increaseResourceVersion(defaultResource, "1.3");
+
+		increaseResourceVersion(defaultResource, "1.4");
+
+	}
+
+	protected void increaseResourceVersion(ResourceReqDetails defaultResource, String expectedVersion)
+			throws IOException {
+		RestResponse response = LifecycleRestUtils.changeResourceState(defaultResource, sdncDesignerUser,
+				LifeCycleStatesEnum.CHECKOUT);
+		AssertJUnit.assertTrue(response.getErrorCode() == HttpStatus.SC_OK);
+		AssertJUnit.assertTrue(defaultResource.getVersion().equals(expectedVersion));
+		response = LifecycleRestUtils.changeResourceState(defaultResource, sdncDesignerUser,
+				LifeCycleStatesEnum.CHECKIN);
+		AssertJUnit.assertTrue(response.getErrorCode() == HttpStatus.SC_OK);
+	}
+
+	@Test
+	public void testServiceAuditLastUncertifiedVersion() throws Exception {
+
+		ServiceReqDetails serviceDetails = ElementFactory.getDefaultService();
+		Wrapper<String> versionZeroOneIDWrapper = new Wrapper<String>(),
+				versionZeroTwoIDWrapper = new Wrapper<String>();
+
+		createBasicServiceForAudit(versionZeroOneIDWrapper, versionZeroTwoIDWrapper, serviceDetails, false);
+
+		JsonElement element = getAuditJson(SERVICES_API, versionZeroTwoIDWrapper.getInnerElement());
+
+		assertTrue(element.getAsJsonArray().size() == 3);
+
+	}
+
+	@Test
+	public void testServiceAuditFirstUncertifiedVersion() throws Exception {
+
+		ServiceReqDetails serviceDetails = ElementFactory.getDefaultService();
+		Wrapper<String> versionZeroOneIDWrapper = new Wrapper<String>(),
+				versionZeroTwoIDWrapper = new Wrapper<String>();
+
+		createBasicServiceForAudit(versionZeroOneIDWrapper, versionZeroTwoIDWrapper, serviceDetails, false);
+
+		JsonElement element = getAuditJson(SERVICES_API, versionZeroOneIDWrapper.getInnerElement());
+
+		assertTrue(element.getAsJsonArray().size() == 3);
+
+	}
+
+	@Test
+	public void testResourceAuditUncertifiedVersion() throws Exception {
+
+		ResourceReqDetails defaultResource = ElementFactory.getDefaultResource();
+		Wrapper<String> versionOnePointTwoIDWrapper = new Wrapper<String>();
+
+		createBasicResourceForAudit(versionOnePointTwoIDWrapper, defaultResource);
+
+		JsonElement element = getAuditJson(RESOURCES_API, versionOnePointTwoIDWrapper.getInnerElement());
+
+		assertTrue(element.getAsJsonArray().size() == 3);
+
+	}
+
+	@Test
+	public void testResourceAuditCertifiedVersion() throws Exception {
+
+		ResourceReqDetails defaultResource = ElementFactory.getDefaultResource();
+		Wrapper<String> versionOnePointTwoIDWrapper = new Wrapper<String>();
+
+		createBasicResourceForAudit(versionOnePointTwoIDWrapper, defaultResource);
+
+		certifyResource(defaultResource);
+		assertTrue(defaultResource.getVersion().equals("2.0"));
+		String certifiedId = defaultResource.getUniqueId();
+
+		increaseResourceVersion(defaultResource, "2.1");
+
+		increaseResourceVersion(defaultResource, "2.2");
+
+		JsonElement element = getAuditJson(RESOURCES_API, certifiedId);
+
+		assertTrue(element.getAsJsonArray().size() == 13);
+
+	}
+
+}
diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/execute/user/ActivateDeActivateDeleteUser.java b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/execute/user/ActivateDeActivateDeleteUser.java
new file mode 100644
index 0000000000..4196fa773f
--- /dev/null
+++ b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/execute/user/ActivateDeActivateDeleteUser.java
@@ -0,0 +1,736 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * SDC
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.sdc.ci.tests.execute.user;
+
+import com.google.gson.*;
+import com.google.gson.reflect.TypeToken;
+import org.apache.http.HttpStatus;
+import org.junit.Rule;
+import org.junit.rules.TestName;
+import org.openecomp.sdc.be.dao.api.ActionStatus;
+import org.openecomp.sdc.be.dao.utils.UserStatusEnum;
+import org.openecomp.sdc.be.model.LifecycleStateEnum;
+import org.openecomp.sdc.be.model.Resource;
+import org.openecomp.sdc.be.model.User;
+import org.openecomp.sdc.ci.tests.api.ComponentBaseTest;
+import org.openecomp.sdc.ci.tests.datatypes.ResourceReqDetails;
+import org.openecomp.sdc.ci.tests.datatypes.ResourceRespJavaObject;
+import org.openecomp.sdc.ci.tests.datatypes.ServiceReqDetails;
+import org.openecomp.sdc.ci.tests.datatypes.enums.ErrorInfo;
+import org.openecomp.sdc.ci.tests.datatypes.enums.NormativeTypesEnum;
+import org.openecomp.sdc.ci.tests.datatypes.enums.ResourceCategoryEnum;
+import org.openecomp.sdc.ci.tests.datatypes.enums.UserRoleEnum;
+import org.openecomp.sdc.ci.tests.datatypes.expected.ExpectedUserCRUDAudit;
+import org.openecomp.sdc.ci.tests.datatypes.http.RestResponse;
+import org.openecomp.sdc.ci.tests.users.UserResponseMessageEnum;
+import org.openecomp.sdc.ci.tests.utils.DbUtils;
+import org.openecomp.sdc.ci.tests.utils.general.Convertor;
+import org.openecomp.sdc.ci.tests.utils.general.ElementFactory;
+import org.openecomp.sdc.ci.tests.utils.rest.*;
+import org.openecomp.sdc.ci.tests.utils.validation.AuditValidationUtils;
+import org.openecomp.sdc.ci.tests.utils.validation.ErrorValidationUtils;
+import org.openecomp.sdc.ci.tests.utils.validation.ResourceValidationUtils;
+import org.openecomp.sdc.ci.tests.utils.validation.UserValidationUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.testng.AssertJUnit;
+import org.testng.annotations.BeforeMethod;
+import org.testng.annotations.Test;
+
+import java.util.*;
+import java.util.Map.Entry;
+
+import static org.testng.AssertJUnit.*;
+
+/**
+ * @author alitvinsky
+ *
+ */
+public class ActivateDeActivateDeleteUser extends ComponentBaseTest {
+	private static Logger logger = LoggerFactory.getLogger(ActivateDeActivateDeleteUser.class.getName());
+	protected Gson gson = new Gson();
+	protected User sdncAdminUser;
+
+	@BeforeMethod
+	public void init() {
+		sdncAdminUser = ElementFactory.getDefaultUser(UserRoleEnum.ADMIN);
+
+	}
+
+	@Rule
+	public static TestName name = new TestName();
+
+	@Test
+	public void authorizeDeActivatedUser() throws Exception {
+
+		User sdncUserDetails = getDefaultUserDetails();
+
+		try {
+
+			UserRestUtils.deleteUser(sdncUserDetails, sdncAdminUser, true);
+			DbUtils.cleanAllAudits();
+
+			RestResponse createUserResponse = UserRestUtils.createUser(sdncUserDetails, sdncAdminUser);
+			validateSuccessCreateUserResponse(sdncUserDetails, createUserResponse);
+
+			// deActivate created user
+			RestResponse deActivateUserResponse = UserRestUtils.deActivateUser(sdncUserDetails, sdncAdminUser);
+			sdncUserDetails.setStatus(UserStatusEnum.INACTIVE);
+			validateSuccessDeActivateUserResponse(sdncUserDetails, deActivateUserResponse);
+
+			ErrorInfo errorInfo = ErrorValidationUtils.parseErrorConfigYaml(ActionStatus.USER_INACTIVE.name());
+			RestResponse getUserResponse = UserRestUtils.getUser(sdncUserDetails, sdncAdminUser);
+
+			AssertJUnit.assertEquals("Check response code after deActive user", errorInfo.getCode(),
+					getUserResponse.getErrorCode());
+
+			List<String> variables = Arrays.asList(sdncUserDetails.getUserId());
+			ErrorValidationUtils.checkBodyResponseOnError(ActionStatus.USER_INACTIVE.name(), variables,
+					getUserResponse.getResponse());
+
+			// clean audit before authorization test
+			DbUtils.cleanAllAudits();
+
+			// Perform login from WebSeal
+			User sealUserDetails = sdncUserDetails;
+			RestResponse authorizedUserResponse = UserRestUtils.authorizedUserTowardsCatalogBeQA(sealUserDetails);
+
+			// validate response
+
+			ErrorInfo errorInfo2 = ErrorValidationUtils.parseErrorConfigYaml(ActionStatus.RESTRICTED_ACCESS.name());
+
+			AssertJUnit.assertNotNull("check response object is not null after user login", authorizedUserResponse);
+			AssertJUnit.assertNotNull("check error code exists in response after user login",
+					authorizedUserResponse.getErrorCode());
+			AssertJUnit.assertEquals("Check response code after deActive user", errorInfo2.getCode(),
+					authorizedUserResponse.getErrorCode());
+
+			List<String> variables2 = Arrays.asList();
+			ErrorValidationUtils.checkBodyResponseOnError(ActionStatus.RESTRICTED_ACCESS.name(), variables2,
+					authorizedUserResponse.getResponse());
+
+			// validate against ES DB
+
+			UserValidationUtils.validateDataAgainstAuditDB_access(sealUserDetails,
+					DbUtils.parseAuditRespByAction("Access"), authorizedUserResponse, errorInfo2, variables2);
+
+		} finally {
+			UserRestUtils.deleteUser(sdncUserDetails, sdncAdminUser, true);
+		}
+
+	}
+
+	public User getDefaultUserDetails() {
+
+		String httpCspUserId = "km2000";
+		String userFirstName = "Kot";
+		String userLastName = "May";
+		String email = "km2000@intl.sdc.com";
+		String role = UserRoleEnum.ADMIN.name();
+		User sdncUserDetails = new User(userFirstName, userLastName, httpCspUserId, email, role, null);
+
+		return sdncUserDetails;
+	}
+
+	public void validateSuccessCreateUserResponse(User sdncUserDetails, RestResponse createUserResponse)
+			throws Exception {
+
+		AssertJUnit.assertNotNull("check response object is not null after create user", createUserResponse);
+		AssertJUnit.assertNotNull("check error code exists in response after create user",
+				createUserResponse.getErrorCode());
+		AssertJUnit.assertEquals("Check response code after create user", HttpStatus.SC_CREATED,
+				createUserResponse.getErrorCode().intValue());
+
+		UserValidationUtils.validateUserDetailsOnResponse(sdncUserDetails, createUserResponse.getResponse());
+		// UserRestUtils.validateAddUserAuditMessage(sdncUserDetails,
+		// sdncAdminUser, String.valueOf(HttpStatus.SC_CREATED),
+		// UserResponseMessageEnum.SUCCESS_MESSAGE.getValue(),
+		// UserRestUtils.getAddUserAuditMessage("AddUser"));
+		String addUser = "AddUser";
+		ExpectedUserCRUDAudit constructFieldsForAuditValidation = Convertor.constructFieldsForAuditValidation(addUser,
+				sdncAdminUser, ActionStatus.CREATED, sdncUserDetails, null);
+		AuditValidationUtils.validateAddUserAudit(constructFieldsForAuditValidation, addUser);
+
+		RestResponse getUserResponse = UserRestUtils.getUser(sdncUserDetails, sdncAdminUser);
+		UserValidationUtils.validateUserDetailsOnResponse(sdncUserDetails, getUserResponse.getResponse());
+
+	}
+
+	public void validateSuccessDeActivateUserResponse(User sdncUserDetails, RestResponse deActivateUserResponse)
+			throws Exception {
+
+		AssertJUnit.assertNotNull("check response object is not null after deActive user", deActivateUserResponse);
+		AssertJUnit.assertNotNull("check error code exists in response after deActive user",
+				deActivateUserResponse.getErrorCode());
+		AssertJUnit.assertEquals("Check response code after deActive user", 200,
+				deActivateUserResponse.getErrorCode().intValue());
+
+		UserValidationUtils.validateUserDetailsOnResponse(sdncUserDetails, deActivateUserResponse.getResponse());
+
+		String deleteUser = "DeleteUser";
+		ExpectedUserCRUDAudit constructFieldsForAuditValidation = Convertor
+				.constructFieldsForAuditValidation(deleteUser, sdncAdminUser, ActionStatus.OK, null, sdncUserDetails);
+		AuditValidationUtils.validateAddUserAudit(constructFieldsForAuditValidation, deleteUser);
+
+	}
+
+	// US498322 - Add Status Field to USER
+
+	@Test
+	public void createNewUser() throws Exception {
+
+		User sdncUserDetails = getDefaultUserDetails();
+		try {
+
+			UserRestUtils.deleteUser(sdncUserDetails, sdncAdminUser, true);
+			DbUtils.cleanAllAudits();
+
+			RestResponse createUserResponse = UserRestUtils.createUser(sdncUserDetails, sdncAdminUser);
+			validateSuccessCreateUserResponse(sdncUserDetails, createUserResponse);
+
+		} finally {
+			UserRestUtils.deleteUser(sdncUserDetails, sdncAdminUser, true);
+		}
+
+	}
+
+	@Test
+	public void createDefaultUser() throws Exception {
+
+		User sdncUserDetails = getDefaultUserDetails();
+		sdncUserDetails.setFirstName(null);
+		sdncUserDetails.setLastName(null);
+		sdncUserDetails.setEmail(null);
+		sdncUserDetails.setRole(null);
+
+		try {
+
+			UserRestUtils.deleteUser(sdncUserDetails, sdncAdminUser, true);
+			DbUtils.cleanAllAudits();
+
+			RestResponse createUserResponse = UserRestUtils.createUser(sdncUserDetails, sdncAdminUser);
+			validateSuccessCreateUserResponse(sdncUserDetails, createUserResponse);
+
+		} finally {
+			UserRestUtils.deleteUser(sdncUserDetails, sdncAdminUser, true);
+		}
+
+	}
+
+	@Test
+	public void createTesterUser() throws Exception {
+
+		User sdncUserDetails = getDefaultUserDetails();
+		sdncUserDetails.setLastName(null);
+		sdncUserDetails.setRole(UserRoleEnum.TESTER.name());
+
+		try {
+
+			UserRestUtils.deleteUser(sdncUserDetails, sdncAdminUser, true);
+			DbUtils.cleanAllAudits();
+
+			RestResponse createUserResponse = UserRestUtils.createUser(sdncUserDetails, sdncAdminUser);
+			validateSuccessCreateUserResponse(sdncUserDetails, createUserResponse);
+
+		} finally {
+			UserRestUtils.deleteUser(sdncUserDetails, sdncAdminUser, true);
+		}
+
+	}
+
+	@Test
+	public void deActivateCreatedAdminUser() throws Exception {
+
+		User sdncUserDetails = getDefaultUserDetails();
+
+		try {
+
+			UserRestUtils.deleteUser(sdncUserDetails, sdncAdminUser, true);
+			DbUtils.cleanAllAudits();
+
+			RestResponse createUserResponse = UserRestUtils.createUser(sdncUserDetails, sdncAdminUser);
+			validateSuccessCreateUserResponse(sdncUserDetails, createUserResponse);
+
+			// deActivate created user
+			RestResponse deActivateUserResponse = UserRestUtils.deActivateUser(sdncUserDetails, sdncAdminUser);
+			sdncUserDetails.setStatus(UserStatusEnum.INACTIVE);
+			validateSuccessDeActivateUserResponse(sdncUserDetails, deActivateUserResponse);
+
+			ErrorInfo errorInfo = ErrorValidationUtils.parseErrorConfigYaml(ActionStatus.USER_INACTIVE.name());
+
+			RestResponse getUserResponse = UserRestUtils.getUser(sdncUserDetails, sdncAdminUser);
+
+			assertEquals("Check response code after get user", errorInfo.getCode(), getUserResponse.getErrorCode());
+
+			List<String> variables = Arrays.asList(sdncUserDetails.getUserId());
+			ErrorValidationUtils.checkBodyResponseOnError(ActionStatus.USER_INACTIVE.name(), variables,
+					getUserResponse.getResponse());
+
+		} finally {
+			UserRestUtils.deleteUser(sdncUserDetails, sdncAdminUser, true);
+		}
+
+	}
+
+	@Test
+	public void deActivateTheSameUserTwice() throws Exception {
+
+		User sdncUserDetails = getDefaultUserDetails();
+
+		try {
+
+			UserRestUtils.deleteUser(sdncUserDetails, sdncAdminUser, true);
+			DbUtils.cleanAllAudits();
+
+			RestResponse createUserResponse = UserRestUtils.createUser(sdncUserDetails, sdncAdminUser);
+			validateSuccessCreateUserResponse(sdncUserDetails, createUserResponse);
+
+			// deActivate created user
+			RestResponse deActivateUserResponse = UserRestUtils.deActivateUser(sdncUserDetails, sdncAdminUser);
+			sdncUserDetails.setStatus(UserStatusEnum.INACTIVE);
+			validateSuccessDeActivateUserResponse(sdncUserDetails, deActivateUserResponse);
+
+			ErrorInfo errorInfo = ErrorValidationUtils.parseErrorConfigYaml(ActionStatus.USER_INACTIVE.name());
+
+			RestResponse getUserResponse = UserRestUtils.getUser(sdncUserDetails, sdncAdminUser);
+
+			assertEquals("Check response code after deActive user", errorInfo.getCode(),
+					getUserResponse.getErrorCode());
+
+			List<String> variables = Arrays.asList(sdncUserDetails.getUserId());
+			ErrorValidationUtils.checkBodyResponseOnError(ActionStatus.USER_INACTIVE.name(), variables,
+					getUserResponse.getResponse());
+
+			// deActivate the same user once time more
+			RestResponse deActivateUserResponse2 = UserRestUtils.deActivateUser(sdncUserDetails, sdncAdminUser);
+			ErrorInfo errorInfo2 = ErrorValidationUtils.parseErrorConfigYaml(ActionStatus.USER_INACTIVE.name());
+			assertEquals("Check response code after deActive user", errorInfo2.getCode(),
+					deActivateUserResponse2.getErrorCode());
+
+			List<String> variables2 = Arrays.asList(sdncUserDetails.getUserId());
+			ErrorValidationUtils.checkBodyResponseOnError(ActionStatus.USER_INACTIVE.name(), variables2,
+					deActivateUserResponse2.getResponse());
+
+		} finally {
+			UserRestUtils.deleteUser(sdncUserDetails, sdncAdminUser, true);
+		}
+
+	}
+
+	@Test
+	public void createAgainDeActivatedUser() throws Exception {
+
+		User sdncUserDetails = getDefaultUserDetails();
+
+		try {
+
+			UserRestUtils.deleteUser(sdncUserDetails, sdncAdminUser, true);
+			DbUtils.cleanAllAudits();
+
+			RestResponse createUserResponse = UserRestUtils.createUser(sdncUserDetails, sdncAdminUser);
+			validateSuccessCreateUserResponse(sdncUserDetails, createUserResponse);
+
+			// deActivate created user
+			RestResponse deActivateUserResponse = UserRestUtils.deActivateUser(sdncUserDetails, sdncAdminUser);
+			sdncUserDetails.setStatus(UserStatusEnum.INACTIVE);
+			validateSuccessDeActivateUserResponse(sdncUserDetails, deActivateUserResponse);
+
+			ErrorInfo errorInfo = ErrorValidationUtils.parseErrorConfigYaml(ActionStatus.USER_INACTIVE.name());
+			RestResponse getUserResponse = UserRestUtils.getUser(sdncUserDetails, sdncAdminUser);
+
+			assertEquals("Check response code after deActive user", errorInfo.getCode(),
+					getUserResponse.getErrorCode());
+
+			List<String> variables = Arrays.asList(sdncUserDetails.getUserId());
+			ErrorValidationUtils.checkBodyResponseOnError(ActionStatus.USER_INACTIVE.name(), variables,
+					getUserResponse.getResponse());
+
+			// create the user with the same UserId(details) as deActivated user
+			DbUtils.cleanAllAudits();
+
+			RestResponse createUserResponse2 = UserRestUtils.createUser(sdncUserDetails, sdncAdminUser);
+			ErrorInfo errorInfo2 = ErrorValidationUtils.parseErrorConfigYaml(ActionStatus.USER_INACTIVE.name());
+			assertEquals("Check response code after deActive user", errorInfo2.getCode(),
+					createUserResponse2.getErrorCode());
+
+			List<String> variables2 = Arrays.asList(sdncUserDetails.getUserId());
+			ErrorValidationUtils.checkBodyResponseOnError(ActionStatus.USER_INACTIVE.name(), variables2,
+					createUserResponse2.getResponse());
+
+		} finally {
+			UserRestUtils.deleteUser(sdncUserDetails, sdncAdminUser, true);
+		}
+
+	}
+
+	// very not recommend to run this test, resources/services may be zombie
+	// @Test
+	public void deActivateLastAdminUser() throws Exception {
+
+		try {
+
+			// send get all ADMIN user request toward BE
+			RestResponse getAllAdminUsers = UserRestUtils.getAllAdminUsers(sdncAdminUser);
+
+			assertNotNull("check response object is not null after create user", getAllAdminUsers);
+			assertNotNull("check error code exists in response after create user", getAllAdminUsers.getErrorCode());
+			assertEquals("Check response code after create user", 200, getAllAdminUsers.getErrorCode().intValue());
+
+			TypeToken<List<User>> typeToken = new TypeToken<List<User>>() {
+			};
+			List<User> listOfUsersOnResponse = gson.fromJson(getAllAdminUsers.getResponse(), typeToken.getType());
+			logger.debug("listOfUsers: {}", listOfUsersOnResponse);
+
+			// build map of all Admin users from listOfUsersOnResponse from
+			// response
+			Map<String, User> mapAllUsersOnResponse = new HashMap<String, User>();
+			for (User sdncUser : listOfUsersOnResponse) {
+				mapAllUsersOnResponse.put(sdncUser.getUserId(), sdncUser);
+			}
+
+			// remove from mapAllUsersOnResponse map one of admin users
+			mapAllUsersOnResponse.remove(sdncAdminUser.getUserId());
+			logger.debug("map Of all Admin users exclude one : {}", mapAllUsersOnResponse);
+
+			// deActivate all Admin users from the userIdAllAdminList list
+			for (Entry<String, User> entry : mapAllUsersOnResponse.entrySet()) {
+				UserRestUtils.deActivateUser(entry.getValue(), sdncAdminUser);
+			}
+
+			// deActivate last Admin user user
+			RestResponse deActivateUserResponse = UserRestUtils.deActivateUser(sdncAdminUser, sdncAdminUser);
+
+			ErrorInfo errorInfo = ErrorValidationUtils
+					.parseErrorConfigYaml(ActionStatus.DELETE_USER_ADMIN_CONFLICT.name());
+
+			assertEquals("Check response code after deActive user", errorInfo.getCode(),
+					deActivateUserResponse.getErrorCode());
+
+			List<String> variables = Arrays.asList();
+			ErrorValidationUtils.checkBodyResponseOnError(ActionStatus.DELETE_USER_ADMIN_CONFLICT.name(), variables,
+					deActivateUserResponse.getResponse());
+
+		} finally {
+			// UserRestUtils.deleteUser(UserRestUtils.getAdminDetails2(),
+			// sdncAdminUser);
+			// UserRestUtils.deleteUser(UserRestUtils.getAdminDetails3(),
+			// sdncAdminUser);
+			// UserRestUtils.createUser(UserRestUtils.getAdminDetails2(),
+			// sdncAdminUser);
+			// UserRestUtils.createUser(UserRestUtils.getAdminDetails3(),
+			// sdncAdminUser);
+		}
+
+	}
+
+	// test check the resource accessibility via catalog view, resource was
+	// created by user which was deActivated
+
+	@Test
+	public void resourceAccessibility() throws Exception {
+
+		User sdncUserDetails = getDefaultUserDetails();
+		ResourceReqDetails resourceDetails = ElementFactory.getDefaultResource("tosca.nodes.newresource4test4",
+				NormativeTypesEnum.ROOT, ResourceCategoryEnum.GENERIC_INFRASTRUCTURE, "jh0003");
+		String resourceBaseVersion = "0.1";
+
+		try {
+			// Delete resource
+			// resourceUtils.deleteResource_allVersions(resourceDetails,
+			// sdncAdminUser);
+			UserRestUtils.deleteUser(sdncUserDetails, sdncAdminUser, true);
+
+			DbUtils.cleanAllAudits();
+			RestResponse createUserResponse = UserRestUtils.createUser(sdncUserDetails, sdncAdminUser);
+			validateSuccessCreateUserResponse(sdncUserDetails, createUserResponse);
+
+			// ------------------------Start create
+			// resource---------------------------------------------------------------------------------
+
+			// create resource
+			RestResponse createResponse = ResourceRestUtils.createResource(resourceDetails, sdncUserDetails);
+			assertEquals("Check response code after create", 201, createResponse.getErrorCode().intValue());
+
+			Resource createdResource = ResponseParser.convertResourceResponseToJavaObject(createResponse.getResponse());
+
+			RestResponse resourceGetResponse = ResourceRestUtils.getResource(sdncUserDetails,
+					createdResource.getUniqueId());
+			assertEquals("Check response code after get", 200, resourceGetResponse.getErrorCode().intValue());
+
+			// validate get response
+			ResourceRespJavaObject resourceRespJavaObject = Convertor.constructFieldsForRespValidation(resourceDetails,
+					resourceBaseVersion);
+			resourceRespJavaObject.setLifecycleState((LifecycleStateEnum.NOT_CERTIFIED_CHECKOUT).toString());
+			resourceRespJavaObject.setAbstractt("false");
+			resourceRespJavaObject.setCreatorUserId(sdncUserDetails.getUserId());
+			resourceRespJavaObject.setLastUpdaterUserId(sdncUserDetails.getUserId());
+
+			resourceRespJavaObject
+					.setCreatorFullName(sdncUserDetails.getFirstName() + " " + sdncUserDetails.getLastName());
+			resourceRespJavaObject
+					.setLastUpdaterFullName(sdncUserDetails.getFirstName() + " " + sdncUserDetails.getLastName());
+
+			ResourceValidationUtils.validateResp(resourceGetResponse, resourceRespJavaObject);
+
+			// ------------------------End create
+			// resource---------------------------------------------------------------------------------
+
+			// clean audit before authorization test
+			DbUtils.cleanAllAudits();
+
+			// deActivate created user
+			RestResponse deActivateUserResponse = UserRestUtils.deActivateUser(sdncUserDetails, sdncAdminUser);
+			sdncUserDetails.setStatus(UserStatusEnum.INACTIVE);
+			validateSuccessDeActivateUserResponse(sdncUserDetails, deActivateUserResponse);
+
+			UserValidationUtils.validateDeleteUserAuditMessage(sdncUserDetails, sdncAdminUser, "200",
+					UserResponseMessageEnum.SUCCESS_MESSAGE.getValue(),
+					UserValidationUtils.getAddUserAuditMessage("DeleteUser"));
+
+			ErrorInfo errorInfo = ErrorValidationUtils.parseErrorConfigYaml(ActionStatus.USER_INACTIVE.name());
+			RestResponse getUserResponse = UserRestUtils.getUser(sdncUserDetails, sdncAdminUser);
+
+			assertEquals("Check response code after deActive user", errorInfo.getCode(),
+					getUserResponse.getErrorCode());
+
+			List<String> variables = Arrays.asList(sdncUserDetails.getUserId());
+			ErrorValidationUtils.checkBodyResponseOnError(ActionStatus.USER_INACTIVE.name(), variables,
+					getUserResponse.getResponse());
+
+			// checking if created resource is accessible
+			DbUtils.cleanAllAudits();
+
+			RestResponse getCatalogDataResponse = CatalogRestUtils.getCatalog(sdncAdminUser.getUserId());
+
+			// validate response
+
+			assertNotNull("check response object is not null after user login", getCatalogDataResponse);
+			assertNotNull("check error code exists in response after user login",
+					getCatalogDataResponse.getErrorCode());
+			assertEquals("Check response code after deActive user", 200,
+					getCatalogDataResponse.getErrorCode().intValue());
+
+			// expected resource list
+			List<String> resourceExpectedUniqIdList = new ArrayList<String>();
+			resourceExpectedUniqIdList.add(resourceDetails.getUniqueId());
+			logger.debug("resourceExpectedUniqIdList: {}", resourceExpectedUniqIdList);
+
+			compareResourceUniqIdList(getCatalogDataResponse.getResponse(), resourceExpectedUniqIdList, true);
+
+		} finally {
+			// resourceUtils.deleteResource_allVersions(resourceDetails,
+			// sdncAdminUser);
+			UserRestUtils.deleteUser(sdncUserDetails, sdncAdminUser, true);
+		}
+
+	}
+
+	// test check the resource accessibility via catalog view, resource was
+	// created by user which was deActivated
+
+	@Test
+	public void resourceAccessibilityOnImport() throws Exception {
+
+		User sdncUserDetails = getDefaultUserDetails();
+		ResourceReqDetails resourceDetails = ElementFactory.getDefaultResource("importResource4test",
+				NormativeTypesEnum.ROOT, ResourceCategoryEnum.NETWORK_L2_3_ROUTERS, "jh0003");
+		resourceDetails.addCategoryChain(ResourceCategoryEnum.GENERIC_DATABASE.getCategory(),
+				ResourceCategoryEnum.GENERIC_DATABASE.getSubCategory());
+		// String resourceBaseVersion = "1.0";
+
+		try {
+			// Delete resource
+			// resourceUtils.deleteResource_allVersions(resourceDetails,
+			// sdncAdminUser);
+			RestResponse deleteUserResponse = UserRestUtils.deleteUser(sdncUserDetails, sdncAdminUser, true);
+			assertTrue("delete user request failed",
+					deleteUserResponse.getErrorCode() == 200 || deleteUserResponse.getErrorCode() == 404);
+			DbUtils.cleanAllAudits();
+			RestResponse createUserResponse = UserRestUtils.createUser(sdncUserDetails, sdncAdminUser);
+			validateSuccessCreateUserResponse(sdncUserDetails, createUserResponse);
+
+			// ------------------------Start import
+			// resource---------------------------------------------------------------------------------
+
+			// import new resource with CERTIFIED state
+			User importer = ElementFactory.getDefaultUser(UserRoleEnum.ADMIN2);
+			RestResponse importResponse = ImportRestUtils.importResourceByName(resourceDetails, importer);
+
+			assertNotNull("check response object is not null after create user", importResponse);
+			assertNotNull("check error code exists in response after create user", importResponse.getErrorCode());
+			assertEquals("Check response code after create user", 201, importResponse.getErrorCode().intValue());
+
+			// ------------------------End import
+			// resource---------------------------------------------------------------------------------
+
+			// clean audit before authorization test
+			DbUtils.cleanAllAudits();
+
+			// deActivate created user
+			RestResponse deActivateUserResponse = UserRestUtils.deActivateUser(sdncUserDetails, sdncAdminUser);
+			sdncUserDetails.setStatus(UserStatusEnum.INACTIVE);
+			validateSuccessDeActivateUserResponse(sdncUserDetails, deActivateUserResponse);
+
+			UserValidationUtils.validateDeleteUserAuditMessage(sdncUserDetails, sdncAdminUser, "200",
+					UserResponseMessageEnum.SUCCESS_MESSAGE.getValue(),
+					UserValidationUtils.getAddUserAuditMessage("DeleteUser"));
+
+			ErrorInfo errorInfo = ErrorValidationUtils.parseErrorConfigYaml(ActionStatus.USER_INACTIVE.name());
+			RestResponse getUserResponse = UserRestUtils.getUser(sdncUserDetails, sdncAdminUser);
+
+			assertEquals("Check response code after deActive user", errorInfo.getCode(),
+					getUserResponse.getErrorCode());
+
+			List<String> variables = Arrays.asList(sdncUserDetails.getUserId());
+			ErrorValidationUtils.checkBodyResponseOnError(ActionStatus.USER_INACTIVE.name(), variables,
+					getUserResponse.getResponse());
+
+			// checking if created resource is accessible
+			DbUtils.cleanAllAudits();
+
+			RestResponse getCatalogDataResponse = CatalogRestUtils.getCatalog(sdncAdminUser.getUserId());
+
+			// validate response
+
+			assertNotNull("check response object is not null after user login", getCatalogDataResponse);
+			assertNotNull("check error code exists in response after user login",
+					getCatalogDataResponse.getErrorCode());
+			assertEquals("Check response code after deActive user", 200,
+					getCatalogDataResponse.getErrorCode().intValue());
+
+			// expected resource list
+			List<String> resourceExpectedUniqIdList = new ArrayList<String>();
+			resourceExpectedUniqIdList.add(resourceDetails.getUniqueId());
+			logger.debug("resourceExpectedUniqIdList: {}", resourceExpectedUniqIdList);
+
+			compareResourceUniqIdList(getCatalogDataResponse.getResponse(), resourceExpectedUniqIdList, true);
+
+		} finally {
+			// resourceUtils.deleteResource_allVersions(resourceDetails,
+			// sdncAdminUser);
+			UserRestUtils.deleteUser(sdncUserDetails, sdncAdminUser, true);
+		}
+
+	}
+
+	public void compareServiceUniqIdList(String response, List<String> expectedList, boolean flag) {
+
+		JsonElement jelement = new JsonParser().parse(response);
+		JsonObject jobject = jelement.getAsJsonObject();
+		JsonArray serviceArray = (JsonArray) jobject.get("services");
+		logger.debug("{}", serviceArray);
+		assertTrue("expected service count: " + expectedList.size() + " or more" + ", actual: " + serviceArray.size(),
+				serviceArray.size() >= expectedList.size());
+
+		// build service list from response
+		List<ServiceReqDetails> serviceReqDetailsListOnResponse = new ArrayList<ServiceReqDetails>();
+		for (int i = 0; i < serviceArray.size(); i++) {
+			ServiceReqDetails json = gson.fromJson(serviceArray.get(i), ServiceReqDetails.class);
+			serviceReqDetailsListOnResponse.add(json);
+		}
+	}
+
+	public void compareResourceUniqIdList(String response, List<String> expectedList, boolean flag) {
+
+		JsonElement jelement = new JsonParser().parse(response);
+		JsonObject jobject = jelement.getAsJsonObject();
+		JsonArray resourceArray = (JsonArray) jobject.get("resources");
+		logger.debug("{}", resourceArray);
+		assertTrue("expected resource count: " + expectedList.size() + " or more" + ", actual: " + resourceArray.size(),
+				resourceArray.size() >= expectedList.size());
+
+		// build resource list from response
+		List<ResourceReqDetails> resourceReqDetailsListOnResponse = new ArrayList<ResourceReqDetails>();
+		for (int i = 0; i < resourceArray.size(); i++) {
+			ResourceReqDetails json = gson.fromJson(resourceArray.get(i), ResourceReqDetails.class);
+			resourceReqDetailsListOnResponse.add(json);
+		}
+
+		logger.debug("ResourceReqDetails list on response: {}", resourceReqDetailsListOnResponse);
+
+		List<String> resourceActualUniqIdList = new ArrayList<String>();
+		for (ResourceReqDetails resource : resourceReqDetailsListOnResponse) {
+			resourceActualUniqIdList.add(resource.getUniqueId());
+		}
+		logger.debug("resourceActualUniqIdList on response: {}", resourceActualUniqIdList);
+		logger.debug("resourceExpectedUniqIdList on response: {}", expectedList);
+
+		if (flag) {
+			assertTrue("actual list does not contain expected list",
+					resourceActualUniqIdList.containsAll(expectedList));
+		} else {
+			assertFalse("actual list contains non expected list elements",
+					resourceActualUniqIdList.containsAll(expectedList));
+		}
+	}
+
+	// public User getDefaultUserDetails(){
+	//
+	// String userFirstName = "Kot";
+	// String userLastName = "May";
+	// String role = UserRoleEnum.ADMIN.name();
+	// User sdncUserDetails = new User(userFirstName, userLastName,
+	// httpCspUserId, email, role,null);
+	//
+	// return sdncUserDetails;
+	// }
+	//
+	// public void validateSuccessCreateUserResponse(User sdncUserDetails,
+	// RestResponse createUserResponse) throws Exception{
+	//
+	// assertNotNull("check response object is not null after create user",
+	// createUserResponse);
+	// assertNotNull("check error code exists in response after create user",
+	// createUserResponse.getErrorCode());
+	// assertEquals("Check response code after create user",
+	// HttpStatus.SC_CREATED, createUserResponse.getErrorCode().intValue());
+	//
+	// UserRestUtils.validateUserDetailsOnResponse(sdncUserDetails,
+	// createUserResponse.getResponse());
+	// UserRestUtils.validateAddUserAuditMessage(sdncUserDetails, sdncAdminUser,
+	// String.valueOf(HttpStatus.SC_CREATED),
+	// UserResponseMessageEnum.SUCCESS_MESSAGE.getValue(),
+	// UserRestUtils.getAddUserAuditMessage("AddUser"));
+	// RestResponse getUserResponse = UserRestUtils.getUser(sdncUserDetails,
+	// sdncAdminUser);
+	// UserRestUtils.validateUserDetailsOnResponse(sdncUserDetails,
+	// getUserResponse.getResponse());
+	//
+	// }
+	//
+	// public void validateSuccessDeActivateUserResponse(User sdncUserDetails,
+	// RestResponse deActivateUserResponse) throws Exception{
+	//
+	// assertNotNull("check response object is not null after deActive user",
+	// deActivateUserResponse);
+	// assertNotNull("check error code exists in response after deActive user",
+	// deActivateUserResponse.getErrorCode());
+	// assertEquals("Check response code after deActive user", 200,
+	// deActivateUserResponse.getErrorCode().intValue());
+	//
+	// UserRestUtils.validateUserDetailsOnResponse(sdncUserDetails,
+	// deActivateUserResponse.getResponse());
+	// UserRestUtils.validateDeleteUserAuditMessage(sdncUserDetails,
+	// sdncAdminUser, "200", UserResponseMessageEnum.SUCCESS_MESSAGE.getValue(),
+	// UserRestUtils.getAddUserAuditMessage("DeleteUser"));
+	//
+
+}
diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/preRequisites/ComplexResourceBaseTest.java b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/preRequisites/ComplexResourceBaseTest.java
new file mode 100644
index 0000000000..7ad9024cdf
--- /dev/null
+++ b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/preRequisites/ComplexResourceBaseTest.java
@@ -0,0 +1,166 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * SDC
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.sdc.ci.tests.preRequisites;
+
+import org.junit.Rule;
+import org.junit.rules.TestName;
+import org.openecomp.sdc.be.datatypes.enums.ResourceTypeEnum;
+import org.openecomp.sdc.be.model.Resource;
+import org.openecomp.sdc.be.model.User;
+import org.openecomp.sdc.ci.tests.api.ComponentBaseTest;
+import org.openecomp.sdc.ci.tests.datatypes.ArtifactReqDetails;
+import org.openecomp.sdc.ci.tests.datatypes.ComponentInstanceReqDetails;
+import org.openecomp.sdc.ci.tests.datatypes.ResourceReqDetails;
+import org.openecomp.sdc.ci.tests.datatypes.ServiceReqDetails;
+import org.openecomp.sdc.ci.tests.datatypes.enums.ArtifactTypeEnum;
+import org.openecomp.sdc.ci.tests.datatypes.enums.LifeCycleStatesEnum;
+import org.openecomp.sdc.ci.tests.datatypes.enums.UserRoleEnum;
+import org.openecomp.sdc.ci.tests.datatypes.http.RestResponse;
+import org.openecomp.sdc.ci.tests.execute.lifecycle.LCSbaseTest;
+import org.openecomp.sdc.ci.tests.utils.general.ElementFactory;
+import org.openecomp.sdc.ci.tests.utils.rest.*;
+import org.testng.annotations.BeforeMethod;
+
+import java.io.IOException;
+
+import static org.testng.AssertJUnit.*;
+
+public class ComplexResourceBaseTest extends ComponentBaseTest {
+
+	protected ServiceReqDetails serviceDetails;
+	protected ResourceReqDetails resourceDetailsVFC;
+	protected ResourceReqDetails resourceDetailsVL;
+	protected ResourceReqDetails resourceDetailsVF;
+	protected ResourceReqDetails resourceDetailsCP;
+	protected ComponentInstanceReqDetails resourceInstanceReqDetailsVF;
+	protected ComponentInstanceReqDetails resourceInstanceReqDetailsVFC;
+	protected ComponentInstanceReqDetails resourceInstanceReqDetailsVL;
+	protected ComponentInstanceReqDetails resourceInstanceReqDetailsCP;
+	protected User sdncDesignerDetails1;
+	protected User sdncTesterDeatails1;
+	protected User sdncAdminDetails1;
+	protected ArtifactReqDetails heatArtifactDetails;
+
+	protected ArtifactReqDetails defaultArtifactDetails;
+	protected int maxLength = 50;
+	protected Resource resourceVF = null;
+
+	@Rule
+	public static TestName name = new TestName();
+
+	@BeforeMethod
+	public void before() throws Exception {
+
+		initializeMembers();
+
+		createComponents();
+
+	}
+
+	public void initializeMembers() throws IOException, Exception {
+
+		serviceDetails = ElementFactory.getDefaultService();
+		resourceDetailsVFC = ElementFactory.getDefaultResourceByType(ResourceTypeEnum.VFC, "resourceVFC");
+		resourceDetailsVF = ElementFactory.getDefaultResourceByType(ResourceTypeEnum.VF, "resourceVF3");
+		resourceDetailsVL = ElementFactory.getDefaultResourceByType(ResourceTypeEnum.VL, "resourceVL");
+		resourceDetailsCP = ElementFactory.getDefaultResourceByType(ResourceTypeEnum.CP, "resourceCP");
+		sdncDesignerDetails1 = ElementFactory.getDefaultUser(UserRoleEnum.DESIGNER);
+		sdncTesterDeatails1 = ElementFactory.getDefaultUser(UserRoleEnum.TESTER);
+		sdncAdminDetails1 = ElementFactory.getDefaultUser(UserRoleEnum.ADMIN);
+		heatArtifactDetails = ElementFactory.getDefaultDeploymentArtifactForType(ArtifactTypeEnum.HEAT.getType());
+
+	}
+
+	protected void createComponents() throws Exception {
+
+		RestResponse response = ServiceRestUtils.createService(serviceDetails, sdncDesignerDetails1);
+		assertTrue("create request returned status:" + response.getErrorCode(), response.getErrorCode() == 201);
+		assertNotNull("service uniqueId is null:", serviceDetails.getUniqueId());
+
+		response = ResourceRestUtils.createResource(resourceDetailsVFC, sdncDesignerDetails1);
+		assertTrue("create request returned status:" + response.getErrorCode(), response.getErrorCode() == 201);
+		assertNotNull("resource uniqueId is null:", resourceDetailsVFC.getUniqueId());
+		response = LifecycleRestUtils.changeResourceState(resourceDetailsVFC, sdncDesignerDetails1,
+				resourceDetailsVFC.getVersion(), LifeCycleStatesEnum.CHECKIN);
+		assertTrue("change LS state to CHECKIN, returned status:" + response.getErrorCode(),
+				response.getErrorCode() == 200);
+
+		response = ResourceRestUtils.createResource(resourceDetailsVF, sdncDesignerDetails1);
+		assertTrue("create request returned status:" + response.getErrorCode(), response.getErrorCode() == 201);
+		assertNotNull("resource uniqueId is null:", resourceDetailsVF.getUniqueId());
+
+		response = ResourceRestUtils.createResource(resourceDetailsCP, sdncDesignerDetails1);
+		assertTrue("create request returned status:" + response.getErrorCode(), response.getErrorCode() == 201);
+		assertNotNull("resource uniqueId is null:", resourceDetailsCP.getUniqueId());
+		response = LifecycleRestUtils.changeResourceState(resourceDetailsCP, sdncDesignerDetails1,
+				resourceDetailsCP.getVersion(), LifeCycleStatesEnum.CHECKIN);
+		assertTrue("change LS state to CHECKIN, returned status:" + response.getErrorCode(),
+				response.getErrorCode() == 200);
+
+		response = ResourceRestUtils.createResource(resourceDetailsVL, sdncDesignerDetails1);
+		assertTrue("create request returned status:" + response.getErrorCode(), response.getErrorCode() == 201);
+		assertNotNull("resource uniqueId is null:", resourceDetailsVL.getUniqueId());
+		response = LifecycleRestUtils.changeResourceState(resourceDetailsVL, sdncDesignerDetails1,
+				resourceDetailsVL.getVersion(), LifeCycleStatesEnum.CHECKIN);
+		assertTrue("change LS state to CHECKIN, returned status:" + response.getErrorCode(),
+				response.getErrorCode() == 200);
+
+		resourceInstanceReqDetailsVFC = ElementFactory.getDefaultComponentInstance("VFC", resourceDetailsVFC);
+		resourceInstanceReqDetailsVF = ElementFactory.getDefaultComponentInstance("VF", resourceDetailsVF);
+		resourceInstanceReqDetailsVL = ElementFactory.getDefaultComponentInstance("VL", resourceDetailsVL);
+		resourceInstanceReqDetailsCP = ElementFactory.getDefaultComponentInstance("CP", resourceDetailsCP);
+
+	}
+
+	protected void createVFWithCertifiedResourceInstance(ResourceReqDetails resourceDetails,
+			ComponentInstanceReqDetails resourceInstanceReqDetails) throws Exception {
+
+		RestResponse response = LifecycleRestUtils.changeResourceState(resourceDetails, sdncDesignerDetails1,
+				resourceDetails.getVersion(), LifeCycleStatesEnum.CHECKOUT);
+		assertEquals("Check response code after CHECKOUT", 200, response.getErrorCode().intValue());
+
+		// add heat artifact to resource and certify
+		ArtifactReqDetails heatArtifactDetails = ElementFactory
+				.getDefaultDeploymentArtifactForType(ArtifactTypeEnum.HEAT.getType());
+		response = ArtifactRestUtils.addInformationalArtifactToResource(heatArtifactDetails, sdncDesignerDetails1,
+				resourceDetails.getUniqueId());
+		assertTrue("add HEAT artifact to resource request returned status:" + response.getErrorCode(),
+				response.getErrorCode() == 200);
+		response = LCSbaseTest.certifyResource(resourceDetails, sdncDesignerDetails1);
+		assertEquals("Check response code after CERTIFY request", 200, response.getErrorCode().intValue());
+
+		resourceVF = convertResourceGetResponseToJavaObject(resourceDetailsVF);
+
+		resourceInstanceReqDetails.setComponentUid(resourceDetails.getUniqueId());
+		response = ComponentInstanceRestUtils.createComponentInstance(resourceInstanceReqDetails, sdncDesignerDetails1,
+				resourceVF);
+		assertEquals("Check response code after create RI", 201, response.getErrorCode().intValue());
+
+		resourceVF = convertResourceGetResponseToJavaObject(resourceDetailsVF);
+	}
+
+	protected Resource convertResourceGetResponseToJavaObject(ResourceReqDetails resourceDetails) throws IOException {
+		RestResponse response = ResourceRestUtils.getResource(resourceDetails, sdncDesignerDetails1);
+		assertEquals("Check response code after get resource", 200, response.getErrorCode().intValue());
+		return ResponseParser.convertResourceResponseToJavaObject(response.getResponse());
+	}
+
+}
diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/preRequisites/DownloadArtifactBaseTest.java b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/preRequisites/DownloadArtifactBaseTest.java
new file mode 100644
index 0000000000..13b0dff959
--- /dev/null
+++ b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/preRequisites/DownloadArtifactBaseTest.java
@@ -0,0 +1,117 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * SDC
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.sdc.ci.tests.preRequisites;
+
+
+import org.junit.rules.TestName;
+import org.openecomp.sdc.be.datatypes.enums.ComponentTypeEnum;
+import org.openecomp.sdc.be.model.Service;
+import org.openecomp.sdc.be.model.User;
+import org.openecomp.sdc.ci.tests.api.ComponentBaseTest;
+import org.openecomp.sdc.ci.tests.datatypes.ArtifactReqDetails;
+import org.openecomp.sdc.ci.tests.datatypes.ComponentInstanceReqDetails;
+import org.openecomp.sdc.ci.tests.datatypes.ResourceReqDetails;
+import org.openecomp.sdc.ci.tests.datatypes.ServiceReqDetails;
+import org.openecomp.sdc.ci.tests.datatypes.enums.ArtifactTypeEnum;
+import org.openecomp.sdc.ci.tests.datatypes.enums.UserRoleEnum;
+import org.openecomp.sdc.ci.tests.datatypes.http.RestResponse;
+import org.openecomp.sdc.ci.tests.execute.lifecycle.LCSbaseTest;
+import org.openecomp.sdc.ci.tests.utils.ArtifactUtils;
+import org.openecomp.sdc.ci.tests.utils.DbUtils;
+import org.openecomp.sdc.ci.tests.utils.general.ElementFactory;
+import org.openecomp.sdc.ci.tests.utils.rest.*;
+import org.testng.AssertJUnit;
+import org.testng.annotations.BeforeMethod;
+
+import java.io.IOException;
+
+public class DownloadArtifactBaseTest extends ComponentBaseTest {
+
+	protected ResourceReqDetails downloadResourceDetails;
+	protected ServiceReqDetails serviceDetails;
+	protected ComponentInstanceReqDetails resourceInstanceReqDetails;
+	protected User sdncUserDetails;
+	protected User sdncDesignerDetails1;
+	protected ArtifactReqDetails heatArtifactDetails;
+
+	protected ArtifactReqDetails defaultArtifactDetails;
+
+	protected ArtifactUtils artifactUtils;
+	protected Service service;
+
+	@BeforeMethod
+	public void before() throws Exception {
+
+		initializeMembers();
+		createComponents();
+
+	}
+
+	public void initializeMembers() throws IOException, Exception {
+		downloadResourceDetails = ElementFactory.getDefaultResource();
+		serviceDetails = ElementFactory.getDefaultService();
+		sdncUserDetails = ElementFactory.getDefaultUser(UserRoleEnum.DESIGNER);
+		sdncDesignerDetails1 = ElementFactory.getDefaultUser(UserRoleEnum.DESIGNER);
+		heatArtifactDetails = ElementFactory.getDefaultDeploymentArtifactForType(ArtifactTypeEnum.HEAT.getType());
+		resourceInstanceReqDetails = ElementFactory.getDefaultComponentInstance();
+
+	}
+
+	protected void createComponents() throws Exception {
+
+		RestResponse response = ResourceRestUtils.createResource(downloadResourceDetails, sdncUserDetails);
+		AssertJUnit.assertTrue("create request returned status:" + response.getErrorCode(),
+				response.getErrorCode() == 201);
+		AssertJUnit.assertNotNull("resource uniqueId is null:", downloadResourceDetails.getUniqueId());
+
+		ArtifactReqDetails heatArtifactDetails = ElementFactory
+				.getDefaultDeploymentArtifactForType(ArtifactTypeEnum.HEAT.getType());
+		response = ArtifactRestUtils.addInformationalArtifactToResource(heatArtifactDetails, sdncUserDetails,
+				downloadResourceDetails.getUniqueId());
+		AssertJUnit.assertTrue("add HEAT artifact to resource request returned status:" + response.getErrorCode(),
+				response.getErrorCode() == 200);
+
+		// certified resource
+		response = LCSbaseTest.certifyResource(downloadResourceDetails, sdncDesignerDetails1);
+		AssertJUnit.assertTrue("certify resource request returned status:" + response.getErrorCode(),
+				response.getErrorCode() == 200);
+
+		response = ServiceRestUtils.createService(serviceDetails, sdncUserDetails);
+		AssertJUnit.assertTrue("create request returned status:" + response.getErrorCode(),
+				response.getErrorCode() == 201);
+		AssertJUnit.assertNotNull("service uniqueId is null:", serviceDetails.getUniqueId());
+
+		// add resource instance with HEAT deployment artifact to the service
+		resourceInstanceReqDetails.setComponentUid(downloadResourceDetails.getUniqueId());
+		response = ComponentInstanceRestUtils.createComponentInstance(resourceInstanceReqDetails, sdncUserDetails,
+				serviceDetails.getUniqueId(), ComponentTypeEnum.SERVICE);
+		AssertJUnit.assertTrue("response code is not 201, returned: " + response.getErrorCode(),
+				response.getErrorCode() == 201);
+
+		response = ServiceRestUtils.getService(serviceDetails, sdncUserDetails);
+		AssertJUnit.assertTrue("response code is not 200, returned: " + response.getErrorCode(),
+				response.getErrorCode() == 200);
+		service = ResponseParser.convertServiceResponseToJavaObject(response.getResponse());
+
+		DbUtils.cleanAllAudits();
+
+	}
+}
diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/preRequisites/SimpleOneRsrcOneServiceTest.java b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/preRequisites/SimpleOneRsrcOneServiceTest.java
new file mode 100644
index 0000000000..9363b8c4fe
--- /dev/null
+++ b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/preRequisites/SimpleOneRsrcOneServiceTest.java
@@ -0,0 +1,92 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * SDC
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.sdc.ci.tests.preRequisites;
+
+
+import org.junit.rules.TestName;
+import org.openecomp.sdc.be.model.User;
+import org.openecomp.sdc.ci.tests.api.ComponentBaseTest;
+import org.openecomp.sdc.ci.tests.datatypes.ArtifactReqDetails;
+import org.openecomp.sdc.ci.tests.datatypes.ComponentInstanceReqDetails;
+import org.openecomp.sdc.ci.tests.datatypes.ResourceReqDetails;
+import org.openecomp.sdc.ci.tests.datatypes.ServiceReqDetails;
+import org.openecomp.sdc.ci.tests.datatypes.enums.ArtifactTypeEnum;
+import org.openecomp.sdc.ci.tests.datatypes.enums.UserRoleEnum;
+import org.openecomp.sdc.ci.tests.datatypes.http.RestResponse;
+import org.openecomp.sdc.ci.tests.utils.ArtifactUtils;
+import org.openecomp.sdc.ci.tests.utils.Utils;
+import org.openecomp.sdc.ci.tests.utils.general.ElementFactory;
+import org.openecomp.sdc.ci.tests.utils.rest.ResourceRestUtils;
+import org.openecomp.sdc.ci.tests.utils.rest.ServiceRestUtils;
+import org.testng.annotations.BeforeMethod;
+
+import java.io.IOException;
+
+import static org.testng.AssertJUnit.assertTrue;
+
+public abstract class SimpleOneRsrcOneServiceTest extends ComponentBaseTest {
+
+	protected ResourceReqDetails resourceDetails;
+	protected ServiceReqDetails serviceDetails;
+	protected ComponentInstanceReqDetails resourceInstanceReqDetails;
+	protected ArtifactReqDetails heatArtifactDetails1;
+
+	private static final String heatExtension = "yaml";
+	private static final String yangXmlExtension = "xml";
+	private static final String muranoPkgExtension = "zip";
+	private static final String extension = null;
+	private final String folderName = "heatEnv";
+
+	protected User sdncDesignerDetails;
+	protected ArtifactReqDetails defaultArtifactDetails;
+
+	protected ArtifactUtils artifactUtils;
+	protected Utils utils;
+
+	private static RestResponse createServiceResponse;
+
+	@BeforeMethod
+	public void before() throws Exception {
+
+		initializeMembers();
+		createComponents();
+
+	}
+
+	public void initializeMembers() throws IOException, Exception {
+		sdncDesignerDetails = ElementFactory.getDefaultUser(UserRoleEnum.DESIGNER);
+		resourceDetails = ElementFactory.getDefaultResource();
+		serviceDetails = ElementFactory.getDefaultService();
+		heatArtifactDetails1 = ElementFactory.getDefaultDeploymentArtifactForType(ArtifactTypeEnum.HEAT.getType());
+		resourceInstanceReqDetails = ElementFactory.getDefaultComponentInstance("resourceInstanceReqDetails");
+	}
+
+	protected void createComponents() throws Exception {
+
+		RestResponse response = ResourceRestUtils.createResource(resourceDetails, sdncDesignerDetails);
+		assertTrue("create request returned status:" + response.getErrorCode(), response.getErrorCode() == 201);
+
+		response = ServiceRestUtils.createService(serviceDetails, sdncDesignerDetails);
+		assertTrue("create request returned status:" + response.getErrorCode(), response.getErrorCode() == 201);
+
+	}
+
+}
diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/requirements/RequirementsTest.java b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/requirements/RequirementsTest.java
new file mode 100644
index 0000000000..e96a41a6c1
--- /dev/null
+++ b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/requirements/RequirementsTest.java
@@ -0,0 +1,114 @@
+/*
+ * Copyright © 2016-2018 European Support Limited
+ *
+ * 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.
+ */
+
+package org.openecomp.sdc.ci.tests.requirements;
+
+import org.junit.Assert;
+import org.junit.Rule;
+import org.junit.rules.TestName;
+import org.openecomp.sdc.be.model.RequirementDefinition;
+import org.openecomp.sdc.be.model.Service;
+import org.openecomp.sdc.be.model.User;
+import org.openecomp.sdc.ci.tests.api.ComponentBaseTest;
+import org.openecomp.sdc.ci.tests.datatypes.RequirementDetails;
+import org.openecomp.sdc.ci.tests.datatypes.ServiceReqDetails;
+import org.openecomp.sdc.ci.tests.datatypes.enums.UserRoleEnum;
+import org.openecomp.sdc.ci.tests.datatypes.http.RestResponse;
+import org.openecomp.sdc.ci.tests.utils.general.ElementFactory;
+import org.openecomp.sdc.ci.tests.utils.rest.BaseRestUtils;
+import org.openecomp.sdc.ci.tests.utils.rest.RequirementsUtils;
+import org.openecomp.sdc.ci.tests.utils.rest.ServiceRestUtils;
+import org.testng.annotations.BeforeTest;
+import org.testng.annotations.Test;
+
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+import java.util.stream.Collectors;
+
+import static org.openecomp.sdc.ci.tests.utils.general.AtomicOperationUtils.getServiceObject;
+
+public class RequirementsTest extends ComponentBaseTest {
+    @Rule
+    public static final TestName name = new TestName();
+
+    private  ServiceReqDetails component;
+    private  User user = null;
+
+    @BeforeTest
+    public void init() throws Exception {
+        user = ElementFactory.getDefaultUser(UserRoleEnum.DESIGNER);
+        component = ElementFactory.getDefaultService();
+        component.setName("comp_req" + Math.random());
+        ServiceRestUtils.createService(component, user);
+    }
+
+    @Test
+    public void createRequirementTest() throws Exception {
+
+        RequirementDetails requirement = createRequirement();
+        RestResponse restResponse = RequirementsUtils.createRequirement(component.getUniqueId(),
+                Collections.singletonList(requirement), user);
+        logger.info("createRequirement Response Code:" + restResponse.getErrorCode());
+        Assert.assertEquals((int) restResponse.getErrorCode(), BaseRestUtils.STATUS_CODE_SUCCESS);
+    }
+
+    @Test(dependsOnMethods = "createRequirementTest")
+    public void updateRequirementTest() throws Exception {
+
+        RequirementDetails requirement = createRequirement();
+        requirement.setMaxOccurrences("10");
+        requirement.setMinOccurrences("4");
+        RestResponse restResponse = RequirementsUtils.updateRequirement(component.getUniqueId(),
+                Collections.singletonList(requirement), user);
+        logger.info("updateRequirement Response Code:" + restResponse.getErrorCode());
+        Assert.assertEquals((int) restResponse.getErrorCode(), BaseRestUtils.STATUS_CODE_SUCCESS);
+    }
+
+    @Test(dependsOnMethods = "updateRequirementTest")
+    public void getRequirementTest() throws Exception {
+        Service service = getServiceObject(component.getUniqueId());
+
+        List<RequirementDefinition> requirementDefinitionList = service.getRequirements().values()
+                .stream().flatMap(Collection::stream).collect(Collectors.toList());
+
+        RestResponse restResponse = RequirementsUtils.getRequirement(component.getUniqueId(),
+                requirementDefinitionList.get(0).getUniqueId(),  user);
+        logger.info("getRequirementTest Response Code:" + restResponse.getErrorCode());
+        Assert.assertEquals((int) restResponse.getErrorCode(), BaseRestUtils.STATUS_CODE_SUCCESS);
+    }
+
+    @Test(dependsOnMethods = "getRequirementTest")
+    public void deleteRequirementTest() throws Exception {
+        Service service = getServiceObject(component.getUniqueId());
+
+        List<RequirementDefinition> requirementDefinitionList = service.getRequirements().values()
+                .stream().flatMap(Collection::stream).collect(Collectors.toList());
+
+        RestResponse restResponse = RequirementsUtils.deleteRequirement(component.getUniqueId(),
+                requirementDefinitionList.get(0).getUniqueId(),  user);
+        logger.info("deleteRequirementTest Response Code:" + restResponse.getErrorCode());
+        Assert.assertEquals((int) restResponse.getErrorCode(), BaseRestUtils.STATUS_CODE_SUCCESS);
+    }
+
+    private  RequirementDetails createRequirement() {
+        RequirementDetails  requirementDetails = new RequirementDetails();
+        requirementDetails.setName("req" + Math.random());
+        requirementDetails.setCapability("tosca.capabilities.network.Bindable");
+
+        return requirementDetails;
+    }
+}
diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/rules/MyTestWatcher.java b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/rules/MyTestWatcher.java
new file mode 100644
index 0000000000..bb2d2d579b
--- /dev/null
+++ b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/rules/MyTestWatcher.java
@@ -0,0 +1,82 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * SDC
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.sdc.ci.tests.rules;
+
+import org.junit.rules.TestWatcher;
+import org.junit.runner.Description;
+import org.openecomp.sdc.ci.tests.api.AttSdcTest;
+
+public class MyTestWatcher extends TestWatcher {
+
+	AttSdcTest odlTest;
+
+	public MyTestWatcher(AttSdcTest odlTest) {
+		this.odlTest = odlTest;
+	}
+
+	/**
+	 * Invoked when a test succeeds
+	 * 
+	 * @param description
+	 */
+	@Override
+	protected void succeeded(Description description) {
+		String testName = description.getMethodName();
+		odlTest.addTestSummary(testName, true);
+
+	}
+
+	/**
+	 * Invoked when a test fails
+	 * 
+	 * @param e
+	 * @param description
+	 */
+	@Override
+	protected void failed(Throwable e, Description description) {
+		String testName = description.getMethodName();
+		odlTest.addTestSummary(testName, false, e);
+	}
+
+	/**
+	 * Invoked when a test is about to start
+	 * 
+	 * @param description
+	 */
+	@Override
+	protected void starting(Description description) {
+		// System.out.println("protected void starting(Description description)
+		// {");
+		this.odlTest.getLogger().debug("Start running test {}", description.getMethodName());
+	}
+
+	/**
+	 * Invoked when a test method finishes (whether passing or failing)
+	 * 
+	 * @param description
+	 */
+	@Override
+	protected void finished(Description description) {
+		// System.out.println("protected void finished(Description description)
+		// {");
+		this.odlTest.getLogger().debug("Finish running test {}", description.getMethodName());
+	}
+}
diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/sanity/CrudE2E.java b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/sanity/CrudE2E.java
new file mode 100644
index 0000000000..0690bdeb39
--- /dev/null
+++ b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/sanity/CrudE2E.java
@@ -0,0 +1,267 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * SDC
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.sdc.ci.tests.sanity;
+
+import fj.data.Either;
+import org.apache.commons.lang3.tuple.Pair;
+import org.junit.Rule;
+import org.junit.rules.TestName;
+import org.openecomp.sdc.be.datatypes.enums.ResourceTypeEnum;
+import org.openecomp.sdc.be.model.*;
+import org.openecomp.sdc.ci.tests.api.ComponentBaseTest;
+import org.openecomp.sdc.ci.tests.datatypes.enums.*;
+import org.openecomp.sdc.ci.tests.datatypes.http.RestResponse;
+import org.openecomp.sdc.ci.tests.utils.general.AtomicOperationUtils;
+import org.openecomp.sdc.ci.tests.utils.general.ElementFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.testng.Assert;
+import org.testng.annotations.Test;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+import java.util.stream.Collectors;
+
+public class CrudE2E extends ComponentBaseTest {
+	private static Logger log = LoggerFactory.getLogger(CrudE2E.class.getName());
+
+	public Component resourceDetailsVFCcomp_01;
+	public Component resourceDetailsVFCsoft_01;
+	public Component resourceDetailsCP_01;
+	public Component resourceDetailsVL_01;
+	public Component resourceDetailsVF_01;
+	public Component resourceDetailsVF_02;
+
+	public ComponentInstance resourceDetailsVFC1compIns1;
+	public ComponentInstance resourceDetailsVFC1softIns1;
+	public ComponentInstance resourceDetailsCP1ins_01;
+	public ComponentInstance resourceDetailsVL1ins_01;
+	public ComponentInstance resourceDetailsVF1ins_01;
+	public Component defaultService1;
+	private List<String> variablesAsList = new ArrayList<String>();
+
+	@Rule
+	public static TestName name = new TestName();
+
+	@Test
+	public void complexScenario() throws Exception {
+
+		User designer = ElementFactory.getDefaultUser(UserRoleEnum.DESIGNER);
+
+		//////// create defaultService1 ///////////////////////
+
+		Either<Service, RestResponse> createDefaultService1e = AtomicOperationUtils.createDefaultService(UserRoleEnum.DESIGNER, true);
+		defaultService1 = createDefaultService1e.left().value();
+
+		//////// create VFC1 (resourceDetailsVFCcomp_01) DerivedFrom COMPUTE
+		//////// type add all possible informational artifacts and change state
+		//////// to CERTIFY////////
+		Either<Resource, RestResponse> resourceDetailsVFCcompE = AtomicOperationUtils.createResourcesByTypeNormTypeAndCatregory(ResourceTypeEnum.VFC, NormativeTypesEnum.COMPUTE, ResourceCategoryEnum.GENERIC_INFRASTRUCTURE, UserRoleEnum.DESIGNER,
+				true);
+		resourceDetailsVFCcomp_01 = resourceDetailsVFCcompE.left().value();
+		AtomicOperationUtils.uploadArtifactByType(ArtifactTypeEnum.CHEF, resourceDetailsVFCcomp_01, UserRoleEnum.DESIGNER, false, true);
+		AtomicOperationUtils.uploadArtifactByType(ArtifactTypeEnum.PUPPET, resourceDetailsVFCcomp_01, UserRoleEnum.DESIGNER, false, true);
+		// AtomicOperationUtils.uploadArtifactByType(ArtifactTypeEnum.SHELL_SCRIPT,
+		// resourceDetailsVFCcomp_01, UserRoleEnum.DESIGNER, false, true);
+		AtomicOperationUtils.uploadArtifactByType(ArtifactTypeEnum.YANG, resourceDetailsVFCcomp_01, UserRoleEnum.DESIGNER, false, true);
+		AtomicOperationUtils.uploadArtifactByType(ArtifactTypeEnum.YANG_XML, resourceDetailsVFCcomp_01, UserRoleEnum.DESIGNER, false, true);
+		// AtomicOperationUtils.uploadArtifactByType(ArtifactTypeEnum.HEAT,
+		// resourceDetailsVFCcomp_01, UserRoleEnum.DESIGNER, false, true);
+		AtomicOperationUtils.uploadArtifactByType(ArtifactTypeEnum.DG_XML, resourceDetailsVFCcomp_01, UserRoleEnum.DESIGNER, false, true);
+		AtomicOperationUtils.uploadArtifactByType(ArtifactTypeEnum.MURANO_PKG, resourceDetailsVFCcomp_01, UserRoleEnum.DESIGNER, false, true);
+		AtomicOperationUtils.uploadArtifactByType(ArtifactTypeEnum.OTHER, resourceDetailsVFCcomp_01, UserRoleEnum.DESIGNER, false, true);
+		AtomicOperationUtils.changeComponentState(resourceDetailsVFCcomp_01, UserRoleEnum.DESIGNER, LifeCycleStatesEnum.CERTIFY, true);
+
+		//////// create VFC2 (resourceDetailsVFCsoft_01) DerivedFrom SOFTWARE
+		//////// type and change state to CERTIFY////////
+		Either<Resource, RestResponse> resourceDetailsVFCsoftE = AtomicOperationUtils.createResourcesByTypeNormTypeAndCatregory(ResourceTypeEnum.VFC, NormativeTypesEnum.SOFTWARE_COMPONENT, ResourceCategoryEnum.GENERIC_DATABASE, UserRoleEnum.DESIGNER,
+				true);
+		resourceDetailsVFCsoft_01 = resourceDetailsVFCsoftE.left().value();
+		AtomicOperationUtils.changeComponentState(resourceDetailsVFCsoft_01, UserRoleEnum.DESIGNER, LifeCycleStatesEnum.CERTIFY, true);
+
+		//////// create CP1 (resourceDetailsVFCsoft_01) DerivedFrom PORT type
+		//////// and change state to CHECKIN////////
+		Either<Resource, RestResponse> resourceDetailsCP_01e = AtomicOperationUtils.createResourcesByTypeNormTypeAndCatregory(ResourceTypeEnum.CP, NormativeTypesEnum.PORT, ResourceCategoryEnum.GENERIC_DATABASE, UserRoleEnum.DESIGNER, true);
+		resourceDetailsCP_01 = resourceDetailsCP_01e.left().value();
+		AtomicOperationUtils.changeComponentState(resourceDetailsCP_01, UserRoleEnum.DESIGNER, LifeCycleStatesEnum.CHECKIN, true);
+
+		//////// create VL1 (resourceDetailsVFCsoft_01) DerivedFrom NETWORK type
+		//////// and change state to CERTIFY////////
+		Either<Resource, RestResponse> resourceDetailsVL_01e = AtomicOperationUtils.createResourcesByTypeNormTypeAndCatregory(ResourceTypeEnum.VL, NormativeTypesEnum.NETWORK, ResourceCategoryEnum.GENERIC_NETWORK_ELEMENTS, UserRoleEnum.DESIGNER,
+				true);
+		resourceDetailsVL_01 = resourceDetailsVL_01e.left().value();
+		AtomicOperationUtils.changeComponentState(resourceDetailsVL_01, UserRoleEnum.DESIGNER, LifeCycleStatesEnum.CERTIFY, true);
+
+		//////// create VF1 (resourceDetailsVFCcomp_01) DerivedFrom COMPUTE type
+		//////// add all possible deployment and informational artifacts
+		//////// //////////
+		Either<Resource, RestResponse> resourceDetailsVF_01e = AtomicOperationUtils.createResourcesByTypeNormTypeAndCatregory(ResourceTypeEnum.VF, NormativeTypesEnum.ROOT, ResourceCategoryEnum.GENERIC_INFRASTRUCTURE, UserRoleEnum.DESIGNER, true);
+		resourceDetailsVF_01 = resourceDetailsVF_01e.left().value();
+		ArtifactDefinition heatArtifact = AtomicOperationUtils.uploadArtifactByType(ArtifactTypeEnum.HEAT, resourceDetailsVF_01, UserRoleEnum.DESIGNER, true, true).left().value();
+		AtomicOperationUtils.uploadArtifactByType(ArtifactTypeEnum.HEAT_VOL, resourceDetailsVF_01, UserRoleEnum.DESIGNER, true, true);
+		AtomicOperationUtils.uploadArtifactByType(ArtifactTypeEnum.HEAT_NET, resourceDetailsVF_01, UserRoleEnum.DESIGNER, true, true);
+		AtomicOperationUtils.uploadArtifactByType(ArtifactTypeEnum.OTHER, resourceDetailsVF_01, UserRoleEnum.DESIGNER, true, true);
+
+		AtomicOperationUtils.uploadArtifactByType(ArtifactTypeEnum.CHEF, resourceDetailsVF_01, UserRoleEnum.DESIGNER, false, true);
+		AtomicOperationUtils.uploadArtifactByType(ArtifactTypeEnum.PUPPET, resourceDetailsVF_01, UserRoleEnum.DESIGNER, false, true);
+		// AtomicOperationUtils.uploadArtifactByType(ArtifactTypeEnum.SHELL_SCRIPT,
+		// resourceDetailsVF_01, UserRoleEnum.DESIGNER, false, true);
+		AtomicOperationUtils.uploadArtifactByType(ArtifactTypeEnum.YANG, resourceDetailsVF_01, UserRoleEnum.DESIGNER, false, true);
+		AtomicOperationUtils.uploadArtifactByType(ArtifactTypeEnum.YANG_XML, resourceDetailsVF_01, UserRoleEnum.DESIGNER, false, true);
+		// AtomicOperationUtils.uploadArtifactByType(ArtifactTypeEnum.HEAT,
+		// resourceDetailsVF_01, UserRoleEnum.DESIGNER, false, true);
+		AtomicOperationUtils.uploadArtifactByType(ArtifactTypeEnum.DG_XML, resourceDetailsVF_01, UserRoleEnum.DESIGNER, false, true);
+		AtomicOperationUtils.uploadArtifactByType(ArtifactTypeEnum.MURANO_PKG, resourceDetailsVF_01, UserRoleEnum.DESIGNER, false, true);
+		AtomicOperationUtils.uploadArtifactByType(ArtifactTypeEnum.OTHER, resourceDetailsVF_01, UserRoleEnum.DESIGNER, false, true);
+
+		//////// Add VFC1 VFC2 CP and VL to VF container /////////////
+		resourceDetailsVFC1compIns1 = AtomicOperationUtils.addComponentInstanceToComponentContainer(resourceDetailsVFCcomp_01, resourceDetailsVF_01, UserRoleEnum.DESIGNER, true).left().value();
+		resourceDetailsVFC1softIns1 = AtomicOperationUtils.addComponentInstanceToComponentContainer(resourceDetailsVFCsoft_01, resourceDetailsVF_01, UserRoleEnum.DESIGNER, true).left().value();
+		resourceDetailsCP1ins_01 = AtomicOperationUtils.addComponentInstanceToComponentContainer(resourceDetailsCP_01, resourceDetailsVF_01, UserRoleEnum.DESIGNER, true).left().value();
+		resourceDetailsVL1ins_01 = AtomicOperationUtils.addComponentInstanceToComponentContainer(resourceDetailsVL_01, resourceDetailsVF_01, UserRoleEnum.DESIGNER, true).left().value();
+
+		//////// associate cp-vl vl-vfcComp and vfcComp-vfcSoft////////
+		resourceDetailsVF_01 = AtomicOperationUtils.getResourceObject(resourceDetailsVF_01, UserRoleEnum.DESIGNER);
+		AtomicOperationUtils.associate2ResourceInstances(resourceDetailsVF_01, resourceDetailsCP1ins_01, resourceDetailsVL1ins_01, AssocType.LINKABLE.getAssocType(), UserRoleEnum.DESIGNER, true);
+		AtomicOperationUtils.associate2ResourceInstances(resourceDetailsVF_01, resourceDetailsCP1ins_01, resourceDetailsVFC1compIns1, AssocType.BINDABLE.getAssocType(), UserRoleEnum.DESIGNER, true);
+		AtomicOperationUtils.associate2ResourceInstances(resourceDetailsVF_01, resourceDetailsVFC1compIns1, resourceDetailsVFC1softIns1, AssocType.NODE.getAssocType(), UserRoleEnum.DESIGNER, true);
+
+		//////// download all VF1 artifacts////////
+
+		Collection<ArtifactDefinition> artifacts = resourceDetailsVF_01.getDeploymentArtifacts().values();
+		List<String> collect = artifacts.stream().filter(p -> p.checkEsIdExist() == true).map(p -> p.getUniqueId()).collect(Collectors.toList());
+		artifacts.stream().filter(p -> p.checkEsIdExist() == true).map(p -> p.getUniqueId()).forEach(item -> log.debug(item));
+
+		//////// get all VF1 artifacts////////
+
+		Collection<List<ComponentInstanceProperty>> componentInstancesProperties = resourceDetailsVF_01.getComponentInstancesProperties().values();
+		List<String> collect2 = componentInstancesProperties.stream().filter(p -> p.isEmpty() == false).flatMap(l -> l.stream()).collect(Collectors.toList()).stream().map(p -> p.getUniqueId()).collect(Collectors.toList());
+		// PropertyRestUtils.updateProperty(resourceDetailsVF_01.getUniqueId(),
+		// propertyId, "1", designer);
+		// .forEach((someOtherString) -> {
+		// System.out.println("Content With Java: " + someOtherString);
+		// });
+		// componentInstancesProperties.stream().filter(p ->
+		// p.isEmpty()==false).flatMap(l -> l.stream()).map(e ->
+		// e.getUniqueId());
+		// resourceDetailsVF_01.getComponentInstancesProperties().
+
+		// ArtifactDefinition artifactDefinition =
+		// resourceDetailsVF_01.getDeploymentArtifacts().get(ArtifactTypeEnum.HEAT.getType().toLowerCase()).getEsId();
+		// ArtifactDefinition artifactDefinition =
+		// resource.getDeploymentArtifacts().get(depResArtType);
+		// ArtifactReqDetails artifacJavaObject =
+		// ResponseParser.convertArtifactDefinitionToArtifactReqDetailsObject(artifactDefinition);
+		// ArtifactRestUtils.updateDeploymentArtifactToRI(artifactDetails,
+		// sdncModifierDetails, resourceInstanceId, serviceId)
+
+		//////// certify VF1 - failed due to uncertified CP instance ////////
+
+		/*RestResponse changeVfStateFailed = LifecycleRestUtils.changeComponentState(resourceDetailsVF_01, designer, LifeCycleStatesEnum.CERTIFICATIONREQUEST);
+		Resource resResourceDetailsVF_01 = (Resource) resourceDetailsVF_01;
+		variablesAsList = Arrays.asList(resResourceDetailsVF_01.getResourceType().toString(), resourceDetailsCP_01.getName());
+		ErrorValidationUtils.checkBodyResponseOnError(ActionStatus.VALIDATED_RESOURCE_NOT_FOUND.name(), variablesAsList, changeVfStateFailed.getResponse());*/
+
+		//////// certify resources CP1 ////////
+		resourceDetailsCP_01 = AtomicOperationUtils.changeComponentState(resourceDetailsCP_01, UserRoleEnum.DESIGNER, LifeCycleStatesEnum.CERTIFY, true).getLeft();
+
+		//////// replace VF1 instances with new certified instances (CP1
+		//////// replaced) ////////
+		Either<Pair<Component, ComponentInstance>, RestResponse> changeComponentInstanceVersion = AtomicOperationUtils.changeComponentInstanceVersion(resourceDetailsVF_01, resourceDetailsCP1ins_01, resourceDetailsCP_01, UserRoleEnum.DESIGNER, true);
+		resourceDetailsVF_01 = changeComponentInstanceVersion.left().value().getLeft();
+		resourceDetailsCP1ins_01 = changeComponentInstanceVersion.left().value().getRight();
+
+		//////// associate cp-vl and cp-vfc1,////////
+		AtomicOperationUtils.associate2ResourceInstances(resourceDetailsVF_01, resourceDetailsCP1ins_01, resourceDetailsVL1ins_01, AssocType.LINKABLE.getAssocType(), UserRoleEnum.DESIGNER, true);
+		AtomicOperationUtils.associate2ResourceInstances(resourceDetailsVF_01, resourceDetailsCP1ins_01, resourceDetailsVFC1compIns1, AssocType.BINDABLE.getAssocType(), UserRoleEnum.DESIGNER, true);
+
+		/////// change VF1 state to CHECK-IN and add it as instance to service1
+		/////// container
+		resourceDetailsVF_01 = AtomicOperationUtils.changeComponentState(resourceDetailsVF_01, UserRoleEnum.DESIGNER, LifeCycleStatesEnum.CHECKIN, true).getLeft();
+		resourceDetailsVF1ins_01 = AtomicOperationUtils.addComponentInstanceToComponentContainer(resourceDetailsVF_01, defaultService1, UserRoleEnum.DESIGNER, true).left().value();
+
+		//////// distribute service1 - failed due to incorrect LifeCyclestatus
+		//////// ////////
+		RestResponse distributeService = AtomicOperationUtils.distributeService(defaultService1, false);
+		Assert.assertEquals(distributeService, null, "verification failed");
+
+		//////// certify service1 - failed due to uncertified instances ////////
+		designer = ElementFactory.getDefaultUser(UserRoleEnum.DESIGNER);
+		/*RestResponse changeServicetStateFailed = LifecycleRestUtils.changeComponentState(defaultService1, designer, LifeCycleStatesEnum.CERTIFICATIONREQUEST);
+		variablesAsList = Arrays.asList(defaultService1.getComponentType().toString().toLowerCase(), resourceDetailsVF_01.getName());
+		ErrorValidationUtils.checkBodyResponseOnError(ActionStatus.VALIDATED_RESOURCE_NOT_FOUND.name(), variablesAsList, changeServicetStateFailed.getResponse());
+*/
+		////// change VF1 state to CERTIFIED
+		resourceDetailsVF_01 = AtomicOperationUtils.changeComponentState(resourceDetailsVF_01, UserRoleEnum.DESIGNER, LifeCycleStatesEnum.CERTIFY, true).getLeft();
+
+		//////// replace VF1 instances with new certified instances ////////
+		changeComponentInstanceVersion = AtomicOperationUtils.changeComponentInstanceVersion(defaultService1, resourceDetailsVF1ins_01, resourceDetailsVF_01, UserRoleEnum.DESIGNER, true);
+		resourceDetailsVF_01 = changeComponentInstanceVersion.left().value().getLeft();
+		resourceDetailsVFC1compIns1 = changeComponentInstanceVersion.left().value().getRight();
+
+		/////// certify service1 ////////
+		defaultService1 = AtomicOperationUtils.changeComponentState(defaultService1, UserRoleEnum.DESIGNER, LifeCycleStatesEnum.CERTIFY, true).getLeft();
+
+		//////// distribute service1 - successfully ////////
+		AtomicOperationUtils.distributeService(defaultService1, true);
+
+		/////// create VF2 ////////
+
+		Either<Resource, RestResponse> resourceDetailsVF_02e = AtomicOperationUtils.createResourcesByTypeNormTypeAndCatregory(ResourceTypeEnum.VF, NormativeTypesEnum.ROOT, ResourceCategoryEnum.GENERIC_INFRASTRUCTURE, UserRoleEnum.DESIGNER, true);
+		resourceDetailsVF_02 = resourceDetailsVF_02e.left().value();
+
+	}
+
+	// private void updateArtParameterInResource(Resource resource) throws
+	// IOException {
+	//
+	// ArtifactRestUtils.uploadArtifact(artifactDetails, component,
+	// sdncModifierDetails)
+	//
+	// for (String depResArtType : Utils.getListOfDepResArtLabels(true)) {
+	// ArtifactDefinition artifactDefinition =
+	// resource.getDeploymentArtifacts().get(depResArtType);
+	// ArtifactReqDetails artifacJavaObject =
+	// ResponseParser.convertArtifactDefinitionToArtifactReqDetailsObject(artifactDefinition);
+	//
+	// //update parameter
+	// List<HeatParameterDefinition> resourceHeatParameters =
+	// resource.getDeploymentArtifacts().get(depResArtType).getHeatParameters();
+	// for (HeatParameterDefinition heatParameterDefinition :
+	// resourceHeatParameters){
+	// if (heatParameterDefinition.getName().equals("address")){
+	// heatParameterDefinition.setCurrentValue("negev");
+	// break;
+	// }
+	// }
+	// artifacJavaObject.setHeatParameters(resourceHeatParameters);
+	// artifacJavaObject.setPayloadData(null);
+	// RestResponse updateInformationalArtifactToResource =
+	// ArtifactRestUtils.updateDeploymentArtifactToResource(artifacJavaObject,
+	// sdncDesignerDetails, resource.getUniqueId());
+	// assertTrue("response code is not 200, returned: " +
+	// updateInformationalArtifactToResource.getErrorCode(),updateInformationalArtifactToResource.getErrorCode()
+	// == 200);
+	// }
+	// }
+
+}
diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/sanity/MultipleResourceUpdate.java b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/sanity/MultipleResourceUpdate.java
new file mode 100644
index 0000000000..2a72494a0c
--- /dev/null
+++ b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/sanity/MultipleResourceUpdate.java
@@ -0,0 +1,122 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * SDC
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.sdc.ci.tests.sanity;
+
+import org.junit.Rule;
+import org.junit.rules.TestName;
+import org.openecomp.sdc.be.datatypes.enums.ResourceTypeEnum;
+import org.openecomp.sdc.be.model.ComponentInstance;
+import org.openecomp.sdc.be.model.Resource;
+import org.openecomp.sdc.ci.tests.api.ComponentBaseTest;
+import org.openecomp.sdc.ci.tests.datatypes.ComponentInstanceReqDetails;
+import org.openecomp.sdc.ci.tests.datatypes.enums.*;
+import org.openecomp.sdc.ci.tests.datatypes.http.RestResponse;
+import org.openecomp.sdc.ci.tests.utils.general.AtomicOperationUtils;
+import org.openecomp.sdc.ci.tests.utils.general.ElementFactory;
+import org.openecomp.sdc.ci.tests.utils.rest.ComponentInstanceRestUtils;
+import org.openecomp.sdc.ci.tests.utils.rest.ProductRestUtils;
+import org.testng.annotations.Test;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import static org.testng.AssertJUnit.assertTrue;
+
+public class MultipleResourceUpdate extends ComponentBaseTest {
+
+	@Rule
+	public static TestName name = new TestName();
+
+	@Test
+	public void simpleScenario() throws Exception {
+
+		// Creating VF and Resource instances
+		Resource vf = AtomicOperationUtils.createResourceByType(ResourceTypeEnum.VF, UserRoleEnum.DESIGNER, true).left()
+				.value();
+		Resource cp1 = AtomicOperationUtils
+				.createResourcesByTypeNormTypeAndCatregory(ResourceTypeEnum.CP, NormativeTypesEnum.PORT,
+						ResourceCategoryEnum.NETWORK_CONNECTIVITY_CON_POINT, UserRoleEnum.DESIGNER, true)
+				.left().value();
+		Resource cp2 = AtomicOperationUtils.createResourceByType(ResourceTypeEnum.CP, UserRoleEnum.DESIGNER, true)
+				.left().value();
+		Resource vl = AtomicOperationUtils
+				.createResourcesByTypeNormTypeAndCatregory(ResourceTypeEnum.VL, NormativeTypesEnum.NETWORK,
+						ResourceCategoryEnum.NETWORK_CONNECTIVITY_VIRTUAL_LINK, UserRoleEnum.DESIGNER, true)
+				.left().value();
+
+		vf.getCreatorUserId();
+
+		// Check In Resources
+		AtomicOperationUtils.changeComponentState(cp1, UserRoleEnum.DESIGNER, LifeCycleStatesEnum.CHECKIN, true);
+		AtomicOperationUtils.changeComponentState(cp2, UserRoleEnum.DESIGNER, LifeCycleStatesEnum.CHECKIN, true);
+		AtomicOperationUtils.changeComponentState(vl, UserRoleEnum.DESIGNER, LifeCycleStatesEnum.CHECKIN, true);
+
+		// CheckIn all other except VF
+		ComponentInstance instanceCP1 = AtomicOperationUtils
+				.addComponentInstanceToComponentContainer(cp1, vf, UserRoleEnum.DESIGNER, true).left().value();
+		ComponentInstance instanceVL = AtomicOperationUtils
+				.addComponentInstanceToComponentContainer(vl, vf, UserRoleEnum.DESIGNER, true).left().value();
+		ComponentInstance instanceCP2 = AtomicOperationUtils
+				.addComponentInstanceToComponentContainer(cp2, vf, UserRoleEnum.DESIGNER, true).left().value();
+
+		vf = (Resource) AtomicOperationUtils.getComponentObject(vf, UserRoleEnum.DESIGNER);
+
+		// Create Vertex(Link/Associate 2 Resource Instances on Canvas)
+		AtomicOperationUtils.associate2ResourceInstances(vf, instanceCP1, instanceVL, AssocType.LINKABLE.getAssocType(),
+				UserRoleEnum.DESIGNER, true);
+
+		List<ComponentInstanceReqDetails> componentInstanceReqDetailsList = new ArrayList<>();
+		componentInstanceReqDetailsList.add(new ComponentInstanceReqDetails(instanceCP1));
+		componentInstanceReqDetailsList.add(new ComponentInstanceReqDetails(instanceCP2));
+		componentInstanceReqDetailsList.add(new ComponentInstanceReqDetails(instanceVL));
+
+		ComponentInstanceReqDetails compInstDet = componentInstanceReqDetailsList.get(0);
+		compInstDet.setPosX("150");
+		compInstDet.setPosY("150");
+		compInstDet = componentInstanceReqDetailsList.get(1);
+		compInstDet.setPosX("400");
+		compInstDet.setPosY("150");
+		compInstDet = componentInstanceReqDetailsList.get(2);
+		compInstDet.setPosX("150");
+		compInstDet.setPosY("300");
+
+		RestResponse response = ComponentInstanceRestUtils.updateMultipleComponentInstance(
+				componentInstanceReqDetailsList, ElementFactory.getDefaultUser(UserRoleEnum.DESIGNER), vf.getUniqueId(),
+				vf.getComponentType());
+		assertTrue("response code is not 200, returned: " + response.getErrorCode(),
+				response.getErrorCode() == ProductRestUtils.STATUS_CODE_SUCCESS);
+
+		compInstDet = componentInstanceReqDetailsList.get(0);
+		compInstDet.setPosX("350");
+		compInstDet.setPosY("350");
+		compInstDet = componentInstanceReqDetailsList.get(1);
+		compInstDet.setPosX("600");
+		compInstDet.setPosY("350");
+		compInstDet = componentInstanceReqDetailsList.get(2);
+		compInstDet.setPosX("350");
+		compInstDet.setPosY("500");
+
+		response = ComponentInstanceRestUtils.updateMultipleComponentInstance(componentInstanceReqDetailsList,
+				ElementFactory.getDefaultUser(UserRoleEnum.DESIGNER), vf.getUniqueId(), vf.getComponentType());
+		assertTrue("response code is not 200, returned: " + response.getErrorCode(),
+				response.getErrorCode() == ProductRestUtils.STATUS_CODE_SUCCESS);
+	}
+}
diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/sanity/Onboard.java b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/sanity/Onboard.java
new file mode 100644
index 0000000000..5dc07fa934
--- /dev/null
+++ b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/sanity/Onboard.java
@@ -0,0 +1,119 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * SDC
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.sdc.ci.tests.sanity;
+
+
+import com.aventstack.extentreports.Status;
+import fj.data.Either;
+import org.junit.Rule;
+import org.junit.rules.TestName;
+import org.openecomp.sdc.be.datatypes.enums.ResourceTypeEnum;
+import org.openecomp.sdc.be.model.ComponentInstance;
+import org.openecomp.sdc.be.model.Resource;
+import org.openecomp.sdc.be.model.Service;
+import org.openecomp.sdc.be.model.User;
+import org.openecomp.sdc.ci.tests.api.ComponentBaseTest;
+import org.openecomp.sdc.ci.tests.api.ExtentTestActions;
+import org.openecomp.sdc.ci.tests.data.providers.OnboardingDataProviders;
+import org.openecomp.sdc.ci.tests.datatypes.ResourceReqDetails;
+import org.openecomp.sdc.ci.tests.datatypes.ServiceReqDetails;
+import org.openecomp.sdc.ci.tests.datatypes.VendorSoftwareProductObject;
+import org.openecomp.sdc.ci.tests.datatypes.enums.LifeCycleStatesEnum;
+import org.openecomp.sdc.ci.tests.datatypes.enums.UserRoleEnum;
+import org.openecomp.sdc.ci.tests.datatypes.http.RestResponse;
+import org.openecomp.sdc.ci.tests.utils.general.AtomicOperationUtils;
+import org.openecomp.sdc.ci.tests.utils.general.ElementFactory;
+import org.openecomp.sdc.ci.tests.utils.general.OnboardingUtillViaApis;
+import org.testng.annotations.*;
+
+public class Onboard extends ComponentBaseTest {
+
+	private String makeDistributionValue;
+	private String makeToscaValidationValue;
+	@Rule
+	public static final TestName name = new TestName();
+	
+	@Parameters({ "makeDistribution" })
+	@BeforeMethod
+	public void beforeTestReadParams(@Optional("true") String makeDistributionReadValue) {
+		makeDistributionValue = makeDistributionReadValue;                             
+		logger.info("makeDistributionReadValue - > " + makeDistributionValue);
+	}
+
+	@Parameters({ "makeToscaValidation" })
+	@BeforeClass
+	public void makeToscaValidation(@Optional("false") String makeToscaValidationReadValue) {
+		makeToscaValidationValue = makeToscaValidationReadValue;
+		logger.info("makeToscaValidationReadValue - > " + makeToscaValidationValue);
+	}
+	
+
+	@Test(dataProviderClass = OnboardingDataProviders.class, dataProvider = "VNF_List")
+	public void onboardVNFShotFlow(String filePath, String vnfFile) throws Exception {
+		setLog(vnfFile);
+		runOnboardToDistributionFlow(filePath, vnfFile, ResourceTypeEnum.VF);
+	}
+
+	@Test(dataProviderClass = OnboardingDataProviders.class, dataProvider = "PNF_List")
+	public void onboardPNFFlow(String filePath, String pnfFile) throws Exception {
+		setLog(pnfFile);
+		runOnboardToDistributionFlow(filePath, pnfFile, ResourceTypeEnum.PNF);
+	}
+
+	private void runOnboardToDistributionFlow(String packageFilePath, String packageFileName, ResourceTypeEnum resourceTypeEnum) throws Exception {
+		ExtentTestActions.log(Status.INFO, String.format("Going to onboard the %s %s", resourceTypeEnum.getValue(), packageFileName));
+		User user = ElementFactory.getDefaultUser(UserRoleEnum.DESIGNER);
+     	ResourceReqDetails resourceReqDetails = ElementFactory.getDefaultResource();
+		resourceReqDetails.setResourceType(resourceTypeEnum.getValue());
+		VendorSoftwareProductObject vendorSoftwareProductObject = OnboardingUtillViaApis.createVspViaApis(resourceReqDetails, packageFilePath, packageFileName, user);
+
+		//		create VF base on VNF imported from previous step - have, resourceReqDetails object include part of resource metadata
+		OnboardingUtillViaApis.prepareOnboardedResourceDetailsBeforeCreate(resourceReqDetails, vendorSoftwareProductObject);
+		resourceReqDetails.setResourceType(resourceTypeEnum.getValue());
+		ExtentTestActions.log(Status.INFO, String.format("Create %s %s From VSP", resourceTypeEnum.getValue(), resourceReqDetails.getName()));
+		Resource resource = OnboardingUtillViaApis.createResourceFromVSP(resourceReqDetails, UserRoleEnum.DESIGNER);
+		ExtentTestActions.log(Status.INFO, String.format("Certify %s", resourceTypeEnum.getValue()));
+		resource = (Resource) AtomicOperationUtils.changeComponentState(resource, UserRoleEnum.DESIGNER, LifeCycleStatesEnum.CERTIFY, true).getLeft();
+
+		//--------------------------SERVICE--------------------------------	
+		ServiceReqDetails serviceReqDetails = OnboardingUtillViaApis.prepareServiceDetailsBeforeCreate(user);
+		ExtentTestActions.log(Status.INFO, String.format("Create Service %s", serviceReqDetails.getName()));
+		Service service = AtomicOperationUtils.createCustomService(serviceReqDetails, UserRoleEnum.DESIGNER, true).left().value();
+		ExtentTestActions.log(Status.INFO, String.format("Add %s to Service", resourceTypeEnum.getValue()));
+		Either<ComponentInstance, RestResponse> addComponentInstanceToComponentContainer = AtomicOperationUtils.addComponentInstanceToComponentContainer(resource, service, UserRoleEnum.DESIGNER, true);
+		addComponentInstanceToComponentContainer.left().value();
+		ExtentTestActions.log(Status.INFO,"Certify Service");
+		service = (Service) AtomicOperationUtils.changeComponentState(service, UserRoleEnum.DESIGNER, LifeCycleStatesEnum.CERTIFY, true).getLeft();
+
+		if (makeDistributionValue.equals("true")) {
+			ExtentTestActions.log(Status.INFO, "Distribute Service");
+			AtomicOperationUtils.distributeService(service, true);
+		}
+
+		if (makeToscaValidationValue.equals("true")) {
+			ExtentTestActions.log(Status.INFO, "Start tosca validation");
+			AtomicOperationUtils.toscaValidation(service ,packageFileName);
+		}
+
+		ExtentTestActions.log(Status.INFO, String.format("The onboarding process for '%s' finished with success", packageFileName));
+	}
+
+}
diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/servicefilter/ServiceFilterTests.java b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/servicefilter/ServiceFilterTests.java
new file mode 100644
index 0000000000..6c424499f8
--- /dev/null
+++ b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/servicefilter/ServiceFilterTests.java
@@ -0,0 +1,139 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * SDC
+ * ================================================================================
+ * 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=========================================================
+ */
+
+package org.openecomp.sdc.ci.tests.servicefilter;
+
+import java.util.Collections;
+
+import org.junit.Rule;
+import org.junit.rules.TestName;
+import org.openecomp.sdc.be.datatypes.enums.ComponentTypeEnum;
+import org.openecomp.sdc.be.model.User;
+import org.openecomp.sdc.ci.tests.api.ComponentBaseTest;
+import org.openecomp.sdc.ci.tests.datatypes.ComponentInstanceReqDetails;
+import org.openecomp.sdc.ci.tests.datatypes.PropertyReqDetails;
+import org.openecomp.sdc.ci.tests.datatypes.ServiceFilterDetails;
+import org.openecomp.sdc.ci.tests.datatypes.ServiceReqDetails;
+import org.openecomp.sdc.ci.tests.datatypes.enums.LifeCycleStatesEnum;
+import org.openecomp.sdc.ci.tests.datatypes.enums.UserRoleEnum;
+import org.openecomp.sdc.ci.tests.datatypes.http.RestResponse;
+import org.openecomp.sdc.ci.tests.utils.general.ElementFactory;
+import org.openecomp.sdc.ci.tests.utils.rest.BaseRestUtils;
+import org.openecomp.sdc.ci.tests.utils.rest.ComponentInstanceRestUtils;
+import org.openecomp.sdc.ci.tests.utils.rest.LifecycleRestUtils;
+import org.openecomp.sdc.ci.tests.utils.rest.PropertyRestUtils;
+import org.openecomp.sdc.ci.tests.utils.rest.ResponseParser;
+import org.openecomp.sdc.ci.tests.utils.rest.ServiceFilterUtils;
+import org.openecomp.sdc.ci.tests.utils.rest.ServiceRestUtils;
+import org.testng.Assert;
+import org.testng.annotations.BeforeTest;
+import org.testng.annotations.Test;
+
+public class ServiceFilterTests extends ComponentBaseTest {
+    @Rule
+    public static TestName name = new TestName();
+
+    private static ServiceReqDetails externalService;
+    private static ComponentInstanceReqDetails componentInstanceReqDetails;
+    private static User user = null;
+
+    @BeforeTest
+    public void init() throws Exception {
+        user = ElementFactory.getDefaultUser(UserRoleEnum.DESIGNER);
+
+        ServiceReqDetails internalService;
+        //Create External Service
+        externalService = ElementFactory.getDefaultService();
+        externalService.setName("ExternalService" + Math.random());
+        ServiceRestUtils.createService(externalService, user);
+
+        //Create Internal Service
+        internalService = ElementFactory.getDefaultService();
+        internalService.setName("InternalService" + Math.random());
+        ServiceRestUtils.createService(internalService, user);
+
+        //Add property services
+        //#PropertyOne
+        PropertyReqDetails propertyReqDetails = ElementFactory.getDefaultStringProperty();
+        propertyReqDetails.setName("StringProp1");
+        String body = propertyReqDetails.propertyToJsonString();
+        PropertyRestUtils.createServiceProperty(externalService.getUniqueId(), body, user);
+        PropertyRestUtils.createServiceProperty(internalService.getUniqueId(), body, user);
+        //#PropertyTwo
+        propertyReqDetails.setName("StringProp2");
+        body = propertyReqDetails.propertyToJsonString();
+        RestResponse response = PropertyRestUtils.createServiceProperty(externalService.getUniqueId(), body, user);
+        response = PropertyRestUtils.createServiceProperty(internalService.getUniqueId(), body, user);
+
+        //CheckIn internal Service
+        response = LifecycleRestUtils.changeServiceState(internalService, user, "0.1",
+                LifeCycleStatesEnum.CHECKIN,
+                "{\"userRemarks\":\"CheckIn\"}");
+        BaseRestUtils.checkSuccess(response);
+        if (response.getErrorCode() == BaseRestUtils.STATUS_CODE_SUCCESS) {
+            internalService.setUniqueId(ResponseParser.getUniqueIdFromResponse(response));
+        }
+        //Make internal service as component instance
+        componentInstanceReqDetails =
+                ElementFactory.getDefaultComponentInstance(internalService.getUniqueId(), "ServiceProxy");
+        response = ComponentInstanceRestUtils.createComponentInstance(componentInstanceReqDetails,
+                user, externalService.getUniqueId(), ComponentTypeEnum.SERVICE);
+        BaseRestUtils.checkCreateResponse(response);
+        if (response.getErrorCode() == BaseRestUtils.STATUS_CODE_CREATED) {
+            componentInstanceReqDetails.setUniqueId(ResponseParser.getUniqueIdFromResponse(response));
+            componentInstanceReqDetails.setName(ResponseParser.getNameFromResponse(response));
+        }
+        //Mark as dependent
+        componentInstanceReqDetails.setDirectives(Collections.singletonList("selectable"));
+        response = ComponentInstanceRestUtils.updateComponentInstance(componentInstanceReqDetails,
+                user, externalService.getUniqueId(), ComponentTypeEnum.SERVICE);
+        BaseRestUtils.checkSuccess(response);
+    }
+
+    @Test
+    public void createServiceFilter() throws Exception {
+        //Add Service Filter
+        ServiceFilterDetails serviceFilterDetails = ElementFactory.getDefaultEqualOperatorFilter("StringProp1", "value");
+        RestResponse restResponse = ServiceFilterUtils.createServiceFilter(externalService.getUniqueId(),
+                componentInstanceReqDetails.getUniqueId(), serviceFilterDetails, user);
+        logger.info("CreateServiceFilter Response Code:" + restResponse.getErrorCode());
+        Assert.assertEquals((int) restResponse.getErrorCode(), BaseRestUtils.STATUS_CODE_SUCCESS);
+    }
+
+    @Test(dependsOnMethods = "createServiceFilter")
+    public void updateServiceFilter() throws Exception {
+        //Update Service Filter
+        ServiceFilterDetails serviceFilterDetails =
+                ElementFactory.getDefaultEqualOperatorFilter("StringProp1", "updated");
+        RestResponse restResponse = ServiceFilterUtils.updateServiceFilter(externalService.getUniqueId(),
+                componentInstanceReqDetails.getUniqueId(), Collections.singletonList(serviceFilterDetails),  user);
+        logger.info("UpdateServiceFilter Response Code:" + restResponse.getErrorCode());
+        Assert.assertEquals((int) restResponse.getErrorCode(), BaseRestUtils.STATUS_CODE_SUCCESS);
+    }
+
+    //    @Test(dependsOnMethods = "updateServiceFilter")
+    public void deleteServiceFilter() throws Exception {
+        //Delete Service Filter
+        RestResponse restResponse = ServiceFilterUtils.deleteServiceFilter(externalService.getUniqueId(),
+                componentInstanceReqDetails.getUniqueId(), 0, user);
+        logger.info("DeleteServiceFilter Response Code:" + restResponse.getErrorCode());
+        Assert.assertEquals((int) restResponse.getErrorCode(), BaseRestUtils.STATUS_CODE_SUCCESS);
+    }
+}
diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/tosca/datatypes/ParametersDefinition.java b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/tosca/datatypes/ParametersDefinition.java
new file mode 100644
index 0000000000..dbdaff3d0f
--- /dev/null
+++ b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/tosca/datatypes/ParametersDefinition.java
@@ -0,0 +1,102 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * SDC
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.sdc.ci.tests.tosca.datatypes;
+
+public class ParametersDefinition {
+	
+	private String type;
+	private String description;
+	private Object Default;
+	private String status;
+//	private List<Constraints> constraints;
+	private String entry_schema;
+	private Object value;
+	
+	public ParametersDefinition() {
+		super();
+	}
+
+	public ParametersDefinition(String type, String description, Object default1, String status, String entry_schema, Object value) {
+		super();
+		this.type = type;
+		this.description = description;
+		Default = default1;
+		this.status = status;
+		this.entry_schema = entry_schema;
+		this.value = value;
+	}
+
+	public String getType() {
+		return type;
+	}
+
+	public void setType(String type) {
+		this.type = type;
+	}
+
+	public String getDescription() {
+		return description;
+	}
+
+	public void setDescription(String description) {
+		this.description = description;
+	}
+
+	public Object getDefault() {
+		return Default;
+	}
+
+	public void setDefault(Object default1) {
+		Default = default1;
+	}
+
+	public String getStatus() {
+		return status;
+	}
+
+	public void setStatus(String status) {
+		this.status = status;
+	}
+
+	public String getEntry_schema() {
+		return entry_schema;
+	}
+
+	public void setEntry_schema(String entry_schema) {
+		this.entry_schema = entry_schema;
+	}
+
+	public Object getValue() {
+		return value;
+	}
+
+	public void setValue(Object value) {
+		this.value = value;
+	}
+
+	@Override
+	public String toString() {
+		return "ParametersDefinition [type=" + type + ", description=" + description + ", Default=" + Default + ", status=" + status + ", entry_schema=" + entry_schema + ", value=" + value + "]";
+	}
+	
+	
+	
+}
diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/tosca/datatypes/ToscaAnnotationsTypesDefinition.java b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/tosca/datatypes/ToscaAnnotationsTypesDefinition.java
new file mode 100644
index 0000000000..968e8dc783
--- /dev/null
+++ b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/tosca/datatypes/ToscaAnnotationsTypesDefinition.java
@@ -0,0 +1,49 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * SDC
+ * ================================================================================
+ * 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=========================================================
+ */
+
+package org.openecomp.sdc.ci.tests.tosca.datatypes;
+
+import org.openecomp.sdc.ci.tests.datatypes.enums.ToscaKeysEnum;
+import org.yaml.snakeyaml.TypeDescription;
+
+import java.util.HashMap;
+import java.util.Map;
+
+public class ToscaAnnotationsTypesDefinition extends ToscaTypesDefinition {
+
+    public static final String SOURCE_ANNOTATION = "org.openecomp.annotations.Source";
+
+    private Map<String, ToscaTypeDefinition> annotation_types = new HashMap<>();
+
+    public Map<String, ToscaTypeDefinition> getAnnotation_types() {
+        return annotation_types;
+    }
+
+    public void setAnnotation_types(Map<String, ToscaTypeDefinition> annotation_types) {
+        this.annotation_types = annotation_types;
+    }
+
+    public static TypeDescription getTypeDescription(){
+        TypeDescription typeDescription = new TypeDescription(ToscaAnnotationsTypesDefinition.class);
+        typeDescription.putListPropertyType(ToscaKeysEnum.IMPORTS.getToscaKey(), String.class);
+        typeDescription.putMapPropertyType(ToscaKeysEnum.ANNOTATION_TYPES.getToscaKey(), String.class, ToscaTypeDefinition.class);
+        return typeDescription;
+    }
+}
diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/tosca/datatypes/ToscaCapabilitiesNodeTemplatesDefinition.java b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/tosca/datatypes/ToscaCapabilitiesNodeTemplatesDefinition.java
new file mode 100644
index 0000000000..76c0c86680
--- /dev/null
+++ b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/tosca/datatypes/ToscaCapabilitiesNodeTemplatesDefinition.java
@@ -0,0 +1,25 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * SDC
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.sdc.ci.tests.tosca.datatypes;
+
+public class ToscaCapabilitiesNodeTemplatesDefinition {
+
+}
diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/tosca/datatypes/ToscaDefinition.java b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/tosca/datatypes/ToscaDefinition.java
new file mode 100644
index 0000000000..5bbb71b853
--- /dev/null
+++ b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/tosca/datatypes/ToscaDefinition.java
@@ -0,0 +1,113 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * SDC
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.sdc.ci.tests.tosca.datatypes;
+
+import org.yaml.snakeyaml.TypeDescription;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+public class ToscaDefinition {
+
+	String tosca_definitions_version;
+	Map<String, String> metadata = new HashMap<>();
+	List<Map<String, ToscaImportsDefinition>> imports = new ArrayList<>();
+	Map<String, ToscaNodeTypesDefinition> node_types = new HashMap<>();
+	ToscaTopologyTemplateDefinition topology_template = new ToscaTopologyTemplateDefinition();
+
+	public ToscaDefinition() {
+		super();
+	}
+
+	public ToscaDefinition(String tosca_definitions_version, Map<String, String> metadata, List<Map<String, ToscaImportsDefinition>> imports, Map<String, ToscaNodeTypesDefinition> node_types,
+			ToscaTopologyTemplateDefinition topology_template) {
+		super();
+		this.tosca_definitions_version = tosca_definitions_version;
+		this.metadata = metadata;
+		this.imports = imports;
+		this.node_types = node_types;
+		this.topology_template = topology_template;
+	}
+
+	public ToscaDefinition(ToscaDefinition toscaDefinition){
+		this.tosca_definitions_version = toscaDefinition.tosca_definitions_version;
+		this.metadata = new HashMap<>(toscaDefinition.metadata);
+		this.imports = new ArrayList<>(toscaDefinition.imports);
+		this.node_types = new HashMap<>(toscaDefinition.node_types);
+		this.topology_template = new ToscaTopologyTemplateDefinition(toscaDefinition.topology_template);
+	}
+	
+	public List<Map<String, ToscaImportsDefinition>> getImports() {
+		return imports;
+	}
+
+	public void setImports(List<Map<String, ToscaImportsDefinition>> imports) {
+		this.imports = imports;
+	}
+
+	public Map<String, String> getMetadata() {
+		return metadata;
+	}
+
+	public void setMetadata(Map<String, String> metadata) {
+		this.metadata = metadata;
+	}
+
+	public String getTosca_definitions_version() {
+		return tosca_definitions_version;
+	}
+
+	public void setTosca_definitions_version(String tosca_definitions_version) {
+		this.tosca_definitions_version = tosca_definitions_version;
+	}
+
+	
+	public Map<String, ToscaNodeTypesDefinition> getNode_types() {
+		return node_types;
+	}
+
+	public void setNode_types(Map<String, ToscaNodeTypesDefinition> node_types) {
+		this.node_types = node_types;
+	}
+
+	public ToscaTopologyTemplateDefinition getTopology_template() {
+		return topology_template;
+	}
+
+	public void setTopology_template(ToscaTopologyTemplateDefinition topology_template) {
+		this.topology_template = topology_template;
+	}
+
+
+
+	//gets Type description for Yaml snake
+	public static TypeDescription getTypeDescription(){
+        TypeDescription typeDescription = new TypeDescription(ToscaDefinition.class);
+        typeDescription.putMapPropertyType("metadata", String.class, String.class);
+        typeDescription.putListPropertyType("imports", Map.class);
+        typeDescription.putMapPropertyType("node_types", String.class, ToscaNodeTypesDefinition.class);
+    	return typeDescription;
+	}
+	
+	
+}
diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/tosca/datatypes/ToscaGroupPropertyDefinition.java b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/tosca/datatypes/ToscaGroupPropertyDefinition.java
new file mode 100644
index 0000000000..adab3fa5f8
--- /dev/null
+++ b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/tosca/datatypes/ToscaGroupPropertyDefinition.java
@@ -0,0 +1,170 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * SDC
+ * ================================================================================
+ * 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=========================================================
+ */
+
+package org.openecomp.sdc.ci.tests.tosca.datatypes;
+
+import org.yaml.snakeyaml.TypeDescription;
+
+public class ToscaGroupPropertyDefinition {
+
+    public String min_vf_module_instances;
+    public String max_vf_module_instances;
+    public String vf_module_label;
+    public String vfc_list;
+    public String vf_module_type;
+    public String vf_module_description;
+    public String initial_count;
+    public String volume_group;
+    public String availability_zone_count;
+
+    public ToscaGroupPropertyDefinition() {
+    }
+
+    public String getMin_vf_module_instances() {
+        return min_vf_module_instances;
+    }
+
+    public void setMin_vf_module_instances(String min_vf_module_instances) {
+        this.min_vf_module_instances = min_vf_module_instances;
+    }
+
+    public String getMax_vf_module_instances() {
+        return max_vf_module_instances;
+    }
+
+    public void setMax_vf_module_instances(String max_vf_module_instances) {
+        this.max_vf_module_instances = max_vf_module_instances;
+    }
+
+    public String getVf_module_label() {
+        return vf_module_label;
+    }
+
+    public void setVf_module_label(String vf_module_label) {
+        this.vf_module_label = vf_module_label;
+    }
+
+    public String getVfc_list() {
+        return vfc_list;
+    }
+
+    public void setVfc_list(String vfc_list) {
+        this.vfc_list = vfc_list;
+    }
+
+    public String getVf_module_type() {
+        return vf_module_type;
+    }
+
+    public void setVf_module_type(String vf_module_type) {
+        this.vf_module_type = vf_module_type;
+    }
+
+    public String getVf_module_description() {
+        return vf_module_description;
+    }
+
+    public void setVf_module_description(String vf_module_description) {
+        this.vf_module_description = vf_module_description;
+    }
+
+    public String getInitial_count() {
+        return initial_count;
+    }
+
+    public void setInitial_count(String initial_count) {
+        this.initial_count = initial_count;
+    }
+
+    public String getVolume_group() {
+        return volume_group;
+    }
+
+    public void setVolume_group(String volume_group) {
+        this.volume_group = volume_group;
+    }
+
+    public String getAvailability_zone_count() {
+        return availability_zone_count;
+    }
+
+    public void setAvailability_zone_count(String availability_zone_count) {
+        this.availability_zone_count = availability_zone_count;
+    }
+
+    @Override
+    public String toString() {
+        return "ToscaGroupPropertyDefinition{" +
+                ", min_vf_module_instances='" + min_vf_module_instances + '\'' +
+                ", max_vf_module_instances='" + max_vf_module_instances + '\'' +
+                ", vf_module_label='" + vf_module_label + '\'' +
+                ", vfc_list='" + vfc_list + '\'' +
+                ", vf_module_type='" + vf_module_type + '\'' +
+                ", vf_module_description='" + vf_module_description + '\'' +
+                ", initial_count='" + initial_count + '\'' +
+                ", volume_group='" + volume_group + '\'' +
+                ", availability_zone_count='" + availability_zone_count + '\'' +
+                '}';
+    }
+
+    //gets Type description for Yaml snake
+    public static TypeDescription getTypeDescription(){
+        TypeDescription typeDescription = new TypeDescription(ToscaGroupPropertyDefinition.class);
+        return typeDescription;
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || getClass() != o.getClass()) return false;
+
+        ToscaGroupPropertyDefinition that = (ToscaGroupPropertyDefinition) o;
+
+        if (min_vf_module_instances != null ? !min_vf_module_instances.equals(that.min_vf_module_instances) : that.min_vf_module_instances != null)
+            return false;
+        if (max_vf_module_instances != null ? !max_vf_module_instances.equals(that.max_vf_module_instances) : that.max_vf_module_instances != null)
+            return false;
+        if (vf_module_label != null ? !vf_module_label.equals(that.vf_module_label) : that.vf_module_label != null)
+            return false;
+        if (vfc_list != null ? !vfc_list.equals(that.vfc_list) : that.vfc_list != null) return false;
+        if (vf_module_type != null ? !vf_module_type.equals(that.vf_module_type) : that.vf_module_type != null)
+            return false;
+        if (vf_module_description != null ? !vf_module_description.equals(that.vf_module_description) : that.vf_module_description != null)
+            return false;
+        if (initial_count != null ? !initial_count.equals(that.initial_count) : that.initial_count != null)
+            return false;
+        if (volume_group != null ? !volume_group.equals(that.volume_group) : that.volume_group != null) return false;
+        return availability_zone_count != null ? availability_zone_count.equals(that.availability_zone_count) : that.availability_zone_count == null;
+    }
+
+    @Override
+    public int hashCode() {
+        int result = min_vf_module_instances != null ? min_vf_module_instances.hashCode() : 0;
+        result = 31 * result + (max_vf_module_instances != null ? max_vf_module_instances.hashCode() : 0);
+        result = 31 * result + (vf_module_label != null ? vf_module_label.hashCode() : 0);
+        result = 31 * result + (vfc_list != null ? vfc_list.hashCode() : 0);
+        result = 31 * result + (vf_module_type != null ? vf_module_type.hashCode() : 0);
+        result = 31 * result + (vf_module_description != null ? vf_module_description.hashCode() : 0);
+        result = 31 * result + (initial_count != null ? initial_count.hashCode() : 0);
+        result = 31 * result + (volume_group != null ? volume_group.hashCode() : 0);
+        result = 31 * result + (availability_zone_count != null ? availability_zone_count.hashCode() : 0);
+        return result;
+    }
+}
diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/tosca/datatypes/ToscaGroupsTopologyTemplateDefinition.java b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/tosca/datatypes/ToscaGroupsTopologyTemplateDefinition.java
new file mode 100644
index 0000000000..a536578e09
--- /dev/null
+++ b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/tosca/datatypes/ToscaGroupsTopologyTemplateDefinition.java
@@ -0,0 +1,177 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * SDC
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.sdc.ci.tests.tosca.datatypes;
+
+import org.yaml.snakeyaml.TypeDescription;
+
+import java.io.Serializable;
+import java.util.List;
+import java.util.Map;
+
+//	spec page 102
+
+public class ToscaGroupsTopologyTemplateDefinition extends ToscaServiceGroupsMetadataDefinition implements Serializable {
+
+	public static final long serialVersionUID = -6373752349967949120L;
+	public String type; // required
+	public String description;
+	//	private Map<String, String> properties;
+	public ToscaGroupPropertyDefinition properties;
+	public Map<String, String> targets; // required
+	public Map<String, Object> interfaces;
+	public List<String> members;
+	//	private Map<String, String> metadata;
+//	private ToscaServiceGroupsMetadataDefinition metadata;
+
+	public ToscaGroupsTopologyTemplateDefinition() {
+		super();
+	}
+
+//	public ToscaServiceGroupsMetadataDefinition getMetadata() {
+//		return metadata;
+//	}
+//
+	public void setMetadata(ToscaServiceGroupsMetadataDefinition metadata) {
+		this.vfModuleModelCustomizationUUID = metadata.vfModuleModelCustomizationUUID;
+		this.vfModuleModelInvariantUUID = metadata.vfModuleModelInvariantUUID;
+		this.vfModuleModelName = metadata.vfModuleModelName;
+		this.vfModuleModelUUID = metadata.vfModuleModelUUID;
+		this.vfModuleModelVersion = metadata.vfModuleModelVersion;
+	}
+
+
+
+	public String getType() {
+		return type;
+	}
+
+	public void setType(String type) {
+		this.type = type;
+	}
+
+	public String getDescription() {
+		return description;
+	}
+
+	public void setDescription(String description) {
+		this.description = description;
+	}
+
+//	public Map<String, String> getProperties() {
+//		return properties;
+//	}
+//
+//	public void setProperties(Map<String, String> properties) {
+//		this.properties = properties;
+//	}
+
+	public ToscaGroupPropertyDefinition getProperties() {
+		return properties;
+	}
+
+	public void setProperties(ToscaGroupPropertyDefinition properties) {
+		this.properties = properties;
+	}
+
+	public Map<String, String> getTargets() {
+		return targets;
+	}
+
+	public void setTargets(Map<String, String> targets) {
+		this.targets = targets;
+	}
+
+	public Map<String, Object> getInterfaces() {
+		return interfaces;
+	}
+
+	public void setInterfaces(Map<String, Object> interfaces) {
+		this.interfaces = interfaces;
+	}
+
+	public List<String> getMembers() {
+		return members;
+	}
+
+	public void setMembers(List<String> members) {
+		this.members = members;
+	}
+
+//	public Map<String, String> getMetadata() {
+//		return metadata;
+//	}
+//
+//	public void setMetadata(Map<String, String> metadata) {
+//		this.metadata = metadata;
+//	}
+
+//	@Override
+//	public String toString() {
+//		return "ToscaGroupsTopologyTemplateDefinition [type=" + type + ", description=" + description + ", properties=" + properties + ", targets=" + targets + ", interfaces=" + interfaces + ", members=" + members + ", metadata=" + metadata
+//				+ "]";
+//	}
+
+
+	@Override
+	public String toString() {
+		return "ToscaGroupsTopologyTemplateDefinition{" +
+				"type='" + type + '\'' +
+				", description='" + description + '\'' +
+				", properties=" + properties +
+				", targets=" + targets +
+				", interfaces=" + interfaces +
+				", members=" + members +
+				'}';
+	}
+
+
+	@Override
+	public boolean equals(Object o) {
+		if (this == o) return true;
+		if (!(o instanceof ToscaGroupsTopologyTemplateDefinition)) return false;
+		if (!super.equals(o)) return false;
+
+		ToscaGroupsTopologyTemplateDefinition that = (ToscaGroupsTopologyTemplateDefinition) o;
+
+//		if (type != null ? !type.equals(that.type) : that.type != null) return false;
+//		if (description != null ? !description.equals(that.description) : that.description != null) return false;
+//		if (properties != null ? !properties.equals(that.properties) : that.properties != null) return false;
+//		if (targets != null ? !targets.equals(that.targets) : that.targets != null) return false;
+//		if (interfaces != null ? !interfaces.equals(that.interfaces) : that.interfaces != null) return false;
+//		return members != null ? members.equals(that.members) : that.members == null;
+
+		return (properties != null ? properties.equals(that.properties) : false);
+	}
+
+	//gets Type description for Yaml snake
+	public static TypeDescription getTypeDescription(){
+		TypeDescription typeDescription = new TypeDescription(ToscaGroupsTopologyTemplateDefinition.class);
+//        typeDescription.putMapPropertyType("properties", String.class, Object.class);
+//		typeDescription.putListPropertyType("properties", ToscaGroupPropertyDefinition.class);
+		typeDescription.putMapPropertyType("interfaces", String.class, Object.class);
+		typeDescription.putMapPropertyType("targets", String.class, Object.class);
+//        typeDescription.putMapPropertyType("metadata", String.class, String.class);
+		typeDescription.putMapPropertyType("metadata", String.class, String.class);
+		typeDescription.putListPropertyType("members", String.class);
+		return typeDescription;
+	}
+
+}
diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/tosca/datatypes/ToscaImportsDefinition.java b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/tosca/datatypes/ToscaImportsDefinition.java
new file mode 100644
index 0000000000..c4324bd987
--- /dev/null
+++ b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/tosca/datatypes/ToscaImportsDefinition.java
@@ -0,0 +1,94 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * SDC
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.sdc.ci.tests.tosca.datatypes;
+
+import org.yaml.snakeyaml.TypeDescription;
+
+public class ToscaImportsDefinition {
+
+	private String name;
+	private String file;
+	private String repository;
+	private String namespace_uri;
+	private String namespace_prefix;
+	
+	public ToscaImportsDefinition() {
+		super();
+	}
+
+	public ToscaImportsDefinition(String name, String file, String repository, String namespace_uri, String namespace_prefix) {
+		super();
+		this.name = name;
+		this.file = file;
+		this.repository = repository;
+		this.namespace_uri = namespace_uri;
+		this.namespace_prefix = namespace_prefix;
+	}
+
+	public String getName() {
+		return name;
+	}
+
+	public void setName(String name) {
+		this.name = name;
+	}
+
+	public String getFile() {
+		return file;
+	}
+
+	public void setFile(String file) {
+		this.file = file;
+	}
+
+	public String getRepository() {
+		return repository;
+	}
+
+	public void setRepository(String repository) {
+		this.repository = repository;
+	}
+
+	public String getNamespace_uri() {
+		return namespace_uri;
+	}
+
+	public void setNamespace_uri(String namespace_uri) {
+		this.namespace_uri = namespace_uri;
+	}
+
+	public String getNamespace_prefix() {
+		return namespace_prefix;
+	}
+
+	public void setNamespace_prefix(String namespace_prefix) {
+		this.namespace_prefix = namespace_prefix;
+	}
+
+	//gets Type description for Yaml snake
+	public static TypeDescription getTypeDescription(){
+        TypeDescription typeDescription = new TypeDescription(ToscaImportsDefinition.class);
+    	return typeDescription;
+	}
+
+	
+	
+}
diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/tosca/datatypes/ToscaInputsAnnotation.java b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/tosca/datatypes/ToscaInputsAnnotation.java
new file mode 100644
index 0000000000..4242e483b2
--- /dev/null
+++ b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/tosca/datatypes/ToscaInputsAnnotation.java
@@ -0,0 +1,71 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * SDC
+ * ================================================================================
+ * 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=========================================================
+ */
+
+package org.openecomp.sdc.ci.tests.tosca.datatypes;
+
+import org.yaml.snakeyaml.TypeDescription;
+
+import java.util.Map;
+import java.util.Objects;
+
+public class ToscaInputsAnnotation {
+	
+	String name;
+	String type;
+	private Map<String, Object> properties;
+	
+	public String getName() {
+		return name;
+	}
+	public void setName(String name) {
+		this.name = name;
+	}
+	public String getType() {
+		return type;
+	}
+	public void setType(String type) {
+		this.type = type;
+	}
+	public Map<String, Object> getProperties() {
+		return properties;
+	}
+	public void setProperties(Map<String, Object> properties) {
+		this.properties = properties;
+	}
+	
+	
+	//gets Type description for Yaml snake
+	public static TypeDescription getTypeDescription(){
+        return new TypeDescription(ToscaInputsAnnotation.class);
+	}
+
+	@Override
+	public boolean equals(Object o) {
+		if (this == o) return true;
+		if (o == null || getClass() != o.getClass()) return false;
+		ToscaInputsAnnotation that = (ToscaInputsAnnotation) o;
+		return Objects.equals(type, that.type);
+	}
+
+	@Override
+	public int hashCode() {
+		return Objects.hash(type);
+	}
+}
diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/tosca/datatypes/ToscaInputsTopologyTemplateDefinition.java b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/tosca/datatypes/ToscaInputsTopologyTemplateDefinition.java
new file mode 100644
index 0000000000..3f0bac06d4
--- /dev/null
+++ b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/tosca/datatypes/ToscaInputsTopologyTemplateDefinition.java
@@ -0,0 +1,270 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * SDC
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.sdc.ci.tests.tosca.datatypes;
+
+import com.google.gson.annotations.SerializedName;
+import org.yaml.snakeyaml.TypeDescription;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+public class ToscaInputsTopologyTemplateDefinition {
+	
+	public String name;
+	public String type;
+	public String description;
+	public Boolean required;
+	public Boolean hidden;
+	public Boolean immutable;
+	@SerializedName("default")
+	public Object Default;
+
+	public String status;
+	public List<Object> constraints = new ArrayList<>();
+	public Map<String, Object> entry_schema;
+	public Object value;
+	public Map<String, ToscaInputsAnnotation> annotations;
+
+	public ToscaInputsTopologyTemplateDefinition(String name, String type, String description, Boolean required, Object default1, String status, List<Object> constraints, Map<String, Object> entry_schema, Object value, Boolean immutable, Boolean hidden, Map<String, ToscaInputsAnnotation> annotations) {
+		super();
+		this.name = name;
+		this.type = type;
+		this.description = description;
+		this.required = required;
+		Default = default1;
+		this.status = status;
+		this.constraints = constraints;
+		this.entry_schema = entry_schema;
+		this.value = value;
+		this.immutable = immutable;
+		this.hidden = hidden;
+		this.annotations = annotations;
+	}
+
+	public ToscaInputsTopologyTemplateDefinition() {
+	}
+	public ToscaInputsTopologyTemplateDefinition(ToscaInputsTopologyTemplateDefinition definition){
+//		this(definition.getName(), definition.getType(), definition.getDescription(), definition.getRequired(), definition.getDefault(), definition.getStatus(), definition.getConstraints(), definition.getEntry_schema(), definition.getValue());
+		this.name = definition.name;
+		this.type = definition.type;
+		this.description = definition.description;
+		this.required = definition.required;
+		this.Default = definition.Default;
+		this.status = definition.status;
+		this.constraints = definition.constraints;
+		this.entry_schema = definition.entry_schema;
+		this.value = definition.value;
+		this.immutable = immutable;
+		this.hidden = hidden;
+	}
+	
+	public Boolean getHidden() {
+		return hidden;
+	}
+
+	public void setHidden(Boolean hidden) {
+		this.hidden = hidden;
+	}
+
+	public Boolean getImmutable() {
+		return immutable;
+	}
+
+	public void setImmutable(Boolean immutable) {
+		this.immutable = immutable;
+	}
+
+	public String getName() {
+		return name;
+	}
+
+	public void setName(String name) {
+		this.name = name;
+	}
+
+	public String getType() {
+		return type;
+	}
+
+	public void setType(String type) {
+		this.type = type;
+	}
+
+	public String getDescription() {
+		return description;
+	}
+
+	public void setDescription(String description) {
+		this.description = description;
+	}
+
+	public Boolean getRequired() {
+		return required;
+	}
+
+	public void setRequired(Boolean required) {
+		this.required = required;
+	}
+
+	public Object getDefault() {
+		return Default;
+	}
+
+	public void setDefault(Object default1) {
+		Default = default1;
+	}
+
+	public String getStatus() {
+		return status;
+	}
+
+	public void setStatus(String status) {
+		this.status = status;
+	}
+
+	public List<Object> getConstraints() {
+		return constraints;
+	}
+
+	public void setConstraints(List<Object> constraints) {
+		this.constraints = constraints;
+	}
+
+	public Map<String, Object> getEntry_schema() {
+		return entry_schema;
+	}
+
+	public void setEntry_schema(Map<String, Object> entry_schema) {
+		this.entry_schema = entry_schema;
+	}
+
+	public Object getValue() {
+		return value;
+	}
+
+	public void setValue(Object value) {
+		this.value = value;
+	}
+
+	public Map<String, ToscaInputsAnnotation> getAnnotations() {
+		return annotations;
+	}
+
+	public void setAnnotations(Map<String, ToscaInputsAnnotation> annotations) {
+		this.annotations = annotations;
+	}
+
+	//gets Type description for Yaml snake
+	public static TypeDescription getTypeDescription(){
+        TypeDescription typeDescription = new TypeDescription(ToscaInputsTopologyTemplateDefinition.class);
+        typeDescription.putListPropertyType("constraints", Object.class);
+        typeDescription.putMapPropertyType("entry_schema", String.class, Object.class);
+        typeDescription.putMapPropertyType("annotations", String.class, ToscaInputsAnnotation.class); 
+    	return typeDescription;
+	}
+
+	@Override
+	public int hashCode() {
+		final int prime = 31;
+		int result = 1;
+		result = prime * result + ((Default == null) ? 0 : Default.hashCode());
+		result = prime * result + ((constraints == null) ? 0 : constraints.hashCode());
+		result = prime * result + ((description == null) ? 0 : description.hashCode());
+		result = prime * result + ((entry_schema == null) ? 0 : entry_schema.hashCode());
+		result = prime * result + ((hidden == null) ? 0 : hidden.hashCode());
+		result = prime * result + ((immutable == null) ? 0 : immutable.hashCode());
+		result = prime * result + ((name == null) ? 0 : name.hashCode());
+		result = prime * result + ((required == null) ? 0 : required.hashCode());
+		result = prime * result + ((status == null) ? 0 : status.hashCode());
+		result = prime * result + ((type == null) ? 0 : type.hashCode());
+		result = prime * result + ((value == null) ? 0 : value.hashCode());
+		return result;
+	}
+
+	@Override
+	public boolean equals(Object obj) {
+		if (this == obj)
+			return true;
+		if (obj == null)
+			return false;
+		if (getClass() != obj.getClass())
+			return false;
+		ToscaInputsTopologyTemplateDefinition other = (ToscaInputsTopologyTemplateDefinition) obj;
+		if (Default == null) {
+			if (other.Default != null)
+				return false;
+		} else if (!Default.equals(other.Default))
+			return false;
+		if (constraints == null) {
+			if (other.constraints != null)
+				return false;
+		} else if (!constraints.equals(other.constraints))
+			return false;
+		if (description == null) {
+			if (other.description != null)
+				return false;
+		} else if (!description.equals(other.description))
+			return false;
+		if (entry_schema == null) {
+			if (other.entry_schema != null)
+				return false;
+		} else if (!entry_schema.equals(other.entry_schema))
+			return false;
+		if (hidden == null) {
+			if (other.hidden != null)
+				return false;
+		} else if (!hidden.equals(other.hidden))
+			return false;
+		if (immutable == null) {
+			if (other.immutable != null)
+				return false;
+		} else if (!immutable.equals(other.immutable))
+			return false;
+		if (name == null) {
+			if (other.name != null)
+				return false;
+		} else if (!name.equals(other.name))
+			return false;
+		if (required == null) {
+			if (other.required != null)
+				return false;
+		} else if (!required.equals(other.required))
+			return false;
+		if (status == null) {
+			if (other.status != null)
+				return false;
+		} else if (!status.equals(other.status))
+			return false;
+		if (type == null) {
+			if (other.type != null)
+				return false;
+		} else if (!type.equals(other.type))
+			return false;
+		if (value == null) {
+			if (other.value != null)
+				return false;
+		} else if (!value.equals(other.value))
+			return false;
+		return true;
+	}
+
+}
diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/tosca/datatypes/ToscaMetadataDefinition.java b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/tosca/datatypes/ToscaMetadataDefinition.java
new file mode 100644
index 0000000000..ceba7adbe4
--- /dev/null
+++ b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/tosca/datatypes/ToscaMetadataDefinition.java
@@ -0,0 +1,196 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * SDC
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.sdc.ci.tests.tosca.datatypes;
+
+import org.yaml.snakeyaml.TypeDescription;
+
+public class ToscaMetadataDefinition {
+
+	private String invariantUUID;
+	private String UUID;
+	private String name;
+	private String description;
+	private String type;
+	private String category;
+	private String subcategory;
+	private String resourceVendor;
+	private String resourceVendorRelease;
+	private String resourceVendorModelNumber;
+	private String serviceType;
+	private String serviceRole;
+	private String serviceEcompNaming;
+	private String ecompGeneratedNaming;
+	private String namingPolicy;
+	
+	public ToscaMetadataDefinition(String invariantUUID, String uUID, String name, String description, String type, String category, String subcategory, String resourceVendor, String resourceVendorRelease, String resourceVendorModelNumber,
+			String serviceType, String serviceRole, String serviceEcompNaming, String ecompGeneratedNaming, String namingPolicy) {
+		super();
+		this.invariantUUID = invariantUUID;
+		UUID = uUID;
+		this.name = name;
+		this.description = description;
+		this.type = type;
+		this.category = category;
+		this.subcategory = subcategory;
+		this.resourceVendor = resourceVendor;
+		this.resourceVendorRelease = resourceVendorRelease;
+		this.resourceVendorModelNumber = resourceVendorModelNumber;
+		this.serviceType = serviceType;
+		this.serviceRole = serviceRole;
+		this.serviceEcompNaming = serviceEcompNaming;
+		this.ecompGeneratedNaming = ecompGeneratedNaming;
+		this.namingPolicy = namingPolicy;
+	}
+
+	public String getInvariantUUID() {
+		return invariantUUID;
+	}
+
+	public void setInvariantUUID(String invariantUUID) {
+		this.invariantUUID = invariantUUID;
+	}
+
+	public String getUUID() {
+		return UUID;
+	}
+
+	public void setUUID(String uUID) {
+		UUID = uUID;
+	}
+
+	public String getName() {
+		return name;
+	}
+
+	public void setName(String name) {
+		this.name = name;
+	}
+
+	public String getDescription() {
+		return description;
+	}
+
+	public void setDescription(String description) {
+		this.description = description;
+	}
+
+	public String getType() {
+		return type;
+	}
+
+	public void setType(String type) {
+		this.type = type;
+	}
+
+	public String getCategory() {
+		return category;
+	}
+
+	public void setCategory(String category) {
+		this.category = category;
+	}
+
+	public String getSubcategory() {
+		return subcategory;
+	}
+
+	public void setSubcategory(String subcategory) {
+		this.subcategory = subcategory;
+	}
+
+	public String getResourceVendor() {
+		return resourceVendor;
+	}
+
+	public void setResourceVendor(String resourceVendor) {
+		this.resourceVendor = resourceVendor;
+	}
+
+	public String getResourceVendorRelease() {
+		return resourceVendorRelease;
+	}
+
+	public void setResourceVendorRelease(String resourceVendorRelease) {
+		this.resourceVendorRelease = resourceVendorRelease;
+	}
+
+	public String getResourceVendorModelNumber() {
+		return resourceVendorModelNumber;
+	}
+
+	public void setResourceVendorModelNumber(String resourceVendorModelNumber) {
+		this.resourceVendorModelNumber = resourceVendorModelNumber;
+	}
+
+	public String getServiceType() {
+		return serviceType;
+	}
+
+	public void setServiceType(String serviceType) {
+		this.serviceType = serviceType;
+	}
+
+	public String getServiceRole() {
+		return serviceRole;
+	}
+
+	public void setServiceRole(String serviceRole) {
+		this.serviceRole = serviceRole;
+	}
+
+	public String getServiceEcompNaming() {
+		return serviceEcompNaming;
+	}
+
+	public void setServiceEcompNaming(String serviceEcompNaming) {
+		this.serviceEcompNaming = serviceEcompNaming;
+	}
+
+	public String getEcompGeneratedNaming() {
+		return ecompGeneratedNaming;
+	}
+
+	public void setEcompGeneratedNaming(String ecompGeneratedNaming) {
+		this.ecompGeneratedNaming = ecompGeneratedNaming;
+	}
+
+	public String getNamingPolicy() {
+		return namingPolicy;
+	}
+
+	public void setNamingPolicy(String namingPolicy) {
+		this.namingPolicy = namingPolicy;
+	}
+
+	@Override
+	public String toString() {
+		return "ToscaMetadataDefinition [invariantUUID=" + invariantUUID + ", UUID=" + UUID + ", name=" + name + ", description=" + description + ", type=" + type + ", category=" + category + ", subcategory=" + subcategory
+				+ ", resourceVendor=" + resourceVendor + ", resourceVendorRelease=" + resourceVendorRelease + ", resourceVendorModelNumber=" + resourceVendorModelNumber + ", serviceType=" + serviceType + ", serviceRole=" + serviceRole
+				+ ", serviceEcompNaming=" + serviceEcompNaming + ", ecompGeneratedNaming=" + ecompGeneratedNaming + ", namingPolicy=" + namingPolicy + "]";
+	}
+	
+	//gets Type description for Yaml snake
+	public static TypeDescription getTypeDescription(){
+        TypeDescription typeDescription = new TypeDescription(ToscaMetadataDefinition.class);
+    	return typeDescription;
+	}
+	
+}
diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/tosca/datatypes/ToscaNodeTemplatesTopologyTemplateDefinition.java b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/tosca/datatypes/ToscaNodeTemplatesTopologyTemplateDefinition.java
new file mode 100644
index 0000000000..442656ebf6
--- /dev/null
+++ b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/tosca/datatypes/ToscaNodeTemplatesTopologyTemplateDefinition.java
@@ -0,0 +1,175 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * SDC
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.sdc.ci.tests.tosca.datatypes;
+
+import org.yaml.snakeyaml.TypeDescription;
+
+import java.util.List;
+import java.util.Map;
+
+public class ToscaNodeTemplatesTopologyTemplateDefinition {
+
+	private String name;
+	private String type;
+	private String description;
+	private String [] directives;
+	private Map<String, Object> properties;
+	private Map<String, Object> attributes;
+	private List<Map<String, Object>> requirements;
+	private Object capabilities;
+//	private List<Map<String, Object>> capabilities;
+//	private Map<String, ToscaPropertiesNodeTemplatesDefinition> properties;
+//	private Map<String, ToscaRequirementsNodeTemplatesDefinition> requirements;
+//	private Map<String, ToscaCapabilitiesNodeTemplatesDefinition> capabilities;
+	private Map<String, Object> interfaces;
+	private Map<String, Object> artifacts;
+	private Map<String, Object> node_filter;
+	private String copy;
+	private Map<String, String> metadata;
+
+
+	public ToscaNodeTemplatesTopologyTemplateDefinition() {
+		super();
+	}
+	
+	public Object getCapabilities() {
+		return capabilities;
+	}
+	
+	public void setCapabilities(Object capabilities) {
+		this.capabilities = capabilities;
+	}
+	
+	public Map<String, String> getMetadata() {
+		return metadata;
+	}
+
+	public void setMetadata(Map<String, String> metadata) {
+		this.metadata = metadata;
+	}
+
+
+	public String getName() {
+		return name;
+	}
+
+	public void setName(String name) {
+		this.name = name;
+	}
+
+	public String getType() {
+		return type;
+	}
+
+	public void setType(String type) {
+		this.type = type;
+	}
+
+	public String getDescription() {
+		return description;
+	}
+
+	public void setDescription(String description) {
+		this.description = description;
+	}
+
+	public String[] getDirectives() {
+		return directives;
+	}
+
+	public void setDirectives(String[] directives) {
+		this.directives = directives;
+	}
+
+
+	public Map<String, Object> getProperties() {
+		return properties;
+	}
+
+	public void setProperties(Map<String, Object> properties) {
+		this.properties = properties;
+	}
+
+	public Map<String, Object> getAttributes() {
+		return attributes;
+	}
+
+	public void setAttributes(Map<String, Object> attributes) {
+		this.attributes = attributes;
+	}
+
+	public List<Map<String, Object>> getRequirements() {
+		return requirements;
+	}
+
+	public void setRequirements(List<Map<String, Object>> requirements) {
+		this.requirements = requirements;
+	}
+
+	public Map<String, Object> getInterfaces() {
+		return interfaces;
+	}
+
+	public void setInterfaces(Map<String, Object> interfaces) {
+		this.interfaces = interfaces;
+	}
+
+	public Map<String, Object> getArtifacts() {
+		return artifacts;
+	}
+
+	public void setArtifacts(Map<String, Object> artifacts) {
+		this.artifacts = artifacts;
+	}
+
+	public Map<String, Object> getNode_filter() {
+		return node_filter;
+	}
+
+	public void setNode_filter(Map<String, Object> node_filter) {
+		this.node_filter = node_filter;
+	}
+
+	public String getCopy() {
+		return copy;
+	}
+
+	public void setCopy(String copy) {
+		this.copy = copy;
+	}
+	
+	//gets Type description for Yaml snake
+	public static TypeDescription getTypeDescription(){
+        TypeDescription typeDescription = new TypeDescription(ToscaNodeTemplatesTopologyTemplateDefinition.class);
+        typeDescription.putMapPropertyType("properties", String.class, Object.class);
+        typeDescription.putListPropertyType("requirements", Map.class);
+//        typeDescription.putMapPropertyType("capabilities",String.class, Object.class);
+//        typeDescription.putListPropertyType("capabilities", Object.class);
+    	typeDescription.putMapPropertyType("attributes", String.class, Object.class);
+    	typeDescription.putMapPropertyType("interfaces", String.class, Object.class);
+    	typeDescription.putMapPropertyType("artifacts", String.class, Object.class);
+    	typeDescription.putMapPropertyType("node_filter", String.class, Object.class);
+    	typeDescription.putMapPropertyType("metadata", String.class, String.class);
+    	return typeDescription;
+	}
+	
+	
+}
diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/tosca/datatypes/ToscaNodeTypesDefinition.java b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/tosca/datatypes/ToscaNodeTypesDefinition.java
new file mode 100644
index 0000000000..b9d200a252
--- /dev/null
+++ b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/tosca/datatypes/ToscaNodeTypesDefinition.java
@@ -0,0 +1,142 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * SDC
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.sdc.ci.tests.tosca.datatypes;
+
+import java.util.HashMap;
+import java.util.Map;
+
+// spec page 88
+public class ToscaNodeTypesDefinition {
+
+	private String name;
+	private String derived_from;
+	private String version;
+	private String description;
+	private Map<String, Object> properties = new HashMap<>();
+	private Map<String, Object> attributes = new HashMap<>();
+	private Map<String, Object> requirements = new HashMap<>();
+	private Map<String, Object> capabilities = new HashMap<>();
+	private Map<String, Object> interfaces = new HashMap<>();
+	private Map<String, Object> artifacts = new HashMap<>();
+	
+	public ToscaNodeTypesDefinition() {
+		super();
+	}
+
+	public ToscaNodeTypesDefinition(String name, String derived_from, String version, String description, Map<String, Object> properties, Map<String, Object> attributes, Map<String, Object> requirements, Map<String, Object> capabilities,
+			Map<String, Object> interfaces, Map<String, Object> artifacts) {
+		super();
+		this.name = name;
+		this.derived_from = derived_from;
+		this.version = version;
+		this.description = description;
+		this.properties = properties;
+		this.attributes = attributes;
+		this.requirements = requirements;
+		this.capabilities = capabilities;
+		this.interfaces = interfaces;
+		this.artifacts = artifacts;
+	}
+
+	public String getName() {
+		return name;
+	}
+
+	public void setName(String name) {
+		this.name = name;
+	}
+
+	public String getDerived_from() {
+		return derived_from;
+	}
+
+	public void setDerived_from(String derived_from) {
+		this.derived_from = derived_from;
+	}
+
+	public String getVersion() {
+		return version;
+	}
+
+	public void setVersion(String version) {
+		this.version = version;
+	}
+
+	public String getDescription() {
+		return description;
+	}
+
+	public void setDescription(String description) {
+		this.description = description;
+	}
+
+	public Map<String, Object> getProperties() {
+		return properties;
+	}
+
+	public void setProperties(Map<String, Object> properties) {
+		this.properties = properties;
+	}
+
+	public Map<String, Object> getAttributes() {
+		return attributes;
+	}
+
+	public void setAttributes(Map<String, Object> attributes) {
+		this.attributes = attributes;
+	}
+
+	public Map<String, Object> getRequirements() {
+		return requirements;
+	}
+
+	public void setRequirements(Map<String, Object> requirements) {
+		this.requirements = requirements;
+	}
+
+	public Map<String, Object> getCapabilities() {
+		return capabilities;
+	}
+
+	public void setCapabilities(Map<String, Object> capabilities) {
+		this.capabilities = capabilities;
+	}
+
+	public Map<String, Object> getInterfaces() {
+		return interfaces;
+	}
+
+	public void setInterfaces(Map<String, Object> interfaces) {
+		this.interfaces = interfaces;
+	}
+
+	public Map<String, Object> getArtifacts() {
+		return artifacts;
+	}
+
+	public void setArtifacts(Map<String, Object> artifacts) {
+		this.artifacts = artifacts;
+	}
+
+	
+	
+
+}
diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/tosca/datatypes/ToscaOutputsTopologyTemplateDefinition.java b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/tosca/datatypes/ToscaOutputsTopologyTemplateDefinition.java
new file mode 100644
index 0000000000..b370dd3b6d
--- /dev/null
+++ b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/tosca/datatypes/ToscaOutputsTopologyTemplateDefinition.java
@@ -0,0 +1,48 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * SDC
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.sdc.ci.tests.tosca.datatypes;
+
+import java.util.Map;
+
+public class ToscaOutputsTopologyTemplateDefinition {
+
+	private Map<String, Object> outputs;
+
+	public ToscaOutputsTopologyTemplateDefinition() {
+		super();
+	}
+
+	public Map<String, Object> getOutputs() {
+		return outputs;
+	}
+
+	public void setOutputs(Map<String, Object> outputs) {
+		this.outputs = outputs;
+	}
+
+	@Override
+	public String toString() {
+		return "ToscaOutputsTopologyTemplateDefinition [outputs=" + outputs + "]";
+	}
+	
+	
+	
+}
diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/tosca/datatypes/ToscaParameterConstants.java b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/tosca/datatypes/ToscaParameterConstants.java
new file mode 100644
index 0000000000..32ccbe3000
--- /dev/null
+++ b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/tosca/datatypes/ToscaParameterConstants.java
@@ -0,0 +1,32 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * SDC
+ * ================================================================================
+ * 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=========================================================
+ */
+
+package org.openecomp.sdc.ci.tests.tosca.datatypes;
+
+public interface ToscaParameterConstants {
+
+	String TOSCA_DEFINITION_PATH = "Definitions";
+	String ENTRY_DEFINITION = "Entry-Definitions";
+	String TOSCA_META_PATH = "TOSCA-Metadata/TOSCA.meta";
+	String HEAT_META_PATH = "Artifacts/HEAT.meta";
+	String IMPORT_STRUCTURE = "importStructure";
+	String NODE_TYPES = "node_types";
+	String PROPERTIES = "properties";
+}
diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/tosca/datatypes/ToscaPoliciesTopologyTemplateDefinition.java b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/tosca/datatypes/ToscaPoliciesTopologyTemplateDefinition.java
new file mode 100644
index 0000000000..7ac3e876b4
--- /dev/null
+++ b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/tosca/datatypes/ToscaPoliciesTopologyTemplateDefinition.java
@@ -0,0 +1,67 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * SDC
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.sdc.ci.tests.tosca.datatypes;
+
+import java.util.Map;
+
+public class ToscaPoliciesTopologyTemplateDefinition {
+
+	public ToscaPoliciesTopologyTemplateDefinition() {
+		super();
+	}
+	
+	private String type; // required
+	private String description;
+	private Map<String, Object> properties;
+	private Map<String, String> targets;
+	public String getType() {
+		return type;
+	}
+	public void setType(String type) {
+		this.type = type;
+	}
+	public String getDescription() {
+		return description;
+	}
+	public void setDescription(String description) {
+		this.description = description;
+	}
+	public Map<String, Object> getProperties() {
+		return properties;
+	}
+	public void setProperties(Map<String, Object> properties) {
+		this.properties = properties;
+	}
+	public Map<String, String> getTargets() {
+		return targets;
+	}
+	public void setTargets(Map<String, String> targets) {
+		this.targets = targets;
+	}
+	@Override
+	public String toString() {
+		return "ToscaPoliciesTopologyTemplateDefinition [type=" + type + ", description=" + description + ", properties=" + properties + ", targets=" + targets + "]";
+	}
+	
+	
+	
+}
+
diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/tosca/datatypes/ToscaRelationshipTemplatesTopologyTemplateDefinition.java b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/tosca/datatypes/ToscaRelationshipTemplatesTopologyTemplateDefinition.java
new file mode 100644
index 0000000000..881f7f587e
--- /dev/null
+++ b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/tosca/datatypes/ToscaRelationshipTemplatesTopologyTemplateDefinition.java
@@ -0,0 +1,78 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * SDC
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.sdc.ci.tests.tosca.datatypes;
+
+import java.util.Map;
+
+public class ToscaRelationshipTemplatesTopologyTemplateDefinition {
+
+	public ToscaRelationshipTemplatesTopologyTemplateDefinition() {
+	}
+
+	private String type;
+	private String description;
+	private Map<String, Object> properties;
+	private Map<String, Object> attributes;
+	private Map<String, Object> interfaces;
+	private String copy;
+	public String getType() {
+		return type;
+	}
+	public void setType(String type) {
+		this.type = type;
+	}
+	public String getDescription() {
+		return description;
+	}
+	public void setDescription(String description) {
+		this.description = description;
+	}
+	public Map<String, Object> getProperties() {
+		return properties;
+	}
+	public void setProperties(Map<String, Object> properties) {
+		this.properties = properties;
+	}
+	public Map<String, Object> getAttributes() {
+		return attributes;
+	}
+	public void setAttributes(Map<String, Object> attributes) {
+		this.attributes = attributes;
+	}
+	public Map<String, Object> getInterfaces() {
+		return interfaces;
+	}
+	public void setInterfaces(Map<String, Object> interfaces) {
+		this.interfaces = interfaces;
+	}
+	public String getCopy() {
+		return copy;
+	}
+	public void setCopy(String copy) {
+		this.copy = copy;
+	}
+	@Override
+	public String toString() {
+		return "ToscaRelationshipTemplatesTopologyTemplateDefinition [type=" + type + ", description=" + description + ", properties=" + properties + ", attributes=" + attributes + ", interfaces=" + interfaces + ", copy=" + copy + "]";
+	}
+	
+	
+}
diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/tosca/datatypes/ToscaRequirementsNodeTemplatesDefinition.java b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/tosca/datatypes/ToscaRequirementsNodeTemplatesDefinition.java
new file mode 100644
index 0000000000..bd9f0f0f5e
--- /dev/null
+++ b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/tosca/datatypes/ToscaRequirementsNodeTemplatesDefinition.java
@@ -0,0 +1,72 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * SDC
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.sdc.ci.tests.tosca.datatypes;
+
+public class ToscaRequirementsNodeTemplatesDefinition {
+
+	String name;
+	String capability;
+	String node;
+	String relationship;
+
+	public ToscaRequirementsNodeTemplatesDefinition() {
+		super();
+	}
+
+	public String getName() {
+		return name;
+	}
+
+	public void setName(String name) {
+		this.name = name;
+	}
+
+	public String getCapability() {
+		return capability;
+	}
+
+	public void setCapability(String capability) {
+		this.capability = capability;
+	}
+
+	public String getNode() {
+		return node;
+	}
+
+	public void setNode(String node) {
+		this.node = node;
+	}
+
+	public String getRelationship() {
+		return relationship;
+	}
+
+	public void setRelationship(String relationship) {
+		this.relationship = relationship;
+	}
+
+	@Override
+	public String toString() {
+		return "ToscaRequirementsDefinition [name=" + name + ", capability=" + capability + ", node=" + node
+				+ ", relationship=" + relationship + "]";
+	}
+
+}
diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/tosca/datatypes/ToscaServiceGroupsMetadataDefinition.java b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/tosca/datatypes/ToscaServiceGroupsMetadataDefinition.java
new file mode 100644
index 0000000000..5b50b0e854
--- /dev/null
+++ b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/tosca/datatypes/ToscaServiceGroupsMetadataDefinition.java
@@ -0,0 +1,106 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * SDC
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.sdc.ci.tests.tosca.datatypes;
+
+import java.io.Serializable;
+
+public class ToscaServiceGroupsMetadataDefinition implements Serializable {
+
+	public static final long serialVersionUID = -6373756459974949120L;
+
+	public String vfModuleModelName;
+	public String vfModuleModelInvariantUUID;
+	public String vfModuleModelCustomizationUUID;
+	public String vfModuleModelUUID;
+	public String vfModuleModelVersion;
+	
+	public ToscaServiceGroupsMetadataDefinition() {
+		super();
+	}
+
+	public String getVfModuleModelName() {
+		return vfModuleModelName;
+	}
+
+	public void setVfModuleModelName(String vfModuleModelName) {
+		this.vfModuleModelName = vfModuleModelName;
+	}
+
+	public String getVfModuleModelInvariantUUID() {
+		return vfModuleModelInvariantUUID;
+	}
+
+	public void setVfModuleModelInvariantUUID(String vfModuleModelInvariantUUID) {
+		this.vfModuleModelInvariantUUID = vfModuleModelInvariantUUID;
+	}
+
+	public String getVfModuleModelCustomizationUUID() {
+		return vfModuleModelCustomizationUUID;
+	}
+
+	public void setVfModuleModelCustomizationUUID(String vfModuleModelCustomizationUUID) {
+		this.vfModuleModelCustomizationUUID = vfModuleModelCustomizationUUID;
+	}
+
+	public String getVfModuleModelUUID() {
+		return vfModuleModelUUID;
+	}
+
+	public void setVfModuleModelUUID(String vfModuleModelUUID) {
+		this.vfModuleModelUUID = vfModuleModelUUID;
+	}
+
+	public String getVfModuleModelVersion() {
+		return vfModuleModelVersion;
+	}
+
+	public void setVfModuleModelVersion(String vfModuleModelVersion) {
+		this.vfModuleModelVersion = vfModuleModelVersion;
+	}
+
+	@Override
+	public String toString() {
+		return "ToscaGroupsMetadataDefinition [vfModuleModelName=" + vfModuleModelName + ", vfModuleModelInvariantUUID=" + vfModuleModelInvariantUUID + ", vfModuleModelCustomizationUUID=" + vfModuleModelCustomizationUUID
+				+ ", vfModuleModelUUID=" + vfModuleModelUUID + ", vfModuleModelVersion=" + vfModuleModelVersion + "]";
+	}
+
+	@Override
+	public boolean equals(Object o) {
+		if (this == o) return true;
+		if (!(o instanceof ToscaServiceGroupsMetadataDefinition)) return false;
+
+		ToscaServiceGroupsMetadataDefinition that = (ToscaServiceGroupsMetadataDefinition) o;
+
+		if (vfModuleModelName != null ? !vfModuleModelName.equals(that.vfModuleModelName) : that.vfModuleModelName != null)
+			return false;
+		if (!vfModuleModelInvariantUUID.equals(that.vfModuleModelInvariantUUID)) return false;
+		if (vfModuleModelCustomizationUUID != null ? !vfModuleModelCustomizationUUID.equals(that.vfModuleModelCustomizationUUID) : that.vfModuleModelCustomizationUUID != null)
+			return false;
+		if (vfModuleModelUUID != null ? !vfModuleModelUUID.equals(that.vfModuleModelUUID) : that.vfModuleModelUUID != null)
+			return false;
+		return vfModuleModelVersion != null ? vfModuleModelVersion.equals(that.vfModuleModelVersion) : that.vfModuleModelVersion == null;
+	}
+
+	@Override
+	public int hashCode() {
+		return vfModuleModelInvariantUUID.hashCode();
+	}
+}
diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/tosca/datatypes/ToscaSubstitutionMappingsDefinition.java b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/tosca/datatypes/ToscaSubstitutionMappingsDefinition.java
new file mode 100644
index 0000000000..d3bb2a03d0
--- /dev/null
+++ b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/tosca/datatypes/ToscaSubstitutionMappingsDefinition.java
@@ -0,0 +1,71 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * SDC
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.sdc.ci.tests.tosca.datatypes;
+
+import org.yaml.snakeyaml.TypeDescription;
+
+import java.util.HashMap;
+import java.util.Map;
+
+public class ToscaSubstitutionMappingsDefinition {
+
+	private String node_type;
+	private Map<String, Object> requirements = new HashMap<>();
+	private Map<String, Object> capabilities = new HashMap<>();
+
+	public ToscaSubstitutionMappingsDefinition() {
+		super();
+	}
+	
+	public String getNode_type() {
+		return node_type;
+	}
+
+	public void setNode_type(String node_type) {
+		this.node_type = node_type;
+	}
+
+	public Map<String, Object> getRequirements() {
+		return requirements;
+	}
+
+	public void setRequirements(Map<String, Object> requirements) {
+		this.requirements = requirements;
+	}
+
+	public Map<String, Object> getCapabilities() {
+		return capabilities;
+	}
+
+	public void setCapabilities(Map<String, Object> capabilities) {
+		this.capabilities = capabilities;
+	}
+
+//	gets Type description for Yaml snake
+	public static TypeDescription getTypeDescription(){
+        TypeDescription typeDescription = new TypeDescription(ToscaSubstitutionMappingsDefinition.class);
+        typeDescription.putMapPropertyType("requirements", String.class, Object.class);
+        typeDescription.putMapPropertyType("capabilities", String.class, Object.class);
+    	return typeDescription;
+	}
+	
+	
+}
diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/tosca/datatypes/ToscaTopologyTemplateDefinition.java b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/tosca/datatypes/ToscaTopologyTemplateDefinition.java
new file mode 100644
index 0000000000..9b2996044a
--- /dev/null
+++ b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/tosca/datatypes/ToscaTopologyTemplateDefinition.java
@@ -0,0 +1,119 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * SDC
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.sdc.ci.tests.tosca.datatypes;
+
+import org.yaml.snakeyaml.TypeDescription;
+
+import java.util.HashMap;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+//	spec page 104	
+public class ToscaTopologyTemplateDefinition {
+
+	String description;
+//	Map<String, Map<String, ToscaInputsDefinition>> inputs;
+	Map<String,ToscaNodeTemplatesTopologyTemplateDefinition> node_templates = new HashMap<>();
+//	Map<String,ToscaRelationshipTemplatesTopologyTemplateDefinition> relationship_templates;
+	Map<String,ToscaGroupsTopologyTemplateDefinition> groups = new HashMap<>();
+	Map<String, ToscaInputsTopologyTemplateDefinition> inputs = new HashMap<>();
+//	Map<String,ToscaPoliciesTopologyTemplateDefinition> policies;
+//	Map<String,ToscaOutputsTopologyTemplateDefinition> outputs;
+	ToscaSubstitutionMappingsDefinition substitution_mappings;
+	
+	public ToscaTopologyTemplateDefinition() {
+		super();
+	}
+	
+	public ToscaTopologyTemplateDefinition(ToscaTopologyTemplateDefinition definition) {
+		this.description = definition.description;
+		this.node_templates = new HashMap<>(definition.node_templates);
+		this.groups = new HashMap<String,ToscaGroupsTopologyTemplateDefinition>(definition.groups);
+		this.inputs = definition.inputs.entrySet().stream().collect(Collectors.toMap(e -> e.getKey(), e -> new ToscaInputsTopologyTemplateDefinition(e.getValue())));
+		this.substitution_mappings = definition.substitution_mappings;
+	}
+	
+	public ToscaTopologyTemplateDefinition(String description, Map<String, ToscaNodeTemplatesTopologyTemplateDefinition> node_templates, Map<String, ToscaGroupsTopologyTemplateDefinition> groups,
+		Map<String, ToscaInputsTopologyTemplateDefinition> inputs, ToscaSubstitutionMappingsDefinition substitution_mappings) {
+	super();
+	this.description = description;
+	this.node_templates = node_templates;
+	this.groups = groups;
+	this.inputs = inputs;
+	this.substitution_mappings = substitution_mappings;
+}
+
+	public Map<String, ToscaInputsTopologyTemplateDefinition> getInputs() {
+		return inputs;
+	}
+
+	public void setInputs(Map<String, ToscaInputsTopologyTemplateDefinition> inputs) {
+		this.inputs = inputs;
+	}
+
+	public void addInputs(Map<String, ToscaInputsTopologyTemplateDefinition> inputs) {
+		this.inputs.putAll(inputs);
+	}
+	
+	public ToscaSubstitutionMappingsDefinition getSubstitution_mappings() {
+		return substitution_mappings;
+	}
+	public void setSubstitution_mappings(ToscaSubstitutionMappingsDefinition substitution_mappings) {
+		this.substitution_mappings = substitution_mappings;
+	}
+
+	public String getDescription() {
+		return description;
+	}
+
+	public void setDescription(String description) {
+		this.description = description;
+	}
+
+
+	public Map<String, ToscaNodeTemplatesTopologyTemplateDefinition> getNode_templates() {
+		return node_templates;
+	}
+
+	public void setNode_templates(Map<String, ToscaNodeTemplatesTopologyTemplateDefinition> node_templates) {
+		this.node_templates = node_templates;
+	}
+
+	public Map<String, ToscaGroupsTopologyTemplateDefinition> getGroups() {
+		return groups;
+	}
+
+	public void setGroups(Map<String, ToscaGroupsTopologyTemplateDefinition> groups) {
+		this.groups = groups;
+	}
+
+	
+	//gets Type description for Yaml snake
+	public static TypeDescription getTypeDescription(){
+        TypeDescription typeDescription = new TypeDescription(ToscaTopologyTemplateDefinition.class);
+        typeDescription.putMapPropertyType("inputs", String.class, ToscaInputsTopologyTemplateDefinition.class);
+        typeDescription.putMapPropertyType("node_templates", String.class, ToscaNodeTemplatesTopologyTemplateDefinition.class);
+        typeDescription.putMapPropertyType("groups", String.class, ToscaGroupsTopologyTemplateDefinition.class);
+    	return typeDescription;
+	}
+	
+	
+}
diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/tosca/datatypes/ToscaTopologyTemplateDefinition2.java b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/tosca/datatypes/ToscaTopologyTemplateDefinition2.java
new file mode 100644
index 0000000000..5c750c9670
--- /dev/null
+++ b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/tosca/datatypes/ToscaTopologyTemplateDefinition2.java
@@ -0,0 +1,77 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * SDC
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.sdc.ci.tests.tosca.datatypes;
+
+import java.util.Map;
+
+//	spec page 104	
+public class ToscaTopologyTemplateDefinition2 {
+
+	String description;
+	Map<String,Map<String, Object>> inputs;
+	Map<String,Object> node_templates;
+//	Map<String,ToscaRelationshipTemplatesTopologyTemplateDefinition> relationship_templates;
+	Map<String,Object> groups;
+//	Map<String,ToscaPoliciesTopologyTemplateDefinition> policies;
+//	Map<String,ToscaOutputsTopologyTemplateDefinition> outputs;
+//	Map<String,ToscaSubstitutionMappingsDefinition> substitution_mappings;
+	
+	public ToscaTopologyTemplateDefinition2() {
+		super();
+	}
+
+	public String getDescription() {
+		return description;
+	}
+
+	public void setDescription(String description) {
+		this.description = description;
+	}
+
+
+	public Map<String, Map<String, Object>> getInputs() {
+		return inputs;
+	}
+
+	public void setInputs(Map<String, Map<String, Object>> inputs) {
+		this.inputs = inputs;
+	}
+
+	public Map<String, Object> getNode_templates() {
+		return node_templates;
+	}
+
+	public void setNode_templates(Map<String, Object> node_templates) {
+		this.node_templates = node_templates;
+	}
+
+	public Map<String, Object> getGroups() {
+		return groups;
+	}
+
+	public void setGroups(Map<String, Object> groups) {
+		this.groups = groups;
+	}
+
+	
+	
+	
+}
diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/tosca/datatypes/ToscaTypeDefinition.java b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/tosca/datatypes/ToscaTypeDefinition.java
new file mode 100644
index 0000000000..66d8350e94
--- /dev/null
+++ b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/tosca/datatypes/ToscaTypeDefinition.java
@@ -0,0 +1,46 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * SDC
+ * ================================================================================
+ * 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=========================================================
+ */
+
+package org.openecomp.sdc.ci.tests.tosca.datatypes;
+
+import java.util.HashMap;
+import java.util.Map;
+
+public class ToscaTypeDefinition {
+
+    private String description;
+    private Map<String, Object> properties = new HashMap<>();
+
+    public String getDescription() {
+        return description;
+    }
+
+    public void setDescription(String description) {
+        this.description = description;
+    }
+
+    public Map<String, Object> getProperties() {
+        return properties;
+    }
+
+    public void setProperties(Map<String, Object> properties) {
+        this.properties = properties;
+    }
+}
diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/tosca/datatypes/ToscaTypesDefinition.java b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/tosca/datatypes/ToscaTypesDefinition.java
new file mode 100644
index 0000000000..16292a83f5
--- /dev/null
+++ b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/tosca/datatypes/ToscaTypesDefinition.java
@@ -0,0 +1,46 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * SDC
+ * ================================================================================
+ * 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=========================================================
+ */
+
+package org.openecomp.sdc.ci.tests.tosca.datatypes;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class ToscaTypesDefinition {
+
+    private String tosca_definitions_version;
+    private List<String> imports = new ArrayList<>();
+
+    public String getTosca_definitions_version() {
+        return tosca_definitions_version;
+    }
+
+    public void setTosca_definitions_version(String tosca_definitions_version) {
+        this.tosca_definitions_version = tosca_definitions_version;
+    }
+
+    public List<String> getImports() {
+        return imports;
+    }
+
+    public void setImports(List<String> imports) {
+        this.imports = imports;
+    }
+}
diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/tosca/datatypes/VfModuleDefinition.java b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/tosca/datatypes/VfModuleDefinition.java
new file mode 100644
index 0000000000..1d32fc1b12
--- /dev/null
+++ b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/tosca/datatypes/VfModuleDefinition.java
@@ -0,0 +1,57 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * SDC
+ * ================================================================================
+ * 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=========================================================
+ */
+
+package org.openecomp.sdc.ci.tests.tosca.datatypes;
+
+import java.io.Serializable;
+import java.util.List;
+
+public class VfModuleDefinition extends ToscaGroupsTopologyTemplateDefinition implements Serializable {
+
+    private List<String> artifacts;
+
+    public static final long serialVersionUID = -6373756459967949586L;
+
+    public List<String> getArtifacts() {
+        return artifacts;
+    }
+
+    public void setArtifacts(List<String> artifacts) {
+        this.artifacts = artifacts;
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (!(o instanceof VfModuleDefinition)) return false;
+        if (!super.equals(o)) return false;
+
+        VfModuleDefinition that = (VfModuleDefinition) o;
+
+        return artifacts != null ? artifacts.containsAll(that.artifacts) : that.artifacts == null;
+    }
+
+    @Override
+    public int hashCode() {
+        int result = super.hashCode();
+        result = 31 * result + (artifacts != null ? artifacts.hashCode() : 0);
+        return result;
+    }
+}
diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/tosca/model/ToscaMetadataFieldsPresentationEnum.java b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/tosca/model/ToscaMetadataFieldsPresentationEnum.java
new file mode 100644
index 0000000000..8716533555
--- /dev/null
+++ b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/tosca/model/ToscaMetadataFieldsPresentationEnum.java
@@ -0,0 +1,95 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * SDC
+ * ================================================================================
+ * 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=========================================================
+ */
+
+package org.openecomp.sdc.ci.tests.tosca.model;
+
+public class ToscaMetadataFieldsPresentationEnum {
+
+	public enum ToscaMetadataFieldsEnum {
+//		general
+		INVARIANT_UUID                         ("invariantUUID",                    ComponentTypeEnum.RESOURCE_SERVICE_NODE_TEMPLATE.value), 
+		UUID                                   ("UUID",                             ComponentTypeEnum.RESOURCE_SERVICE_NODE_TEMPLATE.value), 
+		NAME                                   ("name",                             ComponentTypeEnum.RESOURCE_SERVICE_NODE_TEMPLATE.value),
+		DESCRIPTION                            ("description",                      ComponentTypeEnum.RESOURCE_SERVICE_NODE_TEMPLATE.value), 
+		CATEGORY                               ("category",                         ComponentTypeEnum.RESOURCE_SERVICE_NODE_TEMPLATE.value),
+		TYPE                                   ("type",                             ComponentTypeEnum.RESOURCE_SERVICE_NODE_TEMPLATE.value),
+	
+//		resource
+		SUBCATEGORY                            ("subcategory",                      ComponentTypeEnum.RESOURCE_NODE_TEMPLATE.value), 
+		RESOURCE_VENDOR_NAME                   ("resourceVendor",                   ComponentTypeEnum.RESOURCE_NODE_TEMPLATE.value), 
+		RESOURCE_VENDOR_RELEASE                ("resourceVendorRelease",            ComponentTypeEnum.RESOURCE_NODE_TEMPLATE.value),
+		RESOURCE_VENDOR_MODEL_NUMBER           ("resourceVendorModelNumber",        ComponentTypeEnum.RESOURCE_NODE_TEMPLATE.value),
+		
+//		service
+		SERVICE_TYPE                           ("serviceType",                      ComponentTypeEnum.SERVICE.value), 
+		SERVICE_ROLE                           ("serviceRole",                      ComponentTypeEnum.SERVICE.value), 
+		SERVICE_ECOMP_NAMING                   ("serviceEcompNaming",               ComponentTypeEnum.SERVICE.value),
+		ECOMP_GENERATED_NAMING                 ("ecompGeneratedNaming",             ComponentTypeEnum.SERVICE.value),
+		NAMING_POLICY                          ("namingPolicy",                     ComponentTypeEnum.SERVICE.value),
+		INSTANTIATION_TYPE                     ("instantiationType",                ComponentTypeEnum.SERVICE.value),
+		
+//		node_template
+		CUSTOMIZATION_UUID                     ("customizationUUID",                ComponentTypeEnum.NODE_TEMPLATE.value), 
+		VERSION                                ("version",                          ComponentTypeEnum.RESOURCE_GROUP_NODE_TEMPLATE.value), 
+		
+//		service group:
+		VF_MODULE_MODEL_NAME                   ("vfModuleModelName",                ComponentTypeEnum.RESOURCE_GROUP_SERVICE_GROUP.value), 
+		VF_MODULE_MODEL_INVARIANT_UUID         ("vfModuleModelInvariantUUID",       ComponentTypeEnum.RESOURCE_GROUP_SERVICE_GROUP.value), 
+		VF_MODULE_MODEL_UUID                   ("vfModuleModelUUID",                ComponentTypeEnum.RESOURCE_GROUP_SERVICE_GROUP.value),
+		VF_MODULE_MODEL_VERSION                ("vfModuleModelVersion",             ComponentTypeEnum.RESOURCE_GROUP_SERVICE_GROUP.value),
+		
+		VF_MODULE_MODEL_CUSTOMIZATION_UUID     ("vfModuleModelCustomizationUUID",   ComponentTypeEnum.SERVICE_GROUP.value)
+		;
+		
+		
+		
+		public String value;
+		public String componentTypes;
+	
+		private ToscaMetadataFieldsEnum(String value, String componentTypes) {
+			this.value = value;
+			this.componentTypes = componentTypes;
+		}
+		
+	}
+	
+
+	public enum ComponentTypeEnum {
+//		RESOURCE_SERVICE_NODE_TEMPLATE_RESOURCE_GROUP("resource, service, nodeTemplate, resourceGroup"), 
+		RESOURCE_SERVICE_NODE_TEMPLATE("resource, service, nodeTemplate"),
+		RESOURCE_NODE_TEMPLATE("resource, nodeTemplate"),
+		SERVICE("service"),
+		NODE_TEMPLATE("nodeTemplate"),
+		RESOURCE_GROUP_NODE_TEMPLATE("resourceGroup, nodeTemplate"),
+		SERVICE_GROUP("serviceGroup"),
+		RESOURCE_GROUP_SERVICE_GROUP("resourceGroup, serviceGroup"),
+		
+	;
+	
+		private String value;
+
+		private ComponentTypeEnum(String value) {
+			this.value = value;
+		}
+		
+	}
+	
+	
+}
diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/users/AddUserAuditMessageInfo.java b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/users/AddUserAuditMessageInfo.java
new file mode 100644
index 0000000000..9ca8adee53
--- /dev/null
+++ b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/users/AddUserAuditMessageInfo.java
@@ -0,0 +1,113 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * SDC
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.sdc.ci.tests.users;
+
+public class AddUserAuditMessageInfo {
+
+	String TIMESTAMP;
+	String ACTION;
+	// String MODIFIER_NAME;
+	String MODIFIER;
+	// String USER_UID;
+	// String USER_NAME;
+	// String USER_EMAIL;
+	// String USER_ROLE;
+	String USER;
+	String STATUS;
+	String DESC;
+
+	public AddUserAuditMessageInfo(String timestamp, String action, String modifierName, String modifierUid,
+			String user, String status, String desc) {
+		super();
+		this.TIMESTAMP = timestamp;
+		this.ACTION = action;
+		// this.MODIFIER_NAME = modifierName;
+		this.MODIFIER = modifierUid;
+		this.USER = user;
+		this.STATUS = status;
+		this.DESC = desc;
+	}
+
+	public AddUserAuditMessageInfo() {
+		super();
+	}
+
+	public String getTIMESTAMP() {
+		return TIMESTAMP;
+	}
+
+	public void setTIMESTAMP(String tIMESTAMP) {
+		TIMESTAMP = tIMESTAMP;
+	}
+
+	public String getACTION() {
+		return ACTION;
+	}
+
+	public void setACTION(String aCTION) {
+		ACTION = aCTION;
+	}
+
+	// public String getMODIFIER_NAME() {
+	// return MODIFIER_NAME;
+	// }
+	// public void setMODIFIER_NAME(String mODIFIER_NAME) {
+	// MODIFIER_NAME = mODIFIER_NAME;
+	// }
+	public String getMODIFIER() {
+		return MODIFIER;
+	}
+
+	public void setMODIFIER(String mODIFIER_UID) {
+		MODIFIER = mODIFIER_UID;
+	}
+
+	public String getUSER() {
+		return USER;
+	}
+
+	public void setUSER(String uSER) {
+		USER = uSER;
+	}
+
+	public String getSTATUS() {
+		return STATUS;
+	}
+
+	public void setSTATUS(String sTATUS) {
+		STATUS = sTATUS;
+	}
+
+	public String getDESC() {
+		return DESC;
+	}
+
+	public void setDESC(String dESC) {
+		DESC = dESC;
+	}
+
+	@Override
+	public String toString() {
+		return "AddUserAuditMessageInfo [timestamp=" + TIMESTAMP + ", action=" + ACTION + ", modifierUid=" + MODIFIER
+				+ ", user=" + USER + ", status=" + STATUS + ", desc=" + DESC + "]";
+	}
+
+}
diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/users/UserAuditJavaObject.java b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/users/UserAuditJavaObject.java
new file mode 100644
index 0000000000..b34d474cf0
--- /dev/null
+++ b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/users/UserAuditJavaObject.java
@@ -0,0 +1,133 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * SDC
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.sdc.ci.tests.users;
+
+public class UserAuditJavaObject {
+
+	String TIMESTAMP;
+	String ACTION;
+	// String MODIFIER_NAME;
+	String MODIFIER;
+	String USER;
+	// String USER_NAME;
+	// String USER_EMAIL;
+	// String USER_ROLE;
+	String STATUS;
+	String DESC;
+
+	public UserAuditJavaObject(String timestamp, String action, String modifier, String user, String status,
+			String desc) {
+		super();
+		this.TIMESTAMP = timestamp;
+		this.ACTION = action;
+		// this.MODIFIER_NAME = modifierName;
+		this.MODIFIER = modifier;
+		this.USER = user;
+		// this.USER_NAME = userName;
+		// this.USER_EMAIL = userEmail;
+		// this.USER_ROLE = userRole;
+		this.STATUS = status;
+		this.DESC = desc;
+	}
+
+	public UserAuditJavaObject() {
+		super();
+	}
+
+	public String getTIMESTAMP() {
+		return TIMESTAMP;
+	}
+
+	public void setTIMESTAMP(String tIMESTAMP) {
+		TIMESTAMP = tIMESTAMP;
+	}
+
+	public String getACTION() {
+		return ACTION;
+	}
+
+	public void setACTION(String aCTION) {
+		ACTION = aCTION;
+	}
+
+	// public String getMODIFIER_NAME() {
+	// return MODIFIER_NAME;
+	// }
+	// public void setMODIFIER_NAME(String mODIFIER_NAME) {
+	// MODIFIER_NAME = mODIFIER_NAME;
+	// }
+	public String getMODIFIER() {
+		return MODIFIER;
+	}
+
+	public void setMODIFIER(String mODIFIER_UID) {
+		MODIFIER = mODIFIER_UID;
+	}
+
+	public String getUSER() {
+		return USER;
+	}
+
+	public void setUSER(String uSER) {
+		USER = uSER;
+	}
+
+	// public String getUSER_NAME() {
+	// return USER_NAME;
+	// }
+	// public void setUSER_NAME(String uSER_NAME) {
+	// USER_NAME = uSER_NAME;
+	// }
+	// public String getUSER_EMAIL() {
+	// return USER_EMAIL;
+	// }
+	// public void setUSER_EMAIL(String uSER_EMAIL) {
+	// USER_EMAIL = uSER_EMAIL;
+	// }
+	// public String getUSER_ROLE() {
+	// return USER_ROLE;
+	// }
+	// public void setUSER_ROLE(String uSER_ROLE) {
+	// USER_ROLE = uSER_ROLE;
+	// }
+	public String getSTATUS() {
+		return STATUS;
+	}
+
+	public void setSTATUS(String sTATUS) {
+		STATUS = sTATUS;
+	}
+
+	public String getDESC() {
+		return DESC;
+	}
+
+	public void setDESC(String dESC) {
+		DESC = dESC;
+	}
+
+	@Override
+	public String toString() {
+		return "UserAuditJavaObject [timestamp=" + TIMESTAMP + ", action=" + ACTION + ", modifier=" + MODIFIER
+				+ ", user=" + USER + ", status=" + STATUS + ", desc=" + DESC + "]";
+	}
+
+}
diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/users/UserHeaderData.java b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/users/UserHeaderData.java
new file mode 100644
index 0000000000..06320bcb5f
--- /dev/null
+++ b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/users/UserHeaderData.java
@@ -0,0 +1,59 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * SDC
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.sdc.ci.tests.users;
+
+public class UserHeaderData {
+	String contentType;
+	String httpCspUserId;
+	String accept;
+
+	public UserHeaderData(String contentType, String httpCspUserId, String accept) {
+		super();
+		this.contentType = contentType;
+		this.httpCspUserId = httpCspUserId;
+		this.accept = accept;
+	}
+
+	public String getContentType() {
+		return contentType;
+	}
+
+	public void setContentType(String contentType) {
+		this.contentType = contentType;
+	}
+
+	public String getHttpCspUserId() {
+		return httpCspUserId;
+	}
+
+	public void setHttpCspUserId(String httpCspUserId) {
+		this.httpCspUserId = httpCspUserId;
+	}
+
+	public String getAccept() {
+		return accept;
+	}
+
+	public void setAccept(String accept) {
+		this.accept = accept;
+	}
+
+}
diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/users/UserResponseMessageEnum.java b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/users/UserResponseMessageEnum.java
new file mode 100644
index 0000000000..97a08479f8
--- /dev/null
+++ b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/users/UserResponseMessageEnum.java
@@ -0,0 +1,39 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * SDC
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.sdc.ci.tests.users;
+
+public enum UserResponseMessageEnum {
+
+	SUCCESS_MESSAGE("OK"), MISSING_INFORMATION("Error: Missing information"), METHOD_NOT_ALLOWED("Error: Method not allowed"), RESTRICTED_OPERATION("Error: Restricted operation"), USER_ALREADY_EXISTS("Error: User with %s ID already exists"), 
+	INVALID_EMAIL("Error: Invalid Content. Invalid e-mail address %s"), INVALID_ROLE("Error: Invalid Content. Invalid role %s"), INVALID_CONTENT("Error: Invalid content"), USER_NOT_FOUND("Error: User with %s ID is not found"), 
+	INTERNAL_SERVER_ERROR("Error: Internal Server Error. Try later again"), ADMINISTARTOR_CAN_BE_DELETED("Error: Administrator can be deleted by other administrator only"), RESTRICTED_ACCESS("Error: Restricted access");
+
+	String value;
+
+	private UserResponseMessageEnum(String value) {
+		this.value = value;
+	}
+
+	public String getValue() {
+		return value;
+	}
+
+}
diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/users/WebSealUserDetails.java b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/users/WebSealUserDetails.java
new file mode 100644
index 0000000000..609ebf22b7
--- /dev/null
+++ b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/users/WebSealUserDetails.java
@@ -0,0 +1,74 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * SDC
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.sdc.ci.tests.users;
+
+public class WebSealUserDetails {
+	String firstName;
+	String lastName;
+	String userId;
+	String email;
+
+	public WebSealUserDetails() {
+		super();
+	}
+
+	public WebSealUserDetails(String firstName, String lastName, String userId, String emailAddress) {
+		super();
+		this.firstName = firstName;
+		this.lastName = lastName;
+		this.userId = userId;
+		this.email = emailAddress;
+
+	}
+
+	public String getFirstName() {
+		return firstName;
+	}
+
+	public void setFirstName(String firstName) {
+		this.firstName = firstName;
+	}
+
+	public String getLastName() {
+		return lastName;
+	}
+
+	public void setLastName(String lastName) {
+		this.lastName = lastName;
+	}
+
+	public String getUserId() {
+		return userId;
+	}
+
+	public void setUserId(String userId) {
+		this.userId = userId;
+	}
+
+	public String getEmailAddress() {
+		return email;
+	}
+
+	public void setEmailAddress(String emailAddress) {
+		this.email = emailAddress;
+	}
+
+}
diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/utils/ArtifactUtils.java b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/utils/ArtifactUtils.java
new file mode 100644
index 0000000000..12f8ffe984
--- /dev/null
+++ b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/utils/ArtifactUtils.java
@@ -0,0 +1,43 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * SDC
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.sdc.ci.tests.utils;
+
+import org.openecomp.sdc.be.model.ArtifactDefinition;
+import org.openecomp.sdc.ci.tests.datatypes.ArtifactReqDetails;
+import org.openecomp.sdc.common.api.ArtifactGroupTypeEnum;
+
+public class ArtifactUtils {
+
+	public static ArtifactDefinition convertArtifactReqToDefinition(ArtifactReqDetails artifactReq) {
+		ArtifactDefinition artifact = new ArtifactDefinition();
+		artifact.setArtifactLabel(artifactReq.getArtifactLabel());
+		artifact.setArtifactDisplayName(artifactReq.getArtifactDisplayName());
+		artifact.setArtifactGroupType(ArtifactGroupTypeEnum.findType(artifactReq.getArtifactGroupType()));
+		artifact.setArtifactType(artifactReq.getArtifactType().toUpperCase());
+		artifact.setArtifactName(artifactReq.getArtifactName());
+		artifact.setDescription(artifactReq.getDescription());
+		artifact.setUniqueId(artifactReq.getUniqueId());
+		artifact.setTimeout(artifactReq.getTimeout());
+		artifact.setEsId(artifactReq.getUniqueId());
+
+		return artifact;
+	}
+}
diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/utils/CsarParserUtils.java b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/utils/CsarParserUtils.java
new file mode 100644
index 0000000000..fc717ca79d
--- /dev/null
+++ b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/utils/CsarParserUtils.java
@@ -0,0 +1,201 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * SDC
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.sdc.ci.tests.utils;
+
+import org.apache.commons.codec.binary.Base64;
+import org.json.simple.JSONArray;
+import org.json.simple.JSONObject;
+import org.json.simple.parser.JSONParser;
+import org.json.simple.parser.ParseException;
+import org.junit.Assert;
+import org.openecomp.sdc.be.model.ArtifactUiDownloadData;
+import org.openecomp.sdc.be.model.Component;
+import org.openecomp.sdc.be.model.User;
+import org.openecomp.sdc.ci.tests.datatypes.GroupHeatMetaDefinition;
+import org.openecomp.sdc.ci.tests.datatypes.HeatMetaFirstLevelDefinition;
+import org.openecomp.sdc.ci.tests.datatypes.PropertyHeatMetaDefinition;
+import org.openecomp.sdc.ci.tests.datatypes.TypeHeatMetaDefinition;
+import org.openecomp.sdc.ci.tests.datatypes.enums.ArtifactTypeEnum;
+import org.openecomp.sdc.ci.tests.datatypes.http.RestResponse;
+import org.openecomp.sdc.ci.tests.tosca.datatypes.ToscaParameterConstants;
+import org.openecomp.sdc.ci.tests.utils.rest.ArtifactRestUtils;
+import org.openecomp.sdc.ci.tests.utils.rest.BaseRestUtils;
+import org.openecomp.sdc.ci.tests.utils.rest.ResponseParser;
+import org.openecomp.sdc.ci.tests.utils.validation.CsarValidationUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.io.File;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Set;
+
+import static org.testng.AssertJUnit.assertTrue;
+
+public class CsarParserUtils {
+	public static final String CSAR_ARTIFACT = "assettoscacsar";
+	private static Logger log = LoggerFactory.getLogger(CsarValidationUtils.class.getName());
+
+	public static byte[] downloadComponentCsar(Component csarOwner, User user) throws Exception {
+		String artifactUniqeId = csarOwner.getToscaArtifacts().get(CSAR_ARTIFACT).getUniqueId();
+		RestResponse csarResponse = ArtifactRestUtils.downloadResourceArtifactInternalApi(csarOwner.getUniqueId(), user, artifactUniqeId);
+		Assert.assertNotNull(csarResponse);
+		BaseRestUtils.checkSuccess(csarResponse);
+		ArtifactUiDownloadData artifactUiDownloadData = ResponseParser.parseToObject(csarResponse.getResponse(),
+				ArtifactUiDownloadData.class);
+		byte[] fromUiDownload = artifactUiDownloadData.getBase64Contents().getBytes();
+		return Base64.decodeBase64(fromUiDownload);
+	}
+	
+	public static List<TypeHeatMetaDefinition> getListTypeHeatMetaDefinition(File csarFileLocation) throws Exception {
+
+		String artifactHeatMetaLocation = ToscaParameterConstants.HEAT_META_PATH;
+		String csarPayload = ToscaParserUtils.getYamlPayloadFromCsar(csarFileLocation, artifactHeatMetaLocation);
+		return getListTypeHeatMetaDefinitionByPayload(csarPayload);
+	}
+
+	public static List<TypeHeatMetaDefinition> getListTypeHeatMetaDefinition(String csarUUID) throws Exception {
+		
+		String artifactHeatMetaLocation = ToscaParameterConstants.HEAT_META_PATH;
+		String csarPayload = ToscaParserUtils.getCsarPayload(csarUUID, artifactHeatMetaLocation);
+		return getListTypeHeatMetaDefinitionByPayload(csarPayload);
+	}
+
+	public static List<TypeHeatMetaDefinition> getListTypeHeatMetaDefinitionByPayload(String csarPayload) throws ParseException {
+		JSONParser parser = new JSONParser();
+		if (csarPayload != null) {
+			Object parse = parser.parse(csarPayload);
+			JSONObject jsonObject = (JSONObject) parse;
+			JSONObject jsonObjectImportStructure = (JSONObject) jsonObject.get(ToscaParameterConstants.IMPORT_STRUCTURE);
+			List<TypeHeatMetaDefinition> listHeatMetaDefenition = new ArrayList<>();
+			listHeatMetaDefenition = getArtifactsByGroup(jsonObjectImportStructure, listHeatMetaDefenition);
+			return listHeatMetaDefenition;
+		}
+		return null;
+	}
+	
+	
+	protected static List<TypeHeatMetaDefinition> getArtifactsByGroup(JSONObject jsonObjectImportStructure, List<TypeHeatMetaDefinition> listHeatMetaDefenition) {
+
+		@SuppressWarnings("unchecked")
+		Set<Object> typeSet = jsonObjectImportStructure.keySet();
+		for (Object type : typeSet) {
+			TypeHeatMetaDefinition heatMetaDefenition = new TypeHeatMetaDefinition();
+			log.debug(type.toString());
+			log.debug("{}", jsonObjectImportStructure.get(type));
+			JSONArray array = (JSONArray) jsonObjectImportStructure.get(type);
+			heatMetaDefenition.setTypeName((String) type);
+			List<GroupHeatMetaDefinition> groupHeatMetaDefinitions = new ArrayList<>();
+			heatMetaDefenition.setGroupHeatMetaDefinition(fetchArtifactByGroupFromJsonArray(array, groupHeatMetaDefinitions, true, false));
+			listHeatMetaDefenition.add(heatMetaDefenition);
+		}
+		return listHeatMetaDefenition;
+	}
+	
+	protected static List<GroupHeatMetaDefinition> fetchArtifactByGroupFromJsonArray(JSONArray array, List<GroupHeatMetaDefinition> listGroupHeatMetaDefinition, Boolean openNewGroup, Boolean isNested) {
+
+		GroupHeatMetaDefinition groupHeatMetaDefinition;
+
+		if (array != null) {
+			for (int i = 0; i < array.size(); i++) {
+				if (openNewGroup) {
+					groupHeatMetaDefinition = new GroupHeatMetaDefinition();
+					int groupNumber = listGroupHeatMetaDefinition.size() + 1;
+					log.debug("groupName={}", groupNumber);
+					groupHeatMetaDefinition.setGroup(groupNumber);
+					listGroupHeatMetaDefinition.add(groupHeatMetaDefinition);
+					PropertyHeatMetaDefinition propertyHeatMetaDefinition = new PropertyHeatMetaDefinition();
+					propertyHeatMetaDefinition.setName("isBase");
+					propertyHeatMetaDefinition.setValue(false);
+					groupHeatMetaDefinition.setPropertyHeatMetaDefinition(propertyHeatMetaDefinition);
+				}
+				groupHeatMetaDefinition = listGroupHeatMetaDefinition.get(listGroupHeatMetaDefinition.size() - 1);
+				JSONObject jsonObject = (JSONObject) array.get(i);
+				if (openNewGroup) {
+					String groupName;
+					int lastIndexOfDot = jsonObject.get("fileName").toString().lastIndexOf(".");
+					if(lastIndexOfDot == -1){
+						groupName = jsonObject.get("fileName").toString();
+					}else {
+						groupName = jsonObject.get("fileName").toString().substring(0, lastIndexOfDot);
+					}
+					groupHeatMetaDefinition.setGroupName(groupName);
+				}
+				fetchArtifactByGroupFromJsonObject(listGroupHeatMetaDefinition, groupHeatMetaDefinition, jsonObject, isNested);
+			}
+		}
+		return listGroupHeatMetaDefinition;
+	}
+	
+	
+	public static void fetchArtifactByGroupFromJsonObject(List<GroupHeatMetaDefinition> listGroupHeatMetaDefinition, GroupHeatMetaDefinition groupHeatMetaDefinition, JSONObject jsonObject, Boolean isNested) {
+		@SuppressWarnings("unchecked")
+		Set<Object> groupsKey = jsonObject.keySet();
+		for (Object groupKey : groupsKey) {
+			String groupKeyStr = (String) groupKey;
+			if (groupKeyStr.equals("isBase")) {
+				PropertyHeatMetaDefinition propertyHeatMetaDefinition = new PropertyHeatMetaDefinition();
+				propertyHeatMetaDefinition.setName(groupKeyStr);
+				propertyHeatMetaDefinition.setValue((boolean) jsonObject.get(groupKeyStr));
+				if (!groupHeatMetaDefinition.getPropertyHeatMetaDefinition().equals(propertyHeatMetaDefinition)) {
+					groupHeatMetaDefinition.getPropertyHeatMetaDefinition().setValue((boolean) jsonObject.get(groupKeyStr));
+				}
+			}
+ 			if (groupKeyStr.equals("fileName")) {
+				String artifactName = (String) jsonObject.get(groupKeyStr);
+				String artifactType = ArtifactTypeEnum.HEAT_ARTIFACT.getType();
+				if(isNested){
+					artifactType = ArtifactTypeEnum.HEAT_NESTED.getType();
+				}
+				if(jsonObject.get("type") != null && isNested == false){
+					artifactType = (String) jsonObject.get("type");
+				}
+				HeatMetaFirstLevelDefinition heatMetaFirstLevelDefinition = new HeatMetaFirstLevelDefinition(artifactName, artifactType, null);
+				List<HeatMetaFirstLevelDefinition> listArtifactNames = groupHeatMetaDefinition.getArtifactList();
+				listArtifactNames.add(heatMetaFirstLevelDefinition);
+				groupHeatMetaDefinition.setArtifactList(listArtifactNames);
+			} else {
+				if((groupKeyStr.equals("env"))){
+					if (jsonObject.get(groupKeyStr) instanceof JSONObject){
+						fetchArtifactByGroupFromJsonObject(listGroupHeatMetaDefinition, groupHeatMetaDefinition, (JSONObject) jsonObject.get(groupKeyStr), false);
+					}else{
+						assertTrue("Expected object is JSONObject, but actual: " + jsonObject.get(groupKeyStr).getClass(), jsonObject.get(groupKeyStr).getClass().equals("JSONObject"));
+					}
+				}
+				if((groupKeyStr.equals("nested"))){
+					if (jsonObject.get(groupKeyStr) instanceof JSONArray){
+						fetchArtifactByGroupFromJsonArray((JSONArray) jsonObject.get(groupKeyStr), listGroupHeatMetaDefinition, false, true);
+					}else{
+						assertTrue("Expected object is JSONArray, but actual: " + jsonObject.get(groupKeyStr).getClass(), jsonObject.get(groupKeyStr).getClass().equals("JSONArray"));
+					}
+					
+				}else if (!(groupKeyStr.equals("isBase") || groupKeyStr.equals("type") || groupKeyStr.equals("env"))) {
+					if (jsonObject.get(groupKeyStr) instanceof JSONArray){
+						fetchArtifactByGroupFromJsonArray((JSONArray) jsonObject.get(groupKeyStr), listGroupHeatMetaDefinition, false, false);
+					}else{
+						assertTrue("Expected object is JSONArray, but actual: " + jsonObject.get(groupKeyStr).getClass(), jsonObject.get(groupKeyStr).getClass().equals("JSONArray"));
+					}
+				}
+			}
+		}
+	}
+	
+}
diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/utils/CsarToscaTester.java b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/utils/CsarToscaTester.java
new file mode 100644
index 0000000000..be337ba379
--- /dev/null
+++ b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/utils/CsarToscaTester.java
@@ -0,0 +1,109 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * SDC
+ * ================================================================================
+ * 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=========================================================
+ */
+
+package org.openecomp.sdc.ci.tests.utils;
+
+import org.onap.sdc.tosca.parser.api.ISdcCsarHelper;
+import org.onap.sdc.tosca.parser.enums.SdcTypes;
+import org.onap.sdc.tosca.parser.exceptions.SdcToscaParserException;
+import org.onap.sdc.tosca.parser.impl.SdcToscaParserFactory;
+import org.onap.sdc.toscaparser.api.Group;
+import org.onap.sdc.toscaparser.api.NodeTemplate;
+import org.onap.sdc.toscaparser.api.elements.Metadata;
+import org.onap.sdc.toscaparser.api.parameters.Input;
+
+import java.io.File;
+import java.io.FileWriter;
+import java.io.IOException;
+import java.util.List;
+import java.util.Map;
+
+public class CsarToscaTester {
+
+	public static void processCsar(SdcToscaParserFactory factory, File file) throws SdcToscaParserException {
+		ISdcCsarHelper sdcCsarHelper = factory.getSdcCsarHelper(file.getAbsolutePath());
+		processCsarImpl(sdcCsarHelper);
+		
+	}
+
+	public static void processCsar(ISdcCsarHelper sdcCsarHelper) throws SdcToscaParserException {
+		processCsarImpl(sdcCsarHelper);
+
+	}
+
+	private static void processCsarImpl(ISdcCsarHelper sdcCsarHelper) {
+
+		//Service level
+		System.out.println("Invoking sdc-tosca methods on this CSAR....");
+		String conformanceLevel = sdcCsarHelper.getConformanceLevel();
+		System.out.println("getConformanceLevel() - conformance level is "+conformanceLevel);
+		String serviceSubstitutionMappingsTypeName = sdcCsarHelper.getServiceSubstitutionMappingsTypeName();
+		System.out.println("serviceSubstitutionMappingsTypeName() - subst mappings type of service is "+serviceSubstitutionMappingsTypeName);
+		List<Input> serviceInputs = sdcCsarHelper.getServiceInputs();
+		System.out.println("getServiceInputs() - service inputs are "+serviceInputs);
+		Metadata serviceMetadata = sdcCsarHelper.getServiceMetadata();
+		System.out.println("getServiceMetadata() - service metadata is "+serviceMetadata);
+		Map<String, Object> serviceMetadataProperties = sdcCsarHelper.getServiceMetadataProperties();
+		System.out.println("getServiceMetadataProperties() - service metadata properties is "+serviceMetadataProperties);
+		List<NodeTemplate> allottedResources = sdcCsarHelper.getAllottedResources();
+		System.out.println("getAllottedResources() - service allotted resources are "+allottedResources);
+		List<NodeTemplate> serviceVfList = sdcCsarHelper.getServiceVfList();
+		System.out.println("getServiceVfList() - VF list is "+serviceVfList);
+		List<NodeTemplate> serviceNodeTemplateBySdcType = sdcCsarHelper.getServiceNodeTemplateBySdcType(SdcTypes.VF);
+		System.out.println("getServiceNodeTemplateBySdcType() - VF list is "+serviceNodeTemplateBySdcType);
+		List<NodeTemplate> serviceNodeTemplates = sdcCsarHelper.getServiceNodeTemplates();
+		System.out.println("getServiceNodeTemplates() - all node templates list of service is "+serviceNodeTemplates);
+
+		serviceVfList.forEach(x -> {
+			String nodeTemplateCustomizationUuid = sdcCsarHelper.getNodeTemplateCustomizationUuid(x);
+			System.out.println("getNodeTemplateCustomizationUuid() - VF ID is "+nodeTemplateCustomizationUuid);
+			String typeOfNodeTemplate = sdcCsarHelper.getTypeOfNodeTemplate(x);
+			System.out.println("getTypeOfNodeTemplate() - VF tosca type is "+typeOfNodeTemplate);
+			List<Group> vfModulesByVf = sdcCsarHelper.getVfModulesByVf(nodeTemplateCustomizationUuid);
+			System.out.println("getVfModulesByVf() - VF modules list is "+vfModulesByVf);
+			vfModulesByVf.forEach(y -> {
+				List<NodeTemplate> membersOfVfModule = sdcCsarHelper.getMembersOfVfModule(x, y);
+				System.out.println("getMembersOfVfModule() - members of VfModule are "+membersOfVfModule);
+			});
+			List<NodeTemplate> vfcListByVf = sdcCsarHelper.getVfcListByVf(nodeTemplateCustomizationUuid);
+			System.out.println("getVfcListByVf() - VFC list is "+vfcListByVf);
+			vfcListByVf.forEach(z -> {
+				List<NodeTemplate> nodeTemplateBySdcType = sdcCsarHelper.getNodeTemplateBySdcType(z, SdcTypes.CP);
+				System.out.println("getNodeTemplateBySdcType() - CP children node templates of this VFC are "+nodeTemplateBySdcType);
+				Map<String, Map<String, Object>> cpPropertiesFromVfcAsObject = sdcCsarHelper.getCpPropertiesFromVfcAsObject(z);
+				System.out.println("getCpPropertiesFromVfcAsObject() - consolidated CP properties for this VFC are "+cpPropertiesFromVfcAsObject);
+				boolean hasTopology = sdcCsarHelper.hasTopology(z);
+				System.out.println("hasTopology() - this VFC is "+(hasTopology ? "nested" : "not nested"));
+			});
+		});
+	}
+
+	private static void generateReport(String time, String name, String currentCsarDir, List<String> criticalsReport, String type)
+			throws IOException {
+		FileWriter fw;
+		try (FileWriter fileWriter = fw = new FileWriter(new File(currentCsarDir + "/" + criticalsReport.size() + "-" + type + "-" + name + "-" + time + ".txt"))) {
+		}
+		for (String exception : criticalsReport) {
+			fw.write(exception);
+			fw.write("\r\n");
+		}
+		fw.close();
+	}
+}
diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/utils/DbUtils.java b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/utils/DbUtils.java
new file mode 100644
index 0000000000..5ba7062f3b
--- /dev/null
+++ b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/utils/DbUtils.java
@@ -0,0 +1,278 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * SDC
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.sdc.ci.tests.utils;
+
+import com.google.gson.*;
+import org.janusgraph.core.JanusGraphEdge;
+import org.janusgraph.core.JanusGraphFactory;
+import org.janusgraph.core.JanusGraph;
+import org.janusgraph.core.JanusGraphVertex;
+import fj.data.Either;
+import org.apache.tinkerpop.gremlin.structure.Edge;
+import org.apache.tinkerpop.gremlin.structure.Element;
+import org.apache.tinkerpop.gremlin.structure.Vertex;
+import org.apache.tinkerpop.gremlin.structure.util.ElementHelper;
+import org.openecomp.sdc.ci.tests.api.Urls;
+import org.openecomp.sdc.ci.tests.config.Config;
+import org.openecomp.sdc.ci.tests.datatypes.http.HttpRequest;
+import org.openecomp.sdc.ci.tests.datatypes.http.RestResponse;
+import org.openecomp.sdc.ci.tests.users.UserAuditJavaObject;
+import org.openecomp.sdc.ci.tests.utils.cassandra.CassandraUtils;
+
+import java.io.IOException;
+import java.util.*;
+import java.util.Map.Entry;
+
+public class DbUtils {
+
+	private static String janusGraphConfigFilePath;
+	private static JanusGraph janusGraph;
+
+	
+	public static void cleanAllAudits() throws IOException {
+		CassandraUtils.truncateAllTables("sdcaudit");
+	}
+
+	public static RestResponse deleteFromEsDbByPattern(String patternToDelete) throws IOException {
+		Config config = Utils.getConfig();
+		String url = String.format(Urls.GET_SEARCH_DATA_FROM_ES, config.getEsHost(), config.getEsPort(),
+				patternToDelete);
+		HttpRequest httpRequest = new HttpRequest();
+		RestResponse restResponse = httpRequest.httpSendDelete(url, null);
+		restResponse.getErrorCode();
+		cleanAllAudits();
+
+		return restResponse;
+	}
+
+	public static RestResponse getFromEsByPattern(String patternToGet) throws IOException {
+		Config config = Utils.getConfig();
+		String url = String.format(Urls.GET_SEARCH_DATA_FROM_ES, config.getEsHost(), config.getEsPort(), patternToGet);
+		HttpRequest httpRequest = new HttpRequest();
+		RestResponse restResponse = httpRequest.httpSendGet(url, null);
+		restResponse.getErrorCode();
+
+		return restResponse;
+	}
+
+	public Either<Vertex, Boolean> getVertexByUId(String uid) {
+		JanusGraph janusGraph = getJanusGraph();
+		Either<Vertex, Boolean> result = Either.right(false);
+		// Iterator<Vertex> vertexItr = janusGraph.getVertices().iterator();
+
+		Iterator<JanusGraphVertex> vertexItr = janusGraph.query().vertices().iterator();
+		while (vertexItr.hasNext()) {
+			Vertex vertex = vertexItr.next();
+			// String uidFoundVal = vertex.getProperty("uid");
+			String uidFoundVal = vertex.value("uid");
+			if (uid.equals(uidFoundVal)) {
+				result = Either.left(vertex);
+			}
+		}
+		return result;
+	}
+
+	public static JanusGraphState getCurrentJanusGraphState() {
+		JanusGraph janusGraph = getJanusGraph();
+		List<Vertex> vertices = new ArrayList<>();
+		List<Edge> edges = new ArrayList<>();
+		// Iterator<Edge> edgesItr = janusGraph.getEdges().iterator();
+		Iterator<JanusGraphEdge> edgesItr = janusGraph.query().edges().iterator();
+		// Iterator<Vertex> verticesItr = janusGraph.getVertices().iterator();
+		Iterator<JanusGraphVertex> verticesItr = janusGraph.query().vertices().iterator();
+		while (edgesItr.hasNext()) {
+			edges.add(edgesItr.next());
+		}
+		while (verticesItr.hasNext()) {
+			vertices.add(verticesItr.next());
+		}
+
+		JanusGraphState currState = new JanusGraphState(edges, vertices);
+		return currState;
+
+	}
+
+	//
+	private static JanusGraph getJanusGraph() {
+		if (janusGraph == null) {
+			janusGraph = JanusGraphFactory.open(janusGraphConfigFilePath);
+		}
+		return janusGraph;
+	}
+
+	public void restoreToJanusGraphState(JanusGraphState janusGraphStateToRestoreTo) {
+		List<Vertex> verticesToRemove = new ArrayList<>(), verticesToAdd = new ArrayList<>();
+		List<Edge> edgesToRemove = new ArrayList<>(), edgesToAdd = new ArrayList<>();
+
+		JanusGraphState currentJanusGraphState = getCurrentJanusGraphState();
+
+		List<Edge> joinedEdges = new ArrayList<>();
+		joinedEdges.addAll(janusGraphStateToRestoreTo.edges);
+		joinedEdges.retainAll(currentJanusGraphState.edges);
+
+		List<Vertex> joinedVertices = new ArrayList<>();
+		joinedVertices.addAll(janusGraphStateToRestoreTo.vertices);
+		joinedVertices.retainAll(currentJanusGraphState.vertices);
+
+		edgesToRemove.addAll(currentJanusGraphState.edges);
+		edgesToRemove.removeAll(joinedEdges);
+
+		verticesToRemove.addAll(currentJanusGraphState.vertices);
+		verticesToRemove.removeAll(joinedVertices);
+
+		edgesToAdd.addAll(janusGraphStateToRestoreTo.edges);
+		edgesToAdd.removeAll(joinedEdges);
+
+		verticesToAdd.addAll(janusGraphStateToRestoreTo.vertices);
+		verticesToAdd.removeAll(joinedVertices);
+
+		modifyGraphAccordingToDelta(verticesToRemove, verticesToAdd, edgesToRemove, edgesToAdd);
+
+	}
+
+	private void modifyGraphAccordingToDelta(List<Vertex> verticesToRemove, List<Vertex> verticesToAdd,
+			List<Edge> edgesToRemove, List<Edge> edgesToAdd) {
+
+		JanusGraph janusGraph = getJanusGraph();
+
+		for (Vertex vertex : verticesToRemove) {
+			// janusGraph.removeVertex(vertex);
+			vertex.remove();
+		}
+		for (Vertex vertex : verticesToAdd) {
+			JanusGraphVertex janusGraphVertex = janusGraph.addVertex();
+			copyProperties(vertex, janusGraphVertex);
+		}
+
+		for (Edge edge : edgesToRemove) {
+			// janusGraph.removeEdge(edge);
+			edge.remove();
+		}
+
+		for (Edge edge : edgesToAdd) {
+			// Element addedEdge = janusGraph.addEdge(edge.getId(),
+			// edge.getVertex(Direction.OUT), edge.getVertex(Direction.IN),
+			// edge.getLabel());
+
+			// Edge edge = tGraph.addEdge(null, fromV.left().value(),
+			// toV.left().value(), type);
+
+			Element addedEdge = edge.outVertex().addEdge(edge.label(), edge.inVertex());
+
+			copyProperties(edge, addedEdge);
+
+		}
+
+		// janusGraph.commit();
+		janusGraph.tx().commit();
+
+	}
+
+	private void copyProperties(Element copyFrom, Element copyTo) {
+		// Set<String> properties = copyFrom.getPropertyKeys();
+		Set<String> properties = copyFrom.keys();
+		for (String propertyKey : properties) {
+			// copyTo.setProperty(propertyKey,
+			// copyFrom.getProperty(propertyKey));
+			copyTo.property(propertyKey, copyFrom.value(propertyKey));
+		}
+
+	}
+
+	public static class JanusGraphState {
+		private List<Edge> edges;
+		private List<Vertex> vertices;
+
+		private JanusGraphState(List<Edge> edges, List<Vertex> vertices) {
+			this.edges = edges;
+			this.vertices = vertices;
+		}
+
+		@Override
+		public String toString() {
+			return "JanusGraphState [edges=" + edges.size() + ", vertices=" + vertices.size() + "]";
+		}
+
+	}
+
+	public void shutDownJanusGraph() {
+		if (janusGraph != null) {
+			// janusGraph.shutdown();
+			janusGraph.close();
+		}
+	}
+
+	public static void setProperties(Element element, Map<String, Object> properties) {
+
+		if (properties != null && false == properties.isEmpty()) {
+
+			Object[] propertyKeyValues = new Object[properties.size() * 2];
+			int i = 0;
+			for (Entry<String, Object> entry : properties.entrySet()) {
+				propertyKeyValues[i++] = entry.getKey();
+				propertyKeyValues[i++] = entry.getValue();
+			}
+
+			ElementHelper.attachProperties(element, propertyKeyValues);
+
+		}
+
+	}
+
+	public static UserAuditJavaObject parseAuditRespByAction(String action) throws Exception {
+
+		// String index = "auditingevents*";
+		// String type = "useradminevent";
+		// String pattern = "/_search?q=action:\""+action+"\"";
+		// String auditingMessage = retrieveAuditMessageByIndexType(index, type,
+		// pattern);
+		UserAuditJavaObject auditParsedResp = new UserAuditJavaObject();
+		Gson gson = new Gson();
+
+		String pattern = "/_search?q=ACTION:\"" + action + "\"";
+		String auditingMessage = retrieveAuditMessagesByPattern(pattern);
+		JsonElement jElement = new JsonParser().parse(auditingMessage);
+		JsonObject jObject = jElement.getAsJsonObject();
+		JsonObject hitsObject = (JsonObject) jObject.get("hits");
+		JsonArray hitsArray = (JsonArray) hitsObject.get("hits");
+		// for (int i = 0; i < hitsArray.size();){
+		if (hitsArray.size() == 0) {
+			return auditParsedResp;
+		}
+		JsonObject jHitObject = (JsonObject) hitsArray.get(0);
+		JsonObject jSourceObject = (JsonObject) jHitObject.get("_source");
+
+		auditParsedResp = gson.fromJson(jSourceObject, UserAuditJavaObject.class);		
+
+		return auditParsedResp;
+
+	}
+
+	public static String retrieveAuditMessagesByPattern(String pattern) throws IOException {
+
+		Config config = Utils.getConfig();
+		HttpRequest getAuditingMessage = new HttpRequest();
+		String url = String.format(Urls.GET_SEARCH_DATA_FROM_ES, config.getEsHost(), config.getEsPort(), pattern);
+		RestResponse restResponse = getAuditingMessage.httpSendGet(url, null);
+
+		return restResponse.getResponse();
+	}
+}
diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/utils/Decoder.java b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/utils/Decoder.java
new file mode 100644
index 0000000000..3b11388505
--- /dev/null
+++ b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/utils/Decoder.java
@@ -0,0 +1,62 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * SDC
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.sdc.ci.tests.utils;
+
+import org.apache.commons.codec.binary.Base64;
+
+import java.io.BufferedReader;
+import java.io.FileReader;
+import java.io.IOException;
+
+public class Decoder {
+
+	public static String encode(byte[] byteArrayToEncode) {
+
+		byte[] bytesEncoded = Base64.encodeBase64(byteArrayToEncode);
+		String strEncoded = new String(bytesEncoded);
+		return strEncoded;
+	}
+
+	public static String decode(String strEncoded) throws IOException {
+
+		byte[] byteDecoded = Base64.decodeBase64(strEncoded);
+		String decoded = new String(byteDecoded);
+
+		return decoded;
+
+	}
+
+	public static String readFileToString(String file) throws IOException {
+
+		BufferedReader reader = new BufferedReader(new FileReader(file));
+		String line = null;
+		StringBuilder stringBuilder = new StringBuilder();
+		String ls = System.getProperty("line.separator");
+
+		while ((line = reader.readLine()) != null) {
+			stringBuilder.append(line);
+			stringBuilder.append(ls);
+		}
+		reader.close();
+		return stringBuilder.toString();
+	}
+
+}
diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/utils/DistributionUtils.java b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/utils/DistributionUtils.java
new file mode 100644
index 0000000000..479fdcb220
--- /dev/null
+++ b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/utils/DistributionUtils.java
@@ -0,0 +1,259 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * SDC
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.sdc.ci.tests.utils;
+
+import com.clearspring.analytics.util.Pair;
+import com.google.gson.Gson;
+import org.codehaus.jettison.json.JSONArray;
+import org.codehaus.jettison.json.JSONException;
+import org.codehaus.jettison.json.JSONObject;
+import org.openecomp.sdc.be.model.ArtifactDefinition;
+import org.openecomp.sdc.be.model.ComponentInstance;
+import org.openecomp.sdc.be.model.Service;
+import org.openecomp.sdc.be.model.User;
+import org.openecomp.sdc.ci.tests.api.Urls;
+import org.openecomp.sdc.ci.tests.config.Config;
+import org.openecomp.sdc.ci.tests.datatypes.DistributionMonitorObject;
+import org.openecomp.sdc.ci.tests.datatypes.ServiceDistributionStatus;
+import org.openecomp.sdc.ci.tests.datatypes.enums.UserRoleEnum;
+import org.openecomp.sdc.ci.tests.datatypes.http.RestResponse;
+import org.openecomp.sdc.ci.tests.utils.general.ElementFactory;
+import org.openecomp.sdc.ci.tests.utils.rest.BaseRestUtils;
+import org.openecomp.sdc.ci.tests.utils.rest.ResponseParser;
+import org.openecomp.sdc.ci.tests.utils.rest.ServiceRestUtils;
+
+import java.io.IOException;
+import java.text.ParseException;
+import java.util.*;
+import java.util.Map.Entry;
+
+//import org.openecomp.sdc.be.components.distribution.engine.DistributionStatusNotificationEnum;
+
+ public class DistributionUtils extends BaseRestUtils{
+	 
+	 final static String serviceDistributionSuffix = "/sdc/v1/catalog/services/";
+
+	 public static ServiceDistributionStatus getLatestServiceDistributionObject(Service service) throws IOException, ParseException {
+			ServiceDistributionStatus serviceDistributionStatus = null;
+			RestResponse distributionServiceList = ServiceRestUtils.getDistributionServiceList(service, ElementFactory.getDefaultUser(UserRoleEnum.DESIGNER));
+			Map<Long, ServiceDistributionStatus> serviveDistributionStatusMap = ResponseParser.convertServiceDistributionStatusToObject(distributionServiceList.getResponse());
+			if(serviveDistributionStatusMap.size() != 0){
+				serviceDistributionStatus = getLatestServiceDistributionObjectFromMap(serviveDistributionStatusMap);
+				return serviceDistributionStatus;
+			}
+			
+			return null;
+	}
+
+	public static ServiceDistributionStatus getLatestServiceDistributionObjectFromMap(Map<Long, ServiceDistributionStatus> serviceDistributionStatusMap) {
+		
+		ServiceDistributionStatus serviceDistributionStatus = null;
+		if (serviceDistributionStatusMap.size() == 1 ){
+			for (Entry<Long, ServiceDistributionStatus> entry : serviceDistributionStatusMap.entrySet()) {
+				return entry.getValue();
+			}
+		}
+		else{
+			serviceDistributionStatus = getFilteredServiceDistributionObject(serviceDistributionStatusMap);
+		}
+		
+		return serviceDistributionStatus;
+	}
+
+	private static ServiceDistributionStatus getFilteredServiceDistributionObject(Map<Long, ServiceDistributionStatus> serviceDistributionStatusMap) {
+		
+		List<Long> list = new ArrayList<Long>();
+		list.addAll(serviceDistributionStatusMap.keySet());
+		Collections.sort(list);
+		return serviceDistributionStatusMap.get(list.get(list.size() - 1));
+	}
+	
+	public static Map<String, String> getArtifactsMapOfDistributedService(Service service) throws Exception{
+		
+		Map<String, String> expectedDistributionArtifactMap = new HashMap<String, String>();
+		expectedDistributionArtifactMap = addServiceDeploymentArtifactToMap(service, expectedDistributionArtifactMap);
+		expectedDistributionArtifactMap = addComponentInstancesDeploymentArtifactToMap(service, expectedDistributionArtifactMap);
+		
+		return expectedDistributionArtifactMap;
+	}
+	
+	
+	public static Map<String, String> addServiceDeploymentArtifactToMap(Service service, Map<String, String> distributionArtifactMap){
+		
+		Map<String, ArtifactDefinition> deploymentArtifacts = service.getDeploymentArtifacts();
+		if (deploymentArtifacts != null && deploymentArtifacts.size() > 0){
+			for(Entry<String, ArtifactDefinition> artifact : deploymentArtifacts.entrySet()){
+				String url = buildServiceDeploymentUrl(service, artifact.getValue().getArtifactName(), artifact.getValue().getArtifactUUID());
+				distributionArtifactMap.put(artifact.getKey(), url);
+			}
+		}
+		
+		return distributionArtifactMap;
+	}
+	
+	private static String buildServiceDeploymentUrl(Service service, String artifactName, String artifactUUID) {
+//		format	"/sdc/v1/catalog/services/" + service.getSystemName() + "/" + service.getVersion() + "/artifacts/AAI-" + service.getName() + "-service-1.xml"
+		return serviceDistributionSuffix + service.getSystemName() + "/" + service.getVersion() + "/artifacts/" + artifactName;
+	}
+
+	public static String buildResourceInstanceDeploymentUrl(Service service, String artifactName, String artifactUUID){
+		
+//			/sdc/v1/catalog/services/Servicefordistribution/1.0  /resourceInstances/nestedfrommarina2   /artifacts/FEAdd_On_Module_vProbeLauncher.yaml
+		String resourceInstanceNormalizedName = getResourceInstanceNormalizeName(service, artifactName, artifactUUID );
+		return serviceDistributionSuffix + service.getSystemName() + "/" + service.getVersion() + "/resourceInstances/" + resourceInstanceNormalizedName  +"/artifacts/" + artifactName;
+	}
+	
+	public static String getResourceInstanceNormalizeName(Service service, String artifactName, String artifactUUID) {
+		for (ComponentInstance componentInstance : service.getComponentInstances()){
+			for(String key : componentInstance.getDeploymentArtifacts().keySet()){
+				if(componentInstance.getDeploymentArtifacts().get(key).getArtifactUUID().equals(artifactUUID)) {
+					return componentInstance.getNormalizedName();
+				}
+			}
+		}
+		return null;
+	}
+
+	public static Map<String, String> addComponentInstancesDeploymentArtifactToMap(Service service, Map<String, String> distributionArtifactMap){
+//			TODO Andrey create correct method to build RI url
+		if(service.getComponentInstances() != null && service.getComponentInstances().size() != 0){
+		for(ComponentInstance componentInstance : service.getComponentInstances()){
+			if (componentInstance.getDeploymentArtifacts() != null && componentInstance.getDeploymentArtifacts().size() != 0){
+				for(Entry<String, ArtifactDefinition> artifact : componentInstance.getDeploymentArtifacts().entrySet()){
+					String url = buildResourceInstanceDeploymentUrl(service, artifact.getValue().getArtifactName(), artifact.getValue().getArtifactUUID());;
+					distributionArtifactMap.put(artifact.getKey(), url);
+				}
+			}
+		}
+	}
+		
+		return distributionArtifactMap;
+	}
+	 
+	
+	
+	public static RestResponse getDistributionStatus(User sdncModifierDetails, String distributionId) throws IOException {
+
+		Config config = Utils.getConfig();
+		String url = String.format(Urls.DISTRIBUTION_SERVICE_MONITOR, config.getCatalogBeHost(), config.getCatalogBePort(), distributionId);
+		return sendGet(url, sdncModifierDetails.getUserId());
+		
+	}
+	
+	
+	/**
+	 * @param response
+	 * @return parsed distribution list of DistributionMonitorObject java objects
+	 * @throws JSONException
+	 */
+	public static Map<String, List<DistributionMonitorObject>> getSortedDistributionStatus(RestResponse response) throws JSONException{
+		
+		ArrayList<DistributionMonitorObject> distributionStatusList = new ArrayList<DistributionMonitorObject>();
+		String responseString = response.getResponse();
+		JSONObject jObject;
+		JSONArray jsonArray = null;
+		jObject = new JSONObject(responseString);
+		jsonArray = jObject.getJSONArray("distributionStatusList");
+		
+		Gson gson = new Gson();
+		for(int i=0; i<jsonArray.length(); i++){
+			String jsonElement = jsonArray.get(i).toString();
+			DistributionMonitorObject distributionStatus = gson.fromJson(jsonElement, DistributionMonitorObject.class);
+			distributionStatusList.add(distributionStatus);
+		}
+			Map<String, List<DistributionMonitorObject>> sortedDistributionMapByConsumer = sortDistributionStatusByConsumer(distributionStatusList);
+		
+		return sortedDistributionMapByConsumer;
+	}
+
+	/**
+	 * @param distributionStatusList
+	 * @return sorted distribution map where key is consumer name and value contains list of corresponded DistributionMonitorObject java object
+	 */
+	public static Map<String, List<DistributionMonitorObject>> sortDistributionStatusByConsumer(ArrayList<DistributionMonitorObject> distributionStatusList) {
+		//		sort distribution status list per consumer
+				Map<String, List<DistributionMonitorObject>> distributionStatusMapByConsumer = new HashMap<String, List<DistributionMonitorObject>>();
+				for(DistributionMonitorObject distributionListElement : distributionStatusList){
+					String key = distributionListElement.getOmfComponentID();
+					List<DistributionMonitorObject> list = new ArrayList<>();
+					if(distributionStatusMapByConsumer.get(key) != null){
+						list = distributionStatusMapByConsumer.get(key);
+						list.add(distributionListElement);
+						distributionStatusMapByConsumer.put(key, list);
+					}else{
+						list.add(distributionListElement);
+						distributionStatusMapByConsumer.put(key, list);
+					}
+					
+				}
+				return distributionStatusMapByConsumer;
+	}
+	
+	
+	/**
+	 * @param pair
+	 * @return consumer Status map: if map is empty - all consumers successes download and deploy the artifacts,
+	 * else - return failed consumer status per url 
+	 */
+	public static Pair<Boolean, Map<String, List<String>>> verifyDistributionStatus(Map<String, List<DistributionMonitorObject>> map){
+		
+		Map<String, List<String>> consumerStatusMap = new HashMap<>();
+		List<Boolean> flag = new ArrayList<>();
+		for (Entry<String, List<DistributionMonitorObject>> distributionMonitor : map.entrySet()){
+			int notifiedCount = 0, downloadCount = 0, deployCount = 0;
+			List<String> failedList = new ArrayList<>();
+			List<DistributionMonitorObject> listValue = distributionMonitor.getValue();
+			for(DistributionMonitorObject distributionStatus : listValue){
+				String status = distributionStatus.getStatus();
+				switch (status) {
+				case "NOTIFIED": notifiedCount++;
+					break;
+				case "NOT_NOTIFIED":
+				break;
+				case "DOWNLOAD_OK": downloadCount++;
+				break;
+				case "DEPLOY_OK": deployCount++;
+				break;
+				default:
+					failedList.add("Url " + distributionStatus.getUrl() + " failed with status " + distributionStatus.getStatus());
+					break;
+				}
+			}
+			if((notifiedCount != downloadCount || notifiedCount != deployCount) && notifiedCount != 0){
+				consumerStatusMap.put(distributionMonitor.getKey(), failedList);
+				flag.add(false);
+			}
+			if(notifiedCount == 0){
+				flag.add(true);
+			}
+		}
+	
+		if(!flag.contains(false)){
+			return Pair.create(true, consumerStatusMap);
+		}else{
+			return Pair.create(false, consumerStatusMap);
+		}
+
+	}
+	
+	
+	
+ }
diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/utils/ReqCap.java b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/utils/ReqCap.java
new file mode 100644
index 0000000000..55cc748e99
--- /dev/null
+++ b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/utils/ReqCap.java
@@ -0,0 +1,609 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * SDC
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.sdc.ci.tests.utils;
+
+import org.apache.commons.lang3.tuple.ImmutablePair;
+import org.openecomp.sdc.be.datatypes.enums.ComponentTypeEnum;
+import org.openecomp.sdc.be.datatypes.enums.ResourceTypeEnum;
+import org.openecomp.sdc.be.model.*;
+import org.openecomp.sdc.ci.tests.datatypes.ComponentInstanceReqDetails;
+import org.openecomp.sdc.ci.tests.datatypes.ComponentReqDetails;
+import org.openecomp.sdc.ci.tests.datatypes.enums.UserRoleEnum;
+import org.openecomp.sdc.ci.tests.datatypes.http.RestResponse;
+import org.openecomp.sdc.ci.tests.utils.general.ElementFactory;
+import org.openecomp.sdc.ci.tests.utils.rest.*;
+import org.testng.Assert;
+
+import java.io.IOException;
+import java.util.*;
+import java.util.Map.Entry;
+import java.util.function.Function;
+import java.util.stream.Collectors;
+
+import static org.testng.AssertJUnit.*;
+
+public class ReqCap {
+
+	public static Map<String, List<CapabilityDefinition>> expectedContainerCapabilities;
+	public static Map<String, List<RequirementDefinition>> expectedContainerRequirements;
+	public static Map<String, RequirementDefinition> removedRequirements;
+	public static Map<String, ImmutablePair<Map<String, List<CapabilityDefinition>>, Map<String, List<RequirementDefinition>>>> expectedContInstReqCap;
+
+	public static void verifyVFReqCap(String componentId) throws Exception {
+		RestResponse restResponse = ResourceRestUtils.getResource(componentId);
+		Resource resource = ResponseParser.parseToObject(restResponse.getResponse(), Resource.class);
+		verifyReqCap(resource);
+	}
+
+	public static void verifyServiceReqCap(String componentId, User sdncDesignerDetails) throws Exception {
+		RestResponse restResponse = ServiceRestUtils.getService(componentId, sdncDesignerDetails);
+		Service service = ResponseParser.parseToObject(restResponse.getResponse(), Service.class);
+		verifyReqCap(service);
+	}
+
+	public static void verifyProductReqCap(String componentId, User sdncPsDetails1) throws Exception {
+		RestResponse restResponse = ProductRestUtils.getProduct(componentId, sdncPsDetails1.getUserId());
+		Product product = ResponseParser.parseToObject(restResponse.getResponse(), Product.class);
+		verifyReqCap(product);
+	}
+
+	public static void verifyReqCap(Component actualComponent) {
+		verifyContainerReqCap(actualComponent);
+		verifyCompInstReqCap(actualComponent);
+	}
+
+	public RestResponse changeServiceInstanceVersion(String componentUniqueId, String serviceInstanceToReplaceUniqueId,
+			String serviceUniqueId, User sdncModifierDetails, ComponentTypeEnum componentType, boolean isHighestLevel)
+			throws Exception {
+		RestResponse changeResourceInstanceVersion = ProductRestUtils.changeServiceInstanceVersion(componentUniqueId,
+				serviceInstanceToReplaceUniqueId, serviceUniqueId, sdncModifierDetails, componentType);
+		if (changeResourceInstanceVersion.getErrorCode().equals(BaseRestUtils.STATUS_CODE_SUCCESS) && isHighestLevel) {
+			/*
+			 * // Add RI Capabilities and Requirements to expected MAP -->
+			 * expectedVfCapabilities and expectedVfRequirements
+			 * 
+			 * ComponentInstance componentInstance =
+			 * ResponseParser.parseToObjectUsingMapper(
+			 * changeResourceInstanceVersion.getResponse(),
+			 * ComponentInstance.class);
+			 * addCompInstReqCapToExpected(componentInstance, componentType);
+			 */
+		}
+		return changeResourceInstanceVersion;
+	}
+
+	public static void updateExpectedReqCapAfterChangeLifecycleState(String oldContainerUniqueIdToReplace,
+			String newContainerUniqueId) {
+
+		// Update of container req/cap
+
+		Set<String> compInstKeysToChange = new HashSet<>();
+
+		for (String expKey : expectedContainerCapabilities.keySet()) {
+			List<CapabilityDefinition> expCapList = expectedContainerCapabilities.get(expKey);
+			for (CapabilityDefinition cap : expCapList) {
+				String ownerId = cap.getOwnerId();
+
+				if (ownerId.contains(oldContainerUniqueIdToReplace)) {
+					compInstKeysToChange.add(ownerId);
+					cap.setOwnerId(cap.getOwnerId().replaceAll(oldContainerUniqueIdToReplace, newContainerUniqueId));
+				}
+			}
+		}
+
+		for (String expKey : expectedContainerRequirements.keySet()) {
+			List<RequirementDefinition> expCapList = expectedContainerRequirements.get(expKey);
+			for (RequirementDefinition cap : expCapList) {
+				String ownerId = cap.getOwnerId();
+				if (ownerId.contains(oldContainerUniqueIdToReplace)) {
+					compInstKeysToChange.add(ownerId);
+					cap.setOwnerId(cap.getOwnerId().replaceAll(oldContainerUniqueIdToReplace, newContainerUniqueId));
+				}
+			}
+		}
+
+		// Update of internal comp instances req/cap
+		for (String oldKey : compInstKeysToChange) {
+			ImmutablePair<Map<String, List<CapabilityDefinition>>, Map<String, List<RequirementDefinition>>> immutablePair = expectedContInstReqCap
+					.get(oldKey);
+			if (immutablePair != null) {
+				expectedContInstReqCap.remove(oldKey);
+				String newKey = oldKey.replaceAll(oldContainerUniqueIdToReplace, newContainerUniqueId);
+				expectedContInstReqCap.put(newKey, immutablePair);
+			}
+		}
+	}
+
+	private static void verifyCompInstReqCap(Component actualComponent) {
+		List<ComponentInstance> componentInstances = actualComponent.getComponentInstances();
+		if (componentInstances != null) {
+			assertEquals(expectedContInstReqCap.size(), componentInstances.size());
+			for (ComponentInstance compInst : componentInstances) {
+				String uniqueId = compInst.getUniqueId();
+				// System.out.println("Verifying req/cap of component instance
+				// "+ uniqueId);
+				Map<String, List<RequirementDefinition>> actualCompInstReq = compInst.getRequirements();
+				if (actualCompInstReq == null) {
+					actualCompInstReq = new HashMap<>();
+				}
+				Map<String, List<CapabilityDefinition>> actualCompInstCap = compInst.getCapabilities();
+				if (actualCompInstCap == null) {
+					actualCompInstCap = new HashMap<>();
+				}
+				ImmutablePair<Map<String, List<CapabilityDefinition>>, Map<String, List<RequirementDefinition>>> expReqCap = expectedContInstReqCap
+						.get(uniqueId);
+				assertNotNull(expReqCap);
+				// System.out.println("expected instance requirements:
+				// "+expReqCap.right);
+				// System.out.println("expected instance capabilities:
+				// "+expReqCap.left);
+				// System.out.println("actual instance requirements:
+				// "+actualCompInstReq);
+				// System.out.println("actual instance capabilities:
+				// "+actualCompInstCap);
+
+				// REQ comparison
+				compareReqCapMaps(expReqCap.right, actualCompInstReq);
+
+				// CAP comparison
+				compareReqCapMaps(expReqCap.left, actualCompInstCap);
+			}
+
+		} else {
+			assertTrue(expectedContInstReqCap.isEmpty());
+		}
+	}
+
+	private static void verifyContainerReqCap(Component actualComponent) {
+		Map<String, List<RequirementDefinition>> actualContainerRequirements = actualComponent.getRequirements();
+		if (actualContainerRequirements == null) {
+			actualContainerRequirements = new HashMap<>();
+		}
+		Map<String, List<CapabilityDefinition>> actualContainerCapabilities = actualComponent.getCapabilities();
+		if (actualContainerCapabilities == null) {
+			actualContainerCapabilities = new HashMap<>();
+		}
+		// System.out.println("Verifying req/cap of container component "+
+		// actualComponent.getUniqueId());
+		// System.out.println("expected container requirements:
+		// "+expectedContainerRequirements);
+		// System.out.println("expected container capabilities:
+		// "+expectedContainerCapabilities);
+		// System.out.println("actual container requirements:
+		// "+actualContainerRequirements);
+		// System.out.println("actual container capabilities:
+		// "+actualContainerCapabilities);
+
+		// REQ comparison
+		compareReqCapMaps(expectedContainerRequirements, actualContainerRequirements);
+
+		// CAP comparison
+		compareReqCapMaps(expectedContainerCapabilities, actualContainerCapabilities);
+	}
+
+	private static <T> void compareReqCapMaps(Map<String, List<T>> expectedMap, Map<String, List<T>> actualMap) {
+		assertEquals(expectedMap.size(), actualMap.size());
+		for (String expKey : expectedMap.keySet()) {
+			List<?> expCapList = expectedMap.get(expKey);
+			List<?> actCapList = actualMap.get(expKey);
+			assertEquals(expCapList.size(), actCapList.size());
+			assertEquals(new HashSet<>(expCapList), new HashSet<>(actCapList));
+		}
+	}
+
+	public static void addCompInstReqCapToExpected(ComponentInstance componentInstance,
+			ComponentTypeEnum containerComponentType, User sdncDesignerDetails) throws Exception {
+
+		sdncDesignerDetails = ElementFactory.getDefaultUser(UserRoleEnum.DESIGNER);
+		String uniqueId = componentInstance.getUniqueId();
+		String name = componentInstance.getName();
+		String originComponentId = componentInstance.getComponentUid();
+		RestResponse getResponse = null;
+		ComponentTypeEnum compInstType = getCompInstTypeByContainerType(containerComponentType);
+		Component component = null;
+		if (compInstType == ComponentTypeEnum.RESOURCE) {
+			getResponse = ResourceRestUtils.getResource(sdncDesignerDetails, originComponentId);
+			ResourceRestUtils.checkSuccess(getResponse);
+			component = ResponseParser.parseToObjectUsingMapper(getResponse.getResponse(), Resource.class);
+		} else if (compInstType == ComponentTypeEnum.SERVICE) {
+			getResponse = ServiceRestUtils.getService(originComponentId, sdncDesignerDetails);
+			ResourceRestUtils.checkSuccess(getResponse);
+			component = ResponseParser.parseToObjectUsingMapper(getResponse.getResponse(), Service.class);
+		} else {
+			Assert.fail("Unsupported type - " + containerComponentType);
+		}
+
+		Map<String, List<RequirementDefinition>> resourceRequirements = component.getRequirements();
+		if (resourceRequirements == null) {
+			resourceRequirements = new HashMap<>();
+		}
+
+		Function<Entry<String, List<RequirementDefinition>>, List<RequirementDefinition>> requirementDefinitionMapper = e -> new ArrayList<>(e.getValue().stream().map(item -> new RequirementDefinition(item)).collect(Collectors.toList()));
+		Map<String, List<RequirementDefinition>> reqCopy = resourceRequirements.entrySet().stream().collect(Collectors.toMap(e -> e.getKey(), requirementDefinitionMapper));
+		
+		Map<String, List<CapabilityDefinition>> resourceCapabilities = component.getCapabilities();
+		if (resourceCapabilities == null) {
+			resourceCapabilities = new HashMap<>();
+		}
+		
+		Function<Entry<String, List<CapabilityDefinition>>, List<CapabilityDefinition>> capabilityDefinitionMapper = e -> new ArrayList<>(e.getValue().stream().map(item -> new CapabilityDefinition(item)).collect(Collectors.toList()));
+		Map<String, List<CapabilityDefinition>> capCopy = resourceCapabilities.entrySet().stream().collect(Collectors.toMap(e -> e.getKey(), capabilityDefinitionMapper));
+		
+		setupContainerExpectedReqCap(uniqueId, name, resourceRequirements, resourceCapabilities);
+		if (component.getComponentType().equals(ComponentTypeEnum.RESOURCE)
+				&& ((Resource) component).getResourceType() != ResourceTypeEnum.VF) {
+			setupConstInstExpectedReqCap(uniqueId, name, reqCopy, capCopy);
+		}
+
+		// adding entry for expected componentInstance
+		ImmutablePair<Map<String, List<CapabilityDefinition>>, Map<String, List<RequirementDefinition>>> compInstReqCapPair = new ImmutablePair<Map<String, List<CapabilityDefinition>>, Map<String, List<RequirementDefinition>>>(
+				capCopy, reqCopy);
+		expectedContInstReqCap.put(uniqueId, compInstReqCapPair);
+	}
+
+	private static void setupContainerExpectedReqCap(String uniqueId, String name,
+			Map<String, List<RequirementDefinition>> componentRequirements,
+			Map<String, List<CapabilityDefinition>> componentCapabilities) {
+		for (Entry<String, List<RequirementDefinition>> resReq : componentRequirements.entrySet()) {
+			List<RequirementDefinition> reqListToAdd = resReq.getValue();
+			for (RequirementDefinition requirementDefinition : reqListToAdd) {
+				requirementDefinition.setOwnerId(uniqueId);
+				requirementDefinition.setOwnerName(name);
+			}
+			List<RequirementDefinition> expectedReqList = expectedContainerRequirements.get(resReq.getKey());
+			if (expectedReqList == null) {
+				expectedReqList = reqListToAdd;
+			} else {
+				expectedReqList.addAll(reqListToAdd);
+			}
+			expectedContainerRequirements.put(resReq.getKey(), expectedReqList);
+		}
+
+		for (Entry<String, List<CapabilityDefinition>> resCap : componentCapabilities.entrySet()) {
+			List<CapabilityDefinition> capListToAdd = resCap.getValue();
+			for (CapabilityDefinition capDefinition : capListToAdd) {
+				capDefinition.setOwnerId(uniqueId);
+				capDefinition.setOwnerName(name);
+			}
+			List<CapabilityDefinition> expectedCapList = expectedContainerCapabilities.get(resCap.getKey());
+			if (expectedCapList == null) {
+				expectedCapList = capListToAdd;
+			} else {
+				expectedCapList.addAll(capListToAdd);
+			}
+			expectedContainerCapabilities.put(resCap.getKey(), expectedCapList);
+		}
+	}
+
+	private static void setupConstInstExpectedReqCap(String uniqueId, String name,
+			Map<String, List<RequirementDefinition>> componentRequirements,
+			Map<String, List<CapabilityDefinition>> componentCapabilities) {
+		for (Entry<String, List<RequirementDefinition>> resReq : componentRequirements.entrySet()) {
+			List<RequirementDefinition> reqListToAdd = resReq.getValue();
+			for (RequirementDefinition requirementDefinition : reqListToAdd) {
+				requirementDefinition.setOwnerId(uniqueId);
+				requirementDefinition.setOwnerName(name);
+			}
+		}
+
+		for (Entry<String, List<CapabilityDefinition>> resCap : componentCapabilities.entrySet()) {
+			List<CapabilityDefinition> capListToAdd = resCap.getValue();
+			for (CapabilityDefinition capDefinition : capListToAdd) {
+				capDefinition.setOwnerId(uniqueId);
+				capDefinition.setOwnerName(name);
+			}
+		}
+	}
+
+	private static ComponentTypeEnum getCompInstTypeByContainerType(ComponentTypeEnum componentType) {
+		switch (componentType) {
+		case RESOURCE:
+			return ComponentTypeEnum.RESOURCE;
+		case SERVICE:
+			return ComponentTypeEnum.RESOURCE;
+		case PRODUCT:
+			return ComponentTypeEnum.SERVICE;
+		default:
+			break;
+		}
+		return null;
+	}
+
+	public static void deleteCompInstReqCapFromExpected(String componentInstanceId) {
+		List<String> entriesRequirementsToRemove = new ArrayList<>();
+		List<String> entriesCapabilitiesToRemove = new ArrayList<>();
+		for (Entry<String, List<RequirementDefinition>> reqEntry : expectedContainerRequirements.entrySet()) {
+			List<RequirementDefinition> reqList = reqEntry.getValue();
+			List<RequirementDefinition> reqListToDelete = new ArrayList<>();
+			for (RequirementDefinition requirementDefinition : reqList) {
+				if (requirementDefinition.getOwnerId().equals(componentInstanceId)) {
+					reqListToDelete.add(requirementDefinition);
+				}
+			}
+			reqList.removeAll(reqListToDelete);
+			if (reqList.isEmpty()) {
+				entriesRequirementsToRemove.add(reqEntry.getKey());
+			}
+		}
+
+		for (String ekey : entriesRequirementsToRemove) {
+			expectedContainerRequirements.remove(ekey);
+		}
+
+		for (Entry<String, List<CapabilityDefinition>> capEntry : expectedContainerCapabilities.entrySet()) {
+			List<CapabilityDefinition> capList = capEntry.getValue();
+			List<CapabilityDefinition> capListToDelete = new ArrayList<>();
+			for (CapabilityDefinition capabilityDefinition : capList) {
+				if (capabilityDefinition.getOwnerId().equals(componentInstanceId)) {
+					capListToDelete.add(capabilityDefinition);
+				}
+			}
+			capList.removeAll(capListToDelete);
+			if (capList.isEmpty()) {
+				entriesCapabilitiesToRemove.add(capEntry.getKey());
+			}
+		}
+		for (String ekey : entriesCapabilitiesToRemove) {
+			expectedContainerCapabilities.remove(ekey);
+		}
+
+		expectedContInstReqCap.remove(componentInstanceId);
+
+	}
+
+	// Automatically updates the expected req/cap of the container
+	public static RestResponse createAtomicInstanceForVF(Resource containerDetails, Resource compInstOriginDetails,
+			User modifier) throws Exception {
+		return createComponentInstance(containerDetails, compInstOriginDetails, modifier, ComponentTypeEnum.RESOURCE,
+				true);
+	}
+
+	// Automatically updates the expected req/cap of the container
+	public static RestResponse createAtomicInstanceForService(Service containerDetails, Resource compInstOriginDetails,
+			User modifier) throws Exception {
+		return createComponentInstance(containerDetails, compInstOriginDetails, modifier, ComponentTypeEnum.SERVICE,
+				true);
+	}
+
+	// Automatically updates the expected req/cap of the container
+	public static RestResponse createVFInstance(Service containerDetails, Resource compInstOriginDetails, User modifier)
+			throws Exception {
+		return createComponentInstance(containerDetails, compInstOriginDetails, modifier, ComponentTypeEnum.SERVICE,
+				true);
+	}
+
+	// Automatically updates the expected req/cap of the container
+	public static RestResponse createServiceInstance(Product containerDetails, Service compInstOriginDetails,
+			User modifier) throws Exception {
+		return createComponentInstance(containerDetails, compInstOriginDetails, modifier, ComponentTypeEnum.PRODUCT,
+				true);
+	}
+
+	// Automatically updates the expected req/cap of the container
+	public static RestResponse deleteAtomicInstanceForVF(String compInstUniqueId, Resource containerDetails,
+			User modifier) throws IOException, Exception {
+		return deleteComponentInstance(compInstUniqueId, containerDetails, modifier, ComponentTypeEnum.RESOURCE, true);
+	}
+
+	// Automatically updates the expected req/cap of the container
+	public static RestResponse deleteAtomicInstanceForService(String compInstUniqueId, Service containerDetails,
+			User modifier) throws IOException, Exception {
+		return deleteComponentInstance(compInstUniqueId, containerDetails, modifier, ComponentTypeEnum.SERVICE, true);
+	}
+
+	// Automatically updates the expected req/cap of the container
+	public static RestResponse deleteVFInstance(String compInstUniqueId, Service containerDetails, User modifier)
+			throws IOException, Exception {
+		return deleteComponentInstance(compInstUniqueId, containerDetails, modifier, ComponentTypeEnum.SERVICE, true);
+
+	}
+
+	// Automatically updates the expected req/cap of the container
+	public static RestResponse deleteServiceInstance(String compInstUniqueId, Product containerDetails, User modifier)
+			throws IOException, Exception {
+		return deleteComponentInstance(compInstUniqueId, containerDetails, modifier, ComponentTypeEnum.PRODUCT, true);
+	}
+
+	// Setup of lower components - Doesn't affect req/cap of the container (for
+	// example, setup of VF for testing a Product)
+	public static RestResponse createAtomicInstanceForVFDuringSetup(Resource containerDetails,
+			Resource compInstOriginDetails, User modifier) throws Exception {
+		return createComponentInstance(containerDetails, compInstOriginDetails, modifier, ComponentTypeEnum.RESOURCE,
+				false);
+	}
+
+	// Setup of lower components - Doesn't affect req/cap of the container (for
+	// example, setup of VF for testing a Product)
+	public static RestResponse createAtomicInstanceForServiceDuringSetup(Service containerDetails,
+			Resource compInstOriginDetails, User modifier) throws Exception {
+		return createComponentInstance(containerDetails, compInstOriginDetails, modifier, ComponentTypeEnum.SERVICE,
+				false);
+	}
+
+	// Setup of lower components - Doesn't affect req/cap of the container (for
+	// example, setup of VF for testing a Product)
+	public static RestResponse createVFInstanceDuringSetup(Service containerDetails, Resource compInstOriginDetails,
+			User modifier) throws Exception {
+		return createComponentInstance(containerDetails, compInstOriginDetails, modifier, ComponentTypeEnum.SERVICE,
+				false);
+	}
+
+	// Setup of lower components - Doesn't affect req/cap of the container (for
+	// example, setup of VF for testing a Product)
+	public static RestResponse createServiceInstanceDuringSetup(Product containerDetails, Service compInstOriginDetails,
+			User modifier) throws Exception {
+		return createComponentInstance(containerDetails, compInstOriginDetails, modifier, ComponentTypeEnum.PRODUCT,
+				false);
+	}
+
+	// Setup of lower components - Doesn't affect req/cap of the container (for
+	// example, setup of VF for testing a Product)
+	public static RestResponse deleteAtomicInstanceForVFDuringSetup(String compInstUniqueId, Resource containerDetails,
+			User modifier) throws IOException, Exception {
+		return deleteComponentInstance(compInstUniqueId, containerDetails, modifier, ComponentTypeEnum.RESOURCE, false);
+	}
+
+	// Setup of lower components - Doesn't affect req/cap of the container (for
+	// example, setup of VF for testing a Product)
+	public static RestResponse deleteAtomicInstanceForServiceDuringSetup(String compInstUniqueId,
+			Service containerDetails, User modifier) throws IOException, Exception {
+		return deleteComponentInstance(compInstUniqueId, containerDetails, modifier, ComponentTypeEnum.SERVICE, false);
+	}
+
+	// Setup of lower components - Doesn't affect req/cap of the container (for
+	// example, setup of VF for testing a Product)
+	public static RestResponse deleteVFInstanceDuringSetup(String compInstUniqueId, Service containerDetails,
+			User modifier) throws IOException, Exception {
+		return deleteComponentInstance(compInstUniqueId, containerDetails, modifier, ComponentTypeEnum.SERVICE, false);
+
+	}
+
+	// Setup of lower components - Doesn't affect req/cap of the container (for
+	// example, setup of VF for testing a Product)
+	public static RestResponse deleteServiceInstanceDuringSetup(String compInstUniqueId, Product containerDetails,
+			User modifier) throws IOException, Exception {
+		return deleteComponentInstance(compInstUniqueId, containerDetails, modifier, ComponentTypeEnum.PRODUCT, false);
+	}
+
+	public static Component getComponentAndValidateRIs(Component componentDetails, int numberOfRIs,
+			int numberOfRelations, User sdncAdminDetails) throws IOException, Exception {
+
+		RestResponse getResponse = null;
+		Component component = null;
+		if (componentDetails instanceof Resource) {
+			getResponse = ResourceRestUtils.getResource(sdncAdminDetails, componentDetails.getUniqueId());
+			component = ResponseParser.parseToObjectUsingMapper(getResponse.getResponse(), Resource.class);
+		} else if (componentDetails instanceof Service) {
+			getResponse = ServiceRestUtils.getService((componentDetails.getUniqueId()), sdncAdminDetails);
+			component = ResponseParser.parseToObjectUsingMapper(getResponse.getResponse(), Service.class);
+		} else if (componentDetails instanceof Product) {
+			getResponse = ProductRestUtils.getProduct(componentDetails.getUniqueId(), sdncAdminDetails.getUserId());
+			component = ResponseParser.parseToObjectUsingMapper(getResponse.getResponse(), Product.class);
+		} else {
+			Assert.fail("Unsupported type of componentDetails - " + componentDetails.getClass().getSimpleName());
+		}
+		ResourceRestUtils.checkSuccess(getResponse);
+		int numberOfActualRIs = component.getComponentInstances() != null ? component.getComponentInstances().size()
+				: 0;
+		int numberOfActualRelations = component.getComponentInstancesRelations() != null
+				? component.getComponentInstancesRelations().size() : 0;
+		assertEquals("Check number of RIs meet the expected number", numberOfRIs, numberOfActualRIs);
+		assertEquals("Check number of RI relations meet the expected number", numberOfRelations,
+				numberOfActualRelations);
+		verifyReqCap(component);
+
+		return component;
+	}
+
+	public static void getComponentAndValidateRIsAfterChangeLifecycleState(String oldComponentUniqueIdToReplace,
+			Component componentDetails, int numOfRIs, int numOfRelations, User sdncAdminDetails)
+			throws IOException, Exception {
+		updateExpectedReqCapAfterChangeLifecycleState(oldComponentUniqueIdToReplace, componentDetails.getUniqueId());
+		getComponentAndValidateRIs(componentDetails, numOfRIs, numOfRelations, sdncAdminDetails);
+	}
+
+	private static RestResponse createComponentInstance(Component containerDetails, Component compInstOriginDetails,
+			User modifier, ComponentTypeEnum containerComponentTypeEnum, boolean isHighestLevel)
+			throws IOException, Exception {
+		ComponentInstanceReqDetails resourceInstanceReqDetails = ElementFactory
+				.getComponentInstance(compInstOriginDetails);
+		RestResponse createResourceInstanceResponse = ComponentInstanceRestUtils.createComponentInstance(
+				resourceInstanceReqDetails, modifier, containerDetails.getUniqueId(), containerComponentTypeEnum);
+		if (createResourceInstanceResponse.getErrorCode().equals(BaseRestUtils.STATUS_CODE_CREATED) && isHighestLevel) {
+			// Add RI Capabilities and Requirements to expected MAP -->
+			// expectedVfCapabilities and expectedVfRequirements
+			ComponentInstance componentInstance = ResponseParser
+					.parseToObjectUsingMapper(createResourceInstanceResponse.getResponse(), ComponentInstance.class);
+			addCompInstReqCapToExpected(componentInstance, containerComponentTypeEnum, modifier);
+		}
+		return createResourceInstanceResponse;
+	}
+
+	private static RestResponse deleteComponentInstance(String compInstUniqueId, Component containerDetails,
+			User modifier, ComponentTypeEnum componentTypeEnum, boolean isHighestLevel) throws Exception {
+		RestResponse deleteResourceInstanceResponse = ComponentInstanceRestUtils.deleteComponentInstance(modifier,
+				containerDetails.getUniqueId(), compInstUniqueId, componentTypeEnum);
+		if (deleteResourceInstanceResponse.getErrorCode().equals(BaseRestUtils.STATUS_CODE_DELETE) && isHighestLevel) {
+			deleteCompInstReqCapFromExpected(compInstUniqueId);
+		}
+		return deleteResourceInstanceResponse;
+	}
+
+	public static RestResponse associateComponentInstancesForService(RequirementCapabilityRelDef requirementDef,
+			ComponentReqDetails containerDetails, User user) throws IOException {
+
+		RestResponse associateInstances = ComponentInstanceRestUtils.associateInstances(requirementDef, user,
+				containerDetails.getUniqueId(), ComponentTypeEnum.SERVICE);
+		ResourceRestUtils.checkSuccess(associateInstances);
+		deleteAssociatedFromExpected(requirementDef);
+		return associateInstances;
+	}
+
+	private static void deleteAssociatedFromExpected(RequirementCapabilityRelDef requirementDef) {
+		// removing from requirements
+		RelationshipInfo relationship = requirementDef.getRelationships().get(0).getRelation();
+		String type = relationship.getRelationship().getType();
+		String fromId = requirementDef.getFromNode();
+		List<RequirementDefinition> reqList = expectedContainerRequirements.get(type);
+		RequirementDefinition toDelete = null;
+		if (reqList != null) {
+			for (RequirementDefinition reqDef : reqList) {
+				if (reqDef.getOwnerId().equals(fromId)) {
+					toDelete = reqDef;
+				}
+			}
+			if (toDelete != null) {
+				reqList.remove(toDelete);
+				if (reqList.isEmpty()) {
+					expectedContainerRequirements.remove(type);
+				}
+				removedRequirements.put(toDelete.getCapability() + " " + toDelete.getOwnerId(), toDelete);
+			}
+		}
+	}
+
+	public static void dissociateComponentInstancesForService(RequirementCapabilityRelDef requirementDef,
+			ComponentReqDetails containerDetails, User user) throws IOException {
+
+		RestResponse dissociateInstances = ComponentInstanceRestUtils.dissociateInstances(requirementDef, user,
+				containerDetails.getUniqueId(), ComponentTypeEnum.SERVICE);
+		ResourceRestUtils.checkSuccess(dissociateInstances);
+		addDissociatedToExpected(requirementDef);
+	}
+
+	private static void addDissociatedToExpected(RequirementCapabilityRelDef requirementDef) {
+		// adding to requirements
+		RelationshipInfo relationship = requirementDef.getRelationships().get(0).getRelation();
+		String type = relationship.getRelationship().getType();
+		String fromId = requirementDef.getFromNode();
+		String key = type + " " + fromId;
+		RequirementDefinition requirementDefinition = removedRequirements.get(key);
+		if (requirementDefinition != null) {
+			List<RequirementDefinition> reqList = expectedContainerRequirements.get(type);
+			if (reqList == null) {
+				reqList = new ArrayList<>();
+				expectedContainerRequirements.put(type, reqList);
+			}
+			reqList.add(requirementDefinition);
+		}
+	}
+
+}
diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/utils/ToscaParserUtils.java b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/utils/ToscaParserUtils.java
new file mode 100644
index 0000000000..b7eaf99724
--- /dev/null
+++ b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/utils/ToscaParserUtils.java
@@ -0,0 +1,227 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * SDC
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.sdc.ci.tests.utils;
+
+import static org.testng.AssertJUnit.assertNotNull;
+import static org.testng.AssertJUnit.assertTrue;
+import static org.testng.AssertJUnit.fail;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.Map;
+import org.apache.commons.collections4.MapUtils;
+import org.openecomp.sdc.ci.tests.datatypes.enums.UserRoleEnum;
+import org.openecomp.sdc.ci.tests.tosca.datatypes.ToscaDefinition;
+import org.openecomp.sdc.ci.tests.tosca.datatypes.ToscaGroupsTopologyTemplateDefinition;
+import org.openecomp.sdc.ci.tests.tosca.datatypes.ToscaImportsDefinition;
+import org.openecomp.sdc.ci.tests.tosca.datatypes.ToscaInputsTopologyTemplateDefinition;
+import org.openecomp.sdc.ci.tests.tosca.datatypes.ToscaMetadataDefinition;
+import org.openecomp.sdc.ci.tests.tosca.datatypes.ToscaNodeTemplatesTopologyTemplateDefinition;
+import org.openecomp.sdc.ci.tests.tosca.datatypes.ToscaParameterConstants;
+import org.openecomp.sdc.ci.tests.tosca.datatypes.ToscaSubstitutionMappingsDefinition;
+import org.openecomp.sdc.ci.tests.tosca.datatypes.ToscaTopologyTemplateDefinition;
+import org.openecomp.sdc.ci.tests.utils.general.ElementFactory;
+import org.openecomp.sdc.ci.tests.utils.rest.BaseRestUtils;
+import org.openecomp.sdc.ci.tests.utils.rest.ImportRestUtils;
+import org.openecomp.sdc.common.http.client.api.HttpResponse;
+import org.openecomp.sdc.common.zip.ZipUtils;
+import org.openecomp.sdc.common.zip.exception.ZipException;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.yaml.snakeyaml.Yaml;
+import org.yaml.snakeyaml.constructor.Constructor;
+import org.yaml.snakeyaml.introspector.PropertyUtils;
+
+public class ToscaParserUtils {
+
+	private static Logger log = LoggerFactory.getLogger(ToscaParserUtils.class.getName());
+
+	
+	/**method get csarUUID and send GET API request toward BE 
+	 * @param csarUUID
+	 * @return
+	 * @throws Exception
+	 */
+	public static ToscaDefinition parseToscaYamlToJavaObjectByCsarUuid(String csarUUID) throws Exception {
+		
+		ToscaDefinition toscaDefinition = null;
+		String TOSCAMetaLocation = ToscaParameterConstants.TOSCA_META_PATH;
+		Map<?, ?> map = getToscaYamlMap(csarUUID, TOSCAMetaLocation);
+		assertNotNull("Tosca Entry-Definitions is null", map);
+		if (map != null) {
+			File definitionYamlLocation = (File) map.get(ToscaParameterConstants.ENTRY_DEFINITION);
+			toscaDefinition = parseToscaYamlToJavaObject(definitionYamlLocation);
+		}
+		return toscaDefinition;
+
+	}
+
+	/**method read csar from location
+	 * @param csarNameLocation - full path with csar name 
+	 * @return
+	 * @throws Exception
+	 */
+	public static ToscaDefinition parseToscaMainYamlToJavaObjectByCsarLocation(File csarNameLocation) throws Exception {
+		
+		ToscaDefinition toscaDefinition = null;
+		String TOSCAMetaLocation = ToscaParameterConstants.TOSCA_META_PATH;
+//		read file location of main yaml file(location+name) from TOSCA.meta file by 
+		Map<?, ?> map = getToscaYamlMap(csarNameLocation, TOSCAMetaLocation);
+		
+		assertNotNull("Tosca Entry-Definitions is null", map);
+
+		String definitionYamlLocation = (String) map.get(ToscaParameterConstants.ENTRY_DEFINITION);
+		String csarPayload = getYamlPayloadFromCsar(csarNameLocation, definitionYamlLocation);
+		toscaDefinition = parseToscaYamlPayloadToJavaObject(csarPayload);
+		return toscaDefinition;
+
+	}
+	
+	public static ToscaDefinition parseToscaAnyYamlToJavaObjectByCsarLocation(File csarNameLocation, String yamlLocation) throws Exception {
+		
+		ToscaDefinition toscaDefinition = null;
+		String csarPayload = getYamlPayloadFromCsar(csarNameLocation, yamlLocation);
+		toscaDefinition = parseToscaYamlPayloadToJavaObject(csarPayload);
+		return toscaDefinition;
+
+	}
+	
+	public static ToscaDefinition parseToscaYamlToJavaObject(File path) throws Exception {
+
+		ToscaDefinition toscaDefinition = null;
+		
+//        File path = new File("C:/Data/D2.0/TOSCA_Ex/Definitions/tosca_definition_version.yaml");
+        FileInputStream fis = null;
+        try {
+			try (FileInputStream fileInputStream = fis = new FileInputStream(path)) {
+			}
+			
+		} catch (Exception e) {
+			System.out.println("Exception: " + e);
+		}
+        
+        Constructor constructor = initToscaDefinitionObject();
+    	
+        Yaml yaml = new Yaml(constructor);
+        try {
+        	toscaDefinition = (ToscaDefinition) yaml.load(fis);
+		} catch (Exception e) {
+			log.debug("Failed to parse tosca yaml file");
+			System.out.println("Exception: " + e);
+		} finally {
+			fis.close();
+		}
+        return toscaDefinition;
+        
+	}
+
+	public static ToscaDefinition parseToscaYamlPayloadToJavaObject(String payload){
+
+		ToscaDefinition toscaDefinition = null;
+        Constructor constructor = initToscaDefinitionObject();
+    	
+        Yaml yaml = new Yaml(constructor);
+        try {
+        	toscaDefinition = (ToscaDefinition) yaml.load(payload);
+		} catch (Exception e) {
+			log.debug("Failed to parse tosca yaml file", e);
+			fail("Exception: " + e);
+		}
+        return toscaDefinition;
+        
+	}
+	
+	
+	public static Constructor initToscaDefinitionObject() {
+		Constructor toscaStructure = new Constructor(ToscaDefinition.class);
+        toscaStructure.addTypeDescription(ToscaDefinition.getTypeDescription());
+        toscaStructure.addTypeDescription(ToscaTopologyTemplateDefinition.getTypeDescription());
+    	toscaStructure.addTypeDescription(ToscaNodeTemplatesTopologyTemplateDefinition.getTypeDescription());
+    	toscaStructure.addTypeDescription(ToscaGroupsTopologyTemplateDefinition.getTypeDescription());
+    	toscaStructure.addTypeDescription(ToscaSubstitutionMappingsDefinition.getTypeDescription());
+    	toscaStructure.addTypeDescription(ToscaImportsDefinition.getTypeDescription());
+    	toscaStructure.addTypeDescription(ToscaMetadataDefinition.getTypeDescription());
+    	toscaStructure.addTypeDescription(ToscaInputsTopologyTemplateDefinition.getTypeDescription());
+//    	Skip properties which are found in YAML, but not found in POJO
+    	PropertyUtils propertyUtils = new PropertyUtils();
+    	propertyUtils.setSkipMissingProperties(true);
+    	toscaStructure.setPropertyUtils(propertyUtils);
+		return toscaStructure;
+	}
+
+	public static Map<?, ?> getToscaYamlMap(String csarUUID, String yamlFileLocation) throws Exception {
+		String csarPayload = getCsarPayload(csarUUID, yamlFileLocation);
+		if (csarPayload != null) {
+			Yaml yaml = new Yaml();
+			Map<?, ?> map = (Map<?, ?>) yaml.load(csarPayload);
+			return map;
+		}
+		return null;
+	}
+	
+	public static Map<?, ?> getToscaYamlMap(File csarPath, String yamlFileLocation) throws Exception {
+		String csarPayload = getYamlPayloadFromCsar(csarPath, yamlFileLocation);
+		if (csarPayload != null) {
+			Yaml yaml = new Yaml();
+			Map<?, ?> map = (Map<?, ?>) yaml.load(csarPayload);
+			return map;
+		}
+		return null;
+	}
+	
+	
+	public static String getCsarPayload(String csarName, String yamlFileLocation) throws Exception {
+
+	    HttpResponse<byte []> csar = ImportRestUtils.getCsar(csarName, ElementFactory.getDefaultUser(UserRoleEnum.DESIGNER));
+		assertTrue("Return response code different from 200", csar.getStatusCode() == BaseRestUtils.STATUS_CODE_SUCCESS);
+		byte[] data = csar.getResponse();
+		return getDataFromZipFileByBytes(yamlFileLocation, data);
+
+	}
+
+	public static String getYamlPayloadFromCsar(File csarName, String fileLocation) throws IOException, ZipException {
+		Path path = csarName.toPath();
+		byte[] data = Files.readAllBytes(path);
+		return getDataFromZipFileByBytes(fileLocation, data);
+	}
+
+	/** method get file data from zip data by file location in the zip structure 
+	 * @param fileLocation
+	 * @param data
+	 * @return
+	 */
+	public static String getDataFromZipFileByBytes(String fileLocation, byte[] data) throws ZipException {
+		if (data == null || data.length == 0) {
+			return null;
+		}
+		final Map<String, byte[]> readZip = ZipUtils.readZip(data, false);
+		if (MapUtils.isEmpty(readZip)) {
+			return null;
+		}
+		byte[] artifactsBytes = readZip.get(fileLocation);
+		return new String(artifactsBytes, StandardCharsets.UTF_8);
+	}
+	
+}
diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/utils/ToscaTypesDefinitionUtils.java b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/utils/ToscaTypesDefinitionUtils.java
new file mode 100644
index 0000000000..eab84ae563
--- /dev/null
+++ b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/utils/ToscaTypesDefinitionUtils.java
@@ -0,0 +1,74 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * SDC
+ * ================================================================================
+ * 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=========================================================
+ */
+
+package org.openecomp.sdc.ci.tests.utils;
+
+import org.openecomp.sdc.be.model.Component;
+import org.openecomp.sdc.be.model.User;
+import org.openecomp.sdc.ci.tests.tosca.datatypes.ToscaAnnotationsTypesDefinition;
+import org.openecomp.sdc.ci.tests.tosca.datatypes.ToscaParameterConstants;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.yaml.snakeyaml.Yaml;
+import org.yaml.snakeyaml.constructor.Constructor;
+
+import static org.junit.Assert.assertNotNull;
+import static org.openecomp.sdc.ci.tests.utils.CsarParserUtils.downloadComponentCsar;
+import static org.openecomp.sdc.ci.tests.utils.ToscaParserUtils.getDataFromZipFileByBytes;
+import static org.testng.AssertJUnit.fail;
+
+public class ToscaTypesDefinitionUtils {
+
+    private ToscaTypesDefinitionUtils() {
+    }
+
+    private static final String ANNOTATIONS_TYPE_PATH = ToscaParameterConstants.TOSCA_DEFINITION_PATH + "/annotations.yml";
+    private static Logger log = LoggerFactory.getLogger(ToscaTypesDefinitionUtils.class);
+
+    public static ToscaAnnotationsTypesDefinition getToscaAnnotationsFromCsar(Component csarOwner, User user) throws Exception {
+        byte[] decodeBase64 = downloadComponentCsar(csarOwner, user);
+        String dataFromZipFileByBytes = getDataFromZipFileByBytes(ANNOTATIONS_TYPE_PATH, decodeBase64);
+        assertNotNull(dataFromZipFileByBytes);
+        return parseToscaAnnotationsYml(dataFromZipFileByBytes);
+    }
+
+    private static ToscaAnnotationsTypesDefinition parseToscaAnnotationsYml(String payload){
+        Constructor constructor = initToscaAnnotationDefObject();
+        return (ToscaAnnotationsTypesDefinition) parseToscaYamlPayload(payload, constructor);
+    }
+
+    private static Object parseToscaYamlPayload(String payload, Constructor constructor) {
+        Yaml yaml = new Yaml(constructor);
+        try {
+            return yaml.load(payload);
+        } catch (Exception e) {
+            log.debug("Failed to parse tosca yaml file", e);
+            e.printStackTrace();
+            fail("Failed to parse tosca yaml file");
+        }
+        return null;
+    }
+
+    private static Constructor initToscaAnnotationDefObject() {
+        Constructor toscaStructure = new Constructor(ToscaAnnotationsTypesDefinition.class);
+        toscaStructure.addTypeDescription(ToscaAnnotationsTypesDefinition.getTypeDescription());
+        return toscaStructure;
+    }
+}
diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/utils/Utils.java b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/utils/Utils.java
new file mode 100644
index 0000000000..73e99011c3
--- /dev/null
+++ b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/utils/Utils.java
@@ -0,0 +1,751 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * SDC
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.sdc.ci.tests.utils;
+
+import com.google.gson.Gson;
+import com.google.gson.JsonElement;
+import com.google.gson.JsonObject;
+import com.google.gson.JsonParser;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.logging.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.openecomp.sdc.be.model.Component;
+import org.openecomp.sdc.ci.tests.config.Config;
+import org.openecomp.sdc.ci.tests.datatypes.ServiceReqDetails;
+import org.openecomp.sdc.ci.tests.datatypes.enums.ArtifactTypeEnum;
+import org.openecomp.sdc.ci.tests.tosca.model.ToscaMetadataFieldsPresentationEnum;
+import org.openecomp.sdc.common.api.ToscaNodeTypeInfo;
+import org.openecomp.sdc.common.api.YamlConstants;
+import org.yaml.snakeyaml.Yaml;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.InputStream;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.concurrent.TimeUnit;
+
+import static org.testng.AssertJUnit.*;
+
+public final class Utils {
+
+	Gson gson = new Gson();
+
+	static Logger logger = LogManager.getLogger(Utils.class);
+
+	String contentTypeHeaderData = "application/json";
+	String acceptHeaderDate = "application/json";
+
+	public Utils() {
+		/*
+		 * super();
+		 * 
+		 * StartTest.enableLogger(); logger =
+		 * Logger.getLogger(Utils.class.getName());
+		 */
+
+	}
+
+	// public String serviceTopologyPattern = "/topology/topology/%s";
+	// public String serviceTopologyTemplatePattern =
+	// "/topologytemplate/topologytemplate/%s";
+	//
+	// public String serviceTopologySearchPattern =
+	// "topology/topology/_search?q=%s";
+	// public String serviceTopologyTemplateSearchPattern =
+	// "topologytemplate/topologytemplate/_search?q=%s";
+	//
+	// public ArtifactTypeEnum getFileTypeByExtension(String fileName) {
+	//
+	// String fileExtension = null;
+	// if (fileName.matches("(.*)\\.(.*)")) {
+	// System.out.println(fileName.substring(fileName.lastIndexOf(".") + 1));
+	// fileExtension = fileName.substring(fileName.lastIndexOf(".") + 1);
+	// }
+	//
+	// switch (fileExtension) {
+	// case "sh":
+	// return ArtifactTypeEnum.SHELL_SCRIPT;
+	// case "png":
+	// return ArtifactTypeEnum.ICON;
+	// case "ppp":
+	// return ArtifactTypeEnum.PUPPET;
+	// case "yang":
+	// return ArtifactTypeEnum.YANG;
+	// default:
+	// return ArtifactTypeEnum.UNKNOWN;
+	// }
+	//
+	// }
+	//
+	// public ArrayList<String> getScriptList (List<UploadArtifactInfo>
+	// artifactsList){
+	//
+	// ArrayList<String> scriptNameArray = new ArrayList<>();
+	// if (artifactsList != null){
+	// for (UploadArtifactInfo fileInArtifactsList : artifactsList){
+	// String artifactFileName = fileInArtifactsList.getArtifactName();
+	// ArtifactTypeEnum artifactFileType =
+	// fileInArtifactsList.getArtifactType();
+	// if (! artifactFileType.equals(ArtifactTypeEnum.ICON)){
+	// scriptNameArray.add(artifactFileName);
+	// }
+	// continue;
+	// }
+	// return scriptNameArray;
+	// }
+	// return null;
+	// }
+	//
+	//
+	// public String getYamlFileLocation(File testResourcesPath) {
+	// File[] files = testResourcesPath.listFiles();
+	// if (files.length == 0){
+	// return null;
+	// }else{
+	// for (int i = 0; i < files.length; i++){
+	// if (files[i].isFile()){
+	// return files[i].getAbsoluteFile().toString();
+	// }
+	// }
+	// }
+	// return null;
+	// }
+	//
+	// public String readFileContentToString (String fileName) throws
+	// IOException {
+	//
+	// Path path = Paths.get(fileName);
+	// String stringFromFile = new String(Files.readAllBytes(path));
+	// return stringFromFile;
+	//
+	//
+	// }
+	//
+	@SuppressWarnings("unchecked")
+	public ToscaNodeTypeInfo parseToscaNodeYaml(String fileContent) {
+
+		ToscaNodeTypeInfo result = new ToscaNodeTypeInfo();
+		Object templateVersion = null;
+		Object templateName = null;
+
+		if (fileContent != null) {
+			Yaml yaml = new Yaml();
+
+			Map<String, Object> yamlObject = (Map<String, Object>) yaml.load(fileContent);
+
+			templateVersion = yamlObject.get(YamlConstants.TEMPLATE_VERSION);
+			if (templateVersion != null) {
+				result.setTemplateVersion(templateVersion.toString());
+			}
+			templateName = yamlObject.get(YamlConstants.TEMPLATE_NAME);
+			if (templateName != null) {
+				result.setTemplateName(templateName.toString());
+			}
+			Object nodeTypes = yamlObject.get(YamlConstants.NODE_TYPES);
+
+			if (nodeTypes != null) {
+				Map<String, Object> nodeTypesMap = (Map<String, Object>) nodeTypes;
+				for (Entry<String, Object> entry : nodeTypesMap.entrySet()) {
+
+					String nodeName = entry.getKey();
+					if (nodeName != null) {
+						result.setNodeName(nodeName);
+					}
+
+					break;
+
+				}
+			}
+
+		}
+
+		return result;
+	}
+
+	//
+	//
+	// public ArtifactsMetadata getArtifactsMetadata(String response){
+	// ArtifactsMetadata artifactsMetadata = new ArtifactsMetadata();
+	//
+	// artifactsMetadata.setId(getJsonObjectValueByKey(response, "id"));
+	// artifactsMetadata.setName(getJsonObjectValueByKey(response, "name"));
+	// artifactsMetadata.setType(getJsonObjectValueByKey(response, "type"));
+	//
+	// artifactsMetadata.setCreator(getJsonObjectValueByKey(response,
+	// "creator"));
+	// artifactsMetadata.setCreationTime(getJsonObjectValueByKey(response,
+	// "creationTime"));
+	// artifactsMetadata.setLastUpdateTime(getJsonObjectValueByKey(response,
+	// "lastUpdateTime"));
+	// artifactsMetadata.setChecksum(getJsonObjectValueByKey(response,
+	// "checksum"));
+	// artifactsMetadata.setDescription(getJsonObjectValueByKey(response,
+	// "description"));
+	// artifactsMetadata.setLastUpdater(getJsonObjectValueByKey(response,
+	// "lastUpdater"));
+	//
+	// return artifactsMetadata;
+	// }
+	//
+	public static String getJsonObjectValueByKey(String metadata, String key) {
+		JsonElement jelement = new JsonParser().parse(metadata);
+
+		JsonObject jobject = jelement.getAsJsonObject();
+		Object obj = jobject.get(key);
+		if (obj == null) {
+			return null;
+		} else {
+			String value;
+			value = (String) jobject.get(key).getAsString();
+			return value;
+		}
+	}
+
+	public static Config getConfig() throws FileNotFoundException {
+		Config config = Config.instance();
+		return config;
+	}
+
+	public static Config getConfigHandleException() {
+		Config config = null;
+		try{
+			config = Config.instance();
+		}catch (Exception e){
+			System.out.println("Configuration file not found. " + e);
+		}
+		return config;
+	}
+	// public void uploadNormativeTypes() throws IOException{
+	// Config config = getConfig();
+	// String[] normativeTypes = {"root", "compute", "blockStorage",
+	// "softwareComponent", "DBMS", "database", "network", "objectStorage",
+	// "webServer", "webApplication"};
+	// for( String normativeType : normativeTypes ){
+	// uploadComponent(config.getComponentsConfigDir()+File.separator+"normativeTypes"+File.separator+normativeType);
+	// }
+	//
+	// }
+	//
+	// public void uploadApacheComponent() throws IOException{
+	// Config config = getConfig();
+	// uploadComponent(config.getComponentsConfigDir()+File.separator+"apache");
+	// }
+	//
+	// public void uploadComponent(String componentDir) throws IOException{
+	//
+	// //*********************************************upload*************************************************************
+	// Config config = getConfig();
+	// ZipDirectory zipDirectory = new ZipDirectory();
+	// System.out.println(config.getEsHost());
+	//
+	// List<UploadArtifactInfo> artifactsList = new
+	// ArrayList<UploadArtifactInfo>();
+	//
+	//// read test resources and zip it as byte array
+	// byte[] zippedAsByteArray = zipDirectory.zip(componentDir, artifactsList);
+	//
+	//// encode zipped directory using base64
+	// String payload = Decoder.encode(zippedAsByteArray);
+	//
+	//// zip name build as testName with ".zip" extension
+	// String payloadZipName = getPayloadZipName(componentDir);
+	//
+	//// build json
+	// UploadResourceInfo resourceInfo = new UploadResourceInfo(payload,
+	// payloadZipName, "description", "category/mycategory", null,
+	// artifactsList);
+	// String json = new Gson().toJson(resourceInfo);
+	//
+	//// calculate md5 on the content of json
+	// String jsonMd5 =
+	// org.apache.commons.codec.digest.DigestUtils.md5Hex(json);
+	//
+	//// encode the md5 to base64, sent as header in post http request
+	// String encodedMd5 = Decoder.encode(jsonMd5.getBytes());
+	//
+	//// upload component to Elastic Search DB
+	// String url = null;
+	// HttpRequest http = new HttpRequest();
+	//
+	// url = String.format(Urls.UPLOAD_ZIP_URL, config.getCatalogFeHost(),
+	// config.getCatalogFePort());
+	//
+	//// Prepare headers to post upload component request
+	// HeaderData headerData = new HeaderData(encodedMd5, "application/json",
+	// "att", "test", "testIvanovich", "RoyalSeal", "Far_Far_Away",
+	// "getResourceArtifactListTest");
+	//
+	// MustHeaders headers = new MustHeaders(headerData);
+	// System.out.println("headers:"+headers.getMap());
+	//
+	// RestResponse response = http.httpSendPost(url, json, headers.getMap());
+	//
+	// assertEquals("upload component failed with code " +
+	// response.getErrorCode().intValue(),response.getErrorCode().intValue(),
+	// 204);
+	// }
+	//
+	// private String getPayloadZipName(String componentDir) {
+	// String payloadName;
+	// if( componentDir.contains( File.separator) ){
+	// String delimiter = null;
+	// if( File.separator.equals("\\")){
+	// delimiter ="\\\\";
+	// }
+	// else{
+	// delimiter = File.separator;
+	// }
+	// String[] split = componentDir.split(delimiter);
+	// payloadName = split[split.length-1];
+	// }
+	// else{
+	// payloadName = componentDir;
+	// }
+	// return payloadName+".zip";
+	// }
+	//
+	//
+	//
+	// public List<UploadArtifactInfo> createArtifactsList(String srcDir) {
+	//
+	// List<UploadArtifactInfo> artifactsList = new
+	// ArrayList<UploadArtifactInfo>();
+	// File srcFile = new File(srcDir);
+	// addFileToList(srcFile, artifactsList);
+	//
+	// return artifactsList;
+	// }
+	//
+	// public void addFileToList(File srcFile, List<UploadArtifactInfo>
+	// artifactsList) {
+	//
+	// File[] files = srcFile.listFiles();
+	//
+	// for (int i = 0; i < files.length; i++) {
+	// // if the file is directory, use recursion
+	// if (files[i].isDirectory()) {
+	// addFileToList(files[i], artifactsList);
+	// continue;
+	// }
+	//
+	// String fileName = files[i].getName();
+	// String artifactPath = fileName;
+	//
+	// if ( ! files[i].getName().matches("(.*)\\.y(?)ml($)")) {
+	// UploadArtifactInfo uploadArtifactInfo = new UploadArtifactInfo();
+	// uploadArtifactInfo.setArtifactName(files[i].getName());
+	// String parent = files[i].getParent();
+	//
+	// if (parent != null) {
+	// System.out.println(parent);
+	// int lastSepartor = parent.lastIndexOf(File.separator);
+	// if (lastSepartor > -1) {
+	// String actualParent = parent.substring(lastSepartor + 1);
+	// artifactPath = actualParent + "/" + artifactPath;
+	// }
+	// }
+	//
+	// uploadArtifactInfo.setArtifactPath(artifactPath);
+	// uploadArtifactInfo.setArtifactType(getFileTypeByExtension(fileName));
+	// uploadArtifactInfo.setArtifactDescription("description");
+	// artifactsList.add(uploadArtifactInfo);
+	//
+	// System.out.println("artifact list: " + artifactsList);
+	//
+	// }
+	//
+	// }
+	// }
+	//
+	//
+	// public String buildArtifactListUrl (String nodesType, String
+	// templateVersion, String artifactName) throws FileNotFoundException{
+	// //"http://172.20.43.132/sdc2/v1/catalog/resources/tosca.nodes.Root/1.0.0.wd03-SNAPSHOT/artifacts/wxs_baseline_compare.sh"
+	// Config config = getConfig();
+	// return "\"http://" + config.getCatalogBeHost() + ":" +
+	// config.getCatalogBePort() + "/sdc2/v1/catalog/resources/" +nodesType +
+	// "/" + templateVersion + "/artifacts/" + artifactName +"\"";
+	// }
+	//
+	//
+	// public void addTopologyToES(String testFolder, String
+	// serviceTopologyPattern) throws IOException{
+	// Config config = getConfig();
+	// String url = String.format(Urls.ES_URL, config.getEsHost(),
+	// config.getEsPort()) + serviceTopologyPattern;
+	// String sourceDir =
+	// config.getResourceConfigDir()+File.separator+testFolder;
+	// Path filePath = FileSystems.getDefault().getPath(sourceDir,
+	// "topology.txt");
+	// postFileContentsToUrl(url, filePath);
+	// }
+	//
+	// public void addTopologyTemplateToES(String testFolder, String
+	// serviceTopologyTemplatePattern) throws IOException{
+	// Config config = getConfig();
+	// String url = String.format(Urls.ES_URL, config.getEsHost(),
+	// config.getEsPort()) + serviceTopologyTemplatePattern;
+	// String sourceDir =
+	// config.getResourceConfigDir()+File.separator+testFolder;
+	// Path filePath = FileSystems.getDefault().getPath(sourceDir,
+	// "topologyTemplate.txt");
+	// postFileContentsToUrl(url, filePath);
+	// }
+	//
+	//
+	// public void postFileContentsToUrl(String url, Path filePath) throws
+	// IOException {
+	// HttpClientContext localContext = HttpClientContext.create();
+	// CloseableHttpResponse response = null;
+	//
+	// byte[] fileContent = Files.readAllBytes(filePath);
+	//
+	// try(CloseableHttpClient httpClient = HttpClients.createDefault()){
+	// HttpPost httpPost = new HttpPost(url);
+	// StringEntity entity = new StringEntity(new String(fileContent) ,
+	// ContentType.APPLICATION_JSON);
+	// httpPost.setEntity(entity);
+	// response = httpClient.execute(httpPost, localContext);
+	//
+	// }
+	// finally{
+	// response.close();
+	// }
+	//
+	//
+	// }
+	//
+	//
+	//// public boolean isPatternInEsDb(String patternToSearch)throws
+	// IOException{
+	//// Config config = getConfig();
+	//// String url = String.format(Urls.GET_SEARCH_DATA_FROM_ES,
+	// config.getEsHost(), config.getEsPort(),patternToSearch);
+	//// HttpRequest httpRequest = new HttpRequest();
+	//// RestResponse restResponse = httpRequest.httpSendGet(url);
+	//// if (restResponse.getErrorCode() == 200){
+	//// return true;
+	//// }
+	//// if (restResponse.getErrorCode() == 404){
+	//// return false;
+	//// }
+	////
+	//// return false;
+	//// }
+	//
+	// public static RestResponse deleteAllDataFromEs() throws IOException{
+	// return deleteFromEsDbByPattern("_all");
+	// }
+	//
+
+	//
+	// public List<String> buildIdArrayListByTypesIndex (String index, String
+	// types) throws IOException{
+	//
+	// Config config = getConfig();
+	// HttpRequest http = new HttpRequest();
+	// RestResponse getResponce =
+	// http.httpSendGet(String.format(Urls.GET_ID_LIST_BY_INDEX_FROM_ES,
+	// config.getEsHost(), config.getEsPort(), index, types), null);
+	//
+	// List <String> idArray = new ArrayList<String>();
+	//
+	// JsonElement jelement = new JsonParser().parse(getResponce.getResponse());
+	// JsonObject jobject = jelement.getAsJsonObject();
+	// JsonObject hitsObject = (JsonObject) jobject.get("hits");
+	// JsonArray hitsArray = (JsonArray) hitsObject.get("hits");
+	// for (int i = 0; i < hitsArray.size(); i ++){
+	// JsonObject idObject = (JsonObject) hitsArray.get(i);
+	// String id = idObject.get("_id").toString();
+	// id = id.replace("\"", "");
+	// idArray.add(id);
+	// }
+	//
+	// return idArray;
+	// }
+	//
+	// public List<String> buildCategoriesTagsListFromJson(String
+	// categoriesTagsJson){
+	//
+	// ArrayList<String> categoriesTagsArray = new ArrayList<>();
+	// JsonElement jelement = new JsonParser().parse(categoriesTagsJson);
+	// JsonArray jArray = jelement.getAsJsonArray();
+	// for (int i = 0; i < jArray.size(); i ++){
+	// JsonObject categoriesTagsObject = (JsonObject) jArray.get(i);
+	// String categories = categoriesTagsObject.get("name").toString();
+	// categoriesTagsArray.add(categories);
+	// }
+	//
+	// return categoriesTagsArray;
+	// }
+	//
+	// public ArrayList <String> getCategoriesFromDb() throws Exception{
+	//
+	// ArrayList<String> categoriesFromDbArrayList = new ArrayList<>();
+	// RestResponse restResponse = new RestResponse();
+	// String contentTypeHeaderData = "application/json";
+	// String acceptHeaderDate = "application/json";
+	//
+	// Map<String, String> headersMap = new HashMap<String,String>();
+	// headersMap.put(HttpHeaderEnum.CONTENT_TYPE.getValue(),contentTypeHeaderData);
+	// headersMap.put(HttpHeaderEnum.ACCEPT.getValue(), acceptHeaderDate);
+	//
+	// HttpRequest httpRequest = new HttpRequest();
+	// String url = String.format(Urls.QUERY_NEO4J,
+	// Config.instance().getNeoHost(), Config.instance().getNeoPort());
+	// String body = "{\"statements\" : [ { \"statement\" : \"MATCH
+	// (category:category) return (category)\"} ]}";
+	// restResponse = httpRequest.httpSendPostWithAuth(url, body, headersMap,
+	// Config.instance().getNeoDBusername(),
+	// Config.instance().getNeoDBpassword());
+	//
+	// if (restResponse.getResponse()==null){
+	// return categoriesFromDbArrayList;
+	// }else{
+	// JsonElement jelement = new
+	// JsonParser().parse(restResponse.getResponse());
+	// JsonObject jobject = jelement.getAsJsonObject();
+	// JsonArray resultsArray = (JsonArray) jobject.get("results");
+	// JsonObject resObject = (JsonObject) resultsArray.get(0);
+	// JsonArray dataArray = (JsonArray) resObject.get("data");
+	// for (int i = 0; i < dataArray.size(); i ++){
+	// JsonObject rowObject = (JsonObject) dataArray.get(i);
+	// JsonArray rowArray = (JsonArray) rowObject.get("row");
+	// JsonObject nameObject = (JsonObject) rowArray.get(0);
+	// String name = nameObject.get("name").toString();
+	//// name = name.replace("\"", "");
+	// categoriesFromDbArrayList.add(name);
+	// }
+	//
+	//
+	// }
+	//
+	// return categoriesFromDbArrayList;
+	// }
+	//
+	public static void compareArrayLists(List<String> actualArraylList, List<String> expectedArrayList,
+			String message) {
+
+		ArrayList<String> actual = new ArrayList<String>(actualArraylList);
+		ArrayList<String> expected = new ArrayList<String>(expectedArrayList);
+		// assertEquals(message + " count got by rest API not match to " +
+		// message + " expected count", expected.size(),actual.size());
+		expected.removeAll(actual);
+		assertEquals(message + " content got by rest API not match to " + message + " actual content", 0,
+				expected.size());
+	}
+
+	public static Object parseYamlConfig(String pattern) throws FileNotFoundException {
+
+		Yaml yaml = new Yaml();
+		Config config = getConfig();
+		String configurationFile = config.getConfigurationFile();
+		File file = new File(configurationFile);
+		// File file = new
+		// File("../catalog-be/src/main/resources/config/configuration.yaml");
+		InputStream inputStream = new FileInputStream(file);
+		Map<?, ?> map = (Map<?, ?>) yaml.load(inputStream);
+		Object patternMap = (Object) map.get(pattern);
+
+		return patternMap;
+	}
+
+	public static String getDepArtLabelFromConfig(ArtifactTypeEnum artifactTypeEnum) throws FileNotFoundException {
+
+		@SuppressWarnings("unchecked")
+		Map<String, Object> mapOfDepResArtTypesObjects = (Map<String, Object>) parseYamlConfig(
+				"deploymentResourceArtifacts");
+		for (Map.Entry<String, Object> iter : mapOfDepResArtTypesObjects.entrySet()) {
+			if (iter.getValue().toString().contains(artifactTypeEnum.getType())) {
+				return iter.getKey().toLowerCase();
+			}
+		}
+
+		return "defaultLabelName";
+	}
+
+	
+	public static String multipleChar(String ch, int repeat) {
+		return StringUtils.repeat(ch, repeat);
+	}
+	
+	public static List<String> getListOfDepResArtLabels(Boolean isLowerCase) throws FileNotFoundException {
+
+		List<String> listOfResDepArtTypesFromConfig = new ArrayList<String>();
+		@SuppressWarnings("unchecked")
+		Map<String, Object> resourceDeploymentArtifacts = (Map<String, Object>) parseYamlConfig(
+				"deploymentResourceArtifacts");
+		if (resourceDeploymentArtifacts != null) {
+
+			if (isLowerCase) {
+				for (Map.Entry<String, Object> iter : resourceDeploymentArtifacts.entrySet()) {
+					listOfResDepArtTypesFromConfig.add(iter.getKey().toLowerCase());
+				}
+			} else {
+
+				for (Map.Entry<String, Object> iter : resourceDeploymentArtifacts.entrySet()) {
+					listOfResDepArtTypesFromConfig.add(iter.getKey());
+				}
+			}
+		}
+		return listOfResDepArtTypesFromConfig;
+	}
+
+	public static List<String> getListOfToscaArtLabels(Boolean isLowerCase) throws FileNotFoundException {
+
+		List<String> listOfToscaArtTypesFromConfig = new ArrayList<String>();
+		@SuppressWarnings("unchecked")
+		Map<String, Object> toscaArtifacts = (Map<String, Object>) parseYamlConfig("toscaArtifacts");
+		if (toscaArtifacts != null) {
+
+			if (isLowerCase) {
+				for (Map.Entry<String, Object> iter : toscaArtifacts.entrySet()) {
+					listOfToscaArtTypesFromConfig.add(iter.getKey().toLowerCase());
+				}
+			} else {
+				for (Map.Entry<String, Object> iter : toscaArtifacts.entrySet()) {
+					listOfToscaArtTypesFromConfig.add(iter.getKey());
+				}
+			}
+		}
+		return listOfToscaArtTypesFromConfig;
+	}
+
+	//
+	// public static List<String> getListOfResDepArtTypes() throws
+	// FileNotFoundException {
+	//
+	// List<String> listOfResDepArtTypesFromConfig = new ArrayList<String>();
+	// @SuppressWarnings("unchecked")
+	// Map<String, Object> resourceDeploymentArtifacts = (Map<String, Object>)
+	// parseYamlConfig("resourceDeploymentArtifacts");
+	// for (Map.Entry<String, Object> iter :
+	// resourceDeploymentArtifacts.entrySet()) {
+	// listOfResDepArtTypesFromConfig.add(iter.getKey());
+	// }
+	//
+	// return listOfResDepArtTypesFromConfig;
+	// }
+	//
+	// public static List<String> getListOfDepResInstArtTypes() throws
+	// FileNotFoundException {
+	//
+	// List<String> listOfResInstDepArtTypesFromConfig = new
+	// ArrayList<String>();
+	// @SuppressWarnings("unchecked")
+	// Map<String, Object> resourceDeploymentArtifacts = (Map<String, Object>)
+	// parseYamlConfig("deploymentResourceInstanceArtifacts");
+	// for (Map.Entry<String, Object> iter :
+	// resourceDeploymentArtifacts.entrySet()) {
+	// listOfResInstDepArtTypesFromConfig.add(iter.getKey().toLowerCase());
+	// }
+	//
+	// return listOfResInstDepArtTypesFromConfig;
+	// }
+	//
+	public static List<String> getListOfResPlaceHoldersDepArtTypes() throws FileNotFoundException {
+		List<String> listResDepArtTypesFromConfig = new ArrayList<String>();
+		List<String> listOfResDepArtLabelsFromConfig = getListOfDepResArtLabels(false);
+		assertNotNull("deployment artifact types list is null", listOfResDepArtLabelsFromConfig);
+		Object parseYamlConfig = Utils.parseYamlConfig("deploymentResourceArtifacts");
+		Map<String, Object> mapOfDepResArtTypesObjects = (Map<String, Object>) Utils
+				.parseYamlConfig("deploymentResourceArtifacts");
+
+		// assertNotNull("deployment artifact types list is null",
+		// mapOfDepResArtTypesObjects);
+		if (listOfResDepArtLabelsFromConfig != null) {
+			for (String resDepArtType : listOfResDepArtLabelsFromConfig) {
+				Object object = mapOfDepResArtTypesObjects.get(resDepArtType);
+				if (object instanceof Map<?, ?>) {
+					Map<String, Object> map = (Map<String, Object>) object;
+					listResDepArtTypesFromConfig.add((String) map.get("type"));
+				} else {
+					assertTrue("return object does not instance of map", false);
+				}
+			}
+		}
+		return listResDepArtTypesFromConfig;
+	}
+
+	public static Long getEpochTimeFromUTC(String time) throws ParseException {
+	    SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss.SSS zzz");
+	    java.util.Date date = df.parse(time);
+	    long epoch = date.getTime();
+	    return epoch;
+	}
+
+	public static Long getActionDuration(Runnable func) throws Exception{
+		long startTime = System.nanoTime();
+		func.run();
+		long estimateTime = System.nanoTime();
+        Long duration = TimeUnit.NANOSECONDS.toSeconds(estimateTime - startTime);
+		return duration;
+	}
+
+    public static Long getAndValidateActionDuration (Runnable action, int regularTestRunTime){
+        Long actualTestRunTime = null;
+        try {
+            actualTestRunTime = Utils.getActionDuration(() -> {
+                try {
+                    action.run();
+                } catch (Throwable throwable) {
+                    throwable.printStackTrace();
+                }
+            });
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        double factor = 1.5;
+
+        assertTrue("Expected test run time should be less than " + regularTestRunTime*factor + ", " +
+                "actual time is " + actualTestRunTime , regularTestRunTime*factor>actualTestRunTime);
+//        SetupCDTest.getExtendTest().log(Status.INFO, "Actual catalog loading time is  " + actualTestRunTime + " seconds");
+        return actualTestRunTime;
+    }
+
+
+	public static Map<String, String> generateServiceMetadataToExpectedObject(ServiceReqDetails serviceReqDetails, Component component) {
+			
+			Map<String, String> metadata = new HashMap<>();
+			
+			metadata.put(ToscaMetadataFieldsPresentationEnum.ToscaMetadataFieldsEnum.CATEGORY.value, serviceReqDetails.getCategories().get(0).getName());
+			metadata.put(ToscaMetadataFieldsPresentationEnum.ToscaMetadataFieldsEnum.DESCRIPTION.value, serviceReqDetails.getDescription());
+			metadata.put(ToscaMetadataFieldsPresentationEnum.ToscaMetadataFieldsEnum.INVARIANT_UUID.value, component.getInvariantUUID());
+			metadata.put(ToscaMetadataFieldsPresentationEnum.ToscaMetadataFieldsEnum.TYPE.value, "Service");
+			metadata.put(ToscaMetadataFieldsPresentationEnum.ToscaMetadataFieldsEnum.UUID.value, component.getUUID());
+			metadata.put(ToscaMetadataFieldsPresentationEnum.ToscaMetadataFieldsEnum.NAME.value, component.getName());
+			metadata.put(ToscaMetadataFieldsPresentationEnum.ToscaMetadataFieldsEnum.INSTANTIATION_TYPE.value, serviceReqDetails.getInstantiationType());
+			metadata.put(ToscaMetadataFieldsPresentationEnum.ToscaMetadataFieldsEnum.SERVICE_TYPE.value, serviceReqDetails.getServiceType());
+			metadata.put(ToscaMetadataFieldsPresentationEnum.ToscaMetadataFieldsEnum.SERVICE_ROLE.value, serviceReqDetails.getServiceRole());
+			metadata.put(ToscaMetadataFieldsPresentationEnum.ToscaMetadataFieldsEnum.NAMING_POLICY.value, serviceReqDetails.getNamingPolicy());
+			metadata.put(ToscaMetadataFieldsPresentationEnum.ToscaMetadataFieldsEnum.ECOMP_GENERATED_NAMING.value, serviceReqDetails.getEcompGeneratedNaming().toString());
+			metadata.put(ToscaMetadataFieldsPresentationEnum.ToscaMetadataFieldsEnum.SERVICE_ECOMP_NAMING.value, serviceReqDetails.getEcompGeneratedNaming().toString());//equals to ECOMP_GENERATED_NAMING
+			
+			return metadata;
+		}
+}
diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/utils/cassandra/CassandraUtils.java b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/utils/cassandra/CassandraUtils.java
new file mode 100644
index 0000000000..20a137d8fa
--- /dev/null
+++ b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/utils/cassandra/CassandraUtils.java
@@ -0,0 +1,239 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * SDC
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.sdc.ci.tests.utils.cassandra;
+
+import com.datastax.driver.core.*;
+import com.datastax.driver.core.policies.*;
+import com.datastax.driver.core.querybuilder.QueryBuilder;
+import com.datastax.driver.core.querybuilder.Select;
+import com.datastax.driver.core.querybuilder.Select.Where;
+import org.javatuples.Pair;
+import org.openecomp.sdc.be.resources.data.auditing.AuditingTypesConstants;
+import org.openecomp.sdc.ci.tests.utils.Utils;
+import org.openecomp.sdc.common.datastructure.AuditingFieldsKey;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.io.FileNotFoundException;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+
+public final class CassandraUtils {
+    private static Logger logger = LoggerFactory.getLogger(CassandraUtils.class.getName());
+
+    protected static Cluster cluster = null;
+    protected static Session session;
+
+    public static void initConnection(String keyspace) throws FileNotFoundException {
+        List<String> cassandraHosts = new ArrayList<>();
+        try {
+            cassandraHosts.add(Utils.getConfig().getCassandraHost());
+            long reconnectTimeout = 30000;
+
+            logger.debug("creating cluster to hosts:{} with reconnect timeout:{}", cassandraHosts, reconnectTimeout);
+            Cluster.Builder clusterBuilder = Cluster.builder()
+                    .withReconnectionPolicy(new ConstantReconnectionPolicy(reconnectTimeout))
+                    .withRetryPolicy(DefaultRetryPolicy.INSTANCE);
+
+            cassandraHosts.forEach(host -> clusterBuilder.addContactPoint(host));
+            enableAuthentication(clusterBuilder);
+            enableSsl(clusterBuilder);
+            setLocalDc(clusterBuilder);
+
+            cluster = clusterBuilder.build();
+            session = cluster.connect(keyspace);
+        } catch (Exception e) {
+            logger.info("** CassandraClient isn't connected to {}", cassandraHosts);
+        }
+    }
+
+    private static void enableAuthentication(Cluster.Builder clusterBuilder) throws FileNotFoundException {
+        boolean authenticate = Utils.getConfig().getCassandraAuthenticate();
+        if (authenticate) {
+            String username = Utils.getConfig().getCassandraUsername();
+            String password = Utils.getConfig().getCassandraPassword();
+            if (username == null || password == null) {
+                logger.error("authentication is enabled but username or password were not supplied.");
+            } else {
+                clusterBuilder.withCredentials(username, password);
+            }
+
+        }
+    }
+
+    private static void enableSsl(Cluster.Builder clusterBuilder) throws FileNotFoundException {
+        boolean ssl = Utils.getConfig().getCassandraSsl();
+        if (ssl) {
+            String truststorePath = Utils.getConfig().getCassandraTruststorePath();
+            String truststorePassword = Utils.getConfig().getCassandraTruststorePassword();
+            if (truststorePath == null || truststorePassword == null) {
+                logger.error("ssl is enabled but truststorePath or truststorePassword were not supplied.");
+            } else {
+                System.setProperty("javax.net.ssl.trustStore", truststorePath);
+                System.setProperty("javax.net.ssl.trustStorePassword", truststorePassword);
+                clusterBuilder.withSSL();
+            }
+        }
+    }
+
+
+    private static void setLocalDc(Cluster.Builder clusterBuilder) throws FileNotFoundException {
+        String localDataCenter = Utils.getConfig().getLocalDataCenter();
+        if (localDataCenter != null) {
+            logger.info("localDatacenter was provided, setting Cassndra clint to use datacenter: {} as local.", localDataCenter);
+            LoadBalancingPolicy tokenAwarePolicy = new TokenAwarePolicy(DCAwareRoundRobinPolicy.builder().withLocalDc(localDataCenter).build());
+            clusterBuilder.withLoadBalancingPolicy(tokenAwarePolicy);
+        } else {
+            logger.info("localDatacenter was provided, the driver will use the datacenter of the first contact point that was reached at initialization");
+        }
+    }
+
+    public static void truncateTable(String keyspace, String tableName) throws FileNotFoundException {
+
+        if (session == null || session.isClosed()) {
+            initConnection(keyspace);
+        }
+
+        try (Cluster cluster = CassandraUtils.cluster){
+
+            if (session != null) {
+                session.execute(QueryBuilder.truncate(keyspace, tableName));
+                logger.debug("The table {}.{} was cleaned", keyspace, tableName);
+            } else {
+                throw new RuntimeException("Keyspace " + keyspace + " not connected");
+            }
+        }
+    }
+
+    public static void close() {
+        if (cluster != null) {
+            cluster.close();
+        }
+    }
+
+    public static void truncateAllKeyspaces() throws FileNotFoundException {
+        // truncateAllTables(AuditingTypesConstants.ARTIFACT_KEYSPACE);
+        truncateAllTables(AuditingTypesConstants.AUDIT_KEYSPACE);
+    }
+
+    public static void truncateAllTables(String keyspace) throws FileNotFoundException {
+
+        if (session == null || session.isClosed()) {
+            initConnection(keyspace);
+        }
+        try {
+
+            if (session != null) {
+                Metadata metadata = cluster.getMetadata();
+                KeyspaceMetadata keyspaceMetadata = metadata.getKeyspace(keyspace);
+                if (keyspaceMetadata != null) {
+                    Collection<TableMetadata> tables = keyspaceMetadata.getTables();
+                    tables.forEach(table -> {
+                        session.execute(QueryBuilder.truncate(table));
+                        logger.debug("Table trunceted - {}", table.getName());
+                    });
+                }
+            } else {
+                throw new RuntimeException("Keyspace " + keyspace + " not connected");
+            }
+
+        } finally {
+             if (cluster != null) {
+             cluster.close();
+             }
+        }
+    }
+
+    public static List<Row> fetchFromTable(String keyspace, String tableName, List<Pair<AuditingFieldsKey, String>> fields) throws FileNotFoundException {
+
+        List<Pair<String, String>> fieldsConverted = new ArrayList<>();
+
+//		fields.forEach(pair -> {
+//			Pair<String, String> newPair = new Pair(pair.getValue0().getDisplayName(), pair.getValue1());
+//			fieldsConverted.add(newPair);
+//		});
+
+        fields.forEach(pair -> {
+            Pair<String, String> newPair;
+            if (pair.getValue0() == AuditingFieldsKey.AUDIT_DISTRIBUTION_RESOURCE_URL) {
+                newPair = new Pair<String, String>("RESOURE_URL", pair.getValue1());
+
+            } else {
+                newPair = new Pair<String, String>(pair.getValue0().getDisplayName(), pair.getValue1());
+            }
+            fieldsConverted.add(newPair);
+
+        });
+
+        return fetchFromTableQuery(keyspace, tableName, fieldsConverted);
+    }
+
+    public static List<Row> fetchFromTableQuery(String keyspace, String tableName, List<Pair<String, String>> fields)
+            throws FileNotFoundException {
+
+        if (session == null || session.isClosed()) {
+            initConnection(keyspace);
+        }
+        try {
+
+            if (session != null) {
+                Select select = QueryBuilder.select().all().from(keyspace, tableName);
+                if (fields != null) {
+                    // Set<Entry<AuditingFieldsKey, String>> entrySet =
+                    // fields.entrySet();
+                    // fields.
+                    boolean multiple = (fields.size() > 1) ? true : false;
+                    Where where = null;
+                    int size = 0;
+
+                    for (Pair<String, String> pair : fields) {
+                        ++size;
+                        if (size == 1) {
+                            where = select.where(QueryBuilder.eq(pair.getValue0(), pair.getValue1()));
+                        } else {
+                            where.and(QueryBuilder.eq(pair.getValue0(), pair.getValue1()));
+                        }
+                    }
+                    if (multiple) {
+                        select.allowFiltering();
+                    }
+
+                }
+
+                List<Row> rows = session.execute(select).all();
+                for (Row row : rows) {
+                    logger.debug("{}", row);
+                }
+                return rows;
+            }
+        } finally {
+            // if (cluster != null) {
+            // cluster.close();
+            // }
+        }
+        return null;
+    }
+
+
+
+
+}
diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/utils/cassandra/CassandraUtils2.java b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/utils/cassandra/CassandraUtils2.java
new file mode 100644
index 0000000000..ebb3b33a87
--- /dev/null
+++ b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/utils/cassandra/CassandraUtils2.java
@@ -0,0 +1,166 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * SDC
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.sdc.ci.tests.utils.cassandra;
+
+import com.datastax.driver.core.*;
+import com.datastax.driver.core.querybuilder.QueryBuilder;
+import com.datastax.driver.core.querybuilder.Select;
+import com.datastax.driver.core.querybuilder.Select.Where;
+import org.javatuples.Pair;
+import org.openecomp.sdc.be.resources.data.auditing.AuditingTypesConstants;
+import org.openecomp.sdc.ci.tests.utils.Utils;
+import org.openecomp.sdc.common.datastructure.AuditingFieldsKey;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.io.FileNotFoundException;
+import java.util.Collection;
+import java.util.List;
+
+public final class CassandraUtils2 {
+	private static Logger logger = LoggerFactory.getLogger(CassandraUtils2.class.getName());
+
+	public static void truncateTable(String keyspace, String tableName) throws FileNotFoundException {
+
+		String cassandraHost = Utils.getConfig().getCassandraHost();
+
+		Cluster cluster = null;
+		Session session;
+
+		try {
+			Cluster.Builder clusterBuilder = Cluster.builder().addContactPoint(cassandraHost);
+			// authantication
+			// clusterBuilder.withCredentials(username,password);
+			// ssl
+			// System.setProperty("javax.net.ssl.trustStore",truststorePath);
+			// System.setProperty("javax.net.ssl.trustStorePassword",truststorePassword);
+			// clusterBuilder.withSSL();
+			cluster = clusterBuilder.build();
+			session = cluster.connect(keyspace);
+			if (session != null) {
+				session.execute(QueryBuilder.truncate(keyspace, tableName));
+				logger.debug("The table {}.{} was cleaned",keyspace,tableName);
+			} else {
+				throw new RuntimeException("Keyspace " + keyspace + " not connected");
+			}
+		} finally {
+			if (cluster != null) {
+				cluster.close();
+			}
+		}
+	}
+
+	public static void truncateAllKeyspaces() throws FileNotFoundException {
+		truncateAllTables(AuditingTypesConstants.ARTIFACT_KEYSPACE);
+		truncateAllTables(AuditingTypesConstants.AUDIT_KEYSPACE);
+	}
+
+	public static void truncateAllTables(String keyspace) throws FileNotFoundException {
+		String cassandraHost = Utils.getConfig().getCassandraHost();
+
+		Cluster cluster = null;
+		Session session;
+
+		try {
+			cluster = Cluster.builder().addContactPoint(cassandraHost).build();
+			session = cluster.connect(keyspace);
+			if (session != null) {
+				Metadata metadata = cluster.getMetadata();
+				KeyspaceMetadata keyspaceMetadata = metadata.getKeyspace(keyspace);
+				if (keyspaceMetadata != null) {
+					Collection<TableMetadata> tables = keyspaceMetadata.getTables();
+					tables.forEach(table -> {
+						session.execute(QueryBuilder.truncate(table));
+						logger.debug("Table trunceted - {}", table.getName());
+					});
+				}
+			} else {
+				throw new RuntimeException("Keyspace " + keyspace + " not connected");
+			}
+
+		} finally {
+			if (cluster != null) {
+				cluster.close();
+			}
+		}
+	}
+
+	public static List<Row> fetchFromTable(String keyspace, String tableName,
+			List<Pair<AuditingFieldsKey, String>> fields) throws FileNotFoundException {
+
+		// List<Pair<AuditingFieldsKey, String>>
+		// Map<AuditingFieldsKey, String>
+
+		Cluster cluster = null;
+		Session session;
+		String cassandraHost = Utils.getConfig().getCassandraHost();
+
+		try {
+			cluster = Cluster.builder().addContactPoint(cassandraHost).build();
+			session = cluster.connect(keyspace);
+			if (session != null) {
+				Select select = QueryBuilder.select().all().from(keyspace, tableName);
+				if (fields != null) {
+					// Set<Entry<AuditingFieldsKey, String>> entrySet =
+					// fields.entrySet();
+					// fields.
+					boolean multiple = (fields.size() > 1) ? true : false;
+					Where where = null;
+					int size = 0;
+
+					for (Pair<AuditingFieldsKey, String> pair : fields) {
+						++size;
+						if (size == 1) {
+							where = select.where(QueryBuilder.eq(pair.getValue0().getDisplayName(), pair.getValue1()));
+						} else {
+							where.and(QueryBuilder.eq(pair.getValue0().getDisplayName(), pair.getValue1()));
+						}
+					}
+					if (multiple) {
+						select.allowFiltering();
+					}
+
+				}
+
+				List<Row> rows = session.execute(select).all();
+				for (Row row : rows) {
+					logger.debug("{}", row);
+				}
+				return rows;
+			}
+		} finally {
+			if (cluster != null) {
+				cluster.close();
+			}
+		}
+		return null;
+	}
+	//
+	// public static void main(String[] args) throws FileNotFoundException {
+	// Map<AuditingFieldsKey, String> map = new HashMap<>();
+	// map.put(AuditingFieldsKey.AUDIT_ACTION, "Access");
+	// map.put(AuditingFieldsKey.AUDIT_STATUS, "200");
+	// // CassandraUtils.truncateTable("sdcartifact", "resources");
+	//// CassandraUtils.truncateAllTables("sdcaudit");
+	// CassandraUtils.fetchFromTable("sdcaudit", "useraccessevent", map );
+	// }
+
+}
diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/utils/general/AtomicOperationUtils.java b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/utils/general/AtomicOperationUtils.java
new file mode 100644
index 0000000000..f0efd96079
--- /dev/null
+++ b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/utils/general/AtomicOperationUtils.java
@@ -0,0 +1,1058 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * SDC
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.sdc.ci.tests.utils.general;
+
+import com.aventstack.extentreports.Status;
+import com.google.gson.Gson;
+import fj.data.Either;
+import org.apache.commons.codec.binary.Base64;
+import org.apache.commons.lang3.tuple.Pair;
+import org.json.JSONException;
+import org.onap.sdc.tosca.parser.api.ISdcCsarHelper;
+import org.onap.sdc.tosca.parser.impl.SdcToscaParserFactory;
+import org.openecomp.sdc.be.datatypes.elements.ConsumerDataDefinition;
+import org.openecomp.sdc.be.datatypes.enums.AssetTypeEnum;
+import org.openecomp.sdc.be.datatypes.enums.ComponentTypeEnum;
+import org.openecomp.sdc.be.datatypes.enums.ResourceTypeEnum;
+import org.openecomp.sdc.be.model.*;
+import org.openecomp.sdc.ci.tests.api.ComponentBaseTest;
+import org.openecomp.sdc.ci.tests.api.ExtentTestActions;
+import org.openecomp.sdc.ci.tests.api.Urls;
+import org.openecomp.sdc.ci.tests.config.Config;
+import org.openecomp.sdc.ci.tests.datatypes.*;
+import org.openecomp.sdc.ci.tests.datatypes.enums.*;
+import org.openecomp.sdc.ci.tests.datatypes.http.HttpHeaderEnum;
+import org.openecomp.sdc.ci.tests.datatypes.http.HttpRequest;
+import org.openecomp.sdc.ci.tests.datatypes.http.RestResponse;
+import org.openecomp.sdc.ci.tests.execute.lifecycle.LCSbaseTest;
+import org.openecomp.sdc.ci.tests.tosca.datatypes.ToscaDefinition;
+import org.openecomp.sdc.ci.tests.utils.CsarToscaTester;
+import org.openecomp.sdc.ci.tests.utils.DistributionUtils;
+import org.openecomp.sdc.ci.tests.utils.ToscaParserUtils;
+import org.openecomp.sdc.ci.tests.utils.Utils;
+import org.openecomp.sdc.ci.tests.utils.rest.*;
+import org.openecomp.sdc.common.api.ArtifactGroupTypeEnum;
+import org.openecomp.sdc.common.util.GeneralUtility;
+import org.testng.SkipException;
+
+import java.io.File;
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.concurrent.TimeUnit;
+import java.util.stream.Collectors;
+
+import static org.junit.Assert.assertFalse;
+import static org.testng.AssertJUnit.assertEquals;
+import static org.testng.AssertJUnit.assertTrue;
+
+public final class AtomicOperationUtils {
+
+	static final String basicAuthentication = "Basic Y2k6MTIzNDU2";
+
+	private AtomicOperationUtils() {
+		throw new UnsupportedOperationException();
+	}
+
+	// *********** RESOURCE ****************
+	/**
+	 * Import a vfc From tosca file
+	 *
+	 * @param filePath
+	 * @param fileName
+	 * @return
+	 * @throws IOException
+	 * @throws JSONException
+	 */
+	public static Either<Resource, RestResponse> importResource(String filePath, String fileName) {
+		try {
+			User designer = ElementFactory.getDefaultUser(UserRoleEnum.DESIGNER);
+			ImportReqDetails importReqDetails = ElementFactory.getDefaultImportResource(ElementFactory.getResourcePrefix());
+			importReqDetails = ImportUtils.getImportResourceDetailsByPathAndName(importReqDetails, filePath, fileName);
+			RestResponse importResourceResponse = ResourceRestUtils.createImportResource(importReqDetails, designer, null);
+			return buildResourceFromResponse(importResourceResponse);
+		} catch (Exception e) {
+			throw new AtomicOperationException(e);
+		}
+	}
+
+	public static Either<Resource, RestResponse> importResource(ImportReqDetails importReqDetails, String filePath, String fileName, User userRole, Boolean validateState) {
+		try {
+			importReqDetails = ImportUtils.getImportResourceDetailsByPathAndName(importReqDetails, filePath, fileName);
+			RestResponse importResourceResponse = ResourceRestUtils.createImportResource(importReqDetails, userRole, null);
+
+			if (validateState) {
+				assertTrue("Import resource failed with error: " + importResourceResponse.getResponse(),importResourceResponse.getErrorCode() == ResourceRestUtils.STATUS_CODE_CREATED);
+			}
+
+			if (importResourceResponse.getErrorCode() == ResourceRestUtils.STATUS_CODE_CREATED) {
+				Resource resourceResponseObject = ResponseParser.convertResourceResponseToJavaObject(importResourceResponse.getResponse());
+				return Either.left(resourceResponseObject);
+			}
+			return Either.right(importResourceResponse);
+		} catch (Exception e) {
+			throw new AtomicOperationException(e);
+		}
+	}
+
+
+	public static Either<Resource, RestResponse> createResourceByType(ResourceTypeEnum resourceType, UserRoleEnum userRole, Boolean validateState) {
+		try {
+			User defaultUser = ElementFactory.getDefaultUser(userRole);
+			ResourceReqDetails defaultResource = ElementFactory.getDefaultResourceByType(resourceType, defaultUser);
+			RestResponse resourceResp = ResourceRestUtils.createResource(defaultResource, defaultUser);
+
+			if (validateState) {
+				assertTrue("Create resource failed with error: " + resourceResp.getResponse(),resourceResp.getErrorCode() == ResourceRestUtils.STATUS_CODE_CREATED);
+			}
+
+			if (resourceResp.getErrorCode() == ResourceRestUtils.STATUS_CODE_CREATED) {
+				Resource resourceResponseObject = ResponseParser.convertResourceResponseToJavaObject(resourceResp.getResponse());
+				return Either.left(resourceResponseObject);
+			}
+			return Either.right(resourceResp);
+		} catch (Exception e) {
+			throw new AtomicOperationException(e);
+		}
+	}
+
+	public static Either<Resource, RestResponse> createResourceByResourceDetails(ResourceReqDetails resourceDetails, UserRoleEnum userRole, Boolean validateState) {
+		try {
+			User defaultUser = ElementFactory.getDefaultUser(userRole);
+			RestResponse resourceResp = ResourceRestUtils.createResource(resourceDetails, defaultUser);
+
+			if (validateState) {
+				assertTrue("Create resource failed with error: " + resourceResp.getResponse(),resourceResp.getErrorCode() == ResourceRestUtils.STATUS_CODE_CREATED);
+			}
+
+			if (resourceResp.getErrorCode() == ResourceRestUtils.STATUS_CODE_CREATED) {
+				Resource resourceResponseObject = ResponseParser.convertResourceResponseToJavaObject(resourceResp.getResponse());
+				return Either.left(resourceResponseObject);
+			}
+			return Either.right(resourceResp);
+		} catch (Exception e) {
+			throw new AtomicOperationException(e);
+		}
+	}
+
+	public static Either<Resource, RestResponse> createResourcesByTypeNormTypeAndCatregory(ResourceTypeEnum resourceType, NormativeTypesEnum normativeTypes, ResourceCategoryEnum resourceCategory, UserRoleEnum userRole, Boolean validateState)
+			throws Exception {
+		User defaultUser = ElementFactory.getDefaultUser(userRole);
+		ResourceReqDetails defaultResource = ElementFactory.getDefaultResourceByTypeNormTypeAndCatregory(resourceType, normativeTypes, resourceCategory, defaultUser);
+		RestResponse resourceResp = ResourceRestUtils.createResource(defaultResource, defaultUser);
+
+		if (validateState) {
+			assertTrue("Actual Response Code is: " + resourceResp.getErrorCode(), resourceResp.getErrorCode() == ResourceRestUtils.STATUS_CODE_CREATED);
+		}
+
+		if (resourceResp.getErrorCode() == ResourceRestUtils.STATUS_CODE_CREATED) {
+			// Resource resourceResponseObject = ResponseParser
+			// .convertResourceResponseToJavaObject(resourceResp.getResponse());
+			Resource resourceResponseObject = ResponseParser.parseToObjectUsingMapper(resourceResp.getResponse(), Resource.class);
+			return Either.left(resourceResponseObject);
+		}
+		return Either.right(resourceResp);
+	}
+
+	public static Either<Resource, RestResponse> createResourcesByCustomNormativeTypeAndCatregory(ResourceTypeEnum resourceType, Resource resourceNormativeType, ResourceCategoryEnum resourceCategory, UserRoleEnum userRole, Boolean validateState)
+			throws Exception {
+		User defaultUser = ElementFactory.getDefaultUser(userRole);
+		ResourceReqDetails defaultResource = ElementFactory.getDefaultResourceByTypeNormTypeAndCatregory(resourceType, resourceNormativeType, resourceCategory, defaultUser);
+		RestResponse resourceResp = ResourceRestUtils.createResource(defaultResource, defaultUser);
+
+		if (validateState) {
+			assertTrue("Create resource failed with error: " + resourceResp.getResponse(), resourceResp.getErrorCode() == ResourceRestUtils.STATUS_CODE_CREATED);
+		}
+
+		if (resourceResp.getErrorCode() == ResourceRestUtils.STATUS_CODE_CREATED) {
+			// Resource resourceResponseObject = ResponseParser
+			// .convertResourceResponseToJavaObject(resourceResp.getResponse());
+			Resource resourceResponseObject = ResponseParser.parseToObjectUsingMapper(resourceResp.getResponse(), Resource.class);
+			return Either.left(resourceResponseObject);
+		}
+		return Either.right(resourceResp);
+	}
+
+	public static Either<Resource, RestResponse> updateResource(ResourceReqDetails resourceReqDetails, User defaultUser, Boolean validateState) {
+		try {
+
+			RestResponse resourceResp = ResourceRestUtils.updateResource(resourceReqDetails, defaultUser, resourceReqDetails.getUniqueId());
+
+			if (validateState) {
+				assertTrue("Update resource failed with error: " + resourceResp.getResponse(),resourceResp.getErrorCode() == ResourceRestUtils.STATUS_CODE_SUCCESS);
+			}
+
+			if (resourceResp.getErrorCode() == ResourceRestUtils.STATUS_CODE_SUCCESS) {
+				Resource resourceResponseObject = ResponseParser.convertResourceResponseToJavaObject(resourceResp.getResponse());
+				return Either.left(resourceResponseObject);
+			}
+			return Either.right(resourceResp);
+		} catch (Exception e) {
+			throw new AtomicOperationException(e);
+		}
+	}
+
+	// *********** SERVICE ****************
+
+	public static Either<Service, RestResponse> createDefaultService(UserRoleEnum userRole, Boolean validateState) throws Exception {
+		User defaultUser = ElementFactory.getDefaultUser(userRole);
+		ServiceReqDetails serviceDetails = ElementFactory.getDefaultService(defaultUser);
+		RestResponse createServiceResp = ServiceRestUtils.createService(serviceDetails, defaultUser);
+
+		if (validateState) {
+			assertTrue("Create service failed with error: " + createServiceResp.getResponse(),createServiceResp.getErrorCode() == ServiceRestUtils.STATUS_CODE_CREATED);
+		}
+
+		if (createServiceResp.getErrorCode() == ResourceRestUtils.STATUS_CODE_CREATED) {
+			Service serviceResponseObject = ResponseParser.convertServiceResponseToJavaObject(createServiceResp.getResponse());
+			return Either.left(serviceResponseObject);
+		}
+		return Either.right(createServiceResp);
+	}
+
+	public static Either<Service, RestResponse> createServiceByCategory(ServiceCategoriesEnum category, UserRoleEnum userRole, Boolean validateState) throws Exception {
+		User defaultUser = ElementFactory.getDefaultUser(userRole);
+		ServiceReqDetails serviceDetails = ElementFactory.getDefaultService(category, defaultUser);
+		RestResponse createServiceResp = ServiceRestUtils.createService(serviceDetails, defaultUser);
+
+		if (validateState) {
+			assertTrue("Create service failed with error: " + createServiceResp.getResponse(),createServiceResp.getErrorCode() == ServiceRestUtils.STATUS_CODE_CREATED);
+		}
+
+		if (createServiceResp.getErrorCode() == ResourceRestUtils.STATUS_CODE_CREATED) {
+			Service serviceResponseObject = ResponseParser.convertServiceResponseToJavaObject(createServiceResp.getResponse());
+			return Either.left(serviceResponseObject);
+		}
+		return Either.right(createServiceResp);
+	}
+
+	public static Either<Service, RestResponse> createCustomService(ServiceReqDetails serviceDetails, UserRoleEnum userRole, Boolean validateState) throws Exception {
+		User defaultUser = ElementFactory.getDefaultUser(userRole);
+		RestResponse createServiceResp = ServiceRestUtils.createService(serviceDetails, defaultUser);
+
+		if (validateState) {
+			assertTrue("Create service failed with error: " + createServiceResp.getResponse(),createServiceResp.getErrorCode() == ServiceRestUtils.STATUS_CODE_CREATED);
+		}
+
+		if (createServiceResp.getErrorCode() == ResourceRestUtils.STATUS_CODE_CREATED) {
+			Service serviceResponseObject = ResponseParser.convertServiceResponseToJavaObject(createServiceResp.getResponse());
+			return Either.left(serviceResponseObject);
+		}
+		return Either.right(createServiceResp);
+	}
+	// *********** PRODUCT ****************
+
+	public static Either<Product, RestResponse> createDefaultProduct(UserRoleEnum userRole, Boolean validateState) throws Exception {
+		User defaultUser = ElementFactory.getDefaultUser(userRole);
+		ProductReqDetails defaultProduct = ElementFactory.getDefaultProduct();
+		RestResponse createProductResp = ProductRestUtils.createProduct(defaultProduct, defaultUser);
+
+		if (validateState) {
+			assertTrue(createProductResp.getErrorCode() == ProductRestUtils.STATUS_CODE_CREATED);
+		}
+
+		if (createProductResp.getErrorCode() == ProductRestUtils.STATUS_CODE_CREATED) {
+			Product productResponseJavaObject = ResponseParser.convertProductResponseToJavaObject(createProductResp.getResponse());
+			return Either.left(productResponseJavaObject);
+		}
+		return Either.right(createProductResp);
+	}
+
+	// public static ComponentReqDetails
+	// convertCompoentToComponentReqDetails(Component component){
+	//
+	// ComponentReqDetails componentReqDetails =
+	// ElementFactory.getDefaultService();
+	// componentReqDetails.setName(component.getName());
+	// componentReqDetails.setDescription(component.getDescription());
+	// componentReqDetails.setTags(component.getTags());
+	// componentReqDetails.setContactId(component.getContactId());
+	// componentReqDetails.setIcon(component.getIcon());
+	// componentReqDetails.setUniqueId(component.getUniqueId());
+	// componentReqDetails.setCreatorUserId(component.getCreatorUserId());
+	// componentReqDetails.setCreatorFullName(component.getCreatorFullName());
+	// componentReqDetails.setLastUpdaterUserId(component.getLastUpdaterUserId());
+	// componentReqDetails.setLastUpdaterFullName(component.getLastUpdaterFullName());
+	// componentReqDetails.setCreationDate(component.getCreationDate());
+	// componentReqDetails.setLastUpdateDate(component.getLastUpdateDate());
+	// componentReqDetails.setLifecycleState(component.getLifecycleState());
+	// componentReqDetails.setVersion(component.getVersion());
+	// componentReqDetails.setUuid(component.getUUID());
+	// componentReqDetails.setCategories(component.getCategories());
+	// componentReqDetails.setProjectCode(component.getProjectCode());
+	//
+	// return componentReqDetails;
+	// }
+
+	// *********** LIFECYCLE ***************
+
+    public static Pair<Component, RestResponse> changeComponentState(Component component, UserRoleEnum userRole, LifeCycleStatesEnum targetState, Boolean validateState) throws Exception {
+
+        Boolean isValidationFailed = false;
+        RestResponse lifeCycleStatesResponse = null;
+        User defaultUser;
+
+        LifeCycleStatesEnum currentCompState = LifeCycleStatesEnum.findByCompState(component.getLifecycleState().toString());
+
+		if (currentCompState == targetState) {
+			component = getComponentObject(component, userRole);
+			return Pair.of(component, null);
+		}
+		String componentType = component.getComponentType().getValue();
+		ArrayList<String> lifeCycleStatesEnumList = new ArrayList<>();
+		if (currentCompState.equals(LifeCycleStatesEnum.CHECKIN) && targetState.equals(LifeCycleStatesEnum.CHECKOUT)) {
+			lifeCycleStatesEnumList.add(LifeCycleStatesEnum.CHECKIN.toString());
+			lifeCycleStatesEnumList.add(LifeCycleStatesEnum.CHECKOUT.toString());
+		} else {
+			lifeCycleStatesEnumList.add(LifeCycleStatesEnum.CHECKOUT.toString());
+			lifeCycleStatesEnumList.add(LifeCycleStatesEnum.CHECKIN.toString());
+			lifeCycleStatesEnumList.add(LifeCycleStatesEnum.CERTIFY.toString());
+		}
+		for (int i = 0; i < lifeCycleStatesEnumList.size(); i++) {
+			if (lifeCycleStatesEnumList.get(i).equals(currentCompState.name())) {
+				int a;
+				a = (i == lifeCycleStatesEnumList.size() - 1) ? 0 : i + 1;
+				for (int n = a; n < lifeCycleStatesEnumList.size(); n++) {
+					defaultUser = ElementFactory.getDefaultUser(userRole);
+					lifeCycleStatesResponse = LifecycleRestUtils.changeComponentState(component, defaultUser, LifeCycleStatesEnum.findByState(lifeCycleStatesEnumList.get(n)));
+					if (lifeCycleStatesResponse.getErrorCode() != LifecycleRestUtils.STATUS_CODE_SUCCESS)
+						isValidationFailed = true;
+					if (lifeCycleStatesEnumList.get(n).equals(targetState.toString()) || isValidationFailed) {
+						break;
+					}
+				}
+			}
+		}
+		Component componentJavaObject = getComponentObject(component, userRole);
+
+		if (validateState && isValidationFailed) {
+			assertTrue("change state to [" + targetState.getState() + "] failed" + lifeCycleStatesResponse.getResponse(), false);
+			return Pair.of(componentJavaObject, lifeCycleStatesResponse);
+		}
+
+		if (isValidationFailed) {
+			return Pair.of(componentJavaObject, lifeCycleStatesResponse);
+		}
+
+		return Pair.of(componentJavaObject, lifeCycleStatesResponse);
+	}
+
+	public static RestResponse distributeService(Component component, Boolean validateState) throws Exception {
+
+		Service service = (Service) component;
+
+		User opsUser = ElementFactory.getDefaultUser(UserRoleEnum.OPS);
+		User governotUser = ElementFactory.getDefaultUser(UserRoleEnum.GOVERNOR);
+
+		ServiceReqDetails serviceDetails = new ServiceReqDetails(service);
+		RestResponse distributionService = null;
+
+		RestResponse approveDistribution = LifecycleRestUtils.changeDistributionStatus(serviceDetails, null, governotUser, "approveService", DistributionStatusEnum.DISTRIBUTED);
+		if (approveDistribution.getErrorCode() == BaseRestUtils.STATUS_CODE_SUCCESS) {
+			distributionService = LifecycleRestUtils.changeDistributionStatus(serviceDetails, null, opsUser, "approveService", DistributionStatusEnum.DISTRIBUTED);
+		}
+
+		if (validateState) {
+			assertTrue("Distribution approve failed with error: " + approveDistribution.getResponse(),approveDistribution.getErrorCode() == ProductRestUtils.STATUS_CODE_SUCCESS);
+			assertTrue("Distribute service failed with error: " + distributionService.getResponse(),distributionService.getErrorCode() == ProductRestUtils.STATUS_CODE_SUCCESS);
+			return distributionService;
+		}
+
+		return distributionService;
+	}
+
+	public static void toscaValidation(Component component, String vnfFile) throws Exception {
+
+		ISdcCsarHelper fdntCsarHelper;
+		SdcToscaParserFactory factory = SdcToscaParserFactory.getInstance();
+		File csarFile = AssetRestUtils.getToscaModelCsarFile(AssetTypeEnum.SERVICES, component.getUUID() , vnfFile);
+		ExtentTestActions.log(Status.INFO, "Tosca parser is going to convert service csar file to ISdcCsarHelper object...");
+		fdntCsarHelper = factory.getSdcCsarHelper(csarFile.getAbsolutePath());
+		CsarToscaTester.processCsar(fdntCsarHelper);
+		ExtentTestActions.log(Status.INFO, String.format("Tosca parser successfully parsed service CSAR"));
+
+	}
+
+	// *********** ARTIFACTS *****************
+
+	public static Either<ArtifactDefinition, RestResponse> uploadArtifactByType(ArtifactTypeEnum artifactType, Component component, UserRoleEnum userRole, Boolean deploymentTrue, Boolean validateState) throws Exception {
+
+		User defaultUser = ElementFactory.getDefaultUser(userRole);
+		ArtifactReqDetails artifactDetails = ElementFactory.getArtifactByType(null, artifactType, deploymentTrue);
+		if (!deploymentTrue)
+			artifactDetails.setArtifactGroupType(ArtifactGroupTypeEnum.INFORMATIONAL.getType());
+		RestResponse uploadArtifactResp = ArtifactRestUtils.uploadArtifact(artifactDetails, component, defaultUser);
+
+		if (validateState) {
+			assertTrue("artifact upload failed: " + artifactDetails.getArtifactName(), uploadArtifactResp.getErrorCode() == BaseRestUtils.STATUS_CODE_SUCCESS);
+		}
+
+		if (uploadArtifactResp.getErrorCode() == BaseRestUtils.STATUS_CODE_SUCCESS) {
+			ArtifactDefinition artifactJavaObject = ResponseParser.convertArtifactDefinitionResponseToJavaObject(uploadArtifactResp.getResponse());
+			return Either.left(artifactJavaObject);
+		}
+		return Either.right(uploadArtifactResp);
+	}
+
+	// *********** CONTAINERS *****************
+	/**
+	 * Adds Component instance to Component
+	 *
+	 * @param compInstParent
+	 * @param compContainer
+	 * @return
+	 */
+	public static Either<ComponentInstance, RestResponse> addComponentInstanceToComponentContainer(Component compInstParent, Component compContainer) {
+		return addComponentInstanceToComponentContainer(compInstParent, compContainer, UserRoleEnum.DESIGNER, false);
+	}
+
+    public static Either<ComponentInstance, RestResponse> addComponentInstanceToComponentContainer(Component compInstParent,
+                                                                                                   Component compContainer,
+                                                                                                   UserRoleEnum userRole,
+                                                                                                   Boolean validateState) {
+        try {
+            User defaultUser = ElementFactory.getDefaultUser(userRole);
+            ComponentInstanceReqDetails componentInstanceDetails = ElementFactory.getComponentInstance(compInstParent);
+            if (componentInstanceDetails.getOriginType() == null){
+                componentInstanceDetails.setOriginType(((Resource) compInstParent).getResourceType().toString());
+            }
+            RestResponse createComponentInstance = ComponentInstanceRestUtils.createComponentInstance(componentInstanceDetails,
+                    defaultUser, compContainer);
+
+            if (validateState) {
+                if (createComponentInstance.getErrorCode() == ServiceRestUtils.STATUS_CODE_NOT_FOUND) {
+                    throw new SkipException("Open bug DE262001");
+                } else {
+                    assertTrue("error - " + createComponentInstance.getErrorCode() + "instead - " +
+                            ServiceRestUtils.STATUS_CODE_CREATED,
+                            createComponentInstance.getErrorCode() == ServiceRestUtils.STATUS_CODE_CREATED);
+                }
+            }
+
+            if (createComponentInstance.getErrorCode() == ResourceRestUtils.STATUS_CODE_CREATED) {
+                ComponentInstance componentInstance = ResponseParser
+                        .convertComponentInstanceResponseToJavaObject(createComponentInstance.getResponse());
+                return Either.left(componentInstance);
+            }
+            return Either.right(createComponentInstance);
+        } catch (Exception e) {
+            throw new AtomicOperationException(e);
+        }
+    }
+
+	public static Either<ComponentInstance, RestResponse> addComponentInstanceToComponentContainer(Component compInstParent, Component compContainer, UserRoleEnum userRole, Boolean validateState, String positionX, String positionY) {
+		try {
+			User defaultUser = ElementFactory.getDefaultUser(userRole);
+			ComponentInstanceReqDetails componentInstanceDetails = ElementFactory.getComponentInstance(compInstParent);
+			componentInstanceDetails.setPosX(positionX);
+			componentInstanceDetails.setPosY(positionY);
+			RestResponse createComponentInstance = ComponentInstanceRestUtils.createComponentInstance(componentInstanceDetails, defaultUser, compContainer);
+
+			if (validateState) {
+				if (createComponentInstance.getErrorCode() == ServiceRestUtils.STATUS_CODE_NOT_FOUND)
+				{
+					throw new SkipException("Open bug DE262001");
+				}
+				else{
+					assertTrue("error - " + createComponentInstance.getErrorCode() + "instead - " + ServiceRestUtils.STATUS_CODE_CREATED, createComponentInstance.getErrorCode() == ServiceRestUtils.STATUS_CODE_CREATED);
+				}
+			}
+
+			if (createComponentInstance.getErrorCode() == ResourceRestUtils.STATUS_CODE_CREATED) {
+				ComponentInstance componentInstance = ResponseParser.convertComponentInstanceResponseToJavaObject(createComponentInstance.getResponse());
+				return Either.left(componentInstance);
+			}
+			return Either.right(createComponentInstance);
+		} catch (Exception e) {
+			throw new AtomicOperationException(e);
+		}
+	}
+
+	public static Resource getResourceObject(Component containerDetails, UserRoleEnum userRole) throws Exception {
+		// User defaultUser = ElementFactory.getDefaultUser(userRole);
+		RestResponse restResponse = ResourceRestUtils.getResource(containerDetails.getUniqueId());
+		return ResponseParser.convertResourceResponseToJavaObject(restResponse.getResponse());
+	}
+
+	public static Resource getResourceObject(String uniqueId) throws Exception {
+		RestResponse restResponse = ResourceRestUtils.getResource(uniqueId);
+		return ResponseParser.convertResourceResponseToJavaObject(restResponse.getResponse());
+	}
+
+	public static Resource getResourceObjectByNameAndVersion(UserRoleEnum sdncModifierDetails, String resourceName, String resourceVersion) throws Exception {
+		User defaultUser = ElementFactory.getDefaultUser(sdncModifierDetails);
+		RestResponse resourceResponse = ResourceRestUtils.getResourceByNameAndVersion(defaultUser.getUserId(), resourceName, resourceVersion);
+		return ResponseParser.convertResourceResponseToJavaObject(resourceResponse.getResponse());
+	}
+
+	public static Service getServiceObject(Component containerDetails, UserRoleEnum userRole) throws Exception {
+		User defaultUser = ElementFactory.getDefaultUser(userRole);
+		RestResponse serviceResponse = ServiceRestUtils.getService(containerDetails.getUniqueId(), defaultUser);
+		return ResponseParser.convertServiceResponseToJavaObject(serviceResponse.getResponse());
+	}
+
+	public static Service getServiceObjectByNameAndVersion(UserRoleEnum sdncModifierDetails, String serviceName, String serviceVersion) throws Exception {
+		User defaultUser = ElementFactory.getDefaultUser(sdncModifierDetails);
+		RestResponse serviceResponse = ServiceRestUtils.getServiceByNameAndVersion(defaultUser, serviceName, serviceVersion);
+		return ResponseParser.convertServiceResponseToJavaObject(serviceResponse.getResponse());
+	}
+
+	public static Service getServiceObject(String uniqueId) throws Exception {
+		RestResponse serviceResponse = ServiceRestUtils.getService(uniqueId);
+		return ResponseParser.convertServiceResponseToJavaObject(serviceResponse.getResponse());
+	}
+
+	public static Product getProductObject(Component containerDetails, UserRoleEnum userRole) throws Exception {
+		User defaultUser = ElementFactory.getDefaultUser(userRole);
+		RestResponse productRest = ProductRestUtils.getProduct(containerDetails.getUniqueId(), defaultUser.getUserId());
+		return ResponseParser.convertProductResponseToJavaObject(productRest.getResponse());
+	}
+
+	public static Component getComponentObject(Component containerDetails, UserRoleEnum userRole) throws Exception {
+		User defaultUser = ElementFactory.getDefaultUser(userRole);
+
+		switch (containerDetails.getComponentType()) {
+			case RESOURCE:
+				RestResponse restResponse = ResourceRestUtils.getResource(containerDetails.getUniqueId());
+				containerDetails = ResponseParser.convertResourceResponseToJavaObject(restResponse.getResponse());
+				break;
+			case SERVICE:
+				RestResponse serviceResponse = ServiceRestUtils.getService(containerDetails.getUniqueId(), defaultUser);
+				containerDetails = ResponseParser.convertServiceResponseToJavaObject(serviceResponse.getResponse());
+				break;
+			case PRODUCT:
+				RestResponse productRest = ProductRestUtils.getProduct(containerDetails.getUniqueId(), defaultUser.getUserId());
+				containerDetails = ResponseParser.convertProductResponseToJavaObject(productRest.getResponse());
+				break;
+			default:
+				break;
+		}
+		return containerDetails;
+	}
+
+	public static Component convertReposnseToComponentObject(Component containerDetails, RestResponse restresponse) {
+
+		switch (containerDetails.getComponentType()) {
+			case RESOURCE:
+				containerDetails = ResponseParser.convertResourceResponseToJavaObject(restresponse.getResponse());
+				break;
+			case SERVICE:
+				containerDetails = ResponseParser.convertServiceResponseToJavaObject(restresponse.getResponse());
+				break;
+			case PRODUCT:
+				containerDetails = ResponseParser.convertProductResponseToJavaObject(restresponse.getResponse());
+				break;
+			default:
+				break;
+		}
+		return containerDetails;
+	}
+
+	public static Either<Component, RestResponse> associate2ResourceInstances(Component containerDetails, ComponentInstance fromNode, ComponentInstance toNode, String assocType, UserRoleEnum userRole, Boolean validateState) throws Exception {
+
+		User defaultUser = ElementFactory.getDefaultUser(userRole);
+		RestResponse associate2ResourceInstancesResponse = ResourceRestUtils.associate2ResourceInstances(containerDetails, fromNode, toNode, assocType, defaultUser);
+
+		if (validateState) {
+			assertTrue(associate2ResourceInstancesResponse.getErrorCode() == ServiceRestUtils.STATUS_CODE_SUCCESS);
+		}
+
+		if (associate2ResourceInstancesResponse.getErrorCode() == ResourceRestUtils.STATUS_CODE_SUCCESS) {
+
+			switch (containerDetails.getComponentType()) {
+				case RESOURCE:
+					containerDetails = ResponseParser.convertResourceResponseToJavaObject(associate2ResourceInstancesResponse.getResponse());
+					break;
+				case SERVICE:
+					containerDetails = ResponseParser.convertServiceResponseToJavaObject(associate2ResourceInstancesResponse.getResponse());
+					break;
+				case PRODUCT:
+					containerDetails = ResponseParser.convertProductResponseToJavaObject(associate2ResourceInstancesResponse.getResponse());
+					break;
+				default:
+					break;
+			}
+
+			return Either.left(containerDetails);
+		}
+		return Either.right(associate2ResourceInstancesResponse);
+
+	}
+
+	public static Either<Pair<Component, ComponentInstance>, RestResponse> updateComponentInstance(ComponentInstanceReqDetails componentInstanceReqDetails, User sdncModifierDetails, Component container, boolean validateState) throws Exception {
+
+		RestResponse updateComponentInstance = ComponentInstanceRestUtils.updateComponentInstance(componentInstanceReqDetails, sdncModifierDetails, container.getUniqueId(), container.getComponentType());
+		if (validateState) {
+			assertTrue("Update ComponentInstance failed: " + updateComponentInstance.getResponseMessage(), updateComponentInstance.getErrorCode() == BaseRestUtils.STATUS_CODE_SUCCESS);
+		}
+		if (updateComponentInstance.getErrorCode() == BaseRestUtils.STATUS_CODE_SUCCESS) {
+			String componentType = container.getComponentType().getValue();
+			Component componentObject;
+			if(componentType.equals("Resource")){
+				componentObject = getResourceObject(container.getUniqueId());
+			}else{
+				componentObject = getServiceObject(container.getUniqueId());
+			}
+			ComponentInstance componentInstanceJavaObject = ResponseParser.convertComponentInstanceResponseToJavaObject(updateComponentInstance.getResponse());
+			return Either.left(Pair.of(componentObject, componentInstanceJavaObject));
+		}
+		return Either.right(updateComponentInstance);
+	}
+
+	public static Either<Pair<Component, ComponentInstance>, RestResponse> changeComponentInstanceVersion(Component containerDetails, ComponentInstance componentInstanceToReplace, Component newInstance, UserRoleEnum userRole, Boolean validateState)
+			throws Exception {
+		User defaultUser = ElementFactory.getDefaultUser(userRole);
+
+		RestResponse changeComponentInstanceVersionResp = ComponentInstanceRestUtils.changeComponentInstanceVersion(containerDetails, componentInstanceToReplace, newInstance, defaultUser);
+		if (validateState) {
+			assertTrue("change ComponentInstance version failed: " + changeComponentInstanceVersionResp.getResponseMessage(), changeComponentInstanceVersionResp.getErrorCode() == BaseRestUtils.STATUS_CODE_SUCCESS);
+		}
+
+		if (changeComponentInstanceVersionResp.getErrorCode() == BaseRestUtils.STATUS_CODE_SUCCESS) {
+
+			Component compoenntObject = AtomicOperationUtils.getComponentObject(containerDetails, userRole);
+			ComponentInstance componentInstanceJavaObject = ResponseParser.convertComponentInstanceResponseToJavaObject(changeComponentInstanceVersionResp.getResponse());
+
+			return Either.left(Pair.of(compoenntObject, componentInstanceJavaObject));
+		}
+
+		return Either.right(changeComponentInstanceVersionResp);
+	}
+
+	public static ComponentInstance getComponentInstanceByName(Component component, String name) {
+		ComponentInstance componentInstance = component.getComponentInstances()
+				.stream()
+				.filter(ci->ci.getName().equals(name))
+				.findFirst()
+				.orElse(null);
+		if (componentInstance == null) {
+			List<String> componentInstancesNameList = component.getComponentInstances().stream().map(ComponentInstance::getName).collect(Collectors.toList());
+			assertFalse("Instance name " + name + " not found in container " + component.getComponentType() + " named [" + component.getName()
+					+ "]. Component instances available are: " + componentInstancesNameList.toString(),  true);
+		}
+		return componentInstance;
+	}
+
+	// *********** PROPERTIES *****************
+
+	public static Either<ComponentInstanceProperty, RestResponse> addCustomPropertyToResource(PropertyReqDetails propDetails, Resource resourceDetails, UserRoleEnum userRole, Boolean validateState) throws Exception {
+
+		User defaultUser = ElementFactory.getDefaultUser(userRole);
+		Map<String, PropertyReqDetails> propertyToSend = new HashMap<>();
+		propertyToSend.put(propDetails.getName(), propDetails);
+		Gson gson = new Gson();
+		RestResponse addPropertyResponse = PropertyRestUtils.createProperty(resourceDetails.getUniqueId(), gson.toJson(propertyToSend), defaultUser);
+
+		if (validateState) {
+			assertTrue("add property to resource failed: " + addPropertyResponse.getErrorCode(), addPropertyResponse.getErrorCode() == BaseRestUtils.STATUS_CODE_CREATED);
+		}
+
+		if (addPropertyResponse.getErrorCode() == BaseRestUtils.STATUS_CODE_CREATED) {
+			ComponentInstanceProperty compInstProp = null;
+			String property = ResponseParser.getJsonObjectValueByKey(addPropertyResponse.getResponse(), propDetails.getName());
+			compInstProp = (ResponseParser.convertPropertyResponseToJavaObject(property));
+			return Either.left(compInstProp);
+		}
+		return Either.right(addPropertyResponse);
+	}
+
+	// Benny
+	public static Either<ComponentInstanceProperty, RestResponse> updatePropertyOfResource(PropertyReqDetails propDetails, Resource resourceDetails, String propertyUniqueId, UserRoleEnum userRole, Boolean validateState) throws Exception {
+
+		User defaultUser = ElementFactory.getDefaultUser(userRole);
+		Map<String, PropertyReqDetails> propertyToSend = new HashMap<>();
+		propertyToSend.put(propDetails.getName(), propDetails);
+		Gson gson = new Gson();
+		RestResponse addPropertyResponse = PropertyRestUtils.updateProperty(resourceDetails.getUniqueId(), propertyUniqueId, gson.toJson(propertyToSend), defaultUser);
+
+		if (validateState) {
+			assertTrue("add property to resource failed: " + addPropertyResponse.getResponseMessage(), addPropertyResponse.getErrorCode() == BaseRestUtils.STATUS_CODE_SUCCESS);
+		}
+
+		if (addPropertyResponse.getErrorCode() == BaseRestUtils.STATUS_CODE_SUCCESS) {
+			ComponentInstanceProperty compInstProp = null;
+			String property = ResponseParser.getJsonObjectValueByKey(addPropertyResponse.getResponse(), propDetails.getName());
+			compInstProp = (ResponseParser.convertPropertyResponseToJavaObject(property));
+			return Either.left(compInstProp);
+		}
+		return Either.right(addPropertyResponse);
+	}
+
+	public static RestResponse deletePropertyOfResource(String resourceId, String propertyId, UserRoleEnum userRole) throws Exception {
+		User defaultUser = ElementFactory.getDefaultUser(userRole);
+		return PropertyRestUtils.deleteProperty(resourceId, propertyId, defaultUser);
+	}
+
+	public static Either<ComponentInstanceProperty, RestResponse> addDefaultPropertyToResource(PropertyTypeEnum propertyType, Resource resourceDetails, UserRoleEnum userRole, Boolean validateState) throws Exception {
+
+		User defaultUser = ElementFactory.getDefaultUser(userRole);
+		PropertyReqDetails propDetails = ElementFactory.getPropertyDetails(propertyType);
+		Map<String, PropertyReqDetails> propertyToSend = new HashMap<>();
+		propertyToSend.put(propDetails.getName(), propDetails);
+		Gson gson = new Gson();
+		RestResponse addPropertyResponse = PropertyRestUtils.createProperty(resourceDetails.getUniqueId(), gson.toJson(propertyToSend), defaultUser);
+
+		if (validateState) {
+			assertTrue("add property to resource failed: " + addPropertyResponse.getResponseMessage(), addPropertyResponse.getErrorCode() == BaseRestUtils.STATUS_CODE_CREATED);
+		}
+
+		if (addPropertyResponse.getErrorCode() == BaseRestUtils.STATUS_CODE_CREATED) {
+			ComponentInstanceProperty compInstProp = null;
+			String property = ResponseParser.getJsonObjectValueByKey(addPropertyResponse.getResponse(), propDetails.getName());
+			compInstProp = (ResponseParser.convertPropertyResponseToJavaObject(property));
+
+			return Either.left(compInstProp);
+		}
+		return Either.right(addPropertyResponse);
+	}
+
+	public static Either<GroupDefinition, RestResponse> updateGroupPropertyOnResource(String maxVFModuleInstacesValue, Resource resource, String groupId, User user, Boolean validateState) throws Exception {
+
+//		Gson gson = new Gson();
+        // Json group property object
+        String propertyObjectJson = "[{\"defaultValue\":null,\"description\":\"The maximum instances of this VF-Module\",\"name\":\"max_vf_module_instances\",\"parentUniqueId\":\"org.openecomp.groups.VfModule.1.0.grouptype.max_vf_module_instances\",\"password\":false,\"required\":false,\"schema\":{\"property\":{}},\"type\":\"integer\",\"uniqueId\":\"org.openecomp.groups.VfModule.1.0.grouptype.max_vf_module_instances.property.3\",\"value\":\"" + maxVFModuleInstacesValue + "\",\"definition\":false,\"getInputValues\":null,\"constraints\":null,\"valueUniqueUid\":null,\"ownerId\":\"org.openecomp.groups.VfModule.1.0.grouptype.max_vf_module_instances\"}]";
+//        GroupProperty property = gson.fromJson(propertyObjectJson, GroupProperty.class);
+		RestResponse updateGroupPropertyResponse = PropertyRestUtils.updateGroupProperty(resource, groupId, propertyObjectJson, user);
+
+		if (validateState) {
+			assertTrue("update group property to resource failed: " + updateGroupPropertyResponse.getResponseMessage(), updateGroupPropertyResponse.getErrorCode() == BaseRestUtils.STATUS_CODE_SUCCESS);
+		}
+
+		if (updateGroupPropertyResponse.getErrorCode() == BaseRestUtils.STATUS_CODE_SUCCESS) {
+			GroupDefinition responseGroupDefinition = ResponseParser.convertPropertyResponseToObject(updateGroupPropertyResponse.getResponse());
+			return Either.left(responseGroupDefinition);
+		}
+		return Either.right(updateGroupPropertyResponse);
+	}
+
+
+	public static RestResponse createDefaultConsumer(Boolean validateState) {
+		try {
+			ConsumerDataDefinition defaultConsumerDefinition = ElementFactory.getDefaultConsumerDetails();
+			RestResponse createResponse = ConsumerRestUtils.createConsumer(defaultConsumerDefinition, ElementFactory.getDefaultUser(UserRoleEnum.ADMIN));
+			BaseRestUtils.checkCreateResponse(createResponse);
+
+			if (validateState) {
+				assertTrue(createResponse.getErrorCode() == ResourceRestUtils.STATUS_CODE_CREATED);
+			}
+			return createResponse;
+		} catch (Exception e) {
+			throw new AtomicOperationException(e);
+		}
+	}
+
+	/**
+	 * Builds Resource From rest response
+	 *
+	 * @param resourceResp
+	 * @return
+	 */
+	public static Either<Resource, RestResponse> buildResourceFromResponse(RestResponse resourceResp) {
+		Either<Resource, RestResponse> result;
+		if (resourceResp.getErrorCode() == ResourceRestUtils.STATUS_CODE_CREATED) {
+			Resource resourceResponseObject = ResponseParser.convertResourceResponseToJavaObject(resourceResp.getResponse());
+			result = Either.left(resourceResponseObject);
+		} else {
+			result = Either.right(resourceResp);
+		}
+		return result;
+	}
+
+	private static class AtomicOperationException extends RuntimeException {
+		private AtomicOperationException(Exception e) {
+			super(e);
+		}
+
+		private static final long serialVersionUID = 1L;
+	}
+
+	/**
+	 * Import resource from CSAR
+	 *
+	 * @param resourceType
+	 * @param userRole
+	 * @param fileName
+	 * @param filePath
+	 * @return Resource
+	 * @throws Exception
+	 */
+	public static Resource importResourceFromCsar(ResourceTypeEnum resourceType, UserRoleEnum userRole, String fileName, String... filePath) throws Exception {
+		// Get the CSARs path
+		String realFilePath = System.getProperty("user.dir") + File.separator + "src" + File.separator + "test" + File.separator + "resources" + File.separator + "CI" + File.separator + "csars" ;
+		if (filePath != null && filePath.length > 0) {
+			StringBuilder result = new StringBuilder();
+			for(String currStr: filePath){
+				result.append(currStr);
+			}
+//			realFilePath = Arrays.toString(filePath);
+			realFilePath = result.toString();
+		}
+
+		// Create default import resource & user
+		return importResourceFromCsarFile(resourceType, userRole, fileName, realFilePath);
+	}
+
+	public static Resource importResourceFromCsarFile(ResourceTypeEnum resourceType, UserRoleEnum userRole, String csarFileName, String csarFilePath) throws Exception{
+		RestResponse createResource = getCreateResourceRestResponse(resourceType, userRole, csarFileName, csarFilePath);
+		BaseRestUtils.checkCreateResponse(createResource);
+		return ResponseParser.parseToObjectUsingMapper(createResource.getResponse(), Resource.class);
+	}
+
+	public static Resource importCertifiedResourceFromCsar(ResourceTypeEnum resourceType, UserRoleEnum userRole,	String csarFileName, String csarFilePath) throws Exception{
+		RestResponse createResource = getCreateCertifiedResourceRestResponse(resourceType, userRole, csarFileName, csarFilePath);
+		BaseRestUtils.checkSuccess(createResource);
+		return ResponseParser.parseToObjectUsingMapper(createResource.getResponse(), Resource.class);
+	}
+	public static RestResponse getCreateResourceRestResponse(ResourceTypeEnum resourceType, UserRoleEnum userRole,
+															 String csarFileName, String csarFilePath) throws IOException, Exception {
+
+		ImportReqDetails resourceDetails = buildImportReqDetails(resourceType, csarFileName, csarFilePath);
+		User sdncModifierDetails = ElementFactory.getDefaultUser(userRole);
+		RestResponse createResource = ResourceRestUtils.createResource(resourceDetails, sdncModifierDetails);
+		return createResource;
+	}
+
+	public static RestResponse getCreateCertifiedResourceRestResponse(ResourceTypeEnum resourceType, UserRoleEnum userRole,
+																		   String csarFileName, String csarFilePath) throws IOException, Exception {
+
+		ImportReqDetails resourceDetails = buildImportReqDetails(resourceType, csarFileName, csarFilePath);
+		User sdncModifierDetails = ElementFactory.getDefaultUser(userRole);
+		RestResponse response = ResourceRestUtils.createResource(resourceDetails, sdncModifierDetails);
+		BaseRestUtils.checkCreateResponse(response);
+		return LCSbaseTest.certifyResource(resourceDetails, sdncModifierDetails);
+	}
+
+	private static ImportReqDetails buildImportReqDetails(ResourceTypeEnum resourceType, String csarFileName, String csarFilePath) throws IOException {
+		ImportReqDetails resourceDetails = ElementFactory.getDefaultImportResource();
+		Path path = Paths.get(csarFilePath + File.separator + csarFileName);
+		byte[] data = Files.readAllBytes(path);
+		String payloadName = csarFileName;
+		String payloadData = Base64.encodeBase64String(data);
+		resourceDetails.setPayloadData(payloadData);
+		resourceDetails.setCsarUUID(payloadName);
+		resourceDetails.setPayloadName(payloadName);
+		resourceDetails.setResourceType(resourceType.name());
+		return resourceDetails;
+	}
+
+	public static Resource updateResourceFromCsar(Resource resource, UserRoleEnum userRole,	String csarFileName, String csarFilePath) throws Exception{
+		User sdncModifierDetails = ElementFactory.getDefaultUser(userRole);
+
+		byte[] data = null;
+		Path path = Paths.get(csarFilePath + File.separator + csarFileName);
+		data = Files.readAllBytes(path);
+		String payloadName = csarFileName;
+		String payloadData = Base64.encodeBase64String(data);
+		ImportReqDetails resourceDetails = new ImportReqDetails(resource, payloadName, payloadData);
+		resourceDetails.setPayloadData(payloadData);
+		resourceDetails.setCsarUUID(payloadName);
+		resourceDetails.setPayloadName(payloadName);
+
+		String userId = sdncModifierDetails.getUserId();
+		Config config = Utils.getConfig();
+		String url = String.format(Urls.UPDATE_RESOURCE, config.getCatalogBeHost(), config.getCatalogBePort(), resource.getUniqueId());
+
+		Map<String, String> headersMap = ResourceRestUtils.prepareHeadersMap(userId);
+
+		Gson gson = new Gson();
+		String userBodyJson = gson.toJson(resourceDetails);
+		String calculateMD5 = GeneralUtility.calculateMD5Base64EncodedByString(userBodyJson);
+		headersMap.put(HttpHeaderEnum.Content_MD5.getValue(), calculateMD5);
+		HttpRequest http = new HttpRequest();
+		RestResponse updateResourceResponse = http.httpSendPut(url, userBodyJson, headersMap);
+		BaseRestUtils.checkSuccess(updateResourceResponse);
+		return ResponseParser.parseToObjectUsingMapper(updateResourceResponse.getResponse(), Resource.class);
+	}
+
+	public static Either<Resource, RestResponse> importResourceByFileName(ResourceTypeEnum resourceType, UserRoleEnum userRole, String fileName, Boolean validateState, String... filePath) throws IOException {
+
+		String realFilePath = System.getProperty("user.dir") + File.separator + "src" + File.separator + "test" + File.separator + "resources" + File.separator + "CI" + File.separator + "csars" ;
+		if (filePath != null && filePath.length > 0) {
+			realFilePath = filePath.toString();
+		}
+
+		try {
+			User defaultUser = ElementFactory.getDefaultUser(userRole);
+			ResourceReqDetails defaultResource = ElementFactory.getDefaultResource(defaultUser);
+			ImportReqDetails defaultImportResource = ElementFactory.getDefaultImportResource(defaultResource);
+			ImportUtils.getImportResourceDetailsByPathAndName(defaultImportResource, realFilePath, fileName);
+			RestResponse resourceResp = ResourceRestUtils.createResource(defaultImportResource, defaultUser);
+
+			if (validateState) {
+				assertTrue(resourceResp.getErrorCode() == ResourceRestUtils.STATUS_CODE_CREATED);
+			}
+
+			if (resourceResp.getErrorCode() == ResourceRestUtils.STATUS_CODE_CREATED) {
+				Resource resourceResponseObject = ResponseParser.convertResourceResponseToJavaObject(resourceResp.getResponse());
+				return Either.left(resourceResponseObject);
+			}
+			return Either.right(resourceResp);
+		} catch (Exception e) {
+			throw new AtomicOperationException(e);
+		}
+	}
+
+	public static Either<String, RestResponse> getComponenetArtifactPayload(Component component, String artifactType) throws Exception {
+
+		String url;
+		Config config = Utils.getConfig();
+		if(component.getComponentType().toString().toUpperCase().equals(ComponentTypeEnum.SERVICE.getValue().toUpperCase())){
+			url = String.format(Urls.UI_DOWNLOAD_SERVICE_ARTIFACT, config.getCatalogBeHost(), config.getCatalogBePort(), component.getUniqueId(), component.getToscaArtifacts().get(artifactType).getUniqueId());
+		}else{
+			url = String.format(Urls.UI_DOWNLOAD_RESOURCE_ARTIFACT, config.getCatalogBeHost(), config.getCatalogBePort(), component.getUniqueId(), component.getToscaArtifacts().get(artifactType).getUniqueId());
+		}
+		String userId = component.getLastUpdaterUserId();
+		Map<String, String> headersMap = new HashMap<>();
+		headersMap.put(HttpHeaderEnum.CONTENT_TYPE.getValue(), BaseRestUtils.contentTypeHeaderData);
+		headersMap.put(HttpHeaderEnum.CACHE_CONTROL.getValue(), BaseRestUtils.cacheControlHeader);
+		headersMap.put(HttpHeaderEnum.AUTHORIZATION.getValue(), basicAuthentication);
+		headersMap.put(HttpHeaderEnum.X_ECOMP_INSTANCE_ID.getValue(), BaseRestUtils.xEcompInstanceId);
+		if (userId != null) {
+			headersMap.put(HttpHeaderEnum.USER_ID.getValue(), userId);
+		}
+		HttpRequest http = new HttpRequest();
+		RestResponse response = http.httpSendGet(url, headersMap);
+		if (response.getErrorCode() != BaseRestUtils.STATUS_CODE_SUCCESS && response.getResponse().getBytes() == null && response.getResponse().getBytes().length == 0) {
+			return Either.right(response);
+		}
+		return Either.left(response.getResponse());
+
+	}
+
+	public static RestResponse getDistributionStatusByDistributionId(String distributionId, Boolean validateState) {
+
+		try {
+			User defaultUser = ElementFactory.getDefaultUser(UserRoleEnum.OPS);
+			RestResponse response = DistributionUtils.getDistributionStatus(defaultUser, distributionId);
+
+			if (validateState) {
+				assertTrue(response.getErrorCode() == ResourceRestUtils.STATUS_CODE_SUCCESS);
+			}
+			return response;
+
+		} catch (Exception e) {
+			throw new AtomicOperationException(e);
+		}
+	}
+
+	public static Either <RestResponse, Map<String, List<DistributionMonitorObject>>> getSortedDistributionStatusMap(Service service, Boolean validateState) {
+
+		try {
+			ServiceDistributionStatus serviceDistributionObject = DistributionUtils.getLatestServiceDistributionObject(service);
+			RestResponse response = getDistributionStatusByDistributionId(serviceDistributionObject.getDistributionID(), true);
+			if(validateState) {
+				assertTrue(response.getErrorCode() == ResourceRestUtils.STATUS_CODE_SUCCESS);
+			}
+			if(response.getErrorCode() == ResourceRestUtils.STATUS_CODE_SUCCESS){
+				Map<String, List<DistributionMonitorObject>> parsedDistributionStatus = DistributionUtils.getSortedDistributionStatus(response);
+				return Either.right(parsedDistributionStatus);
+			}
+			return Either.left(response);
+		} catch (Exception e) {
+			throw new AtomicOperationException(e);
+		}
+
+	}
+
+
+	/**
+	 * @param service
+	 * @param pollingCount
+	 * @param pollingInterval
+	 * Recommended values for service distribution for pollingCount is 4 and for pollingInterval is 15000ms
+	 * @throws Exception
+	 */
+	public static Boolean distributeAndValidateService(Service service, int pollingCount, int pollingInterval) throws Exception {
+		int firstPollingInterval = 30000; //this value define first be polling topic time, should change if DC configuration changed
+		Boolean statusFlag = true;
+		AtomicOperationUtils.distributeService(service,  true);
+		TimeUnit.MILLISECONDS.sleep(firstPollingInterval);
+		int timeOut = pollingCount * pollingInterval;
+		com.clearspring.analytics.util.Pair<Boolean,Map<String,List<String>>> verifyDistributionStatus = null;
+
+		while (timeOut > 0) {
+			Map<String,List<DistributionMonitorObject>> sortedDistributionStatusMap = AtomicOperationUtils.getSortedDistributionStatusMap(service, true).right().value();
+			verifyDistributionStatus = DistributionUtils.verifyDistributionStatus(sortedDistributionStatusMap);
+			if(verifyDistributionStatus.left.equals(false)){
+				TimeUnit.MILLISECONDS.sleep(pollingInterval);
+				timeOut-=pollingInterval;
+			}else {
+				timeOut = 0;
+			}
+		}
+
+		if((verifyDistributionStatus.right != null && ! verifyDistributionStatus.right.isEmpty())){
+			for(Entry<String, List<String>> entry : verifyDistributionStatus.right.entrySet()){
+				if(ComponentBaseTest.getExtendTest() != null){
+					ComponentBaseTest.getExtendTest().log(Status.INFO, "Consumer: " + entry.getKey() + " failed on following: "+ entry.getValue());
+				}else{
+					System.out.println("Consumer: [" + entry.getKey() + "] failed on following: "+ entry.getValue());
+				}
+			}
+			statusFlag = false;
+		}
+		return statusFlag;
+	}
+
+	public static Boolean distributeAndValidateService(Service service) throws Exception {
+		return distributeAndValidateService(service, 10, 10000);
+	}
+	
+	  /**
+     * @param resource to download csar file via API
+     * @return Tosca definition object from main yaml file
+     */
+    public static ToscaDefinition downloadAndGetToscaMainYamlObjectApi(Resource resource, File filesFolder) throws Exception {
+        File vfCsarFileName = new File(File.separator + "VfCsar_" + ElementFactory.generateUUIDforSufix() + ".csar");
+        OnboardingUtillViaApis.downloadToscaCsarToDirectory(resource, new File(filesFolder.getPath() + vfCsarFileName));
+        return ToscaParserUtils.parseToscaMainYamlToJavaObjectByCsarLocation(new File(filesFolder.getPath() + vfCsarFileName));
+    }
+
+
+    public static ComponentInstance getServiceComponentInstanceByName(Service service, String name, Boolean validateState){
+        List<ComponentInstance> compInstances = service.getComponentInstances();
+        for (ComponentInstance instance: compInstances){
+            String compName = instance.getName();
+            if (compName.equals(name))
+                return instance;
+        }
+        if (validateState) {
+            assertEquals("Component instance name " + name + " not found", name, null);
+        }
+        return null;
+    }
+
+	public static Pair<Component, ComponentInstance> updateComponentInstanceName(String newName, Component component, String canvasElementName, User user, Boolean validateState) throws Exception {
+		ComponentInstanceReqDetails componentInstanceReqDetails = ElementFactory.getDefaultComponentInstance();
+		ComponentInstance componentInstanceByName = AtomicOperationUtils.getComponentInstanceByName(component, canvasElementName);
+		componentInstanceReqDetails.setName(newName);
+		componentInstanceReqDetails.setComponentUid(componentInstanceByName.getComponentUid());
+		componentInstanceReqDetails.setUniqueId(componentInstanceByName.getUniqueId());
+		return AtomicOperationUtils.updateComponentInstance(componentInstanceReqDetails, user, component, validateState).left().value();
+	}
+
+}
diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/utils/general/Convertor.java b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/utils/general/Convertor.java
new file mode 100644
index 0000000000..031d2d8e72
--- /dev/null
+++ b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/utils/general/Convertor.java
@@ -0,0 +1,337 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * SDC
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.sdc.ci.tests.utils.general;
+
+import org.apache.commons.lang3.StringUtils;
+import org.openecomp.sdc.be.dao.api.ActionStatus;
+import org.openecomp.sdc.be.model.LifecycleStateEnum;
+import org.openecomp.sdc.be.model.Product;
+import org.openecomp.sdc.be.model.User;
+import org.openecomp.sdc.be.model.category.CategoryDefinition;
+import org.openecomp.sdc.ci.tests.datatypes.*;
+import org.openecomp.sdc.ci.tests.datatypes.enums.ErrorInfo;
+import org.openecomp.sdc.ci.tests.datatypes.enums.UserRoleEnum;
+import org.openecomp.sdc.ci.tests.datatypes.expected.ExpectedProductAudit;
+import org.openecomp.sdc.ci.tests.datatypes.expected.ExpectedResourceAuditJavaObject;
+import org.openecomp.sdc.ci.tests.datatypes.expected.ExpectedUserCRUDAudit;
+import org.openecomp.sdc.ci.tests.utils.validation.ErrorValidationUtils;
+import org.openecomp.sdc.common.api.Constants;
+
+import java.io.FileNotFoundException;
+import java.util.ArrayList;
+import java.util.List;
+
+import static org.openecomp.sdc.ci.tests.utils.rest.BaseRestUtils.STATUS_CODE_CREATED;
+import static org.openecomp.sdc.ci.tests.utils.rest.BaseRestUtils.STATUS_CODE_SUCCESS;
+
+public class Convertor {
+	// ***** resource *****
+	public static ResourceRespJavaObject constructFieldsForRespValidation(ResourceReqDetails resourceDetails,
+			String resourceVersion) {
+		return convertToRespObject(resourceDetails, resourceVersion, UserRoleEnum.ADMIN.getUserId(),
+				UserRoleEnum.ADMIN.getUserName());
+
+	}
+
+	public static ResourceRespJavaObject constructFieldsForRespValidation(ResourceReqDetails resourceDetails) {
+		return convertToRespObject(resourceDetails, resourceDetails.getVersion(), UserRoleEnum.ADMIN.getUserId(),
+				UserRoleEnum.ADMIN.getUserName());
+
+	}
+
+	public static ResourceRespJavaObject constructFieldsForRespValidation(ResourceReqDetails resourceDetails,
+			String resourceVersion, User user) {
+		return convertToRespObject(resourceDetails, resourceVersion, user.getUserId(), user.getFullName());
+
+	}
+
+	private static ResourceRespJavaObject convertToRespObject(ResourceReqDetails resourceDetails,
+			String resourceVersion, String userId, String userName) {
+		ResourceRespJavaObject resourceRespJavaObject = new ResourceRespJavaObject();
+
+		resourceRespJavaObject.setUniqueId(resourceDetails.getUniqueId());
+		resourceRespJavaObject.setName(resourceDetails.getName());
+		resourceRespJavaObject.setCreatorUserId(resourceDetails.getCreatorUserId());
+		resourceRespJavaObject.setCreatorFullName(resourceDetails.getCreatorFullName());
+		resourceRespJavaObject.setLastUpdaterUserId(userId);
+		resourceRespJavaObject.setLastUpdaterFullName(userName);
+		resourceRespJavaObject.setDescription(resourceDetails.getDescription());
+		resourceRespJavaObject.setIcon(resourceDetails.getIcon());
+		resourceRespJavaObject.setTags(resourceDetails.getTags());
+		resourceRespJavaObject.setIsHighestVersion("true");
+		resourceRespJavaObject.setCategories(resourceDetails.getCategories());
+		resourceRespJavaObject.setLifecycleState(
+				resourceDetails.getLifecycleState() != null ? resourceDetails.getLifecycleState().toString()
+						: LifecycleStateEnum.NOT_CERTIFIED_CHECKOUT.toString());
+		// resourceRespJavaObject.setLifecycleState((LifecycleStateEnum.NOT_CERTIFIED_CHECKOUT).toString());
+		resourceRespJavaObject.setDerivedFrom(resourceDetails.getDerivedFrom());
+		resourceRespJavaObject.setVendorName(resourceDetails.getVendorName());
+		resourceRespJavaObject.setVendorRelease(resourceDetails.getVendorRelease());
+		resourceRespJavaObject.setContactId(resourceDetails.getContactId());
+		resourceRespJavaObject.setAbstractt("false");
+		resourceRespJavaObject.setVersion(resourceVersion);
+		resourceRespJavaObject.setCost(resourceDetails.getCost());
+		resourceRespJavaObject.setLicenseType(resourceDetails.getLicenseType());
+		resourceRespJavaObject.setResourceType(resourceDetails.getResourceType());
+
+		return resourceRespJavaObject;
+
+	}
+
+	// ********** service **************
+
+	// public static ServiceRespJavaObject
+	// constructFieldsForRespValidation(ServiceReqDetails serviceDetails, String
+	// serviceVersion, User user) {
+	// return convertToRespObject(serviceDetails, serviceVersion,
+	// user.getUserId(), user.getFullName());
+	//
+	// }
+	//
+	// private static ServiceRespJavaObject
+	// convertToRespObject(ServiceReqDetails serviceDetails, String
+	// serviceVersion, String userId, String userName) {
+	// ServiceRespJavaObject serviceRespJavaObject = new
+	// ServiceRespJavaObject();
+	//
+	// serviceRespJavaObject.setUniqueId(serviceDetails.getUniqueId());
+	// serviceRespJavaObject.setName(serviceDetails.getName());
+	// serviceRespJavaObject.setCreatorUserId(userId);
+	// serviceRespJavaObject.setCreatorFullName(userName);
+	// serviceRespJavaObject.setLastUpdaterUserId(userId);
+	// serviceRespJavaObject.setLastUpdaterFullName(userName);
+	// serviceRespJavaObject.setDescription(serviceDetails.getDescription());
+	// serviceRespJavaObject.setIcon(serviceDetails.getIcon());
+	// serviceRespJavaObject.setCategory(serviceDetails.getCategory());
+	// serviceRespJavaObject.setLifecycleState((LifecycleStateEnum.NOT_CERTIFIED_CHECKOUT).toString());
+	// serviceRespJavaObject.setContactId(serviceDetails.getContactId());
+	// serviceRespJavaObject.setVersion(serviceVersion);
+	//
+	// return serviceRespJavaObject;
+	// }
+
+	// ********** product **************
+
+	public static Product constructFieldsForRespValidation(ProductReqDetails productDetails, String productVersion,
+			User user) {
+		return convertToRespObject(productDetails, productVersion, user.getUserId(), user.getFullName());
+	}
+
+	private static Product convertToRespObject(ProductReqDetails productDetails, String productVersion, String userId,
+			String userName) {
+		Product expectedProduct = new Product();
+
+		expectedProduct.setUniqueId(productDetails.getUniqueId());
+		expectedProduct.setName(productDetails.getName());
+		expectedProduct.setFullName(productDetails.getFullName());
+		expectedProduct.setCreatorUserId(productDetails.getCreatorUserId());
+		expectedProduct.setCreatorFullName(productDetails.getCreatorFullName());
+		expectedProduct.setLastUpdaterUserId(userId);
+		expectedProduct.setLastUpdaterFullName(userName);
+		expectedProduct.setDescription(productDetails.getDescription());
+		// expectedProduct.setIcon(resourceDetails.getIcon());
+		expectedProduct.setTags(productDetails.getTags());
+		expectedProduct.setHighestVersion(true);
+		List<CategoryDefinition> categories = productDetails.getCategories();
+		if (categories == null) {
+			categories = new ArrayList<>();
+		}
+		expectedProduct.setCategories(categories);
+		expectedProduct.setState(LifecycleStateEnum.NOT_CERTIFIED_CHECKOUT);
+		expectedProduct.setVersion(productVersion);
+		expectedProduct.setContacts(productDetails.getContacts());
+		return expectedProduct;
+	}
+
+	// ***** audit *****
+
+	public static ExpectedResourceAuditJavaObject constructFieldsForAuditValidation(ResourceReqDetails resourceDetails,
+			String resourceVersion) {
+		return convertToAuditObject(resourceDetails, resourceVersion, UserRoleEnum.ADMIN.getUserId(),
+				UserRoleEnum.ADMIN.getUserName());
+	}
+
+	public static ExpectedResourceAuditJavaObject constructFieldsForAuditValidation(
+			ResourceReqDetails resourceDetails) {
+		return convertToAuditObject(resourceDetails, resourceDetails.getVersion(), UserRoleEnum.ADMIN.getUserId(),
+				UserRoleEnum.ADMIN.getUserName());
+	}
+
+	public static ExpectedResourceAuditJavaObject constructFieldsForAuditValidation(ResourceReqDetails resourceDetails,
+			String resourceVersion, User user) {
+		return convertToAuditObject(resourceDetails, resourceVersion, user.getUserId(), user.getFullName());
+	}
+
+	private static ExpectedResourceAuditJavaObject convertToAuditObject(ResourceReqDetails resourceDetails,
+			String resourceVersion, String userId, String userName) {
+		ExpectedResourceAuditJavaObject expectedResourceAuditJavaObject = new ExpectedResourceAuditJavaObject();
+
+		expectedResourceAuditJavaObject.setAction("Checkout");
+		expectedResourceAuditJavaObject.setModifierName(userName);
+		expectedResourceAuditJavaObject.setModifierUid(userId);
+		expectedResourceAuditJavaObject.setStatus("200.0");
+		expectedResourceAuditJavaObject.setDesc("OK");
+		expectedResourceAuditJavaObject.setResourceName(resourceDetails.getName());
+		expectedResourceAuditJavaObject.setResourceType("Resource");
+		expectedResourceAuditJavaObject.setPrevVersion(String.valueOf(Float.parseFloat(resourceVersion) - 0.1f));
+		expectedResourceAuditJavaObject.setCurrVersion(resourceVersion);
+		expectedResourceAuditJavaObject.setPrevState((LifecycleStateEnum.NOT_CERTIFIED_CHECKOUT).toString());
+		expectedResourceAuditJavaObject.setCurrState((LifecycleStateEnum.NOT_CERTIFIED_CHECKOUT).toString());
+		expectedResourceAuditJavaObject.setComment(null);
+
+		return expectedResourceAuditJavaObject;
+	}
+
+	public static ExpectedProductAudit constructFieldsForAuditValidation(Product productDetails, String action,
+			User user, ActionStatus actionStatus, String prevVersion, String currVersion, LifecycleStateEnum prevState,
+			LifecycleStateEnum currState, String uuid, String... errorMessageParams) throws FileNotFoundException {
+		ErrorInfo errorInfo = ErrorValidationUtils.parseErrorConfigYaml(actionStatus.name());
+		return convertToAuditObject(productDetails, action, user, errorInfo, prevVersion, currVersion, prevState,
+				currState, uuid, errorMessageParams);
+	}
+
+	private static ExpectedProductAudit convertToAuditObject(Product productDetails, String action, User user,
+			ErrorInfo errorInfo, String prevVersion, String currVersion, LifecycleStateEnum prevState,
+			LifecycleStateEnum currState, String uuid, String... errorMessageParams) {
+		ExpectedProductAudit expectedProductAudit = new ExpectedProductAudit();
+
+		expectedProductAudit.setACTION(action);
+		String userUserId = user.getUserId();
+		String userFullName;
+		if (StringUtils.isEmpty(user.getFirstName()) && StringUtils.isEmpty(user.getLastName())) {
+			userFullName = "";
+		} else {
+			userFullName = user.getFullName();
+		}
+		if (StringUtils.isEmpty(userUserId)) {
+			userUserId = "UNKNOWN";
+		}
+		expectedProductAudit.setMODIFIER(
+				!StringUtils.isEmpty(userFullName) ? userFullName + "(" + userUserId + ")" : "(" + userUserId + ")");
+		expectedProductAudit.setSTATUS(Integer.toString(errorInfo.getCode()));
+		expectedProductAudit.setDESC(errorInfo.getAuditDesc((Object[]) (errorMessageParams)));
+		expectedProductAudit
+				.setRESOURCE_NAME(productDetails != null ? productDetails.getName() : Constants.EMPTY_STRING);
+		expectedProductAudit.setRESOURCE_TYPE("Product");
+		expectedProductAudit.setPREV_VERSION(prevVersion);
+		expectedProductAudit.setCURR_VERSION(currVersion);
+		expectedProductAudit.setPREV_STATE(prevState != null ? prevState.name() : Constants.EMPTY_STRING);
+		expectedProductAudit.setCURR_STATE(currState != null ? currState.name() : Constants.EMPTY_STRING);
+		expectedProductAudit.setSERVICE_INSTANCE_ID(uuid);
+		return expectedProductAudit;
+	}
+
+	////////////////
+	// Convertor.constructFieldsForAuditValidationSuccess(addUser,
+	//////////////// sdncAdminUser, mechIdUser, null, STATUS_CODE_CREATED);
+	public static ExpectedUserCRUDAudit constructFieldsForAuditValidation(String action, User userModifier,
+			ActionStatus actionStatus, User userAfter, User userBefore, Object... variables) throws Exception {
+		ErrorInfo errorInfo = ErrorValidationUtils.parseErrorConfigYaml(actionStatus.name());
+		ExpectedUserCRUDAudit expectedAddUserAuditJavaObject = new ExpectedUserCRUDAudit();
+		expectedAddUserAuditJavaObject.setAction(action);
+		expectedAddUserAuditJavaObject.setModifier(
+				userModifier.getFirstName() != null ? userModifier.getFullName() + "(" + userModifier.getUserId() + ")"
+						: "(" + userModifier.getUserId() + ")");
+		String status = Integer.toString(errorInfo.getCode());
+		expectedAddUserAuditJavaObject.setStatus(status);
+		if (errorInfo.getCode() == STATUS_CODE_SUCCESS || errorInfo.getCode() == STATUS_CODE_CREATED) {
+			expectedAddUserAuditJavaObject.setDesc("OK");
+		} else {
+			expectedAddUserAuditJavaObject.setDesc(errorInfo.getAuditDesc(variables));
+		}
+		expectedAddUserAuditJavaObject.setUserBefore(userBefore != null
+				? userBefore.getUserId() + ", " + userBefore.getFirstName() + " " + userBefore.getLastName() + ", "
+						+ userBefore.getEmail() + ", " + userBefore.getRole()
+				: Constants.EMPTY_STRING);
+		expectedAddUserAuditJavaObject.setUserAfter(userAfter != null
+				? userAfter.getUserId() + ", " + userAfter.getFirstName() + " " + userAfter.getLastName() + ", "
+						+ userAfter.getEmail() + ", " + userAfter.getRole()
+				: Constants.EMPTY_STRING);
+		return expectedAddUserAuditJavaObject;
+	}
+
+	// For RESOURCE and SERVICE same Audit
+	public static ExpectedResourceAuditJavaObject constructFieldsForAuditValidation(
+			ComponentReqDetails componentDetails, String action, User userModifier, ActionStatus actionStatus,
+			String currVersion, String prevVersion, String curState, String prevState, String uuid, String comment,
+			Object... variables) throws Exception {
+		ErrorInfo errorInfo = ErrorValidationUtils.parseErrorConfigYaml(actionStatus.name());
+		ExpectedResourceAuditJavaObject expectedResourceAuditJavaObject = new ExpectedResourceAuditJavaObject();
+		expectedResourceAuditJavaObject.setAction(action);
+		expectedResourceAuditJavaObject.setMODIFIER(
+				userModifier.getFirstName() != null ? userModifier.getFullName() + "(" + userModifier.getUserId() + ")"
+						: "(" + userModifier.getUserId() + ")");
+		String status = Integer.toString(errorInfo.getCode());
+		expectedResourceAuditJavaObject.setStatus(status);
+		if (errorInfo.getCode() == STATUS_CODE_SUCCESS || errorInfo.getCode() == STATUS_CODE_CREATED) {
+			expectedResourceAuditJavaObject.setDesc("OK");
+		} else {
+			expectedResourceAuditJavaObject.setDesc(errorInfo.getAuditDesc(variables));
+		}
+		expectedResourceAuditJavaObject.setCurrState(curState);
+		expectedResourceAuditJavaObject.setPrevState(prevState);
+		expectedResourceAuditJavaObject.setCurrVersion(currVersion);
+		expectedResourceAuditJavaObject.setPrevVersion(prevVersion);
+		expectedResourceAuditJavaObject.setComment(comment);
+		expectedResourceAuditJavaObject.setSERVICE_INSTANCE_ID(uuid);
+		if (componentDetails instanceof ServiceReqDetails) {
+			expectedResourceAuditJavaObject.setResourceName(((ServiceReqDetails) componentDetails).getName());
+			expectedResourceAuditJavaObject.setResourceType("Service");
+		}
+		if (componentDetails instanceof ResourceReqDetails) {
+			expectedResourceAuditJavaObject.setResourceName(((ResourceReqDetails) componentDetails).getName());
+			expectedResourceAuditJavaObject.setResourceType("Resource");
+		}
+		return expectedResourceAuditJavaObject;
+	}
+
+	// Distribution Service Audit
+	public static ExpectedResourceAuditJavaObject constructFieldsForDistributionAuditValidation(
+			ComponentReqDetails componentDetails, String action, User userModifier, ActionStatus actionStatus,
+			String currVersion, String distCurrStatus, String distProvStatus, String curState, String uuid,
+			String comment, Object... variables) throws Exception {
+		ErrorInfo errorInfo = ErrorValidationUtils.parseErrorConfigYaml(actionStatus.name());
+		ExpectedResourceAuditJavaObject expectedResourceAuditJavaObject = new ExpectedResourceAuditJavaObject();
+		expectedResourceAuditJavaObject.setAction(action);
+		expectedResourceAuditJavaObject.setMODIFIER(
+				userModifier.getFirstName() != null ? userModifier.getFullName() + "(" + userModifier.getUserId() + ")"
+						: "(" + userModifier.getUserId() + ")");
+		String status = Integer.toString(errorInfo.getCode());
+		expectedResourceAuditJavaObject.setStatus(status);
+		if (errorInfo.getCode() == STATUS_CODE_SUCCESS || errorInfo.getCode() == STATUS_CODE_CREATED) {
+			expectedResourceAuditJavaObject.setDesc("OK");
+		} else {
+			expectedResourceAuditJavaObject.setDesc(errorInfo.getAuditDesc(variables));
+		}
+		expectedResourceAuditJavaObject.setCurrState(curState);
+		expectedResourceAuditJavaObject.setCurrVersion(currVersion);
+		expectedResourceAuditJavaObject.setDcurrStatus(distCurrStatus);
+		expectedResourceAuditJavaObject.setDprevStatus(distProvStatus);
+		expectedResourceAuditJavaObject.setComment(comment);
+		expectedResourceAuditJavaObject.setSERVICE_INSTANCE_ID(uuid);
+		if (componentDetails instanceof ServiceReqDetails) {
+			expectedResourceAuditJavaObject.setResourceName(((ServiceReqDetails) componentDetails).getName());
+			expectedResourceAuditJavaObject.setResourceType("Service");
+		}
+		return expectedResourceAuditJavaObject;
+	}
+
+}
diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/utils/general/ElementFactory.java b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/utils/general/ElementFactory.java
new file mode 100644
index 0000000000..31b8c5b47a
--- /dev/null
+++ b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/utils/general/ElementFactory.java
@@ -0,0 +1,1051 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * SDC
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.sdc.ci.tests.utils.general;
+
+import org.apache.commons.lang.StringUtils;
+import org.openecomp.sdc.be.dao.api.ActionStatus;
+import org.openecomp.sdc.be.datatypes.elements.ConsumerDataDefinition;
+import org.openecomp.sdc.be.datatypes.enums.AssetTypeEnum;
+import org.openecomp.sdc.be.datatypes.enums.ComponentTypeEnum;
+import org.openecomp.sdc.be.datatypes.enums.OriginTypeEnum;
+import org.openecomp.sdc.be.datatypes.enums.ResourceTypeEnum;
+import org.openecomp.sdc.be.model.*;
+import org.openecomp.sdc.be.model.category.CategoryDefinition;
+import org.openecomp.sdc.be.model.category.GroupingDefinition;
+import org.openecomp.sdc.be.model.category.SubCategoryDefinition;
+import org.openecomp.sdc.be.resources.data.auditing.AuditingActionEnum;
+import org.openecomp.sdc.ci.tests.datatypes.*;
+import org.openecomp.sdc.ci.tests.datatypes.enums.*;
+import org.openecomp.sdc.ci.tests.datatypes.expected.ExpectedExternalAudit;
+import org.openecomp.sdc.ci.tests.datatypes.expected.ExpectedResourceAuditJavaObject;
+import org.openecomp.sdc.ci.tests.utils.rest.ArtifactRestUtils;
+import org.openecomp.sdc.ci.tests.utils.rest.ResponseParser;
+import org.openecomp.sdc.ci.tests.utils.validation.AuditValidationUtils;
+import org.openecomp.sdc.ci.tests.utils.validation.ErrorValidationUtils;
+import org.openecomp.sdc.common.api.ArtifactGroupTypeEnum;
+import org.openecomp.sdc.common.util.ValidationUtils;
+
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.UUID;
+
+public final class ElementFactory {
+
+	private static final String CI_SERVICE = "ciService";
+	private static final String CI_RES = "ciRes";
+	private static final String CI_PRODUCT = "CiProduct";
+	private static String DEFAULT_ARTIFACT_LABEL = "artifact1";
+	private static final String RESOURCE_INSTANCE_POS_X = "20";
+	private static final String RESOURCE_INSTANCE_POS_Y = "20";
+	private static final String RESOURCE_INSTANCE_DESCRIPTION = "description";
+
+	private ElementFactory() {
+
+	}
+	
+	// *** Getters ***
+	
+	public static String getServicePrefix() {
+		return CI_SERVICE;
+	}
+
+	public static String getResourcePrefix() {
+		return CI_RES;
+	}
+
+	public static String getProductPrefix() {
+		return CI_PRODUCT;
+	}
+
+	// *** RESOURCE ***
+
+	public static ResourceReqDetails getDefaultResource() {
+		return getDefaultResource(CI_RES, NormativeTypesEnum.ROOT, ResourceCategoryEnum.GENERIC_INFRASTRUCTURE, "jh0003");
+	}
+
+	public static ResourceReqDetails getDefaultResource(ResourceCategoryEnum category) {
+		return getDefaultResource(CI_RES, NormativeTypesEnum.ROOT, category, "jh0003");
+	}
+
+	public static ResourceReqDetails getDefaultResource(String contactId) {
+		return getDefaultResource(CI_RES, NormativeTypesEnum.ROOT, ResourceCategoryEnum.GENERIC_INFRASTRUCTURE, contactId);
+	}
+
+	public static ResourceReqDetails getDefaultResource(User modifier) {
+		return getDefaultResource(CI_RES, NormativeTypesEnum.ROOT, ResourceCategoryEnum.GENERIC_INFRASTRUCTURE, modifier.getUserId());
+	}
+
+	public static ResourceReqDetails getDefaultResource(NormativeTypesEnum derivedFrom, ResourceCategoryEnum category) {
+		return getDefaultResource(CI_RES, derivedFrom, category, "jh0003");
+	}
+
+	public static ResourceReqDetails getDefaultResource(NormativeTypesEnum derivedFrom) {
+		return getDefaultResource(CI_RES, derivedFrom, ResourceCategoryEnum.GENERIC_INFRASTRUCTURE, "jh0003");
+	}
+
+	public static ResourceReqDetails getDefaultResource(String resourceName, NormativeTypesEnum derivedFrom) {
+		return getDefaultResource(resourceName, derivedFrom, ResourceCategoryEnum.GENERIC_INFRASTRUCTURE, "jh0003");
+	}
+
+	public static ResourceReqDetails getDefaultResource(NormativeTypesEnum derivedFrom, String contactId) {
+		return getDefaultResource(CI_RES, derivedFrom, ResourceCategoryEnum.GENERIC_INFRASTRUCTURE, contactId);
+	}
+
+	// New
+	public static ResourceReqDetails getDefaultResourceByType(ResourceTypeEnum ResourceType, String resourceName, ResourceCategoryEnum resourceCategory, String vendorName, String vendorModelNumber) {
+		return getDefaultResourceByType(resourceName, NormativeTypesEnum.ROOT, resourceCategory, "jh0003", ResourceType.toString(), vendorName, vendorModelNumber);
+	}
+
+	public static ResourceReqDetails getDefaultResourceByType(ResourceTypeEnum ResourceType, String resourceName) {
+		return getDefaultResourceByType(resourceName, NormativeTypesEnum.ROOT, ResourceCategoryEnum.GENERIC_INFRASTRUCTURE, "jh0003", ResourceType.toString());
+	}
+
+	public static ResourceReqDetails getDefaultResourceByType(ResourceTypeEnum ResourceType, User user) {
+		return getDefaultResourceByType(CI_RES, NormativeTypesEnum.ROOT, ResourceCategoryEnum.APPLICATION_L4_LOAD_BALANCER, user.getUserId(), ResourceType.toString());
+	}
+
+	public static ResourceReqDetails getDefaultResourceByTypeNormTypeAndCatregory(ResourceTypeEnum resourceType, NormativeTypesEnum normativeTypes, ResourceCategoryEnum resourceCategory, User user) {
+		return getDefaultResourceByType(CI_RES, normativeTypes, resourceCategory, user.getUserId(), resourceType.toString());
+	}
+
+	public static PropertyReqDetails getDefaultMapProperty(PropertyTypeEnum innerType) {
+		return getPropertyDetails(innerType);
+	}
+
+	public static PropertyReqDetails getDefaultMapProperty() {
+		return getPropertyDetails(PropertyTypeEnum.STRING_MAP);
+	}
+
+	public static ResourceReqDetails getDefaultResource(String resourceName, NormativeTypesEnum derived, ResourceCategoryEnum category, String contactId) {
+		resourceName = addRandomSuffixToName(resourceName);
+		String description = "Represents a generic software component that can be managed and run by a Compute Node Type.";
+		ArrayList<String> resourceTags = new ArrayList<>();
+		resourceTags.add(resourceName);
+
+		ArrayList<String> derivedFrom = new ArrayList<>();
+		derivedFrom.add(derived.normativeName);
+		String vendorName = "ATT Tosca";
+		String vendorRelease = "1.0.0.wd03";
+		String icon = "defaulticon";
+		ResourceReqDetails resourceDetails = new ResourceReqDetails(resourceName, description, resourceTags, null, derivedFrom, vendorName, vendorRelease, contactId, icon);
+		resourceDetails.addCategoryChain(category.getCategory(), category.getSubCategory());
+		resourceDetails.setResourceVendorModelNumber("vendorNumber-1.5.7");
+
+		return resourceDetails;
+
+	}
+
+	public static ResourceReqDetails getDefaultResourceByTypeNormTypeAndCatregory(ResourceTypeEnum resourceType, Resource normativeTypes, ResourceCategoryEnum resourceCategory, User user) {
+		return getDefaultResource(CI_RES + resourceType, normativeTypes, resourceCategory, user.getUserId());
+	}
+
+	public static ResourceReqDetails getDefaultResource(String resourceName, Resource derived, ResourceCategoryEnum category, String contactId) {
+		resourceName = addRandomSuffixToName(resourceName);
+		String description = "Represents a generic software component that can be managed and run by a Compute Node Type.";
+		ArrayList<String> resourceTags = new ArrayList<>();
+		resourceTags.add(resourceName);
+
+		ArrayList<String> derivedFrom = new ArrayList<>();
+		derivedFrom.add(derived.getToscaResourceName());
+		String vendorName = "ATT Tosca";
+		String vendorRelease = "1.0.0.wd03";
+		String icon = "defaulticon";
+		ResourceReqDetails resourceDetails = new ResourceReqDetails(resourceName, description, resourceTags, null, derivedFrom, vendorName, vendorRelease, contactId, icon);
+		resourceDetails.addCategoryChain(category.getCategory(), category.getSubCategory());
+
+		return resourceDetails;
+
+	}
+
+	public static String addRandomSuffixToName(final String name) {
+		return name + generateUUIDforSufix();
+	}
+
+	public static ResourceReqDetails getDefaultResourceByType(String resourceName, NormativeTypesEnum derived, ResourceCategoryEnum category, String contactId, ResourceTypeEnum resourceType) {
+		return getDefaultResourceByType(resourceName, derived, category, contactId, resourceType.toString());
+	}
+
+	// New
+	public static ResourceReqDetails getDefaultResourceByType(String resourceName, NormativeTypesEnum derived, ResourceCategoryEnum category, String contactId, String resourceType) {
+		resourceName = (resourceName + resourceType + generateUUIDforSufix());
+		String description = "Represents a generic software component that can be managed and run by a Compute Node Type.";
+		ArrayList<String> resourceTags = new ArrayList<>();
+		resourceTags.add(resourceName);
+		ArrayList<String> derivedFrom = null;
+		if (derived != null) {
+			derivedFrom = new ArrayList<String>();
+			derivedFrom.add(derived.normativeName);
+		}
+		String vendorName = "ATT Tosca";
+		String vendorRelease = "1.0.0.wd03";
+		String icon = "defaulticon";
+		ResourceReqDetails resourceDetails = new ResourceReqDetails(resourceName, description, resourceTags, null, derivedFrom, vendorName, vendorRelease, contactId, icon, resourceType.toString());
+		resourceDetails.addCategoryChain(category.getCategory(), category.getSubCategory());
+		resourceDetails.setResourceVendorModelNumber("vendorNumber-1.5.7");
+		return resourceDetails;
+	}
+
+	public static ResourceReqDetails getDefaultResourceByType(String resourceName, NormativeTypesEnum derived, ResourceCategoryEnum category, String contactId, String resourceType, String vendorName, String vendorModelNumber) {
+		resourceName = (resourceName + resourceType + generateUUIDforSufix());
+
+		String description = "Represents a generic software component that can be managed and run by a Compute Node Type.";
+		ArrayList<String> resourceTags = new ArrayList<>();
+		resourceTags.add(resourceName);
+		ArrayList<String> derivedFrom = null;
+		if (derived != null) {
+			derivedFrom = new ArrayList<>();
+			derivedFrom.add(derived.normativeName);
+		}
+		String vendorRelease = "1.0.0.wd03";
+		String icon = "defaulticon";
+		ResourceReqDetails resourceDetails = new ResourceReqDetails(resourceName, description, resourceTags, null, derivedFrom, vendorName, vendorRelease, contactId, icon, resourceType.toString());
+		resourceDetails.addCategoryChain(category.getCategory(), category.getSubCategory());
+		resourceDetails.setResourceVendorModelNumber(vendorModelNumber);
+		return resourceDetails;
+	}
+
+	public static ResourceReqDetails getRandomCategoryResource() {
+		ResourceReqDetails resourceDetails = getDefaultResource(ResourceCategoryEnum.getRandomElement());
+		return resourceDetails;
+	}
+
+	public static ResourceExternalReqDetails getDefaultResourceByType(String resourceName, ResourceCategoryEnum category, String contactId, String resourceType) {
+		resourceName = (resourceName + resourceType + generateUUIDforSufix());
+		String description = "Represents a generic software component that can be managed and run by a Compute Node Type.";
+		ArrayList<String> resourceTags = new ArrayList<>();
+		resourceTags.add(resourceName);
+		String vendorName = "ATT Tosca";
+		String vendorRelease = "1.0.0.wd03";
+		String icon = "defaulticon";
+		ResourceExternalReqDetails resourceDetails = new ResourceExternalReqDetails(resourceName, description, resourceTags, 
+				vendorName, vendorRelease, contactId, icon,
+				resourceType.toString(), category.getCategory(), category.getSubCategory());
+		return resourceDetails;
+	}
+
+	// New
+	public static ImportReqDetails getDefaultImportResourceByType(String resourceName, NormativeTypesEnum derived, ResourceCategoryEnum category, String contactId, String resourceType) {
+		resourceName = (resourceName + resourceType + generateUUIDforSufix());
+		String description = "Represents a generic software component that can be managed and run by a Compute Node Type.";
+		ArrayList<String> resourceTags = new ArrayList<>();
+		resourceTags.add(resourceName);
+		ArrayList<String> derivedFrom = null;
+		if (derived != null) {
+			derivedFrom = new ArrayList<>();
+			derivedFrom.add(derived.normativeName);
+		}
+		String vendorName = "ATT Tosca";
+		String vendorRelease = "1.0.0.wd03";
+		String icon = "defaulticon";
+		ImportReqDetails resourceDetails = new ImportReqDetails(resourceName, description, resourceTags, derivedFrom, vendorName, vendorRelease, contactId, icon);
+		resourceDetails.addCategoryChain(category.getCategory(), category.getSubCategory());
+		return resourceDetails;
+	}
+	////
+
+	public static ImportReqDetails getDefaultImportResource(ResourceReqDetails resourceReqDetails) {
+		ImportReqDetails importReqDetails = new ImportReqDetails(resourceReqDetails.getName(), resourceReqDetails.getDescription(), resourceReqDetails.getTags(), resourceReqDetails.getDerivedFrom(), resourceReqDetails.getVendorName(),
+				resourceReqDetails.getVendorRelease(), resourceReqDetails.getContactId(), resourceReqDetails.getIcon());
+		importReqDetails.setPayloadName("myCompute.yaml");
+		importReqDetails.setCategories(resourceReqDetails.getCategories());
+		importReqDetails.setPayloadData(
+				"dG9zY2FfZGVmaW5pdGlvbnNfdmVyc2lvbjogdG9zY2Ffc2ltcGxlX3lhbWxfMV8wXzANCm5vZGVfdHlwZXM6IA0KICBjb20uYXR0LmQyLnJlc291cmNlLk15Q29tcHV0ZToNCiAgICBkZXJpdmVkX2Zyb206IHRvc2NhLm5vZGVzLlJvb3QNCiAgICBhdHRyaWJ1dGVzOg0KICAgICAgcHJpdmF0ZV9hZGRyZXNzOg0KICAgICAgICB0eXBlOiBzdHJpbmcNCiAgICAgIHB1YmxpY19hZGRyZXNzOg0KICAgICAgICB0eXBlOiBzdHJpbmcNCiAgICAgIG5ldHdvcmtzOg0KICAgICAgICB0eXBlOiBtYXANCiAgICAgICAgZW50cnlfc2NoZW1hOg0KICAgICAgICAgIHR5cGU6IHRvc2NhLmRhdGF0eXBlcy5uZXR3b3JrLk5ldHdvcmtJbmZvDQogICAgICBwb3J0czoNCiAgICAgICAgdHlwZTogbWFwDQogICAgICAgIGVudHJ5X3NjaGVtYToNCiAgICAgICAgICB0eXBlOiB0b3NjYS5kYXRhdHlwZXMubmV0d29yay5Qb3J0SW5mbw0KICAgIHJlcXVpcmVtZW50czoNCiAgICAgIC0gbG9jYWxfc3RvcmFnZTogDQogICAgICAgICAgY2FwYWJpbGl0eTogdG9zY2EuY2FwYWJpbGl0aWVzLkF0dGFjaG1lbnQNCiAgICAgICAgICBub2RlOiB0b3NjYS5ub2Rlcy5CbG9ja1N0b3JhZ2UNCiAgICAgICAgICByZWxhdGlvbnNoaXA6IHRvc2NhLnJlbGF0aW9uc2hpcHMuQXR0YWNoZXNUbw0KICAgICAgICAgIG9jY3VycmVuY2VzOiBbMCwgVU5CT1VOREVEXSAgDQogICAgY2FwYWJpbGl0aWVzOg0KICAgICAgaG9zdDogDQogICAgICAgIHR5cGU6IHRvc2NhLmNhcGFiaWxpdGllcy5Db250YWluZXINCiAgICAgICAgdmFsaWRfc291cmNlX3R5cGVzOiBbdG9zY2Eubm9kZXMuU29mdHdhcmVDb21wb25lbnRdIA0KICAgICAgZW5kcG9pbnQgOg0KICAgICAgICB0eXBlOiB0b3NjYS5jYXBhYmlsaXRpZXMuRW5kcG9pbnQuQWRtaW4gDQogICAgICBvczogDQogICAgICAgIHR5cGU6IHRvc2NhLmNhcGFiaWxpdGllcy5PcGVyYXRpbmdTeXN0ZW0NCiAgICAgIHNjYWxhYmxlOg0KICAgICAgICB0eXBlOiB0b3NjYS5jYXBhYmlsaXRpZXMuU2NhbGFibGUNCiAgICAgIGJpbmRpbmc6DQogICAgICAgIHR5cGU6IHRvc2NhLmNhcGFiaWxpdGllcy5uZXR3b3JrLkJpbmRhYmxlDQo=");
+		return importReqDetails;
+	}
+
+	public static ImportReqDetails getDefaultImportResource() {
+		ResourceReqDetails resourceReqDetails = getDefaultResource();
+		ImportReqDetails importReqDetails = new ImportReqDetails(resourceReqDetails.getName(), resourceReqDetails.getDescription(), resourceReqDetails.getTags(), resourceReqDetails.getDerivedFrom(), resourceReqDetails.getVendorName(),
+				resourceReqDetails.getVendorRelease(), resourceReqDetails.getContactId(), resourceReqDetails.getIcon());
+		importReqDetails.setPayloadName("myCompute.yaml");
+		importReqDetails.setCategories(resourceReqDetails.getCategories());
+		importReqDetails.setPayloadData(
+				"dG9zY2FfZGVmaW5pdGlvbnNfdmVyc2lvbjogdG9zY2Ffc2ltcGxlX3lhbWxfMV8wXzANCm5vZGVfdHlwZXM6IA0KICBjb20uYXR0LmQyLnJlc291cmNlLk15Q29tcHV0ZToNCiAgICBkZXJpdmVkX2Zyb206IHRvc2NhLm5vZGVzLlJvb3QNCiAgICBhdHRyaWJ1dGVzOg0KICAgICAgcHJpdmF0ZV9hZGRyZXNzOg0KICAgICAgICB0eXBlOiBzdHJpbmcNCiAgICAgIHB1YmxpY19hZGRyZXNzOg0KICAgICAgICB0eXBlOiBzdHJpbmcNCiAgICAgIG5ldHdvcmtzOg0KICAgICAgICB0eXBlOiBtYXANCiAgICAgICAgZW50cnlfc2NoZW1hOg0KICAgICAgICAgIHR5cGU6IHRvc2NhLmRhdGF0eXBlcy5uZXR3b3JrLk5ldHdvcmtJbmZvDQogICAgICBwb3J0czoNCiAgICAgICAgdHlwZTogbWFwDQogICAgICAgIGVudHJ5X3NjaGVtYToNCiAgICAgICAgICB0eXBlOiB0b3NjYS5kYXRhdHlwZXMubmV0d29yay5Qb3J0SW5mbw0KICAgIHJlcXVpcmVtZW50czoNCiAgICAgIC0gbG9jYWxfc3RvcmFnZTogDQogICAgICAgICAgY2FwYWJpbGl0eTogdG9zY2EuY2FwYWJpbGl0aWVzLkF0dGFjaG1lbnQNCiAgICAgICAgICBub2RlOiB0b3NjYS5ub2Rlcy5CbG9ja1N0b3JhZ2UNCiAgICAgICAgICByZWxhdGlvbnNoaXA6IHRvc2NhLnJlbGF0aW9uc2hpcHMuQXR0YWNoZXNUbw0KICAgICAgICAgIG9jY3VycmVuY2VzOiBbMCwgVU5CT1VOREVEXSAgDQogICAgY2FwYWJpbGl0aWVzOg0KICAgICAgaG9zdDogDQogICAgICAgIHR5cGU6IHRvc2NhLmNhcGFiaWxpdGllcy5Db250YWluZXINCiAgICAgICAgdmFsaWRfc291cmNlX3R5cGVzOiBbdG9zY2Eubm9kZXMuU29mdHdhcmVDb21wb25lbnRdIA0KICAgICAgZW5kcG9pbnQgOg0KICAgICAgICB0eXBlOiB0b3NjYS5jYXBhYmlsaXRpZXMuRW5kcG9pbnQuQWRtaW4gDQogICAgICBvczogDQogICAgICAgIHR5cGU6IHRvc2NhLmNhcGFiaWxpdGllcy5PcGVyYXRpbmdTeXN0ZW0NCiAgICAgIHNjYWxhYmxlOg0KICAgICAgICB0eXBlOiB0b3NjYS5jYXBhYmlsaXRpZXMuU2NhbGFibGUNCiAgICAgIGJpbmRpbmc6DQogICAgICAgIHR5cGU6IHRvc2NhLmNhcGFiaWxpdGllcy5uZXR3b3JrLkJpbmRhYmxlDQo=");
+		return importReqDetails;
+	}
+
+	public static ImportReqDetails getDefaultImportResource(String name) {
+		ResourceReqDetails resourceReqDetails = getDefaultResourceByType(ResourceTypeEnum.VFC, name);
+		ImportReqDetails importReqDetails = new ImportReqDetails(resourceReqDetails.getName(), resourceReqDetails.getDescription(), resourceReqDetails.getTags(), resourceReqDetails.getDerivedFrom(), resourceReqDetails.getVendorName(),
+				resourceReqDetails.getVendorRelease(), resourceReqDetails.getContactId(), resourceReqDetails.getIcon());
+		importReqDetails.setPayloadName("myCompute.yaml");
+		importReqDetails.setCategories(resourceReqDetails.getCategories());
+		importReqDetails.setPayloadData(
+				"dG9zY2FfZGVmaW5pdGlvbnNfdmVyc2lvbjogdG9zY2Ffc2ltcGxlX3lhbWxfMV8wXzANCm5vZGVfdHlwZXM6IA0KICBjb20uYXR0LmQyLnJlc291cmNlLk15Q29tcHV0ZToNCiAgICBkZXJpdmVkX2Zyb206IHRvc2NhLm5vZGVzLlJvb3QNCiAgICBhdHRyaWJ1dGVzOg0KICAgICAgcHJpdmF0ZV9hZGRyZXNzOg0KICAgICAgICB0eXBlOiBzdHJpbmcNCiAgICAgIHB1YmxpY19hZGRyZXNzOg0KICAgICAgICB0eXBlOiBzdHJpbmcNCiAgICAgIG5ldHdvcmtzOg0KICAgICAgICB0eXBlOiBtYXANCiAgICAgICAgZW50cnlfc2NoZW1hOg0KICAgICAgICAgIHR5cGU6IHRvc2NhLmRhdGF0eXBlcy5uZXR3b3JrLk5ldHdvcmtJbmZvDQogICAgICBwb3J0czoNCiAgICAgICAgdHlwZTogbWFwDQogICAgICAgIGVudHJ5X3NjaGVtYToNCiAgICAgICAgICB0eXBlOiB0b3NjYS5kYXRhdHlwZXMubmV0d29yay5Qb3J0SW5mbw0KICAgIHJlcXVpcmVtZW50czoNCiAgICAgIC0gbG9jYWxfc3RvcmFnZTogDQogICAgICAgICAgY2FwYWJpbGl0eTogdG9zY2EuY2FwYWJpbGl0aWVzLkF0dGFjaG1lbnQNCiAgICAgICAgICBub2RlOiB0b3NjYS5ub2Rlcy5CbG9ja1N0b3JhZ2UNCiAgICAgICAgICByZWxhdGlvbnNoaXA6IHRvc2NhLnJlbGF0aW9uc2hpcHMuQXR0YWNoZXNUbw0KICAgICAgICAgIG9jY3VycmVuY2VzOiBbMCwgVU5CT1VOREVEXSAgDQogICAgY2FwYWJpbGl0aWVzOg0KICAgICAgaG9zdDogDQogICAgICAgIHR5cGU6IHRvc2NhLmNhcGFiaWxpdGllcy5Db250YWluZXINCiAgICAgICAgdmFsaWRfc291cmNlX3R5cGVzOiBbdG9zY2Eubm9kZXMuU29mdHdhcmVDb21wb25lbnRdIA0KICAgICAgZW5kcG9pbnQgOg0KICAgICAgICB0eXBlOiB0b3NjYS5jYXBhYmlsaXRpZXMuRW5kcG9pbnQuQWRtaW4gDQogICAgICBvczogDQogICAgICAgIHR5cGU6IHRvc2NhLmNhcGFiaWxpdGllcy5PcGVyYXRpbmdTeXN0ZW0NCiAgICAgIHNjYWxhYmxlOg0KICAgICAgICB0eXBlOiB0b3NjYS5jYXBhYmlsaXRpZXMuU2NhbGFibGUNCiAgICAgIGJpbmRpbmc6DQogICAgICAgIHR5cGU6IHRvc2NhLmNhcGFiaWxpdGllcy5uZXR3b3JrLkJpbmRhYmxlDQo=");
+		return importReqDetails;
+	}
+
+	// *** SERVICE ***
+	public static ServiceReqDetails getDefaultService() {
+		return getDefaultService(CI_SERVICE, ServiceCategoriesEnum.MOBILITY, "al1976", ServiceInstantiationType.A_LA_CARTE.getValue());
+	}
+
+	public static ServiceReqDetails getDefaultService(String contactId) {
+		return getDefaultService(CI_SERVICE, ServiceCategoriesEnum.MOBILITY, contactId, ServiceInstantiationType.A_LA_CARTE.getValue());
+	}
+
+	public static ServiceReqDetails getDefaultService(User user) {
+		return getDefaultService(CI_SERVICE, ServiceCategoriesEnum.MOBILITY, user.getUserId(), ServiceInstantiationType.A_LA_CARTE.getValue());
+	}
+	
+	public static ServiceReqDetails getDefaultService(ServiceCategoriesEnum category, User user) {
+		return getDefaultService(CI_SERVICE, category, user.getUserId(), ServiceInstantiationType.A_LA_CARTE.getValue());
+	}
+	
+	public static ServiceReqDetails getServiceByCategory(ServiceCategoriesEnum category) {
+		return getDefaultService(CI_SERVICE, category, "al1976", ServiceInstantiationType.A_LA_CARTE.getValue());
+	}
+
+	public static ServiceReqDetails getDefaultService(String serviceName, ServiceCategoriesEnum category, String contactId, String instantiationType) {
+		serviceName = (serviceName + generateUUIDforSufix());
+		ArrayList<String> tags = new ArrayList<>();
+		tags.add("serviceTag");
+		tags.add("serviceTag1");
+		tags.add(serviceName);
+		String description = "service Description";
+		String icon = "defaulticon";
+
+		ServiceReqDetails serviceDetails = new ServiceReqDetails(serviceName, category.getValue(), tags, description, contactId, icon, instantiationType);
+
+		return serviceDetails;
+	}
+
+	public static ServiceReqDetails getRandomCategoryService() {
+		ServiceReqDetails serviceReqDetails = getServiceByCategory(ServiceCategoriesEnum.getRandomElement());
+		return serviceReqDetails;
+	}
+
+	// ***** PROPERTY ***
+
+	public static PropertyReqDetails getDefaultProperty() {
+		return getDefaultProperty("disk_size");
+	}
+
+	public static PropertyReqDetails getDefaultProperty(String propertyName) {
+		PropertyReqDetails property = new PropertyReqDetails();
+		property.setName(propertyName);
+		property.setPropertyType("integer");
+		property.setPropertyRequired(false);
+		property.setPropertyDefaultValue("12345");
+		property.setPropertyDescription("test property");
+		property.setPropertyRangeMax("500");
+		property.setPropertyRangeMin("100");
+		property.setPropertyPassword(false);
+		return property;
+	}
+
+	public static PropertyReqDetails getDefaultIntegerProperty() {
+		return getPropertyDetails(PropertyTypeEnum.INTEGER);
+	}
+
+	public static PropertyReqDetails getDefaultStringProperty() {
+		return getPropertyDetails(PropertyTypeEnum.STRING);
+	}
+
+	public static PropertyReqDetails getDefaultBooleanProperty() {
+		return getPropertyDetails(PropertyTypeEnum.BOOLEAN);
+	}
+
+	public static PropertyReqDetails getDefaultListProperty() {
+		return getPropertyDetails(PropertyTypeEnum.STRING_LIST);
+	}
+
+	public static PropertyReqDetails getDefaultListProperty(PropertyTypeEnum innerType) {
+		return getPropertyDetails(innerType);
+	}
+
+	public static PropertyReqDetails getPropertyDetails(PropertyTypeEnum propType) {
+		return new PropertyReqDetails(propType.getName(), propType.getType(), propType.getValue(), propType.getDescription(), propType.getSchemaDefinition());
+	}
+
+	// ***** RESOURCE INSTANCE ***
+	public static ComponentInstanceReqDetails getDefaultComponentInstance() {
+		return getDefaultComponentInstance("resourceInstanceName");
+	}
+
+	public static ComponentInstanceReqDetails getDefaultComponentInstance(String name) {
+		String resourceUid = "resourceId";
+		ComponentInstanceReqDetails resourceInstanceDetails = new ComponentInstanceReqDetails(resourceUid, RESOURCE_INSTANCE_DESCRIPTION, RESOURCE_INSTANCE_POS_X, RESOURCE_INSTANCE_POS_Y, name, null);
+
+		return resourceInstanceDetails;
+
+	}
+
+	public static ComponentInstanceReqDetails getDefaultComponentInstance(String name, ComponentReqDetails componentReqDetails) {
+		String resourceUid = componentReqDetails.getUniqueId();
+		ComponentInstanceReqDetails resourceInstanceDetails = new ComponentInstanceReqDetails(resourceUid, RESOURCE_INSTANCE_DESCRIPTION, RESOURCE_INSTANCE_POS_X, RESOURCE_INSTANCE_POS_Y, name, null);
+
+		return resourceInstanceDetails;
+
+	}
+
+    public static ComponentInstanceReqDetails getDefaultComponentInstance(String serviceUniqueId, String originType) {
+        ComponentInstanceReqDetails componentInstanceReqDetails = new ComponentInstanceReqDetails(serviceUniqueId,
+                RESOURCE_INSTANCE_DESCRIPTION, RESOURCE_INSTANCE_POS_X, RESOURCE_INSTANCE_POS_Y, null, originType);
+
+        componentInstanceReqDetails.setUniqueId(serviceUniqueId + Math.random());
+
+        return componentInstanceReqDetails;
+
+    }
+
+	public static ComponentInstanceReqDetails getComponentResourceInstance(ComponentReqDetails compInstOriginDetails) {
+		String compInstName = (compInstOriginDetails.getName() != null ? compInstOriginDetails.getName() : "resourceInstanceName");
+		String resourceUid = compInstOriginDetails.getUniqueId();
+		ComponentInstanceReqDetails resourceInstanceDetails = new ComponentInstanceReqDetails(resourceUid, RESOURCE_INSTANCE_DESCRIPTION, RESOURCE_INSTANCE_POS_X, RESOURCE_INSTANCE_POS_Y, compInstName, null);
+		return resourceInstanceDetails;
+
+	}
+
+	public static ComponentInstanceReqDetails getComponentInstance(Component compInstOriginDetails) {
+		String compInstName = (compInstOriginDetails.getName() != null ? compInstOriginDetails.getName() : "componentInstanceName");
+		String compInsUid = compInstOriginDetails.getUniqueId();
+		ComponentInstanceReqDetails componentInstanceDetails = new ComponentInstanceReqDetails(compInsUid, RESOURCE_INSTANCE_DESCRIPTION, RESOURCE_INSTANCE_POS_X, RESOURCE_INSTANCE_POS_Y, compInstName, compInstOriginDetails.getComponentType() == ComponentTypeEnum.SERVICE ? OriginTypeEnum.ServiceProxy.name() : null);
+		return componentInstanceDetails;
+
+	}
+
+	//********ServiceFilter**********
+    public static ServiceFilterDetails getDefaultEqualOperatorFilter(String propertyName, String valueString) {
+        return new ServiceFilterDetails(propertyName, "equal", "static", "static", valueString);
+    }
+
+    public static ServiceFilterDetails getDefaultFilter(String propertyName, String valueString,
+                                                                    String operator) {
+        return new ServiceFilterDetails(propertyName, operator, "static", "static", valueString);
+    }
+
+	// ******* USER **********************
+	public static User getDefaultUser(UserRoleEnum userRole) {
+		User sdncModifierDetails = new User();
+		sdncModifierDetails.setUserId(userRole.getUserId());
+		sdncModifierDetails.setFirstName(userRole.getFirstName());
+		sdncModifierDetails.setLastName(userRole.getLastName());
+		return sdncModifierDetails;
+	}
+
+	public static User getDefaultMechUser() {
+		User sdncMechUserDetails = new User();
+		sdncMechUserDetails.setUserId("m12345");
+		sdncMechUserDetails.setFirstName("Fishi");
+		sdncMechUserDetails.setLastName("Shifi");
+		sdncMechUserDetails.setEmail("mechId@intl.sdc.com");
+		sdncMechUserDetails.setRole("DESIGNER");
+		return sdncMechUserDetails;
+	}
+
+	// ******* CONSUMER **********************
+
+	public static ConsumerDataDefinition getDefaultConsumerDetails() {
+		ConsumerDataDefinition consumer = new ConsumerDataDefinition();
+		consumer.setConsumerName("ci");
+		consumer.setConsumerSalt("2a1f887d607d4515d4066fe0f5452a50");
+		consumer.setConsumerPassword("0a0dc557c3bf594b1a48030e3e99227580168b21f44e285c69740b8d5b13e33b");
+		return consumer;
+	}
+
+	// *** ARTIFACT ***
+	public static ArtifactReqDetails getDefaultArtifact() throws IOException, Exception {
+		return getDefaultArtifact(DEFAULT_ARTIFACT_LABEL);
+	}
+
+	public static ArtifactReqDetails getDefaultArtifact(String artifactLabel) throws IOException, Exception {
+		List<String> artifactTypes = ResponseParser.getValuesFromJsonArray(ArtifactRestUtils.getArtifactTypesList());
+		String artifactType = artifactTypes.get(0);
+
+		return getDefaultArtifact(artifactLabel, artifactType);
+	}
+
+	public static ArtifactReqDetails getDefaultArtifact(String artifactLabel, String artifactType) throws IOException, Exception {
+
+		String artifactName = "testArtifact.sh";
+		String artifactDescription = "descriptionTest";
+		String payloadData = "dGVzdA=="; // content of file
+
+		ArtifactReqDetails artifactDetails = new ArtifactReqDetails(artifactName, artifactType, artifactDescription, payloadData, artifactLabel);
+		artifactDetails.setUrl("");
+		artifactDetails.setArtifactDisplayName(artifactLabel);
+		return artifactDetails;
+	}
+
+	public static ArtifactReqDetails getServiceApiArtifactDetails(String artifactLabel) throws IOException, Exception {
+		ArtifactReqDetails defaultArtifact = getDefaultArtifact(artifactLabel, "OTHER");
+		defaultArtifact.setUrl("http://www.apple.com");
+		defaultArtifact.setServiceApi(true);
+		defaultArtifact.setArtifactDisplayName(StringUtils.capitalize(defaultArtifact.getArtifactLabel()));
+		return defaultArtifact;
+	}
+
+	public static ArtifactReqDetails getDefaultDeploymentArtifactForType(String artifactType) throws IOException, Exception {
+		return getArtifactByType(DEFAULT_ARTIFACT_LABEL, artifactType, true, false);
+	}
+
+	public static ArtifactReqDetails getArtifactByType(ArtifactTypeEnum artifactLabel, ArtifactTypeEnum artifactType, Boolean deploymentTrue) throws IOException, Exception {
+		return getArtifactByType(DEFAULT_ARTIFACT_LABEL, artifactType.toString(), deploymentTrue, false);
+
+	}
+
+	public static ArtifactReqDetails getArtifactByType(String artifactLabel, String artifactType, Boolean deploymentTrue, Boolean updatedPayload) throws IOException, Exception {
+		String artifactName;
+		String updatedPayloadData =null;
+		String payloadData = null;
+		Integer timeout = null;
+		String url = "";
+		String artifactDescription = "descriptionTest";
+
+		// PLEASE NOTE!!!
+		// The non-default payloads here are real ones according to various
+		// types validations,
+		// Please don't change them unless you know what you are doing!
+
+		ArtifactTypeEnum artifactTypeEnum = ArtifactTypeEnum.findType(artifactType);
+
+		/*
+		 * Missing file type: DCAE_JSON
+		 */
+		switch (artifactTypeEnum) {
+		case DCAE_INVENTORY_TOSCA:
+		case DCAE_EVENT:
+		case APPC_CONFIG:
+		case DCAE_DOC:
+		case DCAE_TOSCA:
+		case HEAT:
+		case HEAT_NET:
+		case HEAT_VOL: {
+			artifactName = generateUUIDforSufix() + artifactType + "_install_apache2.yaml";
+			payloadData = "aGVhdF90ZW1wbGF0ZV92ZXJzaW9uOiAyMDEzLTA1LTIzDQoNCmRlc2NyaXB0aW9uOiBTaW1wbGUgdGVtcGxhdGUgdG8gZGVwbG95IGEgc3RhY2sgd2l0aCB0d28gdmlydHVhbCBtYWNoaW5lIGluc3RhbmNlcw0KDQpwYXJhbWV0ZXJzOg0KICBpbWFnZV9uYW1lXzE6DQogICAgdHlwZTogc3RyaW5nDQogICAgbGFiZWw6IEltYWdlIE5hbWUNCiAgICBkZXNjcmlwdGlvbjogU0NPSU1BR0UgU3BlY2lmeSBhbiBpbWFnZSBuYW1lIGZvciBpbnN0YW5jZTENCiAgICBkZWZhdWx0OiBjaXJyb3MtMC4zLjEteDg2XzY0DQogIGltYWdlX25hbWVfMjoNCiAgICB0eXBlOiBzdHJpbmcNCiAgICBsYWJlbDogSW1hZ2UgTmFtZQ0KICAgIGRlc2NyaXB0aW9uOiBTQ09JTUFHRSBTcGVjaWZ5IGFuIGltYWdlIG5hbWUgZm9yIGluc3RhbmNlMg0KICAgIGRlZmF1bHQ6IGNpcnJvcy0wLjMuMS14ODZfNjQNCiAgbmV0d29ya19pZDoNCiAgICB0eXBlOiBzdHJpbmcNCiAgICBsYWJlbDogTmV0d29yayBJRA0KICAgIGRlc2NyaXB0aW9uOiBTQ09ORVRXT1JLIE5ldHdvcmsgdG8gYmUgdXNlZCBmb3IgdGhlIGNvbXB1dGUgaW5zdGFuY2UNCiAgICBoaWRkZW46IHRydWUNCiAgICBjb25zdHJhaW50czoNCiAgICAgIC0gbGVuZ3RoOiB7IG1pbjogNiwgbWF4OiA4IH0NCiAgICAgICAgZGVzY3JpcHRpb246IFBhc3N3b3JkIGxlbmd0aCBtdXN0IGJlIGJldHdlZW4gNiBhbmQgOCBjaGFyYWN0ZXJzLg0KICAgICAgLSByYW5nZTogeyBtaW46IDYsIG1heDogOCB9DQogICAgICAgIGRlc2NyaXB0aW9uOiBSYW5nZSBkZXNjcmlwdGlvbg0KICAgICAgLSBhbGxvd2VkX3ZhbHVlczoNCiAgICAgICAgLSBtMS5zbWFsbA0KICAgICAgICAtIG0xLm1lZGl1bQ0KICAgICAgICAtIG0xLmxhcmdlDQogICAgICAgIGRlc2NyaXB0aW9uOiBBbGxvd2VkIHZhbHVlcyBkZXNjcmlwdGlvbg0KICAgICAgLSBhbGxvd2VkX3BhdHRlcm46ICJbYS16QS1aMC05XSsiDQogICAgICAgIGRlc2NyaXB0aW9uOiBQYXNzd29yZCBtdXN0IGNvbnNpc3Qgb2YgY2hhcmFjdGVycyBhbmQgbnVtYmVycyBvbmx5Lg0KICAgICAgLSBhbGxvd2VkX3BhdHRlcm46ICJbQS1aXStbYS16QS1aMC05XSoiDQogICAgICAgIGRlc2NyaXB0aW9uOiBQYXNzd29yZCBtdXN0IHN0YXJ0IHdpdGggYW4gdXBwZXJjYXNlIGNoYXJhY3Rlci4NCiAgICAgIC0gY3VzdG9tX2NvbnN0cmFpbnQ6IG5vdmEua2V5cGFpcg0KICAgICAgICBkZXNjcmlwdGlvbjogQ3VzdG9tIGRlc2NyaXB0aW9uDQoNCnJlc291cmNlczoNCiAgbXlfaW5zdGFuY2UxOg0KICAgIHR5cGU6IE9TOjpOb3ZhOjpTZXJ2ZXINCiAgICBwcm9wZXJ0aWVzOg0KICAgICAgaW1hZ2U6IHsgZ2V0X3BhcmFtOiBpbWFnZV9uYW1lXzEgfQ0KICAgICAgZmxhdm9yOiBtMS5zbWFsbA0KICAgICAgbmV0d29ya3M6DQogICAgICAgIC0gbmV0d29yayA6IHsgZ2V0X3BhcmFtIDogbmV0d29ya19pZCB9DQogIG15X2luc3RhbmNlMjoNCiAgICB0eXBlOiBPUzo6Tm92YTo6U2VydmVyDQogICAgcHJvcGVydGllczoNCiAgICAgIGltYWdlOiB7IGdldF9wYXJhbTogaW1hZ2VfbmFtZV8yIH0NCiAgICAgIGZsYXZvcjogbTEudGlueQ0KICAgICAgbmV0d29ya3M6DQogICAgICAgIC0gbmV0d29yayA6IHsgZ2V0X3BhcmFtIDogbmV0d29ya19pZCB9";
+			updatedPayloadData = "dG9zY2FfZGVmaW5pdGlvbnNfdmVyc2lvbjogdG9zY2Ffc2ltcGxlX3lhbWxfMV8wXzANCg0Kbm9kZV90eXBlczoNCiAgY29tLmF0dC5kMi5yZXNvdXJjZS5jcC5DUDoNCiAgICBkZXJpdmVkX2Zyb206IHRvc2NhLm5vZGVzLm5ldHdvcmsuUG9ydA0KICAgIHByb3BlcnRpZXM6DQogICAgICBpc190YWdnZWQ6DQogICAgICAgIHR5cGU6IGJvb2xlYW4NCiAgICAgICAgcmVxdWlyZWQ6IGZhbHNlDQogICAgICAgIGRlZmF1bHQ6IGZhbHNlDQogICAgICAgIGRlc2NyaXB0aW9uOiANCg0KICAgIHJlcXVpcmVtZW50czoNCiAgICAgIC0gdmlydHVhbExpbms6DQogICAgICAgICAgY2FwYWJpbGl0eTogdG9zY2EuY2FwYWJpbGl0aWVzLm5ldHdvcmsuTGlua2FibGUNCiAgICAgICAgICByZWxhdGlvbnNoaXA6IHRvc2NhLnJlbGF0aW9uc2hpcHMubmV0d29yay5MaW5rc1RvDQogICAgICAtIHZpcnR1YWxCaW5kaW5nOg0KICAgICAgICAgIGNhcGFiaWxpdHk6IHRvc2NhLmNhcGFiaWxpdGllcy5uZXR3b3JrLkJpbmRhYmxlDQogICAgICAgICAgcmVsYXRpb25zaGlwOiB0b3NjYS5yZWxhdGlvbnNoaXBzLm5ldHdvcmsuQmluZHNUbw0KICAgIGNhcGFiaWxpdGllczoNCiAgICAgIGF0dGFjaG1lbnQ6DQogICAgICAgIHR5cGU6IHRvc2NhLmNhcGFiaWxpdGllcy5BdHRhY2htZW50DQogICAgICAgIG9jY3VycmVuY2VzOg0KICAgICAgICAtIDENCiAgICAgICAgLSBVTkJPVU5ERUQNCiAgICAgICAgdHlwZTogdG9zY2EuY2FwYWJpbGl0aWVzLm5ldHdvcmsuQmluZGFibGUNCiAgICAgICAgb2NjdXJyZW5jZXM6DQogICAgICAgIC0gMQ0KICAgICAgICAtIFVOQk9VTkRFRA0KICAgICAgdmlydHVhbF9saW5rYWJsZToNCiAgICAgICAgdHlwZTogY29tLmF0dC5kMi5jYXBhYmlsaXRpZXMuTWV0cmljDQogICAgICBlbmRfcG9pbnQ6DQogICAgICAgIHR5cGU6IHRvc2NhLmNhcGFiaWxpdGllcy5FbmRwb2ludCAgICAgICA=";
+			timeout = 60;
+			artifactLabel = normalizeArtifactLabel(artifactName);
+			break;
+		}
+		case DCAE_INVENTORY_POLICY:
+		case DCAE_INVENTORY_BLUEPRINT:
+		case DCAE_INVENTORY_EVENT: {
+			artifactName = getDcaeArtifactName(artifactTypeEnum, artifactType);
+			payloadData = "will be override later";
+			updatedPayloadData = "override";
+			timeout = 60;
+			artifactLabel = normalizeArtifactLabel(artifactName);
+			break;
+		}
+		case MURANO_PKG: {
+			artifactName = artifactType + "org.openstack.Rally.zip";
+			payloadData = "ODM4MTRjNzkxZjcwYTlkMjk4ZGQ2ODE4MThmNjg0N2Y=";
+			updatedPayloadData = "ODM4MTRjNzkxZjcwYTlkMjk4ZGQ2ODE4MThmMTAwN2Y=";
+			break;
+		}
+		case DCAE_POLICY: {
+			artifactName = artifactType + "dcae_policy.emf";
+			payloadData = "will be override later";
+			updatedPayloadData = "override";
+			break;
+		}
+		case DCAE_INVENTORY_JSON:
+		case DCAE_JSON: {
+			artifactName = artifactType + "dcae_policy.json";
+			payloadData = "ew0KICAiYXJ0aWZhY3RzIjogImRmc2FmIiwNCiAgIm5vcm1hbGl6ZWROYW1lIjogImNpc2VydmljZTBiYzY5ODk2OTQ4ZiIsDQogICJzeXN0ZW1OYW1lIjogIkNpc2VydmljZTBiYzY5ODk2OTQ4ZiIsDQogICJpbnZhcmlhbnRVVUlEIjogIjEzZmJkNzI3LWRjNzUtNDU1OS1iNzEyLWUwMjc5YmY4YTg2MSIsDQogICJhdHRDb250YWN0IjogImNzMDAwOCIsDQogICJuYW1lIjogImNpU2VydmljZTBiYzY5ODk2OTQ4ZiINCn0=";
+			updatedPayloadData = "ew0KICAiYXJ0aWZhY3RzIjogIjEyMzQzIiwNCiAgIm5vcm1hbGl6ZWROYW1lIjogIjU0MzUzNCIsDQogICJzeXN0ZW1OYW1lIjogIkNpc2VydmljZTBiYzY5ODk2OTQ4ZiIsDQogICJpbnZhcmlhbnRVVUlEIjogIjEzZmJkNzI3LWRjNzUtNDU1OS1iNzEyLWUwMjc5YmY4YTg2MSIsDQogICJhdHRDb250YWN0IjogImNzMDAwOCIsDQogICJuYW1lIjogImNpU2VydmljZTBiYzY5ODk2OTQ4ZiINCn0=";
+			break;
+		}
+		case PUPPET:
+		case CHEF:
+		case DG_XML:
+		case YANG: {
+			artifactName = generateUUIDforSufix() + artifactType + "yangXml.xml";
+			payloadData = "PD94bWwgdmVyc2lvbj0iMS4wIj8+DQo8ZGF0YT4NCiAgPHNwb3J0cz4NCiAgICA8cGVyc29uPg0KICAgICAgPG5hbWU+TGlvbmVsIEFuZHJlcyBNZXNzaTwvbmFtZT4NCiAgICAgIDxiaXJ0aGRheT4xOTg3LTA2LTI0VDAwOjAwOjAwLTAwOjAwPC9iaXJ0aGRheT4NCiAgICA8L3BlcnNvbj4NCiAgICA8cGVyc29uPg0KICAgICAgPG5hbWU+Q3Jpc3RpYW5vIFJvbmFsZG88L25hbWU+DQogICAgICA8YmlydGhkYXk+MTk4NS0wMi0wNVQwMDowMDowMC0wMDowMDwvYmlydGhkYXk+DQogICAgPC9wZXJzb24+DQogICAgPHRlYW0+DQogICAgICA8bmFtZT5GQyBCYXJjZWxvbmE8L25hbWU+DQogICAgICA8cGxheWVyPg0KICAgICAgICA8bmFtZT5MaW9uZWwgQW5kcmVzIE1lc3NpPC9uYW1lPg0KICAgICAgICA8c2Vhc29uPkNoYW1waW9ucyBMZWFndWUgMjAxNC0yMDE1PC9zZWFzb24+DQogICAgICAgIDxudW1iZXI+MTA8L251bWJlcj4NCiAgICAgICAgPHNjb3Jlcz40Mzwvc2NvcmVzPg0KICAgICAgPC9wbGF5ZXI+DQogICAgPC90ZWFtPg0KICAgIDx0ZWFtPg0KICAgICAgPG5hbWU+UmVhbCBNYWRyaWQ8L25hbWU+DQogICAgICA8cGxheWVyPg0KICAgICAgICA8bmFtZT5DcmlzdGlhbm8gUm9uYWxkbzwvbmFtZT4NCiAgICAgICAgPHNlYXNvbj5DaGFtcGlvbnMgTGVhZ3VlIDIwMTQtMjAxNTwvc2Vhc29uPg0KICAgICAgICA8bnVtYmVyPjc8L251bWJlcj4NCiAgICAgICAgPHNjb3Jlcz40ODwvc2NvcmVzPg0KICAgICAgPC9wbGF5ZXI+DQogICAgPC90ZWFtPg0KICA8L3Nwb3J0cz4NCg0KPC9kYXRhPg==";
+			updatedPayloadData = "PD94bWwgdmVyc2lvbj0iMS4wIj8+DQo8ZGF0YT4NCiAgPHNwb3J0cz4NCiAgICA8cGVyc29uPg0KICAgICAgPG5hbWU+TGlvbmVsIEFuZHJlcyBNZXNzaTwvbmFtZT4NCiAgICAgIDxiaXJ0aGRheT4xOTkwLTA2LTI0VDAwOjAwOjAwLTAwOjExPC9iaXJ0aGRheT4NCiAgICA8L3BlcnNvbj4NCiAgICA8cGVyc29uPg0KICAgICAgPG5hbWU+Q3Jpc3RpYW5vIFJvbmFsZG88L25hbWU+DQogICAgICA8YmlydGhkYXk+MTk4NS0wMi0wNVQwMDowMDowMC0wMDowMDwvYmlydGhkYXk+DQogICAgPC9wZXJzb24+DQogICAgPHRlYW0+DQogICAgICA8bmFtZT5GQyBCYXJjZWxvbmE8L25hbWU+DQogICAgICA8cGxheWVyPg0KICAgICAgICA8bmFtZT5MaW9uZWwgQW5kcmVzIE1lc3NpPC9uYW1lPg0KICAgICAgICA8c2Vhc29uPkNoYW1waW9ucyBMZWFndWUgMjAxNC0yMDE1PC9zZWFzb24+DQogICAgICAgIDxudW1iZXI+MTA8L251bWJlcj4NCiAgICAgICAgPHNjb3Jlcz40Mzwvc2NvcmVzPg0KICAgICAgPC9wbGF5ZXI+DQogICAgPC90ZWFtPg0KICAgIDx0ZWFtPg0KICAgICAgPG5hbWU+UmVhbCBNYWRyaWQ8L25hbWU+DQogICAgICA8cGxheWVyPg0KICAgICAgICA8bmFtZT5DcmlzdGlhbm8gUm9uYWxkbzwvbmFtZT4NCiAgICAgICAgPHNlYXNvbj5DaGFtcGlvbnMgTGVhZ3VlIDIwMTQtMjAxNTwvc2Vhc29uPg0KICAgICAgICA8bnVtYmVyPjc8L251bWJlcj4NCiAgICAgICAgPHNjb3Jlcz40ODwvc2NvcmVzPg0KICAgICAgPC9wbGF5ZXI+DQogICAgPC90ZWFtPg0KICA8L3Nwb3J0cz4NCg0KPC9kYXRhPg==";
+			timeout = 15;
+			artifactLabel = normalizeArtifactLabel(artifactName);
+			break;
+		}
+		case VF_LICENSE:
+		case VENDOR_LICENSE:
+		case MODEL_INVENTORY_PROFILE:
+		case MODEL_QUERY_SPEC:
+		case VNF_CATALOG:
+		case YANG_XML: {
+			artifactName = generateUUIDforSufix() + artifactType + "yangXml.xml";
+			payloadData = "PD94bWwgdmVyc2lvbj0iMS4wIj8+DQo8ZGF0YT4NCiAgPHNwb3J0cz4NCiAgICA8cGVyc29uPg0KICAgICAgPG5hbWU+TGlvbmVsIEFuZHJlcyBNZXNzaTwvbmFtZT4NCiAgICAgIDxiaXJ0aGRheT4xOTg3LTA2LTI0VDAwOjAwOjAwLTAwOjAwPC9iaXJ0aGRheT4NCiAgICA8L3BlcnNvbj4NCiAgICA8cGVyc29uPg0KICAgICAgPG5hbWU+Q3Jpc3RpYW5vIFJvbmFsZG88L25hbWU+DQogICAgICA8YmlydGhkYXk+MTk4NS0wMi0wNVQwMDowMDowMC0wMDowMDwvYmlydGhkYXk+DQogICAgPC9wZXJzb24+DQogICAgPHRlYW0+DQogICAgICA8bmFtZT5GQyBCYXJjZWxvbmE8L25hbWU+DQogICAgICA8cGxheWVyPg0KICAgICAgICA8bmFtZT5MaW9uZWwgQW5kcmVzIE1lc3NpPC9uYW1lPg0KICAgICAgICA8c2Vhc29uPkNoYW1waW9ucyBMZWFndWUgMjAxNC0yMDE1PC9zZWFzb24+DQogICAgICAgIDxudW1iZXI+MTA8L251bWJlcj4NCiAgICAgICAgPHNjb3Jlcz40Mzwvc2NvcmVzPg0KICAgICAgPC9wbGF5ZXI+DQogICAgPC90ZWFtPg0KICAgIDx0ZWFtPg0KICAgICAgPG5hbWU+UmVhbCBNYWRyaWQ8L25hbWU+DQogICAgICA8cGxheWVyPg0KICAgICAgICA8bmFtZT5DcmlzdGlhbm8gUm9uYWxkbzwvbmFtZT4NCiAgICAgICAgPHNlYXNvbj5DaGFtcGlvbnMgTGVhZ3VlIDIwMTQtMjAxNTwvc2Vhc29uPg0KICAgICAgICA8bnVtYmVyPjc8L251bWJlcj4NCiAgICAgICAgPHNjb3Jlcz40ODwvc2NvcmVzPg0KICAgICAgPC9wbGF5ZXI+DQogICAgPC90ZWFtPg0KICA8L3Nwb3J0cz4NCg0KPC9kYXRhPg==";
+			updatedPayloadData = "PD94bWwgdmVyc2lvbj0iMS4wIj8+DQo8ZGF0YT4NCiAgPHNwb3J0cz4NCiAgICA8cGVyc29uPg0KICAgICAgPG5hbWU+TGlvbmVsIEFuZHJlcyBNZXNzaTwvbmFtZT4NCiAgICAgIDxiaXJ0aGRheT4xOTkwLTA2LTI0VDAwOjAwOjAwLTAwOjExPC9iaXJ0aGRheT4NCiAgICA8L3BlcnNvbj4NCiAgICA8cGVyc29uPg0KICAgICAgPG5hbWU+Q3Jpc3RpYW5vIFJvbmFsZG88L25hbWU+DQogICAgICA8YmlydGhkYXk+MTk4NS0wMi0wNVQwMDowMDowMC0wMDowMDwvYmlydGhkYXk+DQogICAgPC9wZXJzb24+DQogICAgPHRlYW0+DQogICAgICA8bmFtZT5GQyBCYXJjZWxvbmE8L25hbWU+DQogICAgICA8cGxheWVyPg0KICAgICAgICA8bmFtZT5MaW9uZWwgQW5kcmVzIE1lc3NpPC9uYW1lPg0KICAgICAgICA8c2Vhc29uPkNoYW1waW9ucyBMZWFndWUgMjAxNC0yMDE1PC9zZWFzb24+DQogICAgICAgIDxudW1iZXI+MTA8L251bWJlcj4NCiAgICAgICAgPHNjb3Jlcz40Mzwvc2NvcmVzPg0KICAgICAgPC9wbGF5ZXI+DQogICAgPC90ZWFtPg0KICAgIDx0ZWFtPg0KICAgICAgPG5hbWU+UmVhbCBNYWRyaWQ8L25hbWU+DQogICAgICA8cGxheWVyPg0KICAgICAgICA8bmFtZT5DcmlzdGlhbm8gUm9uYWxkbzwvbmFtZT4NCiAgICAgICAgPHNlYXNvbj5DaGFtcGlvbnMgTGVhZ3VlIDIwMTQtMjAxNTwvc2Vhc29uPg0KICAgICAgICA8bnVtYmVyPjc8L251bWJlcj4NCiAgICAgICAgPHNjb3Jlcz40ODwvc2NvcmVzPg0KICAgICAgPC9wbGF5ZXI+DQogICAgPC90ZWFtPg0KICA8L3Nwb3J0cz4NCg0KPC9kYXRhPg==";
+			timeout = 0;
+			artifactLabel = normalizeArtifactLabel(artifactName);
+			break;
+		}
+		case SNMP_POLL:
+		case SNMP_TRAP:
+		case DCAE_INVENTORY_DOC:
+		case GUIDE:
+		case OTHER: {
+			artifactName = generateUUIDforSufix() + artifactType + "other.pdf";
+			payloadData = "aGVhdF90ZW1wbGF0ZV92ZXJzaW9uOiAyMDEzLTA1LTIzDQoNCmRlc2NyaXB0aW9uOiBTaW1wbGUgdGVtcGxhdGUgdG8gZGVwbG95IGEgc3RhY2sgd2l0aCB0d28gdmlydHVhbCBtYWNoaW5lIGluc3RhbmNlcw0KDQpwYXJhbWV0ZXJzOg0KICBpbWFnZV9uYW1lXzE6DQogICAgdHlwZTogc3RyaW5nDQogICAgbGFiZWw6IEltYWdlIE5hbWUNCiAgICBkZXNjcmlwdGlvbjogU0NPSU1BR0UgU3BlY2lmeSBhbiBpbWFnZSBuYW1lIGZvciBpbnN0YW5jZTENCiAgICBkZWZhdWx0OiBjaXJyb3MtMC4zLjEteDg2XzY0DQogIGltYWdlX25hbWVfMjoNCiAgICB0eXBlOiBzdHJpbmcNCiAgICBsYWJlbDogSW1hZ2UgTmFtZQ0KICAgIGRlc2NyaXB0aW9uOiBTQ09JTUFHRSBTcGVjaWZ5IGFuIGltYWdlIG5hbWUgZm9yIGluc3RhbmNlMg0KICAgIGRlZmF1bHQ6IGNpcnJvcy0wLjMuMS14ODZfNjQNCiAgbmV0d29ya19pZDoNCiAgICB0eXBlOiBzdHJpbmcNCiAgICBsYWJlbDogTmV0d29yayBJRA0KICAgIGRlc2NyaXB0aW9uOiBTQ09ORVRXT1JLIE5ldHdvcmsgdG8gYmUgdXNlZCBmb3IgdGhlIGNvbXB1dGUgaW5zdGFuY2UNCiAgICBoaWRkZW46IHRydWUNCiAgICBjb25zdHJhaW50czoNCiAgICAgIC0gbGVuZ3RoOiB7IG1pbjogNiwgbWF4OiA4IH0NCiAgICAgICAgZGVzY3JpcHRpb246IFBhc3N3b3JkIGxlbmd0aCBtdXN0IGJlIGJldHdlZW4gNiBhbmQgOCBjaGFyYWN0ZXJzLg0KICAgICAgLSByYW5nZTogeyBtaW46IDYsIG1heDogOCB9DQogICAgICAgIGRlc2NyaXB0aW9uOiBSYW5nZSBkZXNjcmlwdGlvbg0KICAgICAgLSBhbGxvd2VkX3ZhbHVlczoNCiAgICAgICAgLSBtMS5zbWFsbA0KICAgICAgICAtIG0xLm1lZGl1bQ0KICAgICAgICAtIG0xLmxhcmdlDQogICAgICAgIGRlc2NyaXB0aW9uOiBBbGxvd2VkIHZhbHVlcyBkZXNjcmlwdGlvbg0KICAgICAgLSBhbGxvd2VkX3BhdHRlcm46ICJbYS16QS1aMC05XSsiDQogICAgICAgIGRlc2NyaXB0aW9uOiBQYXNzd29yZCBtdXN0IGNvbnNpc3Qgb2YgY2hhcmFjdGVycyBhbmQgbnVtYmVycyBvbmx5Lg0KICAgICAgLSBhbGxvd2VkX3BhdHRlcm46ICJbQS1aXStbYS16QS1aMC05XSoiDQogICAgICAgIGRlc2NyaXB0aW9uOiBQYXNzd29yZCBtdXN0IHN0YXJ0IHdpdGggYW4gdXBwZXJjYXNlIGNoYXJhY3Rlci4NCiAgICAgIC0gY3VzdG9tX2NvbnN0cmFpbnQ6IG5vdmEua2V5cGFpcg0KICAgICAgICBkZXNjcmlwdGlvbjogQ3VzdG9tIGRlc2NyaXB0aW9uDQoNCnJlc291cmNlczoNCiAgbXlfaW5zdGFuY2UxOg0KICAgIHR5cGU6IE9TOjpOb3ZhOjpTZXJ2ZXINCiAgICBwcm9wZXJ0aWVzOg0KICAgICAgaW1hZ2U6IHsgZ2V0X3BhcmFtOiBpbWFnZV9uYW1lXzEgfQ0KICAgICAgZmxhdm9yOiBtMS5zbWFsbA0KICAgICAgbmV0d29ya3M6DQogICAgICAgIC0gbmV0d29yayA6IHsgZ2V0X3BhcmFtIDogbmV0d29ya19pZCB9DQogIG15X2luc3RhbmNlMjoNCiAgICB0eXBlOiBPUzo6Tm92YTo6U2VydmVyDQogICAgcHJvcGVydGllczoNCiAgICAgIGltYWdlOiB7IGdldF9wYXJhbTogaW1hZ2VfbmFtZV8yIH0NCiAgICAgIGZsYXZvcjogbTEudGlueQ0KICAgICAgbmV0d29ya3M6DQogICAgICAgIC0gbmV0d29yayA6IHsgZ2V0X3BhcmFtIDogbmV0d29ya19pZCB9";
+			updatedPayloadData = "aGVhdF90ZW1wbGF0ZV92ZXJzaW9uOiAyMDE2LTA1LTIzDQoNCmRlc2NyaXB0aW9uOiBTaW1wbGUgdGVtcGxhdGRzYWRzYWRzYWUgdG8gZGVwbG95IGEgc3RhY2sgd2l0aCB0d28gdmlydHVhbCBtYWNoaW5lIGluc3RhbmNlcw0KDQpwYXJhbWV0ZXJzOg0KICBpbWFnZV9uYW1lXzE6DQogICAgdHlwZTogc3RyaW5nDQogICAgbGFiZWw6IEltYWdlIE5hbWUNCiAgICBkZXNjcmlwdGlvbjogU0NPSU1BR0UgU3BlY2lmeSBhbiBpbWFkc2FkYXN3Z2UgbmFtZSBmb3IgaW5zdGFuY2UxDQogICAgZGVmYXVsdDogY2lycm9zLTAuMy4xLXg4Nl82NA0KICBpbWFnZV9uYW1lXzI6DQogICAgdHlwZTogc3RyaW5nDQogICAgbGFiZWw6IEltYWdlIE5hbWUNCiAgICBkZXNjcmlwdGlvbjogU0NPSU1BR0UgU3BlY2lmeSBhbiBpbWFnZSBuYW1lIGZvciBpbnN0YW5jZTINCiAgICBkZWZhdWx0OiBjaXJyb3MtMC4zLjEteDg2XzY0DQogIG5ldHdvcmtfaWQ6DQogICAgdHlwZTogc3RyaW5nDQogICAgbGFiZWw6IE5ldHdvcmsgSUQNCiAgICBkZXNjcmlwdGlvbjogU0NPTkVUV09SSyBOZXR3b3JrIHRvIGJlIHVzZWQgZm9yIHRoZSBjb21wdXRlIGluc3RhbmNlDQogICAgaGlkZGVuOiB0cnVlDQogICAgY29uc3RyYWludHM6DQogICAgICAtIGxlbmd0aDogeyBtaW46IDYsIG1heDogOCB9DQogICAgICAgIGRlc2NyaXB0aW9uOiBQYXNzd29yZCBsZW5ndGggbXVzdCBiZSBiZXR3ZWVuIDYgYW5kIDggY2hhcmFjdGVycy4NCiAgICAgIC0gcmFuZ2U6IHsgbWluOiA2LCBtYXg6IDggfQ0KICAgICAgICBkZXNjcmlwdGlvbjogUmFuZ2UgZGVzY3JpcHRpb24NCiAgICAgIC0gYWxsb3dlZF92YWx1ZXM6DQogICAgICAgIC0gbTEuc21hbGwNCiAgICAgICAgLSBtMS5tZWRpdW0NCiAgICAgICAgLSBtMS5sYXJnZQ0KICAgICAgICBkZXNjcmlwdGlvbjogQWxsb3dlZCB2YWx1ZXMgZGVzY3JpcHRpb24NCiAgICAgIC0gYWxsb3dlZF9wYXR0ZXJuOiAiW2EtekEtWjAtOV0rIg0KICAgICAgICBkZXNjcmlwdGlvbjogUGFzc3dvcmQgbXVzdCBjb25zaXN0IG9mIGNoYXJhY3RlcnMgYW5kIG51bWJlcnMgb25seS4NCiAgICAgIC0gYWxsb3dlZF9wYXR0ZXJuOiAiW0EtWl0rW2EtekEtWjAtOV0qIg0KICAgICAgICBkZXNjcmlwdGlvbjogUGFzc3dvcmQgbXVzdCBzdGFydCB3aXRoIGFuIHVwcGVyY2FzZSBjaGFyYWN0ZXIuDQogICAgICAtIGN1c3RvbV9jb25zdHJhaW50OiBub3ZhLmtleXBhaXINCiAgICAgICAgZGVzY3JpcHRpb246IEN1c3RvbSBkZXNjcmlwdGlvbg0KDQpyZXNvdXJjZXM6DQogIG15X2luc3RhbmNlMToNCiAgICB0eXBlOiBPUzo6Tm92YTo6U2VydmVyDQogICAgcHJvcGVydGllczoNCiAgICAgIGltYWdlOiB7IGdldF9wYXJhbTogaW1hZ2VfbmFtZV8xIH0NCiAgICAgIGZsYXZvcjogbTEuc21hbGwNCiAgICAgIG5ldHdvcmtzOg0KICAgICAgICAtIG5ldHdvcmsgOiB7IGdldF9wYXJhbSA6IG5ldHdvcmtfaWQgfQ0KICBteV9pbnN0YW5jZTI6DQogICAgdHlwZTogT1M6Ok5vdmE6OlNlcnZlcg0KICAgIHByb3BlcnRpZXM6DQogICAgICBpbWFnZTogeyBnZXRfcGFyYW06IGltYWdlX25hbWVfMiB9DQogICAgICBmbGF2b3I6IG0xLnRpbnkNCiAgICAgIG5ldHdvcmtzOg0KICAgICAgICAtIG5ldHdvcmsgOiB7IGdldF9wYXJhbSA6IG5ldHdvcmtfaWQgfQ";
+			timeout = 0;
+			artifactLabel = normalizeArtifactLabel(artifactName);
+			break;
+		}
+		case SHELL_SCRIPT:
+		default: {// dummy
+			artifactName = generateUUIDforSufix() + "testArtifact.sh";
+			payloadData = "dGVzdA==";
+			updatedPayloadData = "YmVzYg==";
+			artifactLabel = normalizeArtifactLabel(artifactName);
+			break;
+		}
+		}
+		artifactLabel = normalizeArtifactLabel("ci" + artifactName);
+		
+		ArtifactReqDetails artifactDetails = null;
+		
+		if (!updatedPayload){
+		artifactDetails = new ArtifactReqDetails(artifactName, artifactType, artifactDescription, payloadData, artifactLabel);
+		}
+		else artifactDetails = new ArtifactReqDetails(artifactName, artifactType, artifactDescription,
+				updatedPayloadData, artifactLabel);
+		
+		artifactDetails.setArtifactGroupType(ArtifactGroupTypeEnum.DEPLOYMENT.getType());
+		artifactDetails.setUrl(url);
+		artifactDetails.setTimeout(timeout);
+		artifactDetails.setArtifactDisplayName(artifactLabel);
+		return artifactDetails;
+	}
+
+	private static String getDcaeArtifactName(ArtifactTypeEnum artifactTypeEnum, String artifactType) {
+		String artifactName = null;
+		switch (artifactTypeEnum) {
+		case DCAE_INVENTORY_TOSCA: {
+			artifactName = generateUUIDforSufix() + artifactType + "_toscaSampleArtifact.yml";
+			break;
+		}
+		case DCAE_INVENTORY_JSON: {
+			artifactName = generateUUIDforSufix() + artifactType + "_jsonSampleArtifact.json";
+			break;
+		}
+		case DCAE_INVENTORY_POLICY: {
+			artifactName = generateUUIDforSufix() + artifactType + "_emfSampleArtifact.emf";
+			break;
+		}
+		case DCAE_INVENTORY_DOC: {
+			artifactName = generateUUIDforSufix() + artifactType + "_docSampleArtifact.doc";
+			break;
+		}
+		case DCAE_INVENTORY_BLUEPRINT: {
+			artifactName = generateUUIDforSufix() + artifactType + "_bluePrintSampleArtifact.xml";
+			break;
+		}
+		case DCAE_INVENTORY_EVENT: {
+			artifactName = generateUUIDforSufix() + artifactType + "_eventSampleArtifact.xml";
+			break;
+		}
+		}
+		return artifactName;
+	}
+
+	// ---------------------Audit message------------------
+	public static ExpectedResourceAuditJavaObject getDefaultImportResourceAuditMsgSuccess() {
+
+		ExpectedResourceAuditJavaObject expectedResourceAuditJavaObject = new ExpectedResourceAuditJavaObject();
+		expectedResourceAuditJavaObject.setAction(AuditingActionEnum.IMPORT_RESOURCE.getName());
+		expectedResourceAuditJavaObject.setResourceName("defaultImportResourceName.yaml");
+		expectedResourceAuditJavaObject.setResourceType("Resource");
+		expectedResourceAuditJavaObject.setPrevVersion("");
+		expectedResourceAuditJavaObject.setCurrVersion("0.1");
+		expectedResourceAuditJavaObject.setModifierName(ElementFactory.getDefaultUser(UserRoleEnum.DESIGNER).getFullName());
+		expectedResourceAuditJavaObject.setModifierUid(ElementFactory.getDefaultUser(UserRoleEnum.DESIGNER).getUserId());
+		expectedResourceAuditJavaObject.setPrevState("");
+		expectedResourceAuditJavaObject.setCurrState(LifecycleStateEnum.NOT_CERTIFIED_CHECKOUT.toString());
+		expectedResourceAuditJavaObject.setStatus("201");
+		expectedResourceAuditJavaObject.setDesc("OK");
+		expectedResourceAuditJavaObject.setToscaNodeType("");
+		return expectedResourceAuditJavaObject;
+
+	}
+
+	public static ExpectedResourceAuditJavaObject getDefaultImportResourceAuditMsgFailure(ErrorInfo errorInfo, List<String> variables) {
+
+		ExpectedResourceAuditJavaObject expectedResourceAuditJavaObject = new ExpectedResourceAuditJavaObject();
+		expectedResourceAuditJavaObject.setAction(AuditingActionEnum.IMPORT_RESOURCE.getName());
+		expectedResourceAuditJavaObject.setResourceName("");
+		expectedResourceAuditJavaObject.setResourceType("Resource");
+		expectedResourceAuditJavaObject.setPrevVersion("");
+		expectedResourceAuditJavaObject.setCurrVersion("");
+		expectedResourceAuditJavaObject.setModifierName(ElementFactory.getDefaultUser(UserRoleEnum.DESIGNER).getFullName());
+		expectedResourceAuditJavaObject.setModifierUid(ElementFactory.getDefaultUser(UserRoleEnum.DESIGNER).getUserId());
+		expectedResourceAuditJavaObject.setPrevState("");
+		expectedResourceAuditJavaObject.setCurrState("");
+		expectedResourceAuditJavaObject.setStatus(errorInfo.getCode().toString());
+		expectedResourceAuditJavaObject.setDesc(AuditValidationUtils.buildAuditDescription(errorInfo, variables));
+		expectedResourceAuditJavaObject.setToscaNodeType("");
+		return expectedResourceAuditJavaObject;
+
+	}
+
+	public static ExpectedResourceAuditJavaObject getDefaultCertificationRequestAuditMsgSuccess() {
+
+		ExpectedResourceAuditJavaObject expectedResourceAuditJavaObject = new ExpectedResourceAuditJavaObject();
+		expectedResourceAuditJavaObject.setAction(AuditingActionEnum.CERTIFICATION_REQUEST_RESOURCE.getName());
+		expectedResourceAuditJavaObject.setResourceName("defaultResourceName");
+		expectedResourceAuditJavaObject.setResourceType("Resource");
+		expectedResourceAuditJavaObject.setPrevVersion("");
+		expectedResourceAuditJavaObject.setCurrVersion("0.1");
+		expectedResourceAuditJavaObject.setModifierName(ElementFactory.getDefaultUser(UserRoleEnum.DESIGNER).getFullName());
+		expectedResourceAuditJavaObject.setModifierUid(ElementFactory.getDefaultUser(UserRoleEnum.DESIGNER).getUserId());
+		expectedResourceAuditJavaObject.setPrevState("");
+		expectedResourceAuditJavaObject.setCurrState(LifecycleStateEnum.NOT_CERTIFIED_CHECKOUT.toString());
+		expectedResourceAuditJavaObject.setStatus("200");
+		expectedResourceAuditJavaObject.setDesc("OK");
+		expectedResourceAuditJavaObject.setComment("");
+		return expectedResourceAuditJavaObject;
+
+	}
+
+	public static ExpectedResourceAuditJavaObject getDefaultCertificationRequestAuditMsgFailure(ErrorInfo errorInfo, List<String> variables) {
+
+		ExpectedResourceAuditJavaObject expectedResourceAuditJavaObject = new ExpectedResourceAuditJavaObject();
+		expectedResourceAuditJavaObject.setAction(AuditingActionEnum.CERTIFICATION_REQUEST_RESOURCE.getName());
+		expectedResourceAuditJavaObject.setResourceName("");
+		expectedResourceAuditJavaObject.setResourceType("Resource");
+		expectedResourceAuditJavaObject.setPrevVersion("0.1");
+		expectedResourceAuditJavaObject.setCurrVersion("0.1");
+		expectedResourceAuditJavaObject.setModifierName(ElementFactory.getDefaultUser(UserRoleEnum.DESIGNER).getFullName());
+		expectedResourceAuditJavaObject.setModifierUid(ElementFactory.getDefaultUser(UserRoleEnum.DESIGNER).getUserId());
+		expectedResourceAuditJavaObject.setPrevState(LifecycleStateEnum.NOT_CERTIFIED_CHECKOUT.toString());
+		expectedResourceAuditJavaObject.setCurrState(LifecycleStateEnum.NOT_CERTIFIED_CHECKOUT.toString());
+		expectedResourceAuditJavaObject.setStatus(errorInfo.getCode().toString());
+		expectedResourceAuditJavaObject.setDesc(AuditValidationUtils.buildAuditDescription(errorInfo, variables));
+		expectedResourceAuditJavaObject.setComment("");
+		return expectedResourceAuditJavaObject;
+
+	}
+
+	public static ExpectedExternalAudit getDefaultExternalAuditObject(AssetTypeEnum assetType, AuditingActionEnum action, String query) {
+
+		ExpectedExternalAudit expectedExternalAudit = new ExpectedExternalAudit();
+		expectedExternalAudit.setACTION(action.getName());
+		expectedExternalAudit.setCONSUMER_ID("ci");
+		expectedExternalAudit.setRESOURCE_URL("/sdc/v1/catalog/" + assetType.getValue() + (query == null ? "" : query));
+		expectedExternalAudit.setSTATUS("200");
+		expectedExternalAudit.setDESC("OK");
+		return expectedExternalAudit;
+
+	}
+
+	public static ExpectedExternalAudit getDefaultAssetListAudit(AssetTypeEnum assetType, AuditingActionEnum auditAction) {
+
+		// ExpectedExternalAudit expectedAssetListAuditJavaObject = new
+		// ExpectedExternalAudit();
+		ExpectedExternalAudit expectedAssetListAuditJavaObject = getDefaultExternalAuditObject(assetType, auditAction, null);
+		return expectedAssetListAuditJavaObject;
+
+	}
+
+	public static ExpectedExternalAudit getDefaultFilteredAssetListAudit(AssetTypeEnum assetType, String query) {
+
+		// ExpectedExternalAudit expectedAssetListAuditJavaObject = new
+		// ExpectedExternalAudit();
+		ExpectedExternalAudit expectedAssetListAuditJavaObject = getDefaultExternalAuditObject(assetType, AuditingActionEnum.GET_FILTERED_ASSET_LIST, query);
+		return expectedAssetListAuditJavaObject;
+
+	}
+
+	public static ExpectedExternalAudit getDefaultExternalArtifactAuditSuccess(AssetTypeEnum assetType, AuditingActionEnum action, ArtifactDefinition artifactDefinition, String componentUUID) {
+
+		// ExpectedExternalAudit expectedExternalArtifactAudit = new
+		// ExpectedExternalAudit();
+
+		ExpectedExternalAudit expectedExternalArtifactAudit = getDefaultExternalAuditObject(assetType, action, null);
+		expectedExternalArtifactAudit.setMODIFIER(AuditValidationUtils.getModifierString(artifactDefinition.getUpdaterFullName(), artifactDefinition.getUserIdLastUpdater()));
+		expectedExternalArtifactAudit.setPREV_ARTIFACT_UUID("");
+		expectedExternalArtifactAudit.setCURR_ARTIFACT_UUID(artifactDefinition.getArtifactUUID());
+		expectedExternalArtifactAudit.setARTIFACT_DATA(AuditValidationUtils.buildArtifactDataAudit(artifactDefinition));
+		expectedExternalArtifactAudit.setRESOURCE_URL(expectedExternalArtifactAudit.getRESOURCE_URL() + "/" + componentUUID + "/artifacts");
+		return expectedExternalArtifactAudit;
+
+	}
+	
+	public static ExpectedExternalAudit getDefaultExternalArtifactAuditSuccess(AssetTypeEnum assetType, AuditingActionEnum action, ArtifactDefinition artifactDefinition, Component component) {
+
+		 //ExpectedExternalAudit expectedExternalArtifactAudit = new ExpectedExternalAudit();
+		
+		ExpectedExternalAudit expectedExternalArtifactAudit = getDefaultExternalAuditObject(assetType, action, null);
+		expectedExternalArtifactAudit.setMODIFIER(AuditValidationUtils.getModifierString(artifactDefinition.getUpdaterFullName(), artifactDefinition.getUserIdLastUpdater()));
+		expectedExternalArtifactAudit.setPREV_ARTIFACT_UUID("");
+		expectedExternalArtifactAudit.setCURR_ARTIFACT_UUID(artifactDefinition.getArtifactUUID());
+		expectedExternalArtifactAudit.setARTIFACT_DATA(AuditValidationUtils.buildArtifactDataAudit(artifactDefinition));
+		expectedExternalArtifactAudit.setRESOURCE_URL(expectedExternalArtifactAudit.getRESOURCE_URL() + "/" + component.getUUID() + "/artifacts");
+		expectedExternalArtifactAudit.setRESOURCE_NAME(component.getName());
+		expectedExternalArtifactAudit.setRESOURCE_TYPE(component.getComponentType().getValue());
+		return expectedExternalArtifactAudit;
+		
+	}
+	
+	public static ExpectedResourceAuditJavaObject getDefaultCreateResourceExternalAPI(String resourceName) {
+
+		ExpectedResourceAuditJavaObject expectedResourceAuditJavaObject = new ExpectedResourceAuditJavaObject();
+		expectedResourceAuditJavaObject.setAction(AuditingActionEnum.CREATE_RESOURCE_BY_API.getName());
+		expectedResourceAuditJavaObject.setResourceName(resourceName);
+		expectedResourceAuditJavaObject.setResourceType("Resource");
+		expectedResourceAuditJavaObject.setCONSUMER_ID("ci");
+		expectedResourceAuditJavaObject.setRESOURCE_URL("/sdc/v1/catalog/resources");
+		expectedResourceAuditJavaObject.setMODIFIER("");
+		expectedResourceAuditJavaObject.setPrevVersion("");
+		expectedResourceAuditJavaObject.setCurrVersion("0.1");
+		expectedResourceAuditJavaObject.setPrevState("");
+		expectedResourceAuditJavaObject.setCurrState(LifecycleStateEnum.NOT_CERTIFIED_CHECKOUT.toString());
+		expectedResourceAuditJavaObject.setStatus("201");
+		expectedResourceAuditJavaObject.setDesc("OK");
+		
+		return expectedResourceAuditJavaObject;
+		
+		
+	}
+	
+	public static ExpectedResourceAuditJavaObject getDefaultChangeAssetLifeCycleExternalAPI(Component resourceAssetStructure, User defaultUser, LifeCycleStatesEnum lifecycleStateEnum, AssetTypeEnum assetTypeEnum) {
+
+		ExpectedResourceAuditJavaObject expectedResourceAuditJavaObject = new ExpectedResourceAuditJavaObject();
+		expectedResourceAuditJavaObject.setAction(AuditingActionEnum.CHANGE_LIFECYCLE_BY_API.getName());
+		expectedResourceAuditJavaObject.setResourceName(resourceAssetStructure.getName());
+		expectedResourceAuditJavaObject.setResourceType(assetTypeEnum.getCorrespondingComponent());
+		expectedResourceAuditJavaObject.setCONSUMER_ID("ci");
+		expectedResourceAuditJavaObject.setRESOURCE_URL(String.format("/sdc/v1/catalog/%s/%s/lifecycleState/%s", assetTypeEnum.getValue().toLowerCase(), resourceAssetStructure.getUUID(), lifecycleStateEnum.getState()));
+		expectedResourceAuditJavaObject.setMODIFIER(defaultUser.getFullName() + "(" + defaultUser.getUserId() + ")");
+		expectedResourceAuditJavaObject.setPrevVersion("0.1");
+		expectedResourceAuditJavaObject.setCurrVersion("0.1");
+		expectedResourceAuditJavaObject.setPrevState(LifecycleStateEnum.NOT_CERTIFIED_CHECKOUT.toString());
+		expectedResourceAuditJavaObject.setCurrState(LifecycleStateEnum.NOT_CERTIFIED_CHECKIN.toString());
+		// TODO: Remove comment
+//		expectedResourceAuditJavaObject.setINVARIANT_UUID(resourceAssetStructure.getInvariantUUID());
+		// TODO: SERVICE_INSTANCE_ID
+		expectedResourceAuditJavaObject.setStatus("201");
+		expectedResourceAuditJavaObject.setDesc("OK");
+		
+		return expectedResourceAuditJavaObject;
+		
+	}
+	
+	public static ExpectedResourceAuditJavaObject getDefaultInvalidChangeAssetLifeCycleExternalAPI(String assetUUID, User defaultUser, LifeCycleStatesEnum lifecycleStateEnum, AssetTypeEnum assetTypeEnum) {
+
+		ExpectedResourceAuditJavaObject expectedResourceAuditJavaObject = new ExpectedResourceAuditJavaObject();
+		expectedResourceAuditJavaObject.setAction(AuditingActionEnum.CHANGE_LIFECYCLE_BY_API.getName());
+		expectedResourceAuditJavaObject.setResourceName("");
+		expectedResourceAuditJavaObject.setResourceType(assetTypeEnum.getCorrespondingComponent());
+		expectedResourceAuditJavaObject.setCONSUMER_ID("ci");
+		expectedResourceAuditJavaObject.setRESOURCE_URL(String.format("/sdc/v1/catalog/%s/%s/lifecycleState/%s", assetTypeEnum.getValue().toLowerCase(), assetUUID, lifecycleStateEnum.getState()));
+		expectedResourceAuditJavaObject.setMODIFIER("");
+		expectedResourceAuditJavaObject.setMODIFIER(defaultUser.getFullName() + "(" + defaultUser.getUserId() + ")");
+		expectedResourceAuditJavaObject.setPrevVersion("");
+		expectedResourceAuditJavaObject.setCurrVersion("");
+		expectedResourceAuditJavaObject.setPrevState("");
+		expectedResourceAuditJavaObject.setCurrState("");
+		expectedResourceAuditJavaObject.setStatus("404");
+		expectedResourceAuditJavaObject.setDesc("OK");
+		
+		return expectedResourceAuditJavaObject;
+		
+	}
+
+	public static ExpectedExternalAudit getDefaultExternalArtifactAuditSuccess(AssetTypeEnum assetType, AuditingActionEnum action, ArtifactDefinition artifactDefinition, String componentUUID, String resourceInstanceName) {
+
+		ExpectedExternalAudit expectedExternalArtifactAudit = getDefaultExternalArtifactAuditSuccess(assetType, action, artifactDefinition, componentUUID);
+		expectedExternalArtifactAudit.setRESOURCE_URL("/sdc/v1/catalog/" + assetType.getValue() + "/" + componentUUID + "/resourceInstances/" + resourceInstanceName + "/artifacts");
+		return expectedExternalArtifactAudit;
+	}
+
+	public static ExpectedExternalAudit getDefaultExternalArtifactAuditFailure(AssetTypeEnum assetType, AuditingActionEnum action, ArtifactDefinition artifactDefinition, String componentUUID, ErrorInfo errorInfo, List<String> variables) {
+
+		// ExpectedExternalAudit expectedExternalArtifactAudit = new
+		// ExpectedExternalAudit();
+
+		ExpectedExternalAudit expectedExternalArtifactAudit = getDefaultExternalAuditObject(assetType, action, null);
+		expectedExternalArtifactAudit.setMODIFIER(AuditValidationUtils.getModifierString(artifactDefinition.getUpdaterFullName(), artifactDefinition.getUserIdLastUpdater()));
+		expectedExternalArtifactAudit.setPREV_ARTIFACT_UUID("");
+		expectedExternalArtifactAudit.setCURR_ARTIFACT_UUID(artifactDefinition.getArtifactUUID());
+		expectedExternalArtifactAudit.setARTIFACT_DATA(AuditValidationUtils.buildArtifactDataAudit(artifactDefinition));
+		expectedExternalArtifactAudit.setRESOURCE_URL(expectedExternalArtifactAudit.getRESOURCE_URL() + "/" + componentUUID + "/artifacts");
+		expectedExternalArtifactAudit.setSTATUS(errorInfo.getCode().toString());
+		expectedExternalArtifactAudit.setDESC(AuditValidationUtils.buildAuditDescription(errorInfo, variables));
+		return expectedExternalArtifactAudit;
+
+	}
+
+	public static ExpectedExternalAudit getDefaultExternalArtifactAuditFailure(AssetTypeEnum assetType, AuditingActionEnum action, ArtifactDefinition artifactDefinition, String componentUUID, ErrorInfo errorInfo, List<String> variables,
+			String resourceInstanceName) {
+
+		ExpectedExternalAudit expectedExternalArtifactAudit = getDefaultExternalArtifactAuditFailure(assetType, action, artifactDefinition, componentUUID, errorInfo, variables);
+		expectedExternalArtifactAudit.setRESOURCE_URL("/sdc/v1/catalog/" + assetType.getValue() + "/" + componentUUID + "/resourceInstances/" + resourceInstanceName + "/artifacts");
+		return expectedExternalArtifactAudit;
+	}
+
+	public static ExpectedExternalAudit getFilteredAssetListAuditCategoryNotFound(AssetTypeEnum assetType, String query, String category) {
+
+		// ExpectedExternalAudit expectedAssetListAuditJavaObject = new
+		// ExpectedExternalAudit();
+		ExpectedExternalAudit expectedAssetListAuditJavaObject = getDefaultExternalAuditObject(assetType, AuditingActionEnum.GET_FILTERED_ASSET_LIST, query);
+		expectedAssetListAuditJavaObject.setSTATUS("404");
+		ErrorInfo errorInfo = null;
+		try {
+			errorInfo = ErrorValidationUtils.parseErrorConfigYaml(ActionStatus.COMPONENT_CATEGORY_NOT_FOUND.name());
+		} catch (FileNotFoundException e) {
+			e.printStackTrace();
+		}
+		String desc = (errorInfo.getMessageId() + ": " + errorInfo.getMessage()).replace("%2", "category").replace("%3", category).replace("%1", "resource");
+		expectedAssetListAuditJavaObject.setDESC(desc);
+
+		return expectedAssetListAuditJavaObject;
+
+	}
+
+	public static ExpectedExternalAudit getDefaultAssetMetadataAudit(AssetTypeEnum assetType, Component component) {
+
+		ExpectedExternalAudit expectedAssetListAuditJavaObject = new ExpectedExternalAudit();
+		expectedAssetListAuditJavaObject = getDefaultExternalAuditObject(assetType, AuditingActionEnum.GET_ASSET_METADATA, null);
+		expectedAssetListAuditJavaObject.setRESOURCE_URL(expectedAssetListAuditJavaObject.getRESOURCE_URL() + "/" + component.getUUID() + "/metadata");
+		expectedAssetListAuditJavaObject.setRESOURCE_NAME(component.getName());
+		expectedAssetListAuditJavaObject.setRESOURCE_TYPE(component.getComponentType().getValue());
+		expectedAssetListAuditJavaObject.setSERVICE_INSTANCE_ID(component.getUUID());
+		return expectedAssetListAuditJavaObject;
+
+	}
+
+	public static ExpectedExternalAudit getDefaultAssetMetadataAuditFailure(AssetTypeEnum assetType, String serviceUuid, String resourceType) {
+
+		ExpectedExternalAudit expectedAssetListAuditJavaObject = new ExpectedExternalAudit();
+		expectedAssetListAuditJavaObject = getDefaultExternalAuditObject(assetType, AuditingActionEnum.GET_ASSET_METADATA, null);
+		expectedAssetListAuditJavaObject.setSTATUS("404");
+		expectedAssetListAuditJavaObject.setDESC("OK");
+		expectedAssetListAuditJavaObject.setRESOURCE_URL(expectedAssetListAuditJavaObject.getRESOURCE_URL() + "/" + serviceUuid + "/metadata");
+		expectedAssetListAuditJavaObject.setRESOURCE_TYPE(resourceType);
+		expectedAssetListAuditJavaObject.setSERVICE_INSTANCE_ID(serviceUuid);
+		return expectedAssetListAuditJavaObject;
+
+	}
+
+	// Category/Subcategory/Group
+	public static CategoryDefinition getDefaultCategory() {
+		CategoryDefinition productCategoryDefinition = new CategoryDefinition();
+		productCategoryDefinition.setName("CiCateg" + generateUUIDforSufix());
+		return productCategoryDefinition;
+	}
+
+	public static SubCategoryDefinition getDefaultSubCategory() {
+		SubCategoryDefinition productSubCategoryDefinition = new SubCategoryDefinition();
+		productSubCategoryDefinition.setName("CiSubCateg" + generateUUIDforSufix());
+		return productSubCategoryDefinition;
+	}
+
+	public static GroupingDefinition getDefaultGroup() {
+		GroupingDefinition productGroupDefinition = new GroupingDefinition();
+		productGroupDefinition.setName("CiGrouping1" + generateUUIDforSufix());
+		return productGroupDefinition;
+	}
+
+	// Product
+
+	public static ProductReqDetails getDefaultProduct() {
+		return createDefaultProductReqDetails(CI_PRODUCT, null);
+	}
+
+	public static ProductReqDetails getDefaultProduct(String name) {
+		return createDefaultProductReqDetails(name, null);
+	}
+
+	public static ProductReqDetails getDefaultProduct(CategoryDefinition category) {
+		List<CategoryDefinition> categories = new ArrayList<>();
+		categories.add(category);
+		return createDefaultProductReqDetails(CI_PRODUCT, categories);
+	}
+
+	public static ProductReqDetails getDefaultProduct(String name, CategoryDefinition category) {
+		List<CategoryDefinition> categories = new ArrayList<>();
+		categories.add(category);
+		return createDefaultProductReqDetails(name, categories);
+	}
+
+	public static ProductReqDetails getDefaultProduct(List<CategoryDefinition> categories) {
+		return createDefaultProductReqDetails(CI_PRODUCT, categories);
+	}
+
+	public static ProductReqDetails getDefaultProduct(String name, List<CategoryDefinition> categories) {
+		return createDefaultProductReqDetails(name, categories);
+	}
+
+	private static ProductReqDetails createDefaultProductReqDetails(String productName, List<CategoryDefinition> categories) {
+		ProductReqDetails product = new ProductReqDetails(productName);
+		productName = (productName + generateUUIDforSufix());
+		product.setName(productName);
+		ArrayList<String> tags = new ArrayList<>();
+		tags.add(productName);
+		product.setTags(tags);
+		product.setProjectCode("12345");
+		product.setIcon("myIcon");
+		ArrayList<String> contacts = new ArrayList<>();
+		// contacts.add(ElementFactory.getDefaultUser(UserRoleEnum.PRODUCT_STRATEGIST1).getUserId());
+		// contacts.add(ElementFactory.getDefaultUser(UserRoleEnum.PRODUCT_STRATEGIST2).getUserId());
+		contacts.add(ElementFactory.getDefaultUser(UserRoleEnum.PRODUCT_MANAGER1).getUserId());
+		// contacts.add(ElementFactory.getDefaultUser(UserRoleEnum.PRODUCT_MANAGER2).getUserId());
+		product.setContacts(contacts);
+		product.setContactId(UserRoleEnum.PRODUCT_MANAGER1.getUserId());
+		product.setCategories(categories);
+		String fullName = "This is my full name: " + productName;
+		product.setFullName(fullName);
+		String description = "This is product description";
+		product.setDescription(description);
+		return product;
+	}
+
+	public static RequirementCapabilityRelDef getReqCapRelation(String fromCompInstId, String toCompInstId, String reqOwnerId, String capOwnerId, String capType, String reqCapName, List<CapabilityDefinition> capList,
+			List<RequirementDefinition> reqList) {
+		RequirementCapabilityRelDef requirementDef = new RequirementCapabilityRelDef();
+		requirementDef.setFromNode(fromCompInstId);
+		requirementDef.setToNode(toCompInstId);
+		RelationshipInfo relationInfo = new RelationshipInfo();
+		relationInfo.setRequirementOwnerId(reqOwnerId);
+		relationInfo.setCapabilityOwnerId(capOwnerId);
+		relationInfo.setRequirement(reqCapName);
+		RelationshipImpl relationImpl = new RelationshipImpl();
+		relationImpl.setType(capType);
+		relationInfo.setRelationships(relationImpl);
+		relationInfo.setCapabilityUid(capList.get(0).getUniqueId());
+		relationInfo.setRequirementUid(reqList.get(0).getUniqueId());
+		List<CapabilityRequirementRelationship> relationships = new ArrayList<>();
+		CapabilityRequirementRelationship relationship = new CapabilityRequirementRelationship();
+		relationship.setRelation(relationInfo);
+		relationships.add(relationship);
+		requirementDef.setRelationships(relationships);
+		return requirementDef;
+	}
+
+	public static String generateUUIDforSufix() {
+		final String uniqueSuffix = UUID.randomUUID().toString();
+		return uniqueSuffix.split("-")[4];
+	}
+
+	private static String normalizeArtifactLabel(String label) {
+
+		label = label.substring(0, label.indexOf("."));
+		String normalizedLabel = ValidationUtils.normalizeArtifactLabel(label);
+		return normalizedLabel.substring(0, Math.min(25, normalizedLabel.length()));
+
+	}
+
+}
diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/utils/general/FileHandling.java b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/utils/general/FileHandling.java
new file mode 100644
index 0000000000..ec38312b69
--- /dev/null
+++ b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/utils/general/FileHandling.java
@@ -0,0 +1,473 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * SDC
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.sdc.ci.tests.utils.general;
+
+import static org.testng.AssertJUnit.assertTrue;
+
+import com.aventstack.extentreports.Status;
+import java.io.BufferedWriter;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileWriter;
+import java.io.FilenameFilter;
+import java.io.IOException;
+import java.io.InputStream;
+import java.nio.file.Paths;
+import java.util.ArrayList;
+import java.util.Enumeration;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Properties;
+import java.util.zip.ZipEntry;
+import java.util.zip.ZipException;
+import java.util.zip.ZipFile;
+import org.apache.commons.io.FileUtils;
+import org.openecomp.sdc.be.model.DataTypeDefinition;
+import org.openecomp.sdc.ci.tests.api.ComponentBaseTest;
+import org.openecomp.sdc.ci.tests.datatypes.enums.XnfTypeEnum;
+import org.openecomp.sdc.common.util.GeneralUtility;
+import org.yaml.snakeyaml.Yaml;
+
+public class FileHandling {
+
+//	------------------yaml parser methods----------------------------
+	public static Map<?, ?> parseYamlFile(String filePath) throws Exception {
+		Yaml yaml = new Yaml();
+		File file = new File(filePath);
+		InputStream inputStream = new FileInputStream(file);
+		Map<?, ?> map = (Map<?, ?>) yaml.load(inputStream);
+		return map;
+	}
+	
+	/**
+	 * The method return map fetched objects by pattern from yaml file 
+	 * @param yamlFile
+	 * @param pattern
+	 * @return
+	 * @throws Exception
+	 */
+	public static Map<String, Object> parseYamlFileToMapByPattern(File yamlFile, String pattern) throws Exception {
+		Map<?, ?> yamlFileToMap = FileHandling.parseYamlFile(yamlFile.toString());
+		Map<String, Object> objectMap = getObjectMapByPattern(yamlFileToMap, pattern);
+		return objectMap;
+	}
+	
+	@SuppressWarnings("unchecked")
+	public static Map<String, Object> getObjectMapByPattern(Map<?, ?> parseUpdetedEnvFile, String pattern) {
+		Map<String, Object> objectMap = null;
+		
+		Object objectUpdetedEnvFile = parseUpdetedEnvFile.get(pattern);
+		if(objectUpdetedEnvFile instanceof HashMap){
+			objectMap = (Map<String, Object>) objectUpdetedEnvFile;
+		}
+		return objectMap;
+	}
+	
+	
+	public static Map<String, DataTypeDefinition> parseDataTypesYaml(String filePath) throws Exception {
+		@SuppressWarnings("unchecked")
+		Map<String, DataTypeDefinition> dataTypesMap = (Map<String, DataTypeDefinition>) parseYamlFile(filePath);
+		return dataTypesMap;
+	}
+//	-------------------------------------------------------------------------------------------------
+
+	/**
+	 * @param folder, folder name under "Files" folder
+	 * @return path to given folder from perspective of working directory or sdc-vnfs repository
+	 */
+	public static String getFilePath(String folder) {
+		// return folder from perspective of working directory ( in general for nightly run from Linux, should already contain "Files" directory )
+		return FileHandling.getBasePath() + "src/test/resources/Files" + File.separator + folder + File.separator;
+	}
+
+	public static String getBasePath() {
+		return System.getProperty("user.dir") + File.separator;
+	}
+	
+	public static String getSdcVnfsPath() {
+		return  getBasePath() + Paths.get("..", "..", "sdc-vnfs").toString();
+	}
+	
+	public static String getDriversPath() {
+		return getBasePath() + "src" + File.separator + "test" + File.separator + "resources"
+				+ File.separator + "ci" + File.separator + "drivers" + File.separator;
+	}
+
+	public static String getResourcesFilesPath() {
+		return getSdcVnfsPath()+ File.separator + "ui-tests" + File.separator + "Files" + File.separator;
+	}
+	
+	public static String getResourcesEnvFilesPath() {
+		return getBasePath() + File.separator + "src" + File.separator + "test" + File.separator + "resources"
+				+ File.separator + "Files" + File.separator + "ResourcesEnvFiles" +File.separator;
+	}
+
+	public static String getCiFilesPath() {
+		return getBasePath() + "src" + File.separator + "test" + File.separator + "resources"
+				+ File.separator + "ci";
+	}
+
+	public static String getConfFilesPath() {
+		return getCiFilesPath() + File.separator + "conf" + File.separator;
+	}
+
+	public static String getVnfRepositoryPath() {
+		return getFilePath("VNFs");
+	}
+
+	public static String getXnfRepositoryPath(XnfTypeEnum xnfTypeEnum) {
+		return xnfTypeEnum.getValue().equals(XnfTypeEnum.PNF.name()) ? getFilePath("PNFs") : getFilePath("VNFs");
+	}
+
+	public static String getPortMirroringRepositoryPath() {
+		return getFilePath("PortMirroring");
+	}
+	
+	public static File getConfigFile(String configFileName) throws Exception {
+		File configFile = new File(FileHandling.getBasePath() + File.separator + "conf" + File.separator + configFileName);
+		if (!configFile.exists()) {
+			configFile = new File(FileHandling.getConfFilesPath() + configFileName);
+		}
+		return configFile;
+	}
+
+	public static Object[] filterFileNamesFromFolder(String filepath, String extension) {
+		try {
+			File dir = new File(filepath);
+			List<String> filenames = new ArrayList<String>();
+			
+			FilenameFilter extensionFilter = new FilenameFilter() {
+				public boolean accept(File dir, String name) {
+					return name.endsWith(extension);
+				}
+			};
+			
+			if (dir.isDirectory()) {
+				for (File file : dir.listFiles(extensionFilter)) {
+					filenames.add(file.getName());
+				}
+				return filenames.toArray();
+			}
+
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
+		return null;
+	}
+
+	public static List<String> filterFileNamesListFromFolder(String filepath, String extension) {
+		List<String> filenames = new ArrayList<String>();
+		try {
+			File dir = new File(filepath);
+			
+			FilenameFilter extensionFilter = new FilenameFilter() {
+				public boolean accept(File dir, String name) {
+					return name.endsWith(extension);
+				}
+			};
+			
+			if (dir.isDirectory()) {
+				for (File file : dir.listFiles(extensionFilter)) {
+					filenames.add(file.getName());
+				}
+				return filenames;
+			}
+
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
+		return filenames;
+	}
+	
+	public static String[] getArtifactsFromZip(String filepath, String zipFilename){
+		try {
+			ZipFile zipFile = new ZipFile(filepath + File.separator + zipFilename);
+			Enumeration<? extends ZipEntry> entries = zipFile.entries();
+			
+			String[] artifactNames = new String[zipFile.size() - 1];
+
+			int i = 0;
+			while(entries.hasMoreElements()){
+				ZipEntry nextElement = entries.nextElement();
+				if (!nextElement.isDirectory()){ 
+					if (!nextElement.getName().equals("MANIFEST.json")){
+						String name = nextElement.getName();
+						artifactNames[i++] = name;
+					}
+				}
+			}
+			zipFile.close();
+			return artifactNames;
+		} catch(ZipException zipEx) {
+			System.err.println("Error in zip file named : " +  zipFilename);	
+			zipEx.printStackTrace();
+		} catch (IOException e) {
+			System.err.println("Unhandled exception : ");
+			e.printStackTrace();
+		}
+		
+		return null;
+		
+	}
+
+	public static List<String> getFileNamesFromZip(String zipFileLocation){
+		try{
+			ZipFile zipFile = new ZipFile(zipFileLocation);
+			Enumeration<? extends ZipEntry> entries = zipFile.entries();
+			
+			List<String> artifactNames = new ArrayList<>();
+
+			int i = 0;
+			while(entries.hasMoreElements()){
+				ZipEntry nextElement = entries.nextElement();
+				if (!nextElement.isDirectory()){ 
+					String name = nextElement.getName();
+					artifactNames.add(name);
+				}
+			}
+			zipFile.close();
+			return artifactNames;
+		}
+		catch(ZipException zipEx){
+			System.err.println("Error in zip file named : " +  zipFileLocation);	
+			zipEx.printStackTrace();
+		} catch (IOException e) {
+			System.err.println("Unhandled exception : ");
+			e.printStackTrace();
+		}
+		return null;
+	}
+	
+	public static List<String> getZipFileNamesFromFolder(String filepath) {
+		List<String> fileNamesListFromFolder = filterFileNamesListFromFolder(filepath, ".zip");
+		fileNamesListFromFolder.addAll(filterFileNamesListFromFolder(filepath, ".csar"));
+		return fileNamesListFromFolder;
+	}
+
+	public static int countFilesInZipFile(String[] artifactsArr, String reqExtension){
+		int fileCounter = 0;
+		for (String artifact : artifactsArr){
+			String extensionFile = artifact.substring(artifact.lastIndexOf(".") + 1 , artifact.length());
+			if (extensionFile.equals(reqExtension)){
+				fileCounter++;
+			}
+		}
+		return fileCounter;
+	}
+	
+	/**
+	 * @param dirPath
+	 * @return last modified file name from dirPath directory
+	 */
+	public static synchronized File getLastModifiedFileNameFromDir(String dirPath){
+	    File dir = new File(dirPath);
+	    File[] files = dir.listFiles();
+	    if (files == null) {
+	    	assertTrue("File not found under directory " + dirPath, false);
+	        return null;
+	    }
+
+	    File lastModifiedFile = files[0];
+	    for (int i = 1; i < files.length; i++) {
+	    	if(files[i].isDirectory()) {
+	    		continue;
+	    	}
+	    	if (lastModifiedFile.lastModified()  < files[i].lastModified()) {
+	           lastModifiedFile = files[i];
+	    	}
+	    }
+	    return lastModifiedFile;
+	}
+
+	public static void deleteDirectory(String directoryPath) {
+		File dir = new File(directoryPath);
+		try {
+			FileUtils.cleanDirectory(dir);
+		} catch (IllegalArgumentException e) {
+			System.out.println("Failed to clean " + dir);
+		} catch (IOException e) {
+			System.out.println("Failed to clean " + dir);
+		}
+	}
+	
+	public static void createDirectory(String directoryPath) {
+		File directory = new File(String.valueOf(directoryPath));
+	    if (! directory.exists()){
+	        directory.mkdir();
+	    }
+	}
+
+
+	/**
+	 * The method append data to existing file, if file not exists - create it
+	 * @param pathToFile
+	 * @param text
+	 * @param leftSpaceCount
+	 * @throws IOException
+	 */
+	public static synchronized void writeToFile(File pathToFile, Object text, Integer leftSpaceCount) throws IOException{
+
+		BufferedWriter bw = null;
+		FileWriter fw = null;
+		if(!pathToFile.exists()){
+			createEmptyFile(pathToFile);
+		}
+		try {
+			fw = new FileWriter(pathToFile, true);
+			bw = new BufferedWriter(fw);
+			StringBuilder sb = new StringBuilder();
+			if(leftSpaceCount > 0 ){
+				for(int i = 0; i < leftSpaceCount; i++){
+					sb.append(" ");
+				}
+			}
+			bw.write(sb.toString() + text);
+			bw.newLine();
+			bw.close();
+			fw.close();
+		} catch (Exception e) {
+			ComponentBaseTest.getExtendTest().log(Status.INFO, "Unable to write to flie " + pathToFile);
+		}
+	}
+
+	public static String getCreateDirByName(String dirName) {
+		File dir = new File(dirName);
+		dir.mkdir();
+		if(!dir.exists()) {
+		}
+
+		return dir.getPath();
+	}
+	
+	public static boolean isFileDownloaded(String downloadPath, String fileName) {
+		boolean flag = false;
+		File dir = new File(downloadPath);
+		File[] dir_contents = dir.listFiles();
+		for (int i = 0; i < dir_contents.length; i++) {
+			if (dir_contents[i].getName().equals(fileName))
+				return flag = true;
+		}
+		return flag;
+	}
+	
+	public static String getMD5OfFile(File file) throws IOException {
+		String content = FileUtils.readFileToString(file);
+		String md5 = GeneralUtility.calculateMD5Base64EncodedByString(content);
+		return md5;
+	}
+	
+	public static File createEmptyFile(String fileToCreate) {
+		File file= new File(fileToCreate);
+		try {
+			if(file.exists()){
+				deleteFile(file);
+			}
+			file.createNewFile();
+			ComponentBaseTest.getExtendTest().log(Status.INFO, "Create file " + fileToCreate);
+		} catch (IOException e) {
+			ComponentBaseTest.getExtendTest().log(Status.INFO, "Failed to create file " + fileToCreate);
+			e.printStackTrace();
+		}
+		return file;
+	}
+	
+	public static File createEmptyFile(File fileToCreate) {
+		try {
+			if(fileToCreate.exists()){
+				deleteFile(fileToCreate);
+			}
+			fileToCreate.createNewFile();
+			ComponentBaseTest.getExtendTest().log(Status.INFO, "Create file " + fileToCreate);
+		} catch (IOException e) {
+			ComponentBaseTest.getExtendTest().log(Status.INFO, "Failed to create file " + fileToCreate);
+			e.printStackTrace();
+		}
+		return fileToCreate;
+	}
+	
+	public static void deleteFile(File file){
+		
+		try{
+    		if(file.exists()){
+    			file.deleteOnExit();
+    			ComponentBaseTest.getExtendTest().log(Status.INFO, "File " + file.getName() + "has been deleted");
+    		}else{
+    			ComponentBaseTest.getExtendTest().log(Status.INFO, "Failed to delete file " + file.getName());
+    		}
+    	}catch(Exception e){
+    		e.printStackTrace();
+    	}
+
+	}
+	
+	
+	/**
+	 * get file list from directory by extension array
+	 * @param directory
+	 * @param okFileExtensions
+	 * @return
+	 */
+	public static List<File> getHeatAndHeatEnvArtifactsFromZip(File directory, String[] okFileExtensions){
+		
+			List<File> fileList = new ArrayList<>();
+			File[] files = directory.listFiles();
+			
+			for (String extension : okFileExtensions){
+				for(File file : files){
+					if (file.getName().toLowerCase().endsWith(extension)){
+						fileList.add(file);
+					}
+				}
+			}
+			return fileList;
+	}
+
+    public static String getKeyByValueFromPropertyFormatFile(String fullPath, String key) {
+		Properties prop = new Properties();
+		InputStream input = null;
+		String value = null;
+		try {
+			input = new FileInputStream(fullPath);
+			prop.load(input);
+			value = (prop.getProperty(key));
+
+		} catch (IOException ex) {
+			ex.printStackTrace();
+		} finally {
+			if (input != null) {
+				try {
+					input.close();
+				} catch (IOException e) {
+					e.printStackTrace();
+				}
+			}
+		}
+
+		return value.replaceAll("\"","");
+	}
+
+    public static void overWriteExistindDir(String outputCsar) throws IOException {
+		String basePath = getBasePath();
+		String csarDir = FileHandling.getCreateDirByName("outputCsar");
+		FileUtils.cleanDirectory(new File(csarDir));
+    }
+}
diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/utils/general/FileUtils.java b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/utils/general/FileUtils.java
new file mode 100644
index 0000000000..226c734c91
--- /dev/null
+++ b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/utils/general/FileUtils.java
@@ -0,0 +1,135 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * SDC
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.sdc.ci.tests.utils.general;
+
+import fj.data.Either;
+import org.openecomp.sdc.ci.tests.utils.Decoder;
+import org.openecomp.sdc.ci.tests.utils.Utils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.io.File;
+import java.io.IOException;
+import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
+import java.nio.file.Paths;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+import static org.testng.AssertJUnit.assertTrue;
+
+public class FileUtils {
+	static Logger logger = LoggerFactory.getLogger(Utils.class.getName());
+
+	public static void writeToFile(String filePath, String content) {
+		try {
+			Files.write(Paths.get(filePath), content.getBytes());
+		} catch (IOException e) {
+			e.printStackTrace();
+		}
+	}
+
+	public static String getFileName(String fullyQualified) {
+		String fileName = fullyQualified;
+
+		int i = fullyQualified.lastIndexOf('.');
+		if (i > 0) {
+			fileName = fullyQualified.substring(i + 1);
+		}
+		return fileName;
+
+	}
+
+	public static Either<String, Exception> getFileContentUTF8(String filePath) {
+		Either<String, Exception> eitherResult;
+		try {
+			String content = new String(Files.readAllBytes(Paths.get(filePath)), StandardCharsets.UTF_8);
+			eitherResult = Either.left(content);
+		} catch (Exception e) {
+			eitherResult = Either.right(e);
+		}
+		return eitherResult;
+	}
+
+	public static List<String> getFileListFromBaseDirectoryByTestName(String testResourcesPath) {
+
+		File file = new File(testResourcesPath);
+		File[] listFiles = file.listFiles();
+		if (listFiles != null) {
+			List<String> listFileName = new ArrayList<String>();
+			for (File newFile : listFiles) {
+				if (newFile.isFile()) {
+					listFileName.add(newFile.getPath());
+				}
+			}
+			return listFileName;
+		}
+		assertTrue("directory " + testResourcesPath + " is empty", false);
+		return null;
+	}
+
+	public static String getFilePathFromListByPattern(List<String> fileList, String pattern) {
+
+		for (String filePath : fileList) {
+			if (filePath.contains(pattern)) {
+				return filePath;
+			}
+		}
+		return null;
+	}
+
+	public static String loadPayloadFileFromListUsingPosition(List<String> listFileName, String pattern,
+			Boolean isBase64, int positionInList) throws IOException {
+		List<String> newList = new ArrayList<String>(Arrays.asList(listFileName.get(positionInList)));
+		return loadPayloadFile(newList, pattern, isBase64);
+	}
+
+	public static String loadPayloadFile(List<String> listFileName, String pattern, Boolean isBase64) throws IOException {
+		String fileName;
+		String payload = null;
+		fileName = FileUtils.getFilePathFromListByPattern(listFileName, pattern);
+		logger.debug("fileName: {}", fileName);
+
+		if (fileName != null) {
+			payload = Decoder.readFileToString(fileName);
+			if (isBase64) {
+				payload = Decoder.encode(payload.getBytes());
+			}
+		} else {
+			assertTrue("file to upload not found", false);
+		}
+		return payload;
+	}
+
+	public static String getFileNameFromPath(String testResourcesPath) {
+
+		File file = new File(testResourcesPath);
+		String fileName = null;
+		if (file.exists()) {
+			return file.getName();
+		} else {
+			assertTrue("file to upload not found", false);
+		}
+		return fileName;
+
+	}
+}
diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/utils/general/ImportUtils.java b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/utils/general/ImportUtils.java
new file mode 100644
index 0000000000..3b1dcdac1e
--- /dev/null
+++ b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/utils/general/ImportUtils.java
@@ -0,0 +1,57 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * SDC
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.sdc.ci.tests.utils.general;
+
+import org.openecomp.sdc.ci.tests.datatypes.ImportReqDetails;
+
+import java.io.IOException;
+import java.util.List;
+
+public class ImportUtils {
+
+	public static ImportReqDetails getImportResourceDetailsByPathAndName(ImportReqDetails importReqDetails,
+			String filePath, String fileName) throws IOException {
+
+		// ImportReqDetails importReqDetails;
+		// User sdncUserDetails;
+		// String testResourcesPath;
+		// ResourceReqDetails resourceDetails;
+		// Config config;
+		// config = Utils.getConfig();
+		//
+		// importReqDetails = ElementFactory.getDefaultImportResource();
+		// User sdncUserDetails =
+		// ElementFactory.getDefaultUser(UserRoleEnum.DESIGNER);
+		// ResourceReqDetails resourceDetails =
+		// ElementFactory.getDefaultResource();
+		// String sourceDir = config.getResourceConfigDir();
+		// String testResourcesPath = sourceDir + File.separator + workDir;
+		// final String workDir = "importToscaResourceByCreateUrl";
+
+		List<String> listFileName = FileUtils.getFileListFromBaseDirectoryByTestName(filePath);
+		importReqDetails.setPayloadName(fileName);
+		String payloadData = FileUtils.loadPayloadFile(listFileName, fileName, true);
+		importReqDetails.setPayloadData(payloadData);
+
+		return importReqDetails;
+	}
+
+}
diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/utils/general/OnboardingUtillViaApis.java b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/utils/general/OnboardingUtillViaApis.java
new file mode 100644
index 0000000000..64a62c5619
--- /dev/null
+++ b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/utils/general/OnboardingUtillViaApis.java
@@ -0,0 +1,167 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * SDC
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.sdc.ci.tests.utils.general;
+
+import com.google.gson.Gson;
+import fj.data.Either;
+import org.apache.commons.codec.binary.Base64;
+import org.openecomp.sdc.be.model.Component;
+import org.openecomp.sdc.be.model.Resource;
+import org.openecomp.sdc.be.model.User;
+import org.openecomp.sdc.ci.tests.api.Urls;
+import org.openecomp.sdc.ci.tests.config.Config;
+import org.openecomp.sdc.ci.tests.datatypes.VendorLicenseModel;
+import org.openecomp.sdc.ci.tests.datatypes.ResourceReqDetails;
+import org.openecomp.sdc.ci.tests.datatypes.ServiceReqDetails;
+import org.openecomp.sdc.ci.tests.datatypes.VendorSoftwareProductObject;
+import org.openecomp.sdc.ci.tests.datatypes.enums.ServiceCategoriesEnum;
+import org.openecomp.sdc.ci.tests.datatypes.enums.UserRoleEnum;
+import org.openecomp.sdc.ci.tests.datatypes.http.HttpHeaderEnum;
+import org.openecomp.sdc.ci.tests.datatypes.http.HttpRequest;
+import org.openecomp.sdc.ci.tests.datatypes.http.RestResponse;
+import org.openecomp.sdc.ci.tests.utils.Utils;
+import org.openecomp.sdc.ci.tests.utils.rest.BaseRestUtils;
+
+import java.io.*;
+import java.nio.charset.StandardCharsets;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+import static org.testng.AssertJUnit.assertTrue;
+
+public class OnboardingUtillViaApis {
+
+	public static VendorSoftwareProductObject createVspViaApis(ResourceReqDetails resourceReqDetails, String filepath, String vnfFile, User user) throws Exception {
+
+		VendorLicenseModel vendorLicenseModel = VendorLicenseModelRestUtils.createVendorLicense(user);
+		return VendorSoftwareProductRestUtils.createVendorSoftwareProduct(resourceReqDetails, vnfFile, filepath, user,
+            vendorLicenseModel);
+	}
+	
+	public static Resource createResourceFromVSP(ResourceReqDetails resourceDetails) throws Exception {
+		Resource resource = AtomicOperationUtils.createResourceByResourceDetails(resourceDetails, UserRoleEnum.DESIGNER, true).left().value();
+		return resource;
+
+	}
+	
+	public static Resource createResourceFromVSP(ResourceReqDetails resourceDetails, UserRoleEnum userRole) throws Exception {
+		Resource resource = AtomicOperationUtils.createResourceByResourceDetails(resourceDetails, userRole, true).left().value();
+		return resource;
+
+	}
+	
+	public static void downloadToscaCsarToDirectory(Component component, File file) {
+		try {
+			Either<String, RestResponse> componentToscaArtifactPayload = AtomicOperationUtils.getComponenetArtifactPayload(component, "assettoscacsar");
+			if(componentToscaArtifactPayload.left().value() != null){
+				convertPayloadToFile(componentToscaArtifactPayload.left().value(), file);
+			}
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
+	}
+	
+
+	public static void convertPayloadToFile(String payload, File file) throws IOException{
+		
+		Gson gson = new Gson();
+		@SuppressWarnings("unchecked")
+		Map<String, String> fromJson = gson.fromJson(payload, Map.class);
+		String string = fromJson.get("base64Contents").toString();
+		byte[] byteArray = Base64.decodeBase64(string.getBytes(StandardCharsets.UTF_8));
+		File downloadedFile = new File(file.getAbsolutePath());
+		FileOutputStream fos = new FileOutputStream(downloadedFile);
+		fos.write(byteArray);
+		fos.flush();
+		fos.close();
+	}
+	
+	
+	public static void convertPayloadToZipFile(String payload, File file) throws IOException{
+		
+		byte[] byteArray = payload.getBytes(StandardCharsets.ISO_8859_1);
+		File downloadedFile = new File(file.getAbsolutePath());
+		FileOutputStream fos = new FileOutputStream(downloadedFile);
+		fos.write(byteArray);
+		fos.flush();
+		fos.close();
+		
+		System.out.println("");
+		
+		BufferedInputStream bis = new BufferedInputStream(new ByteArrayInputStream(payload.getBytes(StandardCharsets.ISO_8859_1)));
+		String filePath = file.toString();
+		BufferedOutputStream bos = new BufferedOutputStream(new FileOutputStream(new File(filePath)));
+		int inByte;
+		while((inByte = bis.read()) != -1) bos.write(inByte);
+		bis.close();
+		bos.close();
+	}
+	
+	public static Either<String, RestResponse> getVendorSoftwareProduct(String vspId, User user, Boolean validateState) throws IOException {
+
+		Config config = Utils.getConfig();
+		String url = String.format(Urls.GET_VENDOR_SOFTWARE_PRODUCT, config.getOnboardingBeHost(), config.getOnboardingBePort(), vspId);
+		String userId = user.getUserId();
+		Map<String, String> headersMap = OnboardingUtils.prepareHeadersMap(userId);
+		headersMap.put(HttpHeaderEnum.X_ECOMP_REQUEST_ID_HEADER.getValue(), "123456");
+		headersMap.put(HttpHeaderEnum.ACCEPT.getValue(), "*/*");
+		headersMap.put("Accept-Encoding", "gzip, deflate, br");
+		HttpRequest http = new HttpRequest();
+		RestResponse response = http.httpSendGet(url, headersMap);
+		if (validateState) {
+			assertTrue("add property to resource failed: " + response.getResponseMessage(), response.getErrorCode() == BaseRestUtils.STATUS_CODE_SUCCESS);
+		}
+		if (response.getErrorCode() != BaseRestUtils.STATUS_CODE_SUCCESS && response.getResponse().getBytes() == null && response.getResponse().getBytes().length == 0) {
+			return Either.right(response);
+		}
+		return Either.left(response.getResponse());
+		
+	}
+
+	public static ResourceReqDetails prepareOnboardedResourceDetailsBeforeCreate(ResourceReqDetails resourceDetails, VendorSoftwareProductObject vendorSoftwareProductObject) {
+
+		List<String> tags = new ArrayList<>();
+		tags.add(vendorSoftwareProductObject.getName());
+		resourceDetails.setCsarUUID(vendorSoftwareProductObject.getVspId());
+		resourceDetails.setCsarVersion(vendorSoftwareProductObject.getVersion());
+		resourceDetails.setName(vendorSoftwareProductObject.getName());
+		resourceDetails.setTags(tags);
+		resourceDetails.setDescription(vendorSoftwareProductObject.getDescription());
+		resourceDetails.setVendorName(vendorSoftwareProductObject.getVendorName());
+		resourceDetails.setResourceType("VF");
+		resourceDetails.setResourceVendorModelNumber("666");
+		resourceDetails.setContactId(vendorSoftwareProductObject.getAttContact());
+
+		return resourceDetails;
+	}
+	
+	public static ServiceReqDetails prepareServiceDetailsBeforeCreate(User user) {
+
+		ServiceReqDetails serviceDetails = ElementFactory.getDefaultService(ServiceCategoriesEnum.NETWORK_L4, user);
+		serviceDetails.setServiceType("MyServiceType");
+		serviceDetails.setServiceRole("MyServiceRole");
+		serviceDetails.setNamingPolicy("MyServiceNamingPolicy");
+		serviceDetails.setEcompGeneratedNaming(false);
+		
+		return serviceDetails;
+	}
+}
diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/utils/general/OnboardingUtils.java b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/utils/general/OnboardingUtils.java
new file mode 100644
index 0000000000..1a15f46c08
--- /dev/null
+++ b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/utils/general/OnboardingUtils.java
@@ -0,0 +1,241 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * SDC
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.sdc.ci.tests.utils.general;
+
+import org.openecomp.sdc.be.model.User;
+import org.openecomp.sdc.ci.tests.api.Urls;
+import org.openecomp.sdc.ci.tests.config.Config;
+import org.openecomp.sdc.ci.tests.datatypes.enums.XnfTypeEnum;
+import org.openecomp.sdc.ci.tests.datatypes.http.HttpHeaderEnum;
+import org.openecomp.sdc.ci.tests.datatypes.http.HttpRequest;
+import org.openecomp.sdc.ci.tests.datatypes.http.RestResponse;
+import org.openecomp.sdc.ci.tests.utils.Utils;
+import org.openecomp.sdc.ci.tests.utils.rest.ResponseParser;
+
+import java.util.*;
+
+public class OnboardingUtils {
+
+	/**
+	 * excluded VNF or PNF file list
+	 */
+	public static List<String> excludeXnfList =
+//		new ArrayList<>();
+	Arrays.asList(
+//		DUPLICATE_RESOURCE_ID_IN_DIFFERENT_FILES:
+		"2017-376_vMOG_11_1.zip",
+		"HeatCandidate_2017-09-20_15-06_66Name_2016-20-visbc1vf-v6.0-(VOIP).zip",
+		"1 Apndns-1710-vf v3.0.zip",
+		"1 AVPN_vRE_BV_volume-V2.zip",
+		"1-Vf-zrdm5bpxtc02-092017-(MOBILITY)_v3.0.zip",
+		"1-Mobility_vprobe_fe_11_2_1_vf_(MOBILITY)_v1.0.zip",
+//		ORCHESTRATION_NOT_FOUND:
+		"1-2017-491-4vshaken-HTTP-CM-vf-(VOIP)_v2.0.zip",
+//		did not succeed to create package of new VSP  expected:<200> but was:<500>:
+		"1-Riverbed-WANx1710VFv_v2.0.zip",
+		"1-LMSP_v5-062317_v3.0.zip",
+		"1-VF-Cisco-vCSR-1710_v2.0.zip",
+		"1-mDNS-preload_1710-0914_v3.0.zip",
+		"1-Firewall_170_Pala_Aloto_VF_v2.0.zip",
+		"2-mDNS-preload-1710-0914_v3.1VF.zip",
+		"1-2016-233_xsp_bfsa_nin2-vf-V1.0-VOIP-10-20.zip",
+//		did not succeed to submit new VSP expected:<200> but was:<417>
+		"1-VF_vEPDG_v4.0.zip",
+		"1-VF-2017-491_9vShaken-F5-LB_v1.0.zip",
+		"2-2016-73_Mow-AVPN-vpe-BV-L_v1.0.zip",
+		"VF-2017389vTSBCDPA2-v4.0.zip",
+		"1-vEPDG_V1.0(3).zip",
+		"1-vHSS-EPC-RDM3-Lab-VF-0830_V3.0.zip",
+		"2-2016-73_Mow-AVPN-vPE-BV-L_VF_V2.0_1027.zip",
+		"1-ADIOD_base_vPE_BV_v9.0.zip",
+		"Vhss-epc-rdm3-lab-vf-0921-v2.0-MOBILITY-10-20.zip",
+		"1-Vhss-epc-rdm3-lab-vf-0921_VF00816v2.0-MOBILITY-10-20.zip",
+		"1-VF-vUSP-CCF-DB-0620_v1.0base_vDB.zip",
+		"1-Vusp_vhss-ims_cm-repo1_V1.zip",
+		"1-base_vepdg_volume_v4.0.zip",
+		"1-Vocg_1710-2017-509(2)_v1.0.zip",
+		"1-2016-20-vISBC3VF_v3.0.zip",
+		"Apndns-1710-vf-v3.0-10-20.zip",
+		"1-VF-EFMC_DBE_Nin_v27.0.zip",
+		"2-APNDNS_1710-VF_v4.0.zip",
+		"1-Mow_adig_vpe_bv-V3.0.zip",
+		"1-VF-2017-488_ADOID_vPE_v9.0.zip",
+		"1-MOBT_Nimbus_3_Sprint-1.zip",
+		"1-VF-2017-491_9vShaken-CM_v1.0.zip",
+		"1-VF_zrdm5bpxtc02_092017_v2.0.zip",
+//		Error: TOSCA yaml file %1 cannot be modeled to VF as it does not contain \u0027topology_template
+		"1-VF-Checkpoint_vFW-1710_v1.0.zip"
+	);
+
+	/**
+	 * additional files to excludeXnfList files for tosca parser tests
+	 */
+	protected static List<String> excludeXnfListForToscaParser = //new ArrayList<String>();
+	Arrays.asList(
+		"1-Vvig-062017-(MOBILITY)_v5.1.zip",
+		"1-Mvm-sbc-1710-092017-(MOBILITY)_v7.0.zip",
+		"1-2017-492-5vshaken-SIP-AS-vf-(VOIP)_v2.0.zip",
+		"1-201712-488-adiod-vpe-(Layer-0-3)_v2.0.zip",
+		"2017-502.zip",
+		"1-2017-505-urlb-vhepe-(Layer-0-3)_v2.0.zip",
+		"2017-376_vMOG_11_1.zip",
+		"HeatCandidate_2017-09-22_01-30_60Name_Vdbe-vsp-15.1x49-d50.3-v3.0-(VOIP).zip",
+		"HeatCandidate_2017-09-22_01-42_57Name_2017389vtsbc4vf-v10.0-(VOIP).zip",
+		"HeatCandidate_2017-09-20_13-47_68Name_2017-492-5vshaken-SIP-AS-vf-v1.0-(VOIP)_10202017.zip",
+		"1-2016-20-visbc3vf-(VOIP)_v2.1.zip",
+		"1-2017-404_vUSP_vCCF_AIC3.0-(VOIP)_v6.0.zip",
+		"1-2017389vtsbc4vf-(VOIP)_v11.0.zip"
+	);
+	
+	public static String handleFilename(String heatFileName) {
+		final String namePrefix = String.format("%sVF%s", ElementFactory.getResourcePrefix(), "Onboarded-");
+		final String nameSuffix = "-" + getShortUUID();
+
+		String subHeatFileName = heatFileName.substring(0, heatFileName.lastIndexOf("."));
+
+		if ((namePrefix + subHeatFileName + nameSuffix).length() >= 50) {
+			subHeatFileName = subHeatFileName.substring(0, 50 - namePrefix.length() - nameSuffix.length());
+		}
+
+		if (subHeatFileName.contains("(") || subHeatFileName.contains(")")) {
+			subHeatFileName = subHeatFileName.replace("(", "-");
+			subHeatFileName = subHeatFileName.replace(")", "-");
+		}
+
+		String vnfName = namePrefix + subHeatFileName + nameSuffix;
+		return vnfName;
+	}
+	
+
+	public static String getShortUUID() {
+		return UUID.randomUUID().toString().split("-")[0];
+	}
+
+	private static RestResponse actionOnComponent(String vspid, String body, String onboardComponent, User user, String componentVersion) throws Exception {
+		Config config = Utils.getConfig();
+		String url = String.format(Urls.ACTION_ON_COMPONENT, config.getOnboardingBeHost(), config.getOnboardingBePort(), onboardComponent, vspid, componentVersion);
+		String userId = user.getUserId();
+		Map<String, String> headersMap = prepareHeadersMap(userId);
+
+		HttpRequest http = new HttpRequest();
+		RestResponse response = http.httpSendPut(url, body, headersMap);
+		return response;
+	}
+
+	public static String getVspValidationConfiguration() throws Exception {
+		Config config = Utils.getConfig();
+		String url = String.format(Urls.VSP_VALIDATION_CONFIGURATION, config.getOnboardingBeHost(), config.getOnboardingBePort());
+		Map<String, String> headersMap = prepareHeadersMap("cs0008");
+
+		HttpRequest http = new HttpRequest();
+		RestResponse response = http.httpSendGet(url, headersMap);
+		if(response.getErrorCode().intValue() == 200){
+			return ResponseParser.getValueFromJsonResponse(response.getResponse(), "enabled");
+		}
+		throw new Exception("Cannot get configuration file");
+		//return response;
+	}
+
+	public static String putVspValidationConfiguration(boolean value) throws Exception {
+		Config config = Utils.getConfig();
+		String url = String.format(Urls.VSP_VALIDATION_CONFIGURATION, config.getOnboardingBeHost(), config.getOnboardingBePort());
+		Map<String, String> headersMap = prepareHeadersMap("cs0008");
+
+		String body = String.format("{\"enabled\": \"%s\"}", value);
+
+		HttpRequest http = new HttpRequest();
+		RestResponse response = http.httpSendPut(url, body, headersMap);
+		if(response.getErrorCode().intValue() == 200){
+			return ResponseParser.getValueFromJsonResponse(response.getResponse(), "enabled");
+		}
+		throw new Exception("Cannot set configuration file");
+		//return response;
+	}
+
+	protected static Map<String, String> prepareHeadersMap(String userId) {
+		Map<String, String> headersMap = new HashMap<String, String>();
+		headersMap.put(HttpHeaderEnum.CONTENT_TYPE.getValue(), "application/json");
+		headersMap.put(HttpHeaderEnum.ACCEPT.getValue(), "application/json");
+		headersMap.put(HttpHeaderEnum.USER_ID.getValue(), userId);
+		return headersMap;
+	}
+
+	/**
+	 * @return
+	 * The method returns XNF names list from Files directory under sdc repository
+	 */
+	public static List<String> getXnfNamesFileList(XnfTypeEnum xnfTypeEnum) {
+		String filepath = FileHandling.getXnfRepositoryPath(xnfTypeEnum);
+		List<String> fileNamesFromFolder = FileHandling.getZipFileNamesFromFolder(filepath);
+		fileNamesFromFolder.removeAll(excludeXnfList);
+		return fileNamesFromFolder;
+	}
+
+	/**
+	 * @param vnfNamesFileList
+	 * @return divide List according to day of month, if day of month is even as get first half part of the List, else - second
+	 */
+	public static List<String> divideListByDayOfMonth(List<String> vnfNamesFileList){
+
+		Calendar cal = Calendar.getInstance();
+		int dayOfMonth = cal.get(Calendar.DAY_OF_MONTH)+1;
+		int filesCount = vnfNamesFileList.size();
+		if(dayOfMonth%2 == 0){
+			return vnfNamesFileList.subList(0,filesCount/2);
+		}else{
+			return vnfNamesFileList.subList(filesCount/2, filesCount);
+		}
+	}
+	
+	/**
+	 * @return
+	 * The method returns VNF names list from Files directory under sdc-vnfs repository excluding zip files that known as failed in tosca parser
+	 */
+	public static List<String> getVnfNamesFileListExcludeToscaParserFailure() {
+		List<String> fileNamesFromFolder = getXnfNamesFileList(XnfTypeEnum.VNF);
+		fileNamesFromFolder.removeAll(excludeXnfListForToscaParser);
+		return fileNamesFromFolder;
+	}
+
+
+	public static Object[][] filterObjectArrWithExcludedVnfs(Object[][] objectArr)
+	{
+		Object[][] filteredArObject = new Object[objectArr.length][];
+
+		int index = 0;
+
+		for (int i = 0; i < objectArr.length ; i++) {
+
+			String vnfSourceFile = (String) objectArr[i][0];
+			String vnfUpdateFile = (String) objectArr[i][1];
+
+			if(!excludeXnfList.contains(vnfSourceFile) && !excludeXnfList.contains(vnfUpdateFile))
+			{
+				filteredArObject[index] = new Object[]{vnfSourceFile , vnfUpdateFile };
+				index++;
+			}
+		}
+
+		return filteredArObject;
+	}
+}
+
+	
\ No newline at end of file
diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/utils/general/SnmpTypeEnum.java b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/utils/general/SnmpTypeEnum.java
new file mode 100644
index 0000000000..366962ef0a
--- /dev/null
+++ b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/utils/general/SnmpTypeEnum.java
@@ -0,0 +1,38 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * SDC
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.sdc.ci.tests.utils.general;
+
+enum SnmpTypeEnum{
+    SNMP_POLL ("snmp"),
+    SNMP_TRAP ("snmp-trap");
+
+    private String value;
+
+    public String getValue() {
+        return value;
+    }
+
+    private SnmpTypeEnum(String value) {
+        this.value = value;
+}
+
+}
+
diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/utils/general/VendorLicenseModelRestUtils.java b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/utils/general/VendorLicenseModelRestUtils.java
new file mode 100644
index 0000000000..72f8fc1a01
--- /dev/null
+++ b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/utils/general/VendorLicenseModelRestUtils.java
@@ -0,0 +1,309 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * SDC
+ * ================================================================================
+ * 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=========================================================
+ */
+
+package org.openecomp.sdc.ci.tests.utils.general;
+
+import com.aventstack.extentreports.Status;
+import org.json.JSONObject;
+import org.openecomp.sdc.be.model.User;
+import org.openecomp.sdc.ci.tests.api.ComponentBaseTest;
+import org.openecomp.sdc.ci.tests.api.Urls;
+import org.openecomp.sdc.ci.tests.config.Config;
+import org.openecomp.sdc.ci.tests.datatypes.VendorLicenseModel;
+import org.openecomp.sdc.ci.tests.datatypes.http.HttpRequest;
+import org.openecomp.sdc.ci.tests.datatypes.http.RestResponse;
+import org.openecomp.sdc.ci.tests.utils.Utils;
+import org.openecomp.sdc.ci.tests.utils.rest.ResponseParser;
+
+import java.util.Arrays;
+import java.util.Map;
+
+import static org.testng.AssertJUnit.assertEquals;
+
+public class VendorLicenseModelRestUtils {
+
+    public static void updateVendorLicense(VendorLicenseModel vendorLicenseModel, User user, Boolean isVlmUpdated) throws Exception {
+
+//		create major method
+        RestResponse creationMethodVendorLicense = creationMethodVendorLicense(vendorLicenseModel, user);
+        assertEquals("did not succeed to create method for vendor license", 200, creationMethodVendorLicense.getErrorCode().intValue());
+        vendorLicenseModel
+            .setVersion(ResponseParser.getValueFromJsonResponse(creationMethodVendorLicense.getResponse(), "id"));
+
+        if(isVlmUpdated) {
+//		TODO update vlm do nothing
+//		commit
+            RestResponse commitVendorLicense = commitVendorLicense(vendorLicenseModel, user);
+            assertEquals("did not succeed to commit vendor license", 200, commitVendorLicense.getErrorCode().intValue());
+        }
+
+//		submit
+        RestResponse submitVendorLicense = submitVendorLicense(vendorLicenseModel, user);
+        assertEquals("did not succeed to submit vendor license", 200, submitVendorLicense.getErrorCode().intValue());
+
+        if(ComponentBaseTest.getExtendTest() != null){
+            ComponentBaseTest.getExtendTest().log(Status.INFO, "Succeeded in updating the vendor license");
+        }
+    }
+
+     private static RestResponse getVLMComponentByVersion(String vlmId, String vlmVersion, User user) throws Exception{
+        Config config = Utils.getConfig();
+        String url = String.format(Urls.GET_VLM_COMPONENT_BY_VERSION, config.getOnboardingBeHost(),config.getOnboardingBePort(), vlmId,vlmVersion);
+        String userId = user.getUserId();
+
+        Map<String, String> headersMap = OnboardingUtils.prepareHeadersMap(userId);
+
+        HttpRequest http = new HttpRequest();
+        RestResponse response = http.httpSendGet(url, headersMap);
+        return response;
+    }
+
+     public static boolean validateVlmExist(String vlmId, String vlmVersion, User user) throws Exception {
+        RestResponse restResponse = getVLMComponentByVersion(vlmId, vlmVersion, user);
+        assertEquals(String.format("VLM version not updated, reponse code message: %s", restResponse.getResponse()),restResponse.getErrorCode().intValue(),200);
+        return (restResponse.getErrorCode()==200);
+    }
+
+    public static VendorLicenseModel createVendorLicense(User user) throws Exception {
+
+        VendorLicenseModel vendorLicenseModel;
+//		ComponentBaseTest.getExtendTest().log(Status.INFO, "Starting to create the vendor license");
+        String vendorLicenseName = "ciLicense" + OnboardingUtils.getShortUUID();
+        RestResponse vendorLicenseResponse = createVendorLicenseModels_1(vendorLicenseName, user);
+        assertEquals("did not succeed to create vendor license model", 200, vendorLicenseResponse.getErrorCode().intValue());
+        String vendorId = ResponseParser.getValueFromJsonResponse(vendorLicenseResponse.getResponse(), "itemId");
+        String versionId = ResponseParser.getValueFromJsonResponse(vendorLicenseResponse.getResponse(), "version:id");
+
+        RestResponse vendorKeyGroupsResponse = createVendorKeyGroups_2(vendorId, versionId, user);
+        assertEquals("did not succeed to create vendor key groups", 200, vendorKeyGroupsResponse.getErrorCode().intValue());
+        String keyGroupId = ResponseParser.getValueFromJsonResponse(vendorKeyGroupsResponse.getResponse(), "value");
+
+        RestResponse vendorEntitlementPool = createVendorEntitlementPool_3(vendorId, versionId, user);
+        assertEquals("did not succeed to create vendor entitlement pool", 200, vendorEntitlementPool.getErrorCode().intValue());
+        String entitlementPoolId = ResponseParser.getValueFromJsonResponse(vendorEntitlementPool.getResponse(), "value");
+
+        RestResponse vendorLicenseFeatureGroups = createVendorLicenseFeatureGroups_4(vendorId, versionId, keyGroupId, entitlementPoolId, user);
+        assertEquals("did not succeed to create vendor license feature groups", 200, vendorLicenseFeatureGroups.getErrorCode().intValue());
+        String featureGroupId = ResponseParser.getValueFromJsonResponse(vendorLicenseFeatureGroups.getResponse(), "value");
+
+        RestResponse vendorLicenseAgreement = createVendorLicenseAgreement_5(vendorId, versionId, featureGroupId, user);
+        assertEquals("did not succeed to create vendor license agreement", 200, vendorLicenseAgreement.getErrorCode().intValue());
+        String vendorLicenseAgreementId = ResponseParser.getValueFromJsonResponse(vendorLicenseAgreement.getResponse(), "value");
+
+//		RestResponse checkinVendorLicense = OnboardingUtils.checkinVendorLicense(vendorId, user, versionId);
+//		assertEquals("did not succeed to checkin vendor license", 200, checkinVendorLicense.getErrorCode().intValue());
+
+        vendorLicenseModel = new VendorLicenseModel(vendorId, vendorLicenseName, vendorLicenseAgreementId, featureGroupId);
+        vendorLicenseModel.setVersion(versionId); // Once object created and submitted, his initial version is 1.0
+
+        RestResponse submitVendorLicense = submitVendorLicense(vendorLicenseModel, user);
+        assertEquals("did not succeed to submit vendor license", 200, submitVendorLicense.getErrorCode().intValue());
+
+//		ComponentBaseTest.getExtendTest().log(Status.INFO, "Succeeded in creating the vendor license");
+
+        return vendorLicenseModel;
+    }
+
+    private static RestResponse actionOnComponent(String vspid, String body, String onboardComponent, User user, String componentVersion) throws Exception {
+        Config config = Utils.getConfig();
+        String url = String.format(Urls.ACTION_ON_COMPONENT, config.getOnboardingBeHost(), config.getOnboardingBePort(), onboardComponent, vspid, componentVersion);
+        String userId = user.getUserId();
+        Map<String, String> headersMap = OnboardingUtils.prepareHeadersMap(userId);
+
+        HttpRequest http = new HttpRequest();
+        RestResponse response = http.httpSendPut(url, body, headersMap);
+        return response;
+    }
+
+    private static RestResponse createMethodVendorLicense(String vendorId, String body, String onboardComponent, User user, String componentVersion) throws Exception {
+        Config config = Utils.getConfig();
+        String url = String.format(Urls.CREATE_METHOD, config.getOnboardingBeHost(), config.getOnboardingBePort(), onboardComponent, vendorId, componentVersion);
+        String userId = user.getUserId();
+        Map<String, String> headersMap = OnboardingUtils.prepareHeadersMap(userId);
+
+        HttpRequest http = new HttpRequest();
+        RestResponse response = http.httpSendPost(url, body, headersMap);
+        return response;
+    }
+
+    public static RestResponse submitVendorLicense(VendorLicenseModel vendorLicenseModel, User user) throws Exception {
+        return actionOnComponent(vendorLicenseModel.getVendorId(), "{\"action\":\"Submit\"}", "vendor-license-models", user, vendorLicenseModel
+            .getVersion());
+    }
+
+    /**
+     * @param vendorLicenseModel
+     * @param user
+     * @return
+     * checkOut exist VLM method
+     * @throws Exception
+     */
+    public static RestResponse creationMethodVendorLicense(VendorLicenseModel vendorLicenseModel, User user) throws Exception {
+        String messageBody = "{\"description\":\"2.0\",\"creationMethod\":\"major\"}";
+        return createMethodVendorLicense(vendorLicenseModel.getVendorId(), messageBody, "items", user, vendorLicenseModel
+            .getVersion());
+    }
+
+    public static RestResponse commitVendorLicense(VendorLicenseModel vendorLicenseModel, User user) throws Exception {
+        String messageBody = "{\"action\":\"Commit\",\"commitRequest\":{\"message\":\"commit\"}}";
+        return actionOnComponent(vendorLicenseModel.getVendorId(), messageBody, "items", user, vendorLicenseModel.getVersion());
+    }
+
+    public static RestResponse createVendorLicenseModels_1(String name, User user) throws Exception {
+        Config config = Utils.getConfig();
+        String url = String.format(Urls.CREATE_VENDOR_LISENCE_MODELS, config.getOnboardingBeHost(), config.getOnboardingBePort());
+        String userId = user.getUserId();
+
+        JSONObject jObject = new JSONObject();
+        jObject.put("vendorName", name);
+        jObject.put("description", "new vendor license model");
+        jObject.put("iconRef", "icon");
+
+        Map<String, String> headersMap = OnboardingUtils.prepareHeadersMap(userId);
+
+        HttpRequest http = new HttpRequest();
+        RestResponse response = http.httpSendPost(url, jObject.toString(), headersMap);
+        return response;
+
+    }
+
+    public static RestResponse createVendorLicenseAgreement_5(String vspid, String versionId, String featureGroupId, User user)
+            throws Exception {
+        Config config = Utils.getConfig();
+        String url = String.format(Urls.CREATE_VENDOR_LISENCE_AGREEMENT, config.getOnboardingBeHost(), config.getOnboardingBePort(), vspid, versionId);
+        String userId = user.getUserId();
+
+        JSONObject licenseTermpObject = new JSONObject();
+        licenseTermpObject.put("choice", "Fixed_Term");
+        licenseTermpObject.put("other", "");
+
+        JSONObject jObjectBody = new JSONObject();
+        jObjectBody.put("name", "abc");
+        jObjectBody.put("description", "new vendor license agreement");
+        jObjectBody.put("requirementsAndConstrains", "abc");
+        jObjectBody.put("licenseTerm", licenseTermpObject);
+        jObjectBody.put("addedFeatureGroupsIds", Arrays.asList(featureGroupId).toArray());
+
+        Map<String, String> headersMap = OnboardingUtils.prepareHeadersMap(userId);
+
+        HttpRequest http = new HttpRequest();
+        RestResponse response = http.httpSendPost(url, jObjectBody.toString(), headersMap);
+        return response;
+    }
+
+    public static RestResponse createVendorLicenseFeatureGroups_4(String vspid, String versionId, String licenseKeyGroupId,
+                                                                  String entitlementPoolId, User user) throws Exception {
+        Config config = Utils.getConfig();
+        String url = String.format(Urls.CREATE_VENDOR_LISENCE_FEATURE_GROUPS, config.getOnboardingBeHost(), config.getOnboardingBePort(), vspid, versionId);
+        String userId = user.getUserId();
+
+        JSONObject jObject = new JSONObject();
+        jObject.put("name", "xyz");
+        jObject.put("description", "new vendor license feature groups");
+        jObject.put("partNumber", "123abc456");
+//      jObject.put("manufacturerReferenceNumber", "5");
+        jObject.put("addedLicenseKeyGroupsIds", Arrays.asList(licenseKeyGroupId).toArray());
+        jObject.put("addedEntitlementPoolsIds", Arrays.asList(entitlementPoolId).toArray());
+
+        Map<String, String> headersMap = OnboardingUtils.prepareHeadersMap(userId);
+
+        HttpRequest http = new HttpRequest();
+        RestResponse response = http.httpSendPost(url, jObject.toString(), headersMap);
+        return response;
+
+    }
+
+    public static RestResponse createVendorEntitlementPool_3(String vspid, String versionId, User user) throws Exception {
+        Config config = Utils.getConfig();
+        String url = String.format(Urls.CREATE_VENDOR_LISENCE_ENTITLEMENT_POOL, config.getOnboardingBeHost(), config.getOnboardingBePort(), vspid, versionId);
+        String userId = user.getUserId();
+
+        JSONObject jEntitlementMetricObject = new JSONObject();
+        jEntitlementMetricObject.put("choice", "CPU");
+        jEntitlementMetricObject.put("other", "");
+
+        JSONObject jAggregationFunctionObject = new JSONObject();
+        jAggregationFunctionObject.put("choice", "Peak");
+        jAggregationFunctionObject.put("other", "");
+
+        JSONObject jOperationalScope = new JSONObject();
+        jOperationalScope.put("choices", Arrays.asList("Availability_Zone").toArray());
+        jOperationalScope.put("other", "");
+
+        JSONObject jTimeObject = new JSONObject();
+        jTimeObject.put("choice", "Hour");
+        jTimeObject.put("other", "");
+
+        JSONObject jObjectBody = new JSONObject();
+        jObjectBody.put("name", "def"+ OnboardingUtils.getShortUUID());
+        jObjectBody.put("description", "new vendor license entitlement pool");
+        jObjectBody.put("type", "Universal");
+        jObjectBody.put("thresholdValue", "23");
+        jObjectBody.put("thresholdUnits", "Absolute");
+        jObjectBody.put("entitlementMetric", jEntitlementMetricObject);
+        jObjectBody.put("increments", "abcd");
+        jObjectBody.put("aggregationFunction", jAggregationFunctionObject);
+        jObjectBody.put("operationalScope", jOperationalScope);
+        jObjectBody.put("time", jTimeObject);
+        jObjectBody.put("manufacturerReferenceNumber", "123aaa");
+
+        Map<String, String> headersMap = OnboardingUtils.prepareHeadersMap(userId);
+
+        HttpRequest http = new HttpRequest();
+        RestResponse response = http.httpSendPost(url, jObjectBody.toString(), headersMap);
+        return response;
+    }
+
+    public static RestResponse createVendorKeyGroups_2(String vspid, String versionId, User user) throws Exception {
+        Config config = Utils.getConfig();
+        String url = String.format(Urls.CREATE_VENDOR_LISENCE_KEY_GROUPS, config.getOnboardingBeHost(), config.getOnboardingBePort(), vspid, versionId);
+        String userId = user.getUserId();
+
+        JSONObject jOperationalScope = new JSONObject();
+        jOperationalScope.put("choices", Arrays.asList("Tenant").toArray());
+        jOperationalScope.put("other", "");
+
+        JSONObject jObjectBody = new JSONObject();
+        jObjectBody.put("name", "keyGroup" + OnboardingUtils.getShortUUID());
+        jObjectBody.put("description", "new vendor license key group");
+        jObjectBody.put("operationalScope", jOperationalScope);
+        jObjectBody.put("type", "Universal");
+
+        Map<String, String> headersMap = OnboardingUtils.prepareHeadersMap(userId);
+
+        HttpRequest http = new HttpRequest();
+        RestResponse response = http.httpSendPost(url, jObjectBody.toString(), headersMap);
+        return response;
+    }
+
+    public static RestResponse validateUpload(String vspid, User user, String vspVersion) throws Exception {
+        String body = null;
+        Config config = Utils.getConfig();
+        String url = String.format(Urls.VALIDATE_UPLOAD, config.getOnboardingBeHost(), config.getOnboardingBePort(), vspid,vspVersion);
+        String userId = user.getUserId();
+
+        Map<String, String> headersMap = OnboardingUtils.prepareHeadersMap(userId);
+        HttpRequest http = new HttpRequest();
+        RestResponse response = http.httpSendPut(url, body, headersMap);
+
+        return response;
+    }
+
+}
diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/utils/general/VendorSoftwareProductRestUtils.java b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/utils/general/VendorSoftwareProductRestUtils.java
new file mode 100644
index 0000000000..864dd891ac
--- /dev/null
+++ b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/utils/general/VendorSoftwareProductRestUtils.java
@@ -0,0 +1,744 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * SDC
+ * ================================================================================
+ * 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=========================================================
+ */
+
+package org.openecomp.sdc.ci.tests.utils.general;
+
+import com.aventstack.extentreports.Status;
+import com.clearspring.analytics.util.Pair;
+import com.google.gson.Gson;
+import org.apache.commons.io.IOUtils;
+import org.apache.http.HttpEntity;
+import org.apache.http.client.methods.CloseableHttpResponse;
+import org.apache.http.client.methods.HttpPost;
+import org.apache.http.entity.mime.MultipartEntityBuilder;
+import org.apache.http.entity.mime.content.FileBody;
+import org.apache.http.impl.client.CloseableHttpClient;
+import org.apache.http.impl.client.HttpClients;
+import org.json.simple.JSONArray;
+import org.json.simple.JSONValue;
+import org.openecomp.sdc.be.model.User;
+import org.openecomp.sdc.ci.tests.api.ComponentBaseTest;
+import org.openecomp.sdc.ci.tests.api.Urls;
+import org.openecomp.sdc.ci.tests.config.Config;
+import org.openecomp.sdc.ci.tests.datatypes.*;
+import org.openecomp.sdc.ci.tests.datatypes.enums.CvfcTypeEnum;
+import org.openecomp.sdc.ci.tests.datatypes.enums.ResourceCategoryEnum;
+import org.openecomp.sdc.ci.tests.datatypes.http.HttpHeaderEnum;
+import org.openecomp.sdc.ci.tests.datatypes.http.HttpRequest;
+import org.openecomp.sdc.ci.tests.datatypes.http.RestResponse;
+import org.openecomp.sdc.ci.tests.utils.Utils;
+import org.openecomp.sdc.ci.tests.utils.rest.BaseRestUtils;
+import org.openecomp.sdc.ci.tests.utils.rest.ResponseParser;
+
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.StringWriter;
+import java.nio.file.FileSystems;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Map;
+
+import static org.testng.AssertJUnit.assertEquals;
+
+public class VendorSoftwareProductRestUtils {
+
+    public static VendorSoftwareProductObject createVendorSoftwareProduct(ResourceReqDetails resourceReqDetails, String heatFileName, String filepath, User user, VendorLicenseModel vendorLicenseModel, Map<CvfcTypeEnum, String> cvfcArtifacts)
+            throws Exception {
+
+        VendorSoftwareProductObject vendorSoftwareProductObject = createVSP(resourceReqDetails, heatFileName, filepath, user,
+            vendorLicenseModel);
+        if(cvfcArtifacts != null && ! cvfcArtifacts.isEmpty()){
+            addCvfcArtifacts(cvfcArtifacts, user, vendorSoftwareProductObject);
+        }
+        prepareVspForUse(user, vendorSoftwareProductObject, true);
+        return vendorSoftwareProductObject;
+    }
+
+    public static VendorSoftwareProductObject createVendorSoftwareProduct(ResourceReqDetails resourceReqDetails, String heatFileName, String filepath, User user, VendorLicenseModel vendorLicenseModel)
+            throws Exception {
+
+        Map<CvfcTypeEnum, String> cvfcArtifacts = new HashMap<>();
+        return createVendorSoftwareProduct(resourceReqDetails, heatFileName, filepath, user, vendorLicenseModel, cvfcArtifacts);
+    }
+
+    /**
+     * @param user user
+     * @param vendorSoftwareProductObject vendorSoftwareProductObject
+     * @param isVspUpdated - in case isVspUpdated = false the commit API should not be issued
+     * the method do commit, submit and create package
+     * @throws Exception
+     */
+    public static void prepareVspForUse(User user, VendorSoftwareProductObject vendorSoftwareProductObject, Boolean isVspUpdated) throws Exception {
+
+        if(isVspUpdated) {
+            RestResponse commit = commitVendorSoftwareProduct(vendorSoftwareProductObject, user);
+            assertEquals("did not succeed to commit new VSP", 200, commit.getErrorCode().intValue());
+        }
+        RestResponse submit = submitVendorSoftwareProduct(vendorSoftwareProductObject.getVspId(), user, vendorSoftwareProductObject.getComponentId());
+        assertEquals("did not succeed to submit new VSP", 200, submit.getErrorCode().intValue());
+
+        RestResponse createPackage = createPackageOfVendorSoftwareProduct(vendorSoftwareProductObject.getVspId(), user, vendorSoftwareProductObject.getComponentId());
+        assertEquals("did not succeed to create package of new VSP ", 200, createPackage.getErrorCode().intValue());
+
+    }
+
+    public static VendorSoftwareProductObject createAndFillVendorSoftwareProduct(ResourceReqDetails resourceReqDetails, String heatFileName, String filePath, User user, VendorLicenseModel vendorLicenseModel, Map<CvfcTypeEnum, String> cvfcArtifacts)
+            throws Exception {
+
+        VendorSoftwareProductObject createVendorSoftwareProduct = createVendorSoftwareProduct(resourceReqDetails, heatFileName, filePath, user,
+            vendorLicenseModel, cvfcArtifacts);
+        VendorSoftwareProductObject vendorSoftwareProductObject = fillVendorSoftwareProductObjectWithMetaData(heatFileName, createVendorSoftwareProduct);
+        return vendorSoftwareProductObject;
+
+    }
+
+
+    public static VendorSoftwareProductObject createVSP(ResourceReqDetails resourceReqDetails, String heatFileName, String filepath, User user, VendorLicenseModel vendorLicenseModel) throws Exception {
+        String vspName = handleFilename(heatFileName);
+
+        if(ComponentBaseTest.getExtendTest() != null){
+            ComponentBaseTest.getExtendTest().log(Status.INFO, "Starting to create the vendor software product");
+        }
+
+        Pair<RestResponse, VendorSoftwareProductObject> createNewVspPair = createNewVendorSoftwareProduct(resourceReqDetails, vspName,
+            vendorLicenseModel, user);
+        assertEquals("did not succeed to create new VSP", 200,createNewVspPair.left.getErrorCode().intValue());
+
+        RestResponse uploadHeatPackage = uploadHeatPackage(filepath, heatFileName,  createNewVspPair.right, user);
+        assertEquals("did not succeed to upload HEAT package", 200, uploadHeatPackage.getErrorCode().intValue());
+
+        RestResponse validateUpload = validateUpload(createNewVspPair.right, user);
+        assertEquals("did not succeed to validate upload process, reason: " + validateUpload.getResponse(), 200, validateUpload.getErrorCode().intValue());
+
+        return createNewVspPair.right;
+    }
+
+    public static void updateVspWithVfcArtifacts(String filepath, String updatedSnmpPoll, String updatedSnmpTrap, String componentInstanceId, User user, VendorSoftwareProductObject vendorSoftwareProductObject) throws Exception{
+        RestResponse checkout = creationMethodVendorSoftwareProduct(vendorSoftwareProductObject, user);
+        assertEquals("did not succeed to checkout new VSP", 200, checkout.getErrorCode().intValue());
+//		ExtentTestActions.log(Status.INFO, "Deleting SNMP POLL");
+        deleteArtifactByType(componentInstanceId, vendorSoftwareProductObject, user, CvfcTypeEnum.SNMP_POLL);
+//		ExtentTestActions.log(Status.INFO, "Deleting SNMP TRAP");
+        deleteArtifactByType(componentInstanceId, vendorSoftwareProductObject, user, CvfcTypeEnum.SNMP_TRAP);
+        addVFCArtifacts(filepath, updatedSnmpPoll, updatedSnmpTrap, vendorSoftwareProductObject, user, componentInstanceId);
+        prepareVspForUse(user, vendorSoftwareProductObject, true);
+    }
+
+    private static RestResponse deleteArtifactByType(String componentInstanceId, VendorSoftwareProductObject vendorSoftwareProductObject, User user, CvfcTypeEnum snmpType) throws Exception
+    {
+        Config config = Utils.getConfig();
+        String url = String.format(Urls.DELETE_AMDOCS_ARTIFACT_BY_TYPE, config.getOnboardingBeHost(), config.getOnboardingBePort(), vendorSoftwareProductObject.getVspId(), vendorSoftwareProductObject.getComponentId(), componentInstanceId, snmpType.getValue());
+        String userId = user.getUserId();
+        Map<String, String> headersMap = OnboardingUtils.prepareHeadersMap(userId);
+
+        HttpRequest http = new HttpRequest();
+        RestResponse response = http.httpSendDelete(url, headersMap);
+        return response;
+    }
+
+    public static void updateVendorSoftwareProductToNextVersion(VendorSoftwareProductObject vendorSoftwareProductObject, User user, Boolean isVspUpdated) throws Throwable {
+
+        RestResponse createMethod = creationMethodVendorSoftwareProduct(vendorSoftwareProductObject, user);
+        assertEquals("did not succeed to createMethod for new VSP", 200, createMethod.getErrorCode().intValue());
+        prepareVspForUse(user,vendorSoftwareProductObject, isVspUpdated);
+
+    }
+
+    public static String handleFilename(String heatFileName) {
+        final String namePrefix = String.format("%sVF%s", ElementFactory.getResourcePrefix(), "Onboarded-");
+        final String nameSuffix = "-" + OnboardingUtils.getShortUUID();
+
+        String subHeatFileName = heatFileName.substring(0, heatFileName.lastIndexOf("."));
+
+        if ((namePrefix + subHeatFileName + nameSuffix).length() >= 50) {
+            subHeatFileName = subHeatFileName.substring(0, 50 - namePrefix.length() - nameSuffix.length());
+        }
+
+        if (subHeatFileName.contains("(") || subHeatFileName.contains(")")) {
+            subHeatFileName = subHeatFileName.replace("(", "-");
+            subHeatFileName = subHeatFileName.replace(")", "-");
+        }
+
+        String vnfName = namePrefix + subHeatFileName + nameSuffix;
+        return vnfName;
+    }
+
+    public static String addVFCArtifacts(String filepath, String snmpPoll, String snmpTrap, VendorSoftwareProductObject vendorSoftwareProductObject, User user, String componentInstanceId) throws Exception{
+        componentInstanceId = (componentInstanceId == null) ? getVspComponentId(vendorSoftwareProductObject, user) : componentInstanceId;
+        if (componentInstanceId != null){
+            if (snmpPoll != null){
+//				ExtentTestActions.log(Status.INFO, "Adding VFC artifact of type SNMP POLL with the file " + snmpPoll);
+                RestResponse uploadSnmpPollArtifact = uploadSnmpPollArtifact(filepath, snmpPoll, vendorSoftwareProductObject, user, componentInstanceId);
+                assertEquals("Did not succeed to add SNMP POLL", 200, uploadSnmpPollArtifact.getErrorCode().intValue());
+            }
+            if (snmpTrap != null){
+//				ExtentTestActions.log(Status.INFO, "Adding VFC artifact of type SNMP TRAP with the file " + snmpTrap);
+                RestResponse uploadSnmpTrapArtifact = uploadSnmpTrapArtifact(filepath, snmpTrap, vendorSoftwareProductObject, user, componentInstanceId);
+                assertEquals("Did not succeed to add SNMP TRAP", 200, uploadSnmpTrapArtifact.getErrorCode().intValue());
+            }
+        }
+
+        return componentInstanceId;
+    }
+
+    public static String addCvfcArtifacts(Map<CvfcTypeEnum, String> componentVfcArtifacts, User user, VendorSoftwareProductObject vendorSoftwareProductObject) throws Exception{
+        String componentInstanceId = getVspComponentId(vendorSoftwareProductObject, user);
+        if (componentInstanceId != null){
+            for(Map.Entry<CvfcTypeEnum, String> entry : componentVfcArtifacts.entrySet()){
+//				ExtentTestActions.log(Status.INFO, "Adding VFC artifact of type " + entry.getKey().getValue() + " with the file " + entry.getValue());
+                RestResponse uploadSnmpPollArtifact = uploadCvfcArtifact(entry.getValue(), entry.getKey().getValue(), user, vendorSoftwareProductObject, componentInstanceId);
+                assertEquals("Did not succeed to add " + entry.getKey().getValue(), BaseRestUtils.STATUS_CODE_SUCCESS, uploadSnmpPollArtifact.getErrorCode().intValue());
+            }
+        }
+        return componentInstanceId;
+    }
+
+    public static String addVFCArtifacts(String filepath, String snmpPoll, String snmpTrap, VendorSoftwareProductObject vendorSoftwareProductObject, User user) throws Exception{
+        return addVFCArtifacts(filepath, snmpPoll, snmpTrap, vendorSoftwareProductObject, user, null);
+    }
+
+    public static RestResponse uploadCvfcArtifact(String filepath, String cvfcType, User user, VendorSoftwareProductObject vendorSoftwareProductObject, String componentInstanceId) throws IOException {
+        Config config = Utils.getConfig();
+        String snmpPollUrl = String.format(Urls.UPLOAD_AMDOCS_ARTIFACT, config.getOnboardingBeHost(),config.getOnboardingBePort(), vendorSoftwareProductObject.getVspId(), vendorSoftwareProductObject.getComponentId(), componentInstanceId, cvfcType);
+        return uploadFile(filepath, null, snmpPollUrl, user);
+    }
+
+
+    private static RestResponse uploadSnmpPollArtifact(String filepath, String zipArtifact, VendorSoftwareProductObject vendorSoftwareProductObject, User user, String componentInstanceId) throws IOException {
+        Config config = Utils.getConfig();
+        String snmpPollUrl = String.format(Urls.UPLOAD_SNMP_POLL_ARTIFACT, config.getOnboardingBeHost(),config.getOnboardingBePort(), vendorSoftwareProductObject.getVspId(), vendorSoftwareProductObject.getComponentId(), componentInstanceId);
+        return uploadFile(filepath, zipArtifact, snmpPollUrl, user);
+    }
+
+    private static RestResponse uploadSnmpTrapArtifact(String filepath, String zipArtifact, VendorSoftwareProductObject vendorSoftwareProductObject, User user, String vspComponentId) throws IOException {
+        Config config = Utils.getConfig();
+        String snmpTrapUrl = String.format(Urls.UPLOAD_SNMP_POLL_ARTIFACT, config.getOnboardingBeHost(),config.getOnboardingBePort(), vendorSoftwareProductObject.getVspId(), vendorSoftwareProductObject.getComponentId(), vspComponentId);
+        return uploadFile(filepath, zipArtifact, snmpTrapUrl, user);
+    }
+
+    private static RestResponse deleteSnmpArtifact(String componentId, String vspId, User user, SnmpTypeEnum snmpType) throws Exception
+    {
+        Config config = Utils.getConfig();
+        String url = String.format(Urls.DELETE_AMDOCS_ARTIFACT_BY_TYPE, config.getOnboardingBeHost(),config.getOnboardingBePort(), vspId, componentId, snmpType.getValue());
+        String userId = user.getUserId();
+
+        Map<String, String> headersMap = OnboardingUtils.prepareHeadersMap(userId);
+
+        HttpRequest http = new HttpRequest();
+        RestResponse response = http.httpSendDelete(url, headersMap);
+        return response;
+    }
+
+
+    /**
+     * @param vendorSoftwareProductObject VendorSoftwareProductObject
+     * @param user user object
+     * @return return first found component instance Id from list
+     * @throws Exception Exception
+     */
+    private static String getVspComponentId(VendorSoftwareProductObject vendorSoftwareProductObject, User user) throws Exception {
+        RestResponse componentList = getVSPComponents(vendorSoftwareProductObject, user);
+        String response = componentList.getResponse();
+        Map<String, Object> responseMap = (Map<String, Object>) JSONValue.parse(response);
+        JSONArray results = (JSONArray)responseMap.get("results");
+        for (Object res : results){
+            Map<String, Object> componentMap = (Map<String, Object>) JSONValue.parse(res.toString());
+            String componentInstanceId = componentMap.get("id").toString();
+            return componentInstanceId;
+        }
+        return null;
+    }
+
+    private static RestResponse getVSPComponents(VendorSoftwareProductObject vendorSoftwareProductObject, User user) throws Exception{
+        Config config = Utils.getConfig();
+        String url = String.format(Urls.GET_VSP_COMPONENTS, config.getOnboardingBeHost(),config.getOnboardingBePort(), vendorSoftwareProductObject.getVspId(), vendorSoftwareProductObject.getComponentId());
+        Map<String, String> headersMap = OnboardingUtils.prepareHeadersMap(user.getUserId());
+
+        HttpRequest http = new HttpRequest();
+        RestResponse response = http.httpSendGet(url, headersMap);
+        return response;
+    }
+
+
+
+    public static boolean validateVspExist(VendorSoftwareProductObject vendorSoftwareProductObject, User user) throws Exception {
+        RestResponse restResponse = getVSPComponentByVersion(vendorSoftwareProductObject, user);
+        assertEquals(String.format("Vsp version not updated, reponse message: %s", restResponse.getResponse()),restResponse.getErrorCode().intValue(),200);
+        return (restResponse.getErrorCode()==200);
+    }
+
+
+    private static RestResponse getVSPComponentByVersion(VendorSoftwareProductObject vendorSoftwareProductObject, User user) throws Exception{
+        Config config = Utils.getConfig();
+        String url = String.format(Urls.GET_VSP_COMPONENT_BY_VERSION, config.getOnboardingBeHost(),config.getOnboardingBePort(), vendorSoftwareProductObject.getVspId(), vendorSoftwareProductObject.getComponentId());
+        String userId = user.getUserId();
+
+        Map<String, String> headersMap = OnboardingUtils.prepareHeadersMap(userId);
+
+        HttpRequest http = new HttpRequest();
+        RestResponse response = http.httpSendGet(url, headersMap);
+        return response;
+    }
+
+    private static RestResponse actionOnComponent(String vspid, String body, String onboardComponent, User user, String componentVersion) throws Exception {
+        Config config = Utils.getConfig();
+        String url = String.format(Urls.ACTION_ON_COMPONENT, config.getOnboardingBeHost(), config.getOnboardingBePort(), onboardComponent, vspid, componentVersion);
+        String userId = user.getUserId();
+        Map<String, String> headersMap = OnboardingUtils.prepareHeadersMap(userId);
+
+        HttpRequest http = new HttpRequest();
+        RestResponse response = http.httpSendPut(url, body, headersMap);
+        return response;
+    }
+
+//    TODO to check if for onboard API ACTION_ARCHIVE_RESTORE_COMPONENT format was added version parameter
+//    if yes remove this method and use general actionOnComponent method
+    private static RestResponse actionOnComponent(String vspid, String body, String onboardComponent, User user) throws Exception {
+        Config config = Utils.getConfig();
+        String url = String.format(Urls.ACTION_ARCHIVE_RESTORE_COMPONENT, config.getCatalogBeHost(), config.getCatalogBePort(), onboardComponent, vspid);
+        String userId = user.getUserId();
+        Map<String, String> headersMap = OnboardingUtils.prepareHeadersMap(userId);
+
+        HttpRequest http = new HttpRequest();
+        RestResponse response = http.httpSendPut(url, body, headersMap);
+        return response;
+    }
+
+    public static Pair<RestResponse, VendorSoftwareProductObject> createNewVendorSoftwareProduct(ResourceReqDetails resourceReqDetails, String vspName, VendorLicenseModel vendorLicenseModel, User user) throws Exception {
+
+        Config config = Utils.getConfig();
+        String url = String.format(Urls.CREATE_VENDOR_SOFTWARE_PRODUCT, config.getOnboardingBeHost(), config.getOnboardingBePort());
+        String userId = user.getUserId();
+        VendorSoftwareProductObject vendorSoftwareProductObject = new VendorSoftwareProductObject();
+        LicensingData licensingData = new LicensingData(
+            vendorLicenseModel.getVendorLicenseAgreementId(), Arrays.asList(vendorLicenseModel.getFeatureGroupId()));
+        ResourceCategoryEnum resourceCategoryEnum = ResourceCategoryEnum.findEnumNameByValues(resourceReqDetails.getCategories().get(0).getName(), resourceReqDetails.getCategories().get(0).getSubcategories().get(0).getName());
+
+        vendorSoftwareProductObject.setName(vspName);
+        vendorSoftwareProductObject.setDescription(resourceReqDetails.getDescription());
+        vendorSoftwareProductObject.setCategory(resourceCategoryEnum.getCategoryUniqeId());
+        vendorSoftwareProductObject.setSubCategory(resourceCategoryEnum.getSubCategoryUniqeId());
+        vendorSoftwareProductObject.setOnboardingMethod("NetworkPackage");
+        vendorSoftwareProductObject.setVendorName(vendorLicenseModel.getVendorLicenseName());
+        vendorSoftwareProductObject.setVendorId(vendorLicenseModel.getVendorId());
+        vendorSoftwareProductObject.setIcon("icon");
+        vendorSoftwareProductObject.setLicensingData(licensingData);
+        vendorSoftwareProductObject.setLicensingVersion(vendorLicenseModel.getVersion());
+
+        Map<String, String> headersMap = OnboardingUtils.prepareHeadersMap(userId);
+        HttpRequest http = new HttpRequest();
+        Gson gson = new Gson();
+        String body = gson.toJson(vendorSoftwareProductObject);
+
+        RestResponse response = http.httpSendPost(url, body, headersMap);
+
+        vendorSoftwareProductObject.setVspId(ResponseParser.getValueFromJsonResponse(response.getResponse(), "itemId"));
+        vendorSoftwareProductObject.setComponentId(ResponseParser.getValueFromJsonResponse(response.getResponse(), "version:id"));
+//		vendorSoftwareProductObject.setVersion(ResponseParser.getValueFromJsonResponse(response.getResponse(), "version:name"));
+        vendorSoftwareProductObject.setAttContact(user.getUserId());
+
+        return new Pair<>(response, vendorSoftwareProductObject);
+    }
+
+    public static RestResponse validateUpload(VendorSoftwareProductObject vendorSoftwareProductObject, User user) throws Exception {
+        Config config = Utils.getConfig();
+        String url = String.format(Urls.VALIDATE_UPLOAD, config.getOnboardingBeHost(), config.getOnboardingBePort(), vendorSoftwareProductObject.getVspId(), vendorSoftwareProductObject.getComponentId());
+        String userId = user.getUserId();
+
+        Map<String, String> headersMap = OnboardingUtils.prepareHeadersMap(userId);
+        HttpRequest http = new HttpRequest();
+        RestResponse response = http.httpSendPut(url, null, headersMap);
+
+        return response;
+    }
+
+    public static RestResponse uploadHeatPackage(String filepath, String filename, VendorSoftwareProductObject vendorSoftwareProductObject, User user) throws Exception {
+        Config config = Utils.getConfig();
+        String url = String.format(Urls.UPLOAD_HEAT_PACKAGE, config.getOnboardingBeHost(), config.getOnboardingBePort(), vendorSoftwareProductObject.getVspId(), vendorSoftwareProductObject.getComponentId());
+        return uploadFile(filepath, filename, url, user);
+    }
+
+    private static RestResponse uploadFile(String filepath, String filename, String url, User user) throws IOException{
+        CloseableHttpResponse response = null;
+
+        MultipartEntityBuilder mpBuilder = MultipartEntityBuilder.create();
+        mpBuilder.addPart("upload", new FileBody(getTestZipFile(filepath, filename)));
+
+        Map<String, String> headersMap = OnboardingUtils.prepareHeadersMap(user.getUserId());
+        headersMap.put(HttpHeaderEnum.CONTENT_TYPE.getValue(), "multipart/form-data");
+
+        CloseableHttpClient client = HttpClients.createDefault();
+        try {
+            HttpPost httpPost = new HttpPost(url);
+            RestResponse restResponse = new RestResponse();
+
+            Iterator<String> iterator = headersMap.keySet().iterator();
+            while (iterator.hasNext()) {
+                String key = iterator.next();
+                String value = headersMap.get(key);
+                httpPost.addHeader(key, value);
+            }
+            httpPost.setEntity(mpBuilder.build());
+            response = client.execute(httpPost);
+            HttpEntity entity = response.getEntity();
+            String responseBody = null;
+            if (entity != null) {
+                InputStream instream = entity.getContent();
+                try {
+                    StringWriter writer = new StringWriter();
+                    IOUtils.copy(instream, writer);
+                    responseBody = writer.toString();
+                } finally {
+                    instream.close();
+                }
+            }
+
+            restResponse.setErrorCode(response.getStatusLine().getStatusCode());
+            restResponse.setResponse(responseBody);
+
+            return restResponse;
+
+        } finally {
+            closeResponse(response);
+            closeHttpClient(client);
+
+        }
+    }
+
+    private static void closeResponse(CloseableHttpResponse response) {
+        try {
+            if (response != null) {
+                response.close();
+            }
+        } catch (IOException e) {
+            System.out.println(String.format("failed to close client or response: %s", e.getMessage()));
+        }
+    }
+
+    private static void closeHttpClient(CloseableHttpClient client) {
+        try {
+            if (client != null) {
+                client.close();
+            }
+        } catch (IOException e) {
+            System.out.println(String.format("failed to close client or response: %s", e.getMessage()));
+        }
+    }
+
+    private static File getTestZipFile(String filepath, String filename) throws IOException {
+        Config config = Utils.getConfig();
+        String sourceDir = config.getImportResourceTestsConfigDir();
+        java.nio.file.Path filePath;
+        if(filename == null){
+            filePath = FileSystems.getDefault().getPath(filepath);
+        }else{
+            filePath = FileSystems.getDefault().getPath(filepath + File.separator + filename);
+        }
+        return filePath.toFile();
+    }
+
+    public static RestResponse checkinVendorSoftwareProduct(User user, VendorSoftwareProductObject vendorSoftwareProductObject) throws Exception {
+        Config config = Utils.getConfig();
+        String url = String.format(Urls.UPDATE_VSP, config.getOnboardingBeHost(), config.getOnboardingBePort(), vendorSoftwareProductObject.getVspId(), vendorSoftwareProductObject.getComponentId());
+
+        String userId = user.getUserId();
+        Map<String, String> headersMap = OnboardingUtils.prepareHeadersMap(userId);
+//		unset vspId, componentId, attContact, onboardingMethod
+        String vspId = vendorSoftwareProductObject.getVspId();
+        String componentId = vendorSoftwareProductObject.getComponentId();
+        String attContact = vendorSoftwareProductObject.getAttContact();
+        String onboardingMethod = vendorSoftwareProductObject.getOnboardingMethod();
+        vendorSoftwareProductObject.setVspId(null);
+        vendorSoftwareProductObject.setComponentId(null);
+        vendorSoftwareProductObject.setAttContact(null);
+        vendorSoftwareProductObject.setOnboardingMethod(null);
+        Gson gson = new Gson();
+        String body = gson.toJson(vendorSoftwareProductObject);
+        HttpRequest http = new HttpRequest();
+        RestResponse response = http.httpSendPut(url, body, headersMap);
+//		set back vspId, componentId, attContact, onboardingMethod
+        vendorSoftwareProductObject.setVspId(vspId);
+        vendorSoftwareProductObject.setComponentId(componentId);
+        vendorSoftwareProductObject.setAttContact(attContact);
+        vendorSoftwareProductObject.setOnboardingMethod(onboardingMethod);
+
+        return response;
+    }
+
+    public static RestResponse commitVendorSoftwareProduct(VendorSoftwareProductObject vendorSoftwareProductObject, User user) throws Exception {
+        String messageBody = "{\"action\":\"Commit\",\"commitRequest\":{\"message\":\"commit\"}}";
+        return actionOnComponent(vendorSoftwareProductObject.getVspId(), messageBody, "items", user, vendorSoftwareProductObject.getComponentId());
+    }
+
+    public static RestResponse submitVendorSoftwareProduct(String vspid, User user, String componentId) throws Exception {
+        return actionOnComponent(vspid, "{\"action\":\"Submit\"}", "vendor-software-products", user, componentId);
+    }
+
+    public static RestResponse createPackageOfVendorSoftwareProduct(String vspid, User user, String componentId) throws Exception {
+        return actionOnComponent(vspid, "{\"action\":\"Create_Package\"}", "vendor-software-products", user, componentId);
+    }
+
+    public static RestResponse creationMethodVendorSoftwareProduct(VendorSoftwareProductObject vendorSoftwareProductObject, User user) throws Exception {
+        String messageBody = "{\"description\":\"2.0\",\"creationMethod\":\"major\"}";
+        return createMethodVendorSoftwareProduct(vendorSoftwareProductObject, messageBody, "items", user);
+    }
+
+    private static RestResponse createMethodVendorSoftwareProduct(VendorSoftwareProductObject vendorSoftwareProductObject, String body, String onboardComponent, User user) throws Exception {
+        Config config = Utils.getConfig();
+        String url = String.format(Urls.CREATE_METHOD, config.getOnboardingBeHost(), config.getOnboardingBePort(), onboardComponent, vendorSoftwareProductObject.getVspId(), vendorSoftwareProductObject.getComponentId());
+        String userId = user.getUserId();
+        Map<String, String> headersMap = OnboardingUtils.prepareHeadersMap(userId);
+
+        HttpRequest http = new HttpRequest();
+        RestResponse response = http.httpSendPost(url, body, headersMap);
+        if(response.getErrorCode().intValue() == 200) {
+            vendorSoftwareProductObject.setComponentId(ResponseParser.getValueFromJsonResponse(response.getResponse(), "id"));
+        }
+        return response;
+    }
+
+    public static VendorSoftwareProductObject updateVSPWithNewVLMParameters(VendorSoftwareProductObject vendorSoftwareProductObject, VendorLicenseModel vendorLicenseModel, User user) throws Exception {
+
+        RestResponse createMethod = creationMethodVendorSoftwareProduct(vendorSoftwareProductObject, user);
+        assertEquals("did not succeed to checkout new VSP", 200, createMethod.getErrorCode().intValue());
+//        vendorSoftwareProductObject.setComponentId(ResponseParser.getValueFromJsonResponse(createMethod.getResponse(), "id"));
+
+        String licensingVersion = vendorLicenseModel.getVersion();
+        LicensingData licensingData = new LicensingData(
+            vendorLicenseModel.getVendorLicenseAgreementId(), Arrays.asList(vendorLicenseModel.getFeatureGroupId()));
+        vendorSoftwareProductObject.setVendorId(vendorLicenseModel.getVendorId());
+        vendorSoftwareProductObject.setVendorName(vendorLicenseModel.getVendorLicenseName());
+        vendorSoftwareProductObject.setLicensingVersion(licensingVersion);
+        vendorSoftwareProductObject.setLicensingData(licensingData);
+
+        VendorSoftwareProductObjectReqDetails vendorSoftwareProductObjectReqDetails = new VendorSoftwareProductObjectReqDetails(
+                vendorSoftwareProductObject.getName(), vendorSoftwareProductObject.getDescription(), vendorSoftwareProductObject.getCategory(),
+                vendorSoftwareProductObject.getSubCategory(), vendorSoftwareProductObject.getVendorId(), vendorSoftwareProductObject.getVendorName(),
+                vendorSoftwareProductObject.getLicensingVersion(), vendorSoftwareProductObject.getLicensingData(),
+                null, null, null, vendorSoftwareProductObject.getIcon()	);
+
+        Gson gson = new Gson();
+        String body = gson.toJson(vendorSoftwareProductObjectReqDetails);
+        RestResponse updateResponse = updateVendorSoftwareProduct(vendorSoftwareProductObject, body, user);
+        assertEquals("did not succeed to update VSP", 200, updateResponse.getErrorCode().intValue());
+
+        prepareVspForUse(user, vendorSoftwareProductObject, true);
+
+        return vendorSoftwareProductObject;
+    }
+
+    public static RestResponse updateVendorSoftwareProduct(VendorSoftwareProductObject vendorSoftwareProductObject, String body, User user) throws Exception {
+
+        Config config = Utils.getConfig();
+        String url = String.format(Urls.UPDATE_VSP, config.getOnboardingBeHost(), config.getOnboardingBePort(), vendorSoftwareProductObject.getVspId(), vendorSoftwareProductObject.getComponentId());
+        String userId = user.getUserId();
+
+        Map<String, String> headersMap = OnboardingUtils.prepareHeadersMap(userId);
+        HttpRequest http = new HttpRequest();
+
+        RestResponse response = http.httpSendPut(url, body, headersMap);
+        return response;
+    }
+
+//	private static void importUpdateVSP(Pair<String, Map<String, String>> vsp, boolean isUpdate) throws Exception{
+//		String vspName = vsp.left;
+//		Map<String, String> vspMetadata = vsp.right;
+//		boolean vspFound = HomePage.searchForVSP(vspName);
+//
+//		if (vspFound){
+//
+//			List<WebElement> elemenetsFromTable = HomePage.getElemenetsFromTable();
+////			WebDriverWait wait = new WebDriverWait(GeneralUIUtils.getDriver(), 30);
+////			WebElement findElement = wait.until(ExpectedConditions.visibilityOf(elemenetsFromTable.get(1)));
+////			findElement.click();
+//			elemenetsFromTable.get(1).click();
+//			GeneralUIUtils.waitForLoader();
+//
+//			if (isUpdate){
+//				GeneralUIUtils.clickOnElementByTestId(DataTestIdEnum.ImportVfRepository.UPDATE_VSP.getValue());
+//
+//			}
+//			else{
+//				GeneralUIUtils.clickOnElementByTestId(DataTestIdEnum.ImportVfRepository.IMPORT_VSP.getValue());
+//			}
+//
+//			String lifeCycleState = ResourceGeneralPage.getLifeCycleState();
+//			boolean needCheckout = lifeCycleState.equals(LifeCycleStateEnum.CHECKIN.getValue()) || lifeCycleState.equals(LifeCycleStateEnum.CERTIFIED.getValue());
+//			if (needCheckout)
+//			{
+//				try {
+//					ResourceGeneralPage.clickCheckoutButton();
+//					Assert.assertTrue(ResourceGeneralPage.getLifeCycleState().equals(LifeCycleStateEnum.CHECKOUT.getValue()), "Did not succeed to checkout");
+//
+//				} catch (Exception e) {
+//					ExtentTestActions.log(Status.ERROR, "Did not succeed to checkout");
+//					e.printStackTrace();
+//				}
+//				GeneralUIUtils.waitForLoader();
+//			}
+//
+//			//Metadata verification
+//			VfVerificator.verifyOnboardedVnfMetadata(vspName, vspMetadata);
+//
+//			ExtentTestActions.log(Status.INFO, "Clicking create/update VNF");
+//			String duration = GeneralUIUtils.getActionDuration(() -> waitUntilVnfCreated());
+//		    ExtentTestActions.log(Status.INFO, "Succeeded in importing/updating " + vspName, duration);
+//		}
+//		else{
+//			Assert.fail("Did not find VSP named " + vspName);
+//		}
+//	}
+
+//	private static void waitUntilVnfCreated() {
+//		GeneralUIUtils.clickOnElementByTestIdWithoutWait(DataTestIdEnum.GeneralElementsEnum.CREATE_BUTTON.getValue());
+//		GeneralUIUtils.waitForLoader(60*10);
+//		GeneralUIUtils.waitForAngular();
+//		GeneralUIUtils.getWebElementByTestID(DataTestIdEnum.GeneralElementsEnum.CHECKIN_BUTTON.getValue());
+//	}
+//
+//	public static void updateVSP(Pair<String, Map<String, String>> vsp) throws Exception{
+//		ExtentTestActions.log(Status.INFO, "Updating VSP " + vsp.left);
+//		importUpdateVSP(vsp, true);
+//	}
+//
+//	public static void importVSP(Pair<String, Map<String, String>> vsp) throws Exception{
+//		ExtentTestActions.log(Status.INFO, "Importing VSP " + vsp.left);
+//		importUpdateVSP(vsp, false);
+//	}
+//
+//	public static void updateVnfAndValidate(String filepath, Pair<String, Map<String, String>> vsp, String updatedVnfFile, User user) throws Exception, Throwable {
+//		ExtentTestActions.log(Status.INFO, String.format("Going to update the VNF with %s......", updatedVnfFile));
+//		System.out.println(String.format("Going to update the VNF with %s......", updatedVnfFile));
+//
+//		Map<String, String> vspMap = vsp.right;
+//		String vspId = vspMap.get("vspId");
+//
+//		updateVendorSoftwareProduct(vspId, updatedVnfFile, filepath, user);
+//		HomePage.showVspRepository();
+//		updateVSP(vsp);
+//		ResourceGeneralPage.getLeftMenu().moveToDeploymentArtifactScreen();
+//		DeploymentArtifactPage.verifyArtifactsExistInTable(filepath, updatedVnfFile);
+//	}
+//
+//	public static Pair<String, Map<String, String>> onboardAndValidate(String filepath, String vnfFile, User user) throws Exception {
+//		ExtentTestActions.log(Status.INFO, String.format("Going to onboard the VNF %s", vnfFile));
+//		System.out.println(String.format("Going to onboard the VNF %s", vnfFile));
+//
+//		AmdocsLicenseMembers amdocsLicenseMembers = createVendorLicense(user);
+//		Pair<String, Map<String, String>> createVendorSoftwareProduct = createVendorSoftwareProduct(vnfFile, filepath, user, amdocsLicenseMembers);
+//		String vspName = createVendorSoftwareProduct.left;
+//
+//		DownloadManager.downloadCsarByNameFromVSPRepository(vspName, createVendorSoftwareProduct.right.get("vspId"));
+//		File latestFilefromDir = FileHandling.getLastModifiedFileNameFromDir();
+//
+//		ExtentTestActions.log(Status.INFO, String.format("Searching for onboarded %s", vnfFile));
+//		HomePage.showVspRepository();
+//		ExtentTestActions.log(Status.INFO,String.format("Going to import %s", vnfFile.substring(0, vnfFile.indexOf("."))));
+//		importVSP(createVendorSoftwareProduct);
+//
+//		ResourceGeneralPage.getLeftMenu().moveToDeploymentArtifactScreen();
+//
+//		// Verify deployment artifacts
+//		Map<String, Object> combinedMap = ArtifactFromCsar.combineHeatArtifacstWithFolderArtifacsToMap(latestFilefromDir.getAbsolutePath());
+//
+//		LinkedList<HeatMetaFirstLevelDefinition> deploymentArtifacts = ((LinkedList<HeatMetaFirstLevelDefinition>) combinedMap.get("Deployment"));
+//		ArtifactsCorrelationManager.addVNFartifactDetails(vspName, deploymentArtifacts);
+//
+//		List<String> heatEnvFilesFromCSAR = deploymentArtifacts.stream().filter(e -> e.getType().equals("HEAT_ENV")).
+//																		 map(e -> e.getFileName()).
+//																		 collect(Collectors.toList());
+//
+//		validateDeploymentArtifactsVersion(deploymentArtifacts, heatEnvFilesFromCSAR);
+//
+//		DeploymentArtifactPage.verifyArtifactsExistInTable(filepath, vnfFile);
+//		return createVendorSoftwareProduct;
+//	}
+//
+//	public static void validateDeploymentArtifactsVersion(LinkedList<HeatMetaFirstLevelDefinition> deploymentArtifacts,
+//			List<String> heatEnvFilesFromCSAR) {
+//		String artifactVersion;
+//		String artifactName;
+//
+//		for(HeatMetaFirstLevelDefinition deploymentArtifact: deploymentArtifacts) {
+//			artifactVersion = "1";
+//
+//			if(deploymentArtifact.getType().equals("HEAT_ENV")) {
+//				continue;
+//			} else if(deploymentArtifact.getFileName().contains(".")) {
+//				artifactName = deploymentArtifact.getFileName().trim().substring(0, deploymentArtifact.getFileName().lastIndexOf("."));
+//			} else {
+//				artifactName = deploymentArtifact.getFileName().trim();
+//			}
+//
+//			if (heatEnvFilesFromCSAR.contains(artifactName + ".env")){
+//				artifactVersion = "2";
+//			}
+//			ArtifactUIUtils.validateArtifactNameVersionType(artifactName, artifactVersion, deploymentArtifact.getType());
+//		}
+//	}
+
+
+    private static VendorSoftwareProductObject fillVendorSoftwareProductObjectWithMetaData(String vnfFile, VendorSoftwareProductObject createVendorSoftwareProduct) {
+        VendorSoftwareProductObject vendorSoftwareProductObject = new VendorSoftwareProductObject();
+        vendorSoftwareProductObject.setAttContact(createVendorSoftwareProduct.getAttContact());
+        vendorSoftwareProductObject.setCategory(createVendorSoftwareProduct.getCategory());
+        vendorSoftwareProductObject.setComponentId(createVendorSoftwareProduct.getComponentId());
+        vendorSoftwareProductObject.setDescription(createVendorSoftwareProduct.getDescription());
+        vendorSoftwareProductObject.setSubCategory(createVendorSoftwareProduct.getSubCategory());
+        vendorSoftwareProductObject.setVendorName(createVendorSoftwareProduct.getVendorName());
+        vendorSoftwareProductObject.setVspId(createVendorSoftwareProduct.getVspId());
+        vendorSoftwareProductObject.setName(createVendorSoftwareProduct.getName());
+        String[] arrFileNameAndExtension = vnfFile.split("\\.");
+        vendorSoftwareProductObject.setOnboardingMethod("NetworkPackage");
+        vendorSoftwareProductObject.setNetworkPackageName(arrFileNameAndExtension[0]);
+        vendorSoftwareProductObject.setOnboardingOrigin(arrFileNameAndExtension[1]);
+
+        return vendorSoftwareProductObject;
+    }
+
+    public static void updateVendorSoftwareProductToNextVersion(VendorSoftwareProductObject vendorSoftwareProductObject,
+                                                                User user, String filepath,
+                                                                String heatFileName) throws Exception {
+
+        RestResponse createMethod = creationMethodVendorSoftwareProduct(vendorSoftwareProductObject, user);
+        assertEquals("did not succeed to createMethod for new VSP", 200, createMethod.getErrorCode().intValue());
+
+        RestResponse uploadHeatPackage = uploadHeatPackage(filepath, heatFileName, vendorSoftwareProductObject, user);
+        assertEquals("did not succeed to upload HEAT package", 200, uploadHeatPackage.getErrorCode().intValue());
+
+        RestResponse validateUpload = validateUpload(vendorSoftwareProductObject, user);
+        assertEquals("did not succeed to validate upload process, reason: " + validateUpload.getResponse(), 200, validateUpload.getErrorCode().intValue());
+
+        prepareVspForUse(user,vendorSoftwareProductObject, true);
+    }
+
+    public static RestResponse archiveVendorSoftwareProduct(VendorSoftwareProductObject vendorSoftwareProductObject, User user) throws Exception {
+        String messageBody = "{\"action\":\"ARCHIVE\"}";
+        return actionOnComponent(vendorSoftwareProductObject.getVspId(), messageBody, "items", user);
+    }
+
+    public static RestResponse restoreVendorSoftwareProduct(VendorSoftwareProductObject vendorSoftwareProductObject, User user) throws Exception {
+        String messageBody = "{\"action\":\"RESTORE\"}";
+        return actionOnComponent(vendorSoftwareProductObject.getVspId(), messageBody, "items", user);
+    }
+
+}
diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/utils/rest/ArtifactRestUtils.java b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/utils/rest/ArtifactRestUtils.java
new file mode 100644
index 0000000000..7daf1bd414
--- /dev/null
+++ b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/utils/rest/ArtifactRestUtils.java
@@ -0,0 +1,918 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * SDC
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.sdc.ci.tests.utils.rest;
+
+import com.google.gson.Gson;
+import org.apache.commons.codec.binary.Base64;
+import org.json.simple.JSONObject;
+import org.json.simple.JSONValue;
+import org.openecomp.sdc.be.datatypes.enums.ComponentTypeEnum;
+import org.openecomp.sdc.be.model.*;
+import org.openecomp.sdc.ci.tests.api.Urls;
+import org.openecomp.sdc.ci.tests.config.Config;
+import org.openecomp.sdc.ci.tests.datatypes.ArtifactReqDetails;
+import org.openecomp.sdc.ci.tests.datatypes.ResourceReqDetails;
+import org.openecomp.sdc.ci.tests.datatypes.ServiceReqDetails;
+import org.openecomp.sdc.ci.tests.datatypes.enums.ArtifactTypeEnum;
+import org.openecomp.sdc.ci.tests.datatypes.enums.UserRoleEnum;
+import org.openecomp.sdc.ci.tests.datatypes.http.HttpHeaderEnum;
+import org.openecomp.sdc.ci.tests.datatypes.http.HttpRequest;
+import org.openecomp.sdc.ci.tests.datatypes.http.RestResponse;
+import org.openecomp.sdc.ci.tests.utils.Utils;
+import org.openecomp.sdc.ci.tests.utils.general.ElementFactory;
+import org.openecomp.sdc.common.api.ArtifactGroupTypeEnum;
+import org.openecomp.sdc.common.util.ValidationUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.testng.AssertJUnit;
+
+import java.io.IOException;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import static org.testng.AssertJUnit.assertNotNull;
+import static org.testng.AssertJUnit.assertTrue;
+
+public class ArtifactRestUtils extends BaseRestUtils {
+	private static Logger logger = LoggerFactory.getLogger(ArtifactRestUtils.class.getName());
+	
+	
+	// External API
+	// Delete Artifact on rI of the asset 
+	public static RestResponse externalAPIDeleteArtifactOfComponentInstanceOnAsset(Component component, User user, ComponentInstance resourceInstance, String artifactUUID) throws IOException {
+		Config config = Utils.getConfig();
+		String resourceType;
+		String resourceUUID = component.getUUID();
+		String resourceInstanceName = resourceInstance.getNormalizedName();
+		
+		System.out.println(component.getComponentType());
+		
+		if(component.getComponentType().toString().toLowerCase().equals("resource")) {
+			resourceType = "resources";
+		} else {
+			resourceType = "services";
+		}
+		
+		String url = String.format(Urls.DELETE_EXTRNAL_API_DELETE_ARTIFACT_OF_COMPONENTINSTANCE_ON_ASSET, config.getCatalogBeHost(), config.getCatalogBePort(), resourceType, resourceUUID, resourceInstanceName, artifactUUID);
+		
+		return deleteInformationalArtifact(user, url);
+	}
+	
+	// Delete Artifact of the asset 
+	public static RestResponse externalAPIDeleteArtifactOfTheAsset(Component component, User user, String artifactUUID) throws IOException {
+		Config config = Utils.getConfig();
+		String resourceType;
+		String resourceUUID = component.getUUID();
+		
+		System.out.println(component.getComponentType());
+		
+		if(component.getComponentType().toString().toLowerCase().equals("resource")) {
+			resourceType = "resources";
+		} else {
+			resourceType = "services";
+		}
+		
+		String url = String.format(Urls.DELETE_EXTRNAL_API_DELETE_ARTIFACT_OF_ASSET, config.getCatalogBeHost(), config.getCatalogBePort(), resourceType, resourceUUID, artifactUUID);
+		
+		RestResponse restResponse = deleteInformationalArtifact(user, url);
+		
+		return restResponse;
+	}
+	
+	
+	// Update Artifact on rI of the asset 
+	public static RestResponse externalAPIUpdateArtifactOfComponentInstanceOnAsset(Component component, User user, ArtifactReqDetails artifactReqDetails, ComponentInstance resourceInstance, String artifactUUID) throws IOException {
+		Config config = Utils.getConfig();
+		String resourceType;
+		String resourceUUID = component.getUUID();
+		String resourceInstanceName = resourceInstance.getNormalizedName();
+		
+		System.out.println(component.getComponentType());
+		
+		if(component.getComponentType().toString().toLowerCase().equals("resource")) {
+			resourceType = "resources";
+		} else {
+			resourceType = "services";
+		}
+		
+		String url = String.format(Urls.POST_EXTERNAL_API_UPDATE_ARTIFACT_OF_COMPONENTINSTANCE_ON_ASSET, config.getCatalogBeHost(), config.getCatalogBePort(), resourceType, resourceUUID, resourceInstanceName, artifactUUID);
+		
+		return updateInformationalArtifact(artifactReqDetails, user, calculateChecksum(artifactReqDetails), url);
+	}
+	
+	// Update Artifact of the asset 
+	public static RestResponse externalAPIUpdateArtifactOfTheAsset(Component component, User user, ArtifactReqDetails artifactReqDetails, String artifactUUID) throws IOException {
+		Config config = Utils.getConfig();
+		String resourceType;
+		String resourceUUID = component.getUUID();
+		
+		System.out.println(component.getComponentType());
+		
+		if(component.getComponentType().toString().toLowerCase().equals("resource")) {
+			resourceType = "resources";
+		} else {
+			resourceType = "services";
+		}
+		
+		String url = String.format(Urls.POST_EXTERNAL_API_UPDATE_ARTIFACT_OF_ASSET, config.getCatalogBeHost(), config.getCatalogBePort(), resourceType, resourceUUID, artifactUUID);
+		
+		return updateInformationalArtifact(artifactReqDetails, user, calculateChecksum(artifactReqDetails), url);
+	}
+	
+	
+	// Upload Artifact on rI of the asset 
+	public static RestResponse externalAPIUploadArtifactOfComponentInstanceOnAsset(Component component, User user, ArtifactReqDetails artifactReqDetails, ComponentInstance resourceInstance) throws IOException {
+		Config config = Utils.getConfig();
+		String resourceType;
+		String resourceUUID = component.getUUID();
+		String resourceInstanceName = resourceInstance.getNormalizedName();
+		
+		System.out.println(component.getComponentType());
+		
+		if(component.getComponentType().toString().toLowerCase().equals("resource")) {
+			resourceType = "resources";
+		} else {
+			resourceType = "services";
+		}
+		
+		String url = String.format(Urls.POST_EXTERNAL_API_UPLOAD_ARTIFACT_OF_COMPONENTINSTANCE_ON_ASSET, config.getCatalogBeHost(), config.getCatalogBePort(), resourceType, resourceUUID, resourceInstanceName);
+		
+		return uploadInformationalArtifact(artifactReqDetails, user, calculateChecksum(artifactReqDetails), url);
+	}
+	
+	// Upload Artifact of the asset 
+	public static RestResponse externalAPIUploadArtifactOfTheAsset(Component component, User user, ArtifactReqDetails artifactReqDetails) throws IOException {
+		Config config = Utils.getConfig();
+		String resourceType;
+		String resourceUUID = component.getUUID();
+		
+		System.out.println(component.getComponentType());
+		
+		if(component.getComponentType().toString().toLowerCase().equals("resource")) {
+			resourceType = "resources";
+		} else {
+			resourceType = "services";
+		}
+		
+		String url = String.format(Urls.POST_EXTERNAL_API_UPLOAD_ARTIFACT_OF_ASSET, config.getCatalogBeHost(), config.getCatalogBePort(), resourceType, resourceUUID);
+		
+		return uploadInformationalArtifact(artifactReqDetails, user, calculateChecksum(artifactReqDetails), url);
+	}
+	
+	
+	// Upload Artifact of the asset with invalid checksum
+	public static RestResponse externalAPIUploadArtifactWithInvalidCheckSumOfComponentInstanceOnAsset(Component component, User user, ArtifactReqDetails artifactReqDetails, ComponentInstance resourceInstance) throws IOException {
+		Config config = Utils.getConfig();
+		String resourceType;
+		String resourceUUID = component.getUUID();
+		String resourceInstanceName = resourceInstance.getNormalizedName();
+		
+		System.out.println(component.getComponentType());
+		
+		if(component.getComponentType().toString().toLowerCase().equals("resource")) {
+			resourceType = "resources";
+		} else {
+			resourceType = "services";
+		}
+		
+		String url = String.format(Urls.POST_EXTERNAL_API_UPLOAD_ARTIFACT_OF_COMPONENTINSTANCE_ON_ASSET, config.getCatalogBeHost(), config.getCatalogBePort(), resourceType, resourceUUID, resourceInstanceName);
+		
+		return uploadInformationalArtifact(artifactReqDetails, user, calculateChecksum(artifactReqDetails) + "123", url);
+	}
+		
+	// Upload Artifact of the asset with invalid checksum
+	public static RestResponse externalAPIUploadArtifactWithInvalidCheckSumOfTheAsset(Component component, User user, ArtifactReqDetails artifactReqDetails) throws IOException {
+		Config config = Utils.getConfig();
+		String resourceType;
+		String resourceUUID = component.getUUID();
+		
+		System.out.println(component.getComponentType());
+		
+		if(component.getComponentType().toString().toLowerCase().equals("resource")) {
+			resourceType = "resources";
+		} else {
+			resourceType = "services";
+		}
+		
+		String url = String.format(Urls.POST_EXTERNAL_API_UPLOAD_ARTIFACT_OF_ASSET, config.getCatalogBeHost(), config.getCatalogBePort(), resourceType, resourceUUID);
+		
+		return uploadInformationalArtifact(artifactReqDetails, user, calculateChecksum(artifactReqDetails) + "123", url);
+	}
+	
+	
+	//
+	// Testing
+	//
+	public static RestResponse getResourceDeploymentArtifactExternalAPI(String resourceUUID, String artifactUUID,User sdncModifierDetails, String resourceType) throws IOException {
+		Config config = Utils.getConfig();
+		String url;
+		
+		if (resourceType.toUpperCase().equals("SERVICE")) {
+			url = String.format(Urls.GET_DOWNLOAD_SERVICE_ARTIFACT_OF_ASSET, config.getCatalogBeHost(), config.getCatalogBePort(), resourceUUID, artifactUUID);
+
+		} else {
+			url = String.format(Urls.GET_DOWNLOAD_RESOURCE_ARTIFACT_OF_ASSET, config.getCatalogBeHost(), config.getCatalogBePort(), resourceUUID, artifactUUID);
+		}
+		
+		Map<String, String> headersMap = new HashMap<>();
+		headersMap.put(HttpHeaderEnum.USER_ID.getValue(), sdncModifierDetails.getUserId());
+		headersMap.put(HttpHeaderEnum.CONTENT_TYPE.getValue(), contentTypeHeaderData);
+		headersMap.put(HttpHeaderEnum.AUTHORIZATION.getValue(), authorizationHeader);
+		headersMap.put(HttpHeaderEnum.X_ECOMP_INSTANCE_ID.getValue(), BaseRestUtils.xEcompInstanceId);
+		headersMap.put(HttpHeaderEnum.ACCEPT.getValue(),acceptMultipartHeader);
+		
+		HttpRequest http = new HttpRequest();
+
+		logger.debug("Send GET request to get Resource Assets: {}", url);
+		System.out.println("Send GET request to get Resource Assets: " + url);
+		
+		logger.debug("Request headers: {}", headersMap);
+		System.out.println("Request headers: " + headersMap);
+
+		RestResponse sendGetResourceAssets = http.httpSendGet(url, headersMap);
+
+		return sendGetResourceAssets;
+
+	}
+	
+	
+	
+	public static RestResponse getComponentInstanceDeploymentArtifactExternalAPI(String resourceUUID, String componentNormalizedName, String artifactUUID,User sdncModifierDetails, String resourceType) throws IOException {
+		Config config = Utils.getConfig();
+		String url;
+		
+		if (resourceType.toLowerCase().equals("service")) {
+			url = String.format(Urls.GET_DOWNLOAD_SERVICE_ARTIFACT_OF_COMPONENT_INSTANCE, config.getCatalogBeHost(), config.getCatalogBePort(), resourceUUID, componentNormalizedName, artifactUUID);
+
+		} else {
+			url = String.format(Urls.GET_DOWNLOAD_RESOURCE_ARTIFACT_OF_COMPONENT_INSTANCE, config.getCatalogBeHost(), config.getCatalogBePort(), resourceUUID, componentNormalizedName, artifactUUID);
+		}
+		
+		Map<String, String> headersMap = new HashMap<>();
+		headersMap.put(HttpHeaderEnum.USER_ID.getValue(), sdncModifierDetails.getUserId());
+		headersMap.put(HttpHeaderEnum.CONTENT_TYPE.getValue(), contentTypeHeaderData);
+		headersMap.put(HttpHeaderEnum.AUTHORIZATION.getValue(), authorizationHeader);
+		headersMap.put(HttpHeaderEnum.X_ECOMP_INSTANCE_ID.getValue(), BaseRestUtils.xEcompInstanceId);
+		headersMap.put(HttpHeaderEnum.ACCEPT.getValue(),acceptMultipartHeader);
+		
+		HttpRequest http = new HttpRequest();
+
+		logger.debug("Send GET request to get Resource Assets: {}", url);
+		System.out.println("Send GET request to get Resource Assets: " + url);
+		
+		logger.debug("Request headers: {}", headersMap);
+		System.out.println("Request headers: " + headersMap);
+
+		RestResponse sendGetResourceAssets = http.httpSendGet(url, headersMap);
+
+		return sendGetResourceAssets;
+
+	}
+	
+	
+	//***********  SERVICE ****************
+	public static RestResponse getArtifactTypesList() throws IOException {
+		Config config = Utils.getConfig();
+		String url = String.format(Urls.GET_ALL_ARTIFACTS, config.getCatalogBeHost(), config.getCatalogBePort());
+
+		return sendGet(url, ElementFactory.getDefaultUser(UserRoleEnum.DESIGNER).getUserId());
+	}
+
+	public static RestResponse addInformationalArtifactToService(ArtifactReqDetails artifactDetails, User sdncModifierDetails, String serviceUid) throws IOException {
+		return addInformationalArtifactToService(artifactDetails, sdncModifierDetails, serviceUid, calculateChecksum(artifactDetails));
+	}
+
+	public static RestResponse addInformationalArtifactToService(ArtifactReqDetails artifactDetails, User sdncModifierDetails, String serviceUid, String checksum) throws IOException {
+		Config config = Utils.getConfig();
+		String url = String.format(Urls.ADD_ARTIFACT_TO_SERVICE, config.getCatalogBeHost(), config.getCatalogBePort(), serviceUid);
+
+		return uploadInformationalArtifact(artifactDetails, sdncModifierDetails, checksum, url);
+	}
+
+	public static RestResponse downloadServiceArtifact(ServiceReqDetails service, ArtifactReqDetails artifact, User user, Map<String, String> addionalHeaders) throws Exception
+	{
+	
+		return downloadServiceArtifact( service,  artifact,  user,addionalHeaders,true);
+	}
+	
+	public static RestResponse downloadServiceArtifact(ServiceReqDetails service, ArtifactReqDetails artifact, User user, Map<String, String> addionalHeaders,boolean addEcompHeader) throws Exception
+	{
+		Config config = Utils.getConfig();
+		String relativeUrl = encodeUrlForDownload(String.format(Urls.DISTRIB_DOWNLOAD_SERVICE_ARTIFACT_RELATIVE_URL, ValidationUtils.convertToSystemName(service.getName()), service.getVersion(),  ValidationUtils.normalizeFileName(artifact.getArtifactName())));
+		String fullUrl = String.format(Urls.DOWNLOAD_SERVICE_ARTIFACT_FULL_URL, config.getCatalogBeHost(),config.getCatalogBePort(), relativeUrl);
+		
+		return downloadArtifact(fullUrl, user, addionalHeaders,addEcompHeader);
+	}
+	
+	public static RestResponse downloadResourceArtifact(ServiceReqDetails service, ResourceReqDetails resource, ArtifactReqDetails artifact, User user, Map<String, String> addionalHeaders) throws Exception
+	{	
+		return downloadResourceArtifact(service, resource,  artifact,  user,addionalHeaders, true);
+	}
+	
+	public static RestResponse downloadResourceArtifact(ServiceReqDetails service,ResourceReqDetails resource, ArtifactReqDetails artifact, User user, Map<String, String> addionalHeaders,boolean addEcompHeader) throws Exception
+	{
+		Config config = Utils.getConfig();
+		String relativeUrl = encodeUrlForDownload(String.format(Urls.DISTRIB_DOWNLOAD_RESOURCE_ARTIFACT_RELATIVE_URL, ValidationUtils.convertToSystemName(service.getName()),service.getVersion(),ValidationUtils.convertToSystemName(resource.getName()), resource.getVersion(),  ValidationUtils.normalizeFileName(artifact.getArtifactName())));
+		String fullUrl = String.format(Urls.DOWNLOAD_RESOURCE_ARTIFACT_FULL_URL, config.getCatalogBeHost(),config.getCatalogBePort(), relativeUrl);
+		
+		return downloadArtifact(fullUrl, user, addionalHeaders,addEcompHeader);
+	}
+	
+	
+	
+	public static RestResponse downloadResourceInstanceArtifact(String serviceUniqueId,String resourceInstanceId, User user, String artifactUniqueId) throws Exception
+	{
+		Config config = Utils.getConfig();
+		String url = String.format(Urls.DOWNLOAD_COMPONENT_INSTANCE_ARTIFACT, config.getCatalogBeHost(),config.getCatalogBePort(), serviceUniqueId, resourceInstanceId, artifactUniqueId);
+		RestResponse res =  sendGet(url, user.getUserId(), null);
+		return res;
+	}
+	
+	////	
+
+	//update
+	
+	public static RestResponse updateInformationalArtifactOfServiceByMethod(ArtifactReqDetails artifactReqDetails, String serviceUid, String artifactUid, User sdncModifierDetails, String httpMethod) throws IOException {
+		return updateInformationalArtifactOfServiceByMethod(artifactReqDetails, serviceUid, artifactUid, sdncModifierDetails, httpMethod, calculateChecksum(artifactReqDetails));
+	}
+	
+	public static RestResponse updateInformationalArtifactOfServiceByMethod(ArtifactReqDetails artifactReqDetails, String serviceUid, User sdncModifierDetails, String httpMethod) throws IOException {
+		return updateInformationalArtifactOfServiceByMethod(artifactReqDetails, serviceUid, artifactReqDetails.getUniqueId(), sdncModifierDetails, httpMethod, calculateChecksum(artifactReqDetails));
+	}
+	
+	public static RestResponse downloadResourceArtifactInternalApi(String resourceId, User user, String artifactUniqeId) throws Exception
+	{
+		return downloadComponentArtifactInternalApi(resourceId, user, artifactUniqeId, Urls.UI_DOWNLOAD_RESOURCE_ARTIFACT);
+	}
+
+	public static RestResponse downloadServiceArtifactInternalApi(String componentId, User user, String artifactUniqeId) throws Exception
+	{
+		return downloadComponentArtifactInternalApi(componentId, user, artifactUniqeId, Urls.UI_DOWNLOAD_SERVICE_ARTIFACT);
+	}
+	public static RestResponse downloadComponentArtifactInternalApi(String componentId, User user, String artifactUniqeId, String urlTemplate) throws Exception
+	{
+		Config config = Utils.getConfig();
+		String url = String.format(urlTemplate, config.getCatalogBeHost(),config.getCatalogBePort(), componentId, artifactUniqeId);
+		RestResponse res =  sendGet(url, user.getUserId(), null);
+		return res;
+	}
+	
+//	public static RestResponse downloadServiceArtifactInternalApi(String resourceId, User user, String artifactUniqeId) throws Exception
+//	{
+//		Config config = Utils.getConfig();
+//		String url = String.format(Urls.UI_DOWNLOAD_SERVICE_ARTIFACT, config.getCatalogBeHost(),config.getCatalogBePort(), resourceId, artifactUniqeId);
+//		RestResponse res =  sendGet(url, user.getUserId(), null);
+//		return res;
+//	}
+	
+	/*
+	public static RestResponse updateInformationalArtifactPayloadOfService(ArtifactReqDetails artifactDetails, User sdncModifierDetails, String serviceUid, String artifactUid, String checksum) throws IOException
+	{
+		return updateInformationalArtifactOfService(artifactDetails, sdncModifierDetails, serviceUid, artifactUid, checksum, true);
+	}
+
+	public static RestResponse updateInformationalArtifactMetadataOfService(ArtifactReqDetails artifactDetails, User sdncModifierDetails, String serviceUid, String artifactUid) throws IOException
+	{
+		return updateInformationalArtifactOfService(artifactDetails, sdncModifierDetails, serviceUid, artifactUid, calculateChecksum(artifactDetails), false);
+	}
+
+	public static RestResponse updateInformationalArtifactOfService(ArtifactReqDetails artifactDetails, User sdncModifierDetails, String serviceUid, String artifactUid, String checksum, boolean isPayloadUpdate) throws IOException
+	{
+		Config config = Utils.getConfig();
+		Map<String, String> headersMap = getHeadersMap(sdncModifierDetails);
+
+		if (isPayloadUpdate){
+			headersMap.put(HttpHeaderEnum.Content_MD5.getValue(), checksum);
+		}
+
+		Gson gson = new Gson();
+		String jsonBody = gson.toJson(artifactDetails);
+
+		HttpRequest http = new HttpRequest();
+
+		String url = String.format(Urls.UPDATE_OR_DELETE_ARTIFACT_OF_SERVICE, config.getCatalogBeHost(),config.getCatalogBePort(), serviceUid, artifactUid);
+		RestResponse res =  http.httpSendPost(url, jsonBody, headersMap);
+		System.out.println("update artifact was finished with response: "+ res.getErrorCode());
+		return res;
+	}*/
+	
+	
+	
+	public static RestResponse updateInformationalArtifactOfServiceByMethod(ArtifactReqDetails artifactReqDetails, String serviceUid, String artifactUid, User sdncModifierDetails, String httpMethod, String checksum) throws IOException 
+	{
+		Config config = Utils.getConfig();
+
+		Map<String, String> headersMap = getHeadersMap(sdncModifierDetails);
+		headersMap.put(HttpHeaderEnum.Content_MD5.getValue(), checksum);
+
+		Gson gson = new Gson();
+		String userBodyJson = gson.toJson(artifactReqDetails);
+
+		HttpRequest http = new HttpRequest();
+		String url = String.format(Urls.UPDATE_OR_DELETE_ARTIFACT_OF_SERVICE, config.getCatalogBeHost(),config.getCatalogBePort(), serviceUid, artifactUid);
+		RestResponse updateResourceResponse = http.httpSendByMethod(url, httpMethod, userBodyJson, headersMap);
+//		System.out.println("update artifact was finished with response: "+ updateResourceResponse.getErrorCode());
+
+		return updateResourceResponse;
+	}
+	
+	
+	public static Map<String, String> getHeadersMap(User sdncModifierDetails) {
+		Map<String, String> headersMap = new HashMap<>();
+		headersMap.put(HttpHeaderEnum.CONTENT_TYPE.getValue(), contentTypeHeaderData);
+		headersMap.put(HttpHeaderEnum.ACCEPT.getValue(), acceptJsonHeader);
+		
+		try{
+		headersMap.put(HttpHeaderEnum.USER_ID.getValue(), sdncModifierDetails.getUserId());
+		}
+		catch(Exception e)
+		{
+			
+		}
+		
+		return headersMap;
+	}
+
+	//***********  RESOURCE ****************
+	//add
+	public static RestResponse addInformationalArtifactToResource(ArtifactReqDetails artifactDetails, User sdncModifierDetails, String resourceUid) throws IOException{
+		return addInformationalArtifactToResource(artifactDetails, sdncModifierDetails, resourceUid, calculateChecksum(artifactDetails));
+	}
+	
+	public static RestResponse explicitAddInformationalArtifactToResource(ArtifactReqDetails artifactDetails, User sdncModifierDetails, String resourceUid) throws IOException{
+		Config config = Utils.getConfig();
+
+
+		String url = String.format(Urls.ADD_ARTIFACT_TO_RESOURCE, config.getCatalogBeHost(),config.getCatalogBePort(), resourceUid);
+
+		return uploadInformationalArtifact(artifactDetails, sdncModifierDetails, calculateChecksum(artifactDetails), url);
+	}
+
+	
+	public static RestResponse addInformationalArtifactToResource(ArtifactReqDetails artifactDetails, User sdncModifierDetails, String resourceUid, String checksum) throws IOException{
+		Config config = Utils.getConfig();
+			
+			if (artifactDetails.getArtifactGroupType()!=null && artifactDetails.getArtifactGroupType().equals(ArtifactGroupTypeEnum.DEPLOYMENT.getType())){
+				//YANG_XML and OTHER deployment artifact should be added through this API, not updated
+				String artifactType = artifactDetails.getArtifactType();
+				if (!(ArtifactTypeEnum.YANG_XML.getType().equals(artifactType) ||
+						ArtifactTypeEnum.OTHER.getType().equals(artifactType) ||
+						ArtifactTypeEnum.VNF_CATALOG.getType().equals(artifactType) ||
+						ArtifactTypeEnum.VF_LICENSE.getType().equals(artifactType) ||
+						ArtifactTypeEnum.VENDOR_LICENSE.getType().equals(artifactType) ||
+						ArtifactTypeEnum.MODEL_INVENTORY_PROFILE.getType().equals(artifactType) ||
+						ArtifactTypeEnum.MODEL_QUERY_SPEC.getType().equals(artifactType) ||
+						ArtifactTypeEnum.APPC_CONFIG.getType().equals(artifactType))){
+					//return updateInformationalArtifactToResource(artifactDetails, sdncModifierDetails, resourceUid);
+				}
+			}
+		String url = String.format(Urls.ADD_ARTIFACT_TO_RESOURCE, config.getCatalogBeHost(),config.getCatalogBePort(), resourceUid);
+			
+		return uploadInformationalArtifact(artifactDetails, sdncModifierDetails, checksum, url);
+	}
+	//update
+	public static RestResponse updateInformationalArtifactToResource(ArtifactReqDetails artifactDetails, User sdncModifierDetails, String resourceUid) throws IOException{
+		return updateInformationalArtifactToResource(artifactDetails, sdncModifierDetails, resourceUid, calculateChecksum(artifactDetails));
+	}
+
+	public static RestResponse updateInformationalArtifactToResource(ArtifactReqDetails artifactDetails, User sdncModifierDetails, String resourceUid, String checksum) throws IOException {
+		Config config = Utils.getConfig();
+		if (artifactDetails.getArtifactGroupType()!=null && artifactDetails.getArtifactGroupType().equals("DEPLOYMENT")){
+			RestResponse resourceGetResponse = ResourceRestUtils.getResource(sdncModifierDetails, resourceUid );
+			Resource resourceRespJavaObject = ResponseParser.convertResourceResponseToJavaObject(resourceGetResponse.getResponse());
+			Map<String, ArtifactDefinition> deploymentArtifacts = resourceRespJavaObject.getDeploymentArtifacts();
+			ArtifactDefinition artifactDefinition = deploymentArtifacts.get(artifactDetails.getArtifactLabel());
+			artifactDetails.setUniqueId(artifactDefinition.getUniqueId());
+			artifactDetails.setArtifactLabel(artifactDefinition.getArtifactLabel());
+			
+		}
+		
+		String url = String.format(Urls.UPDATE_OR_DELETE_ARTIFACT_OF_RESOURCE, config.getCatalogBeHost(), config.getCatalogBePort(), resourceUid, artifactDetails.getUniqueId());
+
+		return uploadInformationalArtifact(artifactDetails, sdncModifierDetails, calculateChecksum(artifactDetails), url);
+	}
+	
+	public static RestResponse uploadArtifactToPlaceholderOnResource(ArtifactReqDetails artifactDetails, User sdncModifierDetails, String resourceUid, String placeHolderLabel) throws IOException {
+		Config config = Utils.getConfig();
+		if (artifactDetails.getArtifactLabel() != null && !artifactDetails.getArtifactLabel().isEmpty()){
+			RestResponse resourceGetResponse = ResourceRestUtils.getResource(sdncModifierDetails, resourceUid );
+			Resource resourceRespJavaObject = ResponseParser.convertResourceResponseToJavaObject(resourceGetResponse.getResponse());
+			Map<String, ArtifactDefinition> deploymentArtifacts = resourceRespJavaObject.getDeploymentArtifacts();
+			ArtifactDefinition artifactDefinition = deploymentArtifacts.get(artifactDetails.getArtifactLabel());
+			AssertJUnit.assertNotNull(artifactDefinition);
+			artifactDetails.setUniqueId(artifactDefinition.getUniqueId());
+			artifactDetails.setArtifactLabel(artifactDefinition.getArtifactLabel());
+			
+		}
+		
+		String url = String.format(Urls.UPDATE_OR_DELETE_ARTIFACT_OF_RESOURCE, config.getCatalogBeHost(), config.getCatalogBePort(), resourceUid, artifactDetails.getUniqueId());
+
+		return uploadInformationalArtifact(artifactDetails, sdncModifierDetails, calculateChecksum(artifactDetails), url);
+	}
+	
+	public static RestResponse updateArtifactToResourceInstance(ArtifactDefinition artifactDefinition, User sdncModifierDetails, String resourceInstanceId, String serviceId) throws IOException {
+		Config config = Utils.getConfig();
+		String url = String.format(Urls.UPDATE_RESOURCE_INSTANCE_ARTIFACT, config.getCatalogBeHost(), config.getCatalogBePort(), serviceId, resourceInstanceId, artifactDefinition.getUniqueId());
+		return updateDeploymentArtifact(artifactDefinition, sdncModifierDetails, url);
+	}
+	
+	public static RestResponse updateDeploymentArtifactToResource(ArtifactReqDetails artifactDetails, User sdncModifierDetails, String resourceUid) throws IOException {
+		Config config = Utils.getConfig();
+		String url = String.format(Urls.UPDATE_OR_DELETE_ARTIFACT_OF_RESOURCE, config.getCatalogBeHost(), config.getCatalogBePort(), resourceUid, artifactDetails.getUniqueId());
+	
+		return updateDeploymentArtifact(artifactDetails, sdncModifierDetails, url);
+	}
+
+
+	public static RestResponse updateDeploymentArtifactToRI(ArtifactReqDetails artifactDetails, User sdncModifierDetails, String resourceInstanceId, String serviceId) throws IOException {
+		Config config = Utils.getConfig();
+		String url = String.format(Urls.UPDATE_RESOURCE_INSTANCE_HEAT_ENV_PARAMS, config.getCatalogBeHost(), config.getCatalogBePort(), serviceId, resourceInstanceId, artifactDetails.getUniqueId());
+		return updateDeploymentArtifact(artifactDetails, sdncModifierDetails, url);
+	}
+	
+	//delete
+	public static RestResponse deleteArtifactFromResourceInstance (ArtifactDefinition artifactDefinition, User sdncModifierDetails, String resourceUid, String serviceId) throws IOException{
+		Config config = Utils.getConfig();
+		String url = String.format(Urls.DELETE_RESOURCE_INSTANCE_ARTIFACT, config.getCatalogBeHost(), config.getCatalogBePort(), serviceId, resourceUid, artifactDefinition.getUniqueId());
+		return sendDelete(url, sdncModifierDetails.getUserId());		
+	}
+	
+	public static RestResponse deleteInformationalArtifactFromResource(String resourceUid, ArtifactReqDetails artifactDetails, User sdncModifierDetails) throws IOException{
+		return deleteInformationalArtifactFromResource( resourceUid, artifactDetails.getUniqueId(),  sdncModifierDetails);
+	}
+	
+	public static RestResponse deleteInformationalArtifactFromResource( String resourceUid, String artifactId, User sdncModifierDetails) throws IOException{
+		Config config = Utils.getConfig();
+		String url = String.format(Urls.UPDATE_OR_DELETE_ARTIFACT_OF_RESOURCE, config.getCatalogBeHost(), config.getCatalogBePort(), resourceUid, artifactId);
+		return sendDelete(url, sdncModifierDetails.getUserId());
+	}
+	
+	public static RestResponse deleteServiceApiArtifact(ArtifactReqDetails artifactDetails, String serviceUniqueId, User user) throws Exception
+	{
+		Config config = Utils.getConfig();
+		String url = String.format(Urls.UPDATE_DELETE_SERVICE_API_ARTIFACT, config.getCatalogBeHost(),config.getCatalogBePort(), serviceUniqueId, artifactDetails.getUniqueId());
+		RestResponse res =  sendDelete(url, user.getUserId());
+		logger.debug("Deleting api artifact was finished with response: {}", res.getErrorCode());
+		logger.debug("Response body: {}", res.getResponseMessage());
+		return res;
+	}
+	
+	//*************** RESOURCE INSTANCE **************
+	/**
+	 * Add DCAE artifacts to resource instance.
+	 * @param artifactDetails
+	 * @param sdncModifierDetails
+	 * @param resourceInstanceId
+	 * @param serviceId
+	 * @return
+	 * @throws IOException
+	 */
+	public static RestResponse addArtifactToResourceInstance(ArtifactReqDetails artifactDetails, User sdncModifierDetails, String resourceInstanceId, String serviceId) throws IOException {
+		Config config = Utils.getConfig();
+		String url = String.format(Urls.ADD_RESOURCE_INSTANCE_ARTIFACT, config.getCatalogBeHost(), config.getCatalogBePort(), serviceId,resourceInstanceId, artifactDetails.getUniqueId());
+		return addArtifactToInstance(artifactDetails, sdncModifierDetails, calculateChecksum(artifactDetails), url);
+	}
+	
+	//*************** COMPONENT **************
+	
+	public static RestResponse uploadDeploymentArtifact(ArtifactReqDetails artifactDetails, Component component, User sdncModifierDetails) throws IOException {
+		Config config = Utils.getConfig();
+		Map<String, String> additionalHeaders;
+		String checksum = ResponseParser.calculateMD5Header(artifactDetails);
+		additionalHeaders = new HashMap<>();
+		additionalHeaders.put(HttpHeaderEnum.Content_MD5.getValue(), checksum);
+		
+		ComponentTypeEnum componentType = component.getComponentType();
+		
+		String url = null;
+				
+		switch (componentType){
+
+		case RESOURCE:
+			{
+				url = String.format(Urls.UPDATE_OR_DELETE_ARTIFACT_OF_SERVICE, config.getCatalogBeHost(),config.getCatalogBePort(), component.getUniqueId(), artifactDetails.getUniqueId());
+
+				break;
+			}
+			case SERVICE: {
+
+				break;
+			}
+
+			case PRODUCT: {
+
+				break;
+			}
+
+			default: {//dummy
+				assertTrue("failed on enum selection", false);
+
+				break;
+			}
+		}
+		
+		
+		
+
+		Gson gson = new Gson();
+		String jsonBody = gson.toJson(artifactDetails);
+//		System.out.println("ArtifactDetails: "+ jsonBody);
+
+		RestResponse res = sendPost(url, jsonBody, sdncModifierDetails.getUserId(), acceptHeaderData, additionalHeaders);
+		if (res.getErrorCode() == STATUS_CODE_SUCCESS) {
+			artifactDetails.setUniqueId(ResponseParser.getUniqueIdFromResponse(res));
+		}
+//		System.out.println("Add artifact was finished with response: "+ res.getErrorCode());
+		return res;
+	}
+	
+	public static RestResponse uploadArtifact(ArtifactReqDetails artifactDetails, Component component, User sdncModifierDetails) throws IOException {
+		Config config = Utils.getConfig();
+		List<String> placeHolderlst = Utils.getListOfResPlaceHoldersDepArtTypes();
+		Map<String, String> additionalHeaders;
+		String checksum;
+		String url;
+//
+//		
+//		if (artifactDetails.getArtifactGroupType() != null
+//				&& artifactDetails.getArtifactGroupType().equals("DEPLOYMENT")
+//				&& placeHolderlst.contains(artifactDetails.getArtifactType())) {
+//			Map<String, ArtifactDefinition> deploymentArtifacts = component.getDeploymentArtifacts();
+//			ArtifactDefinition artifactDefinition = deploymentArtifacts.get(artifactDetails.getArtifactLabel());
+//			artifactDetails.setUniqueId(artifactDefinition.getUniqueId());
+//			artifactDetails.setArtifactLabel(artifactDefinition.getArtifactLabel());
+//			checksum = ResponseParser.calculateMD5Header(artifactDetails);
+//			additionalHeaders = new HashMap<String, String>();
+//			additionalHeaders.put(HttpHeaderEnum.Content_MD5.getValue(), checksum);
+//			url = String.format(Urls.UPDATE_ARTIFACT_OF_COMPONENT, config.getCatalogBeHost(),
+//					config.getCatalogBePort(), ComponentTypeEnum.findParamByType(component.getComponentType()),
+//					component.getUniqueId(), artifactDetails.getUniqueId());
+//		}
+//
+//		else {
+			checksum = ResponseParser.calculateMD5Header(artifactDetails);
+			additionalHeaders = new HashMap<>();
+			additionalHeaders.put(HttpHeaderEnum.Content_MD5.getValue(), checksum);
+			url = String.format(Urls.UPLOAD_DELETE_ARTIFACT_OF_COMPONENT, config.getCatalogBeHost(),
+					config.getCatalogBePort(), ComponentTypeEnum.findParamByType(component.getComponentType()),
+					component.getUniqueId(), artifactDetails.getUniqueId());
+//		}
+		
+		Gson gson = new Gson();
+		String jsonBody = gson.toJson(artifactDetails);
+//		System.out.println("ArtifactDetails: "+ jsonBody);
+
+		RestResponse res = sendPost(url, jsonBody, sdncModifierDetails.getUserId(), acceptHeaderData, additionalHeaders);
+		if (res.getErrorCode() == STATUS_CODE_SUCCESS) {
+			artifactDetails.setUniqueId(ResponseParser.getUniqueIdFromResponse(res));
+		}
+//		System.out.println("Add artifact was finished with response: "+ res.getErrorCode());
+		return res;
+	}
+	
+	
+
+	
+	//*************** PRIVATE **************
+	private static RestResponse deleteInformationalArtifact(User sdncModifierDetails, String url) throws IOException {
+		Map<String, String> additionalHeaders;
+
+			additionalHeaders = new HashMap<>();
+		
+		
+		additionalHeaders.put(HttpHeaderEnum.AUTHORIZATION.getValue(), authorizationHeader);
+		additionalHeaders.put(HttpHeaderEnum.X_ECOMP_INSTANCE_ID.getValue(), BaseRestUtils.xEcompInstanceId);
+		
+		return sendDelete(url, sdncModifierDetails.getUserId(), additionalHeaders);
+
+//		Gson gson = new Gson();
+////		System.out.println("ArtifactDetails: "+ jsonBody);
+//		String jsonBody = gson.toJson(artifactDetails);
+//
+//		RestResponse res = sendPost(url, jsonBody, sdncModifierDetails.getUserId(), acceptHeaderData, additionalHeaders);
+//		if ((res.getErrorCode() == STATUS_CODE_SUCCESS) || (res.getErrorCode() == STATUS_CODE_CREATED)) {
+//			artifactDetails.setUniqueId(ResponseParser.getUniqueIdFromResponse(res));
+//		}
+////		System.out.println("Add artifact was finished with response: "+ res.getErrorCode());
+//		return res;
+	}
+	
+	private static RestResponse updateInformationalArtifact(ArtifactReqDetails artifactDetails, User sdncModifierDetails, String checksum, String url) throws IOException {
+		return uploadInformationalArtifact(artifactDetails, sdncModifierDetails, checksum, url);
+	}
+	
+	private static RestResponse uploadInformationalArtifact(ArtifactReqDetails artifactDetails, User sdncModifierDetails, String checksum, String url) throws IOException {
+		Map<String, String> additionalHeaders = null;
+		if (checksum != null && !checksum.isEmpty()) {
+			additionalHeaders = new HashMap<>();
+			additionalHeaders.put(HttpHeaderEnum.Content_MD5.getValue(), checksum);
+		}
+		
+		additionalHeaders.put(HttpHeaderEnum.AUTHORIZATION.getValue(), authorizationHeader);
+		additionalHeaders.put(HttpHeaderEnum.X_ECOMP_INSTANCE_ID.getValue(), BaseRestUtils.xEcompInstanceId);
+
+		Gson gson = new Gson();
+//		System.out.println("ArtifactDetails: "+ jsonBody);
+		String jsonBody = gson.toJson(artifactDetails);
+
+		RestResponse res = sendPost(url, jsonBody, sdncModifierDetails.getUserId(), acceptHeaderData, additionalHeaders);
+		if ((res.getErrorCode() == STATUS_CODE_SUCCESS) || (res.getErrorCode() == STATUS_CODE_CREATED)) {
+			artifactDetails.setUniqueId(ResponseParser.getUniqueIdFromResponse(res));
+		}
+//		System.out.println("Add artifact was finished with response: "+ res.getErrorCode());
+		return res;
+	}
+	
+	private static RestResponse addArtifactToInstance(ArtifactReqDetails artifactDetails, User sdncModifierDetails, String checksum, String url) throws IOException {
+		Map<String, String> additionalHeaders;
+		additionalHeaders = new HashMap<>();
+		if (checksum != null && !checksum.isEmpty()) {
+			additionalHeaders = new HashMap<>();
+			additionalHeaders.put(HttpHeaderEnum.Content_MD5.getValue(), checksum);
+		}
+		additionalHeaders.put(HttpHeaderEnum.ACCEPT.getValue(), "application/json, text/plain, */*");
+		additionalHeaders.put(HttpHeaderEnum.CONTENT_TYPE.getValue(), "application/json;charset=UTF-8");
+
+		Gson gson = new Gson();
+		String jsonBody = gson.toJson(artifactDetails);
+
+		RestResponse res = sendPost(url, jsonBody, sdncModifierDetails.getUserId(), "application/json, text/plain, */*", additionalHeaders);
+		if (res.getErrorCode() == STATUS_CODE_SUCCESS) {
+			artifactDetails.setUniqueId(ResponseParser.getUniqueIdFromResponse(res));
+		}
+		return res;
+	}
+	
+	private static RestResponse updateDeploymentArtifact(ArtifactDefinition artifactDefinition, User sdncModifierDetails, String url) throws IOException {
+		Map<String, String> additionalHeaders;
+		additionalHeaders = new HashMap<>();
+		additionalHeaders.put(HttpHeaderEnum.ACCEPT.getValue(), "application/json, text/plain, */*");
+		additionalHeaders.put(HttpHeaderEnum.CONTENT_TYPE.getValue(), "application/json;charset=UTF-8");
+		
+		Gson gson = new Gson();
+		String jsonBody = gson.toJson(artifactDefinition);
+
+		RestResponse res = sendPost(url, jsonBody, sdncModifierDetails.getUserId(), "application/json, text/plain, */*", additionalHeaders);
+		return res;
+	}
+	
+	private static RestResponse updateDeploymentArtifact(ArtifactReqDetails artifactDetails, User sdncModifierDetails, String url) throws IOException {
+		Map<String, String> additionalHeaders;
+		
+			additionalHeaders = new HashMap<>();
+			additionalHeaders.put(HttpHeaderEnum.ACCEPT.getValue(), "application/json, text/plain, */*");
+			additionalHeaders.put(HttpHeaderEnum.CONTENT_TYPE.getValue(), "application/json;charset=UTF-8");
+//			additionalHeaders.put(HttpHeaderEnum..getValue(), "application/json;charset=UTF-8");
+		
+
+		Gson gson = new Gson();
+		String jsonBody = gson.toJson(artifactDetails);
+//		System.out.println("ArtifactDetails: "+ jsonBody);
+
+		RestResponse res = sendPost(url, jsonBody, sdncModifierDetails.getUserId(), "application/json, text/plain, */*", additionalHeaders);
+		if (res.getErrorCode() == STATUS_CODE_SUCCESS) {
+			artifactDetails.setUniqueId(ResponseParser.getUniqueIdFromResponse(res));
+		}
+//		System.out.println("Add artifact was finished with response: "+ res.getErrorCode());
+		return res;
+	}
+	
+	private static RestResponse downloadArtifact(String url, User user, Map<String, String> addionalHeaders,boolean addEcompHeader) throws IOException
+	{	
+		if(addEcompHeader){
+			addionalHeaders.put(HttpHeaderEnum.X_ECOMP_INSTANCE_ID.getValue(), BaseRestUtils.xEcompInstanceId);
+		}
+		return downloadArtifact(url, user, addionalHeaders, acceptOctetStream);
+	}
+	
+	private static RestResponse downloadArtifact(String url, User user, Map<String, String> addionalHeaders, String accept) throws IOException
+	{
+		addionalHeaders.put(HttpHeaderEnum.ACCEPT.getValue(), accept);
+		
+		RestResponse res =  sendGet(url, user.getUserId(), addionalHeaders);
+//		System.out.println("download artifact was finished with response: "+ res.getErrorCode());
+//		System.out.println("response is: " + res.getResponse());
+		return res;
+	}
+	
+	private static Map<String,Map<String,Object>> getArtifactsListFromResponse(String jsonResponse, String fieldOfArtifactList){
+		JSONObject object = (JSONObject)JSONValue.parse(jsonResponse);
+		Map<String,Map<String,Object>> map = (Map<String,Map<String,Object>>)object.get(fieldOfArtifactList);
+		return map;
+	}
+
+	public static String calculateChecksum(ArtifactReqDetails artifactDetails) {
+		String checksum = null;
+		if (artifactDetails.getPayload() != null) {
+			checksum = ResponseParser.calculateMD5Header(artifactDetails);
+		}
+		return checksum;
+	}
+	
+	public static String encodeUrlForDownload(String url){
+
+		return url.replaceAll(" ", "%20");
+	}
+	
+	public static String getPartialUrlByArtifactName(ServiceReqDetails serviceDetails,String serviceVersion ,String artifactName){
+		return encodeUrlForDownload(String.format(Urls.DISTRIB_DOWNLOAD_SERVICE_ARTIFACT_RELATIVE_URL, ValidationUtils.convertToSystemName(serviceDetails.getName()), serviceVersion, artifactName));
+	}
+	
+	public static String getUniqueIdOfArtifact(RestResponse createResponse, String artifactField, String requieredArtifactLabel) throws Exception
+	{
+		Map<String, Object> artifact = getArtifactFromRestResponse(createResponse, artifactField, requieredArtifactLabel);
+		assertNotNull(artifact);
+		return artifact.get("uniqueId").toString();
+	}
+	
+	public static Map<String, Object> getArtifactFromRestResponse(RestResponse response, String artifactField, String requieredArtifactLabel)
+	{
+		Map<String, Map<String, Object>> map = getArtifactsListFromResponse(response.getResponse(), artifactField);
+		return map.get(requieredArtifactLabel);
+	}
+	
+
+	
+	public static RestResponse updateInformationalArtifactPayloadOfService(ArtifactReqDetails artifactDetails, User sdncModifierDetails, String serviceUid, String artifactUid) throws IOException
+	{
+		return updateInformationalArtifactPayloadOfService(artifactDetails, sdncModifierDetails, serviceUid, artifactUid, calculateMD5Header(artifactDetails));
+	}
+	
+	private static RestResponse updateInformationalArtifactPayloadOfService(ArtifactReqDetails artifactDetails, User sdncModifierDetails, String serviceUid, String artifactUid, String checksum) throws IOException
+	{
+		return updateInformationalArtifactOfService(artifactDetails, sdncModifierDetails, serviceUid, artifactUid, checksum, true);
+	}
+	
+	private static RestResponse updateInformationalArtifactOfService(ArtifactReqDetails artifactDetails, User sdncModifierDetails, String serviceUid, String artifactUid, String checksum, boolean isPayloadUpdate) throws IOException
+	{
+		Config config = Utils.getConfig();
+		Map<String, String> headersMap = prepareHeadersMap(sdncModifierDetails.getUserId());
+
+		if (isPayloadUpdate){
+			headersMap.put(HttpHeaderEnum.Content_MD5.getValue(), checksum);
+		}
+
+		Gson gson = new Gson();
+		String jsonBody = gson.toJson(artifactDetails);
+
+		HttpRequest http = new HttpRequest();
+
+		String url = String.format(Urls.UPDATE_OR_DELETE_ARTIFACT_OF_SERVICE, config.getCatalogBeHost(),config.getCatalogBePort(), serviceUid, artifactUid);
+		RestResponse res =  http.httpSendPost(url, jsonBody, headersMap);
+//		System.out.println("update artifact was finished with response: "+ res.getErrorCode());
+		return res;
+	}
+	
+	public static String calculateMD5Header(ArtifactReqDetails artifactDetails)
+	{
+		Gson gson = new Gson();
+		String jsonBody = gson.toJson(artifactDetails);
+		// calculate MD5 for json body
+		return calculateMD5(jsonBody);
+
+	}
+	
+	public static String calculateMD5 (String data){
+		String calculatedMd5 = org.apache.commons.codec.digest.DigestUtils.md5Hex(data);
+		// encode base-64 result
+		byte[] encodeBase64 = Base64.encodeBase64(calculatedMd5.getBytes());
+		String encodeBase64Str = new String(encodeBase64);
+		return encodeBase64Str;
+
+	}
+
+
+	/**
+	 * @param restResponse restResponse object
+	 * @return readable content(converted from base64)
+	 * @throws IOException ioexception
+	 */
+	public static String getDecodedArtifactPayloadFromResponse(RestResponse restResponse) throws IOException {
+		Gson gson = new Gson();
+		Map<String, String> fromJson = gson.fromJson(restResponse.getResponse(), Map.class);
+		String payloadData = fromJson.get("base64Contents").toString();
+		String decodedPaypload = org.openecomp.sdc.ci.tests.utils.Decoder.decode(payloadData);
+		return decodedPaypload;
+	}
+
+
+}
diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/utils/rest/AssetRestUtils.java b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/utils/rest/AssetRestUtils.java
new file mode 100644
index 0000000000..ad70c34628
--- /dev/null
+++ b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/utils/rest/AssetRestUtils.java
@@ -0,0 +1,621 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * SDC
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.sdc.ci.tests.utils.rest;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.google.gson.*;
+import org.apache.http.HttpEntity;
+import org.apache.http.HttpResponse;
+import org.apache.http.client.methods.CloseableHttpResponse;
+import org.apache.http.client.methods.HttpGet;
+import org.apache.http.impl.client.CloseableHttpClient;
+import org.apache.http.impl.client.HttpClients;
+import org.openecomp.sdc.be.datatypes.enums.AssetTypeEnum;
+import org.openecomp.sdc.be.datatypes.enums.ComponentTypeEnum;
+import org.openecomp.sdc.be.datatypes.enums.ResourceTypeEnum;
+import org.openecomp.sdc.be.model.*;
+import org.openecomp.sdc.ci.tests.api.Urls;
+import org.openecomp.sdc.ci.tests.config.Config;
+import org.openecomp.sdc.ci.tests.datatypes.*;
+import org.openecomp.sdc.ci.tests.datatypes.enums.UserRoleEnum;
+import org.openecomp.sdc.ci.tests.datatypes.http.HttpHeaderEnum;
+import org.openecomp.sdc.ci.tests.datatypes.http.HttpRequest;
+import org.openecomp.sdc.ci.tests.datatypes.http.RestResponse;
+import org.openecomp.sdc.ci.tests.utils.Utils;
+import org.openecomp.sdc.ci.tests.utils.general.AtomicOperationUtils;
+import org.openecomp.sdc.ci.tests.utils.general.FileHandling;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
+
+import static org.testng.AssertJUnit.assertNotNull;
+import static org.testng.AssertJUnit.assertTrue;
+
+public class AssetRestUtils extends BaseRestUtils {
+	static Gson gson = new Gson();
+	static ObjectMapper objectMapper = new ObjectMapper();
+
+	static Logger logger = LoggerFactory.getLogger(AssetRestUtils.class.getName());
+	static final String basicAuthentication = "Basic Y2k6MTIzNDU2";
+	// /sdc/v1/catalog/{services/resources}/{componentUUID}/artifacts/{artifactUUID}
+	static final String COMPONENT_ARTIFACT_URL = "/sdc/v1/catalog/%s/%s/artifacts/%s";
+	// /sdc/v1/catalog/{services/resources}/{componentUUID}/resourceInstances/{resourceInstanceName}/artifacts/{artifactUUID}
+	static final String RESOURCE_INSTANCE_ARTIFACT_URL = "/sdc/v1/catalog/%s/%s/resourceInstances/%s/artifacts/%s";
+
+	public static HttpResponse getComponentToscaModel(AssetTypeEnum assetType, String uuid) throws IOException {
+		Config config = Utils.getConfig();
+		CloseableHttpClient httpclient = HttpClients.createDefault();
+		String url = String.format(Urls.GET_TOSCA_MODEL, config.getCatalogBeHost(), config.getCatalogBePort(),
+				assetType.getValue(), uuid);
+		HttpGet httpGet = new HttpGet(url);
+
+		httpGet.addHeader(HttpHeaderEnum.X_ECOMP_INSTANCE_ID.getValue(), BaseRestUtils.xEcompInstanceId);
+		httpGet.addHeader(HttpHeaderEnum.AUTHORIZATION.getValue(), basicAuthentication);
+
+		logger.debug("Send GET request to get Tosca model: {}", url);
+
+		return httpclient.execute(httpGet);
+	}
+	
+	public static File getToscaModelCsarFile(AssetTypeEnum assetType, String uuid) throws IOException {
+		return getToscaModelCsarFile(assetType, uuid, "");
+	}
+	
+	public static File getToscaModelCsarFile(AssetTypeEnum assetType, String uuid, String fileName) throws IOException {
+		File myFile;
+		Config config = Utils.getConfig();
+		CloseableHttpClient httpclient = HttpClients.createDefault();
+		String url = String.format(Urls.GET_TOSCA_MODEL, config.getCatalogBeHost(), config.getCatalogBePort(),
+				assetType.getValue(), uuid);
+		HttpGet httpGet = new HttpGet(url);
+		
+		if(fileName.isEmpty()) {
+			myFile = new File("tmpCSAR");			
+		} else {
+			String csarDir = FileHandling.getCreateDirByName("outputCsar");
+			myFile = new File(csarDir+ File.separator + "tmpCSAR_" + fileName + ".csar");
+		}
+
+		
+		httpGet.addHeader(HttpHeaderEnum.X_ECOMP_INSTANCE_ID.getValue(), BaseRestUtils.xEcompInstanceId);
+		httpGet.addHeader(HttpHeaderEnum.AUTHORIZATION.getValue(), basicAuthentication);
+
+		logger.debug("Send GET request to get Tosca model: {}", url);
+		CloseableHttpResponse execute = httpclient.execute(httpGet);
+		
+	    HttpEntity entity = execute.getEntity();
+	    if (entity != null) {
+	        try (FileOutputStream outstream = new FileOutputStream(myFile)) {
+	            entity.writeTo(outstream);
+	            outstream.close();
+	        }
+	    }
+		return myFile;
+	}
+	
+	public static RestResponse getRestResponseComponentToscaModel(AssetTypeEnum assetType, String uuid) throws IOException {
+		Config config = Utils.getConfig();
+		
+		String url = String.format(Urls.GET_TOSCA_MODEL, config.getCatalogBeHost(), config.getCatalogBePort(),
+				assetType.getValue(), uuid);
+		
+		Map<String, String> headersMap = new HashMap<>();
+		headersMap.put(HttpHeaderEnum.CONTENT_TYPE.getValue(), contentTypeHeaderData);
+		headersMap.put(HttpHeaderEnum.AUTHORIZATION.getValue(), authorizationHeader);
+		headersMap.put(HttpHeaderEnum.X_ECOMP_INSTANCE_ID.getValue(), BaseRestUtils.xEcompInstanceId);
+		
+		HttpRequest http = new HttpRequest();
+
+		logger.debug("Send GET request to get Resource Assets: {}", url);
+		System.out.println("Send GET request to get Resource Assets: " + url);
+		
+		logger.debug("Request headers: {}", headersMap);
+		System.out.println("Request headers: " + headersMap);
+
+		RestResponse sendGetResourceAssets = http.httpSendGet(url, headersMap);
+
+		return sendGetResourceAssets;
+
+	}
+
+	public static RestResponse getComponentListByAssetType(boolean isBasicAuthentication, AssetTypeEnum assetType,
+			String... filterArrayString) throws IOException {
+		Config config = Utils.getConfig();
+		Map<String, String> headersMap = new HashMap<>();
+		headersMap.put(HttpHeaderEnum.CONTENT_TYPE.getValue(), BaseRestUtils.contentTypeHeaderData);
+		headersMap.put(HttpHeaderEnum.ACCEPT.getValue(), BaseRestUtils.acceptHeaderData);
+		if (isBasicAuthentication) {
+			headersMap.put(HttpHeaderEnum.AUTHORIZATION.getValue(), basicAuthentication);
+		}
+		headersMap.put(HttpHeaderEnum.X_ECOMP_INSTANCE_ID.getValue(), BaseRestUtils.xEcompInstanceId);
+
+		HttpRequest http = new HttpRequest();
+			String url = String.format(Urls.GET_ASSET_LIST, config.getCatalogBeHost(), config.getCatalogBePort(),
+				assetType.getValue());
+		if (filterArrayString != null && filterArrayString.length > 0) {
+			url = buildUrlWithFilter(url, filterArrayString);
+		}
+
+		RestResponse sendGetResourceAssets = http.httpSendGet(url, headersMap);
+
+		return sendGetResourceAssets;
+	}
+
+	public static RestResponse getFilteredComponentList(AssetTypeEnum assetType, String query) throws IOException {
+		Config config = Utils.getConfig();
+		Map<String, String> headersMap = new HashMap<>();
+		headersMap.put(HttpHeaderEnum.CONTENT_TYPE.getValue(), BaseRestUtils.contentTypeHeaderData);
+		headersMap.put(HttpHeaderEnum.ACCEPT.getValue(), BaseRestUtils.acceptHeaderData);
+		headersMap.put(HttpHeaderEnum.AUTHORIZATION.getValue(), basicAuthentication);
+		headersMap.put(HttpHeaderEnum.X_ECOMP_INSTANCE_ID.getValue(), BaseRestUtils.xEcompInstanceId);
+
+		HttpRequest http = new HttpRequest();
+
+		String url = String.format(Urls.GET_FILTERED_ASSET_LIST, config.getCatalogBeHost(), config.getCatalogBePort(),
+				assetType.getValue(), query);
+
+		logger.debug("Send GET request to get Resource Assets: {}", url);
+		logger.debug("Request headers: {}", headersMap);
+
+		RestResponse sendGetResourceAssets = http.httpSendGet(url, headersMap);
+
+		return sendGetResourceAssets;
+	}
+
+	public static String buildUrlWithFilter(String url, String[] filterArrayString) {
+		StringBuilder sb = new StringBuilder();
+		int length = filterArrayString.length;
+		int count = 0;
+		for (String filterString : filterArrayString) {
+			sb.append(filterString);
+			count++;
+			if (length != count) {
+				sb.append("&");
+			}
+		}
+		return url + "?" + sb;
+	}
+
+	public static RestResponse getAssetMetadataByAssetTypeAndUuid(boolean isBasicAuthentication,
+			AssetTypeEnum assetType, String uuid) throws IOException {
+
+		Config config = Utils.getConfig();
+		Map<String, String> headersMap = new HashMap<>();
+		headersMap.put(HttpHeaderEnum.CONTENT_TYPE.getValue(), BaseRestUtils.contentTypeHeaderData);
+		headersMap.put(HttpHeaderEnum.ACCEPT.getValue(), BaseRestUtils.acceptHeaderData);
+		if (isBasicAuthentication) {
+			headersMap.put(HttpHeaderEnum.AUTHORIZATION.getValue(), basicAuthentication);
+		}
+		headersMap.put(HttpHeaderEnum.X_ECOMP_INSTANCE_ID.getValue(), BaseRestUtils.xEcompInstanceId);
+
+		HttpRequest http = new HttpRequest();
+		String url = String.format(Urls.GET_ASSET_METADATA, config.getCatalogBeHost(), config.getCatalogBePort(),
+				assetType.getValue(), uuid);
+
+		logger.debug("Send GET request to get Resource Assets: {}", url);
+		logger.debug("Request headers: {}", headersMap);
+
+		RestResponse sendGetResourceAssets = http.httpSendGet(url, headersMap);
+
+		return sendGetResourceAssets;
+	}
+
+	public static List<ResourceAssetStructure> getResourceAssetList(RestResponse assetResponse) {
+		List<ResourceAssetStructure> resourceAssetList = new ArrayList<>();
+
+		JsonElement jelement = new JsonParser().parse(assetResponse.getResponse());
+		JsonArray componenetArray = (JsonArray) jelement;
+		for (JsonElement jElement : componenetArray) {
+			ResourceAssetStructure resource = gson.fromJson(jElement, ResourceAssetStructure.class);
+			resourceAssetList.add(resource);
+		}
+		return resourceAssetList;
+	}
+
+	public static ResourceDetailedAssetStructure getResourceAssetMetadata(RestResponse assetResponse) {
+
+		List<ResourceInstanceAssetStructure> resourcesList = new ArrayList<>();
+		List<ArtifactAssetStructure> artifactsList = new ArrayList<>();
+		ResourceDetailedAssetStructure resourceAssetMetadata = new ResourceDetailedAssetStructure();
+		String response = assetResponse.getResponse();
+
+		JsonObject jObject = (JsonObject) new JsonParser().parse(response);
+		resourceAssetMetadata = gson.fromJson(jObject, ResourceDetailedAssetStructure.class);
+
+		setResourceInstanceAssetList(resourcesList, jObject);
+		resourceAssetMetadata.setResources(resourcesList);
+
+		setArtifactAssetList(artifactsList, jObject);
+		resourceAssetMetadata.setArtifacts(artifactsList);
+
+		return resourceAssetMetadata;
+	}
+
+	public static void generalMetadataFieldsValidatior(AssetStructure assetMetadata, Component component) {
+
+		assertTrue("Expected resourceUuid is " + component.getUUID() + " actual: " + assetMetadata.getUuid(),
+				assetMetadata.getUuid().equals(component.getUUID()));
+		assertTrue(
+				"Expected resourceInvariantUuid is " + component.getInvariantUUID() + " actual: "
+						+ assetMetadata.getInvariantUUID(),
+				assetMetadata.getInvariantUUID().equals(component.getInvariantUUID()));
+		assertTrue("Expected asset name is " + component.getName() + " actual: " + assetMetadata.getName(),
+				assetMetadata.getName().equals(component.getName()));
+		assertTrue("Expected asset version is " + component.getVersion() + " actual: " + assetMetadata.getVersion(),
+				assetMetadata.getVersion().equals(component.getVersion()));
+		assertTrue(
+				"Expected asset lastUpdaterUserId is " + component.getLastUpdaterUserId() + " actual: "
+						+ assetMetadata.getLastUpdaterUserId(),
+				assetMetadata.getLastUpdaterUserId().equals(component.getLastUpdaterUserId()));
+		assertNotNull("Expected asset toscaModel is null", assetMetadata.getToscaModelURL());
+		assertTrue(
+				"Expected asset category is " + component.getCategories().get(0).getName() + " actual: "
+						+ assetMetadata.getCategory(),
+				assetMetadata.getCategory().equals(component.getCategories().get(0).getName()));
+		assertTrue(
+				"Expected asset lifeCycleState is " + component.getLifecycleState() + " actual: "
+						+ assetMetadata.getLifecycleState(),
+				assetMetadata.getLifecycleState().equals(component.getLifecycleState().toString()));
+
+	}
+
+	public static void resourceMetadataValidatior(ResourceDetailedAssetStructure resourceAssetMetadata,
+			Resource resource, AssetTypeEnum assetType) throws Exception {
+
+		generalMetadataFieldsValidatior(resourceAssetMetadata, resource);
+		assertTrue(
+				"Expected asset lastUpdaterFullName is " + resource.getLastUpdaterFullName() + " actual: "
+						+ resourceAssetMetadata.getLastUpdaterFullName(),
+				resourceAssetMetadata.getLastUpdaterFullName().equals(resource.getLastUpdaterFullName()));
+		assertTrue(
+				"Expected asset subCategory is " + resource.getCategories().get(0).getSubcategories().get(0).getName()
+						+ " actual: " + resourceAssetMetadata.getSubCategory(),
+				resourceAssetMetadata.getSubCategory()
+						.equals(resource.getCategories().get(0).getSubcategories().get(0).getName()));
+		assertTrue(
+				"Expected asset toscaResourceName is " + resource.getToscaResourceName() + " actual: "
+						+ resourceAssetMetadata.getToscaResourceName(),
+				resourceAssetMetadata.getToscaResourceName().equals(resource.getToscaResourceName()));
+		assertTrue(
+				"Expected asset resourceType is " + resource.getResourceType() + " actual: "
+						+ resourceAssetMetadata.getResourceType(),
+				resourceAssetMetadata.getResourceType().equals(resource.getResourceType().toString()));
+		resourceInstanceAssetValidator(resourceAssetMetadata.getResources(), resource, assetType);
+		// resourceInstanceAssetValidator(resourceAssetMetadata.getResources(),
+		// resource);
+		artifactAssetValidator(resourceAssetMetadata.getArtifacts(), resource, assetType);
+
+	}
+
+	public static void serviceMetadataValidatior(ServiceDetailedAssetStructure serviceAssetMetadata, Service service,
+			AssetTypeEnum assetType) throws Exception {
+
+		generalMetadataFieldsValidatior(serviceAssetMetadata, service);
+		assertTrue(
+				"Expected asset lastUpdaterFullName is " + service.getLastUpdaterFullName() + " actual: "
+						+ serviceAssetMetadata.getLastUpdaterFullName(),
+				serviceAssetMetadata.getLastUpdaterFullName().equals(service.getLastUpdaterFullName()));
+		assertTrue("Expected asset distributionStatus is " + service.getDistributionStatus() + " actual: "
+						+ serviceAssetMetadata.getDistributionStatus(),
+				serviceAssetMetadata.getDistributionStatus().equals(service.getDistributionStatus().toString()));
+		resourceInstanceAssetValidator(serviceAssetMetadata.getResources(), service, assetType);
+		// resourceInstanceAssetValidator(serviceAssetMetadata.getResources(),
+		// service);
+		artifactAssetValidator(serviceAssetMetadata.getArtifacts(), service, assetType);
+
+	}
+
+	private static void artifactAssetValidator(List<ArtifactAssetStructure> artifactAssetStructureList,
+			Component component, AssetTypeEnum assetType) {
+		Map<String, ArtifactDefinition> componentDeploymentArtifacts = component.getDeploymentArtifacts();
+		validateArtifactMetadata(componentDeploymentArtifacts, artifactAssetStructureList, component.getUUID(),
+				assetType, null);
+	}
+
+	private static void validateArtifactMetadata(Map<String, ArtifactDefinition> componentDeploymentArtifacts,
+			List<ArtifactAssetStructure> artifactAssetStructureList, String componentUuid, AssetTypeEnum assetType,
+			String resourceInstanceName) {
+		if(componentDeploymentArtifacts != null){
+			for (Entry<String, ArtifactDefinition> componentDeploymentArtifact : componentDeploymentArtifacts.entrySet()) {
+				ArtifactAssetStructure artifactAssetStructure = getArtifactMetadata(artifactAssetStructureList,
+						componentDeploymentArtifact.getValue().getArtifactUUID());
+				ArtifactDefinition componentDeploymentArtifactValue = componentDeploymentArtifact.getValue();
+				if (artifactAssetStructure != null) {
+					assertTrue(
+							"Expected artifact asset artifactName is " + componentDeploymentArtifactValue.getArtifactName()
+									+ " actual: " + artifactAssetStructure.getArtifactName(),
+							componentDeploymentArtifactValue.getArtifactName()
+									.equals(artifactAssetStructure.getArtifactName()));
+					assertTrue(
+							"Expected artifact asset Type is " + componentDeploymentArtifactValue.getArtifactType()
+									+ " actual: " + artifactAssetStructure.getArtifactType(),
+							componentDeploymentArtifactValue.getArtifactType()
+									.equals(artifactAssetStructure.getArtifactType()));
+					// assertNotNull("Expected artifact asset resourceInvariantUUID
+					// is null",
+					// resourceInstanceAssetStructure.getResourceInvariantUUID());
+					// String expectedArtifactUrl = "/sdc/v1/catalog/" +
+					// assetType.getValue() + "/" + componentUuid + "/artifacts/" +
+					// componentDeploymentArtifactValue.getArtifactUUID();
+					String expectedArtifactUrl = "";
+					if (resourceInstanceName == null) {
+						expectedArtifactUrl = String.format(COMPONENT_ARTIFACT_URL, assetType.getValue(), componentUuid,
+								componentDeploymentArtifactValue.getArtifactUUID());
+					} else {
+						expectedArtifactUrl = String.format(RESOURCE_INSTANCE_ARTIFACT_URL, assetType.getValue(),
+								componentUuid, resourceInstanceName, componentDeploymentArtifactValue.getArtifactUUID());
+					}
+	
+					assertTrue(
+							"Expected artifact asset URL is " + expectedArtifactUrl + " actual: "
+									+ artifactAssetStructure.getArtifactURL(),
+							artifactAssetStructure.getArtifactURL().equals(expectedArtifactUrl));
+					assertTrue(
+							"Expected artifact asset description is " + componentDeploymentArtifactValue.getDescription()
+									+ " actual: " + artifactAssetStructure.getArtifactDescription(),
+							componentDeploymentArtifactValue.getDescription().toString()
+									.equals(artifactAssetStructure.getArtifactDescription()));
+					assertTrue(
+							"Expected artifact asset checkSum is " + componentDeploymentArtifactValue.getArtifactChecksum()
+									+ " actual: " + artifactAssetStructure.getArtifactChecksum(),
+							componentDeploymentArtifactValue.getArtifactChecksum()
+									.equals(artifactAssetStructure.getArtifactChecksum()));
+					assertTrue(
+							"Expected artifact asset version is " + componentDeploymentArtifactValue.getArtifactVersion()
+									+ " actual: " + artifactAssetStructure.getArtifactVersion(),
+							componentDeploymentArtifactValue.getArtifactVersion()
+									.equals(artifactAssetStructure.getArtifactVersion()));
+					if (componentDeploymentArtifactValue.getTimeout() > 0) {
+						assertTrue(
+								"Expected artifact asset timeout is " + componentDeploymentArtifactValue.getTimeout()
+										+ " actual: " + artifactAssetStructure.getArtifactTimeout(),
+								componentDeploymentArtifactValue.getTimeout()
+										.equals(artifactAssetStructure.getArtifactTimeout()));
+					}
+	
+				} else {
+					assertTrue("artifact asset with UUID" + componentDeploymentArtifact.getValue().getArtifactUUID()
+							+ " not found in get Metadata response", false);
+				}
+			}
+		}else{
+			System.out.println("componentDeploymentArtifacts is null");
+			logger.debug("componentDeploymentArtifacts is null");
+		}
+
+	}
+
+	private static ArtifactAssetStructure getArtifactMetadata(List<ArtifactAssetStructure> artifactAssetStructureList,
+			String artifactUUID) {
+		for (ArtifactAssetStructure artifactAssetStructure : artifactAssetStructureList) {
+			if (artifactAssetStructure.getArtifactUUID().equals(artifactUUID)) {
+				return artifactAssetStructure;
+			}
+		}
+		return null;
+	}
+
+	private static void resourceInstanceAssetValidator(
+			List<ResourceInstanceAssetStructure> resourceInstanceAssetStructures, Component component,
+			AssetTypeEnum assetType) throws Exception {
+
+		List<ComponentInstance> componentInstances = component.getComponentInstances();
+		if (componentInstances != null) {
+			for (ComponentInstance componentInstance : componentInstances) {
+				ResourceInstanceAssetStructure resourceInstanceAssetStructure = getResourceInstanceMetadata(
+						resourceInstanceAssetStructures, componentInstance.getName());
+				if (resourceInstanceAssetStructure != null) {
+					assertTrue(
+							"Expected RI asset resourceName is " + componentInstance.getComponentName() + " actual: "
+									+ resourceInstanceAssetStructure.getResourceName(),
+							componentInstance.getComponentName()
+									.equals(resourceInstanceAssetStructure.getResourceName()));
+					assertTrue(
+							"Expected RI asset Name is " + componentInstance.getName() + " actual: "
+									+ resourceInstanceAssetStructure.getResourceInstanceName(),
+							componentInstance.getName()
+									.equals(resourceInstanceAssetStructure.getResourceInstanceName()));
+					assertNotNull("Expected RI asset resourceInvariantUUID is null",
+							resourceInstanceAssetStructure.getResourceInvariantUUID());
+					assertTrue(
+							"Expected RI asset resourceVersion is " + componentInstance.getComponentVersion()
+									+ " actual: " + resourceInstanceAssetStructure.getResourceVersion(),
+							componentInstance.getComponentVersion()
+									.equals(resourceInstanceAssetStructure.getResourceVersion()));
+					assertTrue(
+							"Expected RI asset resourceType is " + componentInstance.getOriginType() + " actual: "
+									+ resourceInstanceAssetStructure.getResoucreType(),
+							componentInstance.getOriginType().toString()
+									.equals(resourceInstanceAssetStructure.getResoucreType()));
+					Resource resource = AtomicOperationUtils.getResourceObject(componentInstance.getComponentUid());
+					assertTrue("Expected RI asset resourceUUID is " + resource.getUUID() + " actual: " + resourceInstanceAssetStructure.getResourceUUID(),
+							resource.getUUID().equals(resourceInstanceAssetStructure.getResourceUUID()));
+					validateArtifactMetadata(componentInstance.getDeploymentArtifacts(),
+							resourceInstanceAssetStructure.getArtifacts(), component.getUUID(), assetType,
+							componentInstance.getNormalizedName());
+					// validateArtifactMetadata(componentInstance.getDeploymentArtifacts(),
+					// resourceInstanceAssetStructure.getArtifacts(),
+					// component.getUUID(), AssetTypeEnum.RESOURCES);
+				} else {
+					assertTrue("resourceInstance asset with UUID" + componentInstance.getComponentUid()
+							+ " not found in get Metadata response", false);
+				}
+			}
+		}
+
+	}
+
+	// private static ResourceInstanceAssetStructure
+	// getResourceInstanceMetadata(List<ResourceInstanceAssetStructure>
+	// resourceInstanceAssetStructures, String componentUid) {
+	private static ResourceInstanceAssetStructure getResourceInstanceMetadata(
+			List<ResourceInstanceAssetStructure> resourceInstanceAssetStructures, String name) {
+		for (ResourceInstanceAssetStructure resourceInstanceAssetStructure : resourceInstanceAssetStructures) {
+			if (resourceInstanceAssetStructure.getResourceInstanceName().equals(name)) {
+				return resourceInstanceAssetStructure;
+			}
+		}
+		return null;
+	}
+
+	public static ServiceDetailedAssetStructure getServiceAssetMetadata(RestResponse assetResponse) {
+
+		List<ResourceInstanceAssetStructure> resourcesList = new ArrayList<>();
+		List<ArtifactAssetStructure> artifactsList = new ArrayList<>();
+		ServiceDetailedAssetStructure serviceAssetMetadata;
+
+		JsonObject jObject = (JsonObject) new JsonParser().parse(assetResponse.getResponse());
+		serviceAssetMetadata = gson.fromJson(jObject, ServiceDetailedAssetStructure.class);
+
+		setResourceInstanceAssetList(resourcesList, jObject);
+		serviceAssetMetadata.setResources(resourcesList);
+
+		setArtifactAssetList(artifactsList, jObject);
+		serviceAssetMetadata.setArtifacts(artifactsList);
+
+		return serviceAssetMetadata;
+	}
+
+	public static void setArtifactAssetList(List<ArtifactAssetStructure> artifactsList, JsonObject jObject) {
+		JsonArray artifactsArray = jObject.getAsJsonArray("artifacts");
+		if (artifactsArray != null) {
+			for (JsonElement jElement : artifactsArray) {
+				ArtifactAssetStructure artifact = gson.fromJson(jElement, ArtifactAssetStructure.class);
+				artifactsList.add(artifact);
+			}
+		}
+	}
+
+	public static void setResourceInstanceAssetList(List<ResourceInstanceAssetStructure> resourcesList,
+			JsonObject jObject) {
+		JsonArray resourcesArray = jObject.getAsJsonArray("resources");
+		if (resourcesArray != null) {
+			for (JsonElement jElement : resourcesArray) {
+				ResourceInstanceAssetStructure resource = gson.fromJson(jElement, ResourceInstanceAssetStructure.class);
+				resourcesList.add(resource);
+			}
+		}
+	}
+
+	public static List<ServiceAssetStructure> getServiceAssetList(RestResponse assetResponse) {
+		List<ServiceAssetStructure> serviceAssetList = new ArrayList<>();
+
+		JsonElement jelement = new JsonParser().parse(assetResponse.getResponse());
+		JsonArray componenetArray = (JsonArray) jelement;
+		for (JsonElement jElement : componenetArray) {
+			ServiceAssetStructure service = gson.fromJson(jElement, ServiceAssetStructure.class);
+			serviceAssetList.add(service);
+		}
+		return serviceAssetList;
+	}
+
+	public static List<String> getResourceNamesList(List<ResourceAssetStructure> resourceAssetList) {
+		List<String> assetNamesList = new ArrayList<>();
+		for (ResourceAssetStructure resourceAsset : resourceAssetList) {
+			assetNamesList.add(resourceAsset.getName());
+		}
+		return assetNamesList;
+	}
+	
+	public static Map<String,String> getResourceAssetMap(RestResponse assetResponse) {
+		Map<String,String> resourceAssetMap =  new HashMap<>();
+
+		JsonElement jelement = new JsonParser().parse(assetResponse.getResponse());
+		JsonArray componenetArray = (JsonArray) jelement;
+		for (JsonElement jElement : componenetArray) {
+			ResourceAssetStructure resource = gson.fromJson(jElement, ResourceAssetStructure.class);
+			resourceAssetMap.put(resource.getName(), resource.getVersion());
+		}
+		return resourceAssetMap;
+	}
+	
+	public static Map<String,String> getResourceListFiltteredByWholeVersion(Map<String,String> resourceAssetList) {
+		Map<String,String> assetNamesMap = new HashMap<>();
+			for (Entry<String, String> entry : resourceAssetList.entrySet()) {
+			    String key = entry.getKey();
+			    String[] parts = entry.getValue().split("\\.");
+			    String lastOne = parts[parts.length-1];
+			    
+			    if (key.contains("CinderVolume") ){
+			    	assetNamesMap.put(key,entry.getValue());
+			    }
+			    
+			    if (lastOne.equals("0") && !key.contains("Ci") ){
+			    	assetNamesMap.put(key,entry.getValue());
+			    }
+			}
+			
+		return assetNamesMap;
+	}
+
+	public static List<String> getResourceObjectByNameAndVersionToscaNamesList(Map<String,String> resourceAssetList) throws Exception {
+		List<String> assetNamesList = new ArrayList<>();
+		for (Entry<String, String> entry : resourceAssetList.entrySet()) {
+			System.out.println("fetch data---->"+entry.getKey()+entry.getValue());
+			Resource resourceObjectByNameAndVersion = AtomicOperationUtils.getResourceObjectByNameAndVersion(UserRoleEnum.DESIGNER, entry.getKey(), entry.getValue());
+		    	assetNamesList.add(resourceObjectByNameAndVersion.getToscaResourceName());
+		    
+		}
+		
+		return assetNamesList;
+	}
+	
+
+	public static List<String> getServiceNamesList(List<ServiceAssetStructure> serviceAssetList) {
+		List<String> assetNamesList = new ArrayList<>();
+		for (ServiceAssetStructure serviceAsset : serviceAssetList) {
+			assetNamesList.add(serviceAsset.getName());
+		}
+		return assetNamesList;
+	}
+
+	public static void checkResourceTypeInObjectList(List<ResourceAssetStructure> resourceAssetList, ResourceTypeEnum resourceType) {
+		for (ResourceAssetStructure resourceAsset : resourceAssetList) {
+			assertTrue("Expected resourceType is " + resourceType.toString() + " actual: " + resourceAsset.getResourceType(),
+					resourceAsset.getResourceType().equals(resourceType.toString()));
+		}
+	}
+
+	public static void checkComponentTypeInObjectList(List<ResourceAssetStructure> resourceAssetList, ComponentTypeEnum componentType) {
+		ComponentTypeEnum actualComponentType;
+		for (ResourceAssetStructure resourceAsset : resourceAssetList) {
+			actualComponentType = detectComponentType(resourceAsset);
+			assertTrue("Expected componentType is " + componentType.getValue() + " actual: " + actualComponentType.getValue(), actualComponentType.equals(componentType));
+		}
+	}
+
+	private static ComponentTypeEnum detectComponentType(ResourceAssetStructure resourceAsset) {
+		String resourceType = resourceAsset.getResourceType();
+		if(ResourceTypeEnum.getType(resourceType) !=null){
+			return ComponentTypeEnum.RESOURCE;
+		}
+		return null;
+	}
+	
+}
diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/utils/rest/AutomationUtils.java b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/utils/rest/AutomationUtils.java
new file mode 100644
index 0000000000..8d39bd1c99
--- /dev/null
+++ b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/utils/rest/AutomationUtils.java
@@ -0,0 +1,118 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * SDC
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.sdc.ci.tests.utils.rest;
+
+import org.openecomp.sdc.ci.tests.config.Config;
+import org.openecomp.sdc.ci.tests.datatypes.http.RestResponse;
+import org.openecomp.sdc.ci.tests.utils.Utils;
+
+import java.io.File;
+import java.io.FileNotFoundException;
+import java.io.FileOutputStream;
+import java.io.IOException;
+
+public class AutomationUtils extends BaseRestUtils {
+	
+	
+	public static String getOnboardVersion()  {
+		String onboardVersionStr = null;
+		try {
+			
+			RestResponse onboardVersion = CatalogRestUtils.getOnboardVersion();
+			onboardVersionStr = ResponseParser.getValueFromJsonResponse(onboardVersion.getResponse() , "Version");
+						
+		} catch (Exception e) {
+			System.out.println("UnknownOnboardVersion");
+		}
+		return onboardVersionStr != null ? onboardVersionStr : "UnknownOnboardVersion";
+		
+	}
+
+	public static String getOSVersion()  {
+		String osVersionStr = null;
+		try {
+			RestResponse osVersion = CatalogRestUtils.getOsVersion();
+			osVersionStr = ResponseParser.getVersionFromResponse(osVersion);
+			
+		} catch (Exception e) {
+			System.out.println("UnknownOSversion");
+		}
+	
+		return osVersionStr != null  ? osVersionStr : "UnknownOSversion" ;
+	}
+	
+	
+	
+	public static void createVersionsInfoFile(String filepath, String onboardVersion, String osVersion, String envData, String suiteName) throws IOException {
+		File myFoo = new File(filepath);
+		try (FileOutputStream fooStream = new FileOutputStream(myFoo, false)) {
+			String versions = ("onboardVersion=\"" + onboardVersion + "\"\n" + "osVersion=\"" + osVersion + "\"\n" + "env=\"" + envData + "\"\n" + "suiteName=\"" + suiteName + "\"\n");
+			byte[] myBytes = versions.getBytes();
+			fooStream.write(myBytes);
+		}
+	}
+
+	public static void createVersionsInfoFile(String filepath, String onboardVersion, String osVersion, String envData, String suiteName, String reportStartTime) throws IOException {
+		File myFoo = new File(filepath);
+		try (FileOutputStream fooStream = new FileOutputStream(myFoo, false)) {
+			String versions = ("onboardVersion=\"" + onboardVersion + "\"\n" + "osVersion=\"" + osVersion + "\"\n" + "env=\"" + envData + "\"\n" + "suiteName=\"" + suiteName + "\"\n" + "reportStartTime=\"" + reportStartTime + "\"\n");
+			byte[] myBytes = versions.getBytes();
+			fooStream.write(myBytes);
+		}
+	}
+	
+	public static void createVersionsInfoFile(String filepath, String onboardVersion, String osVersion, String envData)
+			throws IOException {
+		createVersionsInfoFile(filepath, onboardVersion, osVersion, envData, null);
+	}
+	
+	public static void addEnvDetailsToReport() throws FileNotFoundException{
+	
+		Config config = Utils.getConfig();
+		config.getUrl();
+	}
+	
+	public static File getConfigFile(String configFileName) throws Exception {
+		File configFile = new File(getBasePath() + File.separator + "conf" + File.separator + configFileName);
+		if (!configFile.exists()) {
+			configFile = new File(getConfFilesPath() + configFileName);
+		}
+		return configFile;
+	}
+	
+	public static String getCiFilesPath() {
+		return getBasePath() + File.separator + "src" + File.separator + "main" + File.separator + "resources"
+				+ File.separator + "ci";
+	}
+
+	public static String getConfFilesPath() {
+		return getCiFilesPath() + File.separator + "conf" + File.separator;
+	}
+
+	public static String getTestSuitesFilesPath() {
+		return getCiFilesPath() + File.separator + "testSuites" + File.separator;
+	}
+	public static String getBasePath() {
+		return System.getProperty("user.dir");
+	}
+	
+
+}
diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/utils/rest/BaseRestUtils.java b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/utils/rest/BaseRestUtils.java
new file mode 100644
index 0000000000..b8ec35f0ff
--- /dev/null
+++ b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/utils/rest/BaseRestUtils.java
@@ -0,0 +1,268 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * SDC
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.sdc.ci.tests.utils.rest;
+
+import org.apache.commons.codec.binary.Base64;
+import org.apache.http.HttpEntity;
+import org.apache.http.client.methods.CloseableHttpResponse;
+import org.apache.http.client.methods.HttpPost;
+import org.apache.http.impl.client.CloseableHttpClient;
+import org.apache.http.impl.client.HttpClients;
+import org.openecomp.sdc.ci.tests.datatypes.http.HttpHeaderEnum;
+import org.openecomp.sdc.ci.tests.datatypes.http.HttpRequest;
+import org.openecomp.sdc.ci.tests.datatypes.http.RestResponse;
+import org.openecomp.sdc.ci.tests.utils.validation.BaseValidationUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+public class BaseRestUtils extends BaseValidationUtils {
+	public static final String contentTypeHeaderData = "application/json";
+	public static final String acceptHeaderData = "application/json";
+	public static final String acceptJsonHeader = "application/json";
+	public static final String acceptOctetHeader = "application/octet-stream";
+	public static final String acceptMultipartHeader = "application/octet-stream";
+	public static final String authorizationHeader = "Basic " + Base64.encodeBase64String("ci:123456".getBytes());
+	public static final String acceptOctetStream = "application/octet-stream";
+	public static final String ecomp = "ecomp";
+	public static final String authorizationPrefixString = "Basic ";
+	public static final String xEcompInstanceId = "a1bd39f6-d55e-45b2-9207-156216af5cb5";
+	public static final String cacheControlHeader = "no-cache";
+
+	public static final String RESOURCE_COMPONENT_TYPE = "resources";
+	public static final String PRODUCT_COMPONENT_TYPE = "products";
+	public static final String SERVICE_COMPONENT_TYPE = "services";
+
+	public static final int STATUS_CODE_SUCCESS = 200;
+	public static final int STATUS_CODE_CREATED = 201;
+	public static final int STATUS_CODE_DELETE = 204;
+	public static final int STATUS_CODE_NOT_FOUND = 404;
+	public static final int STATUS_CODE_SUCCESS_NO_CONTENT = 204;
+	public static final int STATUS_CODE_SUCCESS_DELETE = 204;
+	public static final int STATUS_CODE_INVALID_CONTENT = 400;
+	public static final int STATUS_CODE_MISSING_DATA = 400;
+	public static final int STATUS_CODE_MISSING_INFORMATION = 403;
+	public static final int STATUS_CODE_RESTRICTED_ACCESS = 403;
+	public static final int STATUS_CODE_ALREADY_EXISTS = 409;
+	public static final int STATUS_CODE_RESTRICTED_OPERATION = 409;
+	public static final int STATUS_CODE_COMPONENT_NAME_EXCEEDS_LIMIT = 400;
+	public static final int STATUS_CODE_MISSING_COMPONENT_NAME = 400;
+	public static final int STATUS_CODE_UNSUPPORTED_ERROR = 400;
+	public static final int STATUS_CODE_IMPORT_SUCCESS = 201;
+	public static final int STATUS_CODE_UPDATE_SUCCESS = 200;
+	public static final int RESTRICTED_OPERATION = 409;
+	public static final int STATUS_CODE_GET_SUCCESS = 200;
+
+	public static final String SUCCESS_MESSAGE = "OK";
+	private static Logger logger = LoggerFactory.getLogger(BaseRestUtils.class.getName());
+
+	private static byte[] encodeBase64;
+
+	// ************* PRIVATE METHODS ************************
+
+	public static Map<String, String> prepareHeadersMap(String userId) {
+		return prepareHeadersMap(userId, acceptHeaderData);
+	}
+
+	protected static Map<String, String> prepareHeadersMap(String userId, String accept) {
+		Map<String, String> headersMap = new HashMap<>();
+		if (contentTypeHeaderData != null) {
+			headersMap.put(HttpHeaderEnum.CONTENT_TYPE.getValue(), contentTypeHeaderData);
+		}
+		if (accept != null) {
+			headersMap.put(HttpHeaderEnum.ACCEPT.getValue(), accept);
+		}
+		if (userId != null) {
+			headersMap.put(HttpHeaderEnum.USER_ID.getValue(), userId);
+		}
+
+		return headersMap;
+	}
+
+	// send request
+	// GET
+	protected static RestResponse sendGet(String url, String userId) throws IOException {
+		return sendGet(url, userId, null);
+	}
+
+	protected static RestResponse sendGet(String url, String userId, Map<String, String> additionalHeaders)
+			throws IOException {
+		Map<String, String> headersMap = prepareHeadersMap(userId);
+		if (additionalHeaders != null) {
+			headersMap.putAll(additionalHeaders);
+		}
+
+		HttpRequest http = new HttpRequest();
+		RestResponse getResourceResponse = http.httpSendGet(url, headersMap);
+		return getResourceResponse;
+	}
+
+	public static RestResponse sendGetAndRemoveHeaders(String url, String userId, List<String> headersToRemove)
+			throws IOException {
+		Map<String, String> headersMap = prepareHeadersMap(userId);
+		if (headersToRemove != null) {
+			for (String header : headersToRemove) {
+				headersMap.remove(header);
+			}
+		}
+
+		HttpRequest http = new HttpRequest();
+		RestResponse getResourceResponse = http.httpSendGet(url, headersMap);
+		return getResourceResponse;
+	}
+
+	// PUT
+	protected static RestResponse sendPut(String url, String userBodyJson, String userId, String cont)
+			throws IOException {
+		Map<String, String> headersMap = prepareHeadersMap(userId, cont);
+
+		HttpRequest http = new HttpRequest();
+		RestResponse updateResourceResponse = http.httpSendByMethod(url, "PUT", userBodyJson, headersMap);
+		return updateResourceResponse;
+	}
+
+	// POST
+	public static RestResponse sendPost(String url, String userBodyJson, String userId, String accept)
+			throws IOException {
+		return sendPost(url, userBodyJson, userId, accept, null);
+	}
+
+	protected static RestResponse sendPost(String url, String userBodyJson, String userId, String accept,
+			Map<String, String> additionalHeaders) throws IOException {
+		Map<String, String> headersMap = prepareHeadersMap(userId, accept);
+		if (additionalHeaders != null) {
+			headersMap.putAll(additionalHeaders);
+		}
+		HttpRequest http = new HttpRequest();
+		RestResponse postResourceResponse = http.httpSendPost(url, userBodyJson, headersMap);
+		return postResourceResponse;
+	}
+
+	// used form complex requests like import categories..
+	protected static RestResponse sendPost(String url, HttpEntity entity, String userId, String accept)
+			throws IOException {
+		RestResponse postResponse = new RestResponse();
+		CloseableHttpResponse response = null;
+		CloseableHttpClient client = null;
+		try {
+			client = HttpClients.createDefault();
+			HttpPost httpPost = new HttpPost(url);
+
+			httpPost.addHeader("USER_ID", userId);
+			httpPost.setEntity(entity);
+			response = client.execute(httpPost);
+			HttpEntity responseEntity = response.getEntity();
+			int statusCode = response.getStatusLine().getStatusCode();
+
+			postResponse.setErrorCode(statusCode);
+			StringBuilder sb = new StringBuilder();
+			try {
+				BufferedReader in = new BufferedReader(new InputStreamReader(responseEntity.getContent()));
+				String inputLine;
+				while ((inputLine = in.readLine()) != null) {
+					sb.append(inputLine);
+				}
+				in.close();
+			} catch (Exception e) {
+				logger.debug("response body is null");
+			}
+			postResponse.setResponse(sb.toString());
+		} finally {
+			try {
+				if (response != null) {
+					response.close();
+				}
+
+			} catch (IOException e) {
+				logger.debug("failed to close client or response: ", e);
+			}
+			try {
+				if (client != null) {
+					client.close();
+				}
+			} catch (IOException e) {
+				logger.debug("failed to close client or response: ", e);
+			}
+		}
+		return postResponse;
+	}
+
+	// DELETE
+	protected static RestResponse sendDelete(String url, String userId) throws IOException {
+//		Map<String, String> headersMap = prepareHeadersMap(userId);
+		
+		return sendDelete(url, userId, null);
+	}
+	
+	protected static RestResponse sendDelete(String url, String userId, Map<String, String> additionalHeaders) throws IOException {
+		Map<String, String> headersMap = prepareHeadersMap(userId);
+		if (additionalHeaders != null) {
+			headersMap.putAll(additionalHeaders);
+		}
+		
+		HttpRequest http = new HttpRequest();
+		RestResponse deleteResourceResponse = http.httpSendDelete(url, headersMap);
+		return deleteResourceResponse;
+	}
+
+	/*
+	 * // ------ protected static Boolean checkErrorCode(RestResponse
+	 * deleteResponse) { if (deleteResponse.getErrorCode() ==
+	 * STATUS_CODE_SUCCESS || deleteResponse.getErrorCode() ==
+	 * STATUS_CODE_DELETE) { return true; } return false; }
+	 * 
+	 * // *** STATUS CODE VALIDATION UTIITIES **** public static void
+	 * checkStatusCode(RestResponse response, String assertMessage, boolean AND,
+	 * int... statuses) { int statusCode = response.getErrorCode(); for (int
+	 * status : statuses) { if (AND && statusCode != status) {
+	 * Assert.fail(assertMessage + " status: " + statusCode); } else if
+	 * (statusCode == status) { return; } } if (!AND) {
+	 * Assert.fail(assertMessage + " status: " + statusCode); } }
+	 * 
+	 * public static void checkDeleteResponse(RestResponse response) {
+	 * checkStatusCode(response,"delete request failed",false,STATUS_CODE_DELETE
+	 * ,STATUS_CODE_NOT_FOUND, STATUS_CODE_SUCCESS); // STATUS_CODE_SUCCESS for
+	 * deActivate user }
+	 * 
+	 * public static void checkCreateResponse(RestResponse response) {
+	 * checkStatusCode(response, "create request failed", false,
+	 * STATUS_CODE_CREATED); }
+	 */
+	public static String encodeUrlForDownload(String url) {
+		return url.replaceAll(" ", "%20");
+	}
+
+	public static Map<String, String> addAuthorizeHeader(String userName, String password) {
+		String userCredentials = userName + ":" + password;
+		encodeBase64 = Base64.encodeBase64(userCredentials.getBytes());
+		String encodedUserCredentials = authorizationPrefixString + new String(encodeBase64);
+		Map<String, String> authorizationHeader = new HashMap<>();
+		authorizationHeader.put(HttpHeaderEnum.AUTHORIZATION.getValue(), encodedUserCredentials);
+		return authorizationHeader;
+	}
+
+}
diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/utils/rest/CapabilityRestUtils.java b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/utils/rest/CapabilityRestUtils.java
new file mode 100644
index 0000000000..488ed249f5
--- /dev/null
+++ b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/utils/rest/CapabilityRestUtils.java
@@ -0,0 +1,77 @@
+/*
+ * Copyright © 2016-2018 European Support Limited
+ *
+ * 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.
+ */
+
+package org.openecomp.sdc.ci.tests.utils.rest;
+
+import com.google.gson.Gson;
+import org.openecomp.sdc.be.datatypes.enums.ComponentTypeEnum;
+import org.openecomp.sdc.be.model.Component;
+import org.openecomp.sdc.be.model.User;
+import org.openecomp.sdc.ci.tests.api.Urls;
+import org.openecomp.sdc.ci.tests.config.Config;
+import org.openecomp.sdc.ci.tests.datatypes.CapabilityDetails;
+import org.openecomp.sdc.ci.tests.datatypes.http.RestResponse;
+
+import java.util.List;
+
+public class CapabilityRestUtils extends BaseRestUtils {
+    private static Gson gson = new Gson();
+
+    public static RestResponse createCapability(Component component,
+                                                 List<CapabilityDetails> capabilityDetailsList,
+                                                 User user) throws Exception{
+        Config config = Config.instance();
+        String url = String.format(Urls.CREATE_CAPABILITY, config.getCatalogBeHost(), config.getCatalogBePort(),
+                ComponentTypeEnum.findParamByType(component.getComponentType()), component.getUniqueId());
+
+        String data = "{ \"capabilities\" : {" + "\"" +capabilityDetailsList.get(0).getType()+ "\"" +" : "
+                + gson.toJson(capabilityDetailsList) + "  } }";
+
+        return sendPost(url, data , user.getUserId(), acceptHeaderData);
+    }
+
+    public static RestResponse updateCapability(Component component,
+                                                 List<CapabilityDetails> capabilityDetailsList,
+                                                 User user) throws Exception{
+        Config config = Config.instance();
+        String url = String.format(Urls.UPDATE_CAPABILITY, config.getCatalogBeHost(), config.getCatalogBePort(),
+                ComponentTypeEnum.findParamByType(component.getComponentType()), component.getUniqueId());
+
+        String data = "{ \"capabilities\" : {" + "\"" +capabilityDetailsList.get(0).getType()+ "\"" +" : "
+                + gson.toJson(capabilityDetailsList) + "  } }";
+
+        return sendPost(url, data , user.getUserId(), acceptHeaderData);
+    }
+
+    public static RestResponse deleteCapability(Component component,
+                                                 String requirementId,
+                                                 User user) throws Exception{
+        Config config = Config.instance();
+        String url = String.format(Urls.DELETE_CAPABILITY, config.getCatalogBeHost(), config.getCatalogBePort(),
+                ComponentTypeEnum.findParamByType(component.getComponentType()), component.getUniqueId(), requirementId);
+        return sendDelete(url, user.getUserId());
+    }
+
+    public static RestResponse getCapability(Component component,
+                                              String requirementId,
+                                              User user) throws Exception{
+        Config config = Config.instance();
+        String url = String.format(Urls.GET_CAPABILITY, config.getCatalogBeHost(), config.getCatalogBePort(),
+                ComponentTypeEnum.findParamByType(component.getComponentType()), component.getUniqueId(), requirementId);
+        return sendDelete(url, user.getUserId());
+    }
+
+}
diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/utils/rest/CatalogRestUtils.java b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/utils/rest/CatalogRestUtils.java
new file mode 100644
index 0000000000..4c8f178181
--- /dev/null
+++ b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/utils/rest/CatalogRestUtils.java
@@ -0,0 +1,92 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * SDC
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.sdc.ci.tests.utils.rest;
+
+import org.openecomp.sdc.ci.tests.api.Urls;
+import org.openecomp.sdc.ci.tests.config.Config;
+import org.openecomp.sdc.ci.tests.datatypes.enums.UserRoleEnum;
+import org.openecomp.sdc.ci.tests.datatypes.http.HttpHeaderEnum;
+import org.openecomp.sdc.ci.tests.datatypes.http.RestResponse;
+import org.openecomp.sdc.ci.tests.utils.Utils;
+
+import java.io.IOException;
+import java.util.HashMap;
+import java.util.Map;
+
+public class CatalogRestUtils extends BaseRestUtils {
+
+	public static RestResponse getAbstractResources() throws IOException {
+
+		Config config = Utils.getConfig();
+		String url = String.format(Urls.GET_ALL_ABSTRACT_RESOURCES, config.getCatalogBeHost(),
+				config.getCatalogBePort());
+
+		return sendGet(url, UserRoleEnum.DESIGNER.getUserId());
+	}
+
+	public static RestResponse getCatalog() throws IOException {
+		return getCatalog(UserRoleEnum.DESIGNER.getUserId());
+	}
+
+	public static RestResponse getCatalog(String userId) throws IOException {
+		Config config = Utils.getConfig();
+		String url = String.format(Urls.GET_CATALOG_DATA, config.getCatalogBeHost(), config.getCatalogBePort());
+		return sendGet(url, userId);
+	}
+
+	public static RestResponse getAllCategoriesTowardsCatalogBe() throws IOException {
+
+		Config config = Utils.getConfig();
+		String url = String.format(Urls.GET_ALL_CATEGORIES, config.getCatalogBeHost(), config.getCatalogBePort(),
+				BaseRestUtils.RESOURCE_COMPONENT_TYPE);
+
+		return sendGet(url, UserRoleEnum.DESIGNER.getUserId());
+	}
+
+	public static RestResponse getAllCategoriesTowardsCatalogFeWithUuid(String uuid) throws IOException {
+
+		Config config = Utils.getConfig();
+		String url = String.format(Urls.GET_ALL_CATEGORIES_FE, config.getCatalogFeHost(), config.getCatalogFePort(),
+				BaseRestUtils.RESOURCE_COMPONENT_TYPE);
+
+		Map<String, String> additionalHeaders = new HashMap<>();
+		additionalHeaders.put(HttpHeaderEnum.X_ECOMP_REQUEST_ID_HEADER.getValue(), uuid);
+
+		return sendGet(url, UserRoleEnum.DESIGNER.getUserId(), additionalHeaders);
+	}
+	
+	public static RestResponse getOnboardVersion() throws IOException {
+
+		Config config = Utils.getConfig();
+		String url = String.format(Urls.ONBOARD_VERSION, config.getOnboardingBeHost(),
+				config.getOnboardingBePort());
+
+		return sendGet(url, UserRoleEnum.DESIGNER.getUserId());
+	}
+	
+	public static RestResponse getOsVersion() throws IOException {
+
+		Config config = Utils.getConfig();
+		String url = String.format(Urls.OS_VERSION, config.getCatalogBeHost(), config.getCatalogBePort());
+
+		return sendGet(url, UserRoleEnum.DESIGNER.getUserId());
+	}
+}
diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/utils/rest/CategoryRestUtils.java b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/utils/rest/CategoryRestUtils.java
new file mode 100644
index 0000000000..3e1413a226
--- /dev/null
+++ b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/utils/rest/CategoryRestUtils.java
@@ -0,0 +1,308 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * SDC
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.sdc.ci.tests.utils.rest;
+
+import com.google.gson.Gson;
+import com.google.gson.reflect.TypeToken;
+import org.apache.http.entity.mime.MultipartEntityBuilder;
+import org.openecomp.sdc.be.model.User;
+import org.openecomp.sdc.be.model.category.CategoryDefinition;
+import org.openecomp.sdc.be.model.category.GroupingDefinition;
+import org.openecomp.sdc.be.model.category.SubCategoryDefinition;
+import org.openecomp.sdc.ci.tests.api.Urls;
+import org.openecomp.sdc.ci.tests.config.Config;
+import org.openecomp.sdc.ci.tests.datatypes.http.HttpRequest;
+import org.openecomp.sdc.ci.tests.datatypes.http.RestResponse;
+import org.openecomp.sdc.ci.tests.utils.Utils;
+
+import java.io.IOException;
+import java.util.List;
+import java.util.Map;
+
+public class CategoryRestUtils extends BaseRestUtils {
+
+	private static final int STATUS_CODE_CREATED = 201;
+
+	private static Gson gson = new Gson();
+
+	public static RestResponse createCategory(CategoryDefinition categoryDefinition, User sdncModifierDetails,
+			String categoryType) throws Exception {
+		Config config = Utils.getConfig();
+		String url = String.format(Urls.CREATE_CATEGORY, config.getCatalogBeHost(), config.getCatalogBePort(),
+				categoryType);
+		String bodyJson = gson.toJson(categoryDefinition);
+		RestResponse addCategoryResponse = BaseRestUtils.sendPost(url, bodyJson, sdncModifierDetails.getUserId(),
+				acceptHeaderData);
+		if (addCategoryResponse.getErrorCode().intValue() == STATUS_CODE_CREATED)
+			categoryDefinition.setUniqueId(
+					ResponseParser.getValueFromJsonResponse(addCategoryResponse.getResponse(), "uniqueId"));
+		return addCategoryResponse;
+	}
+
+	// GET categories
+	public static RestResponse getAllCategories(User sdncModifierDetails, String categoryType) throws Exception {
+		Config config = Utils.getConfig();
+		String url = String.format(Urls.GET_ALL_CATEGORIES, config.getCatalogBeHost(), config.getCatalogBePort(),
+				categoryType);
+		String userId = sdncModifierDetails.getUserId();
+		Map<String, String> headersMap = prepareHeadersMap(userId);
+		HttpRequest http = new HttpRequest();
+		// System.out.println(url);
+		RestResponse getCategotyResponse = http.httpSendGet(url, headersMap);
+		return getCategotyResponse;
+	}
+
+	public static RestResponse getAllCategoriesTowardsFe(User sdncModifierDetails, String categoryType)
+			throws Exception {
+		Config config = Utils.getConfig();
+		String url = String.format(Urls.GET_ALL_CATEGORIES_FE, config.getCatalogFeHost(), config.getCatalogFePort(),
+				categoryType);
+		String userId = sdncModifierDetails.getUserId();
+		Map<String, String> headersMap = prepareHeadersMap(userId);
+		HttpRequest http = new HttpRequest();
+		// System.out.println(url);
+		RestResponse getCategotyResponse = http.httpSendGet(url, headersMap);
+		return getCategotyResponse;
+	}
+
+	// Delete Category
+	public static RestResponse deleteCategory(String categoryId, String psUserId, String categoryType)
+			throws Exception {
+		Config config = Utils.getConfig();
+		String url = String.format(Urls.DELETE_CATEGORY, config.getCatalogBeHost(), config.getCatalogBePort(),
+				categoryType, categoryId);
+		url = url.replace("#", "%23"); // HEX
+		url = url.replace(" ", "%20"); // HEX
+		RestResponse deleteCategoryResponse = sendDelete(url, psUserId);
+		return deleteCategoryResponse;
+	}
+
+	public static RestResponse createSubCategory(SubCategoryDefinition subCategory, CategoryDefinition parentCategory,
+			User sdncModifierDetails, String categoryType) throws Exception {
+		// categoryType = service/resource/product
+		Config config = Utils.getConfig();
+		String url = String.format(Urls.CREATE_SUB_CATEGORY, config.getCatalogBeHost(), config.getCatalogBePort(),
+				categoryType, parentCategory.getUniqueId());
+		String bodyJson = gson.toJson(subCategory);
+		RestResponse createSubCategoryPost = BaseRestUtils.sendPost(url, bodyJson, sdncModifierDetails.getUserId(),
+				acceptHeaderData);
+		if (createSubCategoryPost.getErrorCode().intValue() == STATUS_CODE_CREATED)
+			subCategory.setUniqueId(
+					ResponseParser.getValueFromJsonResponse(createSubCategoryPost.getResponse(), "uniqueId"));
+
+		return createSubCategoryPost;
+	}
+
+	public static RestResponse deleteSubCategory(String subCategoryId, String categoryId, String psUserId,
+			String categoryType) throws Exception {
+		Config config = Utils.getConfig();
+		String url = String.format(Urls.DELETE_SUB_CATEGORY, config.getCatalogBeHost(), config.getCatalogBePort(),
+				categoryType, categoryId, subCategoryId);
+		url = url.replace("#", "%23"); // HEX
+		url = url.replace(" ", "%20"); // HEX
+		RestResponse deleteSubCategoryResponse = sendDelete(url, psUserId);
+		return deleteSubCategoryResponse;
+	}
+
+	public static RestResponse deleteGrouping(String groupId, String subCategoryId, String categoryId, String psUserId,
+			String categoryType) throws Exception {
+
+		Config config = Utils.getConfig();
+		String url = String.format(Urls.DELETE_GROUPING, config.getCatalogBeHost(), config.getCatalogBePort(),
+				categoryType, categoryId, subCategoryId, groupId);
+		url = url.replace("#", "%23"); // HEX
+		url = url.replace(" ", "%20"); // HEX
+		RestResponse deleteGroupResponse = sendDelete(url, psUserId);
+		return deleteGroupResponse;
+	}
+
+	public static RestResponse createServiceCategoryHttpCspAtuUidIsMissing(CategoryDefinition categoryDataDefinition,
+			User sdncModifierDetails) throws Exception {
+
+		Config config = Utils.getConfig();
+		String url = String.format(Urls.CREATE_CATEGORY, config.getCatalogBeHost(), config.getCatalogBePort(),
+				SERVICE_COMPONENT_TYPE);
+
+		Map<String, String> headersMap = prepareHeadersMap(sdncModifierDetails.getUserId());
+		headersMap.remove("USER_ID");
+		Gson gson = new Gson();
+		String userBodyJson = gson.toJson(categoryDataDefinition);
+		HttpRequest http = new HttpRequest();
+		// System.out.println(url);
+		// System.out.println(userBodyJson);
+		RestResponse createCatergoryResponse = http.httpSendPost(url, userBodyJson, headersMap);
+		return createCatergoryResponse;
+	}
+
+	public static RestResponse createSubCategoryHttpCspAtuUidIsMissing(SubCategoryDefinition subCategory,
+			CategoryDefinition parentCategory, User sdncModifierDetails, String categoryType) throws Exception {
+		// categoryType = service/resource/product
+		Config config = Utils.getConfig();
+		String url = String.format(Urls.CREATE_SUB_CATEGORY, config.getCatalogBeHost(), config.getCatalogBePort(),
+				categoryType, parentCategory.getUniqueId());
+		String userId = sdncModifierDetails.getUserId();
+		Map<String, String> headersMap = prepareHeadersMap(userId);
+		headersMap.remove("USER_ID");
+		Gson gson = new Gson();
+		String subCatJson = gson.toJson(subCategory);
+		HttpRequest http = new HttpRequest();
+		// System.out.println(url);
+		// System.out.println(subCatJson);
+		RestResponse addCategoryResponse = http.httpSendPost(url, subCatJson, headersMap);
+		return addCategoryResponse;
+	}
+
+	public static RestResponse deleteCatergoryHttpCspAtuUidIsMissing(CategoryDefinition categoryDataDefinition,
+			User sdncModifierDetails) throws Exception {
+
+		Config config = Utils.getConfig();
+		String url = String.format(Urls.DELETE_CONSUMER, config.getCatalogBeHost(), config.getCatalogBePort(),
+				categoryDataDefinition.getName());
+
+		String userId = sdncModifierDetails.getUserId();
+		Map<String, String> headersMap = prepareHeadersMap(userId);
+		headersMap.remove("USER_ID");
+		Gson gson = new Gson();
+		String userBodyJson = gson.toJson(categoryDataDefinition);
+		HttpRequest http = new HttpRequest();
+		// System.out.println(url);
+		// System.out.println(userBodyJson);
+		RestResponse deleteCategotyResponse = http.httpSendDelete(url, headersMap);
+		return deleteCategotyResponse;
+	}
+
+	public static RestResponse createGrouping(GroupingDefinition grouping, SubCategoryDefinition subCategory,
+			CategoryDefinition parentCategory, User sdncModifierDetails, String categoryType) throws Exception {
+		Config config = Utils.getConfig();
+		String url = String.format(Urls.CREATE_GROUPING, config.getCatalogBeHost(), config.getCatalogBePort(),
+				categoryType, parentCategory.getUniqueId(), subCategory.getUniqueId());
+		String bodyJson = gson.toJson(grouping);
+		RestResponse addGroupingResponse = BaseRestUtils.sendPost(url, bodyJson, sdncModifierDetails.getUserId(),
+				acceptHeaderData);
+		return addGroupingResponse;
+	}
+
+	public static RestResponse importCategories(MultipartEntityBuilder mpBuilder, String userId) throws IOException {
+		Config config = Utils.getConfig();
+		String url = String.format(Urls.IMPORT_CATEGORIES, config.getCatalogBeHost(), config.getCatalogBePort());
+
+		RestResponse importResponse = BaseRestUtils.sendPost(url, mpBuilder.build(), userId, acceptHeaderData);
+		return importResponse;
+	}
+
+	public static int getMatchingCategoriesNum(RestResponse getAllCategoryRest, CategoryDefinition categoryDefinition) {
+		String response = getAllCategoryRest.getResponse();
+		Gson gson = new Gson();
+		List<CategoryDefinition> categoryDefinitions = gson.fromJson(response,
+				new TypeToken<List<CategoryDefinition>>() {
+				}.getType());
+		int categoriesNum = 0;
+		String catName = categoryDefinition.getName();
+		for (CategoryDefinition elem : categoryDefinitions) {
+			if (elem.getName().equals(catName)) {
+				categoryDefinition.setUniqueId(elem.getUniqueId());
+				categoriesNum++;
+			}
+		}
+
+		return categoriesNum;
+	}
+
+	public static int getMatchingSubCategoriesNum(RestResponse getAllCategoryRest, String parentCategoryId,
+			SubCategoryDefinition expectedSubCategoryDefinition) {
+
+		String response = getAllCategoryRest.getResponse();
+		Gson gson = new Gson();
+		List<CategoryDefinition> categoryDefinitions = gson.fromJson(response,
+				new TypeToken<List<CategoryDefinition>>() {
+				}.getType());
+		int subCatNum = 0;
+		String subCatName = expectedSubCategoryDefinition.getName();
+		for (CategoryDefinition elem : categoryDefinitions) {
+			if (elem.getUniqueId().equals(parentCategoryId)) {
+				List<SubCategoryDefinition> subCategories = elem.getSubcategories();
+				if (subCategories != null) {
+					for (SubCategoryDefinition subCategoryDataDefinition : subCategories) {
+						if (subCatName.equals(subCategoryDataDefinition.getName())) {
+							expectedSubCategoryDefinition.setUniqueId(subCategoryDataDefinition.getUniqueId());
+							subCatNum++;
+						}
+					}
+				}
+
+			}
+		}
+		return subCatNum;
+	}
+
+	public static int getMatchingGroupingNum(RestResponse getAllCategoryRest, String parentCategoryId,
+			String subCategoryId, GroupingDefinition expectedGroupingDefinition) {
+
+		String response = getAllCategoryRest.getResponse();
+		Gson gson = new Gson();
+		List<CategoryDefinition> categoryDefinitions = gson.fromJson(response,
+				new TypeToken<List<CategoryDefinition>>() {
+				}.getType());
+		int groupingNum = 0;
+		String groupingName = expectedGroupingDefinition.getName();
+		for (CategoryDefinition elem : categoryDefinitions) {
+			if (elem.getUniqueId().equals(parentCategoryId)) {
+				List<SubCategoryDefinition> subCategories = elem.getSubcategories();
+				if (subCategories != null) {
+					for (SubCategoryDefinition subCategoryDataDefinition : subCategories) {
+						// if
+						// (subCategoryId.equals(subCategoryDataDefinition.getUniqueId()))
+						// {
+						if (subCategoryId.equals(subCategoryDataDefinition.getUniqueId())
+								&& subCategoryDataDefinition.getGroupings() != null) {
+							List<GroupingDefinition> grouping = subCategoryDataDefinition.getGroupings();
+							for (GroupingDefinition groupingDataDefinition : grouping) {
+								if (groupingName.equals(groupingDataDefinition.getName())) {
+									expectedGroupingDefinition.setUniqueId(groupingDataDefinition.getUniqueId());
+									groupingNum++;
+								}
+							}
+
+						}
+					}
+				}
+
+			}
+		}
+		return groupingNum;
+	}
+
+	public enum CategoryAuditJsonKeysEnum {
+		ACTION("ACTION"), MODIFIER("MODIFIER"), CATEGORY_NAME("CATEGORY_NAME"), SUB_CATEGORY_NAME("SUB_CATEGORY_NAME"), GROUPING_NAME("GROUPING_NAME"), RESOURCE_TYPE("RESOURCE_TYPE"), ECOMP_USER("ECOMP_USER"), STATUS("STATUS"), DESCRIPTION("DESCRIPTION"), DETAILS("DETAILS");
+		
+		private String auditJsonKeyName;
+
+		private CategoryAuditJsonKeysEnum(String auditJsonKeyName) {
+			this.auditJsonKeyName = auditJsonKeyName;
+		}
+
+		public String getAuditJsonKeyName() {
+			return auditJsonKeyName.toLowerCase();
+		}
+	}
+	
+
+}
diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/utils/rest/ComponentInstanceRestUtils.java b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/utils/rest/ComponentInstanceRestUtils.java
new file mode 100644
index 0000000000..7cc06de1d8
--- /dev/null
+++ b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/utils/rest/ComponentInstanceRestUtils.java
@@ -0,0 +1,282 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * SDC
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.sdc.ci.tests.utils.rest;
+
+import com.google.gson.Gson;
+import org.openecomp.sdc.be.datatypes.enums.ComponentTypeEnum;
+import org.openecomp.sdc.be.model.*;
+import org.openecomp.sdc.ci.tests.api.Urls;
+import org.openecomp.sdc.ci.tests.config.Config;
+import org.openecomp.sdc.ci.tests.datatypes.ComponentInstanceReqDetails;
+import org.openecomp.sdc.ci.tests.datatypes.http.HttpHeaderEnum;
+import org.openecomp.sdc.ci.tests.datatypes.http.RestResponse;
+import org.openecomp.sdc.ci.tests.utils.Utils;
+
+import java.io.IOException;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import static org.testng.Assert.assertTrue;
+
+public class ComponentInstanceRestUtils extends BaseRestUtils {
+//	public static String acceptHeaderDate = "application/json";
+	static Config config = Config.instance();
+	public static Gson gson = new Gson();
+
+	// 'componentType' can be 'services' or 'resources'
+
+	public static RestResponse createComponentInstance(ComponentInstanceReqDetails componentInstanceReqDetails,
+			User sdncModifierDetails, Component component) throws Exception {
+		return createComponentInstance(componentInstanceReqDetails, sdncModifierDetails, component.getUniqueId(),
+				component.getComponentType());
+	}
+
+	public static RestResponse createComponentInstance(ComponentInstanceReqDetails componentInstanceReqDetails,
+			User sdncModifierDetails, String componentId, ComponentTypeEnum componentType) throws Exception {
+
+		return createComponentInstance(componentInstanceReqDetails, sdncModifierDetails, componentId,
+				ComponentTypeEnum.findParamByType(componentType));
+	}
+
+	public static RestResponse createComponentInstance(ComponentInstanceReqDetails componentInstanceReqDetails,
+			User sdncModifierDetails, String componentId, String componentType) throws Exception {
+		Config config = Utils.getConfig();
+		String userId = sdncModifierDetails.getUserId();
+		String serviceBodyJson = gson.toJson(componentInstanceReqDetails);
+		String url = String.format(Urls.CREATE_COMPONENT_INSTANCE, config.getCatalogBeHost(), config.getCatalogBePort(),
+				componentType, componentId);
+		RestResponse createResourceInstance = sendPost(url, serviceBodyJson, userId, acceptHeaderData);
+		if (createResourceInstance.getErrorCode().equals(BaseRestUtils.STATUS_CODE_CREATED)) {
+			String uniqueId = ResponseParser.getValueFromJsonResponse(createResourceInstance.getResponse(), "uniqueId");
+			componentInstanceReqDetails.setUniqueId(uniqueId);
+			// Gson gson = new Gson();
+			// ResourceInstanceReqDetails fromJson =
+			// gson.fromJson(createResourceInstance.getResponse(),
+			// ResourceInstanceReqDetails.class);
+			// componentInstanceReqDetails.setUniqueId(fromJson.getUniqueId());
+		}
+		return createResourceInstance;
+	}
+
+	public static RestResponse getComponentInstances(ComponentTypeEnum type, String componentId, User user)
+			throws IOException {
+
+		Config config = Utils.getConfig();
+
+		Map<String, String> headersMap = new HashMap<>();
+		headersMap.put(HttpHeaderEnum.CONTENT_TYPE.getValue(), contentTypeHeaderData);
+		headersMap.put(HttpHeaderEnum.ACCEPT.getValue(), acceptHeaderData);
+		headersMap.put(HttpHeaderEnum.USER_ID.getValue(), user.getUserId());
+
+		String url = String.format(Urls.GET_COMPONENT_INSTANCES, config.getCatalogBeHost(), config.getCatalogBePort(),
+				ComponentTypeEnum.findParamByType(type), componentId);
+
+		RestResponse sendGetServerRequest = sendGet(url, user.getUserId(), headersMap);
+
+		return sendGetServerRequest;
+
+	}
+
+	public static RestResponse deleteComponentInstance(User sdncModifierDetails, String componentId,
+			String resourceInstanceId, ComponentTypeEnum componentType) throws Exception {
+
+		return deleteComponentInstance(sdncModifierDetails, componentId, resourceInstanceId,
+				ComponentTypeEnum.findParamByType(componentType));
+	}
+
+	public static RestResponse deleteComponentInstance(User sdncModifierDetails, String componentId,
+			String resourceInstanceId, String componentTypeString) throws Exception {
+		Config config = Utils.getConfig();
+		String userId = sdncModifierDetails.getUserId();
+		String url = String.format(Urls.DELETE_COMPONENT_INSTANCE, config.getCatalogBeHost(), config.getCatalogBePort(),
+				componentTypeString, componentId, resourceInstanceId);
+		RestResponse sendCreateUserRequest = sendDelete(url, userId);
+		return sendCreateUserRequest;
+	}
+
+	public static RestResponse updateComponentInstance(ComponentInstanceReqDetails componentInstanceReqDetails,
+			User sdncModifierDetails, String componentId, ComponentTypeEnum componentType) throws IOException {
+
+		Config config = Utils.getConfig();
+		String userId = sdncModifierDetails.getUserId();
+		String serviceBodyJson = gson.toJson(componentInstanceReqDetails);
+		String url = String.format(Urls.UPDATE_COMPONENT_INSTANCE, config.getCatalogBeHost(), config.getCatalogBePort(),
+				ComponentTypeEnum.findParamByType(componentType), componentId,
+				componentInstanceReqDetails.getUniqueId());
+		RestResponse updateResourceInstance = sendPost(url, serviceBodyJson, userId, acceptHeaderData);
+		return updateResourceInstance;
+	}
+
+	//Tal G - CI for New API Multiple Instance Update
+	public static RestResponse updateMultipleComponentInstance(
+			List<ComponentInstanceReqDetails> componentInstanceReqDetailsList, User sdncModifierDetails,
+			String componentId, ComponentTypeEnum componentType) throws IOException {
+		Config config = Utils.getConfig();
+		String userId = sdncModifierDetails.getUserId();
+		String serviceBodyJson = gson.toJson(componentInstanceReqDetailsList.toArray());
+		String url = String.format(Urls.UPDATE_MULTIPLE_COMPONENT_INSTANCE, config.getCatalogBeHost(),
+				config.getCatalogBePort(), ComponentTypeEnum.findParamByType(componentType), componentId);
+		RestResponse updateResourceInstance = sendPost(url, serviceBodyJson, userId, acceptHeaderData);
+		return updateResourceInstance;
+	}
+
+	public static RestResponse associateInstances(RequirementCapabilityRelDef relation, User sdncModifierDetails,
+			String componentId, ComponentTypeEnum componentTypeEnum) throws IOException {
+
+		Config config = Utils.getConfig();
+
+		String componentType = "";
+		switch (componentTypeEnum) {
+		case RESOURCE:
+			componentType = ComponentTypeEnum.RESOURCE_PARAM_NAME;
+			break;
+		case SERVICE:
+			componentType = ComponentTypeEnum.SERVICE_PARAM_NAME;
+			break;
+		default:
+			break;
+		}
+		String serviceBodyJson = gson.toJson(relation);
+		String url = String.format(Urls.ASSOCIATE__RESOURCE_INSTANCE, config.getCatalogBeHost(),
+				config.getCatalogBePort(), componentType, componentId);
+
+		RestResponse associateInstance = sendPost(url, serviceBodyJson, sdncModifierDetails.getUserId(),
+				acceptHeaderData);
+		return associateInstance;
+
+	}
+
+	public static RestResponse dissociateInstances(RequirementCapabilityRelDef relation, User sdncModifierDetails,
+			String componentId, ComponentTypeEnum componentTypeEnum) throws IOException {
+
+		Config config = Utils.getConfig();
+
+		String componentType = "";
+		switch (componentTypeEnum) {
+		case RESOURCE:
+			componentType = ComponentTypeEnum.RESOURCE_PARAM_NAME;
+			break;
+		case SERVICE:
+			componentType = ComponentTypeEnum.SERVICE_PARAM_NAME;
+			break;
+		default:
+			break;
+		}
+		String serviceBodyJson = gson.toJson(relation);
+		String url = String.format(Urls.DISSOCIATE__RESOURCE_INSTANCE, config.getCatalogBeHost(),
+				config.getCatalogBePort(), componentType, componentId);
+
+		RestResponse associateInstance = sendPut(url, serviceBodyJson, sdncModifierDetails.getUserId(),
+				acceptHeaderData);
+		return associateInstance;
+
+	}
+
+	public static void checkComponentInstanceType(RestResponse response, String expectedComponentType) {
+		String actualComponentType = ResponseParser.getComponentTypeFromResponse(response);
+		assertTrue(expectedComponentType.equals(actualComponentType),
+				"Failed. expected: " + expectedComponentType + ", actual: " + actualComponentType + "/");
+	}
+
+	public static RestResponse updatePropertyValueOnResourceInstance(Component component, ComponentInstance instDetails,
+			User user, ComponentInstanceProperty updatedInstanceProperty) throws IOException {
+
+		Config config = Utils.getConfig();
+
+		Map<String, String> headersMap = new HashMap<>();
+
+		headersMap.put(HttpHeaderEnum.CONTENT_TYPE.getValue(), contentTypeHeaderData);
+		headersMap.put(HttpHeaderEnum.ACCEPT.getValue(), acceptHeaderData);
+		headersMap.put(HttpHeaderEnum.USER_ID.getValue(), user.getUserId());
+
+		String url = String.format(Urls.UPDATE_PROPERTY_TO_RESOURCE_INSTANCE, config.getCatalogBeHost(),
+				config.getCatalogBePort(), ComponentTypeEnum.findParamByType(component.getComponentType()),
+				component.getUniqueId(), instDetails.getUniqueId());
+		String body = gson.toJson(updatedInstanceProperty);
+
+		RestResponse sendGetServerRequest = sendPost(url, body, user.getUserId(), acceptHeaderData);
+		return sendGetServerRequest;
+
+	}
+
+	public static RestResponse changeComponentInstanceVersion(Component container,
+			ComponentInstance componentInstanceToReplace, Component newInstance, User sdncModifierDetails)
+			throws Exception {
+
+		return changeComponentInstanceVersion(container.getUniqueId(), componentInstanceToReplace, newInstance,
+				sdncModifierDetails, container.getComponentType());
+	}
+
+	public static RestResponse changeComponentInstanceVersion(String containerUID,
+			ComponentInstance componentInstanceToReplace, Component component, User sdncModifierDetails,
+			ComponentTypeEnum componentType) throws IOException {
+
+		Config config = Utils.getConfig();
+		String resourceUid = ("{\"componentUid\":\"" + component.getUniqueId() + "\"}");
+		String url = String.format(Urls.CHANGE__RESOURCE_INSTANCE_VERSION, config.getCatalogBeHost(),
+				config.getCatalogBePort(), ComponentTypeEnum.findParamByType(componentType), containerUID,
+				componentInstanceToReplace.getUniqueId());
+		RestResponse changeResourceInstanceVersion = sendPost(url, resourceUid, sdncModifierDetails.getUserId(),
+				acceptHeaderData);
+
+		if (changeResourceInstanceVersion.getErrorCode() == 200
+				|| changeResourceInstanceVersion.getErrorCode() == 201) {
+			Gson gson = new Gson();
+			// ResourceInstanceReqDetails
+			// convertResourceInstanceResponseToJavaObject =
+			// ResponseParser.convertResourceInstanceResponseToJavaObject(createResourceInstance.getResponse());
+			ComponentInstanceReqDetails fromJson = gson.fromJson(changeResourceInstanceVersion.getResponse(),
+					ComponentInstanceReqDetails.class);
+
+			componentInstanceToReplace.setUniqueId(fromJson.getUniqueId());
+
+		}
+
+		return changeResourceInstanceVersion;
+
+	}
+
+	public static RestResponse changeComponentInstanceVersion(String componentUniqueId,
+			String serviceInstanceToReplaceUniqueId, String serviceUniqueId, User sdncModifierDetails,
+			ComponentTypeEnum componentType) throws IOException {
+		Config config = Utils.getConfig();
+		String resourceUid = ("{\"componentUid\":\"" + serviceUniqueId + "\"}");
+		String url = String.format(Urls.CHANGE__RESOURCE_INSTANCE_VERSION, config.getCatalogBeHost(),
+				config.getCatalogBePort(), ComponentTypeEnum.findParamByType(componentType), componentUniqueId,
+				serviceInstanceToReplaceUniqueId);
+		RestResponse changeResourceInstanceVersion = sendPost(url, resourceUid, sdncModifierDetails.getUserId(),
+				acceptHeaderData);
+		return changeResourceInstanceVersion;
+
+	}
+	public static CapReqDef getInstancesCapabilitiesRequirements(Component component, String userId) throws Exception {
+
+		String url = String.format(Urls.GET_INSTANCE_REQUIRMENTS_CAPABILITIES,
+				Utils.getConfig().getCatalogBeHost(), Utils.getConfig().getCatalogBePort(),
+				ComponentTypeEnum.findParamByType(component.getComponentType()), component.getUniqueId());
+
+		RestResponse getComponentReqCap = sendGet(url, userId);
+		assertTrue(getComponentReqCap.getErrorCode() == STATUS_CODE_GET_SUCCESS);
+		return ResponseParser.parseToObject(getComponentReqCap.getResponse(), CapReqDef.class);
+	}
+
+}
diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/utils/rest/ComponentRestUtils.java b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/utils/rest/ComponentRestUtils.java
new file mode 100644
index 0000000000..8fcc67925a
--- /dev/null
+++ b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/utils/rest/ComponentRestUtils.java
@@ -0,0 +1,62 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * SDC
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.sdc.ci.tests.utils.rest;
+
+import org.openecomp.sdc.be.datatypes.enums.ComponentTypeEnum;
+import org.openecomp.sdc.be.model.CapReqDef;
+import org.openecomp.sdc.be.model.User;
+import org.openecomp.sdc.ci.tests.api.Urls;
+import org.openecomp.sdc.ci.tests.config.Config;
+import org.openecomp.sdc.ci.tests.datatypes.ComponentReqDetails;
+import org.openecomp.sdc.ci.tests.datatypes.ProductReqDetails;
+import org.openecomp.sdc.ci.tests.datatypes.ResourceReqDetails;
+import org.openecomp.sdc.ci.tests.datatypes.ServiceReqDetails;
+import org.openecomp.sdc.ci.tests.datatypes.http.RestResponse;
+import org.openecomp.sdc.ci.tests.utils.Utils;
+
+import java.io.IOException;
+
+public class ComponentRestUtils extends BaseRestUtils {
+	public static RestResponse getComponentRequirmentsCapabilities(User sdncModifierDetails,
+			ComponentReqDetails componentReqDetails) throws IOException {
+		Config config = Utils.getConfig();
+		ComponentTypeEnum componentType = null;
+		if (componentReqDetails instanceof ResourceReqDetails) {
+			componentType = ComponentTypeEnum.RESOURCE;
+		} else if (componentReqDetails instanceof ServiceReqDetails) {
+			componentType = ComponentTypeEnum.SERVICE;
+		} else if (componentReqDetails instanceof ProductReqDetails) {
+			componentType = ComponentTypeEnum.PRODUCT;
+		}
+		String url = String.format(Urls.GET_COMPONENT_REQUIRMENTS_CAPABILITIES, config.getCatalogBeHost(),
+				config.getCatalogBePort(), ComponentTypeEnum.findParamByType(componentType),
+				componentReqDetails.getUniqueId());
+		return sendGet(url, sdncModifierDetails.getUserId());
+	}
+
+	public static CapReqDef getAndParseComponentRequirmentsCapabilities(User user, ComponentReqDetails componentDetails)
+			throws IOException {
+		RestResponse getComponentReqCap = getComponentRequirmentsCapabilities(user, componentDetails);
+		ResourceRestUtils.checkSuccess(getComponentReqCap);
+		CapReqDef capReqDef = ResponseParser.parseToObject(getComponentReqCap.getResponse(), CapReqDef.class);
+		return capReqDef;
+	}
+}
diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/utils/rest/ConsumerRestUtils.java b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/utils/rest/ConsumerRestUtils.java
new file mode 100644
index 0000000000..5e35327305
--- /dev/null
+++ b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/utils/rest/ConsumerRestUtils.java
@@ -0,0 +1,246 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * SDC
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.sdc.ci.tests.utils.rest;
+
+import com.fasterxml.jackson.databind.DeserializationFeature;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.google.gson.Gson;
+import org.openecomp.sdc.be.datatypes.elements.ConsumerDataDefinition;
+import org.openecomp.sdc.be.model.User;
+import org.openecomp.sdc.ci.tests.api.Urls;
+import org.openecomp.sdc.ci.tests.config.Config;
+import org.openecomp.sdc.ci.tests.datatypes.http.HttpRequest;
+import org.openecomp.sdc.ci.tests.datatypes.http.RestResponse;
+import org.openecomp.sdc.ci.tests.utils.Utils;
+
+import java.util.Map;
+
+import static org.testng.AssertJUnit.assertEquals;
+
+public class ConsumerRestUtils extends BaseRestUtils {
+
+	public static final int STATUS_CODE_SUCCESS = 200;
+	public static final int STATUS_CODE_CREATED = 201;
+	public static final int STATUS_CODE_DELETE = 204;
+	public static final int STATUS_CODE_NOT_FOUND = 404;
+	Utils utils = new Utils();
+	private static Long expectedsLastupdatedtime;
+	private static Long expectedLastAuthenticationTime;
+
+	public static RestResponse createConsumer(ConsumerDataDefinition consumerDataDefinition, User sdncModifierDetails)
+			throws Exception {
+
+		Config config = Utils.getConfig();
+		String url = String.format(Urls.CREATE_CONSUMER, config.getCatalogBeHost(), config.getCatalogBePort());
+
+		String userId = sdncModifierDetails.getUserId();
+
+		Map<String, String> headersMap = prepareHeadersMap(userId);
+
+		Gson gson = new Gson();
+		String userBodyJson = gson.toJson(consumerDataDefinition);
+
+		HttpRequest http = new HttpRequest();
+		// System.out.println(url);
+		// System.out.println(userBodyJson);
+		RestResponse createConsumerResponse = http.httpSendPost(url, userBodyJson, headersMap);
+		if (createConsumerResponse.getErrorCode() == STATUS_CODE_CREATED) {
+			ConsumerDataDefinition getConsumerDataObject = parseComsumerResp(createConsumerResponse);
+			consumerDataDefinition
+					.setConsumerDetailsLastupdatedtime(getConsumerDataObject.getConsumerDetailsLastupdatedtime());
+			consumerDataDefinition
+					.setConsumerLastAuthenticationTime(getConsumerDataObject.getConsumerLastAuthenticationTime());
+			consumerDataDefinition.setLastModfierAtuid(getConsumerDataObject.getLastModfierAtuid());
+		}
+		return createConsumerResponse;
+	}
+
+	public static RestResponse createConsumerHttpCspAtuUidIsMissing(ConsumerDataDefinition consumerDataDefinition,
+			User sdncModifierDetails) throws Exception {
+
+		Config config = Utils.getConfig();
+		String url = String.format(Urls.CREATE_CONSUMER, config.getCatalogBeHost(), config.getCatalogBePort());
+
+		String userId = sdncModifierDetails.getUserId();
+		Map<String, String> headersMap = prepareHeadersMap(userId);
+		headersMap.remove("USER_ID");
+		Gson gson = new Gson();
+		String userBodyJson = gson.toJson(consumerDataDefinition);
+		HttpRequest http = new HttpRequest();
+		// System.out.println(url);
+		// System.out.println(userBodyJson);
+		RestResponse createConsumerResponse = http.httpSendPost(url, userBodyJson, headersMap);
+		if (createConsumerResponse.getErrorCode() == STATUS_CODE_CREATED) {
+			ConsumerDataDefinition getConsumerDataObject = parseComsumerResp(createConsumerResponse);
+			consumerDataDefinition
+					.setConsumerDetailsLastupdatedtime(getConsumerDataObject.getConsumerDetailsLastupdatedtime());
+			consumerDataDefinition
+					.setConsumerLastAuthenticationTime(getConsumerDataObject.getConsumerLastAuthenticationTime());
+			consumerDataDefinition.setLastModfierAtuid(getConsumerDataObject.getLastModfierAtuid());
+		}
+		return createConsumerResponse;
+	}
+
+	public static RestResponse deleteConsumerHttpCspAtuUidIsMissing(ConsumerDataDefinition consumerDataDefinition,
+			User sdncModifierDetails) throws Exception {
+
+		Config config = Utils.getConfig();
+		String url = String.format(Urls.DELETE_CONSUMER, config.getCatalogBeHost(), config.getCatalogBePort(),
+				consumerDataDefinition.getConsumerName());
+
+		String userId = sdncModifierDetails.getUserId();
+		Map<String, String> headersMap = prepareHeadersMap(userId);
+		headersMap.remove("USER_ID");
+		Gson gson = new Gson();
+		String userBodyJson = gson.toJson(consumerDataDefinition);
+		HttpRequest http = new HttpRequest();
+		// System.out.println(url);
+		// System.out.println(userBodyJson);
+		RestResponse deleteConsumerResponse = http.httpSendDelete(url, headersMap);
+		return deleteConsumerResponse;
+	}
+
+	public static ConsumerDataDefinition parseComsumerResp(RestResponse restResponse) throws Exception {
+
+		String bodyToParse = restResponse.getResponse();
+		ObjectMapper mapper = new ObjectMapper();
+		mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
+		try {
+			ConsumerDataDefinition component = mapper.readValue(bodyToParse, ConsumerDataDefinition.class);
+			return component;
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
+
+		return null;
+	}
+
+	public static RestResponse deleteConsumer(ConsumerDataDefinition consumerDataDefinition, User sdncModifierDetails)
+			throws Exception {
+
+		Config config = Utils.getConfig();
+		String url = String.format(Urls.DELETE_CONSUMER, config.getCatalogBeHost(), config.getCatalogBePort(),
+				consumerDataDefinition.getConsumerName());
+
+		String userId = sdncModifierDetails.getUserId();
+
+		Map<String, String> headersMap = prepareHeadersMap(userId);
+		HttpRequest http = new HttpRequest();
+		// System.out.println(url);
+		RestResponse deleteConsumerResponse = http.httpSendDelete(url, headersMap);
+		return deleteConsumerResponse;
+	}
+
+	public static RestResponse getConsumer(ConsumerDataDefinition consumerDataDefinition, User sdncModifierDetails)
+			throws Exception {
+
+		Config config = Utils.getConfig();
+		String url = String.format(Urls.GET_CONSUMER, config.getCatalogBeHost(), config.getCatalogBePort(),
+				consumerDataDefinition.getConsumerName());
+
+		String userId = sdncModifierDetails.getUserId();
+
+		Map<String, String> headersMap = prepareHeadersMap(userId);
+		HttpRequest http = new HttpRequest();
+		// System.out.println(url);
+		RestResponse getConsumerResponse = http.httpSendGet(url, headersMap);
+		return getConsumerResponse;
+	}
+
+	public static void validateConsumerReqVsResp(ConsumerDataDefinition consumerDefinition,
+			ConsumerDataDefinition getConsumerDataObject) {
+
+		String expected;
+
+		expected = consumerDefinition.getConsumerName();
+		assertEquals("consumer name - ", expected, getConsumerDataObject.getConsumerName());
+
+		expected = consumerDefinition.getConsumerPassword().toLowerCase();
+		assertEquals("consumer password  - ", expected, getConsumerDataObject.getConsumerPassword());
+
+		expected = consumerDefinition.getLastModfierAtuid();
+		assertEquals("consumer Last Modfier Atuid - ", expected, getConsumerDataObject.getLastModfierAtuid());
+
+		expected = consumerDefinition.getConsumerSalt();
+		assertEquals("consumer Salt - ", expected, getConsumerDataObject.getConsumerSalt());
+
+		expectedsLastupdatedtime = consumerDefinition.getConsumerDetailsLastupdatedtime();
+		assertEquals("consumer Last updated time - ", expectedsLastupdatedtime,
+				getConsumerDataObject.getConsumerDetailsLastupdatedtime());
+
+		expectedLastAuthenticationTime = consumerDefinition.getConsumerLastAuthenticationTime();
+		assertEquals("consumer Last authentication time - ", expectedLastAuthenticationTime,
+				getConsumerDataObject.getConsumerLastAuthenticationTime());
+	}
+
+	///// New
+	public enum EcompConsumerAuditJsonKeysEnum {
+		ACTION("ACTION"), MODIFIER("MODIFIER"), ECOMP_USER("ECOMP_USER"), STATUS("STATUS"), DESC("DESCRIPTION");
+		private String auditJsonKeyName;
+
+		private EcompConsumerAuditJsonKeysEnum(String auditJsonKeyName) {
+			this.auditJsonKeyName = auditJsonKeyName;
+		}
+
+		public String getAuditJsonKeyName() {
+			return auditJsonKeyName.toLowerCase();
+		}
+	}
+
+	/*
+	 * protected void resourceArtifatAuditSuccess(String action,
+	 * ArtifactReqDetails artifact, ResourceReqDetails resourceDetails , User
+	 * user) throws Exception { ExpectedResourceAuditJavaObject
+	 * expectedResourceAuditJavaObject =
+	 * Convertor.constructFieldsForAuditValidation(resourceDetails,
+	 * resourceDetails.getVersion(), user); String auditAction = action;
+	 * expectedResourceAuditJavaObject.setAction(auditAction);
+	 * expectedResourceAuditJavaObject.setPrevState("");
+	 * expectedResourceAuditJavaObject.setPrevVersion("");
+	 * expectedResourceAuditJavaObject.setCurrState((LifecycleStateEnum.
+	 * NOT_CERTIFIED_CHECKOUT).toString());
+	 * expectedResourceAuditJavaObject.setStatus("200");
+	 * expectedResourceAuditJavaObject.setDesc("OK");
+	 * expectedResourceAuditJavaObject.setArtifactName(artifact.getArtifactName(
+	 * )); AuditUtils.validateAudit(expectedResourceAuditJavaObject,
+	 * auditAction, null); }
+	 */
+
+	/*
+	 * protected void resourceArtifatValidateAuditWithErrorMessage(String
+	 * actionStatus, ResourceReqDetails resourceDetails, String auditAction,
+	 * String setCurrState, Object ... variables)throws Exception { ErrorInfo
+	 * errorInfo = utils.parseYaml(actionStatus);
+	 * ExpectedResourceAuditJavaObject expectedResourceAuditJavaObject =
+	 * Convertor.constructFieldsForAuditValidation(resourceDetails,
+	 * resourceDetails.getVersion(), sdncUserDetails);
+	 * expectedResourceAuditJavaObject.setAction(auditAction);
+	 * expectedResourceAuditJavaObject.setPrevState("");
+	 * expectedResourceAuditJavaObject.setPrevVersion("");
+	 * expectedResourceAuditJavaObject.setCurrState(setCurrState);
+	 * expectedResourceAuditJavaObject.setStatus(errorInfo.getCode().toString())
+	 * ;
+	 * expectedResourceAuditJavaObject.setDesc(errorInfo.getAuditDesc(variables)
+	 * ); expectedResourceAuditJavaObject.setArtifactName("");
+	 * AuditUtils.validateAudit(expectedResourceAuditJavaObject, auditAction,
+	 * null); }
+	 */
+}
diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/utils/rest/EcompUserRestUtils.java b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/utils/rest/EcompUserRestUtils.java
new file mode 100644
index 0000000000..1cd8632c71
--- /dev/null
+++ b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/utils/rest/EcompUserRestUtils.java
@@ -0,0 +1,247 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * SDC
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.sdc.ci.tests.utils.rest;
+
+import com.google.gson.Gson;
+import org.onap.portalsdk.core.restful.domain.EcompRole;
+import org.onap.portalsdk.core.restful.domain.EcompUser;
+import org.openecomp.sdc.ci.tests.api.Urls;
+import org.openecomp.sdc.ci.tests.config.Config;
+import org.openecomp.sdc.ci.tests.datatypes.http.HttpHeaderEnum;
+import org.openecomp.sdc.ci.tests.datatypes.http.HttpRequest;
+import org.openecomp.sdc.ci.tests.datatypes.http.RestResponse;
+import org.openecomp.sdc.ci.tests.utils.Utils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.io.IOException;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+public class EcompUserRestUtils extends BaseRestUtils {
+
+	static Gson gson = new Gson();
+
+	static Logger logger = LoggerFactory.getLogger(EcompUserRestUtils.class.getName());
+	static String ecompUsername = "12345";
+	static String ecompPassword = "12345";
+
+	public EcompUserRestUtils() {
+		super();
+	}
+
+	public static RestResponse pushUser(EcompUser ecompUser) throws IOException {
+		Config config = Utils.getConfig();
+
+		Map<String, String> headersMap = new HashMap<>();
+		headersMap.put(HttpHeaderEnum.CONTENT_TYPE.getValue(), BaseRestUtils.contentTypeHeaderData);
+		headersMap.put(HttpHeaderEnum.ACCEPT.getValue(), BaseRestUtils.acceptHeaderData);
+		headersMap.put(HttpHeaderEnum.ECOMP_USERNAME.getValue(), ecompUsername);
+		headersMap.put(HttpHeaderEnum.ECOMP_PASSWORD.getValue(), ecompPassword);
+
+		String userBodyJson = gson.toJson(ecompUser);
+
+		HttpRequest http = new HttpRequest();
+		String url = String.format(Urls.ECOMP_PUSH_USER, config.getCatalogBeHost(), config.getCatalogBePort());
+
+		logger.debug("Send POST request to create user: {}", url);
+		logger.debug("User body: {}", userBodyJson);
+		logger.debug("User headers: {}", headersMap);
+
+		RestResponse sendPushUserResponse = http.httpSendPost(url, userBodyJson, headersMap);
+
+		return sendPushUserResponse;
+	}
+
+	/*
+	 * loginId - equals to userId
+	 */
+	public static RestResponse editUser(String loginId, EcompUser ecompUser) throws IOException {
+		Config config = Utils.getConfig();
+
+		Map<String, String> headersMap = new HashMap<>();
+		headersMap.put(HttpHeaderEnum.CONTENT_TYPE.getValue(), BaseRestUtils.contentTypeHeaderData);
+		headersMap.put(HttpHeaderEnum.ACCEPT.getValue(), BaseRestUtils.acceptHeaderData);
+		headersMap.put(HttpHeaderEnum.ECOMP_USERNAME.getValue(), ecompUsername);
+		headersMap.put(HttpHeaderEnum.ECOMP_PASSWORD.getValue(), ecompPassword);
+
+		String userBodyJson = gson.toJson(ecompUser);
+
+		HttpRequest http = new HttpRequest();
+		String url = String.format(Urls.ECOMP_EDIT_USER, config.getCatalogBeHost(), config.getCatalogBePort(), loginId);
+
+		logger.debug("Send POST request to edit user: {}", url);
+		logger.debug("User body: {}", userBodyJson);
+		logger.debug("User headers: {}", headersMap);
+
+		RestResponse sendEditUserResponse = http.httpSendPost(url, userBodyJson, headersMap);
+
+		return sendEditUserResponse;
+	}
+
+	/*
+	 * loginId - equals to userId
+	 */
+	public static RestResponse getUser(String loginId) throws IOException {
+		Config config = Utils.getConfig();
+
+		Map<String, String> headersMap = new HashMap<>();
+		headersMap.put(HttpHeaderEnum.CONTENT_TYPE.getValue(), BaseRestUtils.contentTypeHeaderData);
+		headersMap.put(HttpHeaderEnum.ACCEPT.getValue(), BaseRestUtils.acceptHeaderData);
+		headersMap.put(HttpHeaderEnum.ECOMP_USERNAME.getValue(), ecompUsername);
+		headersMap.put(HttpHeaderEnum.ECOMP_PASSWORD.getValue(), ecompPassword);
+
+		HttpRequest http = new HttpRequest();
+		String url = String.format(Urls.ECOMP_GET_USER, config.getCatalogBeHost(), config.getCatalogBePort(), loginId);
+
+		logger.debug("Send GET request to get user: {}", url);
+		logger.debug("User headers: {}", headersMap);
+
+		RestResponse sendGetUserRequest = http.httpSendGet(url, headersMap);
+
+		return sendGetUserRequest;
+	}
+
+	public static RestResponse getAllUsers() throws IOException {
+		Config config = Utils.getConfig();
+
+		Map<String, String> headersMap = new HashMap<>();
+		headersMap.put(HttpHeaderEnum.CONTENT_TYPE.getValue(), BaseRestUtils.contentTypeHeaderData);
+		headersMap.put(HttpHeaderEnum.ACCEPT.getValue(), BaseRestUtils.acceptHeaderData);
+		headersMap.put(HttpHeaderEnum.ECOMP_USERNAME.getValue(), ecompUsername);
+		headersMap.put(HttpHeaderEnum.ECOMP_PASSWORD.getValue(), ecompPassword);
+
+		HttpRequest http = new HttpRequest();
+		String url = String.format(Urls.ECOMP_GET_ALL_USERS, config.getCatalogBeHost(), config.getCatalogBePort());
+
+		logger.debug("Send POST request to get all users: {}", url);
+		logger.debug("User headers: {}", headersMap);
+
+		RestResponse sendGetAllUsersRequest = http.httpSendGet(url, headersMap);
+
+		return sendGetAllUsersRequest;
+	}
+
+	public static RestResponse getAllAvailableRoles() throws IOException {
+		Config config = Utils.getConfig();
+
+		Map<String, String> headersMap = new HashMap<>();
+		headersMap.put(HttpHeaderEnum.CONTENT_TYPE.getValue(), BaseRestUtils.contentTypeHeaderData);
+		headersMap.put(HttpHeaderEnum.ACCEPT.getValue(), BaseRestUtils.acceptHeaderData);
+		headersMap.put(HttpHeaderEnum.ECOMP_USERNAME.getValue(), ecompUsername);
+		headersMap.put(HttpHeaderEnum.ECOMP_PASSWORD.getValue(), ecompPassword);
+
+		HttpRequest http = new HttpRequest();
+		String url = String.format(Urls.ECOMP_GET_ALL_AVAILABLE_ROLES, config.getCatalogBeHost(),
+				config.getCatalogBePort());
+
+		logger.debug("Send GET request to get all available roles: {}", url);
+		logger.debug("User headers: {}", headersMap);
+
+		RestResponse sendUpdateUserRequest = http.httpSendGet(url, headersMap);
+
+		return sendUpdateUserRequest;
+	}
+
+	/*
+	 * loginId - equals to userId
+	 */
+	public static RestResponse pushUserRoles(String loginId, List<EcompRole> roles) throws IOException {
+		Config config = Utils.getConfig();
+
+		Map<String, String> headersMap = new HashMap<>();
+		headersMap.put(HttpHeaderEnum.CONTENT_TYPE.getValue(), BaseRestUtils.contentTypeHeaderData);
+		headersMap.put(HttpHeaderEnum.ACCEPT.getValue(), BaseRestUtils.acceptHeaderData);
+		headersMap.put(HttpHeaderEnum.ECOMP_USERNAME.getValue(), ecompUsername);
+		headersMap.put(HttpHeaderEnum.ECOMP_PASSWORD.getValue(), ecompPassword);
+
+		String roleBodyJson = gson.toJson(roles);
+		if(roleBodyJson.equals("[{}]")) {
+			roleBodyJson = "[]";
+		}
+
+		HttpRequest http = new HttpRequest();
+		String url = String.format(Urls.ECOMP_PUSH_USER_ROLES, config.getCatalogBeHost(), config.getCatalogBePort(),
+				loginId);
+
+		logger.debug("Send POST request to push user role: {}", url);
+		logger.debug("Roles body: {}", roleBodyJson);
+		logger.debug("Request headers: {}", headersMap);
+
+		RestResponse sendpushUserRolesResponse = http.httpSendPost(url, roleBodyJson, headersMap);
+
+		return sendpushUserRolesResponse;
+	}
+
+	/*
+	 * loginId - equals to userId
+	 */
+	public static RestResponse getUserRoles(String loginId) throws IOException {
+		Config config = Utils.getConfig();
+
+		Map<String, String> headersMap = new HashMap<>();
+		headersMap.put(HttpHeaderEnum.CONTENT_TYPE.getValue(), BaseRestUtils.contentTypeHeaderData);
+		headersMap.put(HttpHeaderEnum.ACCEPT.getValue(), BaseRestUtils.acceptHeaderData);
+		headersMap.put(HttpHeaderEnum.ECOMP_USERNAME.getValue(), ecompUsername);
+		headersMap.put(HttpHeaderEnum.ECOMP_PASSWORD.getValue(), ecompPassword);
+
+		HttpRequest http = new HttpRequest();
+		String url = String.format(Urls.ECOMP_GET_USER_ROLES, config.getCatalogBeHost(), config.getCatalogBePort(),
+				loginId);
+
+		logger.debug("Send GET request to get user roles: {}", url);
+		logger.debug("User headers: {}", headersMap);
+
+		RestResponse sendGetUserRolesRequest = http.httpSendGet(url, headersMap);
+
+		return sendGetUserRolesRequest;
+	}
+
+	// TODO !!!!!!!!!!!!!!
+	/*
+	 * Ask Eli if implementation of users is needed DELETE ECOMP USER
+	 */
+
+	/*
+	 * public static void main(String[] args) { EcompUser ecompUser = new
+	 * EcompUser(); ecompUser.setFirstName("Test");
+	 * ecompUser.setLastName("Testovich");
+	 * ecompUser.setActive(true);
+	 * 
+	 * EcompRole roleToUpdate = new EcompRole(); roleToUpdate.setId(new
+	 * Long(6)); roleToUpdate.setName("PRODUCT_STRATEGIST"); List<EcompRole>
+	 * listOfRoles = new LinkedList<>(); listOfRoles.add(roleToUpdate);
+	 * 
+	 * try {
+	 * System.out.println("\n-----------------------------\n Testing pushUser");
+	 * System.out.println(pushUser(ecompUser));
+	 * System.out.println("\n-----------------------------\n Testing editUser");
+	 * System.out.println("\n-----------------------------\n Testing getUser");
+	 * // System.out.println(getUser(ecompUser.getLoginId())); System.out.
+	 * println("\n-----------------------------\n Testing getAllUsers"); //
+	 * System.out.println(getAllUsers()); System.out.
+	 * println("\n-----------------------------\n Testing getAllAvailableRoles"
+	 * ); // System.out.println(getAllAvailableRoles().toString()); System.out.
+	 * println("\n-----------------------------\n Testing pushUserRoles");
+	 * TODO Auto-generated catch block e.printStackTrace(); } }
+	 */
+}
diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/utils/rest/GroupRestUtils.java b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/utils/rest/GroupRestUtils.java
new file mode 100644
index 0000000000..e491b3bd17
--- /dev/null
+++ b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/utils/rest/GroupRestUtils.java
@@ -0,0 +1,59 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * SDC
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.sdc.ci.tests.utils.rest;
+
+import com.google.gson.Gson;
+import org.openecomp.sdc.be.datatypes.enums.ComponentTypeEnum;
+import org.openecomp.sdc.be.model.Component;
+import org.openecomp.sdc.be.model.User;
+import org.openecomp.sdc.ci.tests.api.Urls;
+import org.openecomp.sdc.ci.tests.config.Config;
+import org.openecomp.sdc.ci.tests.datatypes.http.HttpHeaderEnum;
+import org.openecomp.sdc.ci.tests.datatypes.http.RestResponse;
+import org.openecomp.sdc.ci.tests.utils.Utils;
+
+import java.io.IOException;
+import java.util.HashMap;
+import java.util.Map;
+
+public class GroupRestUtils extends BaseRestUtils {
+	static Config config = Config.instance();
+	public static Gson gson = new Gson();
+
+	public static RestResponse getGroupById(Component component, String groupId, User user) throws IOException {
+
+		Config config = Utils.getConfig();
+
+		Map<String, String> headersMap = new HashMap<>();
+		headersMap.put(HttpHeaderEnum.CONTENT_TYPE.getValue(), contentTypeHeaderData);
+		headersMap.put(HttpHeaderEnum.ACCEPT.getValue(), acceptHeaderData);
+		headersMap.put(HttpHeaderEnum.USER_ID.getValue(), user.getUserId());
+
+		String url = String.format(Urls.GET_GROUP_BY_ID, config.getCatalogBeHost(), config.getCatalogBePort(),
+				ComponentTypeEnum.findParamByType(component.getComponentType()), component.getUniqueId(), groupId);
+
+		RestResponse sendGetServerRequest = sendGet(url, user.getUserId(), headersMap);
+
+		return sendGetServerRequest;
+
+	}
+
+}
diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/utils/rest/ImportRestUtils.java b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/utils/rest/ImportRestUtils.java
new file mode 100644
index 0000000000..0edc294693
--- /dev/null
+++ b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/utils/rest/ImportRestUtils.java
@@ -0,0 +1,392 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * SDC
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.sdc.ci.tests.utils.rest;
+
+import org.apache.commons.io.IOUtils;
+import org.apache.http.HttpEntity;
+import org.apache.http.client.ClientProtocolException;
+import org.apache.http.client.methods.CloseableHttpResponse;
+import org.apache.http.client.methods.HttpPost;
+import org.apache.http.entity.ContentType;
+import org.apache.http.entity.mime.MultipartEntityBuilder;
+import org.apache.http.entity.mime.content.FileBody;
+import org.apache.http.entity.mime.content.StringBody;
+import org.apache.http.impl.client.CloseableHttpClient;
+import org.apache.http.impl.client.HttpClients;
+import org.codehaus.jettison.json.JSONException;
+import org.openecomp.sdc.be.model.User;
+import org.openecomp.sdc.ci.tests.api.Urls;
+import org.openecomp.sdc.ci.tests.config.Config;
+import org.openecomp.sdc.ci.tests.datatypes.ResourceReqDetails;
+import org.openecomp.sdc.ci.tests.datatypes.enums.ErrorInfo;
+import org.openecomp.sdc.ci.tests.datatypes.enums.ImportTestTypesEnum;
+import org.openecomp.sdc.ci.tests.datatypes.enums.NormativeTypesEnum;
+import org.openecomp.sdc.ci.tests.datatypes.enums.UserRoleEnum;
+import org.openecomp.sdc.ci.tests.datatypes.http.HttpRequest;
+import org.openecomp.sdc.ci.tests.datatypes.http.RestResponse;
+import org.openecomp.sdc.ci.tests.utils.Utils;
+import org.openecomp.sdc.ci.tests.utils.validation.ErrorValidationUtils;
+import org.openecomp.sdc.common.http.client.api.HttpResponse;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.io.*;
+import java.nio.file.FileSystems;
+import java.nio.file.Files;
+import java.util.*;
+
+import static org.testng.AssertJUnit.assertEquals;
+import static org.testng.AssertJUnit.assertNotNull;
+
+public class ImportRestUtils extends BaseRestUtils {
+
+	private static Logger log = LoggerFactory.getLogger(ImportRestUtils.class.getName());
+	private static Properties downloadCsarHeaders = new Properties();
+
+	static {
+		downloadCsarHeaders.put("Accept", "application/octet-stream");
+	}
+
+	@SuppressWarnings("unused")
+	private static Integer importNormativeResource(NormativeTypesEnum resource, UserRoleEnum userRole)
+			throws IOException {
+		Config config = Utils.getConfig();
+		CloseableHttpResponse response = null;
+		MultipartEntityBuilder mpBuilder = MultipartEntityBuilder.create();
+
+		mpBuilder.addPart("resourceZip", new FileBody(getTestZipFile(resource.getFolderName())));
+		mpBuilder.addPart("resourceMetadata",
+				new StringBody(getTestJsonStringOfFile(resource.getFolderName(), resource.getFolderName() + ".json"),
+						ContentType.APPLICATION_JSON));
+
+		String url = String.format(Urls.IMPORT_RESOURCE_NORMATIVE, config.getCatalogBeHost(),
+				config.getCatalogBePort());
+
+		CloseableHttpClient client = HttpClients.createDefault();
+		try {
+			HttpPost httpPost = new HttpPost(url);
+			httpPost.addHeader("USER_ID", userRole.getUserId());
+			httpPost.setEntity(mpBuilder.build());
+			response = client.execute(httpPost);
+			return response.getStatusLine().getStatusCode();
+		} finally {
+			closeResponse(response);
+			closeHttpClient(client);
+
+		}
+	}
+
+	/*
+	 * public static RestResponse importResourceByName(String resourceName, User
+	 * user) throws IOException { Config config = Utils.getConfig();
+	 * CloseableHttpResponse response = null; MultipartEntityBuilder mpBuilder =
+	 * MultipartEntityBuilder.create();
+	 * 
+	 * mpBuilder.addPart("resourceZip", new
+	 * FileBody(getTestZipFile(resourceName)));
+	 * mpBuilder.addPart("resourceMetadata", new
+	 * StringBody(getTestJsonStringOfFile(resourceName, resourceName + ".json"),
+	 * ContentType.APPLICATION_JSON));
+	 * 
+	 * String url = String.format(Urls.IMPORT_RESOURCE_NORMATIVE,
+	 * config.getCatalogBeHost(), config.getCatalogBePort());
+	 * 
+	 * CloseableHttpClient client = HttpClients.createDefault(); try { HttpPost
+	 * httpPost = new HttpPost(url); RestResponse restResponse = new
+	 * RestResponse(); httpPost.addHeader("USER_ID", user.getUserId());
+	 * httpPost.setEntity(mpBuilder.build()); response =
+	 * client.execute(httpPost); HttpEntity entity = response.getEntity();
+	 * String responseBody = null; if (entity != null) { InputStream instream =
+	 * entity.getContent(); StringWriter writer = new StringWriter();
+	 * IOUtils.copy(instream, writer); responseBody = writer.toString(); try {
+	 * 
+	 * } finally { instream.close(); } }
+	 * 
+	 * restResponse.setErrorCode(response.getStatusLine().getStatusCode());
+	 * restResponse.setResponse(responseBody); if (restResponse.getErrorCode()
+	 * == STATUS_CODE_CREATED ){
+	 * 
+	 * }
+	 * 
+	 * return restResponse;
+	 * 
+	 * } finally { closeResponse(response); closeHttpClient(client);
+	 * 
+	 * }
+	 * 
+	 * }
+	 */
+
+	public static RestResponse importResourceByName(ResourceReqDetails resourceDetails, User importer)
+			throws Exception {
+		Config config = Utils.getConfig();
+		CloseableHttpResponse response = null;
+		MultipartEntityBuilder mpBuilder = MultipartEntityBuilder.create();
+
+		mpBuilder.addPart("resourceZip", new FileBody(getTestZipFile(resourceDetails.getName())));
+		mpBuilder.addPart("resourceMetadata",
+				new StringBody(getTestJsonStringOfFile(resourceDetails.getName(), resourceDetails.getName() + ".json"),
+						ContentType.APPLICATION_JSON));
+
+		String url = String.format(Urls.IMPORT_RESOURCE_NORMATIVE, config.getCatalogBeHost(),
+				config.getCatalogBePort());
+
+		CloseableHttpClient client = HttpClients.createDefault();
+		try {
+			HttpPost httpPost = new HttpPost(url);
+			RestResponse restResponse = new RestResponse();
+			httpPost.addHeader("USER_ID", importer.getUserId());
+			httpPost.setEntity(mpBuilder.build());
+			response = client.execute(httpPost);
+			HttpEntity entity = response.getEntity();
+			String responseBody = null;
+			if (entity != null) {
+				InputStream instream = entity.getContent();
+				StringWriter writer = new StringWriter();
+				IOUtils.copy(instream, writer);
+				responseBody = writer.toString();
+				try {
+
+				} finally {
+					instream.close();
+				}
+			}
+
+			restResponse.setErrorCode(response.getStatusLine().getStatusCode());
+			restResponse.setResponse(responseBody);
+
+			if (restResponse.getErrorCode() == STATUS_CODE_CREATED) {
+				resourceDetails.setUUID(ResponseParser.getUuidFromResponse(restResponse));
+				resourceDetails.setUniqueId(ResponseParser.getUniqueIdFromResponse(restResponse));
+				resourceDetails.setVersion(ResponseParser.getVersionFromResponse(restResponse));
+				resourceDetails.setCreatorUserId(importer.getUserId());
+				resourceDetails.setCreatorFullName(importer.getFullName());
+			}
+
+			return restResponse;
+
+		} finally {
+			closeResponse(response);
+			closeHttpClient(client);
+
+		}
+
+	}
+
+	public static RestResponse importNewResourceByName(String resourceName, UserRoleEnum userRole) throws IOException {
+		Config config = Utils.getConfig();
+
+		MultipartEntityBuilder mpBuilder = MultipartEntityBuilder.create();
+
+		mpBuilder.addPart("resourceZip", new FileBody(getTestZipFile(resourceName)));
+		mpBuilder.addPart("resourceMetadata", new StringBody(
+				getTestJsonStringOfFile(resourceName, resourceName + ".json"), ContentType.APPLICATION_JSON));
+		HttpEntity requestEntity = mpBuilder.build();
+		String url = String.format(Urls.IMPORT_USER_RESOURCE, config.getCatalogBeHost(), config.getCatalogBePort());
+		Map<String, String> headers = new HashMap<String, String>();
+		headers.put("USER_ID", userRole.getUserId());
+
+		return HttpRequest.sendHttpPostWithEntity(requestEntity, url, headers);
+	}
+
+	public static RestResponse importNormativeResourceByName(String resourceName, UserRoleEnum userRole)
+			throws IOException {
+		Config config = Utils.getConfig();
+
+		MultipartEntityBuilder mpBuilder = MultipartEntityBuilder.create();
+
+		mpBuilder.addPart("resourceZip", new FileBody(getTestZipFile(resourceName)));
+		mpBuilder.addPart("resourceMetadata", new StringBody(
+				getTestJsonStringOfFile(resourceName, resourceName + ".json"), ContentType.APPLICATION_JSON));
+		HttpEntity requestEntity = mpBuilder.build();
+		String url = String.format(Urls.IMPORT_RESOURCE_NORMATIVE, config.getCatalogBeHost(),
+				config.getCatalogBePort());
+		Map<String, String> headers = new HashMap<String, String>();
+		headers.put("USER_ID", userRole.getUserId());
+
+		return HttpRequest.sendHttpPostWithEntity(requestEntity, url, headers);
+	}
+
+	public static RestResponse importTestResource(ImportTestTypesEnum resource, UserRoleEnum userRole)
+			throws IOException {
+		Config config = Utils.getConfig();
+		CloseableHttpResponse response = null;
+		MultipartEntityBuilder mpBuilder = MultipartEntityBuilder.create();
+
+		mpBuilder.addPart("resourceZip", new FileBody(getTestZipFile(resource.getFolderName())));
+		mpBuilder.addPart("resourceMetadata",
+				new StringBody(getTestJsonStringOfFile(resource.getFolderName(), resource.getFolderName() + ".json"),
+						ContentType.APPLICATION_JSON));
+
+		String url = String.format(Urls.IMPORT_RESOURCE_NORMATIVE, config.getCatalogBeHost(),
+				config.getCatalogBePort());
+
+		CloseableHttpClient client = HttpClients.createDefault();
+		try {
+			HttpPost httpPost = new HttpPost(url);
+			RestResponse restResponse = new RestResponse();
+			httpPost.addHeader("USER_ID", UserRoleEnum.ADMIN.getUserId());
+			httpPost.setEntity(mpBuilder.build());
+			response = client.execute(httpPost);
+			HttpEntity entity = response.getEntity();
+			String responseBody = null;
+			if (entity != null) {
+				InputStream instream = entity.getContent();
+				StringWriter writer = new StringWriter();
+				IOUtils.copy(instream, writer);
+				responseBody = writer.toString();
+				try {
+
+				} finally {
+					instream.close();
+				}
+			}
+
+			restResponse.setErrorCode(response.getStatusLine().getStatusCode());
+			// restResponse.setResponse(response.getEntity().toString());
+			restResponse.setResponse(responseBody);
+			return restResponse;
+		} finally {
+			closeResponse(response);
+			closeHttpClient(client);
+
+		}
+	}
+
+	public static Boolean removeNormativeTypeResource(NormativeTypesEnum current)
+			throws FileNotFoundException, IOException, ClientProtocolException {
+		User user = new User(UserRoleEnum.ADMIN.getFirstName(), UserRoleEnum.ADMIN.getLastName(),
+				UserRoleEnum.ADMIN.getUserId(), null, null, null);
+		RestResponse deleteResponse = ResourceRestUtils.deleteResourceByNameAndVersion(user, current.getNormativeName(),
+				"1.0");
+		if (deleteResponse.getErrorCode() == 200) {
+			return true;
+		}
+		return false;
+	}
+
+	public static void validateImportTestTypesResp(ImportTestTypesEnum currResource, RestResponse restResponse)
+			throws IOException, JSONException {
+
+		// assertTrue( status != ResourceUtils.STATUS_CODE_IMPORT_SUCCESS );
+
+		ErrorInfo errorInfo = ErrorValidationUtils.parseErrorConfigYaml(currResource.getActionStatus().name());
+
+		assertNotNull("check response object is not null after create service", restResponse);
+		assertNotNull("check error code exists in response after create service", restResponse.getErrorCode());
+		assertEquals("Check response code after create service", errorInfo.getCode(), restResponse.getErrorCode());
+
+		// validate create service response vs actual
+		List<String> variables = (currResource.getErrorParams() != null ? currResource.getErrorParams()
+				: new ArrayList<String>());
+		if (restResponse.getErrorCode() != 200) {
+			ErrorValidationUtils.checkBodyResponseOnError(currResource.getActionStatus().name(), variables,
+					restResponse.getResponse());
+		}
+	}
+
+	private static String getTestJsonStringOfFile(String folderName, String fileName) throws IOException {
+		// String sourceDir = "src/test/resources/CI/importResourceTests";
+		Config config = Utils.getConfig();
+		String sourceDir = config.getImportResourceTestsConfigDir();
+		java.nio.file.Path filePath = FileSystems.getDefault().getPath(sourceDir + File.separator + folderName,
+				fileName);
+		byte[] fileContent = Files.readAllBytes(filePath);
+		String content = new String(fileContent);
+		return content;
+	}
+
+	private static File getTestZipFile(String elementName) throws IOException {
+		Config config = Utils.getConfig();
+		String sourceDir = config.getImportResourceTestsConfigDir();
+		java.nio.file.Path filePath = FileSystems.getDefault().getPath(sourceDir + File.separator + elementName,
+				"normative-types-new-" + elementName + ".zip");
+		return filePath.toFile();
+	}
+
+	private static void closeHttpClient(CloseableHttpClient client) {
+		try {
+			if (client != null) {
+				client.close();
+			}
+		} catch (IOException e) {
+			log.debug("failed to close client or response: ", e);
+		}
+	}
+
+	private static void closeResponse(CloseableHttpResponse response) {
+		try {
+			if (response != null) {
+				response.close();
+			}
+		} catch (IOException e) {
+			log.debug("failed to close client or response: {}", e);
+		}
+	}
+
+	public static HttpResponse<byte []> getCsar(String csarUid, User sdncModifierDetails) throws Exception {
+
+		Config config = Utils.getConfig();
+		String url = String.format(Urls.GET_CSAR_USING_SIMULATOR, config.getCatalogBeHost(), config.getCatalogBePort(),
+				csarUid);
+
+		String userId = sdncModifierDetails.getUserId();
+
+		Map<String, String> headersMap = prepareHeadersMap(userId);
+
+		// Gson gson = new Gson();
+		// String userBodyJson = gson.toJson(resourceDetails);
+		HttpRequest http = new HttpRequest();
+		// System.out.println(url);
+		// System.out.println(userBodyJson);
+
+		for (Map.Entry<String, String> mapEntry : headersMap.entrySet()) {
+
+			downloadCsarHeaders.put(mapEntry.getKey(), mapEntry.getValue());
+		}
+		return org.openecomp.sdc.common.http.client.api.HttpRequest.getAsByteArray(url, downloadCsarHeaders);
+	}
+
+	private static File getGroupTypeZipFile(String elementName) throws IOException {
+		Config config = Utils.getConfig();
+		String sourceDir = config.getImportResourceTestsConfigDir();
+		sourceDir += File.separator + ".." + File.separator + "importTypesTest" + File.separator;
+		java.nio.file.Path filePath = FileSystems.getDefault().getPath(sourceDir + File.separator + elementName,
+				elementName + ".zip");
+		return filePath.toFile();
+	}
+
+	public static RestResponse importNewGroupTypeByName(String groupTypeName, UserRoleEnum userRole)
+			throws IOException {
+		Config config = Utils.getConfig();
+
+		MultipartEntityBuilder mpBuilder = MultipartEntityBuilder.create();
+
+		mpBuilder.addPart("groupTypesZip", new FileBody(getGroupTypeZipFile(groupTypeName)));
+		HttpEntity requestEntity = mpBuilder.build();
+		String url = String.format(Urls.IMPORT_GROUP_TYPE, config.getCatalogBeHost(), config.getCatalogBePort());
+		Map<String, String> headers = new HashMap<String, String>();
+		headers.put("USER_ID", userRole.getUserId());
+
+		return HttpRequest.sendHttpPostWithEntity(requestEntity, url, headers);
+	}
+
+}
diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/utils/rest/InputsRestUtils.java b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/utils/rest/InputsRestUtils.java
new file mode 100644
index 0000000000..36fe6e3ea7
--- /dev/null
+++ b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/utils/rest/InputsRestUtils.java
@@ -0,0 +1,148 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * SDC
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.sdc.ci.tests.utils.rest;
+
+import com.google.gson.Gson;
+
+import org.openecomp.sdc.be.datatypes.enums.ComponentTypeEnum;
+import org.openecomp.sdc.be.model.Component;
+import org.openecomp.sdc.be.model.ComponentInstInputsMap;
+import org.openecomp.sdc.be.model.ComponentInstance;
+import org.openecomp.sdc.ci.tests.api.Urls;
+import org.openecomp.sdc.ci.tests.config.Config;
+import org.openecomp.sdc.ci.tests.datatypes.enums.UserRoleEnum;
+import org.openecomp.sdc.ci.tests.datatypes.http.RestResponse;
+import org.openecomp.sdc.ci.tests.utils.Utils;
+import org.openecomp.sdc.ci.tests.utils.general.ElementFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * RestUtils for inputs
+ *
+ * @author il0695
+ */
+public class InputsRestUtils extends BaseRestUtils {
+
+	@SuppressWarnings("unused")
+	private static Logger logger = LoggerFactory.getLogger(InputsRestUtils.class.getName());
+
+	/**
+	 * Add inputs to service
+	 *
+	 * @param component
+	 * @param inputs
+	 * @param userRole
+	 * @return {@link org.openecomp.sdc.ci.tests.datatypes.http.RestResponse}
+	 * @throws Exception
+	 */
+	public static RestResponse addInput(Component component, ComponentInstInputsMap inputs, UserRoleEnum userRole)
+			throws Exception {
+		Config config = Utils.getConfig();
+		String url = String.format(Urls.ADD_INPUTS, config.getCatalogBeHost(), config.getCatalogBePort(),
+				ComponentTypeEnum.findParamByType(component.getComponentType()), component.getUniqueId());
+		String json = new Gson().toJson(inputs);
+		return sendPost(url, json, userRole.getUserId(), acceptHeaderData);
+	}
+
+	/**
+	 * Update inputs to service
+	 *
+	 * @param component
+	 * @param data
+	 * @param userRole
+	 * @return {@link org.openecomp.sdc.ci.tests.datatypes.http.RestResponse}
+	 * @throws Exception
+	 */
+	public static RestResponse updateInput(Component component, String data, UserRoleEnum userRole) throws Exception {
+		Config config = Utils.getConfig();
+		String url = String.format(Urls.UPDATE_INPUTS, config.getCatalogBeHost(), config.getCatalogBePort(),
+				ComponentTypeEnum.findParamByType(component.getComponentType()), component.getUniqueId());
+		return sendPost(url, data, userRole.getUserId(), acceptHeaderData);
+	}
+
+	/**
+	 * Get all Component inputs
+	 *
+	 * @param component
+	 * @return {@link org.openecomp.sdc.ci.tests.datatypes.http.RestResponse}
+	 * @throws Exception
+	 */
+	public static RestResponse getComponentInputs(Component component) throws Exception {
+		Config config = Utils.getConfig();
+		//services/{componentId}/inputs
+		String url = String.format(Urls.GET_COMPONENT_INPUTS, config.getCatalogBeHost(), config.getCatalogBePort(),
+				component.getUniqueId());
+		return sendGet(url, ElementFactory.getDefaultUser(UserRoleEnum.DESIGNER).getUserId());
+	}
+
+	/**
+	 * Get all inputs of component instance
+	 *
+	 * @param parentComponent
+	 * @param componentInstance
+	 * @return {@link org.openecomp.sdc.ci.tests.datatypes.http.RestResponse}
+	 * @throws Exception
+	 */
+	public static RestResponse getComponentInstanceInputs(Component parentComponent,
+														  ComponentInstance componentInstance) throws Exception {
+		Config config = Utils.getConfig();
+		//{componentType}/{componentId}/componentInstances/{instanceId}/{originComonentUid}/inputs
+		String url =
+				String.format(Urls.GET_COMPONENT_INSTANCE_INPUTS, config.getCatalogBeHost(), config.getCatalogBePort(),
+						ComponentTypeEnum.findParamByType(parentComponent.getComponentType()),
+						parentComponent.getUniqueId(), componentInstance.getUniqueId(),
+						componentInstance.getComponentUid());
+		return sendGet(url, ElementFactory.getDefaultUser(UserRoleEnum.DESIGNER).getUserId());
+	}
+
+	/**
+	 * Delete input from component
+	 *
+	 * @param parentComponent
+	 * @param inputId
+	 * @return {@link org.openecomp.sdc.ci.tests.datatypes.http.RestResponse}
+	 * @throws Exception
+	 */
+	public static RestResponse deleteInputFromComponent(Component parentComponent, String inputId) throws Exception {
+		return deleteInputFromComponent(ComponentTypeEnum.findParamByType(parentComponent.getComponentType()),
+				parentComponent.getUniqueId(), inputId);
+	}
+
+	/**
+	 * Delete input from component
+	 *
+	 * @param componentType
+	 * @param componentId
+	 * @param inputUniqueId
+	 * @return {@link org.openecomp.sdc.ci.tests.datatypes.http.RestResponse}
+	 * @throws Exception
+	 */
+	public static RestResponse deleteInputFromComponent(String componentType, String componentId, String inputUniqueId)
+			throws Exception {
+		Config config = Utils.getConfig();
+		//{componentType}/{componentId}/delete/{inputId}/input
+		String url = String.format(Urls.DELETE_INPUT_BY_ID, config.getCatalogBeHost(), config.getCatalogBePort(),
+				componentType, componentId, inputUniqueId);
+		return sendDelete(url, ElementFactory.getDefaultUser(UserRoleEnum.DESIGNER).getUserId());
+	}
+
+}
diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/utils/rest/InterfaceOperationsRestUtils.java b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/utils/rest/InterfaceOperationsRestUtils.java
new file mode 100644
index 0000000000..32e731b94f
--- /dev/null
+++ b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/utils/rest/InterfaceOperationsRestUtils.java
@@ -0,0 +1,79 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * SDC
+ * ================================================================================
+ * 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=========================================================
+ */
+
+package org.openecomp.sdc.ci.tests.utils.rest;
+
+import com.google.gson.Gson;
+import java.io.IOException;
+import java.util.Map;
+import org.openecomp.sdc.be.datatypes.enums.ComponentTypeEnum;
+import org.openecomp.sdc.be.model.Component;
+import org.openecomp.sdc.be.model.User;
+import org.openecomp.sdc.ci.tests.api.Urls;
+import org.openecomp.sdc.ci.tests.config.Config;
+import org.openecomp.sdc.ci.tests.datatypes.http.RestResponse;
+import org.openecomp.sdc.ci.tests.utils.Utils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class InterfaceOperationsRestUtils extends BaseRestUtils {
+
+    @SuppressWarnings("unused")
+    private static Logger logger = LoggerFactory.getLogger(InterfaceOperationsRestUtils.class.getName());
+
+    public static RestResponse addInterfaceOperations(Component component, Map<String, Object> interfaceDefinitionMap,
+            User user) throws IOException {
+        Config config = Utils.getConfig();
+        String url = String.format(Urls.ADD_INTERFACE_OPERATIONS, config.getCatalogBeHost(), config.getCatalogBePort(),
+                ComponentTypeEnum.findParamByType(component.getComponentType()), component.getUniqueId());
+        String jsonBody = new Gson().toJson(interfaceDefinitionMap);
+        return sendPost(url, jsonBody, user.getUserId(), acceptHeaderData);
+    }
+
+    public static RestResponse updateInterfaceOperations(Component component,
+            Map<String, Object> interfaceDefinitionMap, User user) throws IOException {
+        Config config = Utils.getConfig();
+        String url =
+                String.format(Urls.UPDATE_INTERFACE_OPERATIONS, config.getCatalogBeHost(), config.getCatalogBePort(),
+                        ComponentTypeEnum.findParamByType(component.getComponentType()), component.getUniqueId());
+        String jsonBody = new Gson().toJson(interfaceDefinitionMap);
+        return sendPut(url, jsonBody, user.getUserId(), acceptHeaderData);
+    }
+
+    public static RestResponse getInterfaceOperations(Component component, String interfaceId, String operationIds,
+            User user) throws IOException {
+        Config config = Utils.getConfig();
+        String url = String.format(Urls.GET_INTERFACE_OPERATIONS, config.getCatalogBeHost(), config.getCatalogBePort(),
+                ComponentTypeEnum.findParamByType(component.getComponentType()), component.getUniqueId(), interfaceId,
+                operationIds);
+        return sendGet(url, user.getUserId());
+    }
+
+    public static RestResponse deleteInterfaceOperations(Component component, String interfaceId, String operationIds,
+            User user) throws IOException {
+        Config config = Utils.getConfig();
+        String url =
+                String.format(Urls.DELETE_INTERFACE_OPERATIONS, config.getCatalogBeHost(), config.getCatalogBePort(),
+                        ComponentTypeEnum.findParamByType(component.getComponentType()), component.getUniqueId(),
+                        interfaceId, operationIds);
+        return sendDelete(url, user.getUserId());
+    }
+
+}
diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/utils/rest/LifecycleRestUtils.java b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/utils/rest/LifecycleRestUtils.java
new file mode 100644
index 0000000000..72cad8c3ca
--- /dev/null
+++ b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/utils/rest/LifecycleRestUtils.java
@@ -0,0 +1,440 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * SDC
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.sdc.ci.tests.utils.rest;
+
+import org.json.simple.JSONObject;
+import org.openecomp.sdc.be.datatypes.enums.AssetTypeEnum;
+import org.openecomp.sdc.be.datatypes.enums.ComponentTypeEnum;
+import org.openecomp.sdc.be.model.*;
+import org.openecomp.sdc.ci.tests.api.Urls;
+import org.openecomp.sdc.ci.tests.config.Config;
+import org.openecomp.sdc.ci.tests.datatypes.ProductReqDetails;
+import org.openecomp.sdc.ci.tests.datatypes.ResourceReqDetails;
+import org.openecomp.sdc.ci.tests.datatypes.ServiceReqDetails;
+import org.openecomp.sdc.ci.tests.datatypes.enums.LifeCycleStatesEnum;
+import org.openecomp.sdc.ci.tests.datatypes.enums.UserRoleEnum;
+import org.openecomp.sdc.ci.tests.datatypes.http.HttpHeaderEnum;
+import org.openecomp.sdc.ci.tests.datatypes.http.HttpRequest;
+import org.openecomp.sdc.ci.tests.datatypes.http.RestResponse;
+import org.openecomp.sdc.ci.tests.utils.Utils;
+import org.openecomp.sdc.ci.tests.utils.general.ElementFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.util.HashMap;
+import java.util.Map;
+
+public class LifecycleRestUtils extends BaseRestUtils {
+	private static Logger logger = LoggerFactory.getLogger(LifecycleRestUtils.class.getName());
+	public static final String COMMENT = "comment";
+	
+	// External APIs
+	public static RestResponse checkInResource(String resourceUUID, User sdncModifierDetails) throws IOException {
+		String comment = "Chekin resource: " + resourceUUID;
+		return changeLifeCycleOfAsset(resourceUUID, AssetTypeEnum.RESOURCES, LifeCycleStatesEnum.CHECKIN, sdncModifierDetails, comment);
+	}
+	
+	public static RestResponse checkInService(String serviceUUID, User sdncModifierDetails) throws IOException {
+		String comment = "Chekin service: " + serviceUUID;
+		return changeLifeCycleOfAsset(serviceUUID, AssetTypeEnum.SERVICES, LifeCycleStatesEnum.CHECKIN, sdncModifierDetails, comment);
+	}
+	
+	public static RestResponse checkOutResource(String resourceUUID, User sdncModifierDetails) throws IOException {
+		String comment = "CheckOut resource: " + resourceUUID;
+		return changeLifeCycleOfAsset(resourceUUID, AssetTypeEnum.RESOURCES, LifeCycleStatesEnum.CHECKOUT, sdncModifierDetails, comment);
+	}
+	
+	public static RestResponse checkOutService(String serviceUUID, User sdncModifierDetails) throws IOException {
+		String comment = "CheckOut service: " + serviceUUID;
+		return changeLifeCycleOfAsset(serviceUUID, AssetTypeEnum.SERVICES, LifeCycleStatesEnum.CHECKOUT, sdncModifierDetails, comment);
+	}
+	
+	public static RestResponse certificationRequestService(String serviceUUID, User sdncModifierDetails) throws IOException {
+		String comment = "Certification request service: " + serviceUUID;
+		return changeLifeCycleOfAsset(serviceUUID, AssetTypeEnum.SERVICES, LifeCycleStatesEnum.CERTIFICATIONREQUEST, sdncModifierDetails, comment);
+	}
+	
+	/*public static RestResponse certificationRequestResource(String resourceUUID, User sdncModifierDetails) throws IOException {
+		String comment = "Certification request resource: " + resourceUUID;
+		return changeLifeCycleOfAsset(resourceUUID, AssetTypeEnum.RESOURCES, LifeCycleStatesEnum.CERTIFICATIONREQUEST, sdncModifierDetails, comment);
+	}*/
+	
+	public static RestResponse startTestingService(String serviceUUID, User sdncModifierDetails) throws IOException {
+		String comment = "Start testing request service: " + serviceUUID;
+		return changeLifeCycleOfAsset(serviceUUID, AssetTypeEnum.SERVICES, LifeCycleStatesEnum.STARTCERTIFICATION, sdncModifierDetails, comment);
+	}
+	
+	public static RestResponse startTestingResource(String resourceUUID, User sdncModifierDetails) throws IOException {
+		String comment = "Start testing request resource: " + resourceUUID;
+		return changeLifeCycleOfAsset(resourceUUID, AssetTypeEnum.RESOURCES, LifeCycleStatesEnum.STARTCERTIFICATION, sdncModifierDetails, comment);
+	}
+	
+	public static RestResponse certifyService(String serviceUUID, User sdncModifierDetails) throws IOException {
+		String comment = "Certify request service: " + serviceUUID;
+		return changeLifeCycleOfAsset(serviceUUID, AssetTypeEnum.SERVICES, LifeCycleStatesEnum.CERTIFY, sdncModifierDetails, comment);
+	}
+	
+	public static RestResponse certifyResource(String resourceUUID, User sdncModifierDetails) throws IOException {
+		String comment = "Certify request resource: " + resourceUUID;
+		return changeLifeCycleOfAsset(resourceUUID, AssetTypeEnum.RESOURCES, LifeCycleStatesEnum.CERTIFY, sdncModifierDetails, comment);
+	}
+	
+	
+	
+	
+	
+	private static RestResponse changeLifeCycleOfAsset(String assetUUID, AssetTypeEnum assetTypeEnum, LifeCycleStatesEnum lifeCycleStatesEnum, User sdncModifierDetails, String comment) throws IOException {
+		Config config = Utils.getConfig();
+		String url = String.format(Urls.POST_EXTERNAL_API_CHANGE_LIFE_CYCLE_OF_ASSET, config.getCatalogBeHost(), config.getCatalogBePort(), assetTypeEnum.getValue(), assetUUID, lifeCycleStatesEnum.getState());
+		
+		Map<String, String> additionalHeaders = new HashMap<>();
+		
+		additionalHeaders.put(HttpHeaderEnum.AUTHORIZATION.getValue(), authorizationHeader);
+		additionalHeaders.put(HttpHeaderEnum.X_ECOMP_INSTANCE_ID.getValue(), BaseRestUtils.xEcompInstanceId);
+
+		String jsonBody = "{\"userRemarks\": \"" + comment + "\"}";
+
+		RestResponse res = sendPost(url, jsonBody, sdncModifierDetails.getUserId(), acceptHeaderData, additionalHeaders);
+
+		return res;
+	}
+	
+	////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+
+	public static RestResponse changeResourceState(ResourceReqDetails resourceDetails, User sdncModifierDetails,
+			String version, LifeCycleStatesEnum LifeCycleStatesEnum) throws IOException {
+		return changeResourceState(resourceDetails, sdncModifierDetails, LifeCycleStatesEnum,
+				createLifecycleCommentJson(COMMENT));
+	}
+
+	public static RestResponse changeResourceState(ResourceReqDetails resourceDetails, User sdncModifierDetails,
+			String version, LifeCycleStatesEnum LifeCycleStatesEnum, String LifecycleChangeInfo) throws IOException {
+
+		return changeResourceState(resourceDetails, sdncModifierDetails, LifeCycleStatesEnum, LifecycleChangeInfo);
+
+	}
+
+	public static RestResponse changeResourceState(ResourceReqDetails resourceDetails, User sdncModifierDetails,
+			LifeCycleStatesEnum LifeCycleStatesEnum) throws IOException {
+
+		return changeResourceState(resourceDetails, sdncModifierDetails, LifeCycleStatesEnum,
+				createLifecycleCommentJson(COMMENT));
+
+	}
+
+	public static RestResponse changeResourceState(ResourceReqDetails resourceDetails, String modifierUserId,
+			LifeCycleStatesEnum LifeCycleStatesEnum) throws IOException {
+		User user = new User();
+		user.setUserId(modifierUserId);
+		return changeResourceState(resourceDetails, user, LifeCycleStatesEnum, createLifecycleCommentJson(COMMENT));
+	}
+
+	private static RestResponse changeResourceState(ResourceReqDetails resourceDetails, User sdncModifierDetails,
+			LifeCycleStatesEnum LifeCycleStatesEnum, String LifecycleChangeInfo) throws IOException {
+		Config config = Utils.getConfig();
+		String url = String.format(Urls.CHANGE_RESOURCE_LIFECYCLE_STATE, config.getCatalogBeHost(),
+				config.getCatalogBePort(), resourceDetails.getUniqueId(), LifeCycleStatesEnum);
+		// System.out.println("url: " + url);
+
+		RestResponse LifeCycleStatesEnumResourceResponse = sendPost(url, LifecycleChangeInfo,
+				sdncModifierDetails.getUserId(), acceptHeaderData);
+		if (LifeCycleStatesEnumResourceResponse.getErrorCode() == STATUS_CODE_SUCCESS) {
+			String stateFromJsonResponse = ResponseParser
+					.getValueFromJsonResponse(LifeCycleStatesEnumResourceResponse.getResponse(), "lifecycleState");
+			resourceDetails.setVersion(ResponseParser.getVersionFromResponse(LifeCycleStatesEnumResourceResponse));
+			resourceDetails.setUniqueId(ResponseParser.getUniqueIdFromResponse(LifeCycleStatesEnumResourceResponse));
+			if (stateFromJsonResponse != null) {
+				resourceDetails.setLifecycleState(LifecycleStateEnum.valueOf(stateFromJsonResponse));
+			}
+		}
+		return LifeCycleStatesEnumResourceResponse;
+	}
+
+	public static RestResponse changeServiceState(ServiceReqDetails serviceDetails, User sdncModifierDetails,
+			String version, LifeCycleStatesEnum LifeCycleStatesEnum) throws Exception {
+		{
+			return changeServiceState(serviceDetails, sdncModifierDetails, version, LifeCycleStatesEnum,
+					createLifecycleCommentJson(COMMENT));
+		}
+	}
+
+	public static RestResponse changeServiceState(ServiceReqDetails serviceDetails, User sdncModifierDetails,
+			LifeCycleStatesEnum LifeCycleStatesEnum) throws Exception {
+		{
+			return changeServiceState(serviceDetails, sdncModifierDetails, null, LifeCycleStatesEnum,
+					createLifecycleCommentJson(COMMENT));
+		}
+	}
+
+	public static RestResponse changeServiceState(ServiceReqDetails serviceDetails, User sdncModifierDetails,
+			LifeCycleStatesEnum LifeCycleStatesEnum, String lifecycleChangeInfo) throws Exception {
+		{
+			return changeServiceState(serviceDetails, sdncModifierDetails, null, LifeCycleStatesEnum,
+					lifecycleChangeInfo);
+		}
+	}
+
+	public static RestResponse changeServiceState(ServiceReqDetails serviceDetails, User sdncModifierDetails,
+			String version, LifeCycleStatesEnum LifeCycleStatesEnum, String lifecycleChangeInfo) throws Exception {
+
+		Config config = Utils.getConfig();
+		Map<String, String> headersMap = prepareHeadersMap(sdncModifierDetails);
+		HttpRequest http = new HttpRequest();
+		String url = String.format(Urls.CHANGE_SERVICE_LIFECYCLE_STATE, config.getCatalogBeHost(),
+				config.getCatalogBePort(), serviceDetails.getUniqueId(), LifeCycleStatesEnum);
+		// System.out.println("url: " + url);
+		RestResponse LifeCycleStatesEnumServiceResponse = http.httpSendPost(url, lifecycleChangeInfo, headersMap);
+		if (LifeCycleStatesEnumServiceResponse.getErrorCode() == STATUS_CODE_SUCCESS) {
+			String serviceUniqueId = ResponseParser
+					.getValueFromJsonResponse(LifeCycleStatesEnumServiceResponse.getResponse(), "uniqueId");
+			serviceDetails.setUniqueId(serviceUniqueId);
+			String serviceVersion = ResponseParser
+					.getValueFromJsonResponse(LifeCycleStatesEnumServiceResponse.getResponse(), "version");
+			serviceDetails.setVersion(serviceVersion);
+			String stateFromJsonResponse = ResponseParser
+					.getValueFromJsonResponse(LifeCycleStatesEnumServiceResponse.getResponse(), "lifecycleState");
+			serviceDetails.setLifecycleState(LifecycleStateEnum.valueOf(stateFromJsonResponse));
+		}
+		return LifeCycleStatesEnumServiceResponse;
+	}
+
+	public static RestResponse changeProductState(Product product, User sdncModifierDetails,
+			LifeCycleStatesEnum LifeCycleStatesEnum, String lifecycleChangeInfo) throws Exception {
+		{
+			return _changeProductState(product, sdncModifierDetails, LifeCycleStatesEnum, lifecycleChangeInfo);
+		}
+	}
+
+	public static RestResponse changeProductState(Product product, User sdncModifierDetails,
+			LifeCycleStatesEnum LifeCycleStatesEnum) throws Exception {
+		{
+			return _changeProductState(product, sdncModifierDetails, LifeCycleStatesEnum, COMMENT);
+		}
+	}
+
+	public static RestResponse changeProductState(ProductReqDetails productDetails, User sdncModifierDetails,
+			LifeCycleStatesEnum LifeCycleStatesEnum) throws Exception {
+		Config config = Utils.getConfig();
+		String url = String.format(Urls.CHANGE_PRODUCT_LIFECYCLE_STATE, config.getCatalogBeHost(),
+				config.getCatalogBePort(), productDetails.getUniqueId(), LifeCycleStatesEnum);
+		RestResponse LifeCycleStatesEnumServiceResponse = sendPost(url, createLifecycleCommentJson(COMMENT),
+				sdncModifierDetails.getUserId(), acceptHeaderData);
+		if (LifeCycleStatesEnumServiceResponse.getErrorCode() == STATUS_CODE_SUCCESS) {
+			String productUniqueId = ResponseParser
+					.getValueFromJsonResponse(LifeCycleStatesEnumServiceResponse.getResponse(), "uniqueId");
+			productDetails.setUniqueId(productUniqueId);
+			String productVersion = ResponseParser
+					.getValueFromJsonResponse(LifeCycleStatesEnumServiceResponse.getResponse(), "version");
+			productDetails.setVersion(productVersion);
+			String newLifecycleState = ResponseParser
+					.getValueFromJsonResponse(LifeCycleStatesEnumServiceResponse.getResponse(), "lifecycleState");
+			productDetails.setLifecycleState(LifecycleStateEnum.valueOf(newLifecycleState));
+		}
+		return LifeCycleStatesEnumServiceResponse;
+
+	}
+
+	public static RestResponse changeComponentState(Component component, User sdncModifierDetails,
+			LifeCycleStatesEnum LifeCycleStatesEnum) throws Exception {
+		Config config = Utils.getConfig();
+		String url = String.format(Urls.CHANGE_COMPONENT_LIFECYCLE_STATE, config.getCatalogBeHost(),
+				config.getCatalogBePort(), ComponentTypeEnum.findParamByType(component.getComponentType()), component.getUniqueId(), LifeCycleStatesEnum);
+		RestResponse LifeCycleStatesEnumServiceResponse = sendPost(url, createLifecycleCommentJson(COMMENT), sdncModifierDetails.getUserId(), acceptHeaderData);
+		if (LifeCycleStatesEnumServiceResponse.getErrorCode() == STATUS_CODE_SUCCESS) {
+			String productUniqueId = ResponseParser.getValueFromJsonResponse(LifeCycleStatesEnumServiceResponse.getResponse(), "uniqueId");
+			component.setUniqueId(productUniqueId);
+			String productVersion = ResponseParser.getValueFromJsonResponse(LifeCycleStatesEnumServiceResponse.getResponse(), "version");
+			component.setVersion(productVersion);
+			String newLifecycleState = ResponseParser.getValueFromJsonResponse(LifeCycleStatesEnumServiceResponse.getResponse(), "lifecycleState");
+			component.setLifecycleState(LifecycleStateEnum.valueOf(newLifecycleState));
+		}
+		return LifeCycleStatesEnumServiceResponse;
+
+	}
+
+	public static RestResponse certifyResource(ResourceReqDetails resourceDetails) throws Exception {
+
+		User designer = ElementFactory.getDefaultUser(UserRoleEnum.DESIGNER);
+		RestResponse restResponseResource = LifecycleRestUtils.changeResourceState(resourceDetails,
+				ElementFactory.getDefaultUser(UserRoleEnum.DESIGNER), LifeCycleStatesEnum.CHECKIN);
+		// if (restResponseResource.getErrorCode() == 200){
+/*		restResponseResource = LifecycleRestUtils.changeResourceState(resourceDetails,
+				ElementFactory.getDefaultUser(UserRoleEnum.DESIGNER), LifeCycleStatesEnum.CERTIFICATIONREQUEST);
+		// }else
+		// return restResponseResource;
+		User testerDetails = ElementFactory.getDefaultUser(UserRoleEnum.TESTER);
+		if (restResponseResource.getErrorCode() == 200) {
+			restResponseResource = LifecycleRestUtils.changeResourceState(resourceDetails, testerDetails,
+					LifeCycleStatesEnum.STARTCERTIFICATION);
+		} else
+			return restResponseResource;*/
+		if (restResponseResource.getErrorCode() == 200) {
+			restResponseResource = LifecycleRestUtils.changeResourceState(resourceDetails, designer,
+					LifeCycleStatesEnum.CERTIFY);
+			if (restResponseResource.getErrorCode() == 200) {
+				String newVersion = ResponseParser.getVersionFromResponse(restResponseResource);
+				resourceDetails.setVersion(newVersion);
+				resourceDetails.setLifecycleState(LifecycleStateEnum.CERTIFIED);
+				resourceDetails.setLastUpdaterUserId(designer.getUserId());
+				resourceDetails.setLastUpdaterFullName(designer.getFullName());
+				String uniqueIdFromRresponse = ResponseParser.getUniqueIdFromResponse(restResponseResource);
+				resourceDetails.setUniqueId(uniqueIdFromRresponse);
+			}
+		}
+		return restResponseResource;
+	}
+
+	public static RestResponse certifyService(ServiceReqDetails serviceDetails) throws Exception {
+		RestResponse restResponseService = LifecycleRestUtils.changeServiceState(serviceDetails,
+				ElementFactory.getDefaultUser(UserRoleEnum.DESIGNER), LifeCycleStatesEnum.CHECKIN);
+		// if (restResponseService.getErrorCode() == 200){
+		restResponseService = LifecycleRestUtils.changeServiceState(serviceDetails,
+				ElementFactory.getDefaultUser(UserRoleEnum.DESIGNER), LifeCycleStatesEnum.CERTIFICATIONREQUEST);
+		// }else
+		// return restResponseService;
+		if (restResponseService.getErrorCode() == 200) {
+			restResponseService = LifecycleRestUtils.changeServiceState(serviceDetails,
+					ElementFactory.getDefaultUser(UserRoleEnum.TESTER), LifeCycleStatesEnum.STARTCERTIFICATION);
+		} else
+			return restResponseService;
+		if (restResponseService.getErrorCode() == 200) {
+			User testerDetails = ElementFactory.getDefaultUser(UserRoleEnum.TESTER);
+			restResponseService = LifecycleRestUtils.changeServiceState(serviceDetails, testerDetails,
+					LifeCycleStatesEnum.CERTIFY);
+			if (restResponseService.getErrorCode() == 200) {
+				String newVersion = ResponseParser.getVersionFromResponse(restResponseService);
+				serviceDetails.setVersion(newVersion);
+				serviceDetails.setLifecycleState(LifecycleStateEnum.CERTIFIED);
+				serviceDetails.setLastUpdaterUserId(testerDetails.getUserId());
+				serviceDetails.setLastUpdaterFullName(testerDetails.getFullName());
+				String uniqueIdFromRresponse = ResponseParser.getUniqueIdFromResponse(restResponseService);
+				serviceDetails.setUniqueId(uniqueIdFromRresponse);
+			}
+		}
+		return restResponseService;
+	}
+
+	private static RestResponse _changeProductState(Product product, User sdncModifierDetails,
+			LifeCycleStatesEnum LifeCycleStatesEnum, String lifecycleChangeInfo) throws Exception {
+
+		Config config = Utils.getConfig();
+		String url = String.format(Urls.CHANGE_PRODUCT_LIFECYCLE_STATE, config.getCatalogBeHost(),
+				config.getCatalogBePort(), product.getUniqueId(), LifeCycleStatesEnum);
+		RestResponse LifeCycleStatesEnumServiceResponse = sendPost(url, createLifecycleCommentJson(lifecycleChangeInfo),
+				sdncModifierDetails.getUserId(), acceptHeaderData);
+
+		return LifeCycleStatesEnumServiceResponse;
+	}
+
+	public static String createLifecycleCommentJson(String commentContent) {
+		String res = null;
+		if (commentContent != null) {
+			res = "{\"userRemarks\": \"" + commentContent + "\"}";
+		}
+		return res;
+	}
+
+	public static void checkLCS_Response(RestResponse response) {
+		checkStatusCode(response, "change lifecycle request failed", false, STATUS_CODE_SUCCESS);
+	}
+
+	private static Map<String, String> prepareHeadersMap(User sdncModifierDetails) {
+		Map<String, String> headersMap = new HashMap<>();
+		headersMap.put(HttpHeaderEnum.CONTENT_TYPE.getValue(), contentTypeHeaderData);
+		headersMap.put(HttpHeaderEnum.ACCEPT.getValue(), acceptHeaderData);
+		headersMap.put(HttpHeaderEnum.USER_ID.getValue(), sdncModifierDetails.getUserId());
+		return headersMap;
+	}
+
+	public static RestResponse changeDistributionStatus(ServiceReqDetails serviceDetails, String version, User user,
+			String userRemarks, DistributionStatusEnum reqDistributionStatus) throws Exception {
+		String uniqueId = serviceDetails.getUniqueId();
+		Config config = Utils.getConfig();
+		String environmentName = "AUTO";
+//		String environmentName = ConfigurationManager.getConfigurationManager().getDistributionEngineConfiguration().getEnvironments().get(0);
+		DistributionStatusEnum distributionStatusEnum = DistributionStatusEnum.findState(reqDistributionStatus.getValue());
+		switch(distributionStatusEnum){
+			case DISTRIBUTED:
+				String url = String.format(Urls.ACTIVATE_DISTRIBUTION, config.getCatalogBeHost(), config.getCatalogBePort(), uniqueId, environmentName);
+				return sendDistrState(user, userRemarks, url);
+			default:
+				return null;	
+			
+		}
+		
+//		if (reqDistributionStatus == DistributionStatusEnum.DISTRIBUTION_APPROVED) {
+//			return sendApproveDistribution(user, uniqueId, userRemarks);
+//		} else if (reqDistributionStatus == DistributionStatusEnum.DISTRIBUTION_REJECTED) {
+//			return rejectDistribution(user, userRemarks, uniqueId);
+//		} else if (reqDistributionStatus == DistributionStatusEnum.DISTRIBUTED) {
+//			Config config = Utils.getConfig();
+//			// String url =
+//			// String.format("http://%s:%s/sdc2/rest/v1/catalog/services/%s/tempUrlToBeDeleted",
+//			// config.getCatalogBeHost(), config.getCatalogBePort(), uniqueId);
+//			String url = String.format(Urls.ACTIVATE_DISTRIBUTION, config.getCatalogBeHost(), config.getCatalogBePort(),
+//					uniqueId, "PROD");
+//			return sendDistrState(user, userRemarks, url);
+//		} else
+//			return null;
+
+	}
+
+	public static RestResponse sendApproveDistribution(User sdncModifierDetails, String uniqueId, String userRemarks)
+			throws FileNotFoundException, IOException {
+		Config config = Utils.getConfig();
+		String url = String.format(Urls.APPROVE_DISTRIBUTION, config.getCatalogBeHost(), config.getCatalogBePort(),
+				uniqueId);
+		return sendDistrState(sdncModifierDetails, userRemarks, url);
+	}
+
+	public static RestResponse rejectDistribution(ServiceReqDetails serviceDetails, String version, User user,
+			String userRemarks) throws Exception {
+		return rejectDistribution(user, userRemarks, serviceDetails.getUniqueId());
+	}
+
+	public static RestResponse rejectDistribution(User user, String userRemarks, String uniqueId)
+			throws FileNotFoundException, IOException {
+		Config config = Utils.getConfig();
+		String url = String.format(Urls.REJECT_DISTRIBUTION, config.getCatalogBeHost(), config.getCatalogBePort(),
+				uniqueId);
+		return sendDistrState(user, userRemarks, url);
+	}
+
+	private static RestResponse sendDistrState(User user, String userRemarks, String url) throws IOException {
+		Map<String, String> headersMap = prepareHeadersMap(user);
+		Map<String, String> userRemarksMap = new HashMap<String, String>();
+		userRemarksMap.put("userRemarks", userRemarks);
+
+		String serviceBodyJson = new JSONObject().toJSONString(userRemarksMap);
+
+		HttpRequest httpRequest = new HttpRequest();
+		logger.debug(url);
+		logger.debug("Send POST request to create service: {}", url);
+		logger.debug("Service body: {}", serviceBodyJson);
+		logger.debug("Service headers: {}", headersMap);
+		RestResponse rejectDistributionResponse = httpRequest.httpSendPost(url, serviceBodyJson, headersMap);
+
+		return rejectDistributionResponse;
+	}
+
+}
diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/utils/rest/ProductRestUtils.java b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/utils/rest/ProductRestUtils.java
new file mode 100644
index 0000000000..1a59a31ddf
--- /dev/null
+++ b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/utils/rest/ProductRestUtils.java
@@ -0,0 +1,195 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * SDC
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.sdc.ci.tests.utils.rest;
+
+import com.google.gson.Gson;
+import org.openecomp.sdc.be.datatypes.enums.ComponentTypeEnum;
+import org.openecomp.sdc.be.model.LifecycleStateEnum;
+import org.openecomp.sdc.be.model.Product;
+import org.openecomp.sdc.be.model.User;
+import org.openecomp.sdc.ci.tests.api.Urls;
+import org.openecomp.sdc.ci.tests.config.Config;
+import org.openecomp.sdc.ci.tests.datatypes.ProductReqDetails;
+import org.openecomp.sdc.ci.tests.datatypes.enums.LifeCycleStatesEnum;
+import org.openecomp.sdc.ci.tests.datatypes.enums.UserRoleEnum;
+import org.openecomp.sdc.ci.tests.datatypes.http.RestResponse;
+import org.openecomp.sdc.ci.tests.utils.Utils;
+import org.openecomp.sdc.ci.tests.utils.general.ElementFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.io.IOException;
+
+public class ProductRestUtils extends BaseRestUtils {
+	private static Gson gson = new Gson();
+	private static Logger logger = LoggerFactory.getLogger(ProductRestUtils.class.getName());
+
+	public static RestResponse createProduct(ProductReqDetails product, User user) throws Exception {
+		Config config = Utils.getConfig();
+		String url = String.format(Urls.CREATE_PRODUCT, config.getCatalogBeHost(), config.getCatalogBePort());
+		String serviceBodyJson = gson.toJson(product);
+
+		logger.debug("Send POST request to create service: {}", url);
+		logger.debug("Service body: {}", serviceBodyJson);
+
+		RestResponse res = sendPost(url, serviceBodyJson, user.getUserId(), acceptHeaderData);
+		if (res.getErrorCode() == STATUS_CODE_CREATED) {
+			product.setUniqueId(ResponseParser.getUniqueIdFromResponse(res));
+			product.setVersion(ResponseParser.getVersionFromResponse(res));
+			product.setUUID(ResponseParser.getUuidFromResponse(res));
+			// Creator details never change after component is created - Ella,
+			// 12/1/2016
+			product.setCreatorUserId(user.getUserId());
+			product.setCreatorFullName(user.getFullName());
+			product.setLastUpdaterFullName(user.getFullName());
+			product.setLastUpdaterUserId(user.getUserId());
+			product.setLastUpdaterFullName(user.getFullName());
+			product.setLifecycleState(LifecycleStateEnum.NOT_CERTIFIED_CHECKOUT);
+			product.setVersion("0.1");
+			String lastUpdate = ResponseParser.getValueFromJsonResponse(res.getResponse(), "lastUpdateDate");
+			product.setLastUpdateDate(Long.parseLong(lastUpdate, 10));
+			product.setCreationDate(Long.parseLong(lastUpdate, 10));
+		}
+		return res;
+	}
+
+	public static RestResponse updateProduct(ProductReqDetails product, User user) throws Exception {
+		Config config = Utils.getConfig();
+		String url = String.format(Urls.UPDATE_PRODUCT, config.getCatalogBeHost(), config.getCatalogBePort(),
+				product.getUniqueId());
+		String serviceBodyJson = gson.toJson(product);
+
+		logger.debug("Send POST request to create service: {}", url);
+		logger.debug("Service body: {}", serviceBodyJson);
+
+		RestResponse res = sendPut(url, serviceBodyJson, user.getUserId(), acceptHeaderData);
+		if (res.getErrorCode() == STATUS_CODE_CREATED) {
+			product.setUniqueId(ResponseParser.getUniqueIdFromResponse(res));
+			product.setVersion(ResponseParser.getVersionFromResponse(res));
+			product.setUUID(ResponseParser.getUuidFromResponse(res));
+			// Creator details never change after component is created - Ella,
+			// 12/1/2016
+			product.setCreatorUserId(user.getUserId());
+			product.setCreatorFullName(user.getFullName());
+			product.setLastUpdaterFullName(user.getFullName());
+			product.setLastUpdaterUserId(user.getUserId());
+			product.setLastUpdaterFullName(user.getFullName());
+			product.setLifecycleState(LifecycleStateEnum.NOT_CERTIFIED_CHECKOUT);
+			String valueFromJsonResponse = ResponseParser.getValueFromJsonResponse(res.getResponse(), "version");
+			product.setVersion(valueFromJsonResponse);
+			String lastUpdate = ResponseParser.getValueFromJsonResponse(res.getResponse(), "lastUpdateDate");
+			product.setLastUpdateDate(Long.parseLong(lastUpdate, 10));
+			product.setCreationDate(Long.parseLong(lastUpdate, 10));
+		}
+		return res;
+	}
+
+	public static RestResponse createProduct_Invalid_Json(String userId) throws Exception {
+		Config config = Utils.getConfig();
+		String url = String.format(Urls.CREATE_PRODUCT, config.getCatalogBeHost(), config.getCatalogBePort());
+
+		RestResponse res = sendPost(url, "kukumuku", userId, acceptHeaderData);
+		return res;
+	}
+
+	public static RestResponse deleteProduct(String id, String userId) throws IOException {
+
+		Config config = Utils.getConfig();
+		String url = String.format(Urls.DELETE_PRODUCT, config.getCatalogBeHost(), config.getCatalogBePort(), id);
+		return sendDelete(url, userId);
+	}
+
+	public static RestResponse getProduct(String productId) throws Exception {
+
+		Config config = Utils.getConfig();
+		String url = String.format(Urls.GET_PRODUCT, config.getCatalogBeHost(), config.getCatalogBePort(), productId);
+		logger.debug("Send GET request to get product: {}", url);
+
+		return sendGet(url, ElementFactory.getDefaultUser(UserRoleEnum.DESIGNER).getUserId());
+	}
+
+	public static RestResponse getProduct(String productId, String userId) throws Exception {
+
+		Config config = Utils.getConfig();
+		String url = String.format(Urls.GET_PRODUCT, config.getCatalogBeHost(), config.getCatalogBePort(), productId);
+		logger.debug("Send GET request to get product: {}", url);
+
+		return sendGet(url, userId);
+	}
+
+	public static RestResponse getFollowed(String userId) throws Exception {
+		Config config = Utils.getConfig();
+		String url = String.format(Urls.GET_FOLLWED_LIST, config.getCatalogBeHost(), config.getCatalogBePort());
+		logger.debug("Send GET request to get user followed page: {}", url);
+		return sendGet(url, userId);
+
+	}
+
+	public static RestResponse changeProductLifeCycle(Product product, User userModifier, LifeCycleStatesEnum lifeCycle)
+			throws Exception {
+		String checkinComment = "my comment";
+		RestResponse changeLifeCycleResponse = LifecycleRestUtils.changeProductState(product, userModifier, lifeCycle,
+				checkinComment);
+		if (changeLifeCycleResponse.getErrorCode() == STATUS_CODE_SUCCESS) {
+			product.setLastUpdaterUserId(userModifier.getUserId());
+			product.setLastUpdaterFullName(userModifier.getFullName());
+			String latestVersion = ResponseParser.getValueFromJsonResponse(changeLifeCycleResponse.getResponse(),
+					"version");
+			product.setVersion(latestVersion);
+			String lifecycleState = ResponseParser.getValueFromJsonResponse(changeLifeCycleResponse.getResponse(),
+					"lifecycleState");
+			product.setLifecycleState((LifecycleStateEnum.valueOf(lifecycleState)));
+			String uniqueId = ResponseParser.getValueFromJsonResponse(changeLifeCycleResponse.getResponse(),
+					"uniqueId");
+			product.setUniqueId(uniqueId);
+			String lastUpdate = ResponseParser.getValueFromJsonResponse(changeLifeCycleResponse.getResponse(),
+					"lastUpdateDate");
+			product.setLastUpdateDate((Long.parseLong(lastUpdate, 10)));
+			String uuid = ResponseParser.getValueFromJsonResponse(changeLifeCycleResponse.getResponse(), "uuid");
+			product.setUUID(uuid);
+		}
+		return changeLifeCycleResponse;
+	}
+
+	public static RestResponse changeServiceInstanceVersion(String componentUniqueId,
+			String serviceInstanceToReplaceUniqueId, String serviceUniqueId, User sdncModifierDetails,
+			ComponentTypeEnum componentType) throws IOException {
+		Config config = Utils.getConfig();
+		String resourceUid = ("{\"componentUid\":\"" + serviceUniqueId + "\"}");
+		String url = String.format(Urls.CHANGE__RESOURCE_INSTANCE_VERSION, config.getCatalogBeHost(),
+				config.getCatalogBePort(), ComponentTypeEnum.findParamByType(componentType), componentUniqueId,
+				serviceInstanceToReplaceUniqueId);
+		RestResponse changeResourceInstanceVersion = sendPost(url, resourceUid, sdncModifierDetails.getUserId(),
+				acceptHeaderData);
+		return changeResourceInstanceVersion;
+
+	}
+
+	public static RestResponse getProductByNameAndVersion(String productName, String productVersion, String userId)
+			throws Exception {
+		Config config = Utils.getConfig();
+		String url = String.format(Urls.GET_PRODUCT_BY_NAME_AND_VERSION, config.getCatalogBeHost(),
+				config.getCatalogBePort(), productName, productVersion);
+		logger.debug("Send GET request to get product by name and version: {}", url);
+		return sendGet(url, userId);
+	}
+
+}
diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/utils/rest/PropertyRestUtils.java b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/utils/rest/PropertyRestUtils.java
new file mode 100644
index 0000000000..34a158fe74
--- /dev/null
+++ b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/utils/rest/PropertyRestUtils.java
@@ -0,0 +1,383 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * SDC
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.sdc.ci.tests.utils.rest;
+
+import static org.testng.AssertJUnit.assertNotNull;
+import static org.testng.AssertJUnit.assertNull;
+import static org.testng.AssertJUnit.assertTrue;
+
+import com.google.gson.Gson;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.openecomp.sdc.be.datatypes.enums.ComponentTypeEnum;
+import org.openecomp.sdc.be.model.Component;
+import org.openecomp.sdc.be.model.ComponentInstance;
+import org.openecomp.sdc.be.model.ComponentInstanceInput;
+import org.openecomp.sdc.be.model.ComponentInstanceProperty;
+import org.openecomp.sdc.be.model.PropertyDefinition;
+import org.openecomp.sdc.be.model.Resource;
+import org.openecomp.sdc.be.model.Service;
+import org.openecomp.sdc.be.model.User;
+import org.openecomp.sdc.ci.tests.api.Urls;
+import org.openecomp.sdc.ci.tests.config.Config;
+import org.openecomp.sdc.ci.tests.datatypes.PropertyObject;
+import org.openecomp.sdc.ci.tests.datatypes.http.HttpHeaderEnum;
+import org.openecomp.sdc.ci.tests.datatypes.http.HttpRequest;
+import org.openecomp.sdc.ci.tests.datatypes.http.RestResponse;
+import org.openecomp.sdc.common.util.GeneralUtility;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class PropertyRestUtils extends BaseRestUtils {
+	private static Logger logger = LoggerFactory.getLogger(PropertyRestUtils.class.getName());
+
+	public static RestResponse createProperty(String resourceId, String body, User user) throws Exception {
+		Config config = Config.instance();
+		String url = String.format(Urls.CREATE_PROPERTY, config.getCatalogBeHost(), config.getCatalogBePort(), resourceId);
+
+		return sendPost(url, body, user.getUserId(), acceptHeaderData);
+	}
+
+	public static RestResponse addValueToProperty(String resourceId, String body, User user) throws Exception {
+		Config config = Config.instance();
+		String url = String.format(Urls.CREATE_PROPERTY, config.getCatalogBeHost(), config.getCatalogBePort(), resourceId);
+
+		return sendPut(url, body, user.getUserId(), acceptHeaderData);
+	}
+
+	public static RestResponse createServiceProperty(String resourceId, String body, User user) throws Exception {
+		Config config = Config.instance();
+		String url = String.format(Urls.CREATE_SERVICE_PROPERTY, config.getCatalogBeHost(), config.getCatalogBePort(),
+				resourceId);
+
+		return sendPost(url, body, user.getUserId(), acceptHeaderData);
+	}
+
+	public static RestResponse updateProperty(String resourceId, String propertyId, String body, User user)
+			throws Exception {
+		Config config = Config.instance();
+
+		String url = String.format(Urls.UPDATE_PROPERTY, config.getCatalogBeHost(), config.getCatalogBePort(),
+				resourceId, propertyId);
+		return sendPut(url, body, user.getUserId(), acceptHeaderData);
+	}
+
+	public static RestResponse updateGroupProperty(Component component, String groupId, String body, User user)
+			throws Exception {
+		Config config = Config.instance();
+
+		String url = String.format(Urls.RESOURCE_GROUP_PROPERTY, config.getCatalogBeHost(), config.getCatalogBePort(), component.getUniqueId(), groupId);
+		return sendPut(url, body, user.getUserId(), acceptHeaderData);
+	}
+
+	public static RestResponse getProperty(String resourceId, String propertyId, User user) throws Exception {
+		Config config = Config.instance();
+		String url = String.format(Urls.GET_PROPERTY, config.getCatalogBeHost(), config.getCatalogBePort(), resourceId,
+				propertyId);
+		return sendGet(url, user.getUserId());
+	}
+
+	public static RestResponse deleteProperty(String resourceId, String propertyId, User user) throws Exception {
+		Config config = Config.instance();
+		String url = String.format(Urls.DELETE_PROPERTY, config.getCatalogBeHost(), config.getCatalogBePort(),
+				resourceId, propertyId);
+
+		return sendDelete(url, user.getUserId());
+	}
+
+	public static ComponentInstanceProperty getPropFromListByPropNameAndType(List<ComponentInstanceProperty> propList,
+																			 String propNameToUpdate, String propTypeToUpdate) {
+		for (ComponentInstanceProperty componentInstanceProperty : propList) {
+			if (componentInstanceProperty.getName().equals(propNameToUpdate)
+					&& componentInstanceProperty.getType().equals(propTypeToUpdate)) {
+				return componentInstanceProperty;
+			}
+		}
+		return null;
+	}
+
+	public static ComponentInstanceProperty getPropFromListByPropNameTypeAndPath(
+			List<ComponentInstanceProperty> propList, String propNameToUpdate, String propTypeToUpdate,
+			List<String> path) {
+		for (ComponentInstanceProperty componentInstanceProperty : propList) {
+			if (componentInstanceProperty.getPath() == null) {
+				return getPropFromListByPropNameAndType(propList, propNameToUpdate, propTypeToUpdate);
+			}
+			if (componentInstanceProperty.getName().equals(propNameToUpdate)
+					&& componentInstanceProperty.getType().equals(propTypeToUpdate)
+					&& path.containsAll(componentInstanceProperty.getPath())) {
+				return componentInstanceProperty;
+			}
+		}
+		return null;
+	}
+
+	public static ComponentInstanceProperty getPropFromListByPropIdAndPath(List<ComponentInstanceProperty> propList,
+																		   String propId, List<String> path) {
+
+		for (ComponentInstanceProperty componentInstanceProperty : propList) {
+			if (path != null) {
+				if (componentInstanceProperty.getUniqueId().equals(propId)
+						&& componentInstanceProperty.getPath().equals(path)) {
+					return componentInstanceProperty;
+				}
+			} else {
+				if (componentInstanceProperty.getUniqueId().equals(propId)) {
+					return componentInstanceProperty;
+				}
+			}
+		}
+		return null;
+	}
+
+	public static void comparePropertyLists(List<ComponentInstanceProperty> expectedList,
+											List<ComponentInstanceProperty> actualList, Boolean isUpdate) {
+
+		assertTrue(
+				"list size are not equals, expected size is: " + expectedList.size() + " ,actual: " + actualList.size(),
+				expectedList.size() == actualList.size());
+		Boolean flag = false;
+		for (ComponentInstanceProperty expectedcompInstProp : expectedList) {
+			for (ComponentInstanceProperty actualcompInstProp : actualList) {
+				flag = comparePropertyObjects(expectedcompInstProp, actualcompInstProp, isUpdate);
+				if (flag) {
+					break;
+				}
+			}
+		}
+		// System.out.println("expected: " + expectedList + ", actual: " +
+		// actualList);
+		logger.debug("expected: {}, actual: {}", expectedList, actualList);
+		assertTrue("actual lists does not contain all uniqeIds", flag);
+	}
+
+	public static Boolean comparePropertyObjects(ComponentInstanceProperty expectedCompInstProp,
+												 ComponentInstanceProperty actualCompInstProp, Boolean isUpdate) {
+		String uniqueId = expectedCompInstProp.getUniqueId();
+		String type = expectedCompInstProp.getType();
+		String defaulValue = (String) expectedCompInstProp.getDefaultValue();
+		if (actualCompInstProp.getUniqueId().equals(uniqueId)
+				&& actualCompInstProp.getPath().equals(expectedCompInstProp.getPath())) {
+			assertTrue("expected type is: " + type + " ,actual: " + actualCompInstProp.getType(),
+					actualCompInstProp.getType().equals(type));
+			if (defaulValue == null) {
+				assertTrue(
+						"expected defaulValue is: " + defaulValue + " ,actual: " + actualCompInstProp.getDefaultValue(),
+						actualCompInstProp.getDefaultValue() == defaulValue);
+			} else {
+				assertTrue(
+						"expected defaulValue is: " + defaulValue + " ,actual: " + actualCompInstProp.getDefaultValue(),
+						actualCompInstProp.getDefaultValue().equals(defaulValue));
+			}
+			if (isUpdate) {
+				assertTrue(
+						"actual [Value] parameter " + actualCompInstProp.getName()
+								+ "should equal to expected [Value]: " + actualCompInstProp.getValue() + " ,Value: "
+								+ actualCompInstProp.getValue(),
+						actualCompInstProp.getValue().equals(expectedCompInstProp.getValue()));
+				assertNotNull("valueId is null", actualCompInstProp.getValueUniqueUid());
+			} else {
+				if (defaulValue == null) {
+					assertTrue(
+							"actual [Value] parameter " + actualCompInstProp.getName()
+									+ "should equal to expected [defaultValue]: " + actualCompInstProp.getValue()
+									+ " ,defaultValue: " + actualCompInstProp.getDefaultValue(),
+							actualCompInstProp.getValue() == expectedCompInstProp.getDefaultValue());
+				} else {
+					assertTrue(
+							"actual [Value] parameter " + actualCompInstProp.getName()
+									+ "should equal to expected [defaultValue]: " + actualCompInstProp.getValue()
+									+ " ,defaultValue: " + actualCompInstProp.getDefaultValue(),
+							actualCompInstProp.getValue().equals(expectedCompInstProp.getDefaultValue()));
+				}
+				assertNull("valueId is not null", actualCompInstProp.getValueUniqueUid());
+			}
+			return true;
+		}
+		return false;
+	}
+
+	public static List<ComponentInstanceProperty> addResourcePropertiesToList(Resource resource,
+																			  List<ComponentInstanceProperty> listToFill) {
+		for (PropertyDefinition prop : resource.getProperties()) {
+			listToFill.add(new ComponentInstanceProperty(prop, null, null));
+		}
+		return listToFill;
+	}
+
+	public static List<ComponentInstanceProperty> addComponentInstPropertiesToList(Component component,
+																				   List<ComponentInstanceProperty> listToFill, String componentId) {
+
+		if (componentId != null) {
+			List<ComponentInstanceProperty> list = component.getComponentInstancesProperties().get(componentId);
+			for (ComponentInstanceProperty prop : list) {
+				ComponentInstanceProperty componentInstanceProperty = new ComponentInstanceProperty(prop, null, null);
+				componentInstanceProperty.setPath(prop.getPath());
+				componentInstanceProperty.setValueUniqueUid(prop.getValueUniqueUid());
+				componentInstanceProperty.setValue(prop.getValue());
+				listToFill.add(componentInstanceProperty);
+			}
+		} else {
+			Map<String, List<ComponentInstanceProperty>> componentInstancesProperties = component
+					.getComponentInstancesProperties();
+			for (Map.Entry<String, List<ComponentInstanceProperty>> componentInstanceProperties : componentInstancesProperties
+					.entrySet()) {
+				for (ComponentInstanceProperty prop : componentInstanceProperties.getValue()) {
+					ComponentInstanceProperty componentInstanceProperty = new ComponentInstanceProperty(prop, null,
+							null);
+					componentInstanceProperty.setPath(prop.getPath());
+					componentInstanceProperty.setValueUniqueUid(prop.getValueUniqueUid());
+					componentInstanceProperty.setValue(prop.getValue());
+					listToFill.add(componentInstanceProperty);
+				}
+			}
+		}
+
+		if (component.getComponentType().getValue().equals("Resource")) {
+			for (PropertyDefinition prop : ((Resource) component).getProperties()) {
+				listToFill.add(new ComponentInstanceProperty(prop, null, null));
+			}
+		}
+		return listToFill;
+	}
+
+	public static ComponentInstanceProperty getCompPropInstListByInstIdAndPropName(Component component,
+																				   ComponentInstance componentInstanceDetails, String name, String type) {
+		List<ComponentInstanceProperty> propList = component.getComponentInstancesProperties()
+				.get(componentInstanceDetails.getUniqueId());
+		if (propList != null) {
+			return getPropFromListByPropNameAndType(propList, name, type);
+		}
+		return null;
+	}
+
+	private static void updatePropertyListWithPathParameter(Resource resource, List<String> path,
+															List<ComponentInstanceProperty> expectedPropertyList) {
+		List<PropertyDefinition> propertyList = resource.getProperties();
+		for (PropertyDefinition propertyDefinition : propertyList) {
+			ComponentInstanceProperty propDetailsToRemove = PropertyRestUtils.getPropFromListByPropNameAndType(
+					expectedPropertyList, propertyDefinition.getName(), propertyDefinition.getType());
+			ComponentInstanceProperty propDetailsToAdd = propDetailsToRemove;
+			propDetailsToAdd.setPath(path);
+			expectedPropertyList.remove(propDetailsToRemove);
+			expectedPropertyList.add(propDetailsToAdd);
+		}
+	}
+
+	private static void updatePropertyListWithPathParameterOnCompInst(Service service, List<String> path,
+																	  List<ComponentInstanceProperty> expectedPropertyList) {
+		List<ComponentInstanceProperty> servicePropertyList = new ArrayList<>();
+		servicePropertyList = PropertyRestUtils.addComponentInstPropertiesToList(service, servicePropertyList,
+				path.get(0));
+
+		for (ComponentInstanceProperty serviceCompInstProperty : servicePropertyList) {
+			ComponentInstanceProperty propDetailsToRemove = PropertyRestUtils.getPropFromListByPropNameTypeAndPath(
+					expectedPropertyList, serviceCompInstProperty.getName(), serviceCompInstProperty.getType(),
+					serviceCompInstProperty.getPath());
+			ComponentInstanceProperty propDetailsToAdd = propDetailsToRemove;
+			List<String> tempPathList = new ArrayList<String>();
+			for (String tempPath : path) {
+				tempPathList.add(tempPath);
+			}
+			// path parameter can not contain the same service unique ID twice
+			if (propDetailsToAdd.getPath() != null
+					&& !propDetailsToAdd.getPath().get(0).contains(service.getUniqueId())) {
+				if (!propDetailsToAdd.getPath().containsAll(tempPathList)) {
+					tempPathList.addAll(propDetailsToAdd.getPath());
+				}
+			}
+			propDetailsToAdd.setPath(tempPathList);
+			expectedPropertyList.remove(propDetailsToRemove);
+			expectedPropertyList.add(propDetailsToAdd);
+		}
+	}
+
+	public static void updatePropertyListWithPathOnResource(ComponentInstance componentInstDetails, Resource resource,
+															List<ComponentInstanceProperty> list, Component container) {
+		List<String> path = new ArrayList<>();
+		if (container != null) {
+			List<ComponentInstance> componentInstances = container.getComponentInstances();
+			for (ComponentInstance componentInstance : componentInstances) {
+				if (componentInstance.getNormalizedName().equals(componentInstDetails.getNormalizedName())) {
+					path.add(componentInstance.getUniqueId());
+					break;
+				}
+			}
+
+		} else {
+			path.add(componentInstDetails.getUniqueId());
+		}
+		updatePropertyListWithPathParameter(resource, path, list);
+	}
+
+	public static void updatePropertyListWithPathOnComponentInstance(ComponentInstance componentInstDetails,
+																	 Service service, List<ComponentInstanceProperty> list) {
+		List<String> path = new ArrayList<>();
+		path.add(componentInstDetails.getUniqueId());
+		updatePropertyListWithPathParameterOnCompInst(service, path, list);
+	}
+
+	public static RestResponse declareProporties(Component componentObject, Map<String, List<ComponentInstanceInput>> componentInstancesInputs, User sdncModifierDetails)
+			throws Exception {
+		Config config = Config.instance();
+		String url = String.format(Urls.DECLARE_PROPERTIES, config.getCatalogBeHost(), config.getCatalogBePort(), ComponentTypeEnum.findParamByType(componentObject.getComponentType()), componentObject.getUniqueId());
+		String userId = sdncModifierDetails.getUserId();
+		Map<String, String> headersMap = prepareHeadersMap(userId);
+		Map<String, Object> jsonBuilder = new HashMap<>();
+		jsonBuilder.put("componentInstanceInputsMap", componentInstancesInputs);
+		Gson gson = new Gson();
+		String userBodyJson = gson.toJson(jsonBuilder);
+		String calculateMD5 = GeneralUtility.calculateMD5Base64EncodedByString(userBodyJson);
+		headersMap.put(HttpHeaderEnum.Content_MD5.getValue(), calculateMD5);
+		HttpRequest http = new HttpRequest();
+		// System.out.println(url);
+		// System.out.println(userBodyJson);
+		RestResponse declareProportiesResponse = http.httpSendPost(url, userBodyJson, headersMap);
+		if (declareProportiesResponse.getErrorCode() == STATUS_CODE_GET_SUCCESS) {
+
+		}
+		return declareProportiesResponse;
+	}
+
+	public static RestResponse updateInput(Component componentObject, PropertyObject componentInput, User sdncModifierDetails)
+			throws Exception {
+		Config config = Config.instance();
+		String url = String.format(Urls.UPDATE_INPUT, config.getCatalogBeHost(), config.getCatalogBePort(), componentObject.getUniqueId());
+		String userId = sdncModifierDetails.getUserId();
+		Map<String, String> headersMap = prepareHeadersMap(userId);
+		Gson gson = new Gson();
+		String userBodyJson = gson.toJson(componentInput);
+		String calculateMD5 = GeneralUtility.calculateMD5Base64EncodedByString(userBodyJson);
+		headersMap.put(HttpHeaderEnum.Content_MD5.getValue(), calculateMD5);
+		HttpRequest http = new HttpRequest();
+		// System.out.println(url);
+		// System.out.println(userBodyJson);
+		RestResponse declareProportiesResponse = http.httpSendPost(url, userBodyJson, headersMap);
+		if (declareProportiesResponse.getErrorCode() == STATUS_CODE_GET_SUCCESS) {
+
+		}
+		return declareProportiesResponse;
+	}
+}
diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/utils/rest/RequirementsUtils.java b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/utils/rest/RequirementsUtils.java
new file mode 100644
index 0000000000..4be1d941ce
--- /dev/null
+++ b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/utils/rest/RequirementsUtils.java
@@ -0,0 +1,75 @@
+/*
+ * Copyright © 2016-2018 European Support Limited
+ *
+ * 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.
+ */
+
+package org.openecomp.sdc.ci.tests.utils.rest;
+
+import com.google.gson.Gson;
+import org.openecomp.sdc.be.model.User;
+import org.openecomp.sdc.ci.tests.api.Urls;
+import org.openecomp.sdc.ci.tests.config.Config;
+import org.openecomp.sdc.ci.tests.datatypes.RequirementDetails;
+import org.openecomp.sdc.ci.tests.datatypes.http.RestResponse;
+
+import java.util.List;
+
+public class RequirementsUtils extends BaseRestUtils {
+    private static Gson gson = new Gson();
+    private static final String COMPONENT_TYPE = "services";
+
+    public static RestResponse createRequirement(String componentId,
+                                                 List<RequirementDetails> requirementDefinitionList,
+                                                 User user) throws Exception{
+        Config config = Config.instance();
+        String url = String.format(Urls.CREATE_REQUIREMENT, config.getCatalogBeHost(), config.getCatalogBePort(),
+                COMPONENT_TYPE, componentId);
+
+        String data = "{ \"requirements\" : {" + "\"" +requirementDefinitionList.get(0).getCapability()+ "\"" +" : "
+                + gson.toJson(requirementDefinitionList) + "  } }";
+
+        return sendPost(url, data , user.getUserId(), acceptHeaderData);
+    }
+
+    public static RestResponse updateRequirement(String componentId,
+                                                 List<RequirementDetails> requirementDefinitionList,
+                                                 User user) throws Exception{
+        Config config = Config.instance();
+        String url = String.format(Urls.UPDATE_REQUIREMENT, config.getCatalogBeHost(), config.getCatalogBePort(),
+                COMPONENT_TYPE, componentId);
+
+        String data = "{ \"requirements\" : {" + "\"" +requirementDefinitionList.get(0).getCapability()+ "\"" +" : "
+                + gson.toJson(requirementDefinitionList) + "  } }";
+
+        return sendPost(url, data , user.getUserId(), acceptHeaderData);
+    }
+
+    public static RestResponse deleteRequirement(String componentId,
+                                                 String requirementId,
+                                                 User user) throws Exception{
+        Config config = Config.instance();
+        String url = String.format(Urls.DELETE_REQUIREMENT, config.getCatalogBeHost(), config.getCatalogBePort(),
+                COMPONENT_TYPE, componentId, requirementId);
+        return sendDelete(url, user.getUserId());
+    }
+
+    public static RestResponse getRequirement(String componentId,
+                                                 String requirementId,
+                                                 User user) throws Exception{
+        Config config = Config.instance();
+        String url = String.format(Urls.GET_REQUIREMENT, config.getCatalogBeHost(), config.getCatalogBePort(),
+                COMPONENT_TYPE, componentId, requirementId);
+        return sendDelete(url, user.getUserId());
+    }
+}
diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/utils/rest/ResourceRestUtils.java b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/utils/rest/ResourceRestUtils.java
new file mode 100644
index 0000000000..656ece54f0
--- /dev/null
+++ b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/utils/rest/ResourceRestUtils.java
@@ -0,0 +1,668 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * SDC
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.sdc.ci.tests.utils.rest;
+
+import com.google.gson.Gson;
+import com.google.gson.JsonArray;
+import com.google.gson.JsonElement;
+import com.google.gson.JsonParser;
+import org.apache.http.client.ClientProtocolException;
+import org.json.JSONException;
+import org.json.simple.JSONArray;
+import org.json.simple.JSONObject;
+import org.openecomp.sdc.be.datatypes.enums.ComponentTypeEnum;
+import org.openecomp.sdc.be.model.*;
+import org.openecomp.sdc.be.resources.data.RelationshipInstData;
+import org.openecomp.sdc.ci.tests.api.Urls;
+import org.openecomp.sdc.ci.tests.config.Config;
+import org.openecomp.sdc.ci.tests.datatypes.ComponentInstanceReqDetails;
+import org.openecomp.sdc.ci.tests.datatypes.ImportReqDetails;
+import org.openecomp.sdc.ci.tests.datatypes.ResourceReqDetails;
+import org.openecomp.sdc.ci.tests.datatypes.enums.UserRoleEnum;
+import org.openecomp.sdc.ci.tests.datatypes.http.HttpHeaderEnum;
+import org.openecomp.sdc.ci.tests.datatypes.http.HttpRequest;
+import org.openecomp.sdc.ci.tests.datatypes.http.RestResponse;
+import org.openecomp.sdc.ci.tests.utils.Utils;
+import org.openecomp.sdc.ci.tests.utils.general.ElementFactory;
+import org.openecomp.sdc.common.util.GeneralUtility;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import static org.testng.AssertJUnit.assertEquals;
+
+public class ResourceRestUtils extends BaseRestUtils {
+	private static Logger logger = LoggerFactory.getLogger(ResourceRestUtils.class.getName());
+
+	// ****** CREATE *******
+
+	public static RestResponse createResource(ResourceReqDetails resourceDetails, User sdncModifierDetails)
+			throws Exception {
+
+		Config config = Utils.getConfig();
+		String url = String.format(Urls.CREATE_RESOURCE, config.getCatalogBeHost(), config.getCatalogBePort());
+
+		String userId = sdncModifierDetails.getUserId();
+
+		Map<String, String> headersMap = prepareHeadersMap(userId);
+
+		Gson gson = new Gson();
+		String userBodyJson = gson.toJson(resourceDetails);
+		String calculateMD5 = GeneralUtility.calculateMD5Base64EncodedByString(userBodyJson);
+		headersMap.put(HttpHeaderEnum.Content_MD5.getValue(), calculateMD5);
+		HttpRequest http = new HttpRequest();
+		RestResponse createResourceResponse = http.httpSendPost(url, userBodyJson, headersMap);
+		if (createResourceResponse.getErrorCode() == STATUS_CODE_CREATED) {
+			resourceDetails.setUUID(ResponseParser.getUuidFromResponse(createResourceResponse));
+			resourceDetails.setVersion(ResponseParser.getVersionFromResponse(createResourceResponse));
+			resourceDetails.setUniqueId(ResponseParser.getUniqueIdFromResponse(createResourceResponse));
+			String lastUpdaterUserId = ResponseParser.getValueFromJsonResponse(createResourceResponse.getResponse(),
+					"lastUpdaterUserId");
+			resourceDetails.setLastUpdaterUserId(lastUpdaterUserId);
+			String lastUpdaterFullName = ResponseParser.getValueFromJsonResponse(createResourceResponse.getResponse(),
+					"lastUpdaterFullName");
+			resourceDetails.setLastUpdaterFullName(lastUpdaterFullName);
+			// Creator details never change after component is created - Ella,
+			// 12/1/2016
+			resourceDetails.setCreatorUserId(userId);
+			resourceDetails.setCreatorFullName(sdncModifierDetails.getFullName());
+		}
+		return createResourceResponse;
+
+	}
+
+	public static RestResponse createImportResource(ImportReqDetails importReqDetails, User sdncModifierDetails,
+			Map<String, String> additionalHeaders) throws JSONException, IOException {
+
+		Config config = Utils.getConfig();
+		String url = String.format(Urls.CREATE_RESOURCE, config.getCatalogBeHost(), config.getCatalogBePort());
+		String userId = sdncModifierDetails.getUserId();
+
+		Gson gson = new Gson();
+		String resourceImportBodyJson = gson.toJson(importReqDetails);
+		HttpRequest http = new HttpRequest();
+
+		Map<String, String> headersMap = prepareHeadersMap(userId);
+		if (additionalHeaders != null) {
+			headersMap.putAll(additionalHeaders);
+		} else {
+			headersMap.put(HttpHeaderEnum.Content_MD5.getValue(), ArtifactRestUtils.calculateMD5(resourceImportBodyJson));
+		}
+
+		RestResponse createResourceResponse = http.httpSendPost(url, resourceImportBodyJson, headersMap);
+		if (createResourceResponse.getErrorCode() == STATUS_CODE_CREATED) {
+			importReqDetails.setVersion(ResponseParser.getVersionFromResponse(createResourceResponse));
+			importReqDetails.setUniqueId(ResponseParser.getUniqueIdFromResponse(createResourceResponse));
+			// Creator details never change after component is created - Ella,
+			// 12/1/2016
+			importReqDetails.setCreatorUserId(userId);
+			importReqDetails.setCreatorFullName(sdncModifierDetails.getFullName());
+			importReqDetails
+					.setToscaResourceName(ResponseParser.getToscaResourceNameFromResponse(createResourceResponse));
+			importReqDetails.setDerivedList(ResponseParser.getDerivedListFromJson(createResourceResponse));
+		}
+		return createResourceResponse;
+
+	}
+
+	// ***** DELETE ****
+	public static RestResponse deleteResource(ResourceReqDetails resourceDetails, User sdncModifierDetails,
+			String version) throws IOException {
+
+		if (resourceDetails.getUniqueId() != null) {
+			Config config = Utils.getConfig();
+			String url = String.format(Urls.DELETE_RESOURCE_BY_NAME_AND_VERSION, config.getCatalogBeHost(),
+					config.getCatalogBePort(), resourceDetails.getName(), version);
+			return sendDelete(url, sdncModifierDetails.getUserId());
+		} else {
+			return null;
+		}
+
+	}
+
+	public static RestResponse markResourceToDelete(String resourceId, String userId) throws IOException {
+
+		Config config = Utils.getConfig();
+		String url = String.format(Urls.DELETE_RESOURCE, config.getCatalogBeHost(), config.getCatalogBePort(),
+				resourceId);
+		RestResponse sendDelete = sendDelete(url, userId);
+
+		return sendDelete;
+
+	}
+
+	public static RestResponse deleteResource(String resourceId, String userId) throws IOException {
+
+		Config config = Utils.getConfig();
+		String url = String.format(Urls.DELETE_RESOURCE, config.getCatalogBeHost(), config.getCatalogBePort(),
+				resourceId);
+		RestResponse sendDelete = sendDelete(url, userId);
+
+		deleteMarkedResources(userId);
+
+		return sendDelete;
+
+	}
+
+	public static void deleteMarkedResources(String userId) throws IOException {
+		String url;
+		Config config = Utils.getConfig();
+		url = String.format(Urls.DELETE_MARKED_RESOURCES, config.getCatalogBeHost(), config.getCatalogBePort());
+		sendDelete(url, userId);
+	}
+
+	public static RestResponse deleteResourceByNameAndVersion(User sdncModifierDetails, String resourceName,
+			String resourceVersion) throws IOException {
+		Config config = Utils.getConfig();
+		String url = String.format(Urls.DELETE_RESOURCE_BY_NAME_AND_VERSION, config.getCatalogBeHost(),
+				config.getCatalogBePort(), resourceName, resourceVersion);
+		RestResponse sendDelete = sendDelete(url, sdncModifierDetails.getUserId());
+
+		deleteMarkedResources(sdncModifierDetails.getUserId());
+
+		return sendDelete;
+	}
+
+	public static Boolean deleteResourceByNameAndVersion(String resourceName, String resourceVersion)
+			throws IOException {
+		RestResponse deleteResponse = ResourceRestUtils.deleteResourceByNameAndVersion(
+				ElementFactory.getDefaultUser(UserRoleEnum.ADMIN), resourceName, resourceVersion);
+		return checkErrorCode(deleteResponse);
+	}
+
+	public static Boolean removeResource(String resourceId)
+			throws FileNotFoundException, IOException, ClientProtocolException {
+		RestResponse response = deleteResource(resourceId,
+				ElementFactory.getDefaultUser(UserRoleEnum.ADMIN).getUserId());
+		return checkErrorCode(response);
+	}
+
+	// ************** GET *************
+	public static RestResponse getResource(User sdncModifierDetails, String uniqueId) throws IOException {
+
+		Config config = Utils.getConfig();
+		String url = String.format(Urls.GET_RESOURCE, config.getCatalogBeHost(), config.getCatalogBePort(), uniqueId);
+		return sendGet(url, sdncModifierDetails.getUserId());
+	}
+
+	public static RestResponse getModule(User sdncModifierDetails, String componentId, String moduleId)
+			throws IOException {
+		Config config = Utils.getConfig();
+		String url = String.format(Urls.GET_MODULE_BY_ID, config.getCatalogBeHost(), config.getCatalogBePort(),
+				componentId, moduleId);
+		return sendGet(url, sdncModifierDetails.getUserId());
+	}
+
+	public static RestResponse getLatestResourceFromCsarUuid(User sdncModifierDetails, String csarUuid)
+			throws IOException {
+
+		Config config = Utils.getConfig();
+		String url = String.format(Urls.GET_RESOURCE_BY_CSAR_UUID, config.getCatalogBeHost(), config.getCatalogBePort(),
+				csarUuid);
+		return sendGet(url, sdncModifierDetails.getUserId());
+	}
+
+	public static RestResponse getResource(ResourceReqDetails resourceDetails, User sdncModifierDetails)
+			throws IOException {
+
+		Config config = Utils.getConfig();
+		String url = String.format(Urls.GET_RESOURCE, config.getCatalogBeHost(), config.getCatalogBePort(),
+				resourceDetails.getUniqueId());
+		return sendGet(url, sdncModifierDetails.getUserId());
+	}
+
+	public static RestResponse getResourceByNameAndVersion(String userId, String resourceName, String resourceVersion)
+			throws IOException {
+
+		Config config = Utils.getConfig();
+		String url = String.format(Urls.GET_RESOURCE_BY_NAME_AND_VERSION, config.getCatalogBeHost(),
+				config.getCatalogBePort(), resourceName, resourceVersion);
+
+		return sendGet(url, userId);
+	}
+
+	public static RestResponse getResourceList(User sdncModifierDetails) throws IOException {
+
+		Config config = Utils.getConfig();
+		String url = String.format(Urls.GET_FOLLWED_LIST, config.getCatalogBeHost(), config.getCatalogBePort());
+
+		return sendGet(url, sdncModifierDetails.getUserId());
+
+	}
+	
+	public static RestResponse getResourceListFilterByCategory(User sdncModifierDetails, String componentType, String category) throws IOException {
+
+		Config config = Utils.getConfig();
+		String url = String.format(Urls.GET_FILTERED_ASSET_LIST, config.getCatalogBeHost(), config.getCatalogBePort(), componentType, "category=" + category);
+		
+		Map<String, String> headersMap =  prepareHeadersMap(sdncModifierDetails.getUserId());
+		headersMap.put(HttpHeaderEnum.AUTHORIZATION.getValue(), authorizationHeader);
+		headersMap.put(HttpHeaderEnum.X_ECOMP_INSTANCE_ID.getValue(), BaseRestUtils.xEcompInstanceId);
+
+		return sendGet(url, sdncModifierDetails.getUserId(), headersMap);
+
+	}
+	
+	public static RestResponse getResourceListFilterBySubCategory(User sdncModifierDetails, String componentType, String subcategory) throws IOException {
+
+		Config config = Utils.getConfig();
+		String url = String.format(Urls.GET_FILTERED_ASSET_LIST, config.getCatalogBeHost(), config.getCatalogBePort(), componentType, "subCategory=" + subcategory);
+		
+		Map<String, String> headersMap =  prepareHeadersMap(sdncModifierDetails.getUserId());
+		headersMap.put(HttpHeaderEnum.AUTHORIZATION.getValue(), authorizationHeader);
+		headersMap.put(HttpHeaderEnum.X_ECOMP_INSTANCE_ID.getValue(), BaseRestUtils.xEcompInstanceId);
+
+		return sendGet(url, sdncModifierDetails.getUserId(), headersMap);
+
+	}
+	
+	public static RestResponse getResourceListFilterByCriteria(User sdncModifierDetails, String componentType, String criteria, String value) throws IOException {
+
+		Config config = Utils.getConfig();
+		String url = String.format(Urls.GET_FILTERED_ASSET_LIST, config.getCatalogBeHost(), config.getCatalogBePort(), componentType, criteria + "=" + value);
+		
+		Map<String, String> headersMap =  prepareHeadersMap(sdncModifierDetails.getUserId());
+		headersMap.put(HttpHeaderEnum.AUTHORIZATION.getValue(), authorizationHeader);
+		headersMap.put(HttpHeaderEnum.X_ECOMP_INSTANCE_ID.getValue(), BaseRestUtils.xEcompInstanceId);
+
+		return sendGet(url, sdncModifierDetails.getUserId(), headersMap);
+
+	}
+
+	public static RestResponse getResource(String resourceId) throws ClientProtocolException, IOException {
+		return getResource(ElementFactory.getDefaultUser(UserRoleEnum.ADMIN), resourceId);
+	}
+
+	public static RestResponse getLatestResourceFromCsarUuid(String csarUuid)
+			throws ClientProtocolException, IOException {
+		return getLatestResourceFromCsarUuid(ElementFactory.getDefaultUser(UserRoleEnum.ADMIN), csarUuid);
+	}
+
+	public static RestResponse getResourceLatestVersionList(User sdncModifierDetails) throws IOException {
+
+		Config config = Utils.getConfig();
+		String url = String.format(Urls.GET_RESOURCE_lATEST_VERSION, config.getCatalogBeHost(),
+				config.getCatalogBePort());
+
+		return sendGet(url, sdncModifierDetails.getUserId());
+
+	}
+
+	public static RestResponse putAllCategoriesTowardsCatalogFeWithUuidNotAllowed(String uuid) throws IOException {
+
+		Config config = Utils.getConfig();
+		String url = String.format(Urls.GET_ALL_CATEGORIES_FE, config.getCatalogFeHost(), config.getCatalogFePort(),
+				BaseRestUtils.RESOURCE_COMPONENT_TYPE);
+
+		Map<String, String> headersMap = new HashMap<String, String>();
+		headersMap.put(HttpHeaderEnum.CONTENT_TYPE.getValue(), contentTypeHeaderData);
+		headersMap.put(HttpHeaderEnum.ACCEPT.getValue(), acceptHeaderData);
+		headersMap.put(HttpHeaderEnum.X_ECOMP_REQUEST_ID_HEADER.getValue(), uuid);
+		HttpRequest http = new HttpRequest();
+
+		logger.debug("Send PUT request to get all categories (should be 405): {}", url);
+		return http.httpSendByMethod(url, "PUT", null, headersMap);
+	}
+
+	public static RestResponse getAllTagsTowardsCatalogBe() throws IOException {
+
+		Config config = Utils.getConfig();
+		HttpRequest http = new HttpRequest();
+		String url = String.format(Urls.GET_ALL_TAGS, config.getCatalogBeHost(), config.getCatalogBePort());
+
+		Map<String, String> headersMap = new HashMap<String, String>();
+		headersMap.put(HttpHeaderEnum.CONTENT_TYPE.getValue(), contentTypeHeaderData);
+		headersMap.put(HttpHeaderEnum.ACCEPT.getValue(), acceptHeaderData);
+		
+		return http.httpSendGet(url, headersMap);
+
+	}
+
+	public static RestResponse getAllPropertyScopesTowardsCatalogBe() throws IOException {
+
+		Config config = Utils.getConfig();
+		HttpRequest http = new HttpRequest();
+		String url = String.format(Urls.GET_PROPERTY_SCOPES_LIST, config.getCatalogBeHost(), config.getCatalogBePort());
+
+		Map<String, String> headersMap = new HashMap<>();
+		headersMap.put(HttpHeaderEnum.CONTENT_TYPE.getValue(), BaseRestUtils.contentTypeHeaderData);
+		headersMap.put(HttpHeaderEnum.ACCEPT.getValue(), BaseRestUtils.acceptHeaderData);
+		headersMap.put(HttpHeaderEnum.USER_ID.getValue(), "cs0008");
+
+		return http.httpSendGet(url, headersMap);
+
+	}
+
+	public static RestResponse getAllArtifactTypesTowardsCatalogBe() throws IOException {
+
+		Config config = Utils.getConfig();
+		HttpRequest http = new HttpRequest();
+		String url = String.format(Urls.GET_ALL_ARTIFACTS, config.getCatalogBeHost(), config.getCatalogBePort());
+
+		Map<String, String> headersMap = new HashMap<>();
+
+		headersMap.put(HttpHeaderEnum.CONTENT_TYPE.getValue(), acceptJsonHeader);
+		headersMap.put(HttpHeaderEnum.ACCEPT.getValue(), acceptJsonHeader);
+		headersMap.put(HttpHeaderEnum.USER_ID.getValue(), "cs0008");
+
+		return http.httpSendGet(url, headersMap);
+
+	}
+
+	public static RestResponse getConfigurationTowardsCatalogBe() throws IOException {
+
+		Config config = Utils.getConfig();
+		HttpRequest http = new HttpRequest();
+		String url = String.format(Urls.GET_CONFIGURATION, config.getCatalogBeHost(), config.getCatalogBePort());
+
+		Map<String, String> headersMap = new HashMap<>();
+		headersMap.put(HttpHeaderEnum.CONTENT_TYPE.getValue(), acceptJsonHeader);
+		headersMap.put(HttpHeaderEnum.ACCEPT.getValue(), acceptJsonHeader);
+		headersMap.put(HttpHeaderEnum.USER_ID.getValue(), "cs0008");
+
+		return http.httpSendGet(url, headersMap);
+
+	}
+
+	public static RestResponse sendOptionsTowardsCatalogFeWithUuid() throws IOException {
+
+		Config config = Utils.getConfig();
+		String url = String.format(Urls.GET_ALL_CATEGORIES_FE, config.getCatalogFeHost(), config.getCatalogFePort(),
+				BaseRestUtils.RESOURCE_COMPONENT_TYPE);
+
+		Map<String, String> headersMap = new HashMap<String, String>();
+		headersMap.put(HttpHeaderEnum.CONTENT_TYPE.getValue(), contentTypeHeaderData);
+		headersMap.put(HttpHeaderEnum.ACCEPT.getValue(), acceptHeaderData);
+		HttpRequest http = new HttpRequest();
+
+		logger.debug("Send OPTIONS request for categories: {}", url);
+		return http.httpSendByMethod(url, "OPTIONS", null, headersMap);
+	}
+
+	// ********** UPDATE *************
+	public static RestResponse updateResourceMetadata(ResourceReqDetails updatedResourceDetails,
+			User sdncModifierDetails, String uniqueId, String encoding) throws Exception {
+		Config config = Utils.getConfig();
+		String url = String.format(Urls.UPDATE_RESOURCE_METADATA, config.getCatalogBeHost(), config.getCatalogBePort(),
+				uniqueId);
+
+		String ContentTypeString = String.format("%s;%s", contentTypeHeaderData, encoding);
+
+		Gson gson = new Gson();
+		String userBodyJson = gson.toJson(updatedResourceDetails);
+		String userId = sdncModifierDetails.getUserId();
+
+		RestResponse updateResourceResponse = sendPut(url, userBodyJson, userId, ContentTypeString);
+
+		updatedResourceDetails.setVersion(ResponseParser.getVersionFromResponse(updateResourceResponse));
+		updatedResourceDetails.setUniqueId(ResponseParser.getUniqueIdFromResponse(updateResourceResponse));
+
+		return updateResourceResponse;
+	}
+
+	public static RestResponse updateResourceTEST(Resource resource, User sdncModifierDetails, String uniqueId,
+			String encoding) throws Exception {
+		Config config = Utils.getConfig();
+		String url = String.format(Urls.UPDATE_RESOURCE_METADATA, config.getCatalogBeHost(), config.getCatalogBePort(),
+				uniqueId);
+
+		String ContentTypeString = String.format("%s;%s", contentTypeHeaderData, encoding);
+
+		Gson gson = new Gson();
+		String userBodyJson = gson.toJson(resource);
+		String userId = sdncModifierDetails.getUserId();
+
+		RestResponse updateResourceResponse = sendPut(url, userBodyJson, userId, ContentTypeString);
+
+		// String resourceUniqueId =
+		// ResponseParser.getValueFromJsonResponse(updateResourceResponse.getResponse(),
+		// "uniqueId");
+		// updatedResourceDetails.setUniqueId(resourceUniqueId);
+		// String resourceVersion =
+		// ResponseParser.getValueFromJsonResponse(updateResourceResponse.getResponse(),
+		// "version");
+		// updatedResourceDetails.setUniqueId(resourceVersion);
+
+		return updateResourceResponse;
+	}
+
+	public static RestResponse updateResourceMetadata(ResourceReqDetails updatedResourceDetails,
+			User sdncModifierDetails, String uniqueId) throws Exception {
+		return updateResourceMetadata(updatedResourceDetails, sdncModifierDetails, uniqueId, "");
+	}
+
+	public static RestResponse updateResourceMetadata(String json, User sdncModifierDetails, String resourceId)
+			throws IOException {
+		Config config = Utils.getConfig();
+		String url = String.format(Urls.UPDATE_RESOURCE_METADATA, config.getCatalogBeHost(), config.getCatalogBePort(),
+				resourceId);
+		String userId = sdncModifierDetails.getUserId();
+
+		RestResponse updateResourceResponse = sendPut(url, json, userId, contentTypeHeaderData);
+
+		return updateResourceResponse;
+	}
+
+	public static RestResponse updateResource(ResourceReqDetails resourceDetails, User sdncModifierDetails,
+			String resourceId) throws IOException {
+
+		String userId = sdncModifierDetails.getUserId();
+		Config config = Utils.getConfig();
+		String url = String.format(Urls.UPDATE_RESOURCE, config.getCatalogBeHost(), config.getCatalogBePort(),
+				resourceId);
+
+		Map<String, String> headersMap = prepareHeadersMap(userId);
+
+		Gson gson = new Gson();
+		String userBodyJson = gson.toJson(resourceDetails);
+		String calculateMD5 = GeneralUtility.calculateMD5Base64EncodedByString(userBodyJson);
+		headersMap.put(HttpHeaderEnum.Content_MD5.getValue(), calculateMD5);
+		HttpRequest http = new HttpRequest();
+		RestResponse updateResourceResponse = http.httpSendPut(url, userBodyJson, headersMap);
+		if (updateResourceResponse.getErrorCode() == STATUS_CODE_UPDATE_SUCCESS) {
+			resourceDetails.setUUID(ResponseParser.getUuidFromResponse(updateResourceResponse));
+			resourceDetails.setVersion(ResponseParser.getVersionFromResponse(updateResourceResponse));
+			resourceDetails.setUniqueId(ResponseParser.getUniqueIdFromResponse(updateResourceResponse));
+			String lastUpdaterUserId = ResponseParser.getValueFromJsonResponse(updateResourceResponse.getResponse(),
+					"lastUpdaterUserId");
+			resourceDetails.setLastUpdaterUserId(lastUpdaterUserId);
+			String lastUpdaterFullName = ResponseParser.getValueFromJsonResponse(updateResourceResponse.getResponse(),
+					"lastUpdaterFullName");
+			resourceDetails.setLastUpdaterFullName(lastUpdaterFullName);
+			resourceDetails.setCreatorUserId(userId);
+			resourceDetails.setCreatorFullName(sdncModifierDetails.getFullName());
+		}
+		return updateResourceResponse;
+	}
+
+	public static RestResponse createResourceInstance(ResourceReqDetails resourceDetails, User modifier,
+			String vfResourceUniqueId) throws Exception {
+		ComponentInstanceReqDetails resourceInstanceReqDetails = ElementFactory
+				.getComponentResourceInstance(resourceDetails);
+		RestResponse createResourceInstanceResponse = ComponentInstanceRestUtils.createComponentInstance(
+				resourceInstanceReqDetails, modifier, vfResourceUniqueId, ComponentTypeEnum.RESOURCE);
+		ResourceRestUtils.checkCreateResponse(createResourceInstanceResponse);
+		return createResourceInstanceResponse;
+	}
+
+	public static RestResponse associateResourceInstances(JSONObject body, User sdncModifierDetails,
+			Component component) throws IOException {
+
+		Config config = Utils.getConfig();
+		Gson gson = new Gson();
+		String bodyJson = gson.toJson(body);
+		component.getComponentType();
+		String componentType = ComponentTypeEnum.findParamByType(component.getComponentType());
+		String url = String.format(Urls.ASSOCIATE__RESOURCE_INSTANCE, config.getCatalogBeHost(),
+				config.getCatalogBePort(), componentType, component.getUniqueId());
+		return sendPost(url, bodyJson, sdncModifierDetails.getUserId(), null);
+
+	}
+
+	public static RestResponse getFollowedList(User sdncModifierDetails) throws Exception {
+		Config config = Utils.getConfig();
+		String url = String.format(Urls.GET_FOLLWED_LIST, config.getCatalogBeHost(), config.getCatalogBePort());
+		return sendGet(url, sdncModifierDetails.getUserId());
+	}
+
+	public static List<Resource> restResponseToResourceObjectList(String restResponse) {
+		JsonElement jelement = new JsonParser().parse(restResponse);
+		JsonArray jsonArray = jelement.getAsJsonArray();
+		List<Resource> restResponseArray = new ArrayList<>();
+		Resource resource = null;
+		for (int i = 0; i < jsonArray.size(); i++) {
+			String resourceString = (String) jsonArray.get(i).toString();
+			resource = ResponseParser.convertResourceResponseToJavaObject(resourceString);
+			restResponseArray.add(resource);
+		}
+
+		return restResponseArray;
+
+	}
+
+	public static Resource getResourceObjectFromResourceListByUid(List<Resource> resourceList, String uid) {
+		if (resourceList != null && resourceList.size() > 0) {
+			for (Resource resource : resourceList) {
+				if (resource.getUniqueId().equals(uid))
+					return resource;
+			}
+		} else
+			return null;
+		return null;
+	}
+
+	// =======================================resource
+	// associate==================================================
+	public static RestResponse associate2ResourceInstances(Component container, ComponentInstance fromNode,
+			ComponentInstance toNode, String assocType, User sdncUserDetails) throws IOException {
+		return associate2ResourceInstances(container, fromNode.getUniqueId(), toNode.getUniqueId(), assocType,
+				sdncUserDetails);
+	}
+
+	public static RestResponse associate2ResourceInstances(Component component, String fromNode, String toNode,
+			String assocType, User sdncUserDetails) throws IOException {
+
+		RelationshipInstData relationshipInstData = new RelationshipInstData();
+		Map<String, List<CapabilityDefinition>> capabilitiesMap = component.getCapabilities();
+		Map<String, List<RequirementDefinition>> requirementMap = component.getRequirements();
+		List<CapabilityDefinition> capabilitiesList = capabilitiesMap.get(assocType);
+		List<RequirementDefinition> requirementList = requirementMap.get(assocType);
+
+		RequirementDefinition requirementDefinitionFrom = getRequirementDefinitionByOwnerId(requirementList, fromNode);
+		CapabilityDefinition capabilityDefinitionTo = getCapabilityDefinitionByOwnerId(capabilitiesList, toNode);
+		relationshipInstData.setCapabilityOwnerId(capabilityDefinitionTo.getOwnerId());
+		relationshipInstData.setCapabiltyId(capabilityDefinitionTo.getUniqueId());
+		relationshipInstData.setRequirementOwnerId(requirementDefinitionFrom.getOwnerId());
+		relationshipInstData.setRequirementId(requirementDefinitionFrom.getUniqueId());
+
+		JSONObject assocBody = assocBuilder(relationshipInstData, capabilityDefinitionTo, requirementDefinitionFrom,
+				toNode, fromNode);
+		return ResourceRestUtils.associateResourceInstances(assocBody, sdncUserDetails, component);
+
+	}
+
+	private static JSONObject assocBuilder(RelationshipInstData relationshipInstData,
+			CapabilityDefinition capabilityDefinitionTo, RequirementDefinition requirementDefinitionFrom, String toNode,
+			String fromNode) {
+
+		String type = capabilityDefinitionTo.getType();
+		String requirement = requirementDefinitionFrom.getName();
+		String capability = requirementDefinitionFrom.getName();
+
+		JSONObject wrapper = new JSONObject();
+		JSONArray relationshipsArray = new JSONArray();
+		JSONObject relationship = new JSONObject();
+		JSONObject simpleObject = new JSONObject();
+
+		relationship.put("type", type);
+		simpleObject.put("relationship", relationship);
+		simpleObject.put("requirement", requirement);
+		simpleObject.put("capability", capability);
+		simpleObject.put("capabilityUid", relationshipInstData.getCapabiltyId());
+		simpleObject.put("capabilityOwnerId", relationshipInstData.getCapabilityOwnerId());
+		simpleObject.put("requirementOwnerId", relationshipInstData.getRequirementOwnerId());
+		simpleObject.put("requirementUid", relationshipInstData.getRequirementId());
+		relationshipsArray.add(simpleObject);
+
+		ArrayList<Object> relationships = new ArrayList<Object>(relationshipsArray);
+		wrapper.put("fromNode", fromNode);
+		wrapper.put("toNode", toNode);
+		wrapper.put("relationships", relationships);
+		return wrapper;
+
+	}
+
+	private static CapabilityDefinition getCapabilityDefinitionByOwnerId(
+			List<CapabilityDefinition> capabilityDefinitionList, String ownerId) {
+
+		for (CapabilityDefinition capabilityDefinition : capabilityDefinitionList) {
+			if (capabilityDefinition.getOwnerId().equals(ownerId)) {
+				return capabilityDefinition;
+			}
+		}
+		return null;
+	}
+
+	private static RequirementDefinition getRequirementDefinitionByOwnerId(
+			List<RequirementDefinition> requirementDefinitionList, String ownerId) {
+
+		for (RequirementDefinition requirementDefinition : requirementDefinitionList) {
+			if (requirementDefinition.getOwnerId().equals(ownerId)) {
+				return requirementDefinition;
+			}
+		}
+		return null;
+	}
+
+	public static String getRiUniqueIdByRiName(Component component, String resourceInstanceName) {
+
+		List<ComponentInstance> componentInstances = component.getComponentInstances();
+		String name = null;
+		for (ComponentInstance componentInstance : componentInstances) {
+			if (componentInstance.getName().equals(resourceInstanceName)) {
+				name = componentInstance.getUniqueId();
+				break;
+			}
+		}
+		return name;
+	}
+
+	public static Resource convertResourceGetResponseToJavaObject(ResourceReqDetails resourceDetails)
+			throws IOException {
+		RestResponse response = ResourceRestUtils.getResource(resourceDetails,
+				ElementFactory.getDefaultUser(UserRoleEnum.DESIGNER));
+		assertEquals("Check response code after get resource", 200, response.getErrorCode().intValue());
+		return ResponseParser.convertResourceResponseToJavaObject(response.getResponse());
+	}
+
+	public static RestResponse changeResourceInstanceVersion(String containerUniqueId, String instanceToReplaceUniqueId,
+			String newResourceUniqueId, User sdncModifierDetails, ComponentTypeEnum componentType) throws IOException {
+		return ProductRestUtils.changeServiceInstanceVersion(containerUniqueId, instanceToReplaceUniqueId,
+				newResourceUniqueId, sdncModifierDetails, componentType);
+	}
+
+}
diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/utils/rest/ResourceRestUtilsExternalAPI.java b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/utils/rest/ResourceRestUtilsExternalAPI.java
new file mode 100644
index 0000000000..f09b14cc62
--- /dev/null
+++ b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/utils/rest/ResourceRestUtilsExternalAPI.java
@@ -0,0 +1,62 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * SDC
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.sdc.ci.tests.utils.rest;
+
+import com.google.gson.Gson;
+import org.openecomp.sdc.be.model.User;
+import org.openecomp.sdc.ci.tests.api.Urls;
+import org.openecomp.sdc.ci.tests.config.Config;
+import org.openecomp.sdc.ci.tests.datatypes.ResourceExternalReqDetails;
+import org.openecomp.sdc.ci.tests.datatypes.http.HttpHeaderEnum;
+import org.openecomp.sdc.ci.tests.datatypes.http.HttpRequest;
+import org.openecomp.sdc.ci.tests.datatypes.http.RestResponse;
+import org.openecomp.sdc.ci.tests.utils.Utils;
+import org.openecomp.sdc.common.util.GeneralUtility;
+
+import java.util.Map;
+
+public class ResourceRestUtilsExternalAPI extends BaseRestUtils {
+	
+	public static RestResponse createResource(ResourceExternalReqDetails resourceDetails, User sdncModifierDetails)
+			throws Exception {
+
+		Config config = Utils.getConfig();
+		String url = String.format(Urls.POST_EXTERNAL_API_CREATE_RESOURCE, config.getCatalogBeHost(), config.getCatalogBePort());
+
+		String userId = sdncModifierDetails.getUserId();
+		Map<String, String> headersMap = prepareHeadersMap(userId);
+
+		Gson gson = new Gson();
+		String userBodyJson = gson.toJson(resourceDetails);
+		String calculateMD5 = GeneralUtility.calculateMD5Base64EncodedByString(userBodyJson);
+		headersMap.put(HttpHeaderEnum.Content_MD5.getValue(), calculateMD5);
+		headersMap.put(HttpHeaderEnum.AUTHORIZATION.getValue(), authorizationHeader);
+		headersMap.put(HttpHeaderEnum.X_ECOMP_INSTANCE_ID.getValue(), BaseRestUtils.xEcompInstanceId);
+		headersMap.put(HttpHeaderEnum.USER_ID.getValue(), sdncModifierDetails.getUserId());
+		
+		HttpRequest http = new HttpRequest();
+		RestResponse createResourceResponse = http.httpSendPost(url, userBodyJson, headersMap);
+		
+		return createResourceResponse;
+	}
+	
+	
+}
diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/utils/rest/ResponseParser.java b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/utils/rest/ResponseParser.java
new file mode 100644
index 0000000000..5254db84fa
--- /dev/null
+++ b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/utils/rest/ResponseParser.java
@@ -0,0 +1,698 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * SDC
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.sdc.ci.tests.utils.rest;
+
+//import com.fasterxml.jackson.databind.DeserializationFeature;
+//import com.fasterxml.jackson.databind.ObjectMapper;
+//import com.fasterxml.jackson.databind.module.SimpleModule;
+//import com.google.gson.*;
+//import org.apache.commons.codec.binary.Base64;
+//import org.apache.log4j.Logger;
+//import org.codehaus.jackson.JsonNode;
+//
+//import org.json.JSONArray;
+//import org.json.JSONException;
+//import org.json.simple.JSONObject;
+//import org.json.simple.JSONValue;
+//import org.openecomp.sdc.be.model.*;
+//import org.openecomp.sdc.be.model.category.CategoryDefinition;
+//import org.openecomp.sdc.be.model.operations.impl.PropertyOperation.PropertyConstraintJacksonDeserializer;;
+//import org.openecomp.sdc.ci.tests.datatypes.ArtifactReqDetails;
+//import org.openecomp.sdc.ci.tests.datatypes.ResourceAssetStructure;
+//import org.openecomp.sdc.ci.tests.datatypes.ResourceRespJavaObject;
+//import org.openecomp.sdc.ci.tests.datatypes.ServiceDistributionStatus;
+//import org.openecomp.sdc.ci.tests.datatypes.http.RestResponse;
+//import org.openecomp.sdc.ci.tests.tosca.datatypes.VfModuleDefinition;
+//import org.openecomp.sdc.ci.tests.utils.Utils;
+//import org.yaml.snakeyaml.Yaml;
+//
+//import java.io.ByteArrayInputStream;
+//import java.io.IOException;
+//import java.io.InputStream;
+//import java.text.ParseException;
+//import java.util.*;
+
+import com.fasterxml.jackson.databind.DeserializationFeature;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.exc.InvalidFormatException;
+import com.fasterxml.jackson.databind.module.SimpleModule;
+import com.google.gson.*;
+import org.apache.commons.codec.binary.Base64;
+import org.apache.logging.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.json.JSONArray;
+import org.json.JSONException;
+import org.json.simple.JSONObject;
+import org.json.simple.JSONValue;
+import org.openecomp.sdc.be.model.*;
+import org.openecomp.sdc.be.model.category.CategoryDefinition;
+import org.openecomp.sdc.be.model.operations.impl.PropertyOperation;
+import org.openecomp.sdc.ci.tests.datatypes.ArtifactReqDetails;
+import org.openecomp.sdc.ci.tests.datatypes.ResourceAssetStructure;
+import org.openecomp.sdc.ci.tests.datatypes.ResourceRespJavaObject;
+import org.openecomp.sdc.ci.tests.datatypes.ServiceDistributionStatus;
+import org.openecomp.sdc.ci.tests.datatypes.http.RestResponse;
+import org.openecomp.sdc.ci.tests.tosca.datatypes.VfModuleDefinition;
+import org.openecomp.sdc.ci.tests.utils.Utils;
+import org.yaml.snakeyaml.Yaml;
+
+import java.io.ByteArrayInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.text.ParseException;
+import java.util.*;
+
+//import org.codehaus.jackson.JsonNode;
+
+public class ResponseParser {
+
+	// comment by Andrey, for test only
+	// public static void main(String[] args) {
+	// String response =
+	// "{\"uniqueId\":\"52eb0139-a855-47b9-a0e6-c90f0a90b1d2\",\"resourceName\":\"importResource4test\",\"resourceVersion\":\"0.1\",\"creatorUserId\":\"jh0003\",\"creatorFullName\":\"Jimmy
+	// Hendrix\",\"lastUpdaterUserId\":\"jh0003\",\"lastUpdaterFullName\":\"Jimmy
+	// Hendrix\",\"creationDate\":1446742241514,\"lastUpdateDate\":1446742241514,\"description\":\"Represents
+	// a generic software component that can be managed and run by a Compute
+	// Node
+	// Type.\",\"icon\":\"defaulticon\",\"tags\":[\"importResource4test\"],\"category\":\"Generic/Infrastructure\",\"lifecycleState\":\"NOT_CERTIFIED_CHECKOUT\",\"derivedFrom\":[\"tosca.nodes.Root\"],\"artifacts\":{},\"deploymentArtifacts\":{},\"properties\":[{\"uniqueId\":\"52eb0139-a855-47b9-a0e6-c90f0a90b1d2.port\",\"type\":\"integer\",\"required\":false,\"description\":\"the
+	// port the DBMS service will listen to for data and
+	// requests\",\"password\":false,\"name\":\"port\",\"parentUniqueId\":\"52eb0139-a855-47b9-a0e6-c90f0a90b1d2\",\"definition\":true},{\"uniqueId\":\"52eb0139-a855-47b9-a0e6-c90f0a90b1d2.root_password\",\"type\":\"string\",\"required\":false,\"description\":\"the
+	// optional root password for the DBMS
+	// service\",\"password\":false,\"name\":\"root_password\",\"parentUniqueId\":\"52eb0139-a855-47b9-a0e6-c90f0a90b1d2\",\"definition\":true}],\"interfaces\":{\"standard\":{\"type\":\"tosca.interfaces.node.lifecycle.Standard\",\"uniqueId\":\"tosca.interfaces.node.lifecycle.standard\",\"operations\":{\"stop\":{\"uniqueId\":\"tosca.interfaces.node.lifecycle.standard.stop\",\"description\":\"Standard
+	// lifecycle stop
+	// operation.\",\"definition\":false},\"start\":{\"uniqueId\":\"tosca.interfaces.node.lifecycle.standard.start\",\"description\":\"Standard
+	// lifecycle start
+	// operation.\",\"definition\":false},\"delete\":{\"uniqueId\":\"tosca.interfaces.node.lifecycle.standard.delete\",\"description\":\"Standard
+	// lifecycle delete
+	// operation.\",\"definition\":false},\"create\":{\"uniqueId\":\"tosca.interfaces.node.lifecycle.standard.create\",\"description\":\"Standard
+	// lifecycle create
+	// operation.\",\"definition\":false},\"configure\":{\"uniqueId\":\"tosca.interfaces.node.lifecycle.standard.configure\",\"description\":\"Standard
+	// lifecycle configure
+	// operation.\",\"definition\":false}},\"definition\":false}},\"capabilities\":{\"feature\":{\"uniqueId\":\"capability.8313348e-3623-4f4a-9b8f-d2fbadaf9a31.feature\",\"type\":\"tosca.capabilities.Node\"},\"feature2\":{\"uniqueId\":\"capability.52eb0139-a855-47b9-a0e6-c90f0a90b1d2.feature2\",\"type\":\"tosca.capabilities.Node\"}},\"requirements\":{\"dependency\":{\"uniqueId\":\"8313348e-3623-4f4a-9b8f-d2fbadaf9a31.dependency\",\"capability\":\"tosca.capabilities.Node\",\"node\":\"tosca.nodes.Root\",\"relationship\":\"tosca.relationships.DependsOn\"},\"dependency2\":{\"uniqueId\":\"52eb0139-a855-47b9-a0e6-c90f0a90b1d2.dependency2\",\"capability\":\"tosca.capabilities.Node\",\"node\":\"tosca.nodes.importResource4test\",\"relationship\":\"tosca.relationships.DependsOn\"}},\"vendorName\":\"ATT
+	// (Tosca)\",\"vendorRelease\":\"1.0.0.wd03\",\"contactId\":\"jh0003\",\"systemName\":\"Importresource4test\",\"additionalInformation\":[{\"uniqueId\":\"52eb0139-a855-47b9-a0e6-c90f0a90b1d2.additionalinformation\",\"lastCreatedCounter\":0,\"parentUniqueId\":\"52eb0139-a855-47b9-a0e6-c90f0a90b1d2\",\"parameters\":[]}],\"allVersions\":{\"0.1\":\"52eb0139-a855-47b9-a0e6-c90f0a90b1d2\"},\"abstract\":false,\"highestVersion\":true,\"uuid\":\"2e91a2df-b066-49bb-abde-4c1c01e409db\"}";
+	// convertResourceResponseToJavaObject(response);
+	// }
+
+	private static final String INVARIANT_UUID = "invariantUUID";
+	public static final String UNIQUE_ID = "uniqueId";
+	public static final String VERSION = "version";
+	public static final String UUID = "uuid";
+	public static final String NAME = "name";
+	public static final String ORIGIN_TYPE = "originType";
+	public static final String TOSCA_RESOURCE_NAME = "toscaResourceName";
+
+	static Logger logger = LogManager.getLogger(ResponseParser.class);
+
+	public static String getValueFromJsonResponse(String response, String fieldName) {
+		try {
+//			JSONObject jsonResp = (JSONObject) JSONValue.parse(response);
+			String[] split = fieldName.split(":");
+			String fieldValue = response;
+
+			for(int i=0; i<split.length; i++) {
+				fieldValue = parser(fieldValue, split[i]);
+			}
+			return fieldValue;
+		} catch (Exception e) {
+			return null;
+		}
+
+	}
+
+	private static String parser(String response, String field){
+		JSONObject fieldValue = (JSONObject) JSONValue.parse(response);
+		return fieldValue.get(field).toString();
+	}
+
+	public static String getUniqueIdFromResponse(RestResponse response) {
+		return getValueFromJsonResponse(response.getResponse(), UNIQUE_ID);
+	}
+
+	public static String getInvariantUuid(RestResponse response) {
+		return getValueFromJsonResponse(response.getResponse(), INVARIANT_UUID);
+	}
+
+	public static String getUuidFromResponse(RestResponse response) {
+		return getValueFromJsonResponse(response.getResponse(), UUID);
+	}
+
+	public static String getNameFromResponse(RestResponse response) {
+		return getValueFromJsonResponse(response.getResponse(), NAME);
+	}
+
+	public static String getVersionFromResponse(RestResponse response) {
+		return ResponseParser.getValueFromJsonResponse(response.getResponse(), VERSION);
+	}
+
+	public static String getComponentTypeFromResponse(RestResponse response) {
+		return ResponseParser.getValueFromJsonResponse(response.getResponse(), ORIGIN_TYPE);
+	}
+
+	public static String getToscaResourceNameFromResponse(RestResponse response) {
+		return getValueFromJsonResponse(response.getResponse(), TOSCA_RESOURCE_NAME);
+	}
+
+	@SuppressWarnings("unchecked")
+	public static ResourceRespJavaObject parseJsonListReturnResourceDetailsObj(RestResponse restResponse,
+			String resourceType, String searchPattern, String expectedResult) throws Exception {
+
+		// Gson gson = new Gson;
+
+		JsonElement jElement = new JsonParser().parse(restResponse.getResponse());
+		JsonObject jObject = jElement.getAsJsonObject();
+		JsonArray arrayOfObjects = (JsonArray) jObject.get(resourceType);
+		Gson gson = new Gson();
+		Map<String, Object> map = new HashMap<>();
+		ResourceRespJavaObject jsonToJavaObject = new ResourceRespJavaObject();
+
+		for (int counter = 0; counter < arrayOfObjects.size(); counter++) {
+			JsonObject jHitObject = (JsonObject) arrayOfObjects.get(counter);
+
+			map = (Map<String, Object>) gson.fromJson(jHitObject.toString(), map.getClass());
+			if (map.get(searchPattern).toString().contains(expectedResult)) {
+
+				jsonToJavaObject = gson.fromJson(jObject, ResourceRespJavaObject.class);
+				break;
+			}
+		}
+		return jsonToJavaObject;
+
+	}
+
+	private static ObjectMapper newObjectMapper() {
+		SimpleModule module = new SimpleModule("customDeserializationModule");
+		module.addDeserializer(PropertyConstraint.class, new PropertyOperation.PropertyConstraintJacksonDeserializer());
+		return new ObjectMapper()
+			.disable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES)
+			.registerModule(module);
+	}
+
+	public static Resource convertResourceResponseToJavaObject(String response) {
+		ObjectMapper mapper = newObjectMapper();
+		Resource resource = null;
+		try {
+			mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
+			resource = mapper.readValue(response, Resource.class);
+			
+			logger.debug(resource.toString());
+		} catch (IOException e) {
+			try {
+				List<Resource> resources = Arrays.asList(mapper.readValue(response.toString(), Resource[].class));
+				resource = resources.get(0);
+			} catch (Exception e1) {
+				e1.printStackTrace();
+			}
+		}
+
+		return resource;
+	}
+
+	public static ComponentInstanceProperty convertPropertyResponseToJavaObject(String response) {
+
+		ObjectMapper mapper = newObjectMapper();
+		ComponentInstanceProperty propertyDefinition = null;
+		try {
+			propertyDefinition = mapper.readValue(response, ComponentInstanceProperty.class);
+			logger.debug(propertyDefinition.toString());
+		} catch (IOException e) {
+			e.printStackTrace();
+		}
+		return propertyDefinition;
+	}
+
+	public static GroupDefinition convertPropertyResponseToObject(String response) {
+
+		ObjectMapper mapper = newObjectMapper();
+		GroupDefinition groupDefinition = null;
+		try {
+			groupDefinition = mapper.readValue(response, GroupDefinition.class);
+			logger.debug(groupDefinition.toString());
+		} catch (IOException e) {
+			e.printStackTrace();
+		}
+		return groupDefinition;
+	}
+
+	public static String toJson(Object object) {
+		Gson gson = new Gson();
+		return gson.toJson(object);
+	}
+
+	public static ArtifactDefinition convertArtifactDefinitionResponseToJavaObject(String response) {
+		ObjectMapper mapper = new ObjectMapper();
+		ArtifactDefinition artifactDefinition = null;
+		try {
+			mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
+			artifactDefinition = mapper.readValue(response, ArtifactDefinition.class);
+			logger.debug(artifactDefinition.toString());
+		} catch (IOException e) {
+			e.printStackTrace();
+		}
+
+		return artifactDefinition;
+
+	}
+
+	public static ArtifactReqDetails convertArtifactReqDetailsToJavaObject(String response) {
+
+		ArtifactReqDetails artifactReqDetails = null;
+		Gson gson = new Gson();
+		artifactReqDetails = gson.fromJson(response, ArtifactReqDetails.class);
+		return artifactReqDetails;
+	}
+
+	public static <T> T parseToObject(String json, Class<T> clazz) {
+		Gson gson = new Gson();
+		T object;
+		try {
+			object = gson.fromJson(json, clazz);
+		} catch (Exception e) {
+			object = parseToObjectUsingMapper(json, clazz);
+		}
+		return object;
+	}
+
+	public static <T> T parseToObjectUsingMapper(String json, Class<T> clazz) {
+		// Generic convert
+		ObjectMapper mapper = newObjectMapper();
+		T object = null;
+		try {
+			object = mapper.readValue(json, clazz);
+		} catch (IOException e) {
+			e.printStackTrace();
+		}
+
+		return object;
+	}
+
+	public static ArtifactReqDetails convertArtifactDefinitionToArtifactReqDetailsObject(
+			ArtifactDefinition artifactDefinition) {
+
+		ArtifactReqDetails artifactReqDetails = null;
+		Gson gson = new Gson();
+		String artDef = gson.toJson(artifactDefinition);
+		artifactReqDetails = gson.fromJson(artDef, ArtifactReqDetails.class);
+		return artifactReqDetails;
+	}
+
+	/*public static Service convertServiceResponseToJavaObject(String response) {
+
+		ObjectMapper mapper = newObjectMapper();
+		Service service = null;
+		try {
+			service = mapper.readValue(response, Service.class);
+			logger.debug(service.toString());
+		} catch (IOException e) {
+			e.printStackTrace();
+		}
+
+		return service;
+	}*/
+	public static Service convertServiceResponseToJavaObject(String response) {
+
+		ObjectMapper mapper = newObjectMapper();
+		Service service = null;
+		try {
+			service = mapper.readValue(response, Service.class);
+			logger.debug(service.toString());
+			//Temporary catch until bug with distribution status fixed
+		} catch (InvalidFormatException e) {
+			System.out.println("broken service with invalid distribution status : " + response);
+			logger.debug("broken service with invalid distribution status : " + response);
+			return service;
+	} catch(IOException e){
+
+		e.printStackTrace();
+	}
+
+		return service;
+}
+
+	public static Product convertProductResponseToJavaObject(String response) {
+
+		ObjectMapper mapper = newObjectMapper();
+		Product product = null;
+		try {
+			product = mapper.readValue(response, Product.class);
+			logger.debug(product.toString());
+		} catch (IOException e) {
+			e.printStackTrace();
+		}
+
+		return product;
+	}
+
+	public static ComponentInstance convertComponentInstanceResponseToJavaObject(String response) {
+
+		ObjectMapper mapper = newObjectMapper();
+		ComponentInstance componentInstance = null;
+		try {
+			componentInstance = mapper.readValue(response, ComponentInstance.class);
+			logger.debug(componentInstance.toString());
+		} catch (IOException e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		}
+
+		return componentInstance;
+	}
+
+	public static List<String> getValuesFromJsonArray(RestResponse message) throws Exception {
+		List<String> artifactTypesArrayFromApi = new ArrayList<>();
+
+		org.json.JSONObject responseObject = new org.json.JSONObject(message.getResponse());
+		JSONArray jArr = responseObject.getJSONArray("artifactTypes");
+
+		for (int i = 0; i < jArr.length(); i++) {
+			org.json.JSONObject jObj = jArr.getJSONObject(i);
+			String value = jObj.get("name").toString();
+
+			artifactTypesArrayFromApi.add(value);
+		}
+		return artifactTypesArrayFromApi;
+	}
+
+	public static String calculateMD5Header(ArtifactReqDetails artifactDetails) {
+		Gson gson = new Gson();
+		String jsonBody = gson.toJson(artifactDetails);
+		// calculate MD5 for json body
+		return calculateMD5(jsonBody);
+
+	}
+
+	public static String calculateMD5(String data) {
+		String calculatedMd5 = org.apache.commons.codec.digest.DigestUtils.md5Hex(data);
+		// encode base-64 result
+		byte[] encodeBase64 = Base64.encodeBase64(calculatedMd5.getBytes());
+		String encodeBase64Str = new String(encodeBase64);
+		return encodeBase64Str;
+
+	}
+
+	public static List<Map<String, Object>> getAuditFromMessage(Map<String, Object> auditingMessage) {
+		List<Map<String, Object>> auditList = new ArrayList<>();
+		auditList.add(auditingMessage);
+		return auditList;
+	}
+
+	public static List<CategoryDefinition> parseCategories(RestResponse getAllCategoriesRest) {
+
+		List<CategoryDefinition> categories = new ArrayList<>();
+		try {
+			JsonElement jElement = new JsonParser().parse(getAllCategoriesRest.getResponse());
+			JsonArray cagegories = jElement.getAsJsonArray();
+			Iterator<JsonElement> iter = cagegories.iterator();
+			while (iter.hasNext()) {
+				JsonElement next = iter.next();
+				CategoryDefinition category = ResponseParser.parseToObject(next.toString(), CategoryDefinition.class);
+				categories.add(category);
+			}
+
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
+
+		return categories;
+	}
+
+	public static JSONArray getListFromJson(RestResponse res, String field) throws JSONException {
+		String valueFromJsonResponse = getValueFromJsonResponse(res.getResponse(), field);
+		JSONArray jArr = new JSONArray(valueFromJsonResponse);
+
+		return jArr;
+	}
+
+	public static List<String> getDerivedListFromJson(RestResponse res) throws JSONException {
+		JSONArray listFromJson = getListFromJson(res, "derivedFrom");
+		List<String> lst = new ArrayList<>();
+		for (int i = 0; i < listFromJson.length(); i++) {
+			lst.add(listFromJson.getString(i));
+		}
+
+		return lst;
+	}
+
+	public static Map<String, Object> convertStringToMap(String obj) {
+		Map<String, Object> object = (Map<String, Object>) JSONValue.parse(obj);
+		return object;
+	}
+
+	public static List<Map<String, Object>> getListOfMapsFromJson(RestResponse res, String field) throws Exception {
+		List<Map<String, Object>> list = new ArrayList<>();
+		JSONArray listFromJson = getListFromJson(res, field);
+		for (int i = 0; i < listFromJson.length(); i++) {
+			Map<String, Object> convertStringToMap = convertStringToMap(listFromJson.getString(i));
+			list.add(convertStringToMap);
+		}
+		return list;
+
+	}
+
+	public static Map<String, Object> getJsonValueAsMap(RestResponse response, String key) {
+		String valueField = getValueFromJsonResponse(response.getResponse(), key);
+		Map<String, Object> convertToMap = convertStringToMap(valueField);
+		return convertToMap;
+	}
+
+	public static String getJsonObjectValueByKey(String metadata, String key) {
+		JsonElement jelement = new JsonParser().parse(metadata);
+
+		JsonObject jobject = jelement.getAsJsonObject();
+		Object obj = jobject.get(key);
+		if (obj == null) {
+			return null;
+		} else {
+			return obj.toString();
+		}
+	}
+
+//	/*public static Map<String, List<Component>> convertCatalogResponseToJavaObject(String response) {
+//
+//		// Map<String, ArrayList<Component>> map = new HashMap<String,
+//		// ArrayList<Component>>();
+//		Map<String, List<Component>> map = new HashMap<>();
+//
+//		JsonElement jElement = new JsonParser().parse(response);
+//		JsonObject jObject = jElement.getAsJsonObject();
+//		JsonArray jArrReousrces = jObject.getAsJsonArray("resources");
+//		JsonArray jArrServices = jObject.getAsJsonArray("services");
+//		//Product removed
+////		JsonArray jArrProducts = jObject.getAsJsonArray("products");
+//		//Product removed
+//		if (jArrReousrces != null && jArrServices != null /*&& jArrProducts != null*/){
+//
+//
+//		//////// RESOURCE/////////////////////////////
+//		ArrayList<Component> restResponseArray = new ArrayList<>();
+//		Component component = null;
+//		for (int i = 0; i < jArrReousrces.size(); i++) {
+//			String resourceString = (String) jArrReousrces.get(i).toString();
+//			component = ResponseParser.convertResourceResponseToJavaObject(resourceString);
+//			restResponseArray.add(component);
+//		}
+//
+//		map.put("resources", restResponseArray);
+//
+//		///////// SERVICE/////////////////////////////
+//
+//		restResponseArray = new ArrayList<>();
+//		component = null;
+//		for (int i = 0; i < jArrServices.size(); i++) {
+//			String resourceString = (String) jArrServices.get(i).toString();
+//			component = ResponseParser.convertServiceResponseToJavaObject(resourceString);
+//			restResponseArray.add(component);
+//		}
+//
+//		map.put("services", restResponseArray);
+////Product removed
+//		///////// PRODUCT/////////////////////////////
+////		restResponseArray = new ArrayList<>();
+////		component = null;
+////		for (int i = 0; i < jArrProducts.size(); i++) {
+////			String resourceString = (String) jArrProducts.get(i).toString();
+////			component = ResponseParser.convertProductResponseToJavaObject(resourceString);
+////			restResponseArray.add(component);
+////		}
+////
+////		map.put("products", restResponseArray);
+////
+//    	}
+//		else {
+//			map.put("resources", new ArrayList<>());
+//			map.put("services", new ArrayList<>());
+//			//Product removed
+////			map.put("products", new ArrayList<>());
+//		}
+//
+//		return map;
+//
+//	}*/
+
+	public static Map<String, List<Component>> convertCatalogResponseToJavaObject(String response) {
+
+		// Map<String, ArrayList<Component>> map = new HashMap<String,
+		// ArrayList<Component>>();
+		Map<String, List<Component>> map = new HashMap<>();
+
+		JsonElement jElement = new JsonParser().parse(response);
+		JsonObject jObject = jElement.getAsJsonObject();
+		JsonArray jArrReousrces = jObject.getAsJsonArray("resources");
+		JsonArray jArrServices = jObject.getAsJsonArray("services");
+		//Product removed
+//		JsonArray jArrProducts = jObject.getAsJsonArray("products");
+		//Product removed
+
+		if (jArrReousrces != null && jArrServices != null /*&& jArrProducts != null*/){
+
+
+			//////// RESOURCE/////////////////////////////
+			ArrayList<Component> restResponseArray = new ArrayList<>();
+			Component component = null;
+			for (int i = 0; i < jArrReousrces.size(); i++) {
+				String resourceString = (String) jArrReousrces.get(i).toString();
+				component = ResponseParser.convertResourceResponseToJavaObject(resourceString);
+				restResponseArray.add(component);
+			}
+
+			map.put("resources", restResponseArray);
+
+			///////// SERVICE/////////////////////////////
+
+			restResponseArray = new ArrayList<>();
+			component = null;
+			for (int i = 0; i < jArrServices.size(); i++) {
+				String resourceString = (String) jArrServices.get(i).toString();
+				component = ResponseParser.convertServiceResponseToJavaObject(resourceString);
+				restResponseArray.add(component);
+			}
+
+			map.put("services", restResponseArray);
+//Product removed
+
+			///////// PRODUCT/////////////////////////////
+//		restResponseArray = new ArrayList<>();
+//		component = null;
+//		for (int i = 0; i < jArrProducts.size(); i++) {
+//			String resourceString = (String) jArrProducts.get(i).toString();
+//			component = ResponseParser.convertProductResponseToJavaObject(resourceString);
+//			restResponseArray.add(component);
+//		}
+//
+
+
+//		map.put("products", restResponseArray);
+//
+
+		}
+		else {
+			map.put("resources", new ArrayList<>());
+			map.put("services", new ArrayList<>());
+			//Product removed
+//			map.put("products", new ArrayList<>());
+		}
+
+		return map;
+
+	}
+	
+	public static Map<Long, ServiceDistributionStatus> convertServiceDistributionStatusToObject(String response) throws ParseException {
+
+		Map<Long, ServiceDistributionStatus> serviceDistributionStatusMap = new HashMap<>();
+		ServiceDistributionStatus serviceDistributionStatusObject = null;
+		
+		JsonElement jElement = new JsonParser().parse(response);
+		JsonObject jObject = jElement.getAsJsonObject();
+		JsonArray jDistrStatusArray = jObject.getAsJsonArray("distributionStatusOfServiceList");
+		
+		for (int i = 0; i < jDistrStatusArray.size(); i++){
+			Gson gson = new Gson();
+			String servDistrStatus = gson.toJson(jDistrStatusArray.get(i));
+			serviceDistributionStatusObject = gson.fromJson(servDistrStatus, ServiceDistributionStatus.class);
+			serviceDistributionStatusMap.put(Utils.getEpochTimeFromUTC(serviceDistributionStatusObject.getTimestamp()), serviceDistributionStatusObject);
+		}
+
+		return serviceDistributionStatusMap;
+		
+	}
+	
+	public static Map<String, String> getPropertiesNameType(RestResponse restResponse)
+			throws JSONException {
+		Map<String, String> propertiesMap = new HashMap<>();
+		JSONArray propertiesList = getListFromJson(restResponse, "properties");
+		for (int i = 0; i < propertiesList.length() ; i ++){
+			JSONObject  prop = (JSONObject) JSONValue.parse(propertiesList.get(i).toString());
+			String propName = prop.get("name").toString();
+			String propType = prop.get("type").toString();
+			propertiesMap.put(propName, propType);
+		}
+		
+		return propertiesMap;
+	}
+	
+	public static ResourceAssetStructure getDataOutOfSearchExternalAPIResponseForResourceName(String response, String resourceName) {
+		Gson gson = new Gson();
+		JsonElement jsonElement = new JsonParser().parse(response);
+		JsonArray jsonArray = jsonElement.getAsJsonArray();
+		for(JsonElement jElement: jsonArray) {
+			ResourceAssetStructure parsedResponse = gson.fromJson(jElement, ResourceAssetStructure.class);
+			
+			if(resourceName.contains(parsedResponse.getName()) && parsedResponse.getName().contains(resourceName)) {
+				return parsedResponse;
+			}
+		}
+		
+		return null;
+	}
+
+	public static Map<String, VfModuleDefinition> convertVfModuleJsonResponseToJavaObject(String response) {
+
+		Yaml yaml = new Yaml();
+		InputStream inputStream = null;
+		inputStream = new ByteArrayInputStream(response.getBytes());
+		List<?> list = (List<?> )yaml.load(inputStream);
+		ObjectMapper mapper = new ObjectMapper();
+
+		VfModuleDefinition moduleDefinition;
+		Map<String, VfModuleDefinition> vfModulesMap = new HashMap<>();
+		for (Object obj : list) {
+//			TODO Andrey L. uncomment line below in case to ignore on unknown properties, not recommended
+			mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
+			moduleDefinition = mapper.convertValue(obj, VfModuleDefinition.class);
+			vfModulesMap.put(moduleDefinition.vfModuleModelName, moduleDefinition);
+		}
+		return  vfModulesMap;
+	}
+
+	public static InterfaceDefinition convertInterfaceDefinitionResponseToJavaObject(String response) {
+		ObjectMapper mapper = new ObjectMapper();
+		InterfaceDefinition interfaceDefinition = null;
+		try {
+			mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
+			interfaceDefinition = mapper.readValue(response, InterfaceDefinition.class);
+			logger.debug(interfaceDefinition.toString());
+		}
+		catch (IOException e) {
+			logger.debug(e);
+		}
+		return interfaceDefinition;
+	}
+
+}
diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/utils/rest/ServiceFilterUtils.java b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/utils/rest/ServiceFilterUtils.java
new file mode 100644
index 0000000000..ce2760a7d3
--- /dev/null
+++ b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/utils/rest/ServiceFilterUtils.java
@@ -0,0 +1,73 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * SDC
+ * ================================================================================
+ * 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=========================================================
+ */
+
+package org.openecomp.sdc.ci.tests.utils.rest;
+
+import com.google.gson.Gson;
+
+import java.util.List;
+
+import org.openecomp.sdc.be.model.User;
+import org.openecomp.sdc.ci.tests.api.Urls;
+import org.openecomp.sdc.ci.tests.config.Config;
+import org.openecomp.sdc.ci.tests.datatypes.ServiceFilterDetails;
+import org.openecomp.sdc.ci.tests.datatypes.http.RestResponse;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class ServiceFilterUtils extends BaseRestUtils {
+
+    private static Logger logger = LoggerFactory.getLogger(ServiceFilterUtils.class.getName());
+
+    private static Gson gson = new Gson();
+
+    public static RestResponse createServiceFilter(String externalServiceId, String proxyServiceId,
+                                                   ServiceFilterDetails serviceFilterDetails,
+                                                   User user) throws Exception{
+        Config config = Config.instance();
+
+        String url = String.format(Urls.CREATE_SERVICE_FILTER, config.getCatalogBeHost(), config.getCatalogBePort(),
+                externalServiceId, proxyServiceId);
+
+        return sendPost(url, gson.toJson(serviceFilterDetails), user.getUserId(), acceptHeaderData);
+    }
+
+    public static RestResponse updateServiceFilter(String externalServiceId, String proxyServiceId,
+                                                   List<ServiceFilterDetails> serviceFilterDetailsList,
+                                                   User user) throws Exception{
+        Config config = Config.instance();
+
+        String url = String.format(Urls.UPDATE_SERVICE_FILTER, config.getCatalogBeHost(), config.getCatalogBePort(),
+                externalServiceId, proxyServiceId);
+
+        return sendPut(url, gson.toJson(serviceFilterDetailsList), user.getUserId(), acceptHeaderData);
+    }
+
+    public static RestResponse deleteServiceFilter(String externalServiceId, String proxyServiceId,
+                                                   int constraintIndex,
+                                                   User user) throws Exception{
+        Config config = Config.instance();
+
+        String url = String.format(Urls.DELETE_SERVICE_FILTER, config.getCatalogBeHost(), config.getCatalogBePort(),
+                externalServiceId, proxyServiceId, constraintIndex);
+
+        return sendDelete(url, user.getUserId());
+    }
+}
diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/utils/rest/ServiceRestUtils.java b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/utils/rest/ServiceRestUtils.java
new file mode 100644
index 0000000000..ec132f0f5a
--- /dev/null
+++ b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/utils/rest/ServiceRestUtils.java
@@ -0,0 +1,301 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * SDC
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.sdc.ci.tests.utils.rest;
+
+import com.google.gson.Gson;
+import org.json.simple.JSONArray;
+import org.json.simple.JSONObject;
+import org.json.simple.JSONValue;
+import org.openecomp.sdc.be.model.Service;
+import org.openecomp.sdc.be.model.User;
+import org.openecomp.sdc.ci.tests.api.Urls;
+import org.openecomp.sdc.ci.tests.config.Config;
+import org.openecomp.sdc.ci.tests.datatypes.ServiceReqDetails;
+import org.openecomp.sdc.ci.tests.datatypes.enums.UserRoleEnum;
+import org.openecomp.sdc.ci.tests.datatypes.http.HttpHeaderEnum;
+import org.openecomp.sdc.ci.tests.datatypes.http.HttpRequest;
+import org.openecomp.sdc.ci.tests.datatypes.http.RestResponse;
+import org.openecomp.sdc.ci.tests.utils.Utils;
+import org.openecomp.sdc.ci.tests.utils.general.ElementFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.io.IOException;
+import java.util.HashMap;
+import java.util.Map;
+
+public class ServiceRestUtils extends BaseRestUtils {
+	private static Logger logger = LoggerFactory.getLogger(ServiceRestUtils.class.getName());
+	// ****** CREATE *******
+
+	private static Gson gson = new Gson();
+
+	public static RestResponse deleteService(String serviceName, String version, User sdncModifierDetails)
+			throws IOException {
+
+		Config config = Utils.getConfig();
+		String url = String.format(Urls.DELETE_SERVICE_BY_NAME_AND_VERSION, config.getCatalogBeHost(),
+				config.getCatalogBePort(), serviceName, version);
+
+		String userId = sdncModifierDetails.getUserId();
+		RestResponse sendDelete = sendDelete(url, userId);
+		deleteMarkedServices(userId);
+		return sendDelete;
+	}
+	
+	public static RestResponse markServiceToDelete(String resourceId, String userId) throws IOException {
+
+		Config config = Utils.getConfig();
+		String url = String.format(Urls.DELETE_SERVICE, config.getCatalogBeHost(), config.getCatalogBePort(), resourceId);
+		RestResponse sendDelete = sendDelete(url, userId);
+
+		return sendDelete;
+
+	}
+
+	public static RestResponse deleteServiceById(String serviceId, String userId) throws IOException {
+
+		Config config = Utils.getConfig();
+		String url = String.format(Urls.DELETE_SERVICE, config.getCatalogBeHost(), config.getCatalogBePort(), serviceId);
+		RestResponse sendDelete = sendDelete(url, userId);
+		deleteMarkedServices(userId);
+		return sendDelete;
+	}
+
+	public static void deleteMarkedServices(String userId) throws IOException {
+		String url;
+		Config config = Utils.getConfig();
+		url = String.format(Urls.DELETE_MARKED_SERVICES, config.getCatalogBeHost(), config.getCatalogBePort());
+		sendDelete(url, userId);
+	}
+
+	public static RestResponse createService(ServiceReqDetails service, User user) throws Exception {
+
+		Config config = Utils.getConfig();
+		String url = String.format(Urls.CREATE_SERVICE, config.getCatalogBeHost(), config.getCatalogBePort());
+		String serviceBodyJson = gson.toJson(service);
+
+		logger.debug("Send POST request to create service: {}", url);
+		logger.debug("Service body: {}", serviceBodyJson);
+
+		RestResponse res = sendPost(url, serviceBodyJson, user.getUserId(), acceptHeaderData);
+		if (res.getErrorCode() == STATUS_CODE_CREATED) {
+			service.setUniqueId(ResponseParser.getUniqueIdFromResponse(res));
+            service.setName(ResponseParser.getNameFromResponse(res));
+			service.setVersion(ResponseParser.getVersionFromResponse(res));
+			service.setUUID(ResponseParser.getUuidFromResponse(res));
+			// Creator details never change after component is created - Ella,
+			// 12/1/2016
+			service.setCreatorUserId(user.getUserId());
+			service.setCreatorFullName(user.getFullName());
+		}
+
+		return res;
+	}
+
+	public static RestResponse updateService(ServiceReqDetails service, User user) throws Exception {
+		Config config = Utils.getConfig();
+		String url = String.format(Urls.UPDATE_SERVICE_METADATA, config.getCatalogBeHost(), config.getCatalogBePort(),
+				service.getUniqueId());
+		String serviceBodyJson = gson.toJson(service);
+
+		logger.debug("Send PUT request to create service: {}", url);
+		logger.debug("Service body: {}", serviceBodyJson);
+
+		RestResponse res = sendPut(url, serviceBodyJson, user.getUserId(), acceptHeaderData);
+		if (res.getErrorCode() == STATUS_CODE_CREATED) {
+			service.setUniqueId(ResponseParser.getUniqueIdFromResponse(res));
+			service.setVersion(ResponseParser.getVersionFromResponse(res));
+		}
+
+		return res;
+	}
+
+	public static RestResponse getService(String serviceId) throws IOException {
+
+		Config config = Utils.getConfig();
+		String url = String.format(Urls.GET_SERVICE, config.getCatalogBeHost(), config.getCatalogBePort(), serviceId);
+		return getServiceFromUrl(url, ElementFactory.getDefaultUser(UserRoleEnum.DESIGNER), false);
+	}
+
+    public static RestResponse getServiceToscaArtifacts(String serviceId) throws IOException {
+
+        Config config = Utils.getConfig();
+        String url = String.format(Urls.GET_INSTANCE_TOSCA_ARTIFACTS, config.getCatalogBeHost(),
+                config.getCatalogBePort(), "services", serviceId);
+        return getServiceFromUrl(url, ElementFactory.getDefaultUser(UserRoleEnum.DESIGNER), false);
+    }
+
+	public static RestResponse getService(ServiceReqDetails serviceReqDetails, User sdncModifierDetails)
+			throws IOException {
+
+		Config config = Utils.getConfig();
+		String url = String.format(Urls.GET_SERVICE, config.getCatalogBeHost(), config.getCatalogBePort(),
+				serviceReqDetails.getUniqueId());
+		return getServiceFromUrl(url, sdncModifierDetails, false);
+	}
+
+	public static RestResponse getService(String serviceId, User sdncModifierDetails) throws IOException {
+
+		Config config = Utils.getConfig();
+		String url = String.format(Urls.GET_SERVICE, config.getCatalogBeHost(), config.getCatalogBePort(), serviceId);
+		return getServiceFromUrl(url, sdncModifierDetails, false);
+	}
+
+	public static RestResponse getServiceByNameAndVersion(User sdncModifierDetails, String serviceName,
+			String serviceVersion) throws IOException {
+		Config config = Utils.getConfig();
+		String url = String.format(Urls.GET_SERVICE_BY_NAME_AND_VERSION, config.getCatalogBeHost(),
+				config.getCatalogBePort(), serviceName, serviceVersion);
+		return getServiceFromUrl(url, sdncModifierDetails, false);
+	}
+
+	public static RestResponse getServiceFromUrl(String url, User sdncModifierDetails, boolean isCached)
+			throws IOException {
+		Map<String, String> headersMap = prepareHeadersMap(sdncModifierDetails, isCached);
+		HttpRequest http = new HttpRequest();
+		logger.debug("Send GET request to create service: {}", url);
+		logger.debug("Service headers: {}", headersMap);
+		RestResponse sendGetServerRequest = http.httpSendGet(url, headersMap);
+
+		return sendGetServerRequest;
+	}
+
+	public static Map<String, String> prepareHeadersMap(User sdncModifierDetails, boolean isCached) {
+		Map<String, String> headersMap = new HashMap<>();
+		if (isCached)
+			headersMap.put(HttpHeaderEnum.CACHE_CONTROL.getValue(), BaseRestUtils.cacheControlHeader);
+
+		headersMap.put(HttpHeaderEnum.CONTENT_TYPE.getValue(), BaseRestUtils.contentTypeHeaderData);
+		headersMap.put(HttpHeaderEnum.ACCEPT.getValue(), BaseRestUtils.acceptHeaderData);
+		headersMap.put(HttpHeaderEnum.USER_ID.getValue(), sdncModifierDetails.getUserId());
+		return headersMap;
+	}
+
+	public static RestResponse approveServiceDistribution(String serviceId, String userId) throws Exception {
+		return changeServiceDistributionState(serviceId, userId, Urls.APPROVE_DISTRIBUTION);
+	}
+
+	public static RestResponse rejectServiceDistribution(String serviceId, String userId) throws Exception {
+		return changeServiceDistributionState(serviceId, userId, Urls.REJECT_DISTRIBUTION);
+	}
+
+	// Benny
+	public static RestResponse rejectServiceDistribution(String serviceId, String userId, String comment)
+			throws Exception {
+		Config config = Utils.getConfig();
+		String url = String.format(Urls.REJECT_DISTRIBUTION, config.getCatalogBeHost(), config.getCatalogBePort(),
+				serviceId);
+		String userBodyJson = gson.toJson(comment);
+		return sendPost(url, userBodyJson, userId, BaseRestUtils.acceptHeaderData);
+
+	}
+
+	private static RestResponse changeServiceDistributionState(String serviceId, String userId, String distributionUrl)
+			throws Exception {
+		Config config = Utils.getConfig();
+		String url = String.format(distributionUrl, config.getCatalogBeHost(), config.getCatalogBePort(), serviceId);
+		String defComment = "{ userRemarks : \"this is an test\" }";
+		String userBodyJson = gson.toJson(defComment);
+		return sendPost(url, userBodyJson, userId, acceptHeaderData);
+
+	}
+
+	public static RestResponse getServiceLatestVersionList(User sdncModifierDetails) throws IOException {
+
+		Config config = Utils.getConfig();
+		String url = String.format(Urls.GET_SERVICE_lATEST_VERSION, config.getCatalogBeHost(),
+				config.getCatalogBePort());
+
+		return sendGet(url, sdncModifierDetails.getUserId());
+
+	}
+
+	public static RestResponse createServiceByHttpMethod(ServiceReqDetails serviceDetails, User sdncModifierDetails,
+			String method, String urls) throws IOException {
+		Map<String, String> headersMap = prepareHeadersMap(sdncModifierDetails, true);
+
+		Config config = Utils.getConfig();
+		String serviceBodyJson = gson.toJson(serviceDetails);
+		HttpRequest http = new HttpRequest();
+		String url = String.format(urls, config.getCatalogBeHost(), config.getCatalogBePort());
+		// TODO: ADD AUTHENTICATION IN REQUEST
+		logger.debug(url);
+		logger.debug("Send {} request to create user: {}",method,url);
+		logger.debug("User body: {}", serviceBodyJson);
+		logger.debug("User headers: {}", headersMap);
+		RestResponse sendCreateUserRequest = http.httpSendByMethod(url, method, serviceBodyJson, headersMap);
+
+		return sendCreateUserRequest;
+
+	}
+
+	public static RestResponse deleteServiceByNameAndVersion(User sdncModifierDetails, String serviceName,
+			String serviceVersion) throws IOException {
+		Config config = Utils.getConfig();
+
+		Map<String, String> headersMap = prepareHeadersMap(sdncModifierDetails, true);
+
+		HttpRequest http = new HttpRequest();
+
+		String url = String.format(Urls.DELETE_SERVICE_BY_NAME_AND_VERSION, config.getCatalogBeHost(),
+				config.getCatalogBePort(), serviceName, serviceVersion);
+		RestResponse deleteResponse = http.httpSendDelete(url, headersMap);
+
+		deleteMarkedServices(sdncModifierDetails.getUserId());
+		return deleteResponse;
+	}
+
+	public static RestResponse getFollowed(User user) throws Exception {
+		Config config = Utils.getConfig();
+
+		HttpRequest httpRequest = new HttpRequest();
+
+		String url = String.format(Urls.GET_FOLLWED_LIST, config.getCatalogBeHost(), config.getCatalogBePort());
+
+		Map<String, String> headersMap = new HashMap<>();
+		headersMap.put(HttpHeaderEnum.CONTENT_TYPE.getValue(), BaseRestUtils.contentTypeHeaderData);
+		headersMap.put(HttpHeaderEnum.ACCEPT.getValue(), BaseRestUtils.acceptHeaderData);
+		headersMap.put(HttpHeaderEnum.USER_ID.getValue(), user.getUserId());
+
+		RestResponse getResourceNotAbstarctResponse = httpRequest.httpSendGet(url, headersMap);
+
+		return getResourceNotAbstarctResponse;
+	}
+
+	public static JSONArray getListArrayFromRestResponse(RestResponse restResponse) {
+		String json = restResponse.getResponse();
+		JSONObject jsonResp = (JSONObject) JSONValue.parse(json);
+		JSONArray servicesArray = (JSONArray) jsonResp.get("services");
+
+		logger.debug("services= {}", servicesArray);
+
+		return servicesArray;
+	}
+	
+	public static RestResponse getDistributionServiceList(Service service, User user) throws IOException {
+
+		Config config = Utils.getConfig();
+		String url = String.format(Urls.DISTRIBUTION_SERVICE_LIST, config.getCatalogBeHost(), config.getCatalogBePort(), service.getUUID());
+		return getServiceFromUrl(url, user, false);
+	}
+
+}
diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/utils/rest/UserRestUtils.java b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/utils/rest/UserRestUtils.java
new file mode 100644
index 0000000000..0e2a182d01
--- /dev/null
+++ b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/utils/rest/UserRestUtils.java
@@ -0,0 +1,295 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * SDC
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.sdc.ci.tests.utils.rest;
+
+import com.google.gson.Gson;
+import org.apache.commons.lang.StringUtils;
+import org.openecomp.sdc.be.model.User;
+import org.openecomp.sdc.ci.tests.api.Urls;
+import org.openecomp.sdc.ci.tests.config.Config;
+import org.openecomp.sdc.ci.tests.datatypes.http.HttpHeaderEnum;
+import org.openecomp.sdc.ci.tests.datatypes.http.HttpRequest;
+import org.openecomp.sdc.ci.tests.datatypes.http.RestResponse;
+import org.openecomp.sdc.ci.tests.utils.Utils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.io.IOException;
+import java.util.HashMap;
+import java.util.Map;
+
+public class UserRestUtils extends BaseRestUtils {
+
+	static Gson gson = new Gson();
+
+	static Logger logger = LoggerFactory.getLogger(UserRestUtils.class.getName());
+	static String contentTypeHeaderData = "application/json";
+	static String acceptHeaderDate = "application/json";
+
+	public UserRestUtils() {
+		super();
+	}
+
+	public static RestResponse createUser(User sdncUserDetails, User sdncModifierDetails) throws IOException {
+
+		Config config = Utils.getConfig();
+
+		Map<String, String> headersMap = new HashMap<String, String>();
+		headersMap.put(HttpHeaderEnum.CONTENT_TYPE.getValue(), contentTypeHeaderData);
+		headersMap.put(HttpHeaderEnum.ACCEPT.getValue(), acceptHeaderDate);
+		headersMap.put(HttpHeaderEnum.USER_ID.getValue(), sdncModifierDetails.getUserId());
+
+		String userBodyJson = gson.toJson(sdncUserDetails);
+		HttpRequest http = new HttpRequest();
+		String url = String.format(Urls.CREATE_USER, config.getCatalogBeHost(), config.getCatalogBePort());
+
+		logger.debug("Send POST request to create user: {}", url);
+		logger.debug("User body: {}", userBodyJson);
+		logger.debug("User headers: {}", headersMap);
+		RestResponse sendCreateUserRequest = http.httpSendPost(url, userBodyJson, headersMap);
+
+		return sendCreateUserRequest;
+
+	}
+
+	public static RestResponse deactivateUser(User sdncUserDetails, User sdncModifierDetails) throws IOException {
+		return deleteUser(sdncUserDetails, sdncModifierDetails, true);
+	}
+
+	public static RestResponse deActivateUser(User sdncUserDetails, User sdncModifierDetails) throws IOException {
+		return deleteUser(sdncUserDetails, sdncModifierDetails, false);
+	}
+
+	public static RestResponse deleteUser(User sdncUserDetails, User sdncModifierDetails, boolean isForceDelete)
+			throws IOException {
+
+		Config config = Utils.getConfig();
+
+		Map<String, String> headersMap = new HashMap<String, String>();
+		headersMap.put(HttpHeaderEnum.CONTENT_TYPE.getValue(), contentTypeHeaderData);
+		headersMap.put(HttpHeaderEnum.ACCEPT.getValue(), acceptHeaderDate);
+		headersMap.put(HttpHeaderEnum.USER_ID.getValue(), sdncModifierDetails.getUserId());
+		if (isForceDelete) {
+			headersMap.put(User.FORCE_DELETE_HEADER_FLAG, User.FORCE_DELETE_HEADER_FLAG);
+		}
+
+		HttpRequest http = new HttpRequest();
+		String url = String.format(Urls.DELETE_USER, config.getCatalogBeHost(), config.getCatalogBePort(),
+				sdncUserDetails.getUserId());
+		RestResponse sendDeleteUserRequest = http.httpSendDelete(url, headersMap);
+		return sendDeleteUserRequest;
+
+	}
+
+	public static RestResponse updateUser(User sdncUserDetails, User sdncModifierDetails)
+			throws IOException, CloneNotSupportedException {
+
+		Config config = Utils.getConfig();
+		User user = new User(sdncModifierDetails);
+
+		Map<String, String> headersMap = new HashMap<String, String>();
+		headersMap.put(HttpHeaderEnum.CONTENT_TYPE.getValue(), contentTypeHeaderData);
+		headersMap.put(HttpHeaderEnum.ACCEPT.getValue(), acceptHeaderDate);
+		headersMap.put(HttpHeaderEnum.USER_ID.getValue(), sdncModifierDetails.getUserId());
+
+		user.setUserId(StringUtils.EMPTY);
+		user.setRole(StringUtils.EMPTY);
+
+		Gson gson = new Gson();
+		String userBodyJson = gson.toJson(user);
+		logger.debug("userBodyJson: {}", userBodyJson);
+		HttpRequest http = new HttpRequest();
+		String url = String.format(Urls.UPDATE_USER, config.getCatalogBeHost(), config.getCatalogBePort(),
+				sdncModifierDetails.getUserId());
+		RestResponse sendUpdateUserRequest = http.httpSendPost(url, userBodyJson, headersMap);
+
+		return sendUpdateUserRequest;
+	}
+
+	/// Benny
+	public static RestResponse updateUserRole(User sdncUserDetails, User sdncModifierDetails, String userIdToUpdate)
+			throws IOException {
+
+		Config config = Utils.getConfig();
+
+		Map<String, String> headersMap = new HashMap<String, String>();
+		headersMap.put(HttpHeaderEnum.CONTENT_TYPE.getValue(), contentTypeHeaderData);
+		headersMap.put(HttpHeaderEnum.ACCEPT.getValue(), acceptHeaderDate);
+		headersMap.put(HttpHeaderEnum.USER_ID.getValue(), sdncModifierDetails.getUserId());
+
+		Gson gson = new Gson();
+		String userBodyJson = gson.toJson(sdncUserDetails);
+		logger.debug("userBodyJson: {}", userBodyJson);
+		HttpRequest http = new HttpRequest();
+		String url = String.format(Urls.UPDATE_USER_ROLE, config.getCatalogBeHost(), config.getCatalogBePort(),
+				userIdToUpdate);
+		RestResponse sendUpdateUserRequest = http.httpSendPost(url, userBodyJson, headersMap);
+
+		return sendUpdateUserRequest;
+
+	}
+
+	public static RestResponse getUser(User sdncUserDetails, User sdncModifierDetails) throws IOException {
+
+		Config config = Utils.getConfig();
+
+		Map<String, String> headersMap = new HashMap<String, String>();
+		headersMap.put(HttpHeaderEnum.CONTENT_TYPE.getValue(), contentTypeHeaderData);
+		headersMap.put(HttpHeaderEnum.ACCEPT.getValue(), acceptHeaderDate);
+		headersMap.put(HttpHeaderEnum.USER_ID.getValue(), sdncModifierDetails.getUserId());
+		HttpRequest http = new HttpRequest();
+		String url = String.format(Urls.GET_USER, config.getCatalogBeHost(), config.getCatalogBePort(),
+				sdncUserDetails.getUserId());
+		RestResponse sendGetUserRequest = http.httpSendGet(url, headersMap);
+		return sendGetUserRequest;
+
+	}
+	
+	public static RestResponse getUserRole(User sdncUserDetails, User sdncModifierDetails) throws IOException {
+
+		Config config = Utils.getConfig();
+
+		Map<String, String> headersMap = new HashMap<>();
+		headersMap.put(HttpHeaderEnum.CONTENT_TYPE.getValue(), contentTypeHeaderData);
+		headersMap.put(HttpHeaderEnum.ACCEPT.getValue(), acceptHeaderDate);
+		headersMap.put(HttpHeaderEnum.USER_ID.getValue(), sdncModifierDetails.getUserId());
+		HttpRequest http = new HttpRequest();
+		String url = String.format(Urls.GET_USER_ROLE, config.getCatalogBeHost(), config.getCatalogBePort(),
+				sdncUserDetails.getUserId());
+		RestResponse sendGetUserRequest = http.httpSendGet(url, headersMap);
+		return sendGetUserRequest;
+
+	}
+	
+	
+
+	public static RestResponse getAllAdminUsers(User sdncModifierDetails) throws IOException {
+
+		Config config = Utils.getConfig();
+
+		Map<String, String> headersMap = new HashMap<>();
+		headersMap.put(HttpHeaderEnum.CONTENT_TYPE.getValue(), contentTypeHeaderData);
+		headersMap.put(HttpHeaderEnum.ACCEPT.getValue(), acceptHeaderDate);
+		headersMap.put(HttpHeaderEnum.USER_ID.getValue(), sdncModifierDetails.getUserId());
+
+		// Gson gson = new Gson();
+		// String userBodyJson = gson.toJson(sdncModifierDetails);
+		// System.out.println(userBodyJson);
+		HttpRequest http = new HttpRequest();
+		String url = String.format(Urls.GET_ALL_ADMIN_USERS, config.getCatalogBeHost(), config.getCatalogBePort());
+		logger.debug("Send following url: {} and headers: {}",url, headersMap.toString());
+		RestResponse sendGetUserRequest = http.httpSendGet(url, headersMap);
+
+		return sendGetUserRequest;
+
+	}
+
+	// US571255
+	public static RestResponse getUsersByRoles(User sdncModifierDetails, String roles) throws IOException {
+
+		Config config = Utils.getConfig();
+		Map<String, String> headersMap = new HashMap<String, String>();
+		headersMap.put(HttpHeaderEnum.CONTENT_TYPE.getValue(), contentTypeHeaderData);
+		headersMap.put(HttpHeaderEnum.ACCEPT.getValue(), acceptHeaderDate);
+		headersMap.put(HttpHeaderEnum.USER_ID.getValue(), sdncModifierDetails.getUserId());
+		HttpRequest http = new HttpRequest();
+		String url;
+		if (roles == "/") {
+			url = String.format(Urls.GET_ALL_USERS, config.getCatalogBeHost(), config.getCatalogBePort());
+		} else {
+			url = String.format(Urls.GET_USERS_BY_ROLES, config.getCatalogBeHost(), config.getCatalogBePort(), roles);
+
+		}
+		logger.debug("Send following url: {} and headers: {}",url, headersMap.toString());
+		RestResponse sendGetUserRequest = http.httpSendGet(url, headersMap);
+		return sendGetUserRequest;
+	}
+
+	public static RestResponse getUsersByRolesHttpCspAtuUidIsMissing(User sdncModifierDetails, String roles)
+			throws Exception {
+
+		Config config = Utils.getConfig();
+		Map<String, String> headersMap = new HashMap<String, String>();
+		headersMap.put(HttpHeaderEnum.CONTENT_TYPE.getValue(), contentTypeHeaderData);
+		headersMap.put(HttpHeaderEnum.ACCEPT.getValue(), acceptHeaderDate);
+		headersMap.put(HttpHeaderEnum.USER_ID.getValue(), sdncModifierDetails.getUserId());
+		headersMap.remove("USER_ID");
+		HttpRequest http = new HttpRequest();
+		String url = String.format(Urls.GET_USERS_BY_ROLES, config.getCatalogBeHost(), config.getCatalogBePort(),
+				roles);
+		logger.debug(
+				"Send following url without USER_ID header : " + url + "  headers: " + headersMap.toString());
+
+		RestResponse sendGetUserRequest = http.httpSendGet(url, headersMap);
+		return sendGetUserRequest;
+	}
+
+	public static RestResponse authorizedUserTowardsCatalogBe(User sdncUserDetails) throws IOException {
+
+		Map<String, String> headersMap = new HashMap<String, String>();
+		headersMap.put(HttpHeaderEnum.CONTENT_TYPE.getValue(), "application/json");
+		headersMap.put(HttpHeaderEnum.ACCEPT.getValue(), "application/json");
+		headersMap.put(HttpHeaderEnum.USER_ID.getValue(), sdncUserDetails.getUserId());
+		if (sdncUserDetails.getFirstName() != null) {
+			headersMap.put(HttpHeaderEnum.HTTP_CSP_FIRSTNAME.getValue(), sdncUserDetails.getFirstName());
+		}
+		if (sdncUserDetails.getLastName() != null) {
+			headersMap.put(HttpHeaderEnum.HTTP_CSP_LASTNAME.getValue(), sdncUserDetails.getLastName());
+		}
+		if (sdncUserDetails.getEmail() != null) {
+			headersMap.put(HttpHeaderEnum.HTTP_CSP_EMAIL.getValue(), sdncUserDetails.getEmail());
+		}
+
+		logger.debug("headersMap: {}", headersMap.toString());
+
+		Config config = Utils.getConfig();
+		HttpRequest http = new HttpRequest();
+		String url = String.format(Urls.AUTHORIZE_USER, config.getCatalogBeHost(), config.getCatalogBePort());
+		logger.debug("Send GET request to login as seal user : {}", url);
+		return http.httpSendGet(url, headersMap);
+	}
+
+	public static RestResponse authorizedUserTowardsCatalogBeQA(User sdncUserDetails) throws IOException {
+
+		Map<String, String> headersMap = new HashMap<String, String>();
+		headersMap.put(HttpHeaderEnum.CONTENT_TYPE.getValue(), "application/json");
+		headersMap.put(HttpHeaderEnum.ACCEPT.getValue(), "application/json");
+		headersMap.put(HttpHeaderEnum.USER_ID.getValue(), sdncUserDetails.getUserId());
+		if (sdncUserDetails.getFirstName() != null) {
+			headersMap.put(HttpHeaderEnum.HTTP_CSP_FIRSTNAME.getValue(), sdncUserDetails.getFirstName());
+		}
+		if (sdncUserDetails.getLastName() != null) {
+			headersMap.put(HttpHeaderEnum.HTTP_CSP_LASTNAME.getValue(), sdncUserDetails.getLastName());
+		}
+		if (sdncUserDetails.getEmail() != null) {
+			headersMap.put(HttpHeaderEnum.HTTP_CSP_EMAIL.getValue(), sdncUserDetails.getEmail());
+		}
+
+		logger.debug("headersMap: {}", headersMap.toString());
+
+		Config config = Utils.getConfig();
+		HttpRequest http = new HttpRequest();
+		String url = String.format(Urls.AUTHORIZE_USER, config.getCatalogBeHost(), config.getCatalogBePort());
+		logger.debug("Send GET request to login as seal user : {}", url);
+		return http.httpSendGet(url, headersMap);
+	}
+
+}
diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/utils/validation/ArtifactValidationUtils.java b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/utils/validation/ArtifactValidationUtils.java
new file mode 100644
index 0000000000..62d491a3b1
--- /dev/null
+++ b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/utils/validation/ArtifactValidationUtils.java
@@ -0,0 +1,219 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * SDC
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.sdc.ci.tests.utils.validation;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.google.gson.JsonElement;
+import com.google.gson.JsonParser;
+import org.openecomp.sdc.be.model.ArtifactDefinition;
+import org.openecomp.sdc.be.model.Component;
+import org.openecomp.sdc.be.model.ComponentInstance;
+import org.openecomp.sdc.be.resources.data.DAOArtifactData;
+import org.openecomp.sdc.ci.tests.config.Config;
+import org.openecomp.sdc.ci.tests.datatypes.ArtifactReqDetails;
+import org.openecomp.sdc.ci.tests.datatypes.enums.ArtifactTypeEnum;
+import org.openecomp.sdc.ci.tests.datatypes.http.RestResponse;
+import org.openecomp.sdc.ci.tests.utils.Decoder;
+import org.openecomp.sdc.ci.tests.utils.Utils;
+import org.openecomp.sdc.ci.tests.utils.general.FileUtils;
+import org.openecomp.sdc.common.api.ArtifactGroupTypeEnum;
+
+import java.io.File;
+import java.io.IOException;
+import java.util.List;
+import java.util.Map;
+
+import static org.testng.AssertJUnit.assertEquals;
+import static org.testng.AssertJUnit.assertTrue;
+
+public class ArtifactValidationUtils {
+
+	private static String desc = "description";
+	private static String artifactType = "artifactType";
+	private static String artifactName = "artifactName";
+	private static String artifactChecksum = "artifactChecksum";
+	private static String uniqueId = "uniqueId";
+	protected Utils utils;
+
+	public static void validateInformationalArtifact(ArtifactReqDetails expectedArtifact,
+			Map<String, Object> actualArtifact) {
+		assertTrue("description is not as expected",
+				expectedArtifact.getDescription().equals(actualArtifact.get(desc).toString()));
+		assertTrue("artifactType is not as expected",
+				expectedArtifact.getArtifactType().toUpperCase().equals(actualArtifact.get(artifactType).toString()));
+		assertTrue("artifactName is not as expected",
+				expectedArtifact.getArtifactName().equals(actualArtifact.get(artifactName).toString()));
+		assertTrue("uniqueId is not as expected",
+				expectedArtifact.getUniqueId().equals(actualArtifact.get(uniqueId).toString()));
+		assertTrue("description is not as expected", expectedArtifact.getArtifactLabel().toLowerCase()
+				.equals(actualArtifact.get("artifactLabel").toString()));
+	}
+
+	public static void validateArtifactsNumberInComponent(Component component, ArtifactGroupTypeEnum artifactGroupType,
+			ArtifactTypeEnum artifactType, int expectedNumber) {
+		Map<String, ArtifactDefinition> deploymentArtifacts;
+		int counter = 0;
+		if (artifactGroupType == ArtifactGroupTypeEnum.DEPLOYMENT) {
+			deploymentArtifacts = component.getDeploymentArtifacts();
+		} else {
+			deploymentArtifacts = component.getArtifacts();
+		}
+		if (deploymentArtifacts != null) {
+			for (ArtifactDefinition artifactDefinition : deploymentArtifacts.values()) {
+				if (artifactDefinition.getArtifactType().equals(artifactType.getType())) {
+					counter++;
+				}
+			}
+		}
+		assertEquals("Unexpected number of " + artifactGroupType.getType() + " artifacts in component", expectedNumber,
+				counter);
+	}
+
+	// Benny
+	public static void validateArtifactsNumberInComponentInstance(ComponentInstance componentInstance,
+			ArtifactGroupTypeEnum artifactGroupType, ArtifactTypeEnum artifactType, int expectedNumber) {
+		Map<String, ArtifactDefinition> deploymentArtifacts = null;
+		int counter = 0;
+		if (artifactGroupType == ArtifactGroupTypeEnum.DEPLOYMENT) {
+			deploymentArtifacts = componentInstance.getDeploymentArtifacts();
+		}
+		if (deploymentArtifacts != null) {
+			for (ArtifactDefinition artifactDefinition : deploymentArtifacts.values()) {
+				if (artifactDefinition.getArtifactType().equals(artifactType.getType())) {
+					counter++;
+				}
+			}
+		}
+		assertEquals("Unexpected number of " + artifactGroupType.getType() + " artifacts in component", expectedNumber,
+				counter);
+	}
+
+	public static DAOArtifactData parseArtifactRespFromES(RestResponse resResponse) throws Exception {
+		String bodyToParse = resResponse.getResponse();
+		JsonElement jElement = new JsonParser().parse(bodyToParse);
+		JsonElement jsourceElement = jElement.getAsJsonObject().get("_source");
+
+		ObjectMapper mapper = new ObjectMapper();
+
+		return mapper.readValue(jsourceElement.toString(), DAOArtifactData.class);
+
+	}
+
+	public static void validateArtifactReqVsResp(ArtifactReqDetails expectedArtifactDetails,
+			ArtifactDefinition actualArtifactJavaObject) {
+		String expected;
+
+		expected = expectedArtifactDetails.getArtifactName();
+		if (expected == null)
+			expected = "";
+		assertEquals("artifact name is not correct ", expected, actualArtifactJavaObject.getArtifactName());
+
+		expected = expectedArtifactDetails.getArtifactType();
+		if (expected == null)
+			expected = "";
+		assertEquals("artifact type is not correct ", expected, actualArtifactJavaObject.getArtifactType());
+
+		expected = expectedArtifactDetails.getDescription();
+		if (expected == null)
+			expected = "";
+		assertEquals("artifact description is not correct ", expected, actualArtifactJavaObject.getDescription());
+
+		expected = expectedArtifactDetails.getArtifactLabel();
+		if (expected == null || expected == "") {
+			expected = expectedArtifactDetails.getArtifactName().toLowerCase().substring(0,
+					expectedArtifactDetails.getArtifactName().lastIndexOf("."));
+			// expected = tmp.substring(0,
+			// artifactInfo.getArtifactName().lastIndexOf("."));
+		}
+		assertEquals("artifact label is not correct ", expected, actualArtifactJavaObject.getArtifactLabel());
+
+		expected = expectedArtifactDetails.getUrl();
+		if (expected != "") {
+			assertEquals(expected, actualArtifactJavaObject.getApiUrl());
+			assertEquals(expectedArtifactDetails.getArtifactDisplayName(),
+					actualArtifactJavaObject.getArtifactDisplayName());
+		}
+
+		// assertEquals(validChecksum,
+		// actualArtifactJavaObject.getArtifactChecksum());
+
+		// expected = expectedArtifactDetails.getArtifactDisplayName();
+		// if (expected != "")
+		// {
+		// assertEquals(expected,
+		// actualArtifactJavaObject.getArtifactDisplayName());
+		// }
+
+		boolean actual = actualArtifactJavaObject.getMandatory();
+		assertEquals(expectedArtifactDetails.isMandatory(), actual);
+
+		if (actualArtifactJavaObject.getServiceApi()) {
+
+			boolean actual2 = actualArtifactJavaObject.getServiceApi();
+			assertEquals(expectedArtifactDetails.isServiceApi(), actual2);
+		}
+
+	}
+
+	public static void validateEsArtifactReqVsResp(ArtifactReqDetails expectedArtifactInfo,
+			DAOArtifactData DAOArtifactData) throws Exception {
+		String expectedArtifactUid = expectedArtifactInfo.getUniqueId();
+		if (expectedArtifactUid == null)
+			expectedArtifactUid = "";
+		assertEquals("artifact name is not correct ", expectedArtifactUid, DAOArtifactData.getId());
+
+		String actualPayload = Decoder.encode(DAOArtifactData.getData().array());
+		assertEquals("artifact payloadData is not correct ", expectedArtifactInfo.getPayload(), actualPayload);
+	}
+
+	public static List<String> getListOfArtifactFromFolder(String folderName) throws IOException, Exception {
+		Config config = Utils.getConfig();
+		String sourceDir = config.getResourceConfigDir();
+		String testResourcesPath = sourceDir + File.separator + folderName;
+		List<String> listofFiles = FileUtils.getFileListFromBaseDirectoryByTestName(testResourcesPath);
+		return listofFiles;
+	}
+
+	public static ArtifactReqDetails replaceDefaultArtWithArtFromList_(ArtifactReqDetails heatArtifactDetails,
+			String heatExtension, String folderName, int positionInlist) throws IOException, Exception {
+
+		Config config = Utils.getConfig();
+		String ext = heatExtension;
+		String sourceDir = config.getResourceConfigDir();
+		String testResourcesPath = sourceDir + File.separator + folderName;
+		List<String> listFileName = FileUtils.getFileListFromBaseDirectoryByTestName(testResourcesPath);
+		String payload = FileUtils.loadPayloadFile(listFileName, ext, true);
+		heatArtifactDetails.setPayload(payload);
+		heatArtifactDetails.setArtifactName(listFileName.get(positionInlist) + "." + ext);
+		return heatArtifactDetails;
+	}
+
+	public static ArtifactReqDetails replaceDefaultArtWithArtFromList(ArtifactReqDetails heatArtifactDetails,
+			String heatExtension, String folderName, int positionInlist) throws IOException, Exception {
+		List<String> listOfArtifactFromFolder = getListOfArtifactFromFolder(folderName);
+		String payload = FileUtils.loadPayloadFileFromListUsingPosition(listOfArtifactFromFolder, heatExtension, true,
+				positionInlist);
+		heatArtifactDetails.setPayload(payload);
+		heatArtifactDetails.setArtifactName(heatArtifactDetails.getArtifactType()
+				+ listOfArtifactFromFolder.get(positionInlist) + "." + heatExtension);
+		return heatArtifactDetails;
+	}
+}
diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/utils/validation/AuditValidationUtils.java b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/utils/validation/AuditValidationUtils.java
new file mode 100644
index 0000000000..4240f046ef
--- /dev/null
+++ b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/utils/validation/AuditValidationUtils.java
@@ -0,0 +1,1002 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * SDC
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.sdc.ci.tests.utils.validation;
+
+import com.datastax.driver.core.ColumnDefinitions;
+import com.datastax.driver.core.Row;
+import org.apache.logging.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.codehaus.jettison.json.JSONArray;
+import org.codehaus.jettison.json.JSONException;
+import org.codehaus.jettison.json.JSONObject;
+import org.javatuples.Pair;
+import org.openecomp.sdc.be.dao.api.ActionStatus;
+import org.openecomp.sdc.be.datatypes.elements.ConsumerDataDefinition;
+import org.openecomp.sdc.be.model.ArtifactDefinition;
+import org.openecomp.sdc.be.model.LifecycleStateEnum;
+import org.openecomp.sdc.be.model.User;
+import org.openecomp.sdc.be.model.category.CategoryDefinition;
+import org.openecomp.sdc.be.model.category.GroupingDefinition;
+import org.openecomp.sdc.be.model.category.SubCategoryDefinition;
+import org.openecomp.sdc.be.resources.data.auditing.AuditingActionEnum;
+import org.openecomp.sdc.ci.tests.api.Urls;
+import org.openecomp.sdc.ci.tests.config.Config;
+import org.openecomp.sdc.ci.tests.datatypes.ServiceReqDetails;
+import org.openecomp.sdc.ci.tests.datatypes.enums.AuditEnum;
+import org.openecomp.sdc.ci.tests.datatypes.enums.AuditJsonKeysEnum;
+import org.openecomp.sdc.ci.tests.datatypes.enums.ComponentType;
+import org.openecomp.sdc.ci.tests.datatypes.enums.ErrorInfo;
+import org.openecomp.sdc.ci.tests.datatypes.expected.*;
+import org.openecomp.sdc.ci.tests.datatypes.http.HttpRequest;
+import org.openecomp.sdc.ci.tests.datatypes.http.RestResponse;
+import org.openecomp.sdc.ci.tests.utils.Utils;
+import org.openecomp.sdc.ci.tests.utils.cassandra.CassandraUtils;
+import org.openecomp.sdc.ci.tests.utils.rest.BaseRestUtils;
+import org.openecomp.sdc.ci.tests.utils.rest.CategoryRestUtils.CategoryAuditJsonKeysEnum;
+import org.openecomp.sdc.ci.tests.utils.rest.ConsumerRestUtils.EcompConsumerAuditJsonKeysEnum;
+import org.openecomp.sdc.ci.tests.utils.rest.ResponseParser;
+import org.openecomp.sdc.common.api.Constants;
+import org.openecomp.sdc.common.datastructure.AuditingFieldsKey;
+
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.util.*;
+
+import static org.testng.AssertJUnit.assertEquals;
+import static org.testng.AssertJUnit.assertTrue;
+
+public class AuditValidationUtils {
+	protected static Logger logger = LogManager.getLogger(AuditValidationUtils.class);
+	private static final String auditKeySpaceName = "sdcaudit";
+
+	public AuditValidationUtils() {
+		super();
+		logger = LogManager.getLogger(AuditValidationUtils.class);
+
+	}
+
+	public static String buildAuditDescription(ErrorInfo errorInfo, List<String> errorVariablesList) {
+		String auditDesc;
+		if(errorInfo.getMessageId() != null){
+			auditDesc = errorInfo.getMessageId() + ": " + errorInfo.getMessage();
+			}else{
+				auditDesc = errorInfo.getMessage();
+			}
+		
+//		if(! variables.isEmpty() && variables.get(0) != null && ! variables.get(0).isEmpty()){
+//			for (int i = 0; i < variables.size(); i++) {
+//				if (auditDesc.contains("%" + (i + 1))) {
+//					auditDesc = auditDesc.replace("%" + (i + 1), variables.get(i));
+//				}
+//			}
+//		}
+		if(errorVariablesList != null && ! errorVariablesList.isEmpty() && errorVariablesList.get(0) != null){
+			for (int i = 0; i < errorVariablesList.size(); i++) {
+				if (auditDesc.contains("%" + (i + 1))) {
+					auditDesc = auditDesc.replace("%" + (i + 1), errorVariablesList.get(i));
+				}
+			}
+		}
+		return auditDesc;
+	}
+
+	public static String getModifierString(String userName, String uid) {
+
+		if (userName.isEmpty() && uid.isEmpty())
+			return "(UNKNOWN)";
+
+		StringBuilder sb = new StringBuilder();
+		sb.append(userName).append("(").append(uid).append(")");
+		return sb.toString();
+
+	}
+
+	public static void validateAuditDownloadExternalAPI(ExpectedResourceAuditJavaObject resourceAuditJavaObject,
+			String action, String body, boolean checkAllFields) throws Exception {
+		Map<String, Object> actualAuditRecords = parseAuditResourceByAction(action, null);
+
+		validateField(actualAuditRecords, AuditJsonKeysEnum.ACTION.getAuditJsonKeyName(), action);
+		validateField(actualAuditRecords, AuditJsonKeysEnum.RESOURCE_NAME.getAuditJsonKeyName(), resourceAuditJavaObject.getResourceName());
+		validateField(actualAuditRecords, AuditJsonKeysEnum.RESOURCE_TYPE.getAuditJsonKeyName(), resourceAuditJavaObject.getResourceType());
+		validateField(actualAuditRecords, AuditJsonKeysEnum.STATUS.getAuditJsonKeyName(), resourceAuditJavaObject.getStatus());
+		validateField(actualAuditRecords, AuditJsonKeysEnum.DESCRIPTION.getAuditJsonKeyName(), resourceAuditJavaObject.getDesc());
+
+	}
+
+	public static void validateAudit(ExpectedResourceAuditJavaObject resourceAuditJavaObject, String action, String body, boolean checkAllFields) throws Exception {
+		Map<String, Object> actualAuditRecords = parseAuditResourceByAction(action, null);
+
+		if ((resourceAuditJavaObject.getModifierName() != null) && (resourceAuditJavaObject.getModifierUid() != null)) {
+			resourceAuditJavaObject.setModifierUid(getModifierString(resourceAuditJavaObject.getModifierName(),
+					resourceAuditJavaObject.getModifierUid()));
+		}
+
+		validateField(actualAuditRecords, AuditJsonKeysEnum.ACTION.getAuditJsonKeyName(), action);
+		validateField(actualAuditRecords, AuditJsonKeysEnum.RESOURCE_NAME.getAuditJsonKeyName(), resourceAuditJavaObject.getResourceName());
+		validateField(actualAuditRecords, AuditJsonKeysEnum.RESOURCE_TYPE.getAuditJsonKeyName(), resourceAuditJavaObject.getResourceType());
+		validateField(actualAuditRecords, AuditJsonKeysEnum.PREV_VERSION.getAuditJsonKeyName(),	resourceAuditJavaObject.getPrevVersion());
+		validateField(actualAuditRecords, AuditJsonKeysEnum.CURR_VERSION.getAuditJsonKeyName(),	resourceAuditJavaObject.getCurrVersion());
+
+		validateField(actualAuditRecords, AuditJsonKeysEnum.MODIFIER.getAuditJsonKeyName(), resourceAuditJavaObject.getModifierUid());
+		validateField(actualAuditRecords, AuditJsonKeysEnum.PREV_STATE.getAuditJsonKeyName(), resourceAuditJavaObject.getPrevState());
+		validateField(actualAuditRecords, AuditJsonKeysEnum.CURR_STATE.getAuditJsonKeyName(), resourceAuditJavaObject.getCurrState());
+		validateField(actualAuditRecords, AuditJsonKeysEnum.STATUS.getAuditJsonKeyName(), resourceAuditJavaObject.getStatus());
+		validateField(actualAuditRecords, AuditJsonKeysEnum.DESCRIPTION.getAuditJsonKeyName(), resourceAuditJavaObject.getDesc());
+		validateField(actualAuditRecords, AuditJsonKeysEnum.COMMENT.getAuditJsonKeyName(), resourceAuditJavaObject.getComment());
+		validateField(actualAuditRecords, AuditJsonKeysEnum.TOSCA_NODE_TYPE.getAuditJsonKeyName(), resourceAuditJavaObject.getToscaNodeType());
+		validateField(actualAuditRecords, AuditJsonKeysEnum.CURR_ARTIFACT_UUID.getAuditJsonKeyName(), resourceAuditJavaObject.getCurrArtifactUuid());
+		validateField(actualAuditRecords, AuditJsonKeysEnum.PREV_ARTIFACT_UUID.getAuditJsonKeyName(), resourceAuditJavaObject.getPrevArtifactUuid());
+
+		validateAtifactDataField(actualAuditRecords, AuditJsonKeysEnum.ARTIFACT_DATA.getAuditJsonKeyName(), resourceAuditJavaObject.getArtifactData(), checkAllFields);
+	}
+
+	public static void validateExternalAudit(ExpectedExternalAudit externalAuditObject, String action, Map<AuditingFieldsKey, String> body) throws Exception {
+
+		Map<String, Object> actualAuditRecord = parseAuditResourceByAction(action, body);
+
+		validateField(actualAuditRecord, AuditJsonKeysEnum.ACTION.getAuditJsonKeyName(), action);
+		validateField(actualAuditRecord, AuditJsonKeysEnum.CONSUMER_ID.getAuditJsonKeyName(), externalAuditObject.getCONSUMER_ID());
+		// TODO
+		validateField(actualAuditRecord, AuditJsonKeysEnum.RESOURCE_URL.getAuditJsonKeyName(), externalAuditObject.getRESOURCE_URL());
+		//TODO
+		validateField(actualAuditRecord, AuditJsonKeysEnum.RESOURCE_NAME.getAuditJsonKeyName(), externalAuditObject.getRESOURCE_NAME());
+		validateField(actualAuditRecord, AuditJsonKeysEnum.SERVICE_INSTANCE_ID.getAuditJsonKeyName(), externalAuditObject.getSERVICE_INSTANCE_ID());
+		//TODO
+		validateField(actualAuditRecord, AuditJsonKeysEnum.RESOURCE_TYPE.getAuditJsonKeyName(), externalAuditObject.getRESOURCE_TYPE());
+		validateField(actualAuditRecord, AuditJsonKeysEnum.STATUS.getAuditJsonKeyName(), externalAuditObject.getSTATUS());
+		validateField(actualAuditRecord, AuditJsonKeysEnum.DESCRIPTION.getAuditJsonKeyName(), externalAuditObject.getDESC());
+		//TODO
+//		validateField(actualAuditRecord, AuditJsonKeysEnum.MODIFIER.getAuditJsonKeyName(), externalAuditObject.getMODIFIER());
+		validateField(actualAuditRecord, AuditJsonKeysEnum.PREV_ARTIFACT_UUID.getAuditJsonKeyName(), externalAuditObject.getPREV_ARTIFACT_UUID());
+		validateField(actualAuditRecord, AuditJsonKeysEnum.CURR_ARTIFACT_UUID.getAuditJsonKeyName(), externalAuditObject.getCURR_ARTIFACT_UUID());
+		//TODO
+		validateField(actualAuditRecord, AuditJsonKeysEnum.ARTIFACT_DATA.getAuditJsonKeyName(), externalAuditObject.getARTIFACT_DATA());
+
+	}
+
+	public enum ArtifactDataFieldEnum {
+		attGroup, artLabel, artType, artName, artTimeout, artPayloadUUID, artVersion, artUUID
+	}
+
+	private static void validateAtifactDataField(Map<String, Object> map, String auditJsonKeyName,
+			String expectedArtifactData, boolean checkAllFields) {
+		Map<ArtifactDataFieldEnum, String> expectedArtifactDataFileds = new HashMap<ArtifactDataFieldEnum, String>();
+		Map<ArtifactDataFieldEnum, String> actualAtifactDataFileds = new HashMap<ArtifactDataFieldEnum, String>();
+		if (expectedArtifactData != null) {
+			String[] expected = expectedArtifactData.split(",");
+
+			assertTrue("Audit field " + auditJsonKeyName + " not found", map.containsKey(auditJsonKeyName));
+			String actualValue = (String) map.get(auditJsonKeyName);
+			String[] actual = actualValue.split(",");
+
+			if (expected.length == 1 && actual.length == 1) {
+				assertEquals(expectedArtifactData, actualValue);
+				return;
+			}
+
+			assertEquals(ArtifactDataFieldEnum.values().length, expected.length);
+			assertEquals(ArtifactDataFieldEnum.values().length, actual.length);
+
+			for (ArtifactDataFieldEnum field : ArtifactDataFieldEnum.values()) {
+
+				expectedArtifactDataFileds.put(field, expected[field.ordinal()]);
+				actualAtifactDataFileds.put(field, actual[field.ordinal()]);
+			}
+			for (Map.Entry<ArtifactDataFieldEnum, String> entry : expectedArtifactDataFileds.entrySet()) {
+				ArtifactDataFieldEnum field = entry.getKey();
+				if (checkAllFields || (!field.equals(ArtifactDataFieldEnum.artVersion)
+						&& !field.equals(ArtifactDataFieldEnum.artUUID))) {
+					assertTrue("Audit field ArtifactData dosn't containt " + field,
+							actualAtifactDataFileds.containsKey(field));
+					assertEquals("Audit field ArtifactData dosn't equal " + field,
+							expectedArtifactDataFileds.get(field), actualAtifactDataFileds.get(field));
+				}
+
+			}
+		}
+	}
+
+	// //Benny
+	public static void validateEcompConsumerAudit(ExpectedEcomConsumerAudit ecompConsumerAuditJavaObject, String action) throws Exception {
+
+		String fixedAction = BaseRestUtils.encodeUrlForDownload(action);
+		Map<String, Object> map2 = parseAuditResourceByAction(fixedAction, null);
+
+		validateField(map2, EcompConsumerAuditJsonKeysEnum.MODIFIER.getAuditJsonKeyName(), ecompConsumerAuditJavaObject.getModifier());
+		validateField(map2, EcompConsumerAuditJsonKeysEnum.ECOMP_USER.getAuditJsonKeyName(), ecompConsumerAuditJavaObject.getEcomUser());
+		validateField(map2, EcompConsumerAuditJsonKeysEnum.STATUS.getAuditJsonKeyName(), ecompConsumerAuditJavaObject.getStatus());
+		validateField(map2, EcompConsumerAuditJsonKeysEnum.DESC.getAuditJsonKeyName(), ecompConsumerAuditJavaObject.getDesc());
+		validateField(map2, EcompConsumerAuditJsonKeysEnum.ACTION.getAuditJsonKeyName(), action);
+	}
+
+	public static void ecompConsumerAuditSuccess(String action, ConsumerDataDefinition consumerDataDefinition, User user, int status) throws Exception {
+		ExpectedEcomConsumerAudit expectedEcomConsumerAuditJavaObject = new ExpectedEcomConsumerAudit();
+		expectedEcomConsumerAuditJavaObject.setAction(action);
+		expectedEcomConsumerAuditJavaObject.setEcomUser(
+				consumerDataDefinition.getConsumerName() + "," + consumerDataDefinition.getConsumerSalt().toLowerCase()
+						+ "," + consumerDataDefinition.getConsumerPassword().toLowerCase());
+		expectedEcomConsumerAuditJavaObject.setStatus(String.valueOf(status));
+		expectedEcomConsumerAuditJavaObject.setDesc("OK");
+		expectedEcomConsumerAuditJavaObject.setModifier(user.getFullName() + "(" + user.getUserId() + ")");
+		AuditValidationUtils.validateEcompConsumerAudit(expectedEcomConsumerAuditJavaObject, action);
+	}
+
+	public static void createEcompConsumerAuditFailure(String action, ConsumerDataDefinition consumerDataDefinition,
+			User user, ActionStatus errorMessage, Object... variables) throws Exception {
+		// validate audit
+		ErrorInfo errorInfo = ErrorValidationUtils.parseErrorConfigYaml(errorMessage.name());
+		ExpectedEcomConsumerAudit expectedEcomConsumerAuditJavaObject = new ExpectedEcomConsumerAudit();
+		expectedEcomConsumerAuditJavaObject.setAction(action);
+		expectedEcomConsumerAuditJavaObject.setEcomUser(
+				consumerDataDefinition.getConsumerName() + "," + consumerDataDefinition.getConsumerSalt().toLowerCase()
+						+ "," + consumerDataDefinition.getConsumerPassword().toLowerCase());
+		expectedEcomConsumerAuditJavaObject.setStatus(errorInfo.getCode().toString());
+		expectedEcomConsumerAuditJavaObject.setDesc(errorInfo.getAuditDesc(variables));
+		expectedEcomConsumerAuditJavaObject.setModifier(user.getFullName() + "(" + user.getUserId() + ")");
+		AuditValidationUtils.validateEcompConsumerAudit(expectedEcomConsumerAuditJavaObject, action);
+	}
+
+	public static void deleteEcompConsumerAuditFailure(String action, ConsumerDataDefinition consumerDataDefinition,
+			User user, ActionStatus errorMessage, Object... variables) throws Exception {
+		// validate audit
+		ErrorInfo errorInfo = ErrorValidationUtils.parseErrorConfigYaml(errorMessage.name());
+		ExpectedEcomConsumerAudit expectedEcomConsumerAuditJavaObject = new ExpectedEcomConsumerAudit();
+		// String auditAction = ADD_ECOMP_USER_CREDENTIALS_AUDIT_ACTION;
+		expectedEcomConsumerAuditJavaObject.setAction(action);
+		expectedEcomConsumerAuditJavaObject.setEcomUser(consumerDataDefinition.getConsumerName());
+		expectedEcomConsumerAuditJavaObject.setStatus(errorInfo.getCode().toString());
+		expectedEcomConsumerAuditJavaObject.setDesc(errorInfo.getAuditDesc(variables));
+		expectedEcomConsumerAuditJavaObject.setModifier(user.getFullName() + "(" + user.getUserId() + ")");
+		AuditValidationUtils.validateEcompConsumerAudit(expectedEcomConsumerAuditJavaObject, action);
+	}
+
+	////////////////////// US571255
+	public static void GetListOfUsersByRolesAuditFailure(String action, String roles, int status, User userModifier,
+			ActionStatus errorMessage, Object... variables) throws Exception {
+		ErrorInfo errorInfo = ErrorValidationUtils.parseErrorConfigYaml(errorMessage.name());
+		ExpectedGetUserListAudit expectedGetListOfUsersAuditJavaObject = new ExpectedGetUserListAudit(); // String
+																											// auditAction
+																											// =
+																											// ADD_ECOMP_USER_CREDENTIALS_AUDIT_ACTION;
+		expectedGetListOfUsersAuditJavaObject.setAction(action);
+		expectedGetListOfUsersAuditJavaObject.setStatus(String.valueOf(status));
+		expectedGetListOfUsersAuditJavaObject.setDesc(errorInfo.getAuditDesc(variables));
+
+		expectedGetListOfUsersAuditJavaObject.setDetails(roles);
+		if (errorMessage == ActionStatus.USER_INACTIVE || errorMessage == ActionStatus.MISSING_INFORMATION) {
+			expectedGetListOfUsersAuditJavaObject.setModifier("(UNKNOWN)");
+		} else {
+			expectedGetListOfUsersAuditJavaObject
+					.setModifier(userModifier.getFullName() + "(" + userModifier.getUserId() + ")");
+		}
+		AuditValidationUtils.validateAuditGetListOfUsersByRoles(expectedGetListOfUsersAuditJavaObject, action);
+	}
+
+	public static void GetListOfUsersByRolesAuditSuccess(String action, String roles, User user, int status)
+			throws Exception {
+		ExpectedGetUserListAudit expectedGetListOfUsersAuditJavaObject = new ExpectedGetUserListAudit();
+		expectedGetListOfUsersAuditJavaObject.setAction(action);
+		expectedGetListOfUsersAuditJavaObject.setStatus(String.valueOf(status));
+		expectedGetListOfUsersAuditJavaObject.setDesc("OK");
+		expectedGetListOfUsersAuditJavaObject.setModifier(user.getFullName() + "(" + user.getUserId() + ")");
+		expectedGetListOfUsersAuditJavaObject.setDetails(roles);
+		validateAuditGetListOfUsersByRoles(expectedGetListOfUsersAuditJavaObject, action);
+	}
+
+	public static void validateAuditGetListOfUsersByRoles(ExpectedGetUserListAudit GetListOfUsersAuditJavaObject,
+			String action) throws Exception {
+
+		Map<String, Object> map2 = parseAuditResourceByAction(action, null);
+		validateField(map2, AuditJsonKeysEnum.ACTION.getAuditJsonKeyName(), action);
+		validateField(map2, AuditJsonKeysEnum.STATUS.getAuditJsonKeyName(), GetListOfUsersAuditJavaObject.getStatus());
+		validateField(map2, AuditJsonKeysEnum.MODIFIER.getAuditJsonKeyName(), GetListOfUsersAuditJavaObject.getModifier());
+		validateField(map2, AuditJsonKeysEnum.DESCRIPTION.getAuditJsonKeyName(), GetListOfUsersAuditJavaObject.getDesc());
+		validateField(map2, AuditJsonKeysEnum.DETAILS.getAuditJsonKeyName(), GetListOfUsersAuditJavaObject.getDetails());
+	}
+
+	public static void validateAuditImport(ExpectedResourceAuditJavaObject resourceAuditJavaObject, String action) throws Exception {
+
+		Map<String, Object> map2 = parseAuditResourceByAction(action, null);
+
+		resourceAuditJavaObject.setModifierUid(getModifierString(resourceAuditJavaObject.getModifierName(), resourceAuditJavaObject.getModifierUid()));
+
+		validateField(map2, AuditJsonKeysEnum.ACTION.getAuditJsonKeyName(), action);
+		validateField(map2, AuditJsonKeysEnum.RESOURCE_TYPE.getAuditJsonKeyName(), resourceAuditJavaObject.getResourceType());
+		validateField(map2, AuditJsonKeysEnum.PREV_VERSION.getAuditJsonKeyName(), resourceAuditJavaObject.getPrevVersion());
+		validateField(map2, AuditJsonKeysEnum.CURR_VERSION.getAuditJsonKeyName(), resourceAuditJavaObject.getCurrVersion());
+		validateField(map2, AuditJsonKeysEnum.MODIFIER.getAuditJsonKeyName(), resourceAuditJavaObject.getModifierUid());
+		validateField(map2, AuditJsonKeysEnum.PREV_STATE.getAuditJsonKeyName(), resourceAuditJavaObject.getPrevState());
+		validateField(map2, AuditJsonKeysEnum.CURR_STATE.getAuditJsonKeyName(), resourceAuditJavaObject.getCurrState());
+		validateField(map2, AuditJsonKeysEnum.STATUS.getAuditJsonKeyName(), resourceAuditJavaObject.getStatus());
+		validateField(map2, AuditJsonKeysEnum.DESCRIPTION.getAuditJsonKeyName(), resourceAuditJavaObject.getDesc());
+
+	}
+
+	public static void validateAuditDistribution(ExpectedResourceAuditJavaObject resourceAuditJavaObject, String action) throws Exception {
+
+		Map<String, Object> map2 = parseAuditResourceByAction(action, null);
+
+		resourceAuditJavaObject.setModifierUid(getModifierString(resourceAuditJavaObject.getModifierName(), resourceAuditJavaObject.getModifierUid()));
+
+		validateField(map2, AuditJsonKeysEnum.ACTION.getAuditJsonKeyName(), action);
+		validateField(map2, AuditJsonKeysEnum.RESOURCE_NAME.getAuditJsonKeyName(), resourceAuditJavaObject.getResourceName());
+		validateField(map2, AuditJsonKeysEnum.RESOURCE_TYPE.getAuditJsonKeyName(), resourceAuditJavaObject.getResourceType());
+		validateField(map2, AuditJsonKeysEnum.CURR_VERSION.getAuditJsonKeyName(), resourceAuditJavaObject.getCurrVersion());
+		validateField(map2, AuditJsonKeysEnum.MODIFIER.getAuditJsonKeyName(), resourceAuditJavaObject.getModifierUid());
+		validateField(map2, AuditJsonKeysEnum.CURR_STATE.getAuditJsonKeyName(), resourceAuditJavaObject.getCurrState());
+		validateField(map2, AuditJsonKeysEnum.DPREV_STATUS.getAuditJsonKeyName(), resourceAuditJavaObject.getDprevStatus());
+		validateField(map2, AuditJsonKeysEnum.DCURR_STATUS.getAuditJsonKeyName(), resourceAuditJavaObject.getDcurrStatus());
+		validateField(map2, AuditJsonKeysEnum.STATUS.getAuditJsonKeyName(), resourceAuditJavaObject.getStatus());
+		validateField(map2, AuditJsonKeysEnum.DESCRIPTION.getAuditJsonKeyName(), resourceAuditJavaObject.getDesc());
+		validateField(map2, AuditJsonKeysEnum.COMMENT.getAuditJsonKeyName(), resourceAuditJavaObject.getComment());
+		validateField(map2, AuditJsonKeysEnum.DID.getAuditJsonKeyName(), resourceAuditJavaObject.getDistributionId());
+
+	}
+
+	// Benny
+	public static void validateAudit_Distribution(ExpectedResourceAuditJavaObject resourceAuditJavaObject, String action) throws Exception {
+
+		List<Map<String, Object>> actionToList = getAuditListByAction(resourceAuditJavaObject.getAction(), 1);
+		Map<String, Object> map2 = actionToList.get(0);
+		validateField(map2, AuditJsonKeysEnum.ACTION.getAuditJsonKeyName(), action);
+		validateField(map2, AuditJsonKeysEnum.RESOURCE_NAME.getAuditJsonKeyName(), resourceAuditJavaObject.getResourceName());
+		validateField(map2, AuditJsonKeysEnum.RESOURCE_TYPE.getAuditJsonKeyName(), resourceAuditJavaObject.getResourceType());
+		validateField(map2, AuditJsonKeysEnum.CURR_VERSION.getAuditJsonKeyName(), resourceAuditJavaObject.getCurrVersion());
+		validateField(map2, AuditJsonKeysEnum.MODIFIER.getAuditJsonKeyName(), resourceAuditJavaObject.getMODIFIER());
+		validateField(map2, AuditJsonKeysEnum.CURR_STATE.getAuditJsonKeyName(), resourceAuditJavaObject.getCurrState());
+		validateField(map2, AuditJsonKeysEnum.DPREV_STATUS.getAuditJsonKeyName(), resourceAuditJavaObject.getDprevStatus());
+		validateField(map2, AuditJsonKeysEnum.DCURR_STATUS.getAuditJsonKeyName(), resourceAuditJavaObject.getDcurrStatus());
+		validateField(map2, AuditJsonKeysEnum.STATUS.getAuditJsonKeyName(), resourceAuditJavaObject.getStatus());
+		validateField(map2, AuditJsonKeysEnum.DESCRIPTION.getAuditJsonKeyName(), resourceAuditJavaObject.getDesc());
+		validateField(map2, AuditJsonKeysEnum.COMMENT.getAuditJsonKeyName(), resourceAuditJavaObject.getComment());
+
+	}
+
+	public void validateAuditNotification(ExpectedResourceAuditJavaObject resourceAuditJavaObject, String action) throws Exception {
+
+		Map<String, Object> map2 = parseAuditResourceByAction(action, null);
+
+		resourceAuditJavaObject.setModifierUid(getModifierString(resourceAuditJavaObject.getModifierName(), resourceAuditJavaObject.getModifierUid()));
+
+		validateField(map2, AuditJsonKeysEnum.ACTION.getAuditJsonKeyName(), action);
+		validateField(map2, AuditJsonKeysEnum.RESOURCE_NAME.getAuditJsonKeyName(), resourceAuditJavaObject.getResourceName());
+		validateField(map2, AuditJsonKeysEnum.RESOURCE_TYPE.getAuditJsonKeyName(), resourceAuditJavaObject.getResourceType());
+		validateField(map2, AuditJsonKeysEnum.CURR_VERSION.getAuditJsonKeyName(), resourceAuditJavaObject.getCurrVersion());
+		validateField(map2, AuditJsonKeysEnum.CURR_STATE.getAuditJsonKeyName(), resourceAuditJavaObject.getCurrState());
+		validateField(map2, AuditJsonKeysEnum.STATUS.getAuditJsonKeyName(), resourceAuditJavaObject.getStatus());
+		validateField(map2, AuditJsonKeysEnum.DESCRIPTION.getAuditJsonKeyName(), resourceAuditJavaObject.getDesc());
+		validateField(map2, AuditJsonKeysEnum.DID.getAuditJsonKeyName(), resourceAuditJavaObject.getDistributionId());
+		validateField(map2, AuditJsonKeysEnum.TOPIC_NAME.getAuditJsonKeyName(), resourceAuditJavaObject.getTopicName());
+
+	}
+
+	public static void validateAudit(ExpectedDistDownloadAudit expectedDistDownloadAudit, String action) throws Exception {
+
+		Map<String, Object> map2 = parseAuditResourceByAction(action, null);
+
+		validateField(map2, AuditJsonKeysEnum.ACTION.getAuditJsonKeyName(), action);
+		validateField(map2, AuditJsonKeysEnum.STATUS.getAuditJsonKeyName(), expectedDistDownloadAudit.getStatus());
+		validateField(map2, AuditJsonKeysEnum.DESCRIPTION.getAuditJsonKeyName(), expectedDistDownloadAudit.getDesc());
+		validateField(map2, AuditJsonKeysEnum.CONSUMER_ID.getAuditJsonKeyName(), expectedDistDownloadAudit.getConsumerId());
+		validateField(map2, AuditJsonKeysEnum.RESOURCE_URL.getAuditJsonKeyName(), expectedDistDownloadAudit.getResourceUrl());
+	}
+	
+	public static void validateAuditExternalSearchAPI(ExpectedExternalAudit expectedDistDownloadAudit, String action, Map<AuditingFieldsKey, String> body)
+			throws Exception {
+
+		Map<String, Object> map2 = parseAuditResourceByAction(action, body);
+
+		validateField(map2, AuditJsonKeysEnum.ACTION.getAuditJsonKeyName(), action);
+		validateField(map2, AuditJsonKeysEnum.STATUS.getAuditJsonKeyName(), expectedDistDownloadAudit.getSTATUS());
+		validateField(map2, AuditJsonKeysEnum.DESCRIPTION.getAuditJsonKeyName(), expectedDistDownloadAudit.getDESC());
+		validateField(map2, AuditJsonKeysEnum.CONSUMER_ID.getAuditJsonKeyName(), expectedDistDownloadAudit.getCONSUMER_ID());
+		validateField(map2, AuditJsonKeysEnum.RESOURCE_URL.getAuditJsonKeyName(), expectedDistDownloadAudit.getRESOURCE_URL());
+	}
+	
+	public static void validateAuditExternalCreateResource(ExpectedResourceAuditJavaObject expectedExternalAudit, String action, Map<AuditingFieldsKey, String> body) throws Exception {
+	Map<String, Object>	map2 = parseAuditResourceByAction(action, body);
+
+		validateField(map2, AuditJsonKeysEnum.ACTION.getAuditJsonKeyName(), action);
+		validateField(map2, AuditJsonKeysEnum.RESOURCE_NAME.getAuditJsonKeyName(), expectedExternalAudit.getResourceName());
+		validateField(map2, AuditJsonKeysEnum.RESOURCE_TYPE.getAuditJsonKeyName(), expectedExternalAudit.getResourceType());
+		validateField(map2, AuditJsonKeysEnum.CONSUMER_ID.getAuditJsonKeyName(), expectedExternalAudit.getCONSUMER_ID());
+		validateField(map2, AuditJsonKeysEnum.RESOURCE_URL.getAuditJsonKeyName(), expectedExternalAudit.getRESOURCE_URL());
+		validateField(map2, AuditJsonKeysEnum.MODIFIER.getAuditJsonKeyName(), expectedExternalAudit.getMODIFIER());
+		
+		validateField(map2, AuditJsonKeysEnum.PREV_VERSION.getAuditJsonKeyName(), expectedExternalAudit.getPrevVersion());
+		validateField(map2, AuditJsonKeysEnum.CURR_VERSION.getAuditJsonKeyName(), expectedExternalAudit.getCurrVersion());
+		validateField(map2, AuditJsonKeysEnum.PREV_STATE.getAuditJsonKeyName(), expectedExternalAudit.getPrevState());
+		validateField(map2, AuditJsonKeysEnum.CURR_STATE.getAuditJsonKeyName(), expectedExternalAudit.getCurrState());
+		
+		validateField(map2, AuditJsonKeysEnum.STATUS.getAuditJsonKeyName(), expectedExternalAudit.getStatus());
+		validateField(map2, AuditJsonKeysEnum.DESCRIPTION.getAuditJsonKeyName(), expectedExternalAudit.getDesc());
+	}
+	
+	public static void validateAuditExternalChangeAssetLifeCycle(ExpectedResourceAuditJavaObject expectedExternalAudit, String action, Map<AuditingFieldsKey, String> body) throws Exception {
+		Map<String, Object> map2 = parseAuditResourceByAction(action, body);
+
+		validateField(map2, AuditJsonKeysEnum.ACTION.getAuditJsonKeyName(), action);
+		validateField(map2, AuditJsonKeysEnum.DESCRIPTION.getAuditJsonKeyName(), expectedExternalAudit.getDesc());
+		validateField(map2, AuditJsonKeysEnum.STATUS.getAuditJsonKeyName(), expectedExternalAudit.getStatus());
+
+		validateField(map2, AuditJsonKeysEnum.RESOURCE_TYPE.getAuditJsonKeyName(), expectedExternalAudit.getResourceType());
+		validateField(map2, AuditJsonKeysEnum.RESOURCE_NAME.getAuditJsonKeyName(), expectedExternalAudit.getResourceName());
+		validateField(map2, AuditJsonKeysEnum.CONSUMER_ID.getAuditJsonKeyName(), expectedExternalAudit.getCONSUMER_ID());
+		validateField(map2, AuditJsonKeysEnum.RESOURCE_URL.getAuditJsonKeyName(), expectedExternalAudit.getRESOURCE_URL());
+		validateField(map2, AuditJsonKeysEnum.MODIFIER.getAuditJsonKeyName(), expectedExternalAudit.getMODIFIER());
+		
+		validateField(map2, AuditJsonKeysEnum.PREV_VERSION.getAuditJsonKeyName(), expectedExternalAudit.getPrevVersion());
+		validateField(map2, AuditJsonKeysEnum.CURR_VERSION.getAuditJsonKeyName(), expectedExternalAudit.getCurrVersion());
+		validateField(map2, AuditJsonKeysEnum.PREV_STATE.getAuditJsonKeyName(), expectedExternalAudit.getPrevState());
+		validateField(map2, AuditJsonKeysEnum.CURR_STATE.getAuditJsonKeyName(), expectedExternalAudit.getCurrState());
+
+	}
+
+	public void validateAuditDeploy(ExpectedResourceAuditJavaObject resourceAuditJavaObject, String action)
+			throws Exception {
+
+		Map<String, Object> map2 = parseAuditResourceByAction(action, null);
+
+		resourceAuditJavaObject.setModifierUid(getModifierString(resourceAuditJavaObject.getModifierName(), resourceAuditJavaObject.getModifierUid()));
+
+		validateField(map2, AuditJsonKeysEnum.ACTION.getAuditJsonKeyName(), action);
+		validateField(map2, AuditJsonKeysEnum.RESOURCE_NAME.getAuditJsonKeyName(), resourceAuditJavaObject.getResourceName());
+		validateField(map2, AuditJsonKeysEnum.RESOURCE_TYPE.getAuditJsonKeyName(), resourceAuditJavaObject.getResourceType());
+		validateField(map2, AuditJsonKeysEnum.CURR_VERSION.getAuditJsonKeyName(), resourceAuditJavaObject.getCurrVersion());
+		validateField(map2, AuditJsonKeysEnum.MODIFIER.getAuditJsonKeyName(), resourceAuditJavaObject.getModifierUid());
+		validateField(map2, AuditJsonKeysEnum.STATUS.getAuditJsonKeyName(), resourceAuditJavaObject.getStatus());
+		validateField(map2, AuditJsonKeysEnum.DESCRIPTION.getAuditJsonKeyName(), resourceAuditJavaObject.getDesc());
+		validateField(map2, AuditJsonKeysEnum.DID.getAuditJsonKeyName(), resourceAuditJavaObject.getDistributionId());
+
+	}
+
+	public static void validateAuditProduct(ExpectedProductAudit productExpectedAudit, String action,
+			AuditJsonKeysEnum... additionalFields) throws Exception {
+
+		Map<String, Object> map2 = parseAuditResourceByAction(action, null);
+
+		validateField(map2, AuditJsonKeysEnum.ACTION.getAuditJsonKeyName(), action);
+		validateField(map2, AuditJsonKeysEnum.RESOURCE_NAME.getAuditJsonKeyName(), productExpectedAudit.getRESOURCE_NAME());
+		validateField(map2, AuditJsonKeysEnum.RESOURCE_TYPE.getAuditJsonKeyName(), productExpectedAudit.getRESOURCE_TYPE());
+		validateField(map2, AuditJsonKeysEnum.PREV_VERSION.getAuditJsonKeyName(), productExpectedAudit.getPREV_VERSION());
+		validateField(map2, AuditJsonKeysEnum.CURR_VERSION.getAuditJsonKeyName(), productExpectedAudit.getCURR_VERSION());
+		validateField(map2, AuditJsonKeysEnum.PREV_STATE.getAuditJsonKeyName(), productExpectedAudit.getPREV_STATE());
+		validateField(map2, AuditJsonKeysEnum.CURR_STATE.getAuditJsonKeyName(), productExpectedAudit.getCURR_STATE());
+		validateField(map2, AuditJsonKeysEnum.MODIFIER.getAuditJsonKeyName(), productExpectedAudit.getMODIFIER());
+		validateField(map2, AuditJsonKeysEnum.STATUS.getAuditJsonKeyName(), productExpectedAudit.getSTATUS());
+		validateField(map2, AuditJsonKeysEnum.DESCRIPTION.getAuditJsonKeyName(), productExpectedAudit.getDESC());
+		validateField(map2, AuditJsonKeysEnum.SERVICE_INSTANCE_ID.getAuditJsonKeyName(), productExpectedAudit.getSERVICE_INSTANCE_ID());
+		if (additionalFields != null) {
+			List<AuditJsonKeysEnum> fieldsList = Arrays.asList(additionalFields);
+			if (fieldsList.contains(AuditJsonKeysEnum.COMMENT)) {
+				validateField(map2, AuditJsonKeysEnum.COMMENT.getAuditJsonKeyName(), productExpectedAudit.getCOMMENT());
+			}
+		}
+	}
+
+	private static List<Map<String, Object>> getAuditListByAction(String action, int expectedNumOfAudit)
+			throws Exception {
+		List<Map<String, Object>> actionToList = parseAuditResourceByActionToList(action, null);
+		assertEquals("recieved different audits number than expected", expectedNumOfAudit, actionToList.size());
+		return actionToList;
+	}
+
+	public static void validateAuthenticationAudit(ExpectedAuthenticationAudit expectedAudit) throws Exception {
+		List<Map<String, Object>> actionToList = getAuditListByAction(expectedAudit.getAction(), 1);
+		assertEquals("expected number of ES action is 1", 1, actionToList.size());
+
+		Map<String, Object> map = actionToList.get(0);
+		validateField(map, AuditEnum.ACTION.getValue(), expectedAudit.getAction());
+		validateField(map, AuditEnum.URL.getValue(), expectedAudit.getUrl());
+		validateField(map, AuditEnum.USER.getValue(), expectedAudit.getUser());
+		validateField(map, AuditEnum.AUTH_STATUS.getValue(), expectedAudit.getAuthStatus());
+		validateField(map, AuditEnum.REALM.getValue(), expectedAudit.getRealm());
+
+	}
+
+	private static void validateField(Map<String, Object> actualAuditRecord, String jsonField, Object expectedValue) {
+		if (expectedValue == null) {
+			// || changed to &&
+			if (actualAuditRecord.containsKey(jsonField)) {
+				assertTrue("Audit field " + jsonField + ": expected null, actual " + actualAuditRecord.get(jsonField),
+						actualAuditRecord.get(jsonField).toString().equals("null")
+								|| actualAuditRecord.get(jsonField).toString().equals(Constants.EMPTY_STRING));
+			}
+
+		} else {
+			assertTrue("Audit field " + jsonField + " not found in actual", actualAuditRecord.containsKey(jsonField));
+			Object foundValue = actualAuditRecord.get(jsonField);
+			compareElements(expectedValue, foundValue);
+		}
+	}
+
+	public static void compareElements(Object expectedValue, Object foundValue) {
+		if (expectedValue instanceof String) {
+			assertTrue("Actual value " + foundValue + " is not string", foundValue instanceof String);
+			assertTrue("Expected " + "[" + expectedValue +"]" + " not equal to actual [" + foundValue + "]", foundValue.equals(expectedValue));
+		}
+		/*
+		 * else if( expectedValue instanceof Number){ assertTrue(foundValue
+		 * instanceof Number); assertTrue(foundValue == expectedValue); }
+		 */
+		else if (expectedValue instanceof Boolean) {
+			assertTrue(foundValue instanceof Boolean);
+			assertTrue(foundValue == expectedValue);
+		} else if (expectedValue instanceof Map) {
+			assertTrue(foundValue instanceof Map);
+			Map<String, Object> foundMap = (Map<String, Object>) foundValue;
+			Map<String, Object> excpectedMap = (Map<String, Object>) expectedValue;
+			assertTrue("size of maps is not equel", foundMap.size() == excpectedMap.size());
+			Iterator<String> foundkeyItr = foundMap.keySet().iterator();
+			while (foundkeyItr.hasNext()) {
+				String foundKey = foundkeyItr.next();
+				assertTrue(excpectedMap.containsKey(foundKey));
+				compareElements(excpectedMap.get(foundKey), foundMap.get(foundKey));
+			}
+
+		} else if (expectedValue instanceof List) {
+			assertTrue(foundValue instanceof List);
+			List<Object> foundList = (List<Object>) foundValue;
+			List<Object> excpectedList = (List<Object>) expectedValue;
+			assertTrue("size of maps is not equel", foundList.size() == excpectedList.size());
+            if( foundList.size() > 0 ){
+                final Object elementInList = foundList.get(0);
+                if( !(elementInList instanceof List || elementInList instanceof Map) ){
+                       List<Object> tempList = new ArrayList<>();
+                       tempList.addAll(foundList);
+                       for(Object expectedObj : excpectedList){
+                              if( tempList.contains(expectedObj)){
+                                     tempList.remove(expectedObj);
+                              }
+                              else{
+                            	  assertTrue(false);
+                              }
+                       }
+                       assertTrue("Lists are not equel", tempList.isEmpty());
+                }
+            }
+
+		} else {
+			assertTrue(foundValue.equals(expectedValue));
+		}
+	}
+
+	// public static Map<String, Object> parseAuditResourceByAction(String
+	// action, String body) throws Exception {
+	//
+	// Map auditingMessage = null;
+	// auditingMessage = retrieveAuditMessagesByPattern(action, null);
+	//
+	// return auditingMessage;
+	//
+	// }
+
+	public static Map<String, Object> parseAuditResourceByAction(String action, Map<AuditingFieldsKey, String> body) throws Exception {
+
+		Map auditingMessage = null;
+		auditingMessage = retrieveAuditMessagesByPattern(action, body, false);
+		return auditingMessage;
+
+	}
+
+	public static List<Map<String, Object>> parseAuditResourceByActionToList(String action,
+			Map<AuditingFieldsKey, String> body) throws Exception {
+
+		Map auditingMessage = null;
+
+		if (body == null || body.isEmpty()) {
+			auditingMessage = retrieveAuditMessagesByPattern(action, null, false);
+		} else {
+			auditingMessage = retrieveAuditMessagesByPattern(action, body, false);
+		}
+
+		return ResponseParser.getAuditFromMessage(auditingMessage);
+	}
+
+	public JSONObject buildElasticQueryStringObject(String defaultField, String queryValue) throws JSONException {
+
+		JSONObject query_string = new JSONObject();
+		JSONObject jSONObject = new JSONObject();
+		jSONObject.put("default_field", defaultField);
+		jSONObject.put("query", queryValue);
+
+		query_string.put("query_string", jSONObject);
+
+		return query_string;
+	}
+
+	public static JSONObject buildElasticQueryBody(List<JSONObject> listObjects) throws JSONException {
+
+		JSONObject query = new JSONObject();
+		JSONObject bool = new JSONObject();
+		JSONObject must = new JSONObject();
+		JSONArray mustA = new JSONArray();
+
+		for (int i = 0; i < listObjects.size(); i++) {
+			JSONObject match = new JSONObject();
+			match.put("match", listObjects.get(i));
+			mustA.put(match);
+
+		}
+
+		must.put("must", mustA);
+		bool.put("bool", must);
+		query.put("query", bool);
+
+		return query;
+	}
+
+	public static String retrieveAuditMessagesUsingBody(String query_string) throws IOException {
+
+		Config config = Utils.getConfig();
+		HttpRequest getAuditingMessage = new HttpRequest();
+		Map<String, String> headersMap = new HashMap<String, String>();
+		String body = query_string;
+
+		String url = String.format(Urls.GET_SEARCH_DATA_FROM_ES, config.getEsHost(), config.getEsPort(), "_search");
+		RestResponse restResponse = getAuditingMessage.httpSendPost(url, body, headersMap);
+
+		return restResponse.getResponse();
+	}
+
+	public static Map<String, String> retrieveAuditMessagesByPattern(String action, Map<AuditingFieldsKey, String> body, Boolean retryFlag)
+			throws IOException {
+
+		// get cassandra table name by action
+		String esType = AuditingActionEnum.fromName(action).getAuditingEsType();
+		Map<String, String> resultsMap = new HashMap<String, String>();
+
+		List<Pair<AuditingFieldsKey, String>> myFields = new ArrayList<Pair<AuditingFieldsKey, String>>();
+		Pair<AuditingFieldsKey, String> myPair = new Pair<AuditingFieldsKey, String>(
+				AuditingFieldsKey.AUDIT_ACTION, action);
+		myFields.add(0, myPair);
+		if (body != null && !body.isEmpty()) {
+			for (Map.Entry<AuditingFieldsKey, String> mapElement : body.entrySet()) {
+				myFields.add(new Pair<AuditingFieldsKey, String>(mapElement.getKey(), mapElement.getValue()));
+			}
+		}
+
+		List<Row> fetchFromTable = CassandraUtils.fetchFromTable(auditKeySpaceName, esType, myFields);
+		if(retryFlag){
+			if(fetchFromTable.size() == 0){
+				return resultsMap;
+			}
+		}
+//		assertTrue("expected on fetching from data base one record only, actual: " + fetchFromTable.size(), fetchFromTable.size() == 1);
+		
+		
+		
+		
+		Row row =null;
+		
+		if (fetchFromTable.size() > 1){
+			List<Row> fetchFromTable2 = fetchFromTable;
+			fetchFromTable2.sort((p1, p2) -> p1.getTimestamp(1).compareTo(p2.getTimestamp(1)));
+			row = fetchFromTable2.get(fetchFromTable2.size() - 1);
+		}
+		else {row = fetchFromTable.get(0);}
+
+		ColumnDefinitions columnDefinitions = row.getColumnDefinitions();
+
+		for (int i = 0; i < columnDefinitions.size(); i++) {
+			resultsMap.put(columnDefinitions.getName(i), row.getObject(columnDefinitions.getName(i)) == null ? "null"
+					: row.getObject(columnDefinitions.getName(i)).toString());
+		}
+
+		return resultsMap;
+	}
+
+	public static void categoryAuditSuccess(String action, CategoryDefinition categoryDefinition, User user, int status,
+			String resourceType) throws Exception {
+		categoryAuditSuccessInternal(action, categoryDefinition, null, null, user, status, resourceType);
+	}
+
+	public static void categoryAuditFailure(String action, CategoryDefinition categoryDataDefinition, User user,
+			ActionStatus errorMessage, int status, String resourceType, Object... variables) throws Exception {
+		categoryAuditFailureInternal(action, categoryDataDefinition, null, null, user, errorMessage, status,
+				resourceType, variables);
+	}
+
+	public static void subCategoryAuditSuccess(String action, CategoryDefinition categoryDefinition,
+			SubCategoryDefinition subCategoryDefinition, User user, int status, String resourceType) throws Exception {
+		categoryAuditSuccessInternal(action, categoryDefinition, subCategoryDefinition, null, user, status,
+				resourceType);
+	}
+
+	public static void groupingAuditSuccess(String action, CategoryDefinition categoryDefinition,
+			SubCategoryDefinition subCategoryDefinition, GroupingDefinition groupingDefinition, User user, int status,
+			String resourceType) throws Exception {
+		categoryAuditSuccessInternal(action, categoryDefinition, subCategoryDefinition, groupingDefinition, user,
+				status, resourceType);
+	}
+
+	public static void subCategoryAuditFailure(String action, CategoryDefinition categoryDataDefinition,
+			SubCategoryDefinition subCategoryDefinition, User user, ActionStatus errorMessage, int status,
+			String resourceType, Object... variables) throws Exception {
+		categoryAuditFailureInternal(action, categoryDataDefinition, subCategoryDefinition, null, user, errorMessage,
+				status, resourceType, variables);
+	}
+
+	// NEW Benny
+	public static void groupingAuditFailure(String action, CategoryDefinition categoryDefinition,
+			SubCategoryDefinition subCategoryDefinition, GroupingDefinition groupingDefinition, User user,
+			ActionStatus errorMessage, int status, String resourceType, Object... variables) throws Exception {
+		groupingAuditFailureInternal(action, categoryDefinition, subCategoryDefinition, groupingDefinition, user,
+				errorMessage, status, resourceType, variables);
+	}
+
+	private static void groupingAuditFailureInternal(String action, CategoryDefinition categoryDataDefinition,
+			SubCategoryDefinition subCategoryDefinition, GroupingDefinition groupingDefinition, User user,
+			ActionStatus errorMessage, int status, String resourceType, Object... variables) throws Exception {
+		// validate audit
+		ErrorInfo errorInfo = ErrorValidationUtils.parseErrorConfigYaml(errorMessage.name());
+		ExpectedCategoryAudit expectedCatrgoryAuditJavaObject = new ExpectedCategoryAudit();
+		expectedCatrgoryAuditJavaObject.setAction(action);
+		expectedCatrgoryAuditJavaObject.setModifier(user.getFullName() + "(" + user.getUserId() + ")");
+		expectedCatrgoryAuditJavaObject.setCategoryName(categoryDataDefinition.getName());
+		String subCategoryName = (subCategoryDefinition != null ? subCategoryDefinition.getName() : Constants.EMPTY_STRING);
+		expectedCatrgoryAuditJavaObject.setSubCategoryName(subCategoryName);
+		String groupingName = (groupingDefinition != null ? groupingDefinition.getName() : Constants.EMPTY_STRING);
+		expectedCatrgoryAuditJavaObject.setGroupingName(groupingName);
+		expectedCatrgoryAuditJavaObject.setResourceType(resourceType);
+		expectedCatrgoryAuditJavaObject.setStatus(String.valueOf(status));
+		expectedCatrgoryAuditJavaObject.setDesc(errorInfo.getAuditDesc(variables));
+		AuditValidationUtils.validateCategoryAudit(expectedCatrgoryAuditJavaObject, action);
+	}
+
+	///
+	private static void categoryAuditSuccessInternal(String action, CategoryDefinition categoryDefinition,
+			SubCategoryDefinition subCategoryDefinition, GroupingDefinition groupingDefinition, User user, int status,
+			String resourceType) throws Exception {
+		// resourceType = Service/Resource/Product
+		ExpectedCategoryAudit expectedCatrgoryAuditJavaObject = new ExpectedCategoryAudit();
+		expectedCatrgoryAuditJavaObject.setAction(action);
+		expectedCatrgoryAuditJavaObject.setModifier(user.getFullName() + "(" + user.getUserId() + ")");
+		expectedCatrgoryAuditJavaObject.setCategoryName(categoryDefinition.getName());
+		String subCategoryName = (subCategoryDefinition != null ? subCategoryDefinition.getName()
+				: Constants.EMPTY_STRING);
+		expectedCatrgoryAuditJavaObject.setSubCategoryName(subCategoryName);
+		String groupingName = (groupingDefinition != null ? groupingDefinition.getName() : Constants.EMPTY_STRING);
+		expectedCatrgoryAuditJavaObject.setGroupingName(groupingName);
+		expectedCatrgoryAuditJavaObject.setResourceType(resourceType);
+		expectedCatrgoryAuditJavaObject.setStatus(String.valueOf(status));
+		expectedCatrgoryAuditJavaObject.setDesc("OK");
+		AuditValidationUtils.validateCategoryAudit(expectedCatrgoryAuditJavaObject, action);
+	}
+
+	///////////////////////////
+	///// BENNNNNNNNY
+	public enum UserAuditJsonKeysEnum {
+		ACTION("ACTION"), MODIFIER("MODIFIER"), STATUS("STATUS"), DESC("DESCRIPTION"), USER_AFTER("USER_AFTER"), USER_BEFORE("USER_BEFORE");
+		private String auditJsonKeyName;
+
+		private UserAuditJsonKeysEnum(String auditJsonKeyName) {
+			this.auditJsonKeyName = auditJsonKeyName;
+		}
+
+		public String getAuditJsonKeyName() {
+			return auditJsonKeyName.toLowerCase();
+		}
+	}
+
+	public static void validateAddUserAudit(ExpectedUserCRUDAudit expectedAddUserAuditJavaObject, String action) throws Exception {
+
+		List<Map<String, Object>> actionToList = getAuditListByAction(expectedAddUserAuditJavaObject.getAction(), 1);
+		Map<String, Object> map = actionToList.get(0);
+		validateField(map, UserAuditJsonKeysEnum.ACTION.getAuditJsonKeyName(), action);
+		validateField(map, UserAuditJsonKeysEnum.MODIFIER.getAuditJsonKeyName(), expectedAddUserAuditJavaObject.getModifier());
+		validateField(map, UserAuditJsonKeysEnum.USER_AFTER.getAuditJsonKeyName(), expectedAddUserAuditJavaObject.getUserAfter());
+		validateField(map, UserAuditJsonKeysEnum.USER_BEFORE.getAuditJsonKeyName(), expectedAddUserAuditJavaObject.getUserBefore());
+		validateField(map, UserAuditJsonKeysEnum.STATUS.getAuditJsonKeyName(), expectedAddUserAuditJavaObject.getStatus());
+		validateField(map, UserAuditJsonKeysEnum.DESC.getAuditJsonKeyName(), expectedAddUserAuditJavaObject.getDesc());
+
+	}
+
+	private static void categoryAuditFailureInternal(String action, CategoryDefinition categoryDataDefinition,
+			SubCategoryDefinition subCategoryDefinition, GroupingDefinition groupingDefinition, User user,
+			ActionStatus errorMessage, int status, String resourceType, Object... variables) throws Exception {
+		// validate audit
+		ErrorInfo errorInfo = ErrorValidationUtils.parseErrorConfigYaml(errorMessage.name());
+		ExpectedCategoryAudit expectedCatrgoryAuditJavaObject = new ExpectedCategoryAudit();
+		expectedCatrgoryAuditJavaObject.setAction(action);
+		expectedCatrgoryAuditJavaObject.setModifier(user.getFullName() + "(" + user.getUserId() + ")");
+		expectedCatrgoryAuditJavaObject.setCategoryName(categoryDataDefinition.getName());
+		String subCategoryName = (subCategoryDefinition != null ? subCategoryDefinition.getName() : Constants.EMPTY_STRING);
+		expectedCatrgoryAuditJavaObject.setSubCategoryName(subCategoryName);
+		String groupingName = (groupingDefinition != null ? groupingDefinition.getName() : Constants.EMPTY_STRING);
+		expectedCatrgoryAuditJavaObject.setGroupingName(groupingName);
+		expectedCatrgoryAuditJavaObject.setResourceType(resourceType);
+		expectedCatrgoryAuditJavaObject.setStatus(String.valueOf(status));
+		expectedCatrgoryAuditJavaObject.setDesc(errorInfo.getAuditDesc(variables));
+		AuditValidationUtils.validateCategoryAudit(expectedCatrgoryAuditJavaObject, action);
+	}
+
+	public static void validateGetCategoryHirarchy(ExpectedCategoryAudit expectedCatrgoryAuditJavaObject, String action)
+			throws Exception {
+
+		List<Map<String, Object>> actionToList = getAuditListByAction(expectedCatrgoryAuditJavaObject.getAction(), 1);
+		Map<String, Object> map = actionToList.get(0);
+
+		expectedCatrgoryAuditJavaObject.setModifier(getModifierString(expectedCatrgoryAuditJavaObject.getModifierName(),
+				expectedCatrgoryAuditJavaObject.getModifierUid()));
+		validateField(map, CategoryAuditJsonKeysEnum.ACTION.getAuditJsonKeyName(), action);
+		validateField(map, CategoryAuditJsonKeysEnum.MODIFIER.getAuditJsonKeyName(), expectedCatrgoryAuditJavaObject.getModifier());
+		validateField(map, CategoryAuditJsonKeysEnum.DETAILS.getAuditJsonKeyName(), expectedCatrgoryAuditJavaObject.getDetails());
+		validateField(map, CategoryAuditJsonKeysEnum.STATUS.getAuditJsonKeyName(), expectedCatrgoryAuditJavaObject.getStatus());
+		validateField(map, CategoryAuditJsonKeysEnum.DESCRIPTION.getAuditJsonKeyName(), expectedCatrgoryAuditJavaObject.getDesc());
+
+	}
+
+	public static void validateCategoryAudit(ExpectedCategoryAudit expectedCatrgoryAuditJavaObject, String action)
+			throws Exception {
+
+		List<Map<String, Object>> actionToList = getAuditListByAction(expectedCatrgoryAuditJavaObject.getAction(), 1);
+		Map<String, Object> map = actionToList.get(0);
+		validateField(map, CategoryAuditJsonKeysEnum.ACTION.getAuditJsonKeyName(), action);
+		validateField(map, CategoryAuditJsonKeysEnum.MODIFIER.getAuditJsonKeyName(), expectedCatrgoryAuditJavaObject.getModifier());
+		validateField(map, CategoryAuditJsonKeysEnum.CATEGORY_NAME.getAuditJsonKeyName(), expectedCatrgoryAuditJavaObject.getCategoryName());
+		validateField(map, CategoryAuditJsonKeysEnum.SUB_CATEGORY_NAME.getAuditJsonKeyName(), expectedCatrgoryAuditJavaObject.getSubCategoryName());
+		validateField(map, CategoryAuditJsonKeysEnum.GROUPING_NAME.getAuditJsonKeyName(), expectedCatrgoryAuditJavaObject.getGroupingName());
+		validateField(map, CategoryAuditJsonKeysEnum.RESOURCE_TYPE.getAuditJsonKeyName(), expectedCatrgoryAuditJavaObject.getResourceType());
+		validateField(map, CategoryAuditJsonKeysEnum.STATUS.getAuditJsonKeyName(), expectedCatrgoryAuditJavaObject.getStatus());
+		validateField(map, CategoryAuditJsonKeysEnum.DESCRIPTION.getAuditJsonKeyName(), expectedCatrgoryAuditJavaObject.getDesc());
+	}
+
+	public static void GetCategoryHierarchyAuditSuccess(String action, String componentType, User user, int status)
+			throws Exception {
+		ExpectedGetUserListAudit expectedGetListOfUsersAuditJavaObject = new ExpectedGetUserListAudit();
+		expectedGetListOfUsersAuditJavaObject.setAction(action);
+		expectedGetListOfUsersAuditJavaObject.setStatus(String.valueOf(status));
+		expectedGetListOfUsersAuditJavaObject.setDesc("OK");
+		expectedGetListOfUsersAuditJavaObject.setModifier(user.getFullName() + "(" + user.getUserId() + ")");
+		expectedGetListOfUsersAuditJavaObject.setDetails(componentType.toLowerCase());
+		validateAuditGetListOfUsersByRoles(expectedGetListOfUsersAuditJavaObject, action);
+	}
+
+	public static String buildArtifactDataAudit(ArtifactDefinition artifactDefinition) {
+		StringBuilder sb = new StringBuilder();
+		if (artifactDefinition.getTimeout() == null) {
+			artifactDefinition.setTimeout(0);
+		}
+		if (artifactDefinition != null) {
+			sb.append(artifactDefinition.getArtifactGroupType() == null ? null
+					: artifactDefinition.getArtifactGroupType().getType()).append(",").append("'")
+					.append(artifactDefinition.getArtifactLabel()).append("'").append(",")
+					.append(artifactDefinition.getArtifactType()).append(",")
+					.append(artifactDefinition.getArtifactName()).append(",").append(artifactDefinition.getTimeout())
+					.append(",").append(artifactDefinition.getEsId());
+			sb.append(",");
+			if (artifactDefinition.getArtifactVersion() != null) {
+				sb.append(artifactDefinition.getArtifactVersion());
+			} else {
+				sb.append(" ");
+			}
+			sb.append(",");
+			if (artifactDefinition.getArtifactUUID() != null) {
+				sb.append(artifactDefinition.getArtifactUUID());
+			} else {
+				sb.append(" ");
+			}
+		}
+
+		return sb.toString();
+	}
+
+
+	public static ExpectedResourceAuditJavaObject expectedArtifactNotFoundAuditObject(String Action, String resourceUid,
+			ComponentType resourceType, String artifactUid, User user, String currState, String currVersion)
+			throws FileNotFoundException {
+		String desc = null;
+
+		ExpectedResourceAuditJavaObject expectedAudit = new ExpectedResourceAuditJavaObject();
+		expectedAudit.setAction(Action);
+		expectedAudit.setResourceName(resourceUid);
+		expectedAudit.setResourceType(resourceType.getValue());
+		expectedAudit.setPrevVersion("");
+		expectedAudit.setCurrVersion(currVersion);
+		expectedAudit.setModifierName(user.getFirstName() + " " + user.getLastName());
+		expectedAudit.setModifierUid(user.getUserId());
+		expectedAudit.setPrevState("");
+		expectedAudit.setCurrState(currState);
+		expectedAudit.setPrevArtifactUuid("");
+		expectedAudit.setCurrArtifactUuid(artifactUid);
+		expectedAudit.setArtifactData("");
+		expectedAudit.setStatus("404");
+
+		desc = buildAuditDescription(
+				new ErrorValidationUtils().parseErrorConfigYaml(ActionStatus.ARTIFACT_NOT_FOUND.name()),
+				Arrays.asList(""));
+
+		expectedAudit.setDesc(desc);
+		return expectedAudit;
+	}
+
+	public static JSONObject filterAuditByUuid(String action, String uuid) throws Exception {
+		Map<String, String> actionMap = new HashMap<>();
+		actionMap.put("ACTION", action);
+		JSONObject actionJsonObject = new JSONObject(actionMap);
+		Map<String, String> uuidMap = new HashMap<>();
+		uuidMap.put("SERVICE_INSTANCE_ID", uuid);
+		JSONObject uuidJsonObject = new JSONObject(uuidMap);
+
+		List<JSONObject> filters = new ArrayList<>(Arrays.asList(actionJsonObject, uuidJsonObject));
+		JSONObject body = buildElasticQueryBody(filters);
+		return body;
+	}
+
+	public static void validateAudit(ExpectedResourceAuditJavaObject resourceAuditJavaObject, String action) throws Exception {
+		List<Map<String, Object>> actionToList = getAuditListByAction(resourceAuditJavaObject.getAction(), 1);
+		Map<String, Object> map2 = actionToList.get(0);
+		validateField(map2, AuditJsonKeysEnum.ACTION.getAuditJsonKeyName(), action);
+		validateField(map2, AuditJsonKeysEnum.RESOURCE_NAME.getAuditJsonKeyName(), resourceAuditJavaObject.getResourceName());
+		validateField(map2, AuditJsonKeysEnum.RESOURCE_TYPE.getAuditJsonKeyName(), resourceAuditJavaObject.getResourceType());
+		validateField(map2, AuditJsonKeysEnum.PREV_VERSION.getAuditJsonKeyName(), resourceAuditJavaObject.getPrevVersion());
+		validateField(map2, AuditJsonKeysEnum.CURR_VERSION.getAuditJsonKeyName(), resourceAuditJavaObject.getCurrVersion());
+		validateField(map2, AuditJsonKeysEnum.MODIFIER.getAuditJsonKeyName(), resourceAuditJavaObject.getMODIFIER());
+		validateField(map2, AuditJsonKeysEnum.PREV_STATE.getAuditJsonKeyName(), resourceAuditJavaObject.getPrevState());
+		validateField(map2, AuditJsonKeysEnum.CURR_STATE.getAuditJsonKeyName(), resourceAuditJavaObject.getCurrState());
+		validateField(map2, AuditJsonKeysEnum.STATUS.getAuditJsonKeyName(), resourceAuditJavaObject.getStatus());
+		validateField(map2, AuditJsonKeysEnum.DESCRIPTION.getAuditJsonKeyName(), resourceAuditJavaObject.getDesc());
+		validateField(map2, AuditJsonKeysEnum.COMMENT.getAuditJsonKeyName(), resourceAuditJavaObject.getComment());
+	}
+
+	////// service audit validation/////////////////////
+
+	public static ExpectedResourceAuditJavaObject constructFieldsForAuditValidation(ServiceReqDetails serviceReqDetails,
+			String serviceVersion, User sdncUserDetails) {
+
+		ExpectedResourceAuditJavaObject expectedResourceAuditJavaObject = new ExpectedResourceAuditJavaObject();
+
+		expectedResourceAuditJavaObject.setAction("Create");
+		expectedResourceAuditJavaObject.setModifierUid(sdncUserDetails.getUserId());
+		String userFirstLastName = sdncUserDetails.getFirstName() + " " + sdncUserDetails.getLastName();
+		expectedResourceAuditJavaObject.setModifierName(userFirstLastName);
+		expectedResourceAuditJavaObject.setStatus("200");
+		expectedResourceAuditJavaObject.setDesc("OK");
+		expectedResourceAuditJavaObject.setResourceName(serviceReqDetails.getName());
+		expectedResourceAuditJavaObject.setResourceType("Service");
+		expectedResourceAuditJavaObject.setPrevVersion(String.valueOf(Float.parseFloat(serviceVersion) - 0.1f));
+		expectedResourceAuditJavaObject.setCurrVersion(serviceVersion);
+		expectedResourceAuditJavaObject.setPrevState((LifecycleStateEnum.NOT_CERTIFIED_CHECKOUT).toString());
+		expectedResourceAuditJavaObject.setCurrState((LifecycleStateEnum.NOT_CERTIFIED_CHECKOUT).toString());
+		expectedResourceAuditJavaObject.setComment(null);
+
+		return expectedResourceAuditJavaObject;
+
+	}
+
+	public static ExpectedResourceAuditJavaObject constructFieldsForAuditValidation(ServiceReqDetails serviceReqDetails,
+			String serviceVersion, User sdncUserDetails, ActionStatus errorStatus, List<String> variables)
+			throws FileNotFoundException {
+
+		ExpectedResourceAuditJavaObject expectedResourceAuditJavaObject = constructFieldsForAuditValidation(
+				serviceReqDetails, serviceVersion, sdncUserDetails);
+		ErrorInfo errorInfo = ErrorValidationUtils.parseErrorConfigYaml(errorStatus.name());
+
+		expectedResourceAuditJavaObject.setStatus(errorInfo.getCode().toString());
+		String auditDesc = AuditValidationUtils.buildAuditDescription(errorInfo, variables);
+		expectedResourceAuditJavaObject.setDesc(auditDesc);
+
+		return expectedResourceAuditJavaObject;
+
+	}
+
+}
diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/utils/validation/BaseValidationUtils.java b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/utils/validation/BaseValidationUtils.java
new file mode 100644
index 0000000000..b29fab4c57
--- /dev/null
+++ b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/utils/validation/BaseValidationUtils.java
@@ -0,0 +1,116 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * SDC
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.sdc.ci.tests.utils.validation;
+
+import org.openecomp.sdc.be.dao.api.ActionStatus;
+import org.openecomp.sdc.ci.tests.datatypes.enums.ErrorInfo;
+import org.openecomp.sdc.ci.tests.datatypes.http.RestResponse;
+import org.openecomp.sdc.ci.tests.utils.rest.ResponseParser;
+import org.openecomp.sdc.exception.ResponseFormat;
+import org.testng.Assert;
+
+import java.io.FileNotFoundException;
+import java.util.Arrays;
+
+import static org.testng.AssertJUnit.assertEquals;
+
+public class BaseValidationUtils {
+
+	public static final int STATUS_CODE_SUCCESS = 200;
+	public static final int STATUS_CODE_CREATED = 201;
+	public static final int STATUS_CODE_DELETE = 204;
+	public static final int STATUS_CODE_NOT_FOUND = 404;
+	public static final int STATUS_CODE_SUCCESS_NO_CONTENT = 204;
+	public static final int STATUS_CODE_SUCCESS_DELETE = 204;
+	public static final int STATUS_CODE_INVALID_CONTENT = 400;
+	public static final int STATUS_CODE_MISSING_DATA = 400;
+	public static final int STATUS_CODE_MISSING_INFORMATION = 403;
+	public static final int STATUS_CODE_RESTRICTED_ACCESS = 403;
+	public static final int STATUS_CODE_RESTRICTED_OPERATION = 409;
+	public static final int STATUS_CODE_ALREADY_EXISTS = 409;
+
+	// ------
+	protected static Boolean checkErrorCode(RestResponse deleteResponse) {
+		if (deleteResponse.getErrorCode() == STATUS_CODE_SUCCESS
+				|| deleteResponse.getErrorCode() == STATUS_CODE_DELETE) {
+			return true;
+		}
+		return false;
+	}
+
+	// *** STATUS CODE VALIDATION UTIITIES ****
+	public static void checkStatusCode(RestResponse response, String assertMessage, boolean AND, int... statuses) {
+		int statusCode = response.getErrorCode();
+		for (int status : statuses) {
+			if (AND && statusCode != status) {
+				Assert.fail(assertMessage + " status: " + statusCode);
+			} else if (statusCode == status) {
+				return;
+			}
+		}
+		if (!AND) {
+			Assert.fail(assertMessage + " status: " + statusCode);
+		}
+	}
+
+	public static void checkDeleteResponse(RestResponse response) {
+		checkStatusCode(response, "delete request failed", false, STATUS_CODE_DELETE, STATUS_CODE_NOT_FOUND,
+				STATUS_CODE_SUCCESS); // STATUS_CODE_SUCCESS for deActivate user
+	}
+
+	public static void checkCreateResponse(RestResponse response) {
+		checkStatusCode(response, "create request failed", false, STATUS_CODE_CREATED);
+	}
+
+	public static void checkSuccess(RestResponse response) {
+		checkStatusCode(response, "request failed", false, STATUS_CODE_SUCCESS);
+	}
+
+	public static void checkErrorResponse(RestResponse errorResponse, ActionStatus actionStatus,
+			String... expectedVariables) throws FileNotFoundException {
+		// Expected error
+		ErrorInfo expectedError = ErrorValidationUtils.parseErrorConfigYaml(actionStatus.name());
+		String expectedMessage = expectedError.getMessage();
+
+		// Actual error
+		ResponseFormat responseFormat = ResponseParser.parseToObjectUsingMapper(errorResponse.getResponse(),
+				ResponseFormat.class);
+		String actualMessage = responseFormat.getText();
+		String[] actualVariables = responseFormat.getVariables();
+
+		assertEquals("Unexpected error message", expectedMessage, actualMessage);
+		assertEquals("Unexpected error variables", Arrays.asList(expectedVariables), Arrays.asList(actualVariables));
+	}
+
+	public static void checkErrorMessageResponse(RestResponse errorResponse, ActionStatus actionStatus)
+			throws FileNotFoundException {
+		// Expected error
+		ErrorInfo expectedError = ErrorValidationUtils.parseErrorConfigYaml(actionStatus.name());
+		String expectedMessage = expectedError.getMessage();
+
+		// Actual error
+		ResponseFormat responseFormat = ResponseParser.parseToObjectUsingMapper(errorResponse.getResponse(),
+				ResponseFormat.class);
+		String actualMessage = responseFormat.getText();
+
+		assertEquals("Unexpected error message", expectedMessage, actualMessage);
+	}
+}
diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/utils/validation/CategoryValidationUtils.java b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/utils/validation/CategoryValidationUtils.java
new file mode 100644
index 0000000000..71a19eaa06
--- /dev/null
+++ b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/utils/validation/CategoryValidationUtils.java
@@ -0,0 +1,124 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * SDC
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.sdc.ci.tests.utils.validation;
+
+import org.json.JSONObject;
+import org.openecomp.sdc.be.model.category.CategoryDefinition;
+import org.openecomp.sdc.be.model.category.GroupingDefinition;
+import org.openecomp.sdc.be.model.category.SubCategoryDefinition;
+import org.openecomp.sdc.ci.tests.datatypes.http.RestResponse;
+import org.openecomp.sdc.ci.tests.utils.rest.CategoryRestUtils;
+
+import static org.testng.AssertJUnit.*;
+
+public class CategoryValidationUtils {
+
+	public static void verifyCategoryExistInGetResponse(RestResponse getAllCategoryRest,
+			CategoryDefinition categoryDefinition) {
+
+		int categoriesNum = CategoryRestUtils.getMatchingCategoriesNum(getAllCategoryRest, categoryDefinition);
+		assertEquals("category " + categoryDefinition.getName() + " not found during get or found more than once", 1,
+				categoriesNum);
+	}
+
+	public static void verifyCategoryNotExistsInGetResponse(RestResponse getAllCategoryRest,
+			CategoryDefinition categoryDefinition) {
+
+		int categoriesNum = CategoryRestUtils.getMatchingCategoriesNum(getAllCategoryRest, categoryDefinition);
+		assertEquals("category " + categoryDefinition.getName() + " should't be found during get", 0, categoriesNum);
+	}
+
+	public static void verifySubCategoryExistInGetResponse(RestResponse getAllCategoryRest, String parentCategoryId,
+			SubCategoryDefinition expectedSubCategoryDefinition) {
+
+		int subCategoriesNum = CategoryRestUtils.getMatchingSubCategoriesNum(getAllCategoryRest, parentCategoryId,
+				expectedSubCategoryDefinition);
+		assertEquals(
+				"sub-category " + expectedSubCategoryDefinition.getName()
+						+ " not found during get or found more than once for parentId " + parentCategoryId,
+				1, subCategoriesNum);
+	}
+
+	public static void verifyGroupingExistInGetResponse(RestResponse getAllCategoryRest, String parentCategoryId,
+			String subCategoryId, GroupingDefinition expectedGroupingDefinition) {
+
+		int groupingNum = CategoryRestUtils.getMatchingGroupingNum(getAllCategoryRest, parentCategoryId, subCategoryId,
+				expectedGroupingDefinition);
+		assertEquals(
+				"sub-category " + expectedGroupingDefinition.getName()
+						+ " not found during get or found more than once for parentId " + parentCategoryId,
+				1, groupingNum);
+	}
+
+	public static void verifyGroupingNotExistInGetResponse(RestResponse getAllCategoryRest, String parentCategoryId,
+			String subCategoryId, GroupingDefinition expectedGroupingDefinition) {
+
+		int groupingNum = CategoryRestUtils.getMatchingGroupingNum(getAllCategoryRest, parentCategoryId, subCategoryId,
+				expectedGroupingDefinition);
+		assertEquals(
+				"sub-category " + expectedGroupingDefinition.getName()
+						+ " not found during get or found more than once for parentId " + parentCategoryId,
+				0, groupingNum);
+	}
+
+	public static void verifySubCategoryNotExistsInGetResponse(RestResponse getAllCategoryRest, String parentCategoryId,
+			SubCategoryDefinition expectedSubCategoryDefinition) {
+
+		int subCategoriesNum = CategoryRestUtils.getMatchingSubCategoriesNum(getAllCategoryRest, parentCategoryId,
+				expectedSubCategoryDefinition);
+		assertEquals("sub-category " + expectedSubCategoryDefinition.getName()
+				+ " should't be found during get for parentId " + parentCategoryId, 0, subCategoriesNum);
+	}
+
+	/// NEE Benny
+	public static void validateCreateGroupResponse(RestResponse createSubCategoryRest,
+			GroupingDefinition expectedGroupDefinition) throws Exception {
+
+		String response = createSubCategoryRest.getResponse();
+		JSONObject jobject = new JSONObject(response);
+		assertTrue(jobject.get("name").equals(expectedGroupDefinition.getName()));
+		assertTrue(jobject.get("normalizedName").equals(expectedGroupDefinition.getNormalizedName()));
+		// assertNotNull(jobject.get("normalizedName"));
+		assertNotNull(jobject.get("uniqueId"));
+		expectedGroupDefinition.setUniqueId(jobject.get("uniqueId").toString());
+
+	}
+
+	public static void validateCreateSubCategoryResponse(RestResponse createSubCategoryRest,
+			SubCategoryDefinition expectedSubCategoryDefinition) throws Exception {
+
+		String response = createSubCategoryRest.getResponse();
+		JSONObject jobject = new JSONObject(response);
+		assertTrue(jobject.get("name").equals(expectedSubCategoryDefinition.getName()));
+		assertNotNull(jobject.get("normalizedName"));
+		assertNotNull(jobject.get("uniqueId"));
+	}
+
+	public static void validateCreateCategoryResponse(RestResponse createCategoryRest,
+			CategoryDefinition expectedCategoryDefinition) throws Exception {
+		String response = createCategoryRest.getResponse();
+		JSONObject jobject = new JSONObject(response);
+		assertTrue(jobject.get("name").equals(expectedCategoryDefinition.getName()));
+		assertTrue(jobject.get("normalizedName").equals(expectedCategoryDefinition.getNormalizedName()));
+		assertNotNull(jobject.get("uniqueId"));
+	}
+
+}
diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/utils/validation/CsarValidationUtils.java b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/utils/validation/CsarValidationUtils.java
new file mode 100644
index 0000000000..d85e093c17
--- /dev/null
+++ b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/utils/validation/CsarValidationUtils.java
@@ -0,0 +1,444 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * SDC
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.sdc.ci.tests.utils.validation;
+
+import org.openecomp.sdc.be.model.Resource;
+import org.openecomp.sdc.ci.tests.datatypes.GroupHeatMetaDefinition;
+import org.openecomp.sdc.ci.tests.datatypes.HeatMetaFirstLevelDefinition;
+import org.openecomp.sdc.ci.tests.datatypes.TypeHeatMetaDefinition;
+import org.openecomp.sdc.ci.tests.utils.CsarParserUtils;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import static org.testng.AssertJUnit.assertTrue;
+
+public class CsarValidationUtils {
+
+	public static void validateCsarVfArtifact(String csarUUID, Resource resource) throws Exception {
+
+		List<TypeHeatMetaDefinition> listTypeHeatMetaDefinition = CsarParserUtils.getListTypeHeatMetaDefinition(csarUUID);
+		assertTrue(
+				"check group count, expected: " + getGroupCount(listTypeHeatMetaDefinition) + ", actual: "
+						+ resource.getGroups().size(),
+				getGroupCount(listTypeHeatMetaDefinition) == resource.getGroups().size());
+		assertTrue(
+				"check artifact count, expected: " + getArtifactCount(listTypeHeatMetaDefinition, false) + ", actual: "
+						+ resource.getDeploymentArtifacts().size(),
+				getArtifactCount(listTypeHeatMetaDefinition, false) == resource.getDeploymentArtifacts().size());
+
+	}
+	
+	/*public static List<TypeHeatMetaDefinition> getListTypeHeatMetaDefinition(String csarUUID) throws Exception {
+
+		String artifactHeatMetaLocation = "Artifacts/HEAT.meta";
+		JSONParser parser = new JSONParser();
+		String csarPayload = getCsarPayload(csarUUID, artifactHeatMetaLocation);
+		if (csarPayload != null) {
+			Object parse = parser.parse(csarPayload);
+			JSONObject jsonObject = (JSONObject) parse;
+			JSONObject jsonObjectImportStructure = (JSONObject) jsonObject.get("importStructure");
+			List<TypeHeatMetaDefinition> listHeatMetaDefenition = new ArrayList<TypeHeatMetaDefinition>();
+			listHeatMetaDefenition = getArtifactsByGroup(jsonObjectImportStructure, listHeatMetaDefenition);
+			return listHeatMetaDefenition;
+		}
+		return null;
+
+	}*/
+	
+	/*public static List<TypeHeatMetaDefinition> getListTypeHeatMetaDefinition(File csarUUID) throws Exception {
+
+		String artifactHeatMetaLocation = "Artifacts/HEAT.meta";
+		JSONParser parser = new JSONParser();
+		String csarPayload = getCsarPayload(csarUUID, artifactHeatMetaLocation);
+		if (csarPayload != null) {
+			Object parse = parser.parse(csarPayload);
+			JSONObject jsonObject = (JSONObject) parse;
+			JSONObject jsonObjectImportStructure = (JSONObject) jsonObject.get("importStructure");
+			List<TypeHeatMetaDefinition> listHeatMetaDefenition = new ArrayList<TypeHeatMetaDefinition>();
+			listHeatMetaDefenition = getArtifactsByGroup(jsonObjectImportStructure, listHeatMetaDefenition);
+			return listHeatMetaDefenition;
+		}
+		return null;
+
+	}*/
+	
+	private static Integer getGroupCount(List<TypeHeatMetaDefinition> listHeatMetaDefenition) {
+		int count = 0;
+		for (TypeHeatMetaDefinition typeHeatMetaDefinition : listHeatMetaDefenition) {
+			count = count + typeHeatMetaDefinition.getGroupHeatMetaDefinition().size();
+		}
+		return count;
+	}
+	
+	private static Integer getArtifactCount(List<TypeHeatMetaDefinition> listHeatMetaDefenition, Boolean isEnvIncluded) {
+		int count = 0;
+		List<HeatMetaFirstLevelDefinition> uniqeArtifactList = new ArrayList<>();
+
+		for (TypeHeatMetaDefinition typeHeatMetaDefinition : listHeatMetaDefenition) {
+			for (GroupHeatMetaDefinition groupHeatMetaDefinition : typeHeatMetaDefinition
+					.getGroupHeatMetaDefinition()) {
+				if (isEnvIncluded) {
+					count = count + groupHeatMetaDefinition.getArtifactList().size();
+				} else {
+					for (HeatMetaFirstLevelDefinition fileName : groupHeatMetaDefinition.getArtifactList()) {
+						if (!fileName.getFileName().contains(".env") && !uniqeArtifactList.contains(fileName)) {
+							uniqeArtifactList.add(fileName);
+							count = count + 1;
+						}
+					}
+				}
+			}
+		}
+		return count;
+	}
+	
+	/*protected static List<TypeHeatMetaDefinition> getArtifactsByGroup(JSONObject jsonObjectImportStructure, List<TypeHeatMetaDefinition> listHeatMetaDefenition) {
+
+		@SuppressWarnings("unchecked")
+		Set<Object> typeSet = jsonObjectImportStructure.keySet();
+		for (Object type : typeSet) {
+			TypeHeatMetaDefinition heatMetaDefenition = new TypeHeatMetaDefinition();
+			log.debug(type.toString());
+			log.debug("{}", jsonObjectImportStructure.get(type));
+			JSONArray array = (JSONArray) jsonObjectImportStructure.get(type);
+			heatMetaDefenition.setTypeName((String) type);
+			List<GroupHeatMetaDefinition> groupHeatMetaDefinitions = new ArrayList<GroupHeatMetaDefinition>();
+			heatMetaDefenition.setGroupHeatMetaDefinition(fetchArtifactByGroupFromJsonArray(array, groupHeatMetaDefinitions, true, false));
+			listHeatMetaDefenition.add(heatMetaDefenition);
+		}
+		return listHeatMetaDefenition;
+	}*/
+	
+/*	protected static List<GroupHeatMetaDefinition> fetchArtifactByGroupFromJsonArray(JSONArray array, List<GroupHeatMetaDefinition> listGroupHeatMetaDefinition, Boolean openNewGroup, Boolean isNested) {
+
+		GroupHeatMetaDefinition groupHeatMetaDefinition;
+
+		if (array != null) {
+			for (int i = 0; i < array.size(); i++) {
+				if (openNewGroup) {
+					groupHeatMetaDefinition = new GroupHeatMetaDefinition();
+					int groupNumber = listGroupHeatMetaDefinition.size() + 1;
+					log.debug("groupName={}", groupNumber);
+					groupHeatMetaDefinition.setGroup(groupNumber);
+					listGroupHeatMetaDefinition.add(groupHeatMetaDefinition);
+					PropertyHeatMetaDefinition propertyHeatMetaDefinition = new PropertyHeatMetaDefinition();
+					propertyHeatMetaDefinition.setName("isBase");
+					propertyHeatMetaDefinition.setValue(false);
+					groupHeatMetaDefinition.setPropertyHeatMetaDefinition(propertyHeatMetaDefinition);
+				}
+				groupHeatMetaDefinition = listGroupHeatMetaDefinition.get(listGroupHeatMetaDefinition.size() - 1);
+				JSONObject jsonObject = (JSONObject) array.get(i);
+				fetchArtifactByGroupFromJsonObject(listGroupHeatMetaDefinition, groupHeatMetaDefinition, jsonObject, isNested);
+			}
+		}
+		return listGroupHeatMetaDefinition;
+	}*/
+	
+	
+	/*public static void fetchArtifactByGroupFromJsonObject(List<GroupHeatMetaDefinition> listGroupHeatMetaDefinition, GroupHeatMetaDefinition groupHeatMetaDefinition, JSONObject jsonObject, Boolean isNested) {
+		@SuppressWarnings("unchecked")
+		Set<Object> groupsKey = jsonObject.keySet();
+		for (Object groupKey : groupsKey) {
+			String groupKeyStr = (String) groupKey;
+			if (groupKeyStr.equals("isBase")) {
+				PropertyHeatMetaDefinition propertyHeatMetaDefinition = new PropertyHeatMetaDefinition();
+				propertyHeatMetaDefinition.setName(groupKeyStr);
+				propertyHeatMetaDefinition.setValue((boolean) jsonObject.get(groupKeyStr));
+				if (!groupHeatMetaDefinition.getPropertyHeatMetaDefinition().equals(propertyHeatMetaDefinition)) {
+					groupHeatMetaDefinition.getPropertyHeatMetaDefinition().setValue((boolean) jsonObject.get(groupKeyStr));
+				}
+			}
+ 			if (groupKeyStr.equals("fileName")) {
+				String artifactName = (String) jsonObject.get(groupKeyStr);
+				String artifactType = ArtifactTypeEnum.HEAT_ARTIFACT.getType();
+				if(isNested){
+					artifactType = ArtifactTypeEnum.HEAT_NESTED.getType();
+				}
+				if(jsonObject.get("type") != null && isNested == false){
+					artifactType = (String) jsonObject.get("type");
+				}
+				HeatMetaFirstLevelDefinition heatMetaFirstLevelDefinition = new HeatMetaFirstLevelDefinition(artifactName, artifactType);
+				List<HeatMetaFirstLevelDefinition> listArtifactNames = groupHeatMetaDefinition.getArtifactList();
+				listArtifactNames.add(heatMetaFirstLevelDefinition);
+				groupHeatMetaDefinition.setArtifactList(listArtifactNames);
+			} else {
+				if((groupKeyStr.equals("env"))){
+					if (jsonObject.get(groupKeyStr) instanceof JSONObject){
+						fetchArtifactByGroupFromJsonObject(listGroupHeatMetaDefinition, groupHeatMetaDefinition, (JSONObject) jsonObject.get(groupKeyStr), false);
+					}else{
+						assertTrue("Expected object is JSONObject, but actual: " + jsonObject.get(groupKeyStr).getClass(), jsonObject.get(groupKeyStr).getClass().equals("JSONObject"));
+					}
+				}
+				if((groupKeyStr.equals("nested"))){
+					if (jsonObject.get(groupKeyStr) instanceof JSONArray){
+						fetchArtifactByGroupFromJsonArray((JSONArray) jsonObject.get(groupKeyStr), listGroupHeatMetaDefinition, false, true);
+					}else{
+						assertTrue("Expected object is JSONArray, but actual: " + jsonObject.get(groupKeyStr).getClass(), jsonObject.get(groupKeyStr).getClass().equals("JSONArray"));
+					}
+					
+				}else if (!(groupKeyStr.equals("isBase") || groupKeyStr.equals("type") || groupKeyStr.equals("env"))) {
+					if (jsonObject.get(groupKeyStr) instanceof JSONArray){
+						fetchArtifactByGroupFromJsonArray((JSONArray) jsonObject.get(groupKeyStr), listGroupHeatMetaDefinition, false, false);
+					}else{
+						assertTrue("Expected object is JSONArray, but actual: " + jsonObject.get(groupKeyStr).getClass(), jsonObject.get(groupKeyStr).getClass().equals("JSONArray"));
+					}
+				}
+			}
+		}
+	}*/
+	
+	/*public static List<TypeHeatMetaDefinition> getListTypeHeatMetaDefinition(String csarUUID) throws Exception {
+
+		String artifactHeatMetaLocation = "Artifacts/HEAT.meta";
+		JSONParser parser = new JSONParser();
+		String csarPayload = getCsarPayload(csarUUID, artifactHeatMetaLocation);
+		if (csarPayload != null) {
+			Object parse = parser.parse(csarPayload);
+			JSONObject jsonObject = (JSONObject) parse;
+			JSONObject jsonObjectImportStructure = (JSONObject) jsonObject.get("importStructure");
+			List<TypeHeatMetaDefinition> listHeatMetaDefenition = new ArrayList<TypeHeatMetaDefinition>();
+			listHeatMetaDefenition = getArtifactsByGroup(jsonObjectImportStructure, listHeatMetaDefenition);
+			return listHeatMetaDefenition;
+		}
+		return null;
+
+	}
+
+	protected static List<TypeHeatMetaDefinition> getArtifactsByGroup(JSONObject jsonObjectImportStructure,
+			List<TypeHeatMetaDefinition> listHeatMetaDefenition) {
+
+		@SuppressWarnings("unchecked")
+		Set<Object> typeSet = jsonObjectImportStructure.keySet();
+		for (Object type : typeSet) {
+			TypeHeatMetaDefinition heatMetaDefenition = new TypeHeatMetaDefinition();
+			log.debug(type.toString());
+			log.debug("{}", jsonObjectImportStructure.get(type));
+			JSONArray array = (JSONArray) jsonObjectImportStructure.get(type);
+			heatMetaDefenition.setTypeName((String) type);
+			List<GroupHeatMetaDefinition> groupHeatMetaDefinitions = new ArrayList<GroupHeatMetaDefinition>();
+			heatMetaDefenition.setGroupHeatMetaDefinition(fetchArtifactByGroup(array, groupHeatMetaDefinitions, true));
+			listHeatMetaDefenition.add(heatMetaDefenition);
+		}
+		return listHeatMetaDefenition;
+	}
+
+	protected static List<GroupHeatMetaDefinition> fetchArtifactByGroup(JSONArray array,
+			List<GroupHeatMetaDefinition> listGroupHeatMetaDefinition, Boolean openNewGroup) {
+
+		GroupHeatMetaDefinition groupHeatMetaDefinition;
+
+		if (array != null) {
+			for (int i = 0; i < array.size(); i++) {
+				if (openNewGroup) {
+					groupHeatMetaDefinition = new GroupHeatMetaDefinition();
+					int groupNumber = listGroupHeatMetaDefinition.size() + 1;
+					log.debug("groupName={}", groupNumber);
+					groupHeatMetaDefinition.setGroup(groupNumber);
+					listGroupHeatMetaDefinition.add(groupHeatMetaDefinition);
+					PropertyHeatMetaDefinition propertyHeatMetaDefinition = new PropertyHeatMetaDefinition();
+					propertyHeatMetaDefinition.setName("isBase");
+					propertyHeatMetaDefinition.setValue(false);
+					groupHeatMetaDefinition.setPropertyHeatMetaDefinition(propertyHeatMetaDefinition);
+				}
+				groupHeatMetaDefinition = listGroupHeatMetaDefinition.get(listGroupHeatMetaDefinition.size() - 1);
+				JSONObject jsonObject = (JSONObject) array.get(i);
+				@SuppressWarnings("unchecked")
+				Set<Object> groupsKey = jsonObject.keySet();
+				for (Object groupKey : groupsKey) {
+					String groupKeyStr = (String) groupKey;
+					if (groupKeyStr.equals("isBase")) {
+						PropertyHeatMetaDefinition propertyHeatMetaDefinition = new PropertyHeatMetaDefinition();
+						propertyHeatMetaDefinition.setName(groupKeyStr);
+						propertyHeatMetaDefinition.setValue((boolean) jsonObject.get(groupKeyStr));
+						if (!groupHeatMetaDefinition.getPropertyHeatMetaDefinition()
+								.equals(propertyHeatMetaDefinition)) {
+							groupHeatMetaDefinition.getPropertyHeatMetaDefinition()
+									.setValue((boolean) jsonObject.get(groupKeyStr));
+						}
+					}
+					if (groupKeyStr.equals("fileName") || groupKeyStr.equals("env")) {
+						String artifactName = (String) jsonObject.get(groupKeyStr);
+						List<String> listArtifactNames = groupHeatMetaDefinition.getArtifactList();
+						listArtifactNames.add(artifactName);
+						groupHeatMetaDefinition.setArtifactList(listArtifactNames);
+					} else {
+						if (!groupKeyStr.equals("isBase")) {
+							fetchArtifactByGroup((JSONArray) jsonObject.get(groupKeyStr), listGroupHeatMetaDefinition,
+									false);
+						}
+					}
+				}
+			}
+		}
+		return listGroupHeatMetaDefinition;
+	}
+
+	private static Integer getArtifactCount(List<TypeHeatMetaDefinition> listHeatMetaDefenition,
+			Boolean isEnvIncluded) {
+		int count = 0;
+		List<String> uniqeArtifactList = new ArrayList<>();
+
+		for (TypeHeatMetaDefinition typeHeatMetaDefinition : listHeatMetaDefenition) {
+			for (GroupHeatMetaDefinition groupHeatMetaDefinition : typeHeatMetaDefinition
+					.getGroupHeatMetaDefinition()) {
+				if (isEnvIncluded) {
+					count = count + groupHeatMetaDefinition.getArtifactList().size();
+				} else {
+					for (String fileName : groupHeatMetaDefinition.getArtifactList()) {
+						if (!fileName.contains(".env") && !uniqeArtifactList.contains(fileName)) {
+							uniqeArtifactList.add(fileName);
+							count = count + 1;
+						}
+					}
+				}
+			}
+		}
+		return count;
+	}
+
+	private static Integer getGroupCount(List<TypeHeatMetaDefinition> listHeatMetaDefenition) {
+		int count = 0;
+		for (TypeHeatMetaDefinition typeHeatMetaDefinition : listHeatMetaDefenition) {
+			count = count + typeHeatMetaDefinition.getGroupHeatMetaDefinition().size();
+		}
+		return count;
+	}
+
+	private static String groupNameBuilder(Resource resource) {
+		String separator = "::";
+		String module = "module-";
+		String groupName = resource.getSystemName() + separator + module;
+		return groupName;
+	}
+
+	public static void validateCsarVfArtifact(String csarUUID, Resource resource) throws Exception {
+
+		List<TypeHeatMetaDefinition> listTypeHeatMetaDefinition = getListTypeHeatMetaDefinition(csarUUID);
+		assertTrue(
+				"check group count, expected: " + getGroupCount(listTypeHeatMetaDefinition) + ", actual: "
+						+ resource.getGroups().size(),
+				getGroupCount(listTypeHeatMetaDefinition) == resource.getGroups().size());
+		assertTrue(
+				"check artifact count, expected: " + getArtifactCount(listTypeHeatMetaDefinition, false) + ", actual: "
+						+ resource.getDeploymentArtifacts().size(),
+				getArtifactCount(listTypeHeatMetaDefinition, false) == resource.getDeploymentArtifacts().size());
+
+	}
+
+	public static void validateToscaDefinitonObjectVsResource(ToscaDefinition toscaDefinition, Resource resource)
+			throws Exception {
+
+		assertTrue(
+				"check resource instance count, expected: " + getResourceInstanceCount(toscaDefinition) + ", actual: "
+						+ resource.getComponentInstances().size(),
+				getResourceInstanceCount(toscaDefinition) == resource.getComponentInstances().size());
+		assertTrue(
+				"check resource instance relation count, expected: " + getResourceInstanceRelationCount(toscaDefinition)
+						+ ", actual: " + resource.getComponentInstancesRelations().size(),
+				getResourceInstanceRelationCount(toscaDefinition) == resource.getComponentInstancesRelations().size());
+
+	}
+
+	public static Integer getResourceInstanceCount(ToscaDefinition toscaDefinition) {
+
+		return toscaDefinition.getTopology_template().getNode_templates().size();
+	}
+
+	public static Integer getResourceInstanceRelationCount(ToscaDefinition toscaDefinition) {
+		int count = 0;
+//		List<ToscaNodeTemplatesTopologyTemplateDefinition> toscaNodeTemplatesTopologyTemplateDefinition = toscaDefinition
+//				.getTopology_template().getToscaNodeTemplatesTopologyTemplateDefinition();
+		Map<String,ToscaNodeTemplatesTopologyTemplateDefinition> toscaNodeTemplatesTopologyTemplateDefinition = toscaDefinition.getTopology_template().getNode_templates();
+		for (int i = 0; i < toscaNodeTemplatesTopologyTemplateDefinition.size(); i++) {
+//			List<ToscaRequirementsNodeTemplatesDefinition> requirements = toscaNodeTemplatesTopologyTemplateDefinition.get(i).getRequirements();
+			
+			for(Entry entry: toscaDefinition.getTopology_template().getNode_templates().entrySet() ){
+				if (entry.getValue().equals("requirements")){
+					
+				}
+			}
+			
+			if (requirements != null) {
+				for (ToscaRequirementsNodeTemplatesDefinition requirement : requirements) {
+					if (requirement.getNode() != null) {
+						count = count + 1;
+					}
+				}
+			}
+		}
+		return count;
+	}
+
+	// not finished yet
+	private static void validateCsarVfgroup(String csarUUID, Resource resource) {
+
+		List<GroupDefinition> groups = resource.getGroups();
+		for (GroupDefinition groupDefinition : groups) {
+			List<String> artifacts = groupDefinition.getArtifacts();
+			assertTrue("group description is null", groupDefinition.getDescription() != null);
+			assertTrue("InvariantUUID is null", groupDefinition.getInvariantUUID() != null);
+			// groupDefinition.getMembers();
+			assertTrue(
+					"name format mismatch, expected: " + groupNameBuilder(resource) + "[0-9], actual: "
+							+ groupDefinition.getName(),
+					groupDefinition.getName().contains(groupNameBuilder(resource)));
+			// groupDefinition.getProperties();
+			// groupDefinition.getPropertyValueCounter();
+			assertTrue(groupDefinition.getType().equals(getGroupType()));
+		}
+
+		String expectedCsarUUID = csarUUID;
+		// String expectedToscaResourceName = "org.openecomp.resource.vf." +
+		// WordUtils.capitalize(resourceDetails.getName().toLowerCase());
+		//
+		// assertTrue("csarUUID : " + buildAssertMessage(expectedCsarUUID,
+		// resource.getCsarUUID()),
+		// expectedCsarUUID.equals(resource.getCsarUUID()));
+		// assertTrue("toscaResourceName : " +
+		// buildAssertMessage(expectedToscaResourceName,
+		// resource.getToscaResourceName()),
+		// expectedToscaResourceName.equals(resource.getToscaResourceName()));
+		//
+		// RestResponse getResourceResponse =
+		// ResourceRestUtils.getResource(resource.getUniqueId());
+		// Resource getResource =
+		// ResponseParser.parseToObjectUsingMapper(getResourceResponse.getResponse(),
+		// Resource.class);
+		// assertTrue("csarUUID : " + buildAssertMessage(expectedCsarUUID,
+		// getResource.getCsarUUID()),
+		// expectedCsarUUID.equals(getResource.getCsarUUID()));
+		// assertTrue("toscaResourceName : " +
+		// buildAssertMessage(expectedToscaResourceName,
+		// getResource.getToscaResourceName()),
+		// expectedToscaResourceName.equals(getResource.getToscaResourceName()));
+
+	}
+
+	private static String getGroupType() {
+		return "org.openecomp.groups.VfModule";
+	}
+*/
+
+	
+	
+	
+}
diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/utils/validation/DistributionValidationUtils.java b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/utils/validation/DistributionValidationUtils.java
new file mode 100644
index 0000000000..b6b809a4a3
--- /dev/null
+++ b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/utils/validation/DistributionValidationUtils.java
@@ -0,0 +1,86 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * SDC
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.sdc.ci.tests.utils.validation;
+
+import org.openecomp.sdc.be.model.Service;
+import org.openecomp.sdc.ci.tests.utils.DistributionUtils;
+import org.openecomp.sdc.ci.tests.utils.general.AtomicOperationUtils;
+import org.openecomp.sdc.common.datastructure.AuditingFieldsKey;
+
+import java.io.IOException;
+import java.text.ParseException;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
+
+import static org.testng.AssertJUnit.assertNotNull;
+
+public class DistributionValidationUtils {
+
+	public static Map<String, String> verifyDistributedArtifactDownloadUsingDB(String distributionID, Map<String, String> expectedArtifactsMapOfDistributedService, List<String> distributionStatusEnumList) throws Exception {
+		
+		String action = "DStatus";
+		int timer = 0;
+		int timeWaitPerArtifcat = 3;
+		if(expectedArtifactsMapOfDistributedService.size() != 0){
+			timer = (expectedArtifactsMapOfDistributedService.size()/10*15 + expectedArtifactsMapOfDistributedService.size() * timeWaitPerArtifcat * distributionStatusEnumList.size() + 30) * 1000 ;
+		}
+		for (String distributionStatusList : distributionStatusEnumList){
+			for (Entry<String, String> url : expectedArtifactsMapOfDistributedService.entrySet()){
+				Map <AuditingFieldsKey, String> body = new HashMap<>();
+		        body.put(AuditingFieldsKey.AUDIT_DISTRIBUTION_ID, distributionID);
+		        body.put(AuditingFieldsKey.AUDIT_DISTRIBUTION_RESOURCE_URL, url.getValue());
+		        body.put(AuditingFieldsKey.AUDIT_STATUS, distributionStatusList);
+		        Map<String, String> actualAuditRecord = new HashMap<String, String>();
+				actualAuditRecord = AuditValidationUtils.retrieveAuditMessagesByPattern(action, body, true);
+				while (timer != 0) {
+					if(actualAuditRecord.size() == 0 ){
+						Thread.sleep(1000);
+						actualAuditRecord = AuditValidationUtils.retrieveAuditMessagesByPattern(action, body, true);
+						timer-=1000;
+						if(timer == 0 && actualAuditRecord.size() == 0){
+							assertNotNull("audit record did not found in DB for artifact url: " + url.getValue(), null);
+						}
+					}else{
+						timer = timer - timeWaitPerArtifcat * 1000;
+						break;
+					}
+					
+				}
+			}
+		}
+		return null;
+	}
+
+	public static void validateDistributedArtifactsByAudit(Service service, List<String> distributionStatusList) throws Exception, IOException, ParseException {
+		String distributionID;
+		AtomicOperationUtils.distributeService(service, true);
+		distributionID = DistributionUtils.getLatestServiceDistributionObject(service).getDistributionID();
+		if(distributionID != null){
+			Map<String, String> expectedArtifactsMapOfDistributedService = DistributionUtils.getArtifactsMapOfDistributedService(service);
+			DistributionValidationUtils.verifyDistributedArtifactDownloadUsingDB(distributionID, expectedArtifactsMapOfDistributedService, distributionStatusList);
+		}
+		else{
+			assertNotNull("distributionID is null", distributionID);
+		}
+	}
+}
diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/utils/validation/ErrorValidationUtils.java b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/utils/validation/ErrorValidationUtils.java
new file mode 100644
index 0000000000..4c5533945b
--- /dev/null
+++ b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/utils/validation/ErrorValidationUtils.java
@@ -0,0 +1,120 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * SDC
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.sdc.ci.tests.utils.validation;
+
+import org.codehaus.jettison.json.JSONException;
+import org.codehaus.jettison.json.JSONObject;
+import org.openecomp.sdc.ci.tests.config.Config;
+import org.openecomp.sdc.ci.tests.datatypes.enums.ErrorInfo;
+import org.openecomp.sdc.ci.tests.datatypes.enums.ExceptionEnumType;
+import org.openecomp.sdc.ci.tests.utils.Utils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.yaml.snakeyaml.Yaml;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.InputStream;
+import java.util.List;
+import java.util.Map;
+
+import static org.testng.AssertJUnit.assertEquals;
+
+public class ErrorValidationUtils {
+	static Logger logger = LoggerFactory.getLogger(ErrorValidationUtils.class.getName());
+
+	public static void checkBodyResponseOnError(String errorType, List<String> variables, String actualResponse)
+			throws FileNotFoundException, JSONException {
+
+		ErrorInfo errorInfo = parseErrorConfigYaml(errorType);
+		JSONObject expectedResponseBody = null;
+		if (errorInfo.getMessageId() != null) {
+			if (errorInfo.getMessageId().contains("SVC")) {
+				expectedResponseBody = restExceptionFormatBuilder(errorInfo.getMessageId(), errorInfo.getMessage(),
+						variables, ExceptionEnumType.SERVICE_EXCEPTION.getValue());
+			} else {
+				expectedResponseBody = restExceptionFormatBuilder(errorInfo.getMessageId(), errorInfo.getMessage(),
+						variables, ExceptionEnumType.POLICY_EXCPTION.getValue());
+			}
+		}
+		actualResponse = actualResponse.replaceAll("\\n", "");
+		logger.debug("actualResponse - {}", actualResponse);
+		logger.debug("expectedResponseBody - {}", expectedResponseBody);
+		assertEquals(expectedResponseBody, new JSONObject(actualResponse));
+	}
+	
+	public static String checkUIResponseOnError(String errorType)
+			throws FileNotFoundException, JSONException {
+
+		ErrorInfo errorInfo = parseErrorConfigYaml(errorType);
+		String messageId = errorInfo.getMessageId();
+		
+		return messageId;
+	}
+
+	public static JSONObject restExceptionFormatBuilder(String messageId, String text, List<String> variables,
+			String type) {
+
+		JSONObject simpleElements = new JSONObject();
+		JSONObject exceptionType = new JSONObject();
+		JSONObject requestError = new JSONObject();
+
+		try {
+			simpleElements.put("messageId", messageId);
+			simpleElements.put("text", text);
+			simpleElements.put("variables", variables);
+			exceptionType.put(type, simpleElements);
+			requestError.put("requestError", exceptionType);
+
+		} catch (JSONException e) {
+			e.printStackTrace();
+		}
+
+		return requestError;
+
+	}
+
+	public static ErrorInfo parseErrorConfigYaml(String error) throws FileNotFoundException {
+		Yaml yaml = new Yaml();
+		ErrorInfo errInfo = null;
+		Config config = Utils.getConfig();
+		String errorConfigurationFile = config.getErrorConfigurationFile();
+		File file = new File(errorConfigurationFile);
+		// File file = new
+		// File("../catalog-be/src/main/resources/config/error-configuration.yaml");
+		InputStream inputStream = new FileInputStream(file);
+		Map<?, ?> map = (Map<?, ?>) yaml.load(inputStream);
+		// System.out.println(map.get("errors"));
+		@SuppressWarnings("unchecked")
+		Map<String, ErrorInfo> errorMap = (Map<String, ErrorInfo>) map.get("errors");
+		@SuppressWarnings("unchecked")
+		Map<String, Object> errorInfo = (Map<String, Object>) errorMap.get(error);
+
+		String message = (String) errorInfo.get("message");
+		String messageId = (String) errorInfo.get("messageId");
+		int code = (Integer) errorInfo.get("code");
+		errInfo = new ErrorInfo(code, message, messageId);
+
+		return errInfo;
+	}
+
+}
diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/utils/validation/ProductValidationUtils.java b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/utils/validation/ProductValidationUtils.java
new file mode 100644
index 0000000000..f2ef0826f2
--- /dev/null
+++ b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/utils/validation/ProductValidationUtils.java
@@ -0,0 +1,238 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * SDC
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.sdc.ci.tests.utils.validation;
+
+import org.apache.logging.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.json.simple.JSONArray;
+import org.json.simple.JSONObject;
+import org.json.simple.JSONValue;
+import org.openecomp.sdc.be.model.Product;
+import org.openecomp.sdc.be.model.User;
+import org.openecomp.sdc.be.model.category.CategoryDefinition;
+import org.openecomp.sdc.be.model.category.GroupingDefinition;
+import org.openecomp.sdc.be.model.category.SubCategoryDefinition;
+import org.openecomp.sdc.ci.tests.api.ComponentBaseTest.ComponentOperationEnum;
+import org.openecomp.sdc.ci.tests.datatypes.http.RestResponse;
+import org.openecomp.sdc.ci.tests.utils.rest.ProductRestUtils;
+import org.openecomp.sdc.ci.tests.utils.rest.ResponseParser;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+import java.util.UUID;
+
+import static org.testng.AssertJUnit.*;
+
+public class ProductValidationUtils {
+
+	static Logger logger = LogManager.getLogger(ProductValidationUtils.class);
+
+	public static void compareExpectedAndActualProducts(Product expectedProduct, Product actualProduct) {
+		compareExpectedAndActualProducts(expectedProduct, actualProduct, null);
+	}
+
+	public static void compareExpectedAndActualProducts(Product expectedProduct, Product actualProduct,
+			ComponentOperationEnum operation) {
+
+		assertEquals(expectedProduct.getName(), actualProduct.getName());
+		assertEquals(expectedProduct.getFullName(), actualProduct.getFullName());
+		assertEquals(expectedProduct.getDescription(), actualProduct.getDescription());
+
+		List<String> expectedContacts = expectedProduct.getContacts();
+		List<String> actualContacts = actualProduct.getContacts();
+		assertTrue(
+				"Expected contacts:" + Arrays.toString(expectedContacts.toArray()) + ", actual contacts:"
+						+ Arrays.toString(actualContacts.toArray()),
+				expectedContacts.size() == actualContacts.size() && expectedContacts.containsAll(actualContacts)
+						&& actualContacts.containsAll(expectedContacts));
+
+		List<String> expectedTags = expectedProduct.getTags();
+		List<String> actualTags = actualProduct.getTags();
+		assertTrue(
+				"Expected tags:" + Arrays.toString(expectedTags.toArray()) + ", actual tags:"
+						+ Arrays.toString(actualTags.toArray()),
+				expectedTags.size() == actualTags.size() && expectedTags.containsAll(actualTags)
+						&& actualTags.containsAll(expectedTags));
+
+		assertEquals(expectedProduct.getLifecycleState(), actualProduct.getLifecycleState());
+		assertEquals(expectedProduct.getVersion(), actualProduct.getVersion());
+		assertEquals(expectedProduct.isHighestVersion(), actualProduct.isHighestVersion());
+		assertEquals(expectedProduct.getNormalizedName(), actualProduct.getNormalizedName());
+
+		compareCategories(expectedProduct, actualProduct);
+		assertEquals(expectedProduct.getLastUpdaterUserId(), actualProduct.getLastUpdaterUserId());
+		if (operation != null) {
+			assertEquals(expectedProduct.getCreatorUserId(), actualProduct.getCreatorUserId());
+		}
+
+		Long lastUpdateDate = actualProduct.getLastUpdateDate();
+		Long creationDate = actualProduct.getCreationDate();
+		Map<String, String> allVersions = actualProduct.getAllVersions();
+
+		if (operation != null) {
+			if (operation == ComponentOperationEnum.UPDATE_COMPONENT
+					|| operation == ComponentOperationEnum.CHANGE_STATE_CHECKOUT
+					|| operation == ComponentOperationEnum.CHANGE_STATE_CHECKIN
+					|| operation == ComponentOperationEnum.CHANGE_STATE_UNDO_CHECKOUT) {
+				assertTrue("Last update date:" + lastUpdateDate + ", creation date: " + creationDate,
+						lastUpdateDate > 0 && creationDate > 0 && lastUpdateDate > creationDate);
+			} else {
+				assertTrue("Last update date:" + lastUpdateDate + ", creation date: " + creationDate,
+						lastUpdateDate > 0 && lastUpdateDate.equals(creationDate));
+			}
+		}
+
+		// Check UUIDs
+		// If just created, no way to test the UUIDs themselves
+		// If updated, we expect the UUIDs of actual to match the expected
+		String uniqueId = actualProduct.getUniqueId();
+		if (operation == ComponentOperationEnum.CREATE_COMPONENT) {
+			UUID.fromString(uniqueId);
+			UUID.fromString(actualProduct.getUUID());
+			UUID.fromString(actualProduct.getInvariantUUID());
+			assertTrue(allVersions.size() == 1);
+			assertTrue(allVersions.get("0.1").equals(uniqueId));
+		} else {
+			if (operation == ComponentOperationEnum.CHANGE_STATE_CHECKOUT) {
+				assertFalse(expectedProduct.getUniqueId().equals(uniqueId));
+				// Assigning the updated uniqueId to expected so that it can be
+				// passed to further logic
+				expectedProduct.setUniqueId(uniqueId);
+			} else if (operation != null) {
+				assertTrue(expectedProduct.getUniqueId().equals(uniqueId));
+			}
+			assertEquals(expectedProduct.getUUID(), actualProduct.getUUID());
+			assertEquals(expectedProduct.getInvariantUUID(), actualProduct.getInvariantUUID());
+		}
+	}
+
+	private static void compareCategories(Product expectedProduct, Product actualProduct) {
+		List<CategoryDefinition> expectedCategories = expectedProduct.getCategories();
+		List<CategoryDefinition> actualCategories = actualProduct.getCategories();
+		if (expectedCategories != null && actualCategories != null) {
+			int expSize = expectedCategories.size();
+			int actSize = actualCategories.size();
+
+			assertTrue("Expected size:" + expSize + ", actual size:" + actSize, expSize == actSize);
+
+			for (CategoryDefinition actualDefinition : actualCategories) {
+				int lastIndexOfCat = expectedCategories.lastIndexOf(actualDefinition);
+				assertTrue("Actual category " + actualDefinition + " not found in expected.", lastIndexOfCat != -1);
+				CategoryDefinition expectedDefinition = expectedCategories.get(lastIndexOfCat);
+				List<SubCategoryDefinition> actualSubcategories = actualDefinition.getSubcategories();
+				List<SubCategoryDefinition> expectedSubcategories = expectedDefinition.getSubcategories();
+				for (SubCategoryDefinition actualSub : actualSubcategories) {
+					lastIndexOfCat = expectedSubcategories.lastIndexOf(actualSub);
+					assertTrue("Actual subcategory " + actualSub + " not found in expected.", lastIndexOfCat != -1);
+					SubCategoryDefinition expectedSub = expectedSubcategories.get(lastIndexOfCat);
+					List<GroupingDefinition> actualGroupings = actualSub.getGroupings();
+					List<GroupingDefinition> expectedGroupings = expectedSub.getGroupings();
+					for (GroupingDefinition actualGrouping : actualGroupings) {
+						lastIndexOfCat = expectedGroupings.lastIndexOf(actualGrouping);
+						assertTrue("Actual grouping " + actualSub + " not found in expected.", lastIndexOfCat != -1);
+					}
+				}
+			}
+
+			for (CategoryDefinition expectedDefinition : expectedCategories) {
+				int lastIndexOfCat = actualCategories.lastIndexOf(expectedDefinition);
+				assertTrue("Expected category " + expectedDefinition + " not found in actual.", lastIndexOfCat != -1);
+				CategoryDefinition actualDefinition = actualCategories.get(lastIndexOfCat);
+				List<SubCategoryDefinition> actualSubcategories = actualDefinition.getSubcategories();
+				List<SubCategoryDefinition> expectedSubcategories = expectedDefinition.getSubcategories();
+				for (SubCategoryDefinition expectedSub : expectedSubcategories) {
+					lastIndexOfCat = actualSubcategories.lastIndexOf(expectedSub);
+					assertTrue("Expected subcategory " + expectedSub + " not found in actual.", lastIndexOfCat != -1);
+					SubCategoryDefinition actualSub = actualSubcategories.get(lastIndexOfCat);
+					List<GroupingDefinition> actualGroupings = actualSub.getGroupings();
+					List<GroupingDefinition> expectedGroupings = expectedSub.getGroupings();
+					for (GroupingDefinition expectedGrouping : expectedGroupings) {
+						lastIndexOfCat = actualGroupings.lastIndexOf(expectedGrouping);
+						assertTrue("Expected grouping " + expectedGrouping + " not found in actual.",
+								lastIndexOfCat != -1);
+					}
+				}
+			}
+		}
+	}
+
+	public static void verifyProductsNotExistInUserFollowedPage(User user, Product... nonExpectedProducts)
+			throws Exception {
+		String component = "products";
+		Boolean isExist;
+		Product nonExpectedProduct;
+		RestResponse getFollowedPage = ProductRestUtils.getFollowed(user.getUserId());
+		JSONArray followedProductes = getListArrayFromRestResponse(getFollowedPage, component);
+		if (followedProductes != null) { // if any product exist in followed
+											// page
+			for (int i = 0; i < nonExpectedProducts.length; i++) {
+				nonExpectedProduct = nonExpectedProducts[i];
+				isExist = false;
+				for (int k = 0; k < followedProductes.size(); k++) {
+					JSONObject jobject = (JSONObject) followedProductes.get(k);
+					if (jobject.get("uuid").toString().equals(nonExpectedProduct.getUUID())) {
+						isExist = true;
+						k = followedProductes.size();
+					}
+				}
+				assertFalse(isExist);
+			}
+		}
+
+	}
+
+	public static void checkUserFollowedPage(User user, Product... expectedProducts) throws Exception {
+		String component = "products";
+		Boolean isExist;
+		Product expectedProduct;
+		RestResponse getFollowedPage = ProductRestUtils.getFollowed(user.getUserId());
+		JSONArray followedProductes = getListArrayFromRestResponse(getFollowedPage, component);
+		assertTrue("check if any followedProductes received ", followedProductes != null);
+		assertTrue("check if any expectedProducts and followedProductes are the same size",
+				expectedProducts.length == followedProductes.size());
+		for (int i = 0; i < expectedProducts.length; i++) {
+			expectedProduct = expectedProducts[i];
+			isExist = false;
+			for (int k = 0; k < followedProductes.size(); k++) {
+				JSONObject jobject = (JSONObject) followedProductes.get(k);
+				// if(jobject.get("uuid").toString().equals(expectedProduct.getUUID()))
+				if (jobject.get("uniqueId").toString().equals(expectedProduct.getUniqueId())) {
+
+					String productString = jobject.toJSONString();
+					Product actualProduct = ResponseParser.parseToObjectUsingMapper(productString, Product.class);
+					ProductValidationUtils.compareExpectedAndActualProducts(expectedProduct, actualProduct, null);
+					isExist = true;
+					k = followedProductes.size();
+				}
+			}
+			assertTrue(isExist);
+		}
+	}
+
+	private static JSONArray getListArrayFromRestResponse(RestResponse restResponse, String lst) {
+		String json = restResponse.getResponse();
+		JSONObject jsonResp = (JSONObject) JSONValue.parse(json);
+		JSONArray resources = (JSONArray) jsonResp.get(lst);
+		return resources;
+	}
+
+}
diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/utils/validation/ResourceValidationUtils.java b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/utils/validation/ResourceValidationUtils.java
new file mode 100644
index 0000000000..de6d32beed
--- /dev/null
+++ b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/utils/validation/ResourceValidationUtils.java
@@ -0,0 +1,351 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * SDC
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.sdc.ci.tests.utils.validation;
+
+import com.google.gson.Gson;
+import org.openecomp.sdc.be.model.ArtifactDefinition;
+import org.openecomp.sdc.be.model.InterfaceDefinition;
+import org.openecomp.sdc.be.model.Operation;
+import org.openecomp.sdc.be.model.Resource;
+import org.openecomp.sdc.be.model.category.CategoryDefinition;
+import org.openecomp.sdc.ci.tests.datatypes.ResourceReqDetails;
+import org.openecomp.sdc.ci.tests.datatypes.ResourceRespJavaObject;
+import org.openecomp.sdc.ci.tests.datatypes.enums.RespJsonKeysEnum;
+import org.openecomp.sdc.ci.tests.datatypes.http.RestResponse;
+import org.openecomp.sdc.ci.tests.utils.rest.ResponseParser;
+
+import java.util.*;
+
+import static org.testng.AssertJUnit.assertEquals;
+import static org.testng.AssertJUnit.assertTrue;
+
+public class ResourceValidationUtils {
+
+	public static void validateResourceReqVsResp(ResourceReqDetails resourceDetails,
+			ResourceRespJavaObject resourceRespJavaObject) {
+
+		String expected;
+
+		expected = resourceDetails.getDescription();
+		assertEquals("resource description - ", expected, resourceRespJavaObject.getDescription());
+
+		expected = resourceDetails.getVendorName();
+		assertEquals("resource vendorName - ", expected, resourceRespJavaObject.getVendorName());
+
+		expected = resourceDetails.getVendorRelease();
+		assertEquals("resource vendorReleaseName - ", expected, resourceRespJavaObject.getVendorRelease());
+
+		expected = resourceDetails.getContactId();
+		assertEquals("resource contactId - ", expected, resourceRespJavaObject.getContactId());
+
+	}
+
+	public static void validateResourceReqVsResp(ResourceReqDetails resourceDetails, Resource resourceRespJavaObject) {
+
+		String expected;
+
+		expected = resourceDetails.getDescription();
+		assertEquals("resource description - ", expected, resourceRespJavaObject.getDescription());
+
+		expected = resourceDetails.getVendorName();
+		assertEquals("resource vendorName - ", expected, resourceRespJavaObject.getVendorName());
+
+		expected = resourceDetails.getVendorRelease();
+		assertEquals("resource vendorReleaseName - ", expected, resourceRespJavaObject.getVendorRelease());
+
+		expected = resourceDetails.getContactId();
+		assertEquals("resource contactId - ", expected, resourceRespJavaObject.getContactId());
+
+		// Validating deduplication of tags
+		List<String> expectedTags = resourceDetails.getTags();
+		if (expectedTags != null) {
+			Set<String> hs = new LinkedHashSet<>(expectedTags);
+			expectedTags.clear();
+			expectedTags.addAll(hs);
+			List<String> receivedTags = resourceRespJavaObject.getTags();
+			assertEquals("resource tags - ", expectedTags, receivedTags);
+		}
+
+	}
+
+	public static void validateModelObjects(Resource expected, Resource actual) throws Exception {
+
+		compareElements(expected.getUniqueId(), actual.getUniqueId());
+		compareElements(expected.getName(), actual.getName());
+		compareElements(expected.getVersion(), actual.getVersion());
+		compareElements(expected.getCreatorUserId(), actual.getCreatorUserId());
+		compareElements(expected.getCreatorFullName(), actual.getCreatorFullName());
+		compareElements(expected.getLastUpdaterUserId(), actual.getLastUpdaterUserId());
+		compareElements(expected.getLastUpdaterFullName(), actual.getLastUpdaterFullName());
+		compareElements(expected.getCreatorFullName(), actual.getCreatorFullName());
+		compareElements(expected.getCreationDate(), actual.getCreationDate());
+		compareElements(expected.getLastUpdateDate(), actual.getLastUpdateDate());
+		compareElements(expected.getDescription(), actual.getDescription());
+		compareElements(expected.getIcon(), actual.getIcon());
+		compareElements(expected.getLastUpdateDate(), actual.getLastUpdateDate());
+		// TODO compare tags
+		compareElements(expected.getCategories(), actual.getCategories());
+		compareElements(expected.getLifecycleState(), actual.getLifecycleState());
+		compareElements(expected.getVendorName(), actual.getVendorName());
+		compareElements(expected.getVendorRelease(), actual.getVendorRelease());
+		compareElements(expected.getContactId(), actual.getContactId());
+		compareElements(expected.getUUID(), actual.getUUID());
+		compareElements(expected.getVersion(), actual.getVersion());
+
+	}
+
+	public static void validateResp(RestResponse restResponse, ResourceRespJavaObject resourceRespJavaObject)
+			throws Exception {
+
+		Gson gson = new Gson();
+		String response = restResponse.getResponse();
+
+		validateResp(response, resourceRespJavaObject, gson);
+
+	}
+
+	public static void validateResp(String response, ResourceRespJavaObject resourceRespJavaObject, Gson gson) {
+
+		Map<String, Object> map = new HashMap<String, Object>();
+		map = (Map<String, Object>) gson.fromJson(response, map.getClass());
+
+		// De-duplicating the tags list for comparison
+		List<String> tags = resourceRespJavaObject.getTags();
+		if (tags != null) {
+			Set<String> hs = new LinkedHashSet<>(tags);
+			tags = new ArrayList<String>(hs);
+			resourceRespJavaObject.setTags(tags);
+			tags = new ArrayList<String>(hs);
+			resourceRespJavaObject.setTags(tags);
+		}
+
+		validateField(map, RespJsonKeysEnum.RESOURCE_NAME.getRespJsonKeyName(), resourceRespJavaObject.getName());
+		validateField(map, RespJsonKeysEnum.RESOURCE_DESC.getRespJsonKeyName(),
+				resourceRespJavaObject.getDescription());
+		// validateField(map, RespJsonKeysEnum.CATEGORIES.getRespJsonKeyName(),
+		// resourceRespJavaObject.getCategories());
+		validateField(map, RespJsonKeysEnum.VENDOR_NAME.getRespJsonKeyName(), resourceRespJavaObject.getVendorName());
+		validateField(map, RespJsonKeysEnum.VENDOR_RELEASE.getRespJsonKeyName(),
+				resourceRespJavaObject.getVendorRelease());
+		validateField(map, RespJsonKeysEnum.CONTACT_ID.getRespJsonKeyName(), resourceRespJavaObject.getContactId());
+		validateField(map, RespJsonKeysEnum.ICON.getRespJsonKeyName(), resourceRespJavaObject.getIcon());
+		validateField(map, RespJsonKeysEnum.IS_ABSTRACT.getRespJsonKeyName(),
+				Boolean.valueOf(resourceRespJavaObject.getAbstractt()));
+		validateField(map, RespJsonKeysEnum.HIGHEST_VERSION.getRespJsonKeyName(),
+				Boolean.valueOf(resourceRespJavaObject.getIsHighestVersion()));
+		validateField(map, RespJsonKeysEnum.UNIQUE_ID.getRespJsonKeyName(), resourceRespJavaObject.getUniqueId());
+		validateField(map, RespJsonKeysEnum.RESOURCE_VERSION.getRespJsonKeyName(), resourceRespJavaObject.getVersion());
+		validateField(map, RespJsonKeysEnum.LIFE_CYCLE_STATE.getRespJsonKeyName(),
+				resourceRespJavaObject.getLifecycleState());
+		validateField(map, RespJsonKeysEnum.TAGS.getRespJsonKeyName(), tags);
+		validateField(map, RespJsonKeysEnum.CREATOR_ATT_UID.getRespJsonKeyName(),
+				resourceRespJavaObject.getCreatorUserId());
+		validateField(map, RespJsonKeysEnum.CREATOR_FULL_NAME.getRespJsonKeyName(),
+				resourceRespJavaObject.getCreatorFullName());
+		validateField(map, RespJsonKeysEnum.LAST_UPDATER_ATT_UID.getRespJsonKeyName(),
+				resourceRespJavaObject.getLastUpdaterUserId());
+		validateField(map, RespJsonKeysEnum.LAST_UPDATER_FULL_NAME.getRespJsonKeyName(),
+				resourceRespJavaObject.getLastUpdaterFullName());
+		validateField(map, RespJsonKeysEnum.COST.getRespJsonKeyName(), resourceRespJavaObject.getCost());
+		validateField(map, RespJsonKeysEnum.LICENSE_TYPE.getRespJsonKeyName(), resourceRespJavaObject.getLicenseType());
+		validateField(map, RespJsonKeysEnum.RESOURCE_TYPE.getRespJsonKeyName(),
+				resourceRespJavaObject.getResourceType().toString());
+		if (resourceRespJavaObject.getResourceType().equals("VF")) {
+			validateField(map, RespJsonKeysEnum.DERIVED_FROM.getRespJsonKeyName(), null);
+		} else {
+			validateField(map, RespJsonKeysEnum.DERIVED_FROM.getRespJsonKeyName(),
+					resourceRespJavaObject.getDerivedFrom());
+		}
+
+		validateCategories(resourceRespJavaObject, map);
+
+		String uuid = ResponseParser.getValueFromJsonResponse(response, RespJsonKeysEnum.UUID.getRespJsonKeyName());
+		assertTrue("UUID is empty", uuid != null && !uuid.isEmpty());
+	}
+
+	private static void validateCategories(ResourceRespJavaObject resourceRespJavaObject, Map<String, Object> map) {
+		assertTrue(RespJsonKeysEnum.CATEGORIES.getRespJsonKeyName() + " is missing",
+				map.containsKey(RespJsonKeysEnum.CATEGORIES.getRespJsonKeyName()));
+		Object foundValue = map.get(RespJsonKeysEnum.CATEGORIES.getRespJsonKeyName());
+		List<Map<String, Object>> foundList = (List<Map<String, Object>>) foundValue;
+		List<CategoryDefinition> excpectedList = resourceRespJavaObject.getCategories();
+
+		assertTrue(foundList.size() == excpectedList.size());
+		for (int i = 0; i < foundList.size(); i++) {
+			CategoryDefinition expCat = excpectedList.get(i);
+			Map<String, Object> foun = foundList.get(i);
+			assertTrue("expected " + expCat.getName() + " not equal to actual " + foundValue,
+					foun.get("name").equals(expCat.getName()));
+		}
+	}
+
+	public static void validateField(Map<String, Object> map, String jsonField, Object expectedValue) {
+		if (expectedValue == null) {
+			assertTrue(jsonField + " is expected to be null", !map.containsKey(jsonField));
+		} else {
+			assertTrue(jsonField + " is missing", map.containsKey(jsonField));
+			Object foundValue = map.get(jsonField);
+			compareElements(expectedValue, foundValue);
+		}
+	}
+
+	public static void compareElements(Object expectedValue, Object foundValue) {
+		if (expectedValue instanceof String) {
+			assertTrue(foundValue instanceof String);
+			assertTrue("expected " + expectedValue + " not equal to actual " + foundValue,
+					foundValue.equals(expectedValue));
+		}
+		/*
+		 * else if( expectedValue instanceof Number){ assertTrue(foundValue
+		 * instanceof Number); assertTrue(foundValue == expectedValue); }
+		 */
+		else if (expectedValue instanceof Boolean) {
+			assertTrue(foundValue instanceof Boolean);
+			assertTrue(foundValue == expectedValue);
+		} else if (expectedValue instanceof Map) {
+			assertTrue(foundValue instanceof Map);
+			Map<String, Object> foundMap = (Map<String, Object>) foundValue;
+			Map<String, Object> excpectedMap = (Map<String, Object>) expectedValue;
+			assertTrue(foundMap.size() == excpectedMap.size());
+			Iterator<String> foundkeyItr = foundMap.keySet().iterator();
+			while (foundkeyItr.hasNext()) {
+				String foundKey = foundkeyItr.next();
+				assertTrue(excpectedMap.containsKey(foundKey));
+				compareElements(excpectedMap.get(foundKey), foundMap.get(foundKey));
+			}
+
+		} else if (expectedValue instanceof List) {
+			assertTrue(foundValue instanceof List);
+			List<Object> foundList = (List<Object>) foundValue;
+			List<Object> excpectedList = (List<Object>) expectedValue;
+			assertTrue(foundList.size() == excpectedList.size());
+			for (int i = 0; i < foundList.size(); i++) {
+				compareElements(excpectedList.get(i), foundList.get(i));
+			}
+
+		} else {
+			assertTrue(foundValue.equals(expectedValue));
+		}
+	}
+
+	public static boolean validateUuidAfterChangingStatus(String oldUuid, String newUuid) {
+		return oldUuid.equals(newUuid);
+
+	}
+
+	public static void validateRespArt(RestResponse restResponse, ResourceRespJavaObject resourceRespJavaObject,
+			String interfaze) throws Exception {
+
+		Gson gson = new Gson();
+		String response = restResponse.getResponse();
+
+		Map<String, Object> map = new HashMap<String, Object>();
+		map = (Map<String, Object>) gson.fromJson(response, map.getClass());
+
+		Resource resource = gson.fromJson(response, Resource.class);
+
+		Map<String, ArtifactDefinition> artifacts = resource.getArtifacts();
+		Map<String, InterfaceDefinition> interfaces = null;
+
+		if (interfaze != null) {
+			interfaces = resource.getInterfaces();
+			Map<String, Operation> operation = interfaces.get(interfaze).getOperationsMap();
+			// operation.get("configure").getUniqueId();
+		}
+
+		validateField(map, RespJsonKeysEnum.RESOURCE_NAME.getRespJsonKeyName(), resourceRespJavaObject.getName());
+		validateField(map, RespJsonKeysEnum.RESOURCE_DESC.getRespJsonKeyName(),
+				resourceRespJavaObject.getDescription());
+		// validateField(map, RespJsonKeysEnum.CATEGORIES.getRespJsonKeyName(),
+		// resourceRespJavaObject.getCategories());
+		validateField(map, RespJsonKeysEnum.DERIVED_FROM.getRespJsonKeyName(), resourceRespJavaObject.getDerivedFrom());
+		validateField(map, RespJsonKeysEnum.VENDOR_NAME.getRespJsonKeyName(), resourceRespJavaObject.getVendorName());
+		validateField(map, RespJsonKeysEnum.VENDOR_RELEASE.getRespJsonKeyName(),
+				resourceRespJavaObject.getVendorRelease());
+		validateField(map, RespJsonKeysEnum.CONTACT_ID.getRespJsonKeyName(), resourceRespJavaObject.getContactId());
+		validateField(map, RespJsonKeysEnum.ICON.getRespJsonKeyName(), resourceRespJavaObject.getIcon());
+		validateField(map, RespJsonKeysEnum.IS_ABSTRACT.getRespJsonKeyName(),
+				Boolean.valueOf(resourceRespJavaObject.getAbstractt()));
+		validateField(map, RespJsonKeysEnum.HIGHEST_VERSION.getRespJsonKeyName(),
+				Boolean.valueOf(resourceRespJavaObject.getIsHighestVersion()));
+		validateField(map, RespJsonKeysEnum.UNIQUE_ID.getRespJsonKeyName(), resourceRespJavaObject.getUniqueId());
+		validateField(map, RespJsonKeysEnum.RESOURCE_VERSION.getRespJsonKeyName(), resourceRespJavaObject.getVersion());
+		validateField(map, RespJsonKeysEnum.LIFE_CYCLE_STATE.getRespJsonKeyName(),
+				resourceRespJavaObject.getLifecycleState());
+		validateField(map, RespJsonKeysEnum.TAGS.getRespJsonKeyName(), resourceRespJavaObject.getTags());
+		validateField(map, RespJsonKeysEnum.CREATOR_ATT_UID.getRespJsonKeyName(),
+				resourceRespJavaObject.getCreatorUserId());
+		validateField(map, RespJsonKeysEnum.CREATOR_FULL_NAME.getRespJsonKeyName(),
+				resourceRespJavaObject.getCreatorFullName());
+		validateField(map, RespJsonKeysEnum.LAST_UPDATER_ATT_UID.getRespJsonKeyName(),
+				resourceRespJavaObject.getLastUpdaterUserId());
+		validateField(map, RespJsonKeysEnum.LAST_UPDATER_FULL_NAME.getRespJsonKeyName(),
+				resourceRespJavaObject.getLastUpdaterFullName());
+
+		// validate number of artifacts
+		if (resourceRespJavaObject.getArtifacts() != null) {
+
+			// assertEquals("check number of artifacts",
+			// resourceRespJavaObject.getArtifacts().size(), artifacts.size());
+			int iterNum = -1;
+			ArrayList<String> myArtifacats = new ArrayList<String>();
+			Iterator it = artifacts.entrySet().iterator();
+			while (it.hasNext()) {
+				iterNum++;
+				Map.Entry pair = (Map.Entry) it.next();
+				// System.out.println(pair.getKey() + " = " + pair.getValue());
+				ArtifactDefinition myArtifact = artifacts.get(pair.getKey());
+				myArtifacats.add(myArtifact.getEsId());
+				it.remove(); // avoids a ConcurrentModificationException
+			}
+			// assertTrue("check service contains
+			// artifacts",myArtifacats.containsAll(resourceRespJavaObject.getArtifacts()));
+		}
+
+		// validate number of interfaces:
+
+		if (interfaze != null) {
+			assertEquals("check number of interfaces", resourceRespJavaObject.getInterfaces().size(),
+					interfaces.size());
+		}
+
+	}
+
+	public static boolean validateResourceIsAbstartct(List<Resource> resourceList, Boolean bool) {
+		if (resourceList != null && resourceList.size() > 0) {
+			for (Resource resource : resourceList) {
+				if (resource.isAbstract().equals(bool))
+					continue;
+				else
+					return false;
+			}
+		} else
+			return false;
+		return true;
+	}
+
+	public static void validateResourceVersion(Resource resource, String expectedVersion) {
+		if (resource != null && !resource.equals("")) {
+			assertTrue("expected resource version is: " + expectedVersion + ", but actual is: " + resource.getVersion(),
+					resource.getVersion().equals(expectedVersion));
+		}
+	}
+}
diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/utils/validation/ServiceValidationUtils.java b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/utils/validation/ServiceValidationUtils.java
new file mode 100644
index 0000000000..6c9b839150
--- /dev/null
+++ b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/utils/validation/ServiceValidationUtils.java
@@ -0,0 +1,131 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * SDC
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.sdc.ci.tests.utils.validation;
+
+import org.openecomp.sdc.be.model.DistributionStatusEnum;
+import org.openecomp.sdc.be.model.LifecycleStateEnum;
+import org.openecomp.sdc.be.model.Service;
+import org.openecomp.sdc.be.model.User;
+import org.openecomp.sdc.ci.tests.datatypes.ServiceReqDetails;
+import org.openecomp.sdc.ci.tests.datatypes.expected.ExpectedResourceAuditJavaObject;
+import org.openecomp.sdc.ci.tests.datatypes.http.RestResponse;
+import org.openecomp.sdc.ci.tests.utils.rest.ResponseParser;
+
+import java.util.LinkedHashSet;
+import java.util.List;
+import java.util.Set;
+
+import static org.testng.AssertJUnit.assertEquals;
+import static org.testng.AssertJUnit.assertFalse;
+
+public class ServiceValidationUtils {
+
+	public static void validateServiceResponseMetaData(ServiceReqDetails serviceDetails, Service service, User user,
+			LifecycleStateEnum lifecycleState) {
+		validateServiceResponseMetaData(serviceDetails, service, user, user, lifecycleState);
+	}
+
+	public static void validateServiceResponseMetaData(ServiceReqDetails expectedService, Service service,
+			User creatorUser, User updaterUser, LifecycleStateEnum lifeCycleState) {
+		List<String> expectedTags = expectedService.getTags();
+		expectedTags.add(expectedService.getName());
+		List<String> receivedTags = service.getTags();
+		if (expectedTags != null) {
+			Set<String> hs = new LinkedHashSet<>(expectedTags);
+			expectedTags.clear();
+			expectedTags.addAll(hs);
+		}
+
+		assertEquals("Check service name on response after create service", expectedService.getName(),
+				service.getName());
+		// check size of list
+		assertEquals("Check only 1 category returned on response after create service", 1,
+				expectedService.getCategories().size());
+		assertEquals("Check service name on response after create service", expectedService.getName(),
+				service.getName());
+		assertEquals("Check categories on response after create service",
+				expectedService.getCategories().get(0).getName(), service.getCategories().get(0).getName());
+		assertEquals("Check tag list on response after create service", expectedTags, receivedTags);
+		assertEquals("Check description on response after create service", expectedService.getDescription(),
+				service.getDescription());
+		// assertEquals("Check vendor name on response after create service",
+		// expectedService.getVendorName(), service.getVendorName());
+		// assertEquals("Check vendor release on response after create service",
+		// expectedService.getVendorRelease(), service.getVendorRelease());
+		assertEquals("Check attContant name on response after create service",
+				expectedService.getContactId().toLowerCase(), service.getContactId());
+		assertEquals("Check icon name on response after create service", expectedService.getIcon(), service.getIcon());
+		assertEquals("Check LastUpdaterUserId after create service", updaterUser.getUserId(),
+				service.getLastUpdaterUserId());
+		assertEquals("Check LastUpdaterName after create service",
+				updaterUser.getFirstName() + " " + updaterUser.getLastName(), service.getLastUpdaterFullName());
+		assertEquals("Check CreatorUserId after create service", creatorUser.getUserId(), service.getCreatorUserId());
+		assertEquals("Check CreatorName after create service",
+				creatorUser.getFirstName() + " " + creatorUser.getLastName(), service.getCreatorFullName());
+		assertEquals("Check version after create service", expectedService.getVersion(), service.getVersion());
+		// assertEquals("Check UniqueId after create service", SERVICE_PREFIX +
+		// serviceDetails.getServiceName().toLowerCase()+"." +
+		// serviceBaseVersion, service.getUniqueId());
+		assertFalse("Check uuid after create service", service.getUUID().isEmpty());
+
+		// assertTrue("check creation date after create service",
+		// service.getCreationDate() != null);
+		// assertTrue("check update date after create service",
+		// service.getLastUpdateDate() != null);
+
+		if (lifeCycleState != null)
+			assertEquals("Check LifecycleState after create service", lifeCycleState, service.getLifecycleState());
+		else
+			assertEquals("Check LifecycleState after create service", LifecycleStateEnum.NOT_CERTIFIED_CHECKOUT,
+					service.getLifecycleState());
+	}
+
+	public static ExpectedResourceAuditJavaObject constructFieldsForAuditValidation(ServiceReqDetails serviceReqDetails,
+			String serviceVersion, User sdncUserDetails) {
+
+		ExpectedResourceAuditJavaObject expectedResourceAuditJavaObject = new ExpectedResourceAuditJavaObject();
+
+		expectedResourceAuditJavaObject.setAction("Create");
+		expectedResourceAuditJavaObject.setModifierUid(sdncUserDetails.getUserId());
+		String userFirstLastName = sdncUserDetails.getFirstName() + " " + sdncUserDetails.getLastName();
+		expectedResourceAuditJavaObject.setModifierName(userFirstLastName);
+		expectedResourceAuditJavaObject.setStatus("200");
+		expectedResourceAuditJavaObject.setDesc("OK");
+		expectedResourceAuditJavaObject.setResourceName(serviceReqDetails.getName());
+		expectedResourceAuditJavaObject.setResourceType("Service");
+		expectedResourceAuditJavaObject.setPrevVersion(String.valueOf(Float.parseFloat(serviceVersion) - 0.1f));
+		expectedResourceAuditJavaObject.setCurrVersion(serviceVersion);
+		expectedResourceAuditJavaObject.setPrevState((LifecycleStateEnum.NOT_CERTIFIED_CHECKOUT).toString());
+		expectedResourceAuditJavaObject.setCurrState((LifecycleStateEnum.NOT_CERTIFIED_CHECKOUT).toString());
+		expectedResourceAuditJavaObject.setComment(null);
+
+		return expectedResourceAuditJavaObject;
+
+	}
+
+	public static void validateDistrubtionStatusValue(RestResponse response,
+			DistributionStatusEnum expectedDistributionValue) throws Exception {
+		String actualDistributionValue = ResponseParser.getValueFromJsonResponse(response.getResponse(),
+				"distributionStatus");
+		assertEquals(expectedDistributionValue.name(), actualDistributionValue);
+	}
+
+}
diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/utils/validation/UserValidationUtils.java b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/utils/validation/UserValidationUtils.java
new file mode 100644
index 0000000000..58fd4f05d3
--- /dev/null
+++ b/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/utils/validation/UserValidationUtils.java
@@ -0,0 +1,274 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * SDC
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.sdc.ci.tests.utils.validation;
+
+import com.google.gson.*;
+import org.apache.commons.lang.StringUtils;
+import org.openecomp.sdc.be.dao.utils.UserStatusEnum;
+import org.openecomp.sdc.be.model.User;
+import org.openecomp.sdc.ci.tests.datatypes.enums.ErrorInfo;
+import org.openecomp.sdc.ci.tests.datatypes.enums.UserRoleEnum;
+import org.openecomp.sdc.ci.tests.datatypes.http.RestResponse;
+import org.openecomp.sdc.ci.tests.users.AddUserAuditMessageInfo;
+import org.openecomp.sdc.ci.tests.users.UserAuditJavaObject;
+import org.openecomp.sdc.ci.tests.utils.DbUtils;
+import org.openecomp.sdc.ci.tests.utils.Utils;
+
+import java.util.List;
+
+import static org.testng.AssertJUnit.assertEquals;
+import static org.testng.AssertJUnit.assertTrue;
+
+public class UserValidationUtils {
+	public static void compareExpectedAndActualUsers(User expected, User actual) {
+
+		String actualFirstName = actual.getFirstName();
+		String expectedFirstName = expected.getFirstName();
+		assertEquals("check user first name - ", expectedFirstName, actualFirstName);
+
+		String actualLastName = actual.getLastName();
+		String expectedLastName = expected.getLastName();
+		assertEquals("check user last name - ", expectedLastName, actualLastName);
+
+		String actualUserId = actual.getUserId();
+		String expectedUserId = expected.getUserId();
+		assertEquals("check user userId - ", expectedUserId, actualUserId);
+
+		String actualEmail = actual.getEmail();
+		String expectedEmail = expected.getEmail();
+		assertEquals("check user email - ", expectedEmail, actualEmail);
+
+		Long actualLastLoginTime = actual.getLastLoginTime();
+		Long expectedLastLoginTime = expected.getLastLoginTime();
+		assertEquals("check user last login time - ", expectedLastLoginTime, actualLastLoginTime);
+
+		String actualRole = actual.getRole();
+		if (expected.getRole() == null) {
+			String expectedRole = UserRoleEnum.DESIGNER.name();
+			assertEquals("check user role - ", expectedRole, actualRole);
+		} else {
+			String expectedRole = expected.getRole();
+			assertEquals("check user role - ", expectedRole, actualRole);
+		}
+
+		UserStatusEnum actualStatus = expected.getStatus();
+		UserStatusEnum expectedStatus = expected.getStatus();
+		assertEquals("check user status - ", expectedStatus, actualStatus);
+	}
+
+	public static void validateDeleteUserAuditMessage(User sdncUserDetails, User sdncModifierDetails,
+			String responseCode, String responseMessage, AddUserAuditMessageInfo addUserAuditMessageInfo) {
+		String action = "DeleteUser";
+		validateUserAuditMessage(sdncUserDetails, sdncModifierDetails, responseCode, responseMessage,
+				addUserAuditMessageInfo, action);
+
+	}
+
+	private static void validateUserAuditMessage(User sdncUserDetails, User sdncModifierDetails, String responseCode,
+			String responseMessage, AddUserAuditMessageInfo addUserAuditMessageInfo, String expectedAction) {
+
+		assertEquals("check audit action - ", expectedAction, addUserAuditMessageInfo.getACTION());
+
+		// String expectedModifierFirstLastName =
+		// sdncModifierDetails.getFirstName() + " " +
+		// sdncModifierDetails.getLastName();
+		// assertEquals("check audit modifier name - ",
+		// expectedModifierFirstLastName,
+		// addUserAuditMessageInfo.getMODIFIER_NAME());
+		String fullName = sdncModifierDetails.getFullName();
+		if (sdncModifierDetails.getFullName().equals(" ")) {
+			fullName = "";
+		}
+		String expectedModifierId = fullName + "(" + sdncModifierDetails.getUserId() + ")";
+		assertEquals("check audit modifier uid - ", expectedModifierId, addUserAuditMessageInfo.getMODIFIER());
+
+		String expectedUserFirstLastName = sdncUserDetails.getFirstName() + " " + sdncUserDetails.getLastName();
+		if (expectedUserFirstLastName.equals("null null")) {
+			expectedUserFirstLastName = "";
+		}
+
+		String email = (sdncUserDetails.getEmail() == null) ? "" : sdncUserDetails.getEmail();
+		String role = (sdncUserDetails.getRole() == null) ? "DESIGNER" : sdncUserDetails.getRole();
+
+		String formatedUser = String.format("%s,%s,%s,%s", sdncUserDetails.getUserId(), expectedUserFirstLastName,
+				email, role);
+
+		//
+		// String expectedUserFirstLastName = sdncUserDetails.getFirstName() + "
+		// " + sdncUserDetails.getLastName();
+		// if (expectedUserFirstLastName.equals("null null")) {
+		// expectedUserFirstLastName = "";
+		// }
+		//
+		// String expectedUserFirstLastName = "";
+		// expectedUserFirstLastName += sdncUserDetails.getFirstName() == null ?
+		// "" : sdncUserDetails.getFirstName();
+		// String lastName = sdncUserDetails.getLastName() == null ? "" :
+		// sdncUserDetails.getLastName();
+		// if (expectedUserFirstLastName.isEmpty()) {
+		// expectedUserFirstLastName = lastName;
+		// } else {
+		// expectedUserFirstLastName += " " + lastName;
+		// }
+
+		assertEquals("check audit user name - ", formatedUser, addUserAuditMessageInfo.getUSER());
+
+		// String expectedUserUid = sdncUserDetails.getUserId();
+		// assertEquals("check audit user uid - ", expectedUserUid,
+		// addUserAuditMessageInfo.getUSER_UID());
+		//
+		// String expectedUserEmail = sdncUserDetails.getEmail() == null ? "" :
+		// sdncUserDetails.getEmail();
+		// //TODO: esofer check with Andrey. Audit return "" but in user we have
+		// null
+		// assertEquals("check audit user email - ", expectedUserEmail,
+		// addUserAuditMessageInfo.getUSER_EMAIL());
+		//
+		// String expectedUserRole = sdncUserDetails.getRole();
+		// if (expectedUserRole ==null){
+		// expectedUserRole = "DESIGNER";
+		// assertEquals("check audit user role - ", expectedUserRole,
+		// addUserAuditMessageInfo.getUSER_ROLE());
+		// }else{
+		// assertEquals("check audit user role - ", expectedUserRole,
+		// addUserAuditMessageInfo.getUSER_ROLE());
+		// }
+
+		String expectedUserResponseCode = responseCode;
+		assertEquals("check audit user response code - ", expectedUserResponseCode,
+				addUserAuditMessageInfo.getSTATUS());
+
+		String expectedUserResponseMessage = responseMessage;
+		assertEquals("check audit user response message - ", expectedUserResponseMessage,
+				addUserAuditMessageInfo.getDESC());
+
+	}
+
+	public static void validateDataAgainstAuditDB_access(User sdncUserDetails, UserAuditJavaObject auditJavaObject,
+			RestResponse restResponse, ErrorInfo errorInfo, List<String> variables) {
+
+		validateAuditDataAgainstAuditDbInAccess(sdncUserDetails, auditJavaObject, restResponse, errorInfo, variables);
+
+	}
+
+	public static void validateAuditDataAgainstAuditDbInAccess(User sdncUserDetails,
+			UserAuditJavaObject auditJavaObject, RestResponse restResponse, ErrorInfo errorInfo,
+			List<String> variables) {
+
+		String expected;
+
+		expected = "Access";
+		assertEquals("ACTION- ", expected, auditJavaObject.getACTION());
+
+		if (sdncUserDetails.getFirstName() != StringUtils.EMPTY && sdncUserDetails.getLastName() != StringUtils.EMPTY) {
+			expected = sdncUserDetails.getFirstName() + " " + sdncUserDetails.getLastName();
+		} else {
+			expected = StringUtils.EMPTY;
+		}
+		String formatedUser = String.format("%s(%s)", expected, sdncUserDetails.getUserId());
+		assertTrue(
+				"check audit user: expected start with - " + formatedUser + " ,actual - " + auditJavaObject.getUSER(),
+				auditJavaObject.getUSER().startsWith(formatedUser));
+
+		expected = restResponse.getErrorCode().toString();
+		assertEquals("check audit user status code - ", expected, auditJavaObject.getSTATUS());
+
+		if (restResponse.getErrorCode() == 200 || restResponse.getErrorCode() == 201) {
+			expected = errorInfo.getMessage();
+		} else {
+			expected = AuditValidationUtils.buildAuditDescription(errorInfo, variables);
+		}
+
+		assertEquals("check audit user desc - ", expected, auditJavaObject.getDESC());
+
+		// expected = sdncUserDetails.getUserId();
+		// assertEquals(expected, auditJavaObject.getUSER());
+
+	}
+
+	public static void validateUserDetailsOnResponse(User sdncUserDetails, String userDetailsOnResponse) {
+
+		String actualFirstName = Utils.getJsonObjectValueByKey(userDetailsOnResponse, "firstName");
+		String expectedFirstName = sdncUserDetails.getFirstName();
+		assertEquals("check user first name - ", expectedFirstName, actualFirstName);
+
+		String actualLastName = Utils.getJsonObjectValueByKey(userDetailsOnResponse, "lastName");
+		String expectedLastName = sdncUserDetails.getLastName();
+		assertEquals("check user last name - ", expectedLastName, actualLastName);
+
+		String actualUserId = Utils.getJsonObjectValueByKey(userDetailsOnResponse, "userId");
+		String expectedUserId = sdncUserDetails.getUserId();
+		assertEquals("check user userId - ", expectedUserId, actualUserId);
+
+		String actualEmail = Utils.getJsonObjectValueByKey(userDetailsOnResponse, "email");
+		String expectedEmail = sdncUserDetails.getEmail();
+		assertEquals("check user email - ", expectedEmail, actualEmail);
+
+		String actualRole = Utils.getJsonObjectValueByKey(userDetailsOnResponse, "role");
+		if (sdncUserDetails.getRole() == null) {
+			String expectedRole = UserRoleEnum.DESIGNER.name();
+			assertEquals("check user role - ", expectedRole, actualRole);
+		} else {
+			String expectedRole = sdncUserDetails.getRole();
+			assertEquals("check user role - ", expectedRole, actualRole);
+		}
+
+		String actualStatus = Utils.getJsonObjectValueByKey(userDetailsOnResponse, "status");
+		String expectedStatus = sdncUserDetails.getStatus().name();
+		assertEquals("check user status - ", expectedStatus, actualStatus);
+
+	}
+
+	public static AddUserAuditMessageInfo getAddUserAuditMessage(String action) throws Exception {
+
+		Gson gson = new Gson();
+		String index = "auditingevents*";
+		String type = "useradminevent";
+		String pattern = "/_search?q=ACTION:\"" + action + "\"";
+		String auditingMessage = DbUtils.retrieveAuditMessagesByPattern(pattern);
+		// String auditingMessage = retrieveAuditMessageByIndexType(index, type,
+		// pattern);
+		JsonElement jElement = new JsonParser().parse(auditingMessage);
+		JsonObject jObject = jElement.getAsJsonObject();
+		JsonObject hitsObject = (JsonObject) jObject.get("hits");
+		JsonArray hitsArray = (JsonArray) hitsObject.get("hits");
+		// for (int i = 0; i < hitsArray.size();){
+		if (hitsArray != null) {
+			JsonObject jHitObject = (JsonObject) hitsArray.get(0);
+			JsonObject jSourceObject = (JsonObject) jHitObject.get("_source");
+			AddUserAuditMessageInfo addUserAuditMessageInfo = new AddUserAuditMessageInfo();
+			addUserAuditMessageInfo = gson.fromJson(jSourceObject, AddUserAuditMessageInfo.class);
+			return addUserAuditMessageInfo;
+		}
+		return null;
+
+	}
+
+	public static void validateAddUserAuditMessage(User sdncUserDetails, User sdncModifierDetails, String responseCode,
+			String responseMessage, AddUserAuditMessageInfo addUserAuditMessageInfo) {
+
+		String action = "AddUser";
+		validateUserAuditMessage(sdncUserDetails, sdncModifierDetails, responseCode, responseMessage,
+				addUserAuditMessageInfo, action);
+
+	}
+
+}
diff --git a/integration-tests/src/test/java/org/openecomp/sdc/externalApis/AssetLifeCycle.java b/integration-tests/src/test/java/org/openecomp/sdc/externalApis/AssetLifeCycle.java
new file mode 100644
index 0000000000..d7698a6521
--- /dev/null
+++ b/integration-tests/src/test/java/org/openecomp/sdc/externalApis/AssetLifeCycle.java
@@ -0,0 +1,733 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * SDC
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.sdc.externalApis;
+
+import com.aventstack.extentreports.Status;
+import com.google.gson.Gson;
+import fj.data.Either;
+import org.json.simple.parser.JSONParser;
+import org.junit.Rule;
+import org.junit.rules.TestName;
+import org.openecomp.sdc.be.dao.api.ActionStatus;
+import org.openecomp.sdc.be.datatypes.enums.AssetTypeEnum;
+import org.openecomp.sdc.be.datatypes.enums.ComponentTypeEnum;
+import org.openecomp.sdc.be.datatypes.enums.ResourceTypeEnum;
+import org.openecomp.sdc.be.model.*;
+import org.openecomp.sdc.ci.tests.api.ComponentBaseTest;
+import org.openecomp.sdc.ci.tests.config.Config;
+import org.openecomp.sdc.ci.tests.datatypes.*;
+import org.openecomp.sdc.ci.tests.datatypes.enums.*;
+import org.openecomp.sdc.ci.tests.datatypes.http.RestResponse;
+import org.openecomp.sdc.ci.tests.utils.general.AtomicOperationUtils;
+import org.openecomp.sdc.ci.tests.utils.general.ElementFactory;
+import org.openecomp.sdc.ci.tests.utils.rest.*;
+import org.openecomp.sdc.ci.tests.utils.validation.ErrorValidationUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.testng.Assert;
+import org.testng.annotations.DataProvider;
+import org.testng.annotations.Test;
+
+import java.io.FileNotFoundException;
+
+public class AssetLifeCycle extends ComponentBaseTest {
+	private static Logger log = LoggerFactory.getLogger(CRUDExternalAPI.class.getName());
+	protected static final String UPLOAD_ARTIFACT_PAYLOAD = "UHVUVFktVXNlci1LZXktRmlsZS0yOiBzc2gtcnNhDQpFbmNyeXB0aW9uOiBhZXMyNTYtY2JjDQpDb21tZW5wOA0K";
+	protected static final String UPLOAD_ARTIFACT_NAME = "TLV_prv.ppk";
+
+	protected Config config = Config.instance();
+	protected String contentTypeHeaderData = "application/json";
+	protected String acceptHeaderDate = "application/json";
+	protected static User defaultUser = ElementFactory.getDefaultUser(UserRoleEnum.DESIGNER);
+
+	protected Gson gson = new Gson();
+	protected JSONParser jsonParser = new JSONParser();
+
+
+	protected String serviceVersion;
+	protected ResourceReqDetails resourceDetails;
+	protected User sdncUserDetails;
+	protected ServiceReqDetails serviceDetails;
+	
+	public static final int STATUS_CODE_SUCCESS = getResponseCodeByAction(ActionStatus.OK);
+	public static final int STATUS_CODE_CREATED = getResponseCodeByAction(ActionStatus.CREATED);
+	public static final int STATUS_CODE_NOT_FOUND = getResponseCodeByAction(ActionStatus.RESOURCE_NOT_FOUND);
+	public static final int STATUS_CODE_INVALID_CONTENT = getResponseCodeByAction(ActionStatus.INVALID_CONTENT);
+	public static final int STATUS_CODE_MISSING_INFORMATION = getResponseCodeByAction(ActionStatus.MISSING_INFORMATION);
+	public static final int STATUS_CODE_ALREADY_EXISTS = getResponseCodeByAction(ActionStatus.RESOURCE_ALREADY_EXISTS);
+	public static final Integer RESTRICTED_OPERATION = getResponseCodeByAction(ActionStatus.RESTRICTED_OPERATION);
+	public static final int COMPONENT_IN_CHECKOUT_STATE = getResponseCodeByAction(ActionStatus.COMPONENT_IN_CHECKOUT_STATE);
+	public static final int COMPONENT_ALREADY_CHECKED_IN = getResponseCodeByAction(ActionStatus.COMPONENT_ALREADY_CHECKED_IN);
+	public static final int COMPONENT_NOT_READY_FOR_CERTIFICATION = getResponseCodeByAction(ActionStatus.COMPONENT_NOT_READY_FOR_CERTIFICATION);
+	public static final int COMPONENT_SENT_FOR_CERTIFICATION = getResponseCodeByAction(ActionStatus.COMPONENT_SENT_FOR_CERTIFICATION);
+	public static final int COMPONENT_IN_CERT_IN_PROGRESS_STATE = getResponseCodeByAction(ActionStatus.COMPONENT_IN_CERT_IN_PROGRESS_STATE);
+	public static final int COMPONENT_ALREADY_CERTIFIED = getResponseCodeByAction(ActionStatus.COMPONENT_ALREADY_CERTIFIED);
+	
+	
+
+	public static int getResponseCodeByAction(ActionStatus actionStatus ){
+		ErrorInfo errorInfo;
+		try {
+			errorInfo = ErrorValidationUtils.parseErrorConfigYaml(actionStatus.name());
+			return errorInfo.getCode();
+		} catch (FileNotFoundException e) {
+			e.printStackTrace();
+		}
+		return 100500;
+	}
+
+	@Rule 
+	public static TestName name = new TestName();
+
+	// US849997 - Story [BE]: External API for asset lifecycle - checkout
+	@Test
+	public void createResourceCheckInThenCheckOut() throws Exception {
+		User defaultUser = ElementFactory.getDefaultUser(UserRoleEnum.DESIGNER);
+		ResourceExternalReqDetails defaultResource = ElementFactory.getDefaultResourceByType("ci", ResourceCategoryEnum.TEMPLATE_MONITORING_TEMPLATE, defaultUser.getUserId(), ResourceTypeEnum.VF.toString());
+		
+		RestResponse restResponse = ResourceRestUtilsExternalAPI.createResource(defaultResource, defaultUser);
+		defaultResource.setVersion(String.format("%.1f",0.1));
+		ResourceAssetStructure parsedCreatedResponse = gson.fromJson(restResponse.getResponse(), ResourceAssetStructure.class);
+		
+		restResponse = LifecycleRestUtils.checkInResource(parsedCreatedResponse.getUuid(), defaultUser);
+		Assert.assertEquals(restResponse.getErrorCode(), (Integer)STATUS_CODE_CREATED, "Fail to check in.");
+		
+		Component resourceDetails = AtomicOperationUtils.getResourceObjectByNameAndVersion(UserRoleEnum.DESIGNER, defaultResource.getName(), defaultResource.getVersion());
+		Assert.assertEquals(resourceDetails.getLifecycleState().toString(), LifeCycleStatesEnum.CHECKIN.getComponentState().toString(), "Life cycle state not changed.");
+		
+		/*// auditing verification
+		AuditingActionEnum action = AuditingActionEnum.CHANGE_LIFECYCLE_BY_API;
+		Map <AuditingFieldsKeysEnum, String> body = new HashMap<>();
+		body.put(AuditingFieldsKeysEnum.AUDIT_RESOURCE_NAME, parsedCreatedResponse.getName());
+		ExpectedResourceAuditJavaObject expectedResourceAuditJavaObject = ElementFactory.getDefaultChangeAssetLifeCycleExternalAPI(resourceDetails, defaultUser, LifeCycleStatesEnum.CHECKIN, AssetTypeEnum.RESOURCES);	
+		AuditValidationUtils.validateAuditExternalChangeAssetLifeCycle(expectedResourceAuditJavaObject, action.getName(), body);*/
+	
+		restResponse = LifecycleRestUtils.checkOutResource(parsedCreatedResponse.getUuid(), defaultUser);
+		Assert.assertEquals(restResponse.getErrorCode(), (Integer)STATUS_CODE_CREATED, "Fail to check out.");
+		
+		resourceDetails = AtomicOperationUtils.getResourceObjectByNameAndVersion(UserRoleEnum.DESIGNER, defaultResource.getName(), String.format("%.1f", Double.parseDouble(defaultResource.getVersion()) + 0.1));
+		Assert.assertEquals(resourceDetails.getLifecycleState().toString(), LifeCycleStatesEnum.CHECKOUT.getComponentState().toString(), "Life cycle state not changed.");
+		
+		/*// auditing verification
+		body = new HashMap<>();
+		body.put(AuditingFieldsKeysEnum.AUDIT_RESOURCE_NAME, parsedCreatedResponse.getName());
+		body.put(AuditingFieldsKeysEnum.AUDIT_RESOURCE_CURR_STATE, LifecycleStateEnum.NOT_CERTIFIED_CHECKOUT.toString());
+		expectedResourceAuditJavaObject = ElementFactory.getDefaultChangeAssetLifeCycleExternalAPI(resourceDetails, defaultUser, LifeCycleStatesEnum.CHECKOUT, AssetTypeEnum.RESOURCES);	
+		expectedResourceAuditJavaObject.setCurrVersion("0.2");
+		expectedResourceAuditJavaObject.setPrevState(LifecycleStateEnum.NOT_CERTIFIED_CHECKIN.toString());
+		expectedResourceAuditJavaObject.setCurrState(LifecycleStateEnum.NOT_CERTIFIED_CHECKOUT.toString());
+		AuditValidationUtils.validateAuditExternalChangeAssetLifeCycle(expectedResourceAuditJavaObject, action.getName(), body);*/
+		
+	}
+	
+	// US849997 - Story [BE]: External API for asset lifecycle - checkout
+	@Test
+	public void createServiceCheckInThenCheckOut() throws Exception {
+		User defaultUser = ElementFactory.getDefaultUser(UserRoleEnum.DESIGNER);
+		
+		Component resourceDetails = null;
+		Either<Service, RestResponse> createdComponent = AtomicOperationUtils.createDefaultService(UserRoleEnum.DESIGNER, true);
+		resourceDetails = createdComponent.left().value();
+		
+		RestResponse restResponse = LifecycleRestUtils.checkInService(resourceDetails.getUUID(), defaultUser);
+		Assert.assertEquals(restResponse.getErrorCode(), (Integer)STATUS_CODE_CREATED, "Fail to check in.");
+		
+		resourceDetails = AtomicOperationUtils.getServiceObjectByNameAndVersion(UserRoleEnum.DESIGNER, resourceDetails.getName(), resourceDetails.getVersion());
+		Assert.assertEquals(resourceDetails.getLifecycleState().toString(), LifeCycleStatesEnum.CHECKIN.getComponentState().toString(), "Life cycle state not changed.");
+		
+		/*// auditing verification
+		AuditingActionEnum action = AuditingActionEnum.CHANGE_LIFECYCLE_BY_API;
+		Map <AuditingFieldsKeysEnum, String> body = new HashMap<>();
+		body.put(AuditingFieldsKeysEnum.AUDIT_RESOURCE_NAME, resourceDetails.getName());
+		ExpectedResourceAuditJavaObject expectedResourceAuditJavaObject = ElementFactory.getDefaultChangeAssetLifeCycleExternalAPI(resourceDetails, defaultUser, LifeCycleStatesEnum.CHECKIN, AssetTypeEnum.SERVICES);	
+		AuditValidationUtils.validateAuditExternalChangeAssetLifeCycle(expectedResourceAuditJavaObject, action.getName(), body);*/
+	
+		restResponse = LifecycleRestUtils.checkOutService(resourceDetails.getUUID(), defaultUser);
+		Assert.assertEquals(restResponse.getErrorCode(), (Integer)STATUS_CODE_CREATED, "Fail to check out.");
+		
+		resourceDetails = AtomicOperationUtils.getServiceObjectByNameAndVersion(UserRoleEnum.DESIGNER, resourceDetails.getName(), String.format("%.1f", Double.parseDouble(resourceDetails.getVersion()) + 0.1));
+		Assert.assertEquals(resourceDetails.getLifecycleState().toString(), LifeCycleStatesEnum.CHECKOUT.getComponentState().toString(), "Life cycle state not changed.");
+		
+		/*// auditing verification
+		body = new HashMap<>();
+		body.put(AuditingFieldsKeysEnum.AUDIT_RESOURCE_NAME, resourceDetails.getName());
+		body.put(AuditingFieldsKeysEnum.AUDIT_RESOURCE_CURR_STATE, LifecycleStateEnum.NOT_CERTIFIED_CHECKOUT.toString());
+		expectedResourceAuditJavaObject = ElementFactory.getDefaultChangeAssetLifeCycleExternalAPI(resourceDetails, defaultUser, LifeCycleStatesEnum.CHECKOUT, AssetTypeEnum.SERVICES);	
+		expectedResourceAuditJavaObject.setCurrVersion("0.2");
+		expectedResourceAuditJavaObject.setPrevState(LifecycleStateEnum.NOT_CERTIFIED_CHECKIN.toString());
+		expectedResourceAuditJavaObject.setCurrState(LifecycleStateEnum.NOT_CERTIFIED_CHECKOUT.toString());
+		AuditValidationUtils.validateAuditExternalChangeAssetLifeCycle(expectedResourceAuditJavaObject, action.getName(), body);*/
+	}
+	
+	///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+	
+	@DataProvider(name="invalidAssetUUID") 
+	public static Object[][] dataProviderInvalidAssetUUID() {
+		return new Object[][] {
+			{AssetTypeEnum.SERVICES, LifeCycleStatesEnum.CHECKIN},
+			{AssetTypeEnum.RESOURCES, LifeCycleStatesEnum.CHECKIN},
+			
+			{AssetTypeEnum.SERVICES, LifeCycleStatesEnum.CHECKOUT},
+			{AssetTypeEnum.RESOURCES, LifeCycleStatesEnum.CHECKOUT},
+			
+			{AssetTypeEnum.SERVICES, LifeCycleStatesEnum.CERTIFICATIONREQUEST},
+			/*{AssetTypeEnum.RESOURCES, LifeCycleStatesEnum.CERTIFICATIONREQUEST},*/
+			
+			{AssetTypeEnum.SERVICES, LifeCycleStatesEnum.STARTCERTIFICATION},
+			/*{AssetTypeEnum.RESOURCES, LifeCycleStatesEnum.STARTCERTIFICATION},*/
+			};
+	}
+	
+	// US849997 - Story [BE]: External API for asset lifecycle - checkout
+	@Test(dataProvider="invalidAssetUUID")
+	public void invalidAssetUUID(AssetTypeEnum assetTypeEnum, LifeCycleStatesEnum lifeCycleStatesEnum) throws Exception {
+		User defaultUser = ElementFactory.getDefaultUser(UserRoleEnum.DESIGNER);
+		String assetUUID = "InvalidAssetUUID";
+		ErrorInfo errorInfo = null;
+		
+		RestResponse restResponse = null;
+		if(assetTypeEnum.equals(AssetTypeEnum.SERVICES)) {
+			
+			if(lifeCycleStatesEnum.equals(LifeCycleStatesEnum.CHECKIN)) {
+				restResponse = LifecycleRestUtils.checkInService(assetUUID, defaultUser);
+			} else if(lifeCycleStatesEnum.equals(LifeCycleStatesEnum.CHECKOUT)) {
+				restResponse = LifecycleRestUtils.checkOutService(assetUUID, defaultUser);
+			} else if(lifeCycleStatesEnum.equals(LifeCycleStatesEnum.CERTIFICATIONREQUEST)) {
+				restResponse = LifecycleRestUtils.certificationRequestService(assetUUID, defaultUser);
+			} else if(lifeCycleStatesEnum.equals(LifeCycleStatesEnum.STARTCERTIFICATION)) {
+				restResponse = LifecycleRestUtils.startTestingService(assetUUID, defaultUser);
+			}
+				
+			errorInfo = ErrorValidationUtils.parseErrorConfigYaml(ActionStatus.SERVICE_NOT_FOUND.name());
+		} else {
+			
+			if(lifeCycleStatesEnum.equals(LifeCycleStatesEnum.CHECKIN)) {
+				restResponse = LifecycleRestUtils.checkInResource(assetUUID, defaultUser);
+			} else if(lifeCycleStatesEnum.equals(LifeCycleStatesEnum.CHECKOUT)) {
+				restResponse = LifecycleRestUtils.checkOutResource(assetUUID, defaultUser);
+			/*} else if(lifeCycleStatesEnum.equals(LifeCycleStatesEnum.CERTIFICATIONREQUEST)) {
+				restResponse = LifecycleRestUtils.certificationRequestResource(assetUUID, defaultUser);
+			} else if(lifeCycleStatesEnum.equals(LifeCycleStatesEnum.STARTCERTIFICATION)) {
+				restResponse = LifecycleRestUtils.startTestingResource(assetUUID, defaultUser);*/
+			}
+			
+			errorInfo = ErrorValidationUtils.parseErrorConfigYaml(ActionStatus.RESOURCE_NOT_FOUND.name());
+			
+		}
+		Assert.assertEquals(restResponse.getErrorCode(), (Integer)STATUS_CODE_NOT_FOUND, "Asset found.");
+		
+	}
+	
+	///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+	
+	@DataProvider(name="invalidUserCheckinForCheckedOutService") 
+	public static Object[][] dataProviderInvalidUserCheckinForCheckedOutService() {
+		return new Object[][] {
+			{ElementFactory.getDefaultUser(UserRoleEnum.TESTER)},
+			// TODO: remove comment after talk with renana if it is defect or not
+//			{ElementFactory.getDefaultUser(UserRoleEnum.ADMIN)},
+			{ElementFactory.getDefaultUser(UserRoleEnum.GOVERNOR)},
+			{ElementFactory.getDefaultUser(UserRoleEnum.OPS)},
+			/*due to those roles are not exists in the system		{ElementFactory.getDefaultUser(UserRoleEnum.PRODUCT_STRATEGIST1)},
+			{ElementFactory.getDefaultUser(UserRoleEnum.PRODUCT_MANAGER1)},*/
+			};
+	}
+	
+	// US849997 - Story [BE]: External API for asset lifecycle - checkout
+	@Test(dataProvider="invalidUserCheckinForCheckedOutService")
+	public void invalidUserCheckinForCheckedOutService(User defaultUser) throws Exception {
+		Component resourceDetails = AtomicOperationUtils.createDefaultService(UserRoleEnum.DESIGNER, true).left().value();
+		RestResponse restResponse = LifecycleRestUtils.checkInService(resourceDetails.getUUID(), defaultUser);
+		Assert.assertEquals(restResponse.getErrorCode(), RESTRICTED_OPERATION, "Expected for restricted operation.");
+		
+	}
+	
+	@DataProvider(name="invalidUserCheckinForCheckedInService") 
+	public static Object[][] dataProviderInvalidUserCheckinForCheckedInService() {
+		return new Object[][] {
+			{ElementFactory.getDefaultUser(UserRoleEnum.TESTER)},
+			// TODO: remove comment after talk with renana if it is defect or not
+//			{ElementFactory.getDefaultUser(UserRoleEnum.ADMIN)},
+			{ElementFactory.getDefaultUser(UserRoleEnum.GOVERNOR)},
+			{ElementFactory.getDefaultUser(UserRoleEnum.OPS)},
+			/*due to those roles are not exists in the system					{ElementFactory.getDefaultUser(UserRoleEnum.PRODUCT_STRATEGIST1)},
+			{ElementFactory.getDefaultUser(UserRoleEnum.PRODUCT_MANAGER1)},*/
+			};
+	}
+	
+	// US849997 - Story [BE]: External API for asset lifecycle - checkout
+	@Test(dataProvider="invalidUserCheckinForCheckedInService")
+	public void invalidUserCheckinForCheckedInService(User defaultUser) throws Exception {
+		Component resourceDetails = null;
+		Either<Service, RestResponse> createdComponent = AtomicOperationUtils.createDefaultService(UserRoleEnum.DESIGNER, true);
+		resourceDetails = createdComponent.left().value();
+		resourceDetails = AtomicOperationUtils.changeComponentState(resourceDetails, UserRoleEnum.DESIGNER, LifeCycleStatesEnum.CHECKIN, true).getLeft();
+		RestResponse restResponse = LifecycleRestUtils.checkInService(resourceDetails.getUUID(), defaultUser);
+		Assert.assertEquals(restResponse.getErrorCode(), RESTRICTED_OPERATION, "Expected for restricted operation.");
+		
+	}
+	
+	@DataProvider(name="invalidUserCheckoutForCheckedOutService") 
+	public static Object[][] dataProviderInvalidUserCheckoutForCheckedOutService() {
+		return new Object[][] {
+			{ElementFactory.getDefaultUser(UserRoleEnum.TESTER)},
+			// TODO: remove comment after talk with renana if it is defect or not
+//			{ElementFactory.getDefaultUser(UserRoleEnum.ADMIN)},
+			{ElementFactory.getDefaultUser(UserRoleEnum.GOVERNOR)},
+			{ElementFactory.getDefaultUser(UserRoleEnum.OPS)},
+			/*due to those roles are not exists in the system		{ElementFactory.getDefaultUser(UserRoleEnum.PRODUCT_STRATEGIST1)},
+			{ElementFactory.getDefaultUser(UserRoleEnum.PRODUCT_MANAGER1)},*/
+			};
+	}
+	
+	// US849997 - Story [BE]: External API for asset lifecycle - checkout
+	@Test(dataProvider="invalidUserCheckoutForCheckedOutService")
+	public void invalidUserCheckoutForCheckedOutService(User defaultUser) throws Exception {
+
+		Component resourceDetails = AtomicOperationUtils.createDefaultService(UserRoleEnum.DESIGNER, true).left().value();
+		RestResponse restResponse = LifecycleRestUtils.checkOutService(resourceDetails.getUUID(), defaultUser);
+		Assert.assertEquals(restResponse.getErrorCode(), RESTRICTED_OPERATION, "Expected for restricted operation.");
+		
+	}
+	
+	@DataProvider(name="invalidUserCheckoutForCheckedInService") 
+	public static Object[][] dataProviderInvalidUserCheckoutForCheckedInService() {
+		return new Object[][] {
+			{ElementFactory.getDefaultUser(UserRoleEnum.TESTER)},
+			// TODO: remove comment after talk with renana if it is defect or not
+//			{ElementFactory.getDefaultUser(UserRoleEnum.ADMIN)},
+			{ElementFactory.getDefaultUser(UserRoleEnum.GOVERNOR)},
+			{ElementFactory.getDefaultUser(UserRoleEnum.OPS)},
+			/*due to those roles are not exists in the system		{ElementFactory.getDefaultUser(UserRoleEnum.PRODUCT_STRATEGIST1)},
+			{ElementFactory.getDefaultUser(UserRoleEnum.PRODUCT_MANAGER1)},*/
+			};
+	}
+	
+	// US849997 - Story [BE]: External API for asset lifecycle - checkout
+	@Test(dataProvider="invalidUserCheckoutForCheckedInService")
+	public void invalidUserCheckoutForCheckedInService(User defaultUser) throws Exception {
+		Component resourceDetails = AtomicOperationUtils.createDefaultService(UserRoleEnum.DESIGNER, true).left().value();
+		resourceDetails = AtomicOperationUtils.changeComponentState(resourceDetails, UserRoleEnum.DESIGNER, LifeCycleStatesEnum.CHECKIN, true).getLeft();
+		RestResponse restResponse = LifecycleRestUtils.checkOutService(resourceDetails.getUUID(), defaultUser);
+		Assert.assertEquals(restResponse.getErrorCode(), RESTRICTED_OPERATION, "Expected for restricted operation.");
+		
+	}
+	
+	@DataProvider(name="invalidUserCheckinForCheckedOutResource") 
+	public static Object[][] dataProviderInvalidUserCheckinForCheckedOutResource() {
+		return new Object[][] {
+			{ElementFactory.getDefaultUser(UserRoleEnum.TESTER)},
+			// TODO: remove comment after talk with renana if it is defect or not
+//			{ElementFactory.getDefaultUser(UserRoleEnum.ADMIN)},
+			{ElementFactory.getDefaultUser(UserRoleEnum.GOVERNOR)},
+			{ElementFactory.getDefaultUser(UserRoleEnum.OPS)},
+	/*due to those roles are not exists in the system		{ElementFactory.getDefaultUser(UserRoleEnum.PRODUCT_STRATEGIST1)},
+			{ElementFactory.getDefaultUser(UserRoleEnum.PRODUCT_MANAGER1)},*/
+			};
+	}
+	
+	// US849997 - Story [BE]: External API for asset lifecycle - checkout
+	@Test(dataProvider="invalidUserCheckinForCheckedOutResource")
+	public void invalidUserCheckinForCheckedOutResource(User defaultUser) throws Exception {
+
+		Component resourceDetails = AtomicOperationUtils.createResourcesByTypeNormTypeAndCatregory(ResourceTypeEnum.VF, NormativeTypesEnum.ROOT, ResourceCategoryEnum.GENERIC_INFRASTRUCTURE, UserRoleEnum.DESIGNER, true).left().value();
+		RestResponse restResponse = LifecycleRestUtils.checkInResource(resourceDetails.getUUID(), defaultUser);
+		Assert.assertEquals(restResponse.getErrorCode(), RESTRICTED_OPERATION, "Expected for restricted operation.");
+		
+	}
+	
+	@DataProvider(name="invalidUserCheckinForCheckedInResource") 
+	public static Object[][] dataProviderInvalidUserCheckinForCheckedInResource() {
+		return new Object[][] {
+			{ElementFactory.getDefaultUser(UserRoleEnum.TESTER)},
+			// TODO: remove comment after talk with renana if it is defect or not
+//			{ElementFactory.getDefaultUser(UserRoleEnum.ADMIN)},
+			{ElementFactory.getDefaultUser(UserRoleEnum.GOVERNOR)},
+			{ElementFactory.getDefaultUser(UserRoleEnum.OPS)},
+			/*due to those roles are not exists in the system		{ElementFactory.getDefaultUser(UserRoleEnum.PRODUCT_STRATEGIST1)},
+			{ElementFactory.getDefaultUser(UserRoleEnum.PRODUCT_MANAGER1)},*/
+			};
+	}
+	
+	// US849997 - Story [BE]: External API for asset lifecycle - checkout
+	@Test(dataProvider="invalidUserCheckinForCheckedInResource")
+	public void invalidUserCheckinForCheckedInResource(User defaultUser) throws Exception {
+		Component resourceDetails = null;
+		Either<Resource, RestResponse> createdComponent = AtomicOperationUtils.createResourcesByTypeNormTypeAndCatregory(ResourceTypeEnum.VF, NormativeTypesEnum.ROOT, ResourceCategoryEnum.GENERIC_INFRASTRUCTURE, UserRoleEnum.DESIGNER, true);
+		resourceDetails = createdComponent.left().value();
+		resourceDetails = AtomicOperationUtils.changeComponentState(resourceDetails, UserRoleEnum.DESIGNER, LifeCycleStatesEnum.CHECKIN, true).getLeft();
+		
+		RestResponse restResponse = LifecycleRestUtils.checkInResource(resourceDetails.getUUID(), defaultUser);
+		Assert.assertEquals(restResponse.getErrorCode(), RESTRICTED_OPERATION, "Expected for restricted operation.");
+	}
+	
+	@DataProvider(name="invalidUserCheckoutForCheckedOutResource") 
+	public static Object[][] dataProviderInvalidUserCheckoutForCheckedOutResource() {
+		return new Object[][] {
+			{ElementFactory.getDefaultUser(UserRoleEnum.TESTER)},
+			// TODO: remove comment after talk with renana if it is defect or not
+//			{ElementFactory.getDefaultUser(UserRoleEnum.ADMIN)},
+			{ElementFactory.getDefaultUser(UserRoleEnum.GOVERNOR)},
+			{ElementFactory.getDefaultUser(UserRoleEnum.OPS)},
+			/*due to those roles are not exists in the system		{ElementFactory.getDefaultUser(UserRoleEnum.PRODUCT_STRATEGIST1)},
+			{ElementFactory.getDefaultUser(UserRoleEnum.PRODUCT_MANAGER1)},*/
+			};
+	}
+	
+	// US849997 - Story [BE]: External API for asset lifecycle - checkout
+	@Test(dataProvider="invalidUserCheckoutForCheckedOutResource")
+	public void invalidUserCheckoutForCheckedOutResource(User defaultUser) throws Exception {
+
+		Component resourceDetails = AtomicOperationUtils.createResourcesByTypeNormTypeAndCatregory(ResourceTypeEnum.VF, NormativeTypesEnum.ROOT, ResourceCategoryEnum.GENERIC_INFRASTRUCTURE, UserRoleEnum.DESIGNER, true).left().value();
+		RestResponse restResponse = LifecycleRestUtils.checkOutResource(resourceDetails.getUUID(), defaultUser);
+		Assert.assertEquals(restResponse.getErrorCode(), RESTRICTED_OPERATION, "Expected for restricted operation.");
+		
+	}
+	
+	@DataProvider(name="invalidUserCheckoutForCheckedInResource") 
+	public static Object[][] dataProviderInvalidUserCheckoutForCheckedInResource() {
+		return new Object[][] {
+			{ElementFactory.getDefaultUser(UserRoleEnum.TESTER)},
+			// TODO: remove comment after talk with renana if it is defect or not
+//			{ElementFactory.getDefaultUser(UserRoleEnum.ADMIN)},
+			{ElementFactory.getDefaultUser(UserRoleEnum.GOVERNOR)},
+			{ElementFactory.getDefaultUser(UserRoleEnum.OPS)},
+			/*due to those roles are not exists in the system		{ElementFactory.getDefaultUser(UserRoleEnum.PRODUCT_STRATEGIST1)},
+			{ElementFactory.getDefaultUser(UserRoleEnum.PRODUCT_MANAGER1)},*/
+			};
+	}
+	
+	// US849997 - Story [BE]: External API for asset lifecycle - checkout
+	@Test(dataProvider="invalidUserCheckoutForCheckedInResource")
+	public void invalidUserCheckoutForCheckedInResource(User defaultUser) throws Exception {
+
+		Component resourceDetails = AtomicOperationUtils.createResourcesByTypeNormTypeAndCatregory(ResourceTypeEnum.VF, NormativeTypesEnum.ROOT, ResourceCategoryEnum.GENERIC_INFRASTRUCTURE, UserRoleEnum.DESIGNER, true).left().value();
+		resourceDetails = AtomicOperationUtils.changeComponentState(resourceDetails, UserRoleEnum.DESIGNER, LifeCycleStatesEnum.CHECKIN, true).getLeft();
+		
+		RestResponse restResponse = LifecycleRestUtils.checkOutResource(resourceDetails.getUUID(), defaultUser);
+		Assert.assertEquals(restResponse.getErrorCode(), RESTRICTED_OPERATION, "Expected for restricted operation.");
+		
+	}
+	
+	///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+	///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+	///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+	
+	
+	
+	
+	@DataProvider(name="invalidStatesForService") 
+	public static Object[][] dataProviderInvalidStatesForService() {
+		return new Object[][] {
+				{LifeCycleStatesEnum.CHECKIN, LifeCycleStatesEnum.CHECKIN, COMPONENT_ALREADY_CHECKED_IN, LifecycleStateEnum.NOT_CERTIFIED_CHECKIN, LifecycleStateEnum.NOT_CERTIFIED_CHECKIN, "409", ActionStatus.COMPONENT_ALREADY_CHECKED_IN, ElementFactory.getDefaultUser(UserRoleEnum.DESIGNER), null},
+				{LifeCycleStatesEnum.CHECKOUT, LifeCycleStatesEnum.CHECKOUT, COMPONENT_IN_CHECKOUT_STATE, LifecycleStateEnum.NOT_CERTIFIED_CHECKOUT, LifecycleStateEnum.NOT_CERTIFIED_CHECKOUT, "403", ActionStatus.COMPONENT_IN_CHECKOUT_STATE, ElementFactory.getDefaultUser(UserRoleEnum.DESIGNER), null},
+				{LifeCycleStatesEnum.CERTIFY, LifeCycleStatesEnum.CHECKIN, COMPONENT_ALREADY_CERTIFIED, LifecycleStateEnum.CERTIFIED, LifecycleStateEnum.CERTIFIED, "403", ActionStatus.COMPONENT_ALREADY_CERTIFIED, ElementFactory.getDefaultUser(UserRoleEnum.DESIGNER), ElementFactory.getDefaultUser(UserRoleEnum.DESIGNER)},
+				{LifeCycleStatesEnum.CERTIFY, LifeCycleStatesEnum.CERTIFY, COMPONENT_NOT_READY_FOR_CERTIFICATION, LifecycleStateEnum.CERTIFIED, LifecycleStateEnum.CERTIFIED, "403", ActionStatus.COMPONENT_NOT_READY_FOR_CERTIFICATION, ElementFactory.getDefaultUser(UserRoleEnum.DESIGNER), null},
+		};
+	}
+	
+	// US849997 - Story [BE]: External API for asset lifecycle - checkout
+	@Test(dataProvider="invalidStatesForService")
+	public void invalidStatesForService(LifeCycleStatesEnum initState, LifeCycleStatesEnum targetState, int errorCode,
+			LifecycleStateEnum preState, LifecycleStateEnum currState, String status,
+			ActionStatus actionStatus, User user, User operationUser) throws Exception {
+
+		getExtendTest().log(Status.INFO, String.format("initState: %s, targetState: %s, errorCode: %s,"
+				+ " preState: %s, currState: %s, status: %s, actionStatus: %s, user: %s, operationUser: %s", initState, targetState, errorCode, preState,
+				currState, status, actionStatus, user, operationUser));
+		
+		
+		Either<Service, RestResponse> createdComponent = AtomicOperationUtils.createDefaultService(UserRoleEnum.DESIGNER, true);
+		Component service = createdComponent.left().value();
+		
+		service = AtomicOperationUtils.changeComponentState(service, UserRoleEnum.DESIGNER, initState, true).getLeft();
+		
+		RestResponse restResponse = null;
+		
+		if(targetState.equals(LifeCycleStatesEnum.CHECKOUT)) {
+			restResponse = LifecycleRestUtils.checkOutService(service.getUUID(), user);
+		} else if(targetState.equals(LifeCycleStatesEnum.CHECKIN)) {
+			restResponse = LifecycleRestUtils.checkInService(service.getUUID(), user);
+		} else if(targetState.equals(LifeCycleStatesEnum.CERTIFY)) {
+			restResponse = LifecycleRestUtils.certifyService(service.getUUID(), user);
+		}
+		
+		Assert.assertEquals(restResponse.getErrorCode(), (Integer)errorCode, "Expected that response code will be equal.");
+		
+	}
+
+	@DataProvider(name="invalidStatesForResource") 
+	public static Object[][] dataProviderInvalidStatesForResource() {
+		return new Object[][] {
+			{LifeCycleStatesEnum.CHECKIN, LifeCycleStatesEnum.CHECKIN, COMPONENT_ALREADY_CHECKED_IN, LifecycleStateEnum.NOT_CERTIFIED_CHECKIN, LifecycleStateEnum.NOT_CERTIFIED_CHECKIN, "409", ActionStatus.COMPONENT_ALREADY_CHECKED_IN, ElementFactory.getDefaultUser(UserRoleEnum.DESIGNER), null},
+		/*	{LifeCycleStatesEnum.CHECKIN, LifeCycleStatesEnum.STARTCERTIFICATION, COMPONENT_NOT_READY_FOR_CERTIFICATION, LifecycleStateEnum.NOT_CERTIFIED_CHECKIN, LifecycleStateEnum.NOT_CERTIFIED_CHECKIN, "403", ActionStatus.COMPONENT_NOT_READY_FOR_CERTIFICATION, ElementFactory.getDefaultUser(UserRoleEnum.TESTER), null},*/
+			{LifeCycleStatesEnum.CHECKIN, LifeCycleStatesEnum.CERTIFY, COMPONENT_NOT_READY_FOR_CERTIFICATION, LifecycleStateEnum.NOT_CERTIFIED_CHECKIN, LifecycleStateEnum.NOT_CERTIFIED_CHECKIN, "403", ActionStatus.COMPONENT_NOT_READY_FOR_CERTIFICATION, ElementFactory.getDefaultUser(UserRoleEnum.TESTER), null},
+			
+			{LifeCycleStatesEnum.CHECKOUT, LifeCycleStatesEnum.CHECKOUT, COMPONENT_IN_CHECKOUT_STATE, LifecycleStateEnum.NOT_CERTIFIED_CHECKOUT, LifecycleStateEnum.NOT_CERTIFIED_CHECKOUT, "403", ActionStatus.COMPONENT_IN_CHECKOUT_STATE, ElementFactory.getDefaultUser(UserRoleEnum.DESIGNER), null},
+		/*	{LifeCycleStatesEnum.CHECKOUT, LifeCycleStatesEnum.STARTCERTIFICATION, COMPONENT_NOT_READY_FOR_CERTIFICATION, LifecycleStateEnum.NOT_CERTIFIED_CHECKOUT, LifecycleStateEnum.NOT_CERTIFIED_CHECKOUT, "403", ActionStatus.COMPONENT_NOT_READY_FOR_CERTIFICATION, ElementFactory.getDefaultUser(UserRoleEnum.TESTER), null},*/
+			{LifeCycleStatesEnum.CHECKOUT, LifeCycleStatesEnum.CERTIFY, COMPONENT_NOT_READY_FOR_CERTIFICATION, LifecycleStateEnum.NOT_CERTIFIED_CHECKOUT, LifecycleStateEnum.NOT_CERTIFIED_CHECKOUT, "403", ActionStatus.COMPONENT_NOT_READY_FOR_CERTIFICATION, ElementFactory.getDefaultUser(UserRoleEnum.TESTER), null},
+			
+			/*{LifeCycleStatesEnum.CERTIFICATIONREQUEST, LifeCycleStatesEnum.CERTIFICATIONREQUEST, COMPONENT_SENT_FOR_CERTIFICATION, LifecycleStateEnum.READY_FOR_CERTIFICATION, LifecycleStateEnum.READY_FOR_CERTIFICATION, "403", ActionStatus.COMPONENT_SENT_FOR_CERTIFICATION, ElementFactory.getDefaultUser(UserRoleEnum.DESIGNER), null},
+			{LifeCycleStatesEnum.CERTIFICATIONREQUEST, LifeCycleStatesEnum.CERTIFY, RESTRICTED_OPERATION, LifecycleStateEnum.READY_FOR_CERTIFICATION, LifecycleStateEnum.READY_FOR_CERTIFICATION, "409", ActionStatus.RESTRICTED_OPERATION, ElementFactory.getDefaultUser(UserRoleEnum.DESIGNER), null},
+			
+			{LifeCycleStatesEnum.STARTCERTIFICATION, LifeCycleStatesEnum.CHECKIN, COMPONENT_IN_CERT_IN_PROGRESS_STATE, LifecycleStateEnum.CERTIFICATION_IN_PROGRESS, LifecycleStateEnum.CERTIFICATION_IN_PROGRESS, "403", ActionStatus.COMPONENT_IN_CERT_IN_PROGRESS_STATE, ElementFactory.getDefaultUser(UserRoleEnum.DESIGNER), ElementFactory.getDefaultUser(UserRoleEnum.TESTER)},
+			{LifeCycleStatesEnum.STARTCERTIFICATION, LifeCycleStatesEnum.CHECKOUT, COMPONENT_IN_CERT_IN_PROGRESS_STATE, LifecycleStateEnum.CERTIFICATION_IN_PROGRESS, LifecycleStateEnum.CERTIFICATION_IN_PROGRESS, "403", ActionStatus.COMPONENT_IN_CERT_IN_PROGRESS_STATE, ElementFactory.getDefaultUser(UserRoleEnum.DESIGNER), ElementFactory.getDefaultUser(UserRoleEnum.TESTER)},
+			{LifeCycleStatesEnum.STARTCERTIFICATION, LifeCycleStatesEnum.CERTIFICATIONREQUEST, COMPONENT_IN_CERT_IN_PROGRESS_STATE, LifecycleStateEnum.CERTIFICATION_IN_PROGRESS, LifecycleStateEnum.CERTIFICATION_IN_PROGRESS, "403", ActionStatus.COMPONENT_IN_CERT_IN_PROGRESS_STATE, ElementFactory.getDefaultUser(UserRoleEnum.DESIGNER), ElementFactory.getDefaultUser(UserRoleEnum.TESTER)},
+			{LifeCycleStatesEnum.STARTCERTIFICATION, LifeCycleStatesEnum.STARTCERTIFICATION, COMPONENT_IN_CERT_IN_PROGRESS_STATE, LifecycleStateEnum.CERTIFICATION_IN_PROGRESS, LifecycleStateEnum.CERTIFICATION_IN_PROGRESS, "403", ActionStatus.COMPONENT_IN_CERT_IN_PROGRESS_STATE, ElementFactory.getDefaultUser(UserRoleEnum.TESTER), null},*/
+
+			{LifeCycleStatesEnum.CERTIFY, LifeCycleStatesEnum.CHECKIN, COMPONENT_ALREADY_CERTIFIED, LifecycleStateEnum.CERTIFIED, LifecycleStateEnum.CERTIFIED, "403", ActionStatus.COMPONENT_ALREADY_CERTIFIED, ElementFactory.getDefaultUser(UserRoleEnum.DESIGNER), ElementFactory.getDefaultUser(UserRoleEnum.TESTER)},
+			/*{LifeCycleStatesEnum.CERTIFY, LifeCycleStatesEnum.CERTIFICATIONREQUEST, COMPONENT_ALREADY_CERTIFIED, LifecycleStateEnum.CERTIFIED, LifecycleStateEnum.CERTIFIED, "403", ActionStatus.COMPONENT_ALREADY_CERTIFIED, ElementFactory.getDefaultUser(UserRoleEnum.DESIGNER), ElementFactory.getDefaultUser(UserRoleEnum.TESTER)},
+			{LifeCycleStatesEnum.CERTIFY, LifeCycleStatesEnum.STARTCERTIFICATION, COMPONENT_ALREADY_CERTIFIED, LifecycleStateEnum.CERTIFIED, LifecycleStateEnum.CERTIFIED, "403", ActionStatus.COMPONENT_ALREADY_CERTIFIED, ElementFactory.getDefaultUser(UserRoleEnum.TESTER), null},*/
+			{LifeCycleStatesEnum.CERTIFY, LifeCycleStatesEnum.CERTIFY, COMPONENT_NOT_READY_FOR_CERTIFICATION, LifecycleStateEnum.CERTIFIED, LifecycleStateEnum.CERTIFIED, "403", ActionStatus.COMPONENT_NOT_READY_FOR_CERTIFICATION, ElementFactory.getDefaultUser(UserRoleEnum.TESTER), null},
+		};
+	}
+	
+	// US849997 - Story [BE]: External API for asset lifecycle - checkout
+	@Test(dataProvider="invalidStatesForResource")
+	public void invalidStatesForResource(LifeCycleStatesEnum initState, LifeCycleStatesEnum targetState, int errorCode,
+			LifecycleStateEnum preState, LifecycleStateEnum currState, String status,
+			ActionStatus actionStatus, User user, User operationUser) throws Exception {
+
+		getExtendTest().log(Status.INFO, String.format("initState: %s, targetState: %s, errorCode: %s,"
+				+ " preState: %s, currState: %s, status: %s, actionStatus: %s, user: %s, operationUser: %s", initState, targetState, errorCode, preState,
+				currState, status, actionStatus, user, operationUser));
+
+		Either<Resource, RestResponse> createdComponent = AtomicOperationUtils.createResourcesByTypeNormTypeAndCatregory(ResourceTypeEnum.VF, NormativeTypesEnum.ROOT, ResourceCategoryEnum.GENERIC_INFRASTRUCTURE, UserRoleEnum.DESIGNER, true);
+		Component resourceDetails = createdComponent.left().value();
+		
+		resourceDetails = AtomicOperationUtils.changeComponentState(resourceDetails, UserRoleEnum.DESIGNER, initState, true).getLeft();
+		
+		RestResponse restResponse = null;
+		
+		if(targetState.equals(LifeCycleStatesEnum.CHECKOUT)) {
+			restResponse = LifecycleRestUtils.checkOutResource(resourceDetails.getUUID(), user);
+		} else if(targetState.equals(LifeCycleStatesEnum.CHECKIN)) {
+			restResponse = LifecycleRestUtils.checkInResource(resourceDetails.getUUID(), user);
+		} else if(targetState.equals(LifeCycleStatesEnum.CERTIFY)) {
+			restResponse = LifecycleRestUtils.certifyResource(resourceDetails.getUUID(), user);
+		}
+		
+		Assert.assertEquals(restResponse.getErrorCode(), (Integer)errorCode, "Expected that response code will be equal.");
+		
+	}
+	
+	
+
+	
+	////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+	////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+	////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+	
+/*	// US824692 - Story [BE]: External API for asset lifecycle - submit for test / start testing
+	@Test
+	public void BasicFlowForResourceSubmitForTestingStartTesting() throws Exception {
+		Either<Resource, RestResponse> createdComponent = AtomicOperationUtils.createResourcesByTypeNormTypeAndCatregory(ResourceTypeEnum.VF, NormativeTypesEnum.ROOT, ResourceCategoryEnum.GENERIC_INFRASTRUCTURE, UserRoleEnum.DESIGNER, true);
+		Component resourceDetails = createdComponent.left().value();
+		RestResponse restResponse = LifecycleRestUtils.checkInResource(resourceDetails.getUUID(), ElementFactory.getDefaultUser(UserRoleEnum.DESIGNER));
+		
+		// Certification request
+		restResponse = LifecycleRestUtils.certificationRequestResource(resourceDetails.getUUID(), ElementFactory.getDefaultUser(UserRoleEnum.DESIGNER));
+	}*/
+	
+	// US824692 - Story [BE]: External API for asset lifecycle - submit for test / start testing
+	@Test
+	public void BasicFlowForServiceSubmitForTestingStartTesting() throws Exception {
+		Either<Service, RestResponse> createdComponent = AtomicOperationUtils.createDefaultService(UserRoleEnum.DESIGNER, true);
+		Component resourceDetails = createdComponent.left().value();
+		RestResponse restResponse = LifecycleRestUtils.checkInService(resourceDetails.getUUID(), ElementFactory.getDefaultUser(UserRoleEnum.DESIGNER));
+		
+		// Certification request
+		restResponse = LifecycleRestUtils.certificationRequestService(resourceDetails.getUUID(), ElementFactory.getDefaultUser(UserRoleEnum.DESIGNER));
+		
+		// Start testing
+		restResponse = LifecycleRestUtils.startTestingService(resourceDetails.getUUID(), ElementFactory.getDefaultUser(UserRoleEnum.TESTER));
+		
+	}
+	
+	/*// US824692 - Story [BE]: External API for asset lifecycle - submit for test / start testing
+	@Test
+	public void specialCaseInvalidFlowForVfcmtSubmitForTesting() throws Exception {
+		Either<Resource, RestResponse> createdComponent = AtomicOperationUtils.createResourcesByTypeNormTypeAndCatregory(ResourceTypeEnum.VFCMT, NormativeTypesEnum.ROOT, ResourceCategoryEnum.GENERIC_INFRASTRUCTURE, UserRoleEnum.DESIGNER, true);
+		Component resourceDetails = createdComponent.left().value();
+		RestResponse restResponse = LifecycleRestUtils.checkInResource(resourceDetails.getUUID(), ElementFactory.getDefaultUser(UserRoleEnum.DESIGNER));
+		
+		// Certification request
+		restResponse = LifecycleRestUtils.certificationRequestResource(resourceDetails.getUUID(), ElementFactory.getDefaultUser(UserRoleEnum.DESIGNER));
+	}*/
+	
+	// US824692 - Story [BE]: External API for asset lifecycle - submit for test / start testing
+	@Test
+	public void specialCaseInvalidFlowForVfcmtStartTesting() throws Exception {
+		Either<Resource, RestResponse> createdComponent = AtomicOperationUtils.createResourcesByTypeNormTypeAndCatregory(ResourceTypeEnum.VFCMT, NormativeTypesEnum.ROOT, ResourceCategoryEnum.GENERIC_INFRASTRUCTURE, UserRoleEnum.DESIGNER, true);
+		Component resourceDetails = createdComponent.left().value();
+		RestResponse restResponse = LifecycleRestUtils.checkInResource(resourceDetails.getUUID(), ElementFactory.getDefaultUser(UserRoleEnum.DESIGNER));
+		
+		// Certification request
+		restResponse = LifecycleRestUtils.startTestingResource(resourceDetails.getUUID(), ElementFactory.getDefaultUser(UserRoleEnum.TESTER));
+		
+	}
+	
+	
+	
+	////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+	////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+	////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+	
+	
+	
+	
+	// US824692 - Story [BE]: External API for asset lifecycle - submit for test / start testing
+	@Test
+	public void BasicFlowForResourceCertify() throws Exception {
+		Either<Resource, RestResponse> createdComponent = AtomicOperationUtils.createResourcesByTypeNormTypeAndCatregory(ResourceTypeEnum.VF, NormativeTypesEnum.ROOT, ResourceCategoryEnum.GENERIC_INFRASTRUCTURE, UserRoleEnum.DESIGNER, true);
+		Component resourceDetails = createdComponent.left().value();
+		RestResponse restResponse = LifecycleRestUtils.checkInResource(resourceDetails.getUUID(), ElementFactory.getDefaultUser(UserRoleEnum.DESIGNER));
+		
+		/*// Certification request
+		restResponse = LifecycleRestUtils.certificationRequestResource(resourceDetails.getUUID(), ElementFactory.getDefaultUser(UserRoleEnum.DESIGNER));
+		
+		// Start testing
+		restResponse = LifecycleRestUtils.startTestingResource(resourceDetails.getUUID(), ElementFactory.getDefaultUser(UserRoleEnum.TESTER));*/
+		
+		// Certify
+		restResponse = LifecycleRestUtils.certifyResource(resourceDetails.getUUID(), ElementFactory.getDefaultUser(UserRoleEnum.DESIGNER));
+	}
+		
+	// US824692 - Story [BE]: External API for asset lifecycle - submit for test / start testing
+	@Test
+	public void BasicFlowForServiceCertify() throws Exception {
+		Either<Service, RestResponse> createdComponent = AtomicOperationUtils.createDefaultService(UserRoleEnum.DESIGNER, true);
+		Component resourceDetails = createdComponent.left().value();
+		RestResponse restResponse = LifecycleRestUtils.checkInService(resourceDetails.getUUID(), ElementFactory.getDefaultUser(UserRoleEnum.DESIGNER));
+		
+		// Certification request
+		restResponse = LifecycleRestUtils.certificationRequestService(resourceDetails.getUUID(), ElementFactory.getDefaultUser(UserRoleEnum.DESIGNER));
+		
+		// Start testing
+		restResponse = LifecycleRestUtils.startTestingService(resourceDetails.getUUID(), ElementFactory.getDefaultUser(UserRoleEnum.TESTER));
+		
+		// Certify
+		restResponse = LifecycleRestUtils.certifyService(resourceDetails.getUUID(), ElementFactory.getDefaultUser(UserRoleEnum.TESTER));
+		
+	}
+	
+	
+	
+	
+	
+	
+	
+	
+	////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+	////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+	////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+	
+	@Test
+	public void theFlow() throws Exception {
+		User defaultUser = ElementFactory.getDefaultUser(UserRoleEnum.DESIGNER);
+		ResourceExternalReqDetails defaultResource = ElementFactory.getDefaultResourceByType("ci", ResourceCategoryEnum.TEMPLATE_MONITORING_TEMPLATE, defaultUser.getUserId(), ResourceTypeEnum.VFCMT.toString());
+		
+		// 1. Create VFCMT.
+		RestResponse restResponse = ResourceRestUtilsExternalAPI.createResource(defaultResource, defaultUser);
+		BaseRestUtils.checkCreateResponse(restResponse);
+		ResourceAssetStructure parsedCreatedResponse = gson.fromJson(restResponse.getResponse(), ResourceAssetStructure.class);
+		
+		// 2. Using search external API with resourceType=VFCMT to retrieve VFCMT.
+		restResponse = ResourceRestUtils.getResourceListFilterByCriteria(ElementFactory.getDefaultUser(UserRoleEnum.DESIGNER), AssetTypeEnum.RESOURCES.getValue(), SearchCriteriaEnum.RESOURCE_TYPE.getValue(), ResourceTypeEnum.VFCMT.toString());
+		BaseRestUtils.checkSuccess(restResponse);
+		ResourceAssetStructure dataOutOfSearchResponseForResourceName = ResponseParser.getDataOutOfSearchExternalAPIResponseForResourceName(restResponse.getResponse(), parsedCreatedResponse.getName());
+		Assert.assertEquals(parsedCreatedResponse.getUuid(), dataOutOfSearchResponseForResourceName.getUuid(), "Created resourceUUID not equal to search retrieve resourceUUID.");
+		
+		// 3. Use getSpecificMetadata external API to receive full information of the VFCMT.
+		RestResponse assetResponse = AssetRestUtils.getAssetMetadataByAssetTypeAndUuid(true, AssetTypeEnum.RESOURCES, dataOutOfSearchResponseForResourceName.getUuid());
+		BaseRestUtils.checkSuccess(assetResponse);
+		ResourceDetailedAssetStructure resourceAssetMetadata = AssetRestUtils.getResourceAssetMetadata(assetResponse);
+		Assert.assertEquals(resourceAssetMetadata.getUuid(), parsedCreatedResponse.getUuid(), "Created resourceUUID not equal to getSpecificMetadata resourceUUID.");
+		
+		// 4. Upload artifact via upload artifact external API.
+		Component initComponentVersion = AtomicOperationUtils.getResourceObjectByNameAndVersion(UserRoleEnum.DESIGNER, parsedCreatedResponse.getName(), parsedCreatedResponse.getVersion());
+		ArtifactReqDetails artifactReqDetails = ElementFactory.getArtifactByType("ci", "OTHER", true, false);
+		RestResponse uploadArtifactRestResponse = ArtifactRestUtils.externalAPIUploadArtifactOfTheAsset(initComponentVersion, defaultUser, artifactReqDetails);
+		BaseRestUtils.checkSuccess(uploadArtifactRestResponse);
+
+		ArtifactDefinition responseArtifact = ResponseParser.convertArtifactDefinitionResponseToJavaObject(uploadArtifactRestResponse.getResponse());
+//		ArtifactDefinition responseArtifact = ArtifactRestUtils.getArtifactDataFromJson(uploadArtifactRestResponse.getResponse());
+		initComponentVersion = AtomicOperationUtils.getResourceObjectByNameAndVersion(UserRoleEnum.DESIGNER, parsedCreatedResponse.getName(), parsedCreatedResponse.getVersion());
+		
+		// 5. Update artifact via external API.
+		CRUDExternalAPI crudExternalAPI = new CRUDExternalAPI();
+		crudExternalAPI.updateArtifactOnAssetViaExternalAPI(initComponentVersion, ComponentTypeEnum.RESOURCE, LifeCycleStatesEnum.CHECKOUT, "OTHER");
+	
+		
+		// 6. Use external API to checkin the VFCMT.
+		RestResponse checkInRestResponse = LifecycleRestUtils.checkInResource(initComponentVersion.getUUID(), ElementFactory.getDefaultUser(UserRoleEnum.DESIGNER));
+		BaseRestUtils.checkCreateResponse(checkInRestResponse);
+		parsedCreatedResponse = gson.fromJson(checkInRestResponse.getResponse(), ResourceAssetStructure.class);
+		Assert.assertEquals(parsedCreatedResponse.getVersion(), "0.1", "Expect that version will not change.");
+		Assert.assertEquals(parsedCreatedResponse.getUuid(), initComponentVersion.getUUID(), "Expect that UUID will not change.");
+		Assert.assertEquals(parsedCreatedResponse.getInvariantUUID(), initComponentVersion.getInvariantUUID(), "Expected that invariantUUID will not change.");
+		
+		// 7. Then checkout the VFCMT via external API.
+		RestResponse checkOutRestResponse = LifecycleRestUtils.checkOutResource(initComponentVersion.getUUID(), ElementFactory.getDefaultUser(UserRoleEnum.DESIGNER));
+		BaseRestUtils.checkCreateResponse(checkOutRestResponse);
+		parsedCreatedResponse = gson.fromJson(checkOutRestResponse.getResponse(), ResourceAssetStructure.class);
+		Assert.assertEquals(parsedCreatedResponse.getVersion(), "0.2", "Expect that version will change to 0.2.");
+		Assert.assertEquals(parsedCreatedResponse.getUuid(), initComponentVersion.getUUID(), "Expect that UUID will not change.");
+		Assert.assertEquals(parsedCreatedResponse.getInvariantUUID(), initComponentVersion.getInvariantUUID(), "Expected that invariantUUID will not change.");
+		
+		// 8. The minor version must be incremented, the invariantUUID, and UUID must stay the same, the uniqueId should be changed, the artifacts from first version exists on the new version.
+		Component newComponentVersion = AtomicOperationUtils.getResourceObjectByNameAndVersion(UserRoleEnum.DESIGNER, parsedCreatedResponse.getName(), String.format("%.1f", Double.parseDouble(parsedCreatedResponse.getVersion())));
+		Assert.assertEquals(newComponentVersion.getInvariantUUID(), initComponentVersion.getInvariantUUID(), "Expected that invariantUUID will not change.");
+		Assert.assertEquals(newComponentVersion.getUUID(), initComponentVersion.getUUID(), "Expected that UUID will not change.");
+		Assert.assertNotEquals(newComponentVersion.getUniqueId(), initComponentVersion.getUniqueId(), "Expected that uniqueId will change.");
+		Assert.assertTrue(newComponentVersion.getDeploymentArtifacts().keySet().contains(responseArtifact.getArtifactLabel()), "Expected that artifact from first version exists on the new version.");
+		
+		// 9. The previous version remains untouched, the highest version flag on the first version is false, all information (metadata / artifacts) are the same on the first version.
+		initComponentVersion = AtomicOperationUtils.getResourceObjectByNameAndVersion(UserRoleEnum.DESIGNER, parsedCreatedResponse.getName(), String.format("%.1f", Double.parseDouble("0.1")));
+		Assert.assertEquals(initComponentVersion.isHighestVersion(), (Boolean)false, "Expected that highest version flag on first version is false.");
+		
+		// 10. Check in via external API.
+		checkInRestResponse = LifecycleRestUtils.checkInResource(initComponentVersion.getUUID(), ElementFactory.getDefaultUser(UserRoleEnum.DESIGNER));
+		BaseRestUtils.checkCreateResponse(checkInRestResponse);
+		parsedCreatedResponse = gson.fromJson(checkInRestResponse.getResponse(), ResourceAssetStructure.class);
+		Assert.assertEquals(parsedCreatedResponse.getVersion(), "0.2", "Expect that version will not change.");
+		Assert.assertEquals(parsedCreatedResponse.getUuid(), initComponentVersion.getUUID(), "Expect that UUID will not change.");
+		Assert.assertEquals(parsedCreatedResponse.getInvariantUUID(), initComponentVersion.getInvariantUUID(), "Expected that invariantUUID will not change.");
+		
+		// 11. Certify via external API.
+		RestResponse certifyRestResponse = LifecycleRestUtils.certifyResource(initComponentVersion.getUUID(), ElementFactory.getDefaultUser(UserRoleEnum.DESIGNER));
+		BaseRestUtils.checkCreateResponse(certifyRestResponse);
+		parsedCreatedResponse = gson.fromJson(certifyRestResponse.getResponse(), ResourceAssetStructure.class);
+		Assert.assertEquals(parsedCreatedResponse.getVersion(), "1.0", "Expect that version will change to 1.0");
+		Assert.assertEquals(parsedCreatedResponse.getUuid(), initComponentVersion.getUUID(), "Expect that UUID will not change.");
+		Assert.assertEquals(parsedCreatedResponse.getInvariantUUID(), initComponentVersion.getInvariantUUID(), "Expected that invariantUUID will not change.");
+		
+		// 12. Check out via external API.
+		checkOutRestResponse = LifecycleRestUtils.checkOutResource(initComponentVersion.getUUID(), ElementFactory.getDefaultUser(UserRoleEnum.DESIGNER));
+		BaseRestUtils.checkCreateResponse(checkOutRestResponse);
+		parsedCreatedResponse = gson.fromJson(checkOutRestResponse.getResponse(), ResourceAssetStructure.class);
+		Assert.assertEquals(parsedCreatedResponse.getVersion(), "1.1", "Expect that version will change to 1.1");
+		Assert.assertNotEquals(parsedCreatedResponse.getUuid(), initComponentVersion.getUUID(), "Expect that UUID will change.");
+		Assert.assertEquals(parsedCreatedResponse.getInvariantUUID(), initComponentVersion.getInvariantUUID(), "Expected that invariantUUID will not change.");
+		
+	}
+	
+}
diff --git a/integration-tests/src/test/java/org/openecomp/sdc/externalApis/CRUDExternalAPI.java b/integration-tests/src/test/java/org/openecomp/sdc/externalApis/CRUDExternalAPI.java
new file mode 100644
index 0000000000..d8383759ae
--- /dev/null
+++ b/integration-tests/src/test/java/org/openecomp/sdc/externalApis/CRUDExternalAPI.java
@@ -0,0 +1,2438 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * SDC
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.sdc.externalApis;
+
+import com.aventstack.extentreports.Status;
+import fj.data.Either;
+import org.apache.commons.lang3.StringUtils;
+import org.junit.Rule;
+import org.junit.rules.TestName;
+import org.openecomp.sdc.be.dao.api.ActionStatus;
+import org.openecomp.sdc.be.datatypes.enums.ComponentTypeEnum;
+import org.openecomp.sdc.be.datatypes.enums.ResourceTypeEnum;
+import org.openecomp.sdc.be.model.*;
+import org.openecomp.sdc.ci.tests.api.ComponentBaseTest;
+import org.openecomp.sdc.ci.tests.config.Config;
+import org.openecomp.sdc.ci.tests.datatypes.ArtifactReqDetails;
+import org.openecomp.sdc.ci.tests.datatypes.ResourceReqDetails;
+import org.openecomp.sdc.ci.tests.datatypes.ServiceReqDetails;
+import org.openecomp.sdc.ci.tests.datatypes.enums.*;
+import org.openecomp.sdc.ci.tests.datatypes.http.RestResponse;
+import org.openecomp.sdc.ci.tests.utils.general.AtomicOperationUtils;
+import org.openecomp.sdc.ci.tests.utils.general.ElementFactory;
+import org.openecomp.sdc.ci.tests.utils.rest.ArtifactRestUtils;
+import org.openecomp.sdc.ci.tests.utils.rest.ResponseParser;
+import org.openecomp.sdc.ci.tests.utils.validation.ErrorValidationUtils;
+import org.openecomp.sdc.common.util.ValidationUtils;
+import org.testng.Assert;
+import org.testng.annotations.DataProvider;
+import org.testng.annotations.Test;
+
+import java.io.IOException;
+import java.util.List;
+import java.util.Map;
+
+import static java.util.Arrays.asList;
+
+public class CRUDExternalAPI extends ComponentBaseTest {
+
+    /*private static Logger log = LoggerFactory.getLogger(CRUDExternalAPI.class.getName());
+    protected static final String UPLOAD_ARTIFACT_PAYLOAD = "UHVUVFktVXNlci1LZXktRmlsZS0yOiBzc2gtcnNhDQpFbmNyeXB0aW9uOiBhZXMyNTYtY2JjDQpDb21tZW5wOA0K";
+    protected static final String UPLOAD_ARTIFACT_NAME = "TLV_prv.ppk";*/
+
+    protected Config config = Config.instance();
+
+    protected String serviceVersion;
+    protected ResourceReqDetails resourceDetails;
+    protected User sdncUserDetails;
+    protected ServiceReqDetails serviceDetails;
+
+    @Rule
+    public static TestName name = new TestName();
+
+    @DataProvider(name = "uploadArtifactOnVfcVlCpViaExternalAPI", parallel = true)
+    public static Object[][] dataProviderUploadArtifactOnVfcVlCpViaExternalAPI() {
+        return new Object[][]{
+                {LifeCycleStatesEnum.CHECKOUT, ArtifactTypeEnum.VNF_CATALOG.getType(), ResourceTypeEnum.VFC},
+                {LifeCycleStatesEnum.CHECKOUT, ArtifactTypeEnum.VF_LICENSE.getType(), ResourceTypeEnum.VFC},
+                {LifeCycleStatesEnum.CHECKOUT, ArtifactTypeEnum.VENDOR_LICENSE.getType(), ResourceTypeEnum.VFC},
+                {LifeCycleStatesEnum.CHECKOUT, ArtifactTypeEnum.MODEL_INVENTORY_PROFILE.getType(), ResourceTypeEnum.VFC},
+                {LifeCycleStatesEnum.CHECKOUT, ArtifactTypeEnum.MODEL_QUERY_SPEC.getType(), ResourceTypeEnum.VFC},
+                {LifeCycleStatesEnum.CHECKOUT, ArtifactTypeEnum.OTHER.getType(), ResourceTypeEnum.VFC},
+                {LifeCycleStatesEnum.CHECKOUT, ArtifactTypeEnum.SNMP_POLL.getType(), ResourceTypeEnum.VFC},
+                {LifeCycleStatesEnum.CHECKOUT, ArtifactTypeEnum.SNMP_TRAP.getType(), ResourceTypeEnum.VFC},
+
+                {LifeCycleStatesEnum.CHECKOUT, ArtifactTypeEnum.YANG_XML.getType(), ResourceTypeEnum.VL},
+                {LifeCycleStatesEnum.CHECKOUT, ArtifactTypeEnum.VNF_CATALOG.getType(), ResourceTypeEnum.VL},
+                {LifeCycleStatesEnum.CHECKOUT, ArtifactTypeEnum.VF_LICENSE.getType(), ResourceTypeEnum.VL},
+                {LifeCycleStatesEnum.CHECKOUT, ArtifactTypeEnum.VENDOR_LICENSE.getType(), ResourceTypeEnum.VL},
+                {LifeCycleStatesEnum.CHECKOUT, ArtifactTypeEnum.MODEL_INVENTORY_PROFILE.getType(), ResourceTypeEnum.VL},
+                {LifeCycleStatesEnum.CHECKOUT, ArtifactTypeEnum.MODEL_QUERY_SPEC.getType(), ResourceTypeEnum.VL},
+                {LifeCycleStatesEnum.CHECKOUT, ArtifactTypeEnum.OTHER.getType(), ResourceTypeEnum.VL},
+                {LifeCycleStatesEnum.CHECKOUT, ArtifactTypeEnum.SNMP_POLL.getType(), ResourceTypeEnum.VL},
+                {LifeCycleStatesEnum.CHECKOUT, ArtifactTypeEnum.SNMP_TRAP.getType(), ResourceTypeEnum.VL},
+
+                {LifeCycleStatesEnum.CHECKOUT, ArtifactTypeEnum.YANG_XML.getType(), ResourceTypeEnum.CP},
+                {LifeCycleStatesEnum.CHECKOUT, ArtifactTypeEnum.VNF_CATALOG.getType(), ResourceTypeEnum.CP},
+                {LifeCycleStatesEnum.CHECKOUT, ArtifactTypeEnum.VF_LICENSE.getType(), ResourceTypeEnum.CP},
+                {LifeCycleStatesEnum.CHECKOUT, ArtifactTypeEnum.VENDOR_LICENSE.getType(), ResourceTypeEnum.CP},
+                {LifeCycleStatesEnum.CHECKOUT, ArtifactTypeEnum.MODEL_INVENTORY_PROFILE.getType(), ResourceTypeEnum.CP},
+                {LifeCycleStatesEnum.CHECKOUT, ArtifactTypeEnum.MODEL_QUERY_SPEC.getType(), ResourceTypeEnum.CP},
+                {LifeCycleStatesEnum.CHECKOUT, ArtifactTypeEnum.OTHER.getType(), ResourceTypeEnum.CP},
+                {LifeCycleStatesEnum.CHECKOUT, ArtifactTypeEnum.SNMP_POLL.getType(), ResourceTypeEnum.CP},
+                {LifeCycleStatesEnum.CHECKOUT, ArtifactTypeEnum.SNMP_TRAP.getType(), ResourceTypeEnum.CP},
+
+                {LifeCycleStatesEnum.CHECKIN, ArtifactTypeEnum.YANG_XML.getType(), ResourceTypeEnum.VFC},
+                {LifeCycleStatesEnum.CHECKIN, ArtifactTypeEnum.VNF_CATALOG.getType(), ResourceTypeEnum.VFC},
+                {LifeCycleStatesEnum.CHECKIN, ArtifactTypeEnum.VF_LICENSE.getType(), ResourceTypeEnum.VFC},
+                {LifeCycleStatesEnum.CHECKIN, ArtifactTypeEnum.VENDOR_LICENSE.getType(), ResourceTypeEnum.VFC},
+                {LifeCycleStatesEnum.CHECKIN, ArtifactTypeEnum.MODEL_INVENTORY_PROFILE.getType(), ResourceTypeEnum.VFC},
+                {LifeCycleStatesEnum.CHECKIN, ArtifactTypeEnum.MODEL_QUERY_SPEC.getType(), ResourceTypeEnum.VFC},
+                {LifeCycleStatesEnum.CHECKIN, ArtifactTypeEnum.OTHER.getType(), ResourceTypeEnum.VFC},
+                {LifeCycleStatesEnum.CHECKIN, ArtifactTypeEnum.SNMP_POLL.getType(), ResourceTypeEnum.VFC},
+                {LifeCycleStatesEnum.CHECKIN, ArtifactTypeEnum.SNMP_TRAP.getType(), ResourceTypeEnum.VFC},
+
+                {LifeCycleStatesEnum.CHECKIN, ArtifactTypeEnum.YANG_XML.getType(), ResourceTypeEnum.VL},
+                {LifeCycleStatesEnum.CHECKIN, ArtifactTypeEnum.VNF_CATALOG.getType(), ResourceTypeEnum.VL},
+                {LifeCycleStatesEnum.CHECKIN, ArtifactTypeEnum.VF_LICENSE.getType(), ResourceTypeEnum.VL},
+                {LifeCycleStatesEnum.CHECKIN, ArtifactTypeEnum.VENDOR_LICENSE.getType(), ResourceTypeEnum.VL},
+                {LifeCycleStatesEnum.CHECKIN, ArtifactTypeEnum.MODEL_INVENTORY_PROFILE.getType(), ResourceTypeEnum.VL},
+                {LifeCycleStatesEnum.CHECKIN, ArtifactTypeEnum.MODEL_QUERY_SPEC.getType(), ResourceTypeEnum.VL},
+                {LifeCycleStatesEnum.CHECKIN, ArtifactTypeEnum.OTHER.getType(), ResourceTypeEnum.VL},
+                {LifeCycleStatesEnum.CHECKIN, ArtifactTypeEnum.SNMP_POLL.getType(), ResourceTypeEnum.VL},
+                {LifeCycleStatesEnum.CHECKIN, ArtifactTypeEnum.SNMP_TRAP.getType(), ResourceTypeEnum.VL},
+
+                {LifeCycleStatesEnum.CHECKIN, ArtifactTypeEnum.YANG_XML.getType(), ResourceTypeEnum.CP},
+                {LifeCycleStatesEnum.CHECKIN, ArtifactTypeEnum.VNF_CATALOG.getType(), ResourceTypeEnum.CP},
+                {LifeCycleStatesEnum.CHECKIN, ArtifactTypeEnum.VF_LICENSE.getType(), ResourceTypeEnum.CP},
+                {LifeCycleStatesEnum.CHECKIN, ArtifactTypeEnum.VENDOR_LICENSE.getType(), ResourceTypeEnum.CP},
+                {LifeCycleStatesEnum.CHECKIN, ArtifactTypeEnum.MODEL_INVENTORY_PROFILE.getType(), ResourceTypeEnum.CP},
+                {LifeCycleStatesEnum.CHECKIN, ArtifactTypeEnum.MODEL_QUERY_SPEC.getType(), ResourceTypeEnum.CP},
+                {LifeCycleStatesEnum.CHECKIN, ArtifactTypeEnum.OTHER.getType(), ResourceTypeEnum.CP},
+                {LifeCycleStatesEnum.CHECKIN, ArtifactTypeEnum.SNMP_POLL.getType(), ResourceTypeEnum.CP},
+                {LifeCycleStatesEnum.CHECKIN, ArtifactTypeEnum.SNMP_TRAP.getType(), ResourceTypeEnum.CP},
+        };
+    }
+
+    // External API
+    // Upload artifact on VFC, VL, CP via external API - happy flow
+    @Test(dataProvider = "uploadArtifactOnVfcVlCpViaExternalAPI")
+    public void uploadArtifactOnVfcVlCpViaExternalAPI(LifeCycleStatesEnum chosenLifeCycleState, String artifactType, ResourceTypeEnum resourceTypeEnum) throws Exception {
+        getExtendTest().log(Status.INFO, String.format("chosenLifeCycleState: %s, artifactType: %s, resourceTypeEnum: %s", chosenLifeCycleState, artifactType, resourceTypeEnum));
+        uploadArtifactOnAssetViaExternalAPI(ComponentTypeEnum.RESOURCE, chosenLifeCycleState, artifactType, resourceTypeEnum);
+    }
+
+    @DataProvider(name = "uploadArtifactOnVFViaExternalAPI", parallel = true)
+    public static Object[][] dataProviderUploadArtifactOnVFViaExternalAPI() {
+        return new Object[][]{
+                {LifeCycleStatesEnum.CHECKOUT, ArtifactTypeEnum.DCAE_JSON.getType()},
+                {LifeCycleStatesEnum.CHECKOUT, ArtifactTypeEnum.DCAE_POLICY.getType()},
+                {LifeCycleStatesEnum.CHECKOUT, ArtifactTypeEnum.DCAE_EVENT.getType()},
+                {LifeCycleStatesEnum.CHECKOUT, ArtifactTypeEnum.APPC_CONFIG.getType()},
+                {LifeCycleStatesEnum.CHECKOUT, ArtifactTypeEnum.DCAE_DOC.getType()},
+                {LifeCycleStatesEnum.CHECKOUT, ArtifactTypeEnum.DCAE_TOSCA.getType()},
+                {LifeCycleStatesEnum.CHECKOUT, ArtifactTypeEnum.YANG_XML.getType()},
+                {LifeCycleStatesEnum.CHECKOUT, ArtifactTypeEnum.VNF_CATALOG.getType()},
+                {LifeCycleStatesEnum.CHECKOUT, ArtifactTypeEnum.VF_LICENSE.getType()},
+                {LifeCycleStatesEnum.CHECKOUT, ArtifactTypeEnum.VENDOR_LICENSE.getType()},
+                {LifeCycleStatesEnum.CHECKOUT, ArtifactTypeEnum.MODEL_INVENTORY_PROFILE.getType()},
+                {LifeCycleStatesEnum.CHECKOUT, ArtifactTypeEnum.MODEL_QUERY_SPEC.getType()},
+                {LifeCycleStatesEnum.CHECKOUT, ArtifactTypeEnum.OTHER.getType()},
+
+                {LifeCycleStatesEnum.CHECKIN, ArtifactTypeEnum.DCAE_JSON.getType()},
+                {LifeCycleStatesEnum.CHECKIN, ArtifactTypeEnum.DCAE_POLICY.getType()},
+                {LifeCycleStatesEnum.CHECKIN, ArtifactTypeEnum.DCAE_EVENT.getType()},
+                {LifeCycleStatesEnum.CHECKIN, ArtifactTypeEnum.APPC_CONFIG.getType()},
+                {LifeCycleStatesEnum.CHECKIN, ArtifactTypeEnum.DCAE_DOC.getType()},
+                {LifeCycleStatesEnum.CHECKIN, ArtifactTypeEnum.DCAE_TOSCA.getType()},
+                {LifeCycleStatesEnum.CHECKIN, ArtifactTypeEnum.YANG_XML.getType()},
+                {LifeCycleStatesEnum.CHECKIN, ArtifactTypeEnum.VNF_CATALOG.getType()},
+                {LifeCycleStatesEnum.CHECKIN, ArtifactTypeEnum.VF_LICENSE.getType()},
+                {LifeCycleStatesEnum.CHECKIN, ArtifactTypeEnum.VENDOR_LICENSE.getType()},
+                {LifeCycleStatesEnum.CHECKIN, ArtifactTypeEnum.MODEL_INVENTORY_PROFILE.getType()},
+                {LifeCycleStatesEnum.CHECKIN, ArtifactTypeEnum.MODEL_QUERY_SPEC.getType()},
+                {LifeCycleStatesEnum.CHECKIN, ArtifactTypeEnum.OTHER.getType()},
+        };
+    }
+
+    // External API
+    // Upload artifact on VF via external API - happy flow
+    @Test(dataProvider = "uploadArtifactOnVFViaExternalAPI")
+    public void uploadArtifactOnVFViaExternalAPI(LifeCycleStatesEnum chosenLifeCycleState, String artifactType) throws Exception {
+        getExtendTest().log(Status.INFO, String.format("chosenLifeCycleState: %s, artifactType: %s", chosenLifeCycleState, artifactType));
+        uploadArtifactOnAssetViaExternalAPI(ComponentTypeEnum.RESOURCE, chosenLifeCycleState, artifactType, null);
+    }
+
+
+    @DataProvider(name = "uploadArtifactOnServiceViaExternalAPI", parallel = true)
+    public static Object[][] dataProviderUploadArtifactOnServiceViaExternalAPI() {
+        return new Object[][]{
+                {LifeCycleStatesEnum.CHECKOUT, ArtifactTypeEnum.YANG_XML.getType()},
+                {LifeCycleStatesEnum.CHECKOUT, ArtifactTypeEnum.VNF_CATALOG.getType()},
+                {LifeCycleStatesEnum.CHECKOUT, ArtifactTypeEnum.MODEL_INVENTORY_PROFILE.getType()},
+                {LifeCycleStatesEnum.CHECKOUT, ArtifactTypeEnum.MODEL_QUERY_SPEC.getType()},
+                {LifeCycleStatesEnum.CHECKOUT, ArtifactTypeEnum.OTHER.getType()},
+                {LifeCycleStatesEnum.CHECKIN, ArtifactTypeEnum.YANG_XML.getType()},
+                {LifeCycleStatesEnum.CHECKIN, ArtifactTypeEnum.VNF_CATALOG.getType()},
+                {LifeCycleStatesEnum.CHECKIN, ArtifactTypeEnum.MODEL_INVENTORY_PROFILE.getType()},
+                {LifeCycleStatesEnum.CHECKIN, ArtifactTypeEnum.MODEL_QUERY_SPEC.getType()},
+                {LifeCycleStatesEnum.CHECKIN, ArtifactTypeEnum.OTHER.getType()},
+                {LifeCycleStatesEnum.CERTIFICATIONREQUEST, ArtifactTypeEnum.YANG_XML.getType()},
+                {LifeCycleStatesEnum.CERTIFICATIONREQUEST, ArtifactTypeEnum.VNF_CATALOG.getType()},
+                {LifeCycleStatesEnum.CERTIFICATIONREQUEST, ArtifactTypeEnum.MODEL_INVENTORY_PROFILE.getType()},
+                {LifeCycleStatesEnum.CERTIFICATIONREQUEST, ArtifactTypeEnum.MODEL_QUERY_SPEC.getType()},
+                {LifeCycleStatesEnum.CERTIFICATIONREQUEST, ArtifactTypeEnum.OTHER.getType()}
+        };
+    }
+
+
+    @Test(dataProvider = "uploadArtifactOnServiceViaExternalAPI")
+    public void uploadArtifactOnServiceViaExternalAPI(LifeCycleStatesEnum chosenLifeCycleState, String artifactType) throws Exception {
+        getExtendTest().log(Status.INFO, String.format("chosenLifeCycleState: %s, artifactType: %s", chosenLifeCycleState, artifactType));
+        uploadArtifactOnAssetViaExternalAPI(ComponentTypeEnum.SERVICE, chosenLifeCycleState, artifactType, null);
+    }
+
+    // Happy flow - get chosen life cycle state, artifact type and asset type
+    // Create asset, upload artifact via external API + check audit & response code
+    // Download artifact via external API + check audit & response code
+    protected Component uploadArtifactOnAssetViaExternalAPI(ComponentTypeEnum componentTypeEnum, LifeCycleStatesEnum chosenLifeCycleState, String artifactType, ResourceTypeEnum resourceTypeEnum) throws Exception {
+        Component component = null;
+        RestResponse restResponse;
+        int numberOfArtifact = 0;
+
+        // get artifact data
+        ArtifactReqDetails artifactReqDetails = ElementFactory.getArtifactByType("ci", artifactType, true, false);
+
+        // create component/s & upload artifact via external api
+        if (ComponentTypeEnum.RESOURCE_INSTANCE == componentTypeEnum) {
+            component = getComponentWithResourceInstanceInTargetLifeCycleState(chosenLifeCycleState, resourceTypeEnum);
+            restResponse = uploadArtifactOfRIIncludingValiditionOfAuditAndResponseCode(component, component.getComponentInstances().get(0), ElementFactory.getDefaultUser(UserRoleEnum.DESIGNER), artifactReqDetails, 200);
+            component = getNewerVersionOfComponent(component, chosenLifeCycleState);
+            numberOfArtifact = (component.getComponentInstances().get(0).getDeploymentArtifacts() == null ? 0 : component.getComponentInstances().get(0).getDeploymentArtifacts().size());
+        } else {
+            component = getComponentInTargetLifeCycleState(componentTypeEnum.toString(), UserRoleEnum.DESIGNER, chosenLifeCycleState, resourceTypeEnum);
+            restResponse = uploadArtifactOfAssetIncludingValiditionOfAuditAndResponseCode(component, ElementFactory.getDefaultUser(UserRoleEnum.DESIGNER), artifactReqDetails, 200);
+            component = updateComponentDetailsByLifeCycleState(chosenLifeCycleState, component);
+            numberOfArtifact = component.getDeploymentArtifacts().size();
+        }
+
+        ArtifactDefinition responseArtifact = ResponseParser.convertArtifactDefinitionResponseToJavaObject(restResponse.getResponse());
+        // Get list of deployment artifact + download them via external API
+        Map<String, ArtifactDefinition> deploymentArtifacts = getDeploymentArtifactsOfAsset(component, componentTypeEnum);
+        Assert.assertEquals(numberOfArtifact, deploymentArtifacts.keySet().size(), "Expected that number of deployment artifacts will be increase by one.");
+
+        // Download the uploaded artifact via external API
+        downloadResourceDeploymentArtifactExternalAPI(component, deploymentArtifacts.get(responseArtifact.getArtifactLabel()), ElementFactory.getDefaultUser(UserRoleEnum.DESIGNER), artifactReqDetails, componentTypeEnum);
+        return component;
+    }
+
+    /**
+     * according lifecycle state of component get updated component details
+     *
+     * @param chosenLifeCycleState
+     * @param component
+     * @return
+     * @throws Exception
+     */
+    public Component updateComponentDetailsByLifeCycleState(LifeCycleStatesEnum chosenLifeCycleState, Component component) throws Exception {
+        if (LifeCycleStatesEnum.CHECKOUT.equals(chosenLifeCycleState)) {
+            component = AtomicOperationUtils.getComponentObject(component, UserRoleEnum.DESIGNER);
+        } else {
+            component = getNewerVersionOfComponent(component, chosenLifeCycleState);
+        }
+        return component;
+    }
+
+    // Upload artifact via external API + Check auditing for upload operation + Check response of external API
+    public RestResponse uploadArtifactOfRIIncludingValiditionOfAuditAndResponseCode(Component component, ComponentInstance componentInstance, User sdncModifierDetails, ArtifactReqDetails artifactReqDetails, Integer expectedResponseCode) throws Exception {
+        RestResponse restResponse = ArtifactRestUtils.externalAPIUploadArtifactOfComponentInstanceOnAsset(component, ElementFactory.getDefaultUser(UserRoleEnum.DESIGNER), artifactReqDetails, component.getComponentInstances().get(0));
+
+        // Check response of external API
+        Integer responseCode = restResponse.getErrorCode();
+        Assert.assertEquals(responseCode, expectedResponseCode, "Response code is not correct.");
+        return restResponse;
+    }
+
+
+    protected Component getComponentWithResourceInstanceInTargetLifeCycleState(LifeCycleStatesEnum lifeCycleStatesEnum, ResourceTypeEnum resourceTypeEnum) throws Exception {
+        Component component;
+        if (resourceTypeEnum == ResourceTypeEnum.VF) {
+            component = getComponentInTargetLifeCycleState(ComponentTypeEnum.SERVICE.toString(), UserRoleEnum.DESIGNER, LifeCycleStatesEnum.CHECKOUT, null);
+
+            Component resourceInstanceDetails = getComponentInTargetLifeCycleState(ComponentTypeEnum.RESOURCE.getValue(), UserRoleEnum.DESIGNER, LifeCycleStatesEnum.CERTIFY, null);
+            AtomicOperationUtils.addComponentInstanceToComponentContainer(resourceInstanceDetails, component, UserRoleEnum.DESIGNER, true).left().value();
+
+            // Add artifact to service if asked for certification request - must be at least one artifact for the flow
+//			if((LifeCycleStatesEnum.CERTIFICATIONREQUEST == lifeCycleStatesEnum) || (LifeCycleStatesEnum.STARTCERTIFICATION == lifeCycleStatesEnum)) {
+//			}
+            AtomicOperationUtils.uploadArtifactByType(ArtifactTypeEnum.OTHER, component, UserRoleEnum.DESIGNER, true, true).left().value();
+            component = AtomicOperationUtils.changeComponentState(component, UserRoleEnum.DESIGNER, lifeCycleStatesEnum, true).getLeft();
+        } else {
+            component = getComponentInTargetLifeCycleState(ComponentTypeEnum.RESOURCE.toString(), UserRoleEnum.DESIGNER, LifeCycleStatesEnum.CHECKOUT, null);
+            Component resourceInstanceDetails = getComponentInTargetLifeCycleState(ComponentTypeEnum.RESOURCE.getValue(), UserRoleEnum.DESIGNER, LifeCycleStatesEnum.CERTIFY, resourceTypeEnum);
+            AtomicOperationUtils.addComponentInstanceToComponentContainer(resourceInstanceDetails, component, UserRoleEnum.DESIGNER, true).left().value();
+            component = AtomicOperationUtils.changeComponentState(component, UserRoleEnum.DESIGNER, lifeCycleStatesEnum, true).getLeft();
+        }
+        return component;
+    }
+
+    // Upload artifact via external API + Check auditing for upload operation + Check response of external API
+    protected RestResponse uploadArtifactOfAssetIncludingValiditionOfAuditAndResponseCode(Component component, User sdncModifierDetails, ArtifactReqDetails artifactReqDetails, Integer expectedResponseCode) throws Exception {
+        RestResponse restResponse = ArtifactRestUtils.externalAPIUploadArtifactOfTheAsset(component, sdncModifierDetails, artifactReqDetails);
+
+        // Check response of external API
+        Integer responseCode = restResponse.getErrorCode();
+        Assert.assertEquals(responseCode, expectedResponseCode, "Response code is not correct.");
+        return restResponse;
+    }
+
+    // Check Component version (increase by one if not in checkout)
+    // Input: component, componentLifeCycleState
+    // for any LifeCycleState != checkout
+    // find component of version +0.1
+    // check that this version different for input version
+    // check that this component uniqueID different from input uniqueID
+    // Return: that version
+    protected synchronized Component getNewerVersionOfComponent(Component component, LifeCycleStatesEnum lifeCycleStatesEnum) throws Exception {
+        Component resourceDetails = null;
+
+        if ((!lifeCycleStatesEnum.equals(LifeCycleStatesEnum.CHECKOUT)) && (!lifeCycleStatesEnum.equals(LifeCycleStatesEnum.STARTCERTIFICATION))) {
+
+
+            String resourceVersion = component.getVersion();
+            String resourceUniqueID = component.getUniqueId();
+
+            if (component.getComponentType().equals(ComponentTypeEnum.SERVICE)) {
+                resourceDetails = AtomicOperationUtils.getServiceObjectByNameAndVersion(UserRoleEnum.DESIGNER, component.getName(), String.format("%.1f", Double.parseDouble(component.getVersion()) + 0.1));
+            } else {
+                resourceDetails = AtomicOperationUtils.getResourceObjectByNameAndVersion(UserRoleEnum.DESIGNER, component.getName(), String.format("%.1f", Double.parseDouble(component.getVersion()) + 0.1));
+            }
+
+            String resourceNewVersion = resourceDetails.getVersion();
+            String resourceNewUniqueID = resourceDetails.getUniqueId();
+
+            System.out.println(resourceNewVersion);
+            System.out.println("Service UUID: " + resourceDetails.getUUID());
+            System.out.println("Service UniqueID: " + resourceDetails.getUniqueId());
+
+            // Checking that new version exist + different from old one by unique id
+            Assert.assertNotEquals(resourceVersion, resourceNewVersion, "Expected for different resource version.");
+            Assert.assertNotEquals(resourceUniqueID, resourceNewUniqueID, "Expected that resource will have new unique ID.");
+        } else {
+            if (component.getComponentType().equals(ComponentTypeEnum.SERVICE)) {
+                resourceDetails = AtomicOperationUtils.getServiceObjectByNameAndVersion(UserRoleEnum.DESIGNER, component.getName(), component.getVersion());
+            } else {
+                resourceDetails = AtomicOperationUtils.getResourceObjectByNameAndVersion(UserRoleEnum.DESIGNER, component.getName(), component.getVersion());
+            }
+        }
+        return resourceDetails;
+    }
+
+
+    // download deployment via external api + check response code for success (200) + get artifactReqDetails and verify payload + verify audit
+    protected RestResponse downloadResourceDeploymentArtifactExternalAPI(Component component, ArtifactDefinition artifactDefinition, User sdncModifierDetails, ArtifactReqDetails artifactReqDetails, ComponentTypeEnum componentTypeEnum) throws Exception {
+        RestResponse restResponse;
+
+        if (componentTypeEnum == ComponentTypeEnum.RESOURCE_INSTANCE) {
+            restResponse = ArtifactRestUtils.getComponentInstanceDeploymentArtifactExternalAPI(component.getUUID(), component.getComponentInstances().get(0).getNormalizedName(), artifactDefinition.getArtifactUUID(), ElementFactory.getDefaultUser(UserRoleEnum.DESIGNER), component.getComponentType().toString());
+        } else {
+            restResponse = ArtifactRestUtils.getResourceDeploymentArtifactExternalAPI(component.getUUID(), artifactDefinition.getArtifactUUID(), ElementFactory.getDefaultUser(UserRoleEnum.DESIGNER), component.getComponentType().toString());
+        }
+
+        Integer responseCode = restResponse.getErrorCode();
+        Integer expectedCode = 200;
+        Assert.assertEquals(responseCode, expectedCode, "Response code is not correct.");
+
+        // For known artifact/payload - verify payload of downloaded artifact
+        if (artifactReqDetails != null) {
+            String response = restResponse.getResponse();
+            String payloadData = artifactReqDetails.getPayload();
+            String decodedPaypload = org.openecomp.sdc.ci.tests.utils.Decoder.decode(payloadData);
+            Assert.assertEquals(response, decodedPaypload, "Response artifact payload not correct.");
+        }
+        return restResponse;
+    }
+
+    // download deployment via external api + check response code for success (200) + verify audit
+    protected void downloadResourceDeploymentArtifactExternalAPI(Component component, ArtifactDefinition artifactDefinition, User sdncModifierDetails) throws Exception {
+        downloadResourceDeploymentArtifactExternalAPI(component, artifactDefinition, sdncModifierDetails, null, component.getComponentType());
+    }
+
+
+    @DataProvider(name = "uploadArtifactOnRIViaExternalAPI", parallel = true)
+    public static Object[][] dataProviderUploadArtifactOnRIViaExternalAPI() {
+        return new Object[][]{
+                {LifeCycleStatesEnum.CHECKOUT, ArtifactTypeEnum.DCAE_INVENTORY_TOSCA.getType()},
+                {LifeCycleStatesEnum.CHECKOUT, ArtifactTypeEnum.DCAE_INVENTORY_JSON.getType()},
+                {LifeCycleStatesEnum.CHECKOUT, ArtifactTypeEnum.DCAE_INVENTORY_POLICY.getType()},
+                {LifeCycleStatesEnum.CHECKOUT, ArtifactTypeEnum.DCAE_INVENTORY_DOC.getType()},
+                {LifeCycleStatesEnum.CHECKOUT, ArtifactTypeEnum.DCAE_INVENTORY_BLUEPRINT.getType()},
+                {LifeCycleStatesEnum.CHECKOUT, ArtifactTypeEnum.DCAE_INVENTORY_EVENT.getType()},
+                {LifeCycleStatesEnum.CHECKOUT, ArtifactTypeEnum.SNMP_POLL.getType()},
+                {LifeCycleStatesEnum.CHECKOUT, ArtifactTypeEnum.SNMP_TRAP.getType()},
+
+
+                {LifeCycleStatesEnum.CHECKIN, ArtifactTypeEnum.DCAE_INVENTORY_TOSCA.getType()},
+                {LifeCycleStatesEnum.CHECKIN, ArtifactTypeEnum.DCAE_INVENTORY_JSON.getType()},
+                {LifeCycleStatesEnum.CHECKIN, ArtifactTypeEnum.DCAE_INVENTORY_POLICY.getType()},
+                {LifeCycleStatesEnum.CHECKIN, ArtifactTypeEnum.DCAE_INVENTORY_DOC.getType()},
+                {LifeCycleStatesEnum.CHECKIN, ArtifactTypeEnum.DCAE_INVENTORY_BLUEPRINT.getType()},
+                {LifeCycleStatesEnum.CHECKIN, ArtifactTypeEnum.DCAE_INVENTORY_EVENT.getType()},
+                {LifeCycleStatesEnum.CHECKIN, ArtifactTypeEnum.SNMP_POLL.getType()},
+                {LifeCycleStatesEnum.CHECKIN, ArtifactTypeEnum.SNMP_TRAP.getType()},
+        };
+    }
+
+
+    @Test(dataProvider = "uploadArtifactOnRIViaExternalAPI")
+    public void uploadArtifactOnRIViaExternalAPI(LifeCycleStatesEnum chosenLifeCycleState, String artifactType) throws Exception {
+        getExtendTest().log(Status.INFO, String.format("chosenLifeCycleState: %s, artifactType: %s", chosenLifeCycleState, artifactType));
+        uploadArtifactOnAssetViaExternalAPI(ComponentTypeEnum.RESOURCE_INSTANCE, chosenLifeCycleState, artifactType, null);
+    }
+
+
+    @DataProvider(name = "uploadArtifactOnVfcVlCpRIViaExternalAPI", parallel = true)
+    public static Object[][] dataProviderUploadArtifactOnVfcVlCpRIViaExternalAPI() {
+        return new Object[][]{
+                {LifeCycleStatesEnum.CHECKOUT, ArtifactTypeEnum.DCAE_INVENTORY_TOSCA.getType(), ResourceTypeEnum.VFC},
+                {LifeCycleStatesEnum.CHECKOUT, ArtifactTypeEnum.DCAE_INVENTORY_JSON.getType(), ResourceTypeEnum.VFC},
+                {LifeCycleStatesEnum.CHECKOUT, ArtifactTypeEnum.DCAE_INVENTORY_POLICY.getType(), ResourceTypeEnum.VFC},
+                {LifeCycleStatesEnum.CHECKOUT, ArtifactTypeEnum.DCAE_INVENTORY_DOC.getType(), ResourceTypeEnum.VFC},
+                {LifeCycleStatesEnum.CHECKOUT, ArtifactTypeEnum.DCAE_INVENTORY_BLUEPRINT.getType(), ResourceTypeEnum.VFC},
+                {LifeCycleStatesEnum.CHECKOUT, ArtifactTypeEnum.DCAE_INVENTORY_EVENT.getType(), ResourceTypeEnum.VFC},
+                {LifeCycleStatesEnum.CHECKOUT, ArtifactTypeEnum.SNMP_POLL.getType(), ResourceTypeEnum.VFC},
+                {LifeCycleStatesEnum.CHECKOUT, ArtifactTypeEnum.SNMP_TRAP.getType(), ResourceTypeEnum.VFC},
+
+
+                {LifeCycleStatesEnum.CHECKOUT, ArtifactTypeEnum.DCAE_INVENTORY_TOSCA.getType(), ResourceTypeEnum.VL},
+                {LifeCycleStatesEnum.CHECKOUT, ArtifactTypeEnum.DCAE_INVENTORY_JSON.getType(), ResourceTypeEnum.VL},
+                {LifeCycleStatesEnum.CHECKOUT, ArtifactTypeEnum.DCAE_INVENTORY_POLICY.getType(), ResourceTypeEnum.VL},
+                {LifeCycleStatesEnum.CHECKOUT, ArtifactTypeEnum.DCAE_INVENTORY_DOC.getType(), ResourceTypeEnum.VL},
+                {LifeCycleStatesEnum.CHECKOUT, ArtifactTypeEnum.DCAE_INVENTORY_BLUEPRINT.getType(), ResourceTypeEnum.VL},
+                {LifeCycleStatesEnum.CHECKOUT, ArtifactTypeEnum.DCAE_INVENTORY_EVENT.getType(), ResourceTypeEnum.VL},
+                {LifeCycleStatesEnum.CHECKOUT, ArtifactTypeEnum.SNMP_POLL.getType(), ResourceTypeEnum.VL},
+                {LifeCycleStatesEnum.CHECKOUT, ArtifactTypeEnum.SNMP_TRAP.getType(), ResourceTypeEnum.VL},
+
+                {LifeCycleStatesEnum.CHECKOUT, ArtifactTypeEnum.DCAE_INVENTORY_TOSCA.getType(), ResourceTypeEnum.CP},
+                {LifeCycleStatesEnum.CHECKOUT, ArtifactTypeEnum.DCAE_INVENTORY_JSON.getType(), ResourceTypeEnum.CP},
+                {LifeCycleStatesEnum.CHECKOUT, ArtifactTypeEnum.DCAE_INVENTORY_POLICY.getType(), ResourceTypeEnum.CP},
+                {LifeCycleStatesEnum.CHECKOUT, ArtifactTypeEnum.DCAE_INVENTORY_DOC.getType(), ResourceTypeEnum.CP},
+                {LifeCycleStatesEnum.CHECKOUT, ArtifactTypeEnum.DCAE_INVENTORY_BLUEPRINT.getType(), ResourceTypeEnum.CP},
+                {LifeCycleStatesEnum.CHECKOUT, ArtifactTypeEnum.DCAE_INVENTORY_EVENT.getType(), ResourceTypeEnum.CP},
+                {LifeCycleStatesEnum.CHECKOUT, ArtifactTypeEnum.SNMP_POLL.getType(), ResourceTypeEnum.CP},
+                {LifeCycleStatesEnum.CHECKOUT, ArtifactTypeEnum.SNMP_TRAP.getType(), ResourceTypeEnum.CP},
+
+
+                {LifeCycleStatesEnum.CHECKIN, ArtifactTypeEnum.DCAE_INVENTORY_TOSCA.getType(), ResourceTypeEnum.VFC},
+                {LifeCycleStatesEnum.CHECKIN, ArtifactTypeEnum.DCAE_INVENTORY_JSON.getType(), ResourceTypeEnum.VFC},
+                {LifeCycleStatesEnum.CHECKIN, ArtifactTypeEnum.DCAE_INVENTORY_POLICY.getType(), ResourceTypeEnum.VFC},
+                {LifeCycleStatesEnum.CHECKIN, ArtifactTypeEnum.DCAE_INVENTORY_DOC.getType(), ResourceTypeEnum.VFC},
+                {LifeCycleStatesEnum.CHECKIN, ArtifactTypeEnum.DCAE_INVENTORY_BLUEPRINT.getType(), ResourceTypeEnum.VFC},
+                {LifeCycleStatesEnum.CHECKIN, ArtifactTypeEnum.DCAE_INVENTORY_EVENT.getType(), ResourceTypeEnum.VFC},
+                {LifeCycleStatesEnum.CHECKIN, ArtifactTypeEnum.SNMP_POLL.getType(), ResourceTypeEnum.VFC},
+                {LifeCycleStatesEnum.CHECKIN, ArtifactTypeEnum.SNMP_TRAP.getType(), ResourceTypeEnum.VFC},
+
+                {LifeCycleStatesEnum.CHECKIN, ArtifactTypeEnum.DCAE_INVENTORY_TOSCA.getType(), ResourceTypeEnum.VL},
+                {LifeCycleStatesEnum.CHECKIN, ArtifactTypeEnum.DCAE_INVENTORY_JSON.getType(), ResourceTypeEnum.VL},
+                {LifeCycleStatesEnum.CHECKIN, ArtifactTypeEnum.DCAE_INVENTORY_POLICY.getType(), ResourceTypeEnum.VL},
+                {LifeCycleStatesEnum.CHECKIN, ArtifactTypeEnum.DCAE_INVENTORY_DOC.getType(), ResourceTypeEnum.VL},
+                {LifeCycleStatesEnum.CHECKIN, ArtifactTypeEnum.DCAE_INVENTORY_BLUEPRINT.getType(), ResourceTypeEnum.VL},
+                {LifeCycleStatesEnum.CHECKIN, ArtifactTypeEnum.DCAE_INVENTORY_EVENT.getType(), ResourceTypeEnum.VL},
+                {LifeCycleStatesEnum.CHECKIN, ArtifactTypeEnum.SNMP_POLL.getType(), ResourceTypeEnum.VL},
+                {LifeCycleStatesEnum.CHECKIN, ArtifactTypeEnum.SNMP_TRAP.getType(), ResourceTypeEnum.VL},
+
+                {LifeCycleStatesEnum.CHECKIN, ArtifactTypeEnum.DCAE_INVENTORY_TOSCA.getType(), ResourceTypeEnum.CP},
+                {LifeCycleStatesEnum.CHECKIN, ArtifactTypeEnum.DCAE_INVENTORY_JSON.getType(), ResourceTypeEnum.CP},
+                {LifeCycleStatesEnum.CHECKIN, ArtifactTypeEnum.DCAE_INVENTORY_POLICY.getType(), ResourceTypeEnum.CP},
+                {LifeCycleStatesEnum.CHECKIN, ArtifactTypeEnum.DCAE_INVENTORY_DOC.getType(), ResourceTypeEnum.CP},
+                {LifeCycleStatesEnum.CHECKIN, ArtifactTypeEnum.DCAE_INVENTORY_BLUEPRINT.getType(), ResourceTypeEnum.CP},
+                {LifeCycleStatesEnum.CHECKIN, ArtifactTypeEnum.DCAE_INVENTORY_EVENT.getType(), ResourceTypeEnum.CP},
+                {LifeCycleStatesEnum.CHECKIN, ArtifactTypeEnum.SNMP_POLL.getType(), ResourceTypeEnum.CP},
+                {LifeCycleStatesEnum.CHECKIN, ArtifactTypeEnum.SNMP_TRAP.getType(), ResourceTypeEnum.CP},
+        };
+    }
+
+
+    @Test(dataProvider = "uploadArtifactOnVfcVlCpRIViaExternalAPI")
+    public void uploadArtifactOnVfcVlCpRIViaExternalAPI(LifeCycleStatesEnum chosenLifeCycleState, String artifactType, ResourceTypeEnum resourceTypeEnum) throws Exception {
+        getExtendTest().log(Status.INFO, String.format("chosenLifeCycleState: %s, artifactType: %s", chosenLifeCycleState, artifactType));
+        uploadArtifactOnAssetViaExternalAPI(ComponentTypeEnum.RESOURCE_INSTANCE, chosenLifeCycleState, artifactType, resourceTypeEnum);
+    }
+
+
+    @DataProvider(name = "uploadInvalidArtifactTypeExtensionLabelDescriptionCheckSumDuplicateLabelViaExternalAPI", parallel = false)
+    public static Object[][] dataProviderUploadInvalidArtifactTypeExtensionLabelDescriptionCheckSumDuplicateLabelViaExternalAPI() {
+        return new Object[][]{
+
+                {LifeCycleStatesEnum.CHECKOUT, ComponentTypeEnum.RESOURCE, "uploadArtifactWithInvalidTypeToLong"},
+                {LifeCycleStatesEnum.CHECKOUT, ComponentTypeEnum.SERVICE, "uploadArtifactWithInvalidTypeToLong"},
+                {LifeCycleStatesEnum.CHECKOUT, ComponentTypeEnum.RESOURCE_INSTANCE, "uploadArtifactWithInvalidTypeToLong"},
+                {LifeCycleStatesEnum.CHECKIN, ComponentTypeEnum.RESOURCE, "uploadArtifactWithInvalidTypeToLong"},
+                {LifeCycleStatesEnum.CHECKIN, ComponentTypeEnum.SERVICE, "uploadArtifactWithInvalidTypeToLong"},
+                {LifeCycleStatesEnum.CHECKIN, ComponentTypeEnum.RESOURCE_INSTANCE, "uploadArtifactWithInvalidTypeToLong"},
+                {LifeCycleStatesEnum.CERTIFICATIONREQUEST, ComponentTypeEnum.SERVICE, "uploadArtifactWithInvalidTypeToLong"},
+                {LifeCycleStatesEnum.CERTIFICATIONREQUEST, ComponentTypeEnum.RESOURCE_INSTANCE, "uploadArtifactWithInvalidTypeToLong"},
+
+                {LifeCycleStatesEnum.CHECKOUT, ComponentTypeEnum.RESOURCE, "uploadArtifactWithInvalidTypeEmpty"},
+                {LifeCycleStatesEnum.CHECKOUT, ComponentTypeEnum.SERVICE, "uploadArtifactWithInvalidTypeEmpty"},
+                {LifeCycleStatesEnum.CHECKOUT, ComponentTypeEnum.RESOURCE_INSTANCE, "uploadArtifactWithInvalidTypeEmpty"},
+                {LifeCycleStatesEnum.CHECKIN, ComponentTypeEnum.RESOURCE, "uploadArtifactWithInvalidTypeEmpty"},
+                {LifeCycleStatesEnum.CHECKIN, ComponentTypeEnum.SERVICE, "uploadArtifactWithInvalidTypeEmpty"},
+                {LifeCycleStatesEnum.CHECKIN, ComponentTypeEnum.RESOURCE_INSTANCE, "uploadArtifactWithInvalidTypeEmpty"},
+                {LifeCycleStatesEnum.CERTIFICATIONREQUEST, ComponentTypeEnum.SERVICE, "uploadArtifactWithInvalidTypeEmpty"},
+                {LifeCycleStatesEnum.CERTIFICATIONREQUEST, ComponentTypeEnum.RESOURCE_INSTANCE, "uploadArtifactWithInvalidTypeEmpty"},
+
+                {LifeCycleStatesEnum.CHECKOUT, ComponentTypeEnum.RESOURCE, "uploadArtifactWithInvalidNameToLong"},
+                {LifeCycleStatesEnum.CHECKOUT, ComponentTypeEnum.SERVICE, "uploadArtifactWithInvalidNameToLong"},
+                {LifeCycleStatesEnum.CHECKOUT, ComponentTypeEnum.RESOURCE_INSTANCE, "uploadArtifactWithInvalidNameToLong"},
+                {LifeCycleStatesEnum.CHECKIN, ComponentTypeEnum.RESOURCE, "uploadArtifactWithInvalidNameToLong"},
+                {LifeCycleStatesEnum.CHECKIN, ComponentTypeEnum.SERVICE, "uploadArtifactWithInvalidNameToLong"},
+                {LifeCycleStatesEnum.CHECKIN, ComponentTypeEnum.RESOURCE_INSTANCE, "uploadArtifactWithInvalidNameToLong"},
+                {LifeCycleStatesEnum.CERTIFICATIONREQUEST, ComponentTypeEnum.SERVICE, "uploadArtifactWithInvalidNameToLong"},
+                {LifeCycleStatesEnum.CERTIFICATIONREQUEST, ComponentTypeEnum.RESOURCE_INSTANCE, "uploadArtifactWithInvalidNameToLong"},
+
+                {LifeCycleStatesEnum.CHECKOUT, ComponentTypeEnum.RESOURCE, "uploadArtifactWithInvalidNameEmpty"},
+                {LifeCycleStatesEnum.CHECKOUT, ComponentTypeEnum.SERVICE, "uploadArtifactWithInvalidNameEmpty"},
+                {LifeCycleStatesEnum.CHECKOUT, ComponentTypeEnum.RESOURCE_INSTANCE, "uploadArtifactWithInvalidNameEmpty"},
+                {LifeCycleStatesEnum.CHECKIN, ComponentTypeEnum.RESOURCE, "uploadArtifactWithInvalidNameEmpty"},
+                {LifeCycleStatesEnum.CHECKIN, ComponentTypeEnum.SERVICE, "uploadArtifactWithInvalidNameEmpty"},
+                {LifeCycleStatesEnum.CHECKIN, ComponentTypeEnum.RESOURCE_INSTANCE, "uploadArtifactWithInvalidNameEmpty"},
+                {LifeCycleStatesEnum.CERTIFICATIONREQUEST, ComponentTypeEnum.SERVICE, "uploadArtifactWithInvalidNameEmpty"},
+                {LifeCycleStatesEnum.CERTIFICATIONREQUEST, ComponentTypeEnum.RESOURCE_INSTANCE, "uploadArtifactWithInvalidNameEmpty"},
+
+                {LifeCycleStatesEnum.CHECKOUT, ComponentTypeEnum.RESOURCE, "uploadArtifactWithInvalidLabelToLong"},
+                {LifeCycleStatesEnum.CHECKOUT, ComponentTypeEnum.SERVICE, "uploadArtifactWithInvalidLabelToLong"},
+                {LifeCycleStatesEnum.CHECKOUT, ComponentTypeEnum.RESOURCE_INSTANCE, "uploadArtifactWithInvalidLabelToLong"},
+                {LifeCycleStatesEnum.CHECKIN, ComponentTypeEnum.RESOURCE, "uploadArtifactWithInvalidLabelToLong"},
+                {LifeCycleStatesEnum.CHECKIN, ComponentTypeEnum.SERVICE, "uploadArtifactWithInvalidLabelToLong"},
+                {LifeCycleStatesEnum.CHECKIN, ComponentTypeEnum.RESOURCE_INSTANCE, "uploadArtifactWithInvalidLabelToLong"},
+                {LifeCycleStatesEnum.CERTIFICATIONREQUEST, ComponentTypeEnum.SERVICE, "uploadArtifactWithInvalidLabelToLong"},
+                {LifeCycleStatesEnum.CERTIFICATIONREQUEST, ComponentTypeEnum.RESOURCE_INSTANCE, "uploadArtifactWithInvalidLabelToLong"},
+
+                {LifeCycleStatesEnum.CHECKOUT, ComponentTypeEnum.RESOURCE, "uploadArtifactWithInvalidLabelEmpty"},
+                {LifeCycleStatesEnum.CHECKOUT, ComponentTypeEnum.SERVICE, "uploadArtifactWithInvalidLabelEmpty"},
+                {LifeCycleStatesEnum.CHECKOUT, ComponentTypeEnum.RESOURCE_INSTANCE, "uploadArtifactWithInvalidLabelEmpty"},
+                {LifeCycleStatesEnum.CHECKIN, ComponentTypeEnum.RESOURCE, "uploadArtifactWithInvalidLabelEmpty"},
+                {LifeCycleStatesEnum.CHECKIN, ComponentTypeEnum.SERVICE, "uploadArtifactWithInvalidLabelEmpty"},
+                {LifeCycleStatesEnum.CHECKIN, ComponentTypeEnum.RESOURCE_INSTANCE, "uploadArtifactWithInvalidLabelEmpty"},
+                {LifeCycleStatesEnum.CERTIFICATIONREQUEST, ComponentTypeEnum.SERVICE, "uploadArtifactWithInvalidLabelEmpty"},
+                {LifeCycleStatesEnum.CERTIFICATIONREQUEST, ComponentTypeEnum.RESOURCE_INSTANCE, "uploadArtifactWithInvalidLabelEmpty"},
+
+                {LifeCycleStatesEnum.CHECKOUT, ComponentTypeEnum.RESOURCE, "uploadArtifactWithInvalidDescriptionToLong"},
+                {LifeCycleStatesEnum.CHECKOUT, ComponentTypeEnum.SERVICE, "uploadArtifactWithInvalidDescriptionToLong"},
+                {LifeCycleStatesEnum.CHECKOUT, ComponentTypeEnum.RESOURCE_INSTANCE, "uploadArtifactWithInvalidDescriptionToLong"},
+                {LifeCycleStatesEnum.CHECKIN, ComponentTypeEnum.RESOURCE, "uploadArtifactWithInvalidDescriptionToLong"},
+                {LifeCycleStatesEnum.CHECKIN, ComponentTypeEnum.SERVICE, "uploadArtifactWithInvalidDescriptionToLong"},
+                {LifeCycleStatesEnum.CHECKIN, ComponentTypeEnum.RESOURCE_INSTANCE, "uploadArtifactWithInvalidDescriptionToLong"},
+                {LifeCycleStatesEnum.CERTIFICATIONREQUEST, ComponentTypeEnum.SERVICE, "uploadArtifactWithInvalidDescriptionToLong"},
+                {LifeCycleStatesEnum.CERTIFICATIONREQUEST, ComponentTypeEnum.RESOURCE_INSTANCE, "uploadArtifactWithInvalidDescriptionToLong"},
+
+                {LifeCycleStatesEnum.CHECKOUT, ComponentTypeEnum.RESOURCE, "uploadArtifactWithInvalidDescriptionEmpty"},
+                {LifeCycleStatesEnum.CHECKOUT, ComponentTypeEnum.SERVICE, "uploadArtifactWithInvalidDescriptionEmpty"},
+                {LifeCycleStatesEnum.CHECKOUT, ComponentTypeEnum.RESOURCE_INSTANCE, "uploadArtifactWithInvalidDescriptionEmpty"},
+                {LifeCycleStatesEnum.CHECKIN, ComponentTypeEnum.RESOURCE, "uploadArtifactWithInvalidDescriptionEmpty"},
+                {LifeCycleStatesEnum.CHECKIN, ComponentTypeEnum.SERVICE, "uploadArtifactWithInvalidDescriptionEmpty"},
+                {LifeCycleStatesEnum.CHECKIN, ComponentTypeEnum.RESOURCE_INSTANCE, "uploadArtifactWithInvalidDescriptionEmpty"},
+                {LifeCycleStatesEnum.CERTIFICATIONREQUEST, ComponentTypeEnum.SERVICE, "uploadArtifactWithInvalidDescriptionEmpty"},
+                {LifeCycleStatesEnum.CERTIFICATIONREQUEST, ComponentTypeEnum.RESOURCE_INSTANCE, "uploadArtifactWithInvalidDescriptionEmpty"},
+
+                {LifeCycleStatesEnum.CHECKOUT, ComponentTypeEnum.RESOURCE, "uploadArtifactWithSameLabel"},
+                {LifeCycleStatesEnum.CHECKOUT, ComponentTypeEnum.SERVICE, "uploadArtifactWithSameLabel"},
+                {LifeCycleStatesEnum.CHECKOUT, ComponentTypeEnum.RESOURCE_INSTANCE, "uploadArtifactWithSameLabel"},
+                {LifeCycleStatesEnum.CHECKIN, ComponentTypeEnum.RESOURCE, "uploadArtifactWithSameLabel"},
+                {LifeCycleStatesEnum.CHECKIN, ComponentTypeEnum.SERVICE, "uploadArtifactWithSameLabel"},
+                {LifeCycleStatesEnum.CHECKIN, ComponentTypeEnum.RESOURCE_INSTANCE, "uploadArtifactWithSameLabel"},
+                {LifeCycleStatesEnum.CERTIFICATIONREQUEST, ComponentTypeEnum.SERVICE, "uploadArtifactWithSameLabel"},
+
+                {LifeCycleStatesEnum.CHECKOUT, ComponentTypeEnum.RESOURCE, "uploadArtifactWithInvalidCheckSum"},
+                {LifeCycleStatesEnum.CHECKOUT, ComponentTypeEnum.SERVICE, "uploadArtifactWithInvalidCheckSum"},
+                {LifeCycleStatesEnum.CHECKOUT, ComponentTypeEnum.RESOURCE_INSTANCE, "uploadArtifactWithInvalidCheckSum"},
+                {LifeCycleStatesEnum.CHECKIN, ComponentTypeEnum.RESOURCE, "uploadArtifactWithInvalidCheckSum"},
+                {LifeCycleStatesEnum.CHECKIN, ComponentTypeEnum.SERVICE, "uploadArtifactWithInvalidCheckSum"},
+                {LifeCycleStatesEnum.CHECKIN, ComponentTypeEnum.RESOURCE_INSTANCE, "uploadArtifactWithInvalidCheckSum"},
+                {LifeCycleStatesEnum.CERTIFICATIONREQUEST, ComponentTypeEnum.SERVICE, "uploadArtifactWithInvalidCheckSum"},
+                {LifeCycleStatesEnum.CERTIFICATIONREQUEST, ComponentTypeEnum.RESOURCE_INSTANCE, "uploadArtifactWithInvalidCheckSum"},
+        };
+    }
+
+
+    // InvalidArtifact + check audit & response code function
+    @Test(dataProvider = "uploadInvalidArtifactTypeExtensionLabelDescriptionCheckSumDuplicateLabelViaExternalAPI")
+    public void uploadInvalidArtifactTypeExtensionLabelDescriptionCheckSumDuplicateLabelViaExternalAPI(LifeCycleStatesEnum chosenLifeCycleState,
+                                                                                                       ComponentTypeEnum componentTypeEnum, String uploadArtifactTestType) throws Exception {
+        getExtendTest().log(Status.INFO, String.format("chosenLifeCycleState: %s, componentTypeEnum: %s, uploadArtifactTestType: %s", chosenLifeCycleState, componentTypeEnum, uploadArtifactTestType));
+        Component resourceDetails;
+        ComponentInstance componentResourceInstanceDetails = null;
+        ArtifactReqDetails artifactReqDetails;
+
+        if (ComponentTypeEnum.RESOURCE_INSTANCE == componentTypeEnum) {
+            artifactReqDetails = ElementFactory.getArtifactByType("Abcd", ArtifactTypeEnum.DCAE_INVENTORY_DOC.toString(), true, false);
+
+            resourceDetails = getComponentInTargetLifeCycleState(ComponentTypeEnum.SERVICE.toString(), UserRoleEnum.DESIGNER, LifeCycleStatesEnum.CHECKOUT, null);
+            resourceDetails = getComponentWithResourceInstanceInTargetLifeCycleState(chosenLifeCycleState, null);
+            componentResourceInstanceDetails = resourceDetails.getComponentInstances().get(0);
+        } else {
+            artifactReqDetails = ElementFactory.getArtifactByType("Abcd", ArtifactTypeEnum.OTHER.toString(), true, false);
+            resourceDetails = getComponentInTargetLifeCycleState(componentTypeEnum.toString(), UserRoleEnum.DESIGNER, chosenLifeCycleState, null);
+        }
+
+
+        switch (uploadArtifactTestType) {
+            case "uploadArtifactWithInvalidTypeToLong":
+                uploadArtifactWithInvalidTypeToLong(resourceDetails, ElementFactory.getDefaultUser(UserRoleEnum.DESIGNER), artifactReqDetails, componentResourceInstanceDetails);
+                break;
+            case "uploadArtifactWithInvalidTypeEmpty":
+                uploadArtifactWithInvalidTypeEmpty(resourceDetails, ElementFactory.getDefaultUser(UserRoleEnum.DESIGNER), artifactReqDetails, componentResourceInstanceDetails);
+                break;
+            case "uploadArtifactWithInvalidCheckSum":
+                uploadArtifactWithInvalidCheckSum(resourceDetails, ElementFactory.getDefaultUser(UserRoleEnum.DESIGNER), artifactReqDetails, componentResourceInstanceDetails);
+                break;
+            case "uploadArtifactWithInvalidNameToLong":
+                uploadArtifactWithInvalidNameToLong(resourceDetails, ElementFactory.getDefaultUser(UserRoleEnum.DESIGNER), artifactReqDetails, componentResourceInstanceDetails);
+                break;
+            case "uploadArtifactWithInvalidNameEmpty":
+                uploadArtifactWithInvalidNameEmpty(resourceDetails, ElementFactory.getDefaultUser(UserRoleEnum.DESIGNER), artifactReqDetails, componentResourceInstanceDetails);
+                break;
+            case "uploadArtifactWithInvalidLabelToLong":
+                uploadArtifactWithInvalidLabelToLong(resourceDetails, ElementFactory.getDefaultUser(UserRoleEnum.DESIGNER), artifactReqDetails, componentResourceInstanceDetails);
+                break;
+            case "uploadArtifactWithInvalidLabelEmpty":
+                uploadArtifactWithInvalidLabelEmpty(resourceDetails, ElementFactory.getDefaultUser(UserRoleEnum.DESIGNER), artifactReqDetails, componentResourceInstanceDetails);
+                break;
+            case "uploadArtifactWithInvalidDescriptionToLong":
+                uploadArtifactWithInvalidDescriptionToLong(resourceDetails, ElementFactory.getDefaultUser(UserRoleEnum.DESIGNER), artifactReqDetails, componentResourceInstanceDetails);
+                break;
+            case "uploadArtifactWithInvalidDescriptionEmpty":
+                uploadArtifactWithInvalidDescriptionEmpty(resourceDetails, ElementFactory.getDefaultUser(UserRoleEnum.DESIGNER), artifactReqDetails, componentResourceInstanceDetails);
+                break;
+            case "uploadArtifactWithSameLabel":
+            default:
+                uploadArtifactWithSameLabel(resourceDetails, ElementFactory.getDefaultUser(UserRoleEnum.DESIGNER), artifactReqDetails, componentResourceInstanceDetails);
+                break;
+        }
+    }
+
+    // Upload artifact with invalid type via external API - to long type
+    protected void uploadArtifactWithInvalidTypeToLong(Component component, User sdncModifierDetails, ArtifactReqDetails artifactReqDetails,
+                                                       ComponentInstance componentResourceInstanceDetails) throws Exception {
+        artifactReqDetails.setArtifactType("dsfdsfdsdsfdsfdsdsfdsfdsdsfdsfdsdsfdsfdsdsfdsfdsdsfdsfdsdsfdsfdsdsfdsfdsdsfdsfdsdsfdsfdsdsfdsfdsdsfdsfdsdsfdsfdsdsfdsfdsdsfdsfdsdsfdsfdsdsfdsfdsdsfdsfdsdsfdsfdsdsfdsfdsdsfdsfdsdsfdsfdsdsfdsfdsdsfdsfdsdsfdsfdsdsfdsfdsdsfdsfdsdsfdsfdsdsfdsfdsdsfdsfdsdsfdsfdsdsfdsfdsdsfdsfdsdsfdsfdsdsfdsfdsdsfdsfdsdsfdsfdsdsfdsfdsdsfdsfdsdsfdsfdsdsfdsfdsdsfdsfdsdsfdsfdsdsfdsfdsdsfdsfdsdsfdsfdsdsfdsfdsdsfdsfdsdsfdsfdsdsfdsfdsdsfdsfdsdsfdsfdsdsfdsfdsdsfdsfdsdsfdsfdsdsfdsfdsdsfdsfdsdsfdsfdsdsfdsfdsdsfdsfdsdsfdsfdsdsfdsfdsdsfdsfdsdsfdsfds");
+        ErrorInfo errorInfo = ErrorValidationUtils.parseErrorConfigYaml(ActionStatus.ARTIFACT_TYPE_NOT_SUPPORTED.name());
+        List<String> variables = asList(artifactReqDetails.getArtifactType());
+
+        uploadArtifactOfAssetIncludingValiditionOfAuditAndResponseCode(component, ElementFactory.getDefaultUser(UserRoleEnum.DESIGNER),
+                artifactReqDetails, componentResourceInstanceDetails, errorInfo, variables, null, false);
+    }
+
+    // Upload artifact with invalid type via external API - empty type
+    protected void uploadArtifactWithInvalidTypeEmpty(Component component, User sdncModifierDetails, ArtifactReqDetails artifactReqDetails,
+                                                      ComponentInstance componentResourceInstanceDetails) throws Exception {
+        artifactReqDetails.setArtifactType("");
+        ErrorInfo errorInfo = ErrorValidationUtils.parseErrorConfigYaml(ActionStatus.ARTIFACT_TYPE_NOT_SUPPORTED.name());
+        List<String> variables = asList(artifactReqDetails.getArtifactType());
+
+        uploadArtifactOfAssetIncludingValiditionOfAuditAndResponseCode(component, ElementFactory.getDefaultUser(UserRoleEnum.DESIGNER),
+                artifactReqDetails, componentResourceInstanceDetails, errorInfo, variables, null, false);
+    }
+
+    // Upload artifact with invalid checksum via external API
+    protected void uploadArtifactWithInvalidCheckSum(Component component, User sdncModifierDetails, ArtifactReqDetails artifactReqDetails,
+                                                     ComponentInstance componentResourceInstanceDetails) throws Exception {
+        ErrorInfo errorInfo = ErrorValidationUtils.parseErrorConfigYaml(ActionStatus.ARTIFACT_INVALID_MD5.name());
+        List<String> variables = asList();
+        uploadArtifactWithInvalidCheckSumOfAssetIncludingValiditionOfAuditAndResponseCode(component, ElementFactory.getDefaultUser(UserRoleEnum.DESIGNER),
+                artifactReqDetails, componentResourceInstanceDetails, errorInfo, variables);
+    }
+
+    // Upload artifact with valid type & invalid name via external API - name to long
+    protected void uploadArtifactWithInvalidNameToLong(Component component, User sdncModifierDetails, ArtifactReqDetails artifactReqDetails,
+                                                       ComponentInstance componentResourceInstanceDetails) throws Exception {
+        ErrorInfo errorInfo = ErrorValidationUtils.parseErrorConfigYaml(ActionStatus.EXCEEDS_LIMIT.name());
+        List<String> variables = asList("artifact name", "255");
+        artifactReqDetails.setArtifactName("invalGGfdsiofhdsouhfoidshfoidshoifhsdoifhdsouihfdsofhiufdsinvalGGfdsiofhdsouhfoidshfoidshoifhsdoifhdsouihfdsofhiufdsghiufghodhfioudsgafodsgaiofudsghifudsiugfhiufawsouipfhgawseiupfsadiughdfsoiuhgfaighfpasdghfdsaqgfdsgdfgidTypeinvalGGfdsiofhdsouhfoidshfoidshoifhsdoifhdsouihfdsofhiufdsghiufghodhfioudsgafodsgaiofudsghifudsiugfhiufawsouipfhgawseiupfsadiughdfsoiuhgfaighfpasdghfdsaqgfdsgdfgidTypeghiufghodhfioudsgafodsgaiofudsghifudsiugfhiufawsouipfhgawseiupfsadiughdfsoiuhgfaighfpasdghfdsaqgfdsgdfgidType");
+        uploadArtifactOfAssetIncludingValiditionOfAuditAndResponseCode(component, ElementFactory.getDefaultUser(UserRoleEnum.DESIGNER),
+                artifactReqDetails, componentResourceInstanceDetails, errorInfo, variables, null, false);
+    }
+
+    // Upload artifact with valid type & invalid name via external API - name is empty
+    protected void uploadArtifactWithInvalidNameEmpty(Component component, User sdncModifierDetails, ArtifactReqDetails artifactReqDetails,
+                                                      ComponentInstance componentResourceInstanceDetails) throws Exception {
+        ErrorInfo errorInfo = ErrorValidationUtils.parseErrorConfigYaml(ActionStatus.MISSING_ARTIFACT_NAME.name());
+        List<String> variables = asList();
+
+        artifactReqDetails.setArtifactName("");
+        uploadArtifactOfAssetIncludingValiditionOfAuditAndResponseCode(component, ElementFactory.getDefaultUser(UserRoleEnum.DESIGNER),
+                artifactReqDetails, componentResourceInstanceDetails, errorInfo, variables, null, false);
+    }
+
+
+    // Upload artifact with valid type & invalid label via external API - label to long
+    protected void uploadArtifactWithInvalidLabelToLong(Component component, User sdncModifierDetails, ArtifactReqDetails artifactReqDetails,
+                                                        ComponentInstance componentResourceInstanceDetails) throws Exception {
+
+        ErrorInfo errorInfo = ErrorValidationUtils.parseErrorConfigYaml(ActionStatus.EXCEEDS_LIMIT.name());
+        List<String> variables = asList("artifact label", "255");
+        artifactReqDetails.setArtifactLabel("invalGGfdsiofhdsouhfoidshfoidshoifhsdoifhdsouihfdsofhiufdsghiufghodhfioudsgafodsgaiofudsghifudsiugfhiufawsouipfhgawseiupfsadiughdfsoiuhgfaighfpasdghfdsaqgfdsgdfgidTypeinvalGGfdsiofhdsouhfoidshfoidshoifhsdoifhdsouihfdsofhiufdsghiufghodhfioudsgafodsgaiofudsghifudsiugfhiufawsouipfhgawseiupfsadiughdfsoiuhgfaighfpasdghfdsaqgfdsgdfgidTypeinvalGGfdsiofhdsouhfoidshfoidshoifhsdoifhdsouihfdsofhiufdsghiufghodhfioudsgafodsgaiofudsghifudsiugfhiufawsouipfhgawseiupfsadiughdfsoiuhgfaighfpasdghfdsaqgfdsgdfgidTypeinvalGGfdsiofhdsouhfoidshfoidshoifhsdoifhdsouihfdsofhiufdsghiufghodhfioudsgafodsgaiofudsghifudsiugfhiufawsouipfhgawseiupfsadiughdfsoiuhgfaighfpasdghfdsaqgfdsgdfgidType");
+        uploadArtifactOfAssetIncludingValiditionOfAuditAndResponseCode(component, ElementFactory.getDefaultUser(UserRoleEnum.DESIGNER),
+                artifactReqDetails, componentResourceInstanceDetails, errorInfo, variables, null, false);
+    }
+
+    // Upload artifact with valid type & invalid label via external API - label is empty
+    protected void uploadArtifactWithInvalidLabelEmpty(Component component, User sdncModifierDetails, ArtifactReqDetails artifactReqDetails,
+                                                       ComponentInstance componentResourceInstanceDetails) throws Exception {
+
+        ErrorInfo errorInfo = ErrorValidationUtils.parseErrorConfigYaml(ActionStatus.MISSING_DATA.name());
+        List<String> variables = asList("artifact label");
+        artifactReqDetails.setArtifactLabel("");
+        uploadArtifactOfAssetIncludingValiditionOfAuditAndResponseCode(component, ElementFactory.getDefaultUser(UserRoleEnum.DESIGNER),
+                artifactReqDetails, componentResourceInstanceDetails, errorInfo, variables, null, false);
+    }
+
+    // Upload artifact with invalid description via external API - to long description
+    protected void uploadArtifactWithInvalidDescriptionToLong(Component component, User sdncModifierDetails, ArtifactReqDetails artifactReqDetails,
+                                                              ComponentInstance componentResourceInstanceDetails) throws Exception {
+
+        ErrorInfo errorInfo = ErrorValidationUtils.parseErrorConfigYaml(ActionStatus.EXCEEDS_LIMIT.name());
+        List<String> variables = asList("artifact description", "256");
+        artifactReqDetails.setDescription("invalGGfdsiofhdsouhfoidshfoidshoifhsdoifhdsouihfdsofhiufdsinvalGGfdsiofhdsouhfoidshfoidshoifhsdoifhdsouihfdsofhiufdsghiufghodhfioudsgafodsgaiofudsghifudsiugfhiufawsouipfhgawseiupfsadiughdfsoiuhgfaighfpasdghfdsaqgfdsgdfgidTypeinvalGGfdsiofhdsouhfoidshfoidshoifhsdoifhdsouihfdsofhiufdsghiufghodhfioudsgafodsgaiofudsghifudsiugfhiufawsouipfhgawseiupfsadiughdfsoiuhgfaighfpasdghfdsaqgfdsgdfgidTypeghiufghodhfioudsgafodsgaiofudsghifudsiugfhiufawsouipfhgawseiupfsadiughdfsoiuhgfaighfpasdghfdsaqgfdsgdfgidType");
+        uploadArtifactOfAssetIncludingValiditionOfAuditAndResponseCode(component, ElementFactory.getDefaultUser(UserRoleEnum.DESIGNER),
+                artifactReqDetails, componentResourceInstanceDetails, errorInfo, variables, null, false);
+    }
+
+
+    // Upload artifact with invalid description via external API - empty description
+    protected void uploadArtifactWithInvalidDescriptionEmpty(Component component, User sdncModifierDetails, ArtifactReqDetails artifactReqDetails,
+                                                             ComponentInstance componentResourceInstanceDetails) throws Exception {
+
+        ErrorInfo errorInfo = ErrorValidationUtils.parseErrorConfigYaml(ActionStatus.MISSING_DATA.name());
+        List<String> variables = asList("artifact description");
+        artifactReqDetails.setDescription("");
+        uploadArtifactOfAssetIncludingValiditionOfAuditAndResponseCode(component, ElementFactory.getDefaultUser(UserRoleEnum.DESIGNER),
+                artifactReqDetails, componentResourceInstanceDetails, errorInfo, variables, null, false);
+    }
+
+    // Upload artifact with same label via external API
+    protected void uploadArtifactWithSameLabel(Component component, User sdncModifierDetails, ArtifactReqDetails artifactReqDetails,
+                                               ComponentInstance componentResourceInstanceDetails) throws Exception {
+
+        RestResponse restResponse = null;
+        if (componentResourceInstanceDetails != null) {
+            restResponse = ArtifactRestUtils.externalAPIUploadArtifactOfComponentInstanceOnAsset(component, ElementFactory.getDefaultUser(UserRoleEnum.DESIGNER), artifactReqDetails, componentResourceInstanceDetails);
+        } else {
+            restResponse = ArtifactRestUtils.externalAPIUploadArtifactOfTheAsset(component, ElementFactory.getDefaultUser(UserRoleEnum.DESIGNER), artifactReqDetails);
+
+        }
+
+        ArtifactDefinition artifactDefinition = ResponseParser.convertArtifactDefinitionResponseToJavaObject(restResponse.getResponse());
+        ErrorInfo errorInfo = ErrorValidationUtils.parseErrorConfigYaml(ActionStatus.ARTIFACT_EXIST.name());
+
+        List<String> variables = asList(artifactDefinition.getArtifactDisplayName());
+        ArtifactReqDetails artifactReqDetailsSameLabel = ElementFactory.getArtifactByType("Abcd", ArtifactTypeEnum.DCAE_INVENTORY_EVENT.toString(), true, false);
+        artifactReqDetailsSameLabel.setArtifactLabel(artifactReqDetails.getArtifactLabel());
+        uploadArtifactOfAssetIncludingValiditionOfAuditAndResponseCode(component, ElementFactory.getDefaultUser(UserRoleEnum.DESIGNER),
+                artifactReqDetailsSameLabel, componentResourceInstanceDetails, errorInfo, variables, null, false);
+    }
+
+    protected RestResponse uploadArtifactOfAssetIncludingValiditionOfAuditAndResponseCode(Component component, User sdncModifierDetails, ArtifactReqDetails artifactReqDetails,
+                                                                                          ComponentInstance componentResourceInstanceDetails, ErrorInfo errorInfo, List<String> variables, LifeCycleStatesEnum lifeCycleStatesEnum, Boolean includeResourceNameInAudit) throws Exception {
+        RestResponse restResponse;
+        if (componentResourceInstanceDetails != null) {
+            restResponse = ArtifactRestUtils.externalAPIUploadArtifactOfComponentInstanceOnAsset(component, sdncModifierDetails, artifactReqDetails, componentResourceInstanceDetails);
+        } else {
+            restResponse = ArtifactRestUtils.externalAPIUploadArtifactOfTheAsset(component, sdncModifierDetails, artifactReqDetails);
+
+        }
+        // validate response code
+        Integer responseCode = restResponse.getErrorCode();
+        Assert.assertEquals(responseCode, errorInfo.getCode(), "Response code is not correct.");
+        return restResponse;
+    }
+
+
+    protected RestResponse uploadArtifactWithInvalidCheckSumOfAssetIncludingValiditionOfAuditAndResponseCode(Component component, User sdncModifierDetails, ArtifactReqDetails artifactReqDetails,
+                                                                                                             ComponentInstance componentResourceInstanceDetails, ErrorInfo errorInfo, List<String> variables) throws Exception {
+        RestResponse restResponse;
+        if (componentResourceInstanceDetails != null) {
+            restResponse = ArtifactRestUtils.externalAPIUploadArtifactWithInvalidCheckSumOfComponentInstanceOnAsset(component, ElementFactory.getDefaultUser(UserRoleEnum.DESIGNER), artifactReqDetails, componentResourceInstanceDetails);
+        } else {
+            restResponse = ArtifactRestUtils.externalAPIUploadArtifactWithInvalidCheckSumOfTheAsset(component, ElementFactory.getDefaultUser(UserRoleEnum.DESIGNER), artifactReqDetails);
+
+        }
+        // validate response code
+        Integer responseCode = restResponse.getErrorCode();
+        Assert.assertEquals(responseCode, errorInfo.getCode(), "Response code is not correct.");
+        return restResponse;
+
+    }
+
+    @DataProvider(name = "uploadArtifactOnVFViaExternalAPIByDiffrentUserThenCreatorOfAsset", parallel = true)
+    public static Object[][] dataProviderUploadArtifactOnVFViaExternalAPIByDiffrentUserThenCreatorOfAsset() {
+        return new Object[][]{
+                {ComponentTypeEnum.RESOURCE, UserRoleEnum.ADMIN, LifeCycleStatesEnum.CHECKOUT},
+                {ComponentTypeEnum.SERVICE, UserRoleEnum.ADMIN, LifeCycleStatesEnum.CHECKOUT},
+                {ComponentTypeEnum.RESOURCE_INSTANCE, UserRoleEnum.ADMIN, LifeCycleStatesEnum.CHECKOUT},
+                {ComponentTypeEnum.RESOURCE, UserRoleEnum.ADMIN, LifeCycleStatesEnum.CHECKOUT},
+                {ComponentTypeEnum.SERVICE, UserRoleEnum.ADMIN, LifeCycleStatesEnum.CHECKOUT},
+                {ComponentTypeEnum.RESOURCE_INSTANCE, UserRoleEnum.ADMIN, LifeCycleStatesEnum.CHECKOUT},
+
+                {ComponentTypeEnum.RESOURCE, UserRoleEnum.TESTER, LifeCycleStatesEnum.CHECKIN},
+                {ComponentTypeEnum.SERVICE, UserRoleEnum.TESTER, LifeCycleStatesEnum.CHECKIN},
+                {ComponentTypeEnum.RESOURCE_INSTANCE, UserRoleEnum.TESTER, LifeCycleStatesEnum.CHECKIN},
+                {ComponentTypeEnum.RESOURCE, UserRoleEnum.TESTER, LifeCycleStatesEnum.CHECKOUT},
+                {ComponentTypeEnum.SERVICE, UserRoleEnum.TESTER, LifeCycleStatesEnum.CHECKOUT},
+                {ComponentTypeEnum.RESOURCE_INSTANCE, UserRoleEnum.TESTER, LifeCycleStatesEnum.CHECKOUT},
+
+                {ComponentTypeEnum.RESOURCE, UserRoleEnum.OPS, LifeCycleStatesEnum.CHECKIN},
+                {ComponentTypeEnum.SERVICE, UserRoleEnum.OPS, LifeCycleStatesEnum.CHECKIN},
+                {ComponentTypeEnum.RESOURCE_INSTANCE, UserRoleEnum.OPS, LifeCycleStatesEnum.CHECKIN},
+                {ComponentTypeEnum.RESOURCE, UserRoleEnum.OPS, LifeCycleStatesEnum.CHECKOUT},
+                {ComponentTypeEnum.SERVICE, UserRoleEnum.OPS, LifeCycleStatesEnum.CHECKOUT},
+                {ComponentTypeEnum.RESOURCE_INSTANCE, UserRoleEnum.OPS, LifeCycleStatesEnum.CHECKOUT},
+
+                {ComponentTypeEnum.RESOURCE, UserRoleEnum.GOVERNOR, LifeCycleStatesEnum.CHECKIN},
+                {ComponentTypeEnum.SERVICE, UserRoleEnum.GOVERNOR, LifeCycleStatesEnum.CHECKIN},
+                {ComponentTypeEnum.RESOURCE_INSTANCE, UserRoleEnum.GOVERNOR, LifeCycleStatesEnum.CHECKIN},
+                {ComponentTypeEnum.RESOURCE, UserRoleEnum.GOVERNOR, LifeCycleStatesEnum.CHECKOUT},
+                {ComponentTypeEnum.SERVICE, UserRoleEnum.GOVERNOR, LifeCycleStatesEnum.CHECKOUT},
+                {ComponentTypeEnum.RESOURCE_INSTANCE, UserRoleEnum.GOVERNOR, LifeCycleStatesEnum.CHECKOUT},
+        };
+    }
+
+    // External API
+    // Upload artifact by diffrent user then creator of asset - Fail
+    @Test(dataProvider = "uploadArtifactOnVFViaExternalAPIByDiffrentUserThenCreatorOfAsset")
+    public void uploadArtifactOnVFViaExternalAPIByDiffrentUserThenCreatorOfAsset(ComponentTypeEnum componentTypeEnum, UserRoleEnum userRoleEnum, LifeCycleStatesEnum lifeCycleStatesEnum) throws Exception {
+        getExtendTest().log(Status.INFO, String.format("componentTypeEnum: %s, userRoleEnum: %s, lifeCycleStatesEnum: %s", componentTypeEnum, userRoleEnum, lifeCycleStatesEnum));
+        Component resourceDetails;
+        ComponentInstance componentResourceInstanceDetails = null;
+        ArtifactReqDetails artifactReqDetails;
+
+        if (ComponentTypeEnum.RESOURCE_INSTANCE == componentTypeEnum) {
+            artifactReqDetails = ElementFactory.getArtifactByType("Abcd", ArtifactTypeEnum.DCAE_INVENTORY_DOC.toString(), true, false);
+
+            resourceDetails = getComponentWithResourceInstanceInTargetLifeCycleState(lifeCycleStatesEnum, null);
+            componentResourceInstanceDetails = resourceDetails.getComponentInstances().get(0);
+        } else {
+            artifactReqDetails = ElementFactory.getArtifactByType("Abcd", ArtifactTypeEnum.OTHER.toString(), true, false);
+
+            resourceDetails = getComponentInTargetLifeCycleState(componentTypeEnum.toString(), UserRoleEnum.DESIGNER, lifeCycleStatesEnum, null);
+        }
+
+        ErrorInfo errorInfo = ErrorValidationUtils.parseErrorConfigYaml(ActionStatus.RESTRICTED_OPERATION.name());
+        List<String> variables = asList();
+
+        uploadArtifactOfAssetIncludingValiditionOfAuditAndResponseCode(resourceDetails, ElementFactory.getDefaultUser(userRoleEnum),
+                artifactReqDetails, componentResourceInstanceDetails, errorInfo, variables, lifeCycleStatesEnum, true);
+
+    }
+
+    @DataProvider(name = "uploadArtifactOnAssetWhichNotExist", parallel = true)
+    public static Object[][] dataProviderUploadArtifactOnAssetWhichNotExist() {
+        return new Object[][]{
+                {ComponentTypeEnum.SERVICE},
+                {ComponentTypeEnum.RESOURCE},
+                {ComponentTypeEnum.RESOURCE_INSTANCE},
+        };
+    }
+
+    // External API
+    // Upload artifact on VF via external API - happy flow
+    @Test(dataProvider = "uploadArtifactOnAssetWhichNotExist")
+    public void uploadArtifactOnAssetWhichNotExist(ComponentTypeEnum componentTypeEnum) throws Exception {
+        getExtendTest().log(Status.INFO, String.format("componentTypeEnum: %s", componentTypeEnum));
+        Component resourceDetails;
+        ComponentInstance componentResourceInstanceDetails = null;
+        ArtifactReqDetails artifactReqDetails;
+
+        if (ComponentTypeEnum.RESOURCE_INSTANCE == componentTypeEnum) {
+            artifactReqDetails = ElementFactory.getArtifactByType("Abcd", ArtifactTypeEnum.DCAE_INVENTORY_DOC.toString(), true, false);
+
+            resourceDetails = getComponentWithResourceInstanceInTargetLifeCycleState(LifeCycleStatesEnum.CHECKIN, null);
+            componentResourceInstanceDetails = resourceDetails.getComponentInstances().get(0);
+
+            resourceDetails.setUUID("12345");
+            componentResourceInstanceDetails.setNormalizedName("12345");
+        } else {
+            artifactReqDetails = ElementFactory.getArtifactByType("Abcd", ArtifactTypeEnum.OTHER.getType(), true, false);
+
+            resourceDetails = getComponentInTargetLifeCycleState(componentTypeEnum.toString(), UserRoleEnum.DESIGNER, LifeCycleStatesEnum.CHECKIN, null);
+
+            resourceDetails.setUUID("12345");
+        }
+
+        String componentTypeError = ActionStatus.RESOURCE_NOT_FOUND.name();
+        if (ComponentTypeEnum.SERVICE == componentTypeEnum) {
+            componentTypeError = ActionStatus.SERVICE_NOT_FOUND.name();
+        }
+        ErrorInfo errorInfo = ErrorValidationUtils.parseErrorConfigYaml(componentTypeError);
+        List<String> variables = asList(resourceDetails.getUUID());
+
+        uploadArtifactOfAssetIncludingValiditionOfAuditAndResponseCode(resourceDetails, ElementFactory.getDefaultUser(UserRoleEnum.DESIGNER),
+                artifactReqDetails, componentResourceInstanceDetails, errorInfo, variables, LifeCycleStatesEnum.CHECKIN, false);
+    }
+
+    @DataProvider(name = "uploadArtifactOnAssetWhichInInvalidStateForUploading", parallel = true)
+    public static Object[][] dataProviderUploadArtifactOnAssetWhichInInvalidStateForUploading() {
+        return new Object[][]{
+                {ComponentTypeEnum.SERVICE},
+        };
+    }
+
+    @Test(dataProvider = "uploadArtifactOnAssetWhichInInvalidStateForUploading")
+    public void uploadArtifactOnAssetWhichInInvalidStateForUploading(ComponentTypeEnum componentTypeEnum) throws Exception {
+        getExtendTest().log(Status.INFO, String.format("componentTypeEnum: %s", componentTypeEnum));
+        ComponentInstance componentResourceInstanceDetails = null;
+
+        ArtifactReqDetails artifactReqDetails = ElementFactory.getArtifactByType("Abcd", ArtifactTypeEnum.OTHER.toString(), true, false);
+        Component resourceDetails = getComponentInTargetLifeCycleState(componentTypeEnum.toString(), UserRoleEnum.DESIGNER, LifeCycleStatesEnum.STARTCERTIFICATION, null);
+
+        ErrorInfo errorInfo = ErrorValidationUtils.parseErrorConfigYaml(ActionStatus.COMPONENT_IN_CERT_IN_PROGRESS_STATE.name());
+        List<String> variables = asList(resourceDetails.getName(), resourceDetails.getComponentType().toString().toLowerCase(), resourceDetails.getLastUpdaterFullName().split(" ")[0],
+                resourceDetails.getLastUpdaterFullName().split(" ")[1], resourceDetails.getLastUpdaterUserId());
+
+        uploadArtifactOfAssetIncludingValiditionOfAuditAndResponseCode(resourceDetails, ElementFactory.getDefaultUser(UserRoleEnum.DESIGNER),
+                artifactReqDetails, componentResourceInstanceDetails, errorInfo, variables, LifeCycleStatesEnum.STARTCERTIFICATION, true);
+    }
+
+    ////////////////////////////////////////////////////////////////////////////////////
+    ////////////////////////////////////////////////////////////////////////////////////
+    ////////////////////////////////////////////////////////////////////////////////////
+    //					Update External API											  //
+    ////////////////////////////////////////////////////////////////////////////////////
+    ////////////////////////////////////////////////////////////////////////////////////
+    ////////////////////////////////////////////////////////////////////////////////////
+
+    @DataProvider(name = "updateArtifactForServiceViaExternalAPI", parallel = true)
+    public static Object[][] dataProviderUpdateArtifactForServiceViaExternalAPI() {
+        return new Object[][]{
+                {LifeCycleStatesEnum.CHECKOUT, ArtifactTypeEnum.YANG_XML.getType()},
+                {LifeCycleStatesEnum.CHECKOUT, ArtifactTypeEnum.VNF_CATALOG.getType()},
+                {LifeCycleStatesEnum.CHECKOUT, ArtifactTypeEnum.MODEL_INVENTORY_PROFILE.getType()},
+                {LifeCycleStatesEnum.CHECKOUT, ArtifactTypeEnum.MODEL_QUERY_SPEC.getType()},
+                {LifeCycleStatesEnum.CHECKOUT, ArtifactTypeEnum.OTHER.getType()},
+                {LifeCycleStatesEnum.CHECKIN, ArtifactTypeEnum.YANG_XML.getType()},
+                {LifeCycleStatesEnum.CHECKIN, ArtifactTypeEnum.VNF_CATALOG.getType()},
+                {LifeCycleStatesEnum.CHECKIN, ArtifactTypeEnum.MODEL_INVENTORY_PROFILE.getType()},
+                {LifeCycleStatesEnum.CHECKIN, ArtifactTypeEnum.MODEL_QUERY_SPEC.getType()},
+                {LifeCycleStatesEnum.CHECKIN, ArtifactTypeEnum.OTHER.getType()},
+                {LifeCycleStatesEnum.CERTIFICATIONREQUEST, ArtifactTypeEnum.YANG_XML.getType()},
+                {LifeCycleStatesEnum.CERTIFICATIONREQUEST, ArtifactTypeEnum.VNF_CATALOG.getType()},
+                {LifeCycleStatesEnum.CERTIFICATIONREQUEST, ArtifactTypeEnum.MODEL_INVENTORY_PROFILE.getType()},
+                {LifeCycleStatesEnum.CERTIFICATIONREQUEST, ArtifactTypeEnum.MODEL_QUERY_SPEC.getType()},
+                {LifeCycleStatesEnum.CERTIFICATIONREQUEST, ArtifactTypeEnum.OTHER.getType()},
+                {LifeCycleStatesEnum.CERTIFY, ArtifactTypeEnum.YANG_XML.getType()},
+                {LifeCycleStatesEnum.CERTIFY, ArtifactTypeEnum.VNF_CATALOG.getType()},
+                {LifeCycleStatesEnum.CERTIFY, ArtifactTypeEnum.MODEL_INVENTORY_PROFILE.getType()},
+                {LifeCycleStatesEnum.CERTIFY, ArtifactTypeEnum.MODEL_QUERY_SPEC.getType()},
+                {LifeCycleStatesEnum.CERTIFY, ArtifactTypeEnum.OTHER.getType()}
+        };
+    }
+
+    // Update artifact for Service - Success
+    @Test(dataProvider = "updateArtifactForServiceViaExternalAPI")
+    public void updateArtifactForServiceViaExternalAPI(LifeCycleStatesEnum lifeCycleStatesEnum, String artifactType) throws Exception {
+        getExtendTest().log(Status.INFO, String.format("lifeCycleStatesEnum: %s, artifactType: %s", lifeCycleStatesEnum, artifactType));
+        Component component = uploadArtifactOnAssetViaExternalAPI(ComponentTypeEnum.SERVICE, LifeCycleStatesEnum.CHECKOUT, artifactType, null);
+        updateArtifactOnAssetViaExternalAPI(component, ComponentTypeEnum.SERVICE, lifeCycleStatesEnum, artifactType);
+
+        // for certify version check that previous version exist, and that it artifact can be download + checksum
+        if (lifeCycleStatesEnum.equals(LifeCycleStatesEnum.CERTIFY)) {
+            // Download the uploaded artifact via external API
+            downloadResourceDeploymentArtifactExternalAPIAndComparePayLoadOfArtifactType(component, artifactType, ElementFactory.getDefaultUser(UserRoleEnum.DESIGNER), ComponentTypeEnum.SERVICE);
+        }
+    }
+
+    @DataProvider(name = "updateArtifactForVFViaExternalAPI", parallel = true)
+    public static Object[][] dataProviderUpdateArtifactForVFViaExternalAPI() {
+        return new Object[][]{
+                {LifeCycleStatesEnum.CHECKOUT, ArtifactTypeEnum.DCAE_JSON.getType()},
+                {LifeCycleStatesEnum.CHECKOUT, ArtifactTypeEnum.DCAE_POLICY.getType()},
+                {LifeCycleStatesEnum.CHECKOUT, ArtifactTypeEnum.DCAE_EVENT.getType()},
+                {LifeCycleStatesEnum.CHECKOUT, ArtifactTypeEnum.APPC_CONFIG.getType()},
+                {LifeCycleStatesEnum.CHECKOUT, ArtifactTypeEnum.DCAE_DOC.getType()},
+                {LifeCycleStatesEnum.CHECKOUT, ArtifactTypeEnum.DCAE_TOSCA.getType()},
+                {LifeCycleStatesEnum.CHECKOUT, ArtifactTypeEnum.YANG_XML.getType()},
+                {LifeCycleStatesEnum.CHECKOUT, ArtifactTypeEnum.VNF_CATALOG.getType()},
+                {LifeCycleStatesEnum.CHECKOUT, ArtifactTypeEnum.VF_LICENSE.getType()},
+                {LifeCycleStatesEnum.CHECKOUT, ArtifactTypeEnum.VENDOR_LICENSE.getType()},
+                {LifeCycleStatesEnum.CHECKOUT, ArtifactTypeEnum.MODEL_INVENTORY_PROFILE.getType()},
+                {LifeCycleStatesEnum.CHECKOUT, ArtifactTypeEnum.MODEL_QUERY_SPEC.getType()},
+                {LifeCycleStatesEnum.CHECKOUT, ArtifactTypeEnum.OTHER.getType()},
+
+                {LifeCycleStatesEnum.CHECKIN, ArtifactTypeEnum.DCAE_JSON.getType()},
+                {LifeCycleStatesEnum.CHECKIN, ArtifactTypeEnum.DCAE_POLICY.getType()},
+                {LifeCycleStatesEnum.CHECKIN, ArtifactTypeEnum.DCAE_EVENT.getType()},
+                {LifeCycleStatesEnum.CHECKIN, ArtifactTypeEnum.APPC_CONFIG.getType()},
+                {LifeCycleStatesEnum.CHECKIN, ArtifactTypeEnum.DCAE_DOC.getType()},
+                {LifeCycleStatesEnum.CHECKIN, ArtifactTypeEnum.DCAE_TOSCA.getType()},
+                {LifeCycleStatesEnum.CHECKIN, ArtifactTypeEnum.YANG_XML.getType()},
+                {LifeCycleStatesEnum.CHECKIN, ArtifactTypeEnum.VNF_CATALOG.getType()},
+                {LifeCycleStatesEnum.CHECKIN, ArtifactTypeEnum.VF_LICENSE.getType()},
+                {LifeCycleStatesEnum.CHECKIN, ArtifactTypeEnum.VENDOR_LICENSE.getType()},
+                {LifeCycleStatesEnum.CHECKIN, ArtifactTypeEnum.MODEL_INVENTORY_PROFILE.getType()},
+                {LifeCycleStatesEnum.CHECKIN, ArtifactTypeEnum.MODEL_QUERY_SPEC.getType()},
+                {LifeCycleStatesEnum.CHECKIN, ArtifactTypeEnum.OTHER.getType()},
+        };
+    }
+
+    // Update artifact for VF - Success
+    @Test(dataProvider = "updateArtifactForVFViaExternalAPI")
+    public void updateArtifactForVFViaExternalAPI(LifeCycleStatesEnum lifeCycleStatesEnum, String artifactType) throws Exception {
+        getExtendTest().log(Status.INFO, String.format("lifeCycleStatesEnum: %s, artifactType: %s", lifeCycleStatesEnum, artifactType));
+        Component component = uploadArtifactOnAssetViaExternalAPI(ComponentTypeEnum.RESOURCE, LifeCycleStatesEnum.CHECKOUT, artifactType, null);
+        updateArtifactOnAssetViaExternalAPI(component, ComponentTypeEnum.RESOURCE, lifeCycleStatesEnum, artifactType);
+
+        // for certify version check that previous version exist, and that it artifact can be download + checksum
+        if (lifeCycleStatesEnum.equals(LifeCycleStatesEnum.CERTIFY)) {
+            // Download the uploaded artifact via external API
+            downloadResourceDeploymentArtifactExternalAPIAndComparePayLoadOfArtifactType(component, artifactType, ElementFactory.getDefaultUser(UserRoleEnum.DESIGNER), ComponentTypeEnum.RESOURCE);
+        }
+    }
+
+    @DataProvider(name = "updateArtifactForVfcVlCpViaExternalAPI", parallel = true)
+    public static Object[][] dataProviderUpdateArtifactForVfcVlCpViaExternalAPI() {
+        return new Object[][]{
+                {LifeCycleStatesEnum.CHECKOUT, ArtifactTypeEnum.YANG_XML.getType(), ResourceTypeEnum.VFC},
+                {LifeCycleStatesEnum.CHECKOUT, ArtifactTypeEnum.VNF_CATALOG.getType(), ResourceTypeEnum.VFC},
+                {LifeCycleStatesEnum.CHECKOUT, ArtifactTypeEnum.VF_LICENSE.getType(), ResourceTypeEnum.VFC},
+                {LifeCycleStatesEnum.CHECKOUT, ArtifactTypeEnum.VENDOR_LICENSE.getType(), ResourceTypeEnum.VFC},
+                {LifeCycleStatesEnum.CHECKOUT, ArtifactTypeEnum.MODEL_INVENTORY_PROFILE.getType(), ResourceTypeEnum.VFC},
+                {LifeCycleStatesEnum.CHECKOUT, ArtifactTypeEnum.MODEL_QUERY_SPEC.getType(), ResourceTypeEnum.VFC},
+                {LifeCycleStatesEnum.CHECKOUT, ArtifactTypeEnum.OTHER.getType(), ResourceTypeEnum.VFC},
+                {LifeCycleStatesEnum.CHECKOUT, ArtifactTypeEnum.SNMP_POLL.getType(), ResourceTypeEnum.VFC},
+                {LifeCycleStatesEnum.CHECKOUT, ArtifactTypeEnum.SNMP_TRAP.getType(), ResourceTypeEnum.VFC},
+
+                {LifeCycleStatesEnum.CHECKOUT, ArtifactTypeEnum.YANG_XML.getType(), ResourceTypeEnum.VL},
+                {LifeCycleStatesEnum.CHECKOUT, ArtifactTypeEnum.VNF_CATALOG.getType(), ResourceTypeEnum.VL},
+                {LifeCycleStatesEnum.CHECKOUT, ArtifactTypeEnum.VF_LICENSE.getType(), ResourceTypeEnum.VL},
+                {LifeCycleStatesEnum.CHECKOUT, ArtifactTypeEnum.VENDOR_LICENSE.getType(), ResourceTypeEnum.VL},
+                {LifeCycleStatesEnum.CHECKOUT, ArtifactTypeEnum.MODEL_INVENTORY_PROFILE.getType(), ResourceTypeEnum.VL},
+                {LifeCycleStatesEnum.CHECKOUT, ArtifactTypeEnum.MODEL_QUERY_SPEC.getType(), ResourceTypeEnum.VL},
+                {LifeCycleStatesEnum.CHECKOUT, ArtifactTypeEnum.OTHER.getType(), ResourceTypeEnum.VL},
+                {LifeCycleStatesEnum.CHECKOUT, ArtifactTypeEnum.SNMP_POLL.getType(), ResourceTypeEnum.VL},
+                {LifeCycleStatesEnum.CHECKOUT, ArtifactTypeEnum.SNMP_TRAP.getType(), ResourceTypeEnum.VL},
+
+                {LifeCycleStatesEnum.CHECKOUT, ArtifactTypeEnum.YANG_XML.getType(), ResourceTypeEnum.CP},
+                {LifeCycleStatesEnum.CHECKOUT, ArtifactTypeEnum.VNF_CATALOG.getType(), ResourceTypeEnum.CP},
+                {LifeCycleStatesEnum.CHECKOUT, ArtifactTypeEnum.VF_LICENSE.getType(), ResourceTypeEnum.CP},
+                {LifeCycleStatesEnum.CHECKOUT, ArtifactTypeEnum.VENDOR_LICENSE.getType(), ResourceTypeEnum.CP},
+                {LifeCycleStatesEnum.CHECKOUT, ArtifactTypeEnum.MODEL_INVENTORY_PROFILE.getType(), ResourceTypeEnum.CP},
+                {LifeCycleStatesEnum.CHECKOUT, ArtifactTypeEnum.MODEL_QUERY_SPEC.getType(), ResourceTypeEnum.CP},
+                {LifeCycleStatesEnum.CHECKOUT, ArtifactTypeEnum.OTHER.getType(), ResourceTypeEnum.CP},
+                {LifeCycleStatesEnum.CHECKOUT, ArtifactTypeEnum.SNMP_POLL.getType(), ResourceTypeEnum.CP},
+                {LifeCycleStatesEnum.CHECKOUT, ArtifactTypeEnum.SNMP_TRAP.getType(), ResourceTypeEnum.CP},
+
+                {LifeCycleStatesEnum.CHECKIN, ArtifactTypeEnum.YANG_XML.getType(), ResourceTypeEnum.VFC},
+                {LifeCycleStatesEnum.CHECKIN, ArtifactTypeEnum.VNF_CATALOG.getType(), ResourceTypeEnum.VFC},
+                {LifeCycleStatesEnum.CHECKIN, ArtifactTypeEnum.VF_LICENSE.getType(), ResourceTypeEnum.VFC},
+                {LifeCycleStatesEnum.CHECKIN, ArtifactTypeEnum.VENDOR_LICENSE.getType(), ResourceTypeEnum.VFC},
+                {LifeCycleStatesEnum.CHECKIN, ArtifactTypeEnum.MODEL_INVENTORY_PROFILE.getType(), ResourceTypeEnum.VFC},
+                {LifeCycleStatesEnum.CHECKIN, ArtifactTypeEnum.MODEL_QUERY_SPEC.getType(), ResourceTypeEnum.VFC},
+                {LifeCycleStatesEnum.CHECKIN, ArtifactTypeEnum.OTHER.getType(), ResourceTypeEnum.VFC},
+                {LifeCycleStatesEnum.CHECKIN, ArtifactTypeEnum.SNMP_POLL.getType(), ResourceTypeEnum.VFC},
+                {LifeCycleStatesEnum.CHECKIN, ArtifactTypeEnum.SNMP_TRAP.getType(), ResourceTypeEnum.VFC},
+
+                {LifeCycleStatesEnum.CHECKIN, ArtifactTypeEnum.YANG_XML.getType(), ResourceTypeEnum.VL},
+                {LifeCycleStatesEnum.CHECKIN, ArtifactTypeEnum.VNF_CATALOG.getType(), ResourceTypeEnum.VL},
+                {LifeCycleStatesEnum.CHECKIN, ArtifactTypeEnum.VF_LICENSE.getType(), ResourceTypeEnum.VL},
+                {LifeCycleStatesEnum.CHECKIN, ArtifactTypeEnum.VENDOR_LICENSE.getType(), ResourceTypeEnum.VL},
+                {LifeCycleStatesEnum.CHECKIN, ArtifactTypeEnum.MODEL_INVENTORY_PROFILE.getType(), ResourceTypeEnum.VL},
+                {LifeCycleStatesEnum.CHECKIN, ArtifactTypeEnum.MODEL_QUERY_SPEC.getType(), ResourceTypeEnum.VL},
+                {LifeCycleStatesEnum.CHECKIN, ArtifactTypeEnum.OTHER.getType(), ResourceTypeEnum.VL},
+                {LifeCycleStatesEnum.CHECKIN, ArtifactTypeEnum.SNMP_POLL.getType(), ResourceTypeEnum.VL},
+                {LifeCycleStatesEnum.CHECKIN, ArtifactTypeEnum.SNMP_TRAP.getType(), ResourceTypeEnum.VL},
+
+                {LifeCycleStatesEnum.CHECKIN, ArtifactTypeEnum.YANG_XML.getType(), ResourceTypeEnum.CP},
+                {LifeCycleStatesEnum.CHECKIN, ArtifactTypeEnum.VNF_CATALOG.getType(), ResourceTypeEnum.CP},
+                {LifeCycleStatesEnum.CHECKIN, ArtifactTypeEnum.VF_LICENSE.getType(), ResourceTypeEnum.CP},
+                {LifeCycleStatesEnum.CHECKIN, ArtifactTypeEnum.VENDOR_LICENSE.getType(), ResourceTypeEnum.CP},
+                {LifeCycleStatesEnum.CHECKIN, ArtifactTypeEnum.MODEL_INVENTORY_PROFILE.getType(), ResourceTypeEnum.CP},
+                {LifeCycleStatesEnum.CHECKIN, ArtifactTypeEnum.MODEL_QUERY_SPEC.getType(), ResourceTypeEnum.CP},
+                {LifeCycleStatesEnum.CHECKIN, ArtifactTypeEnum.OTHER.getType(), ResourceTypeEnum.CP},
+                {LifeCycleStatesEnum.CHECKIN, ArtifactTypeEnum.SNMP_POLL.getType(), ResourceTypeEnum.CP},
+                {LifeCycleStatesEnum.CHECKIN, ArtifactTypeEnum.SNMP_TRAP.getType(), ResourceTypeEnum.CP},
+        };
+    }
+
+    // Update artifact for VFC/VL/CP - Success
+    @Test(dataProvider = "updateArtifactForVfcVlCpViaExternalAPI")
+    public void updateArtifactForVfcVlCpViaExternalAPI(LifeCycleStatesEnum lifeCycleStatesEnum, String artifactType, ResourceTypeEnum resourceTypeEnum) throws Exception {
+        getExtendTest().log(Status.INFO, String.format("lifeCycleStatesEnum: %s, artifactType: %s, resourceTypeEnum: %s", lifeCycleStatesEnum, artifactType, resourceTypeEnum));
+        Component component = uploadArtifactOnAssetViaExternalAPI(ComponentTypeEnum.RESOURCE, LifeCycleStatesEnum.CHECKOUT, artifactType, resourceTypeEnum);
+        updateArtifactOnAssetViaExternalAPI(component, ComponentTypeEnum.RESOURCE, lifeCycleStatesEnum, artifactType);
+
+        // for certify version check that previous version exist, and that it artifact can be download + checksum
+        if (lifeCycleStatesEnum.equals(LifeCycleStatesEnum.CERTIFY)) {
+            // Download the uploaded artifact via external API
+            downloadResourceDeploymentArtifactExternalAPIAndComparePayLoadOfArtifactType(component, artifactType, ElementFactory.getDefaultUser(UserRoleEnum.DESIGNER), ComponentTypeEnum.RESOURCE);
+        }
+    }
+
+    @DataProvider(name = "updateArtifactOfVfcVlCpForVfciVliCpiViaExternalAPI", parallel = true)
+    public static Object[][] dataProviderUpdateArtifactOfVfcVlCpForVfciVliCpiViaExternalAPI() {
+        return new Object[][]{
+                {ResourceTypeEnum.VFC},
+                {ResourceTypeEnum.VL},
+                {ResourceTypeEnum.CP}
+        };
+    }
+
+    // Verify that it cannot update VFC/VL/CP artifact on VFCi/VLi/CPi - Failure flow
+    @Test(dataProvider = "updateArtifactOfVfcVlCpForVfciVliCpiViaExternalAPI")
+    public void updateArtifactOfVfcVlCpForVfciVliCpiViaExternalAPI(ResourceTypeEnum resourceTypeEnum) throws Exception {
+        getExtendTest().log(Status.INFO, String.format("resourceTypeEnum: %s", resourceTypeEnum));
+
+        Component resourceInstanceDetails = getComponentInTargetLifeCycleState(ComponentTypeEnum.RESOURCE.getValue(), UserRoleEnum.DESIGNER, LifeCycleStatesEnum.CHECKOUT, resourceTypeEnum);
+        ArtifactReqDetails artifactReqDetails = ElementFactory.getArtifactByType("ci", ArtifactTypeEnum.SNMP_TRAP.getType(), true, false);
+        uploadArtifactOfAssetIncludingValiditionOfAuditAndResponseCode(resourceInstanceDetails, ElementFactory.getDefaultUser(UserRoleEnum.DESIGNER), artifactReqDetails, 200);
+        resourceInstanceDetails = AtomicOperationUtils.changeComponentState(resourceInstanceDetails, UserRoleEnum.DESIGNER, LifeCycleStatesEnum.CHECKIN, true).getLeft();
+        Component component = getComponentInTargetLifeCycleState(ComponentTypeEnum.RESOURCE.toString(), UserRoleEnum.DESIGNER, LifeCycleStatesEnum.CHECKOUT, null);
+        AtomicOperationUtils.addComponentInstanceToComponentContainer(resourceInstanceDetails, component, UserRoleEnum.DESIGNER, true).left().value();
+        component = AtomicOperationUtils.getResourceObjectByNameAndVersion(UserRoleEnum.DESIGNER, component.getName(), component.getVersion());
+
+        ErrorInfo errorInfo = ErrorValidationUtils.parseErrorConfigYaml(ActionStatus.OK.name());
+        Map<String, ArtifactDefinition> deploymentArtifacts;
+        deploymentArtifacts = getDeploymentArtifactsOfAsset(component, ComponentTypeEnum.RESOURCE_INSTANCE);
+        String artifactUUID = null;
+        for (String key : deploymentArtifacts.keySet()) {
+            if (key.startsWith("ci") && StringUtils.isNotEmpty(deploymentArtifacts.get(key).getArtifactUUID())) {
+                artifactUUID = deploymentArtifacts.get(key).getArtifactUUID();
+                break;
+            }
+        }
+        List<String> variables = asList(artifactUUID);
+        updateArtifactOnAssetViaExternalAPI(component, ComponentTypeEnum.RESOURCE_INSTANCE, LifeCycleStatesEnum.CHECKOUT, ArtifactTypeEnum.SNMP_TRAP.getType(), errorInfo, variables, UserRoleEnum.DESIGNER);
+
+    }
+
+    @DataProvider(name = "updateArtifactOnRIViaExternalAPI", parallel = true)
+    public static Object[][] dataProviderUpdateArtifactOnRIViaExternalAPI() {
+        return new Object[][]{
+                {LifeCycleStatesEnum.CHECKOUT, ArtifactTypeEnum.DCAE_INVENTORY_TOSCA.getType(), null},
+                {LifeCycleStatesEnum.CHECKOUT, ArtifactTypeEnum.DCAE_INVENTORY_JSON.getType(), null},
+                {LifeCycleStatesEnum.CHECKOUT, ArtifactTypeEnum.DCAE_INVENTORY_POLICY.getType(), null},
+                {LifeCycleStatesEnum.CHECKOUT, ArtifactTypeEnum.DCAE_INVENTORY_DOC.getType(), null},
+                {LifeCycleStatesEnum.CHECKOUT, ArtifactTypeEnum.DCAE_INVENTORY_BLUEPRINT.getType(), null},
+                {LifeCycleStatesEnum.CHECKOUT, ArtifactTypeEnum.DCAE_INVENTORY_EVENT.getType(), null},
+
+                {LifeCycleStatesEnum.CHECKIN, ArtifactTypeEnum.DCAE_INVENTORY_TOSCA.getType(), null},
+                {LifeCycleStatesEnum.CHECKIN, ArtifactTypeEnum.DCAE_INVENTORY_JSON.getType(), null},
+                {LifeCycleStatesEnum.CHECKIN, ArtifactTypeEnum.DCAE_INVENTORY_POLICY.getType(), null},
+                {LifeCycleStatesEnum.CHECKIN, ArtifactTypeEnum.DCAE_INVENTORY_DOC.getType(), null},
+                {LifeCycleStatesEnum.CHECKIN, ArtifactTypeEnum.DCAE_INVENTORY_BLUEPRINT.getType(), null},
+                {LifeCycleStatesEnum.CHECKIN, ArtifactTypeEnum.DCAE_INVENTORY_EVENT.getType(), null},
+
+        };
+    }
+
+    @Test(dataProvider = "updateArtifactOnRIViaExternalAPI")
+    public void updateArtifactOnRIViaExternalAPI(LifeCycleStatesEnum chosenLifeCycleState, String artifactType, ResourceTypeEnum resourceTypeEnum) throws Exception {
+        getExtendTest().log(Status.INFO, String.format("chosenLifeCycleState: %s, artifactType: %s", chosenLifeCycleState, artifactType));
+        Component component = uploadArtifactOnAssetViaExternalAPI(ComponentTypeEnum.RESOURCE_INSTANCE, LifeCycleStatesEnum.CHECKOUT, artifactType, resourceTypeEnum);
+        updateArtifactOnAssetViaExternalAPI(component, ComponentTypeEnum.RESOURCE_INSTANCE, chosenLifeCycleState, artifactType);
+
+        // for certify version check that previous version exist, and that it artifact can be download + checksum
+        if (chosenLifeCycleState.equals(LifeCycleStatesEnum.CERTIFY)) {
+            // Download the uploaded artifact via external API
+            downloadResourceDeploymentArtifactExternalAPIAndComparePayLoadOfArtifactType(component, artifactType, ElementFactory.getDefaultUser(UserRoleEnum.DESIGNER), ComponentTypeEnum.RESOURCE_INSTANCE);
+        }
+    }
+
+    @DataProvider(name = "updateArtifactOnVfcVlCpRIViaExternalAPI", parallel = true)
+    public static Object[][] dataProviderUpdateArtifactOnVfcVlCpRIViaExternalAPI() {
+        return new Object[][]{
+                {LifeCycleStatesEnum.CHECKOUT, ArtifactTypeEnum.DCAE_INVENTORY_TOSCA.getType(), ResourceTypeEnum.VFC},
+                {LifeCycleStatesEnum.CHECKOUT, ArtifactTypeEnum.DCAE_INVENTORY_JSON.getType(), ResourceTypeEnum.VFC},
+                {LifeCycleStatesEnum.CHECKOUT, ArtifactTypeEnum.DCAE_INVENTORY_POLICY.getType(), ResourceTypeEnum.VFC},
+                {LifeCycleStatesEnum.CHECKOUT, ArtifactTypeEnum.DCAE_INVENTORY_DOC.getType(), ResourceTypeEnum.VFC},
+                {LifeCycleStatesEnum.CHECKOUT, ArtifactTypeEnum.DCAE_INVENTORY_BLUEPRINT.getType(), ResourceTypeEnum.VFC},
+                {LifeCycleStatesEnum.CHECKOUT, ArtifactTypeEnum.DCAE_INVENTORY_EVENT.getType(), ResourceTypeEnum.VFC},
+                {LifeCycleStatesEnum.CHECKOUT, ArtifactTypeEnum.SNMP_POLL.getType(), ResourceTypeEnum.VFC},
+                {LifeCycleStatesEnum.CHECKOUT, ArtifactTypeEnum.SNMP_TRAP.getType(), ResourceTypeEnum.VFC},
+
+
+                {LifeCycleStatesEnum.CHECKOUT, ArtifactTypeEnum.DCAE_INVENTORY_TOSCA.getType(), ResourceTypeEnum.VL},
+                {LifeCycleStatesEnum.CHECKOUT, ArtifactTypeEnum.DCAE_INVENTORY_JSON.getType(), ResourceTypeEnum.VL},
+                {LifeCycleStatesEnum.CHECKOUT, ArtifactTypeEnum.DCAE_INVENTORY_POLICY.getType(), ResourceTypeEnum.VL},
+                {LifeCycleStatesEnum.CHECKOUT, ArtifactTypeEnum.DCAE_INVENTORY_DOC.getType(), ResourceTypeEnum.VL},
+                {LifeCycleStatesEnum.CHECKOUT, ArtifactTypeEnum.DCAE_INVENTORY_BLUEPRINT.getType(), ResourceTypeEnum.VL},
+                {LifeCycleStatesEnum.CHECKOUT, ArtifactTypeEnum.DCAE_INVENTORY_EVENT.getType(), ResourceTypeEnum.VL},
+                {LifeCycleStatesEnum.CHECKOUT, ArtifactTypeEnum.SNMP_POLL.getType(), ResourceTypeEnum.VL},
+                {LifeCycleStatesEnum.CHECKOUT, ArtifactTypeEnum.SNMP_TRAP.getType(), ResourceTypeEnum.VL},
+
+                {LifeCycleStatesEnum.CHECKOUT, ArtifactTypeEnum.DCAE_INVENTORY_TOSCA.getType(), ResourceTypeEnum.CP},
+                {LifeCycleStatesEnum.CHECKOUT, ArtifactTypeEnum.DCAE_INVENTORY_JSON.getType(), ResourceTypeEnum.CP},
+                {LifeCycleStatesEnum.CHECKOUT, ArtifactTypeEnum.DCAE_INVENTORY_POLICY.getType(), ResourceTypeEnum.CP},
+                {LifeCycleStatesEnum.CHECKOUT, ArtifactTypeEnum.DCAE_INVENTORY_DOC.getType(), ResourceTypeEnum.CP},
+                {LifeCycleStatesEnum.CHECKOUT, ArtifactTypeEnum.DCAE_INVENTORY_BLUEPRINT.getType(), ResourceTypeEnum.CP},
+                {LifeCycleStatesEnum.CHECKOUT, ArtifactTypeEnum.DCAE_INVENTORY_EVENT.getType(), ResourceTypeEnum.CP},
+                {LifeCycleStatesEnum.CHECKOUT, ArtifactTypeEnum.SNMP_POLL.getType(), ResourceTypeEnum.CP},
+                {LifeCycleStatesEnum.CHECKOUT, ArtifactTypeEnum.SNMP_TRAP.getType(), ResourceTypeEnum.CP},
+
+
+                {LifeCycleStatesEnum.CHECKIN, ArtifactTypeEnum.DCAE_INVENTORY_TOSCA.getType(), ResourceTypeEnum.VFC},
+                {LifeCycleStatesEnum.CHECKIN, ArtifactTypeEnum.DCAE_INVENTORY_JSON.getType(), ResourceTypeEnum.VFC},
+                {LifeCycleStatesEnum.CHECKIN, ArtifactTypeEnum.DCAE_INVENTORY_POLICY.getType(), ResourceTypeEnum.VFC},
+                {LifeCycleStatesEnum.CHECKIN, ArtifactTypeEnum.DCAE_INVENTORY_DOC.getType(), ResourceTypeEnum.VFC},
+                {LifeCycleStatesEnum.CHECKIN, ArtifactTypeEnum.DCAE_INVENTORY_BLUEPRINT.getType(), ResourceTypeEnum.VFC},
+                {LifeCycleStatesEnum.CHECKIN, ArtifactTypeEnum.DCAE_INVENTORY_EVENT.getType(), ResourceTypeEnum.VFC},
+                {LifeCycleStatesEnum.CHECKIN, ArtifactTypeEnum.SNMP_POLL.getType(), ResourceTypeEnum.VFC},
+                {LifeCycleStatesEnum.CHECKIN, ArtifactTypeEnum.SNMP_TRAP.getType(), ResourceTypeEnum.VFC},
+
+                {LifeCycleStatesEnum.CHECKIN, ArtifactTypeEnum.DCAE_INVENTORY_TOSCA.getType(), ResourceTypeEnum.VL},
+                {LifeCycleStatesEnum.CHECKIN, ArtifactTypeEnum.DCAE_INVENTORY_JSON.getType(), ResourceTypeEnum.VL},
+                {LifeCycleStatesEnum.CHECKIN, ArtifactTypeEnum.DCAE_INVENTORY_POLICY.getType(), ResourceTypeEnum.VL},
+                {LifeCycleStatesEnum.CHECKIN, ArtifactTypeEnum.DCAE_INVENTORY_DOC.getType(), ResourceTypeEnum.VL},
+                {LifeCycleStatesEnum.CHECKIN, ArtifactTypeEnum.DCAE_INVENTORY_BLUEPRINT.getType(), ResourceTypeEnum.VL},
+                {LifeCycleStatesEnum.CHECKIN, ArtifactTypeEnum.DCAE_INVENTORY_EVENT.getType(), ResourceTypeEnum.VL},
+                {LifeCycleStatesEnum.CHECKIN, ArtifactTypeEnum.SNMP_POLL.getType(), ResourceTypeEnum.VL},
+                {LifeCycleStatesEnum.CHECKIN, ArtifactTypeEnum.SNMP_TRAP.getType(), ResourceTypeEnum.VL},
+
+                {LifeCycleStatesEnum.CHECKIN, ArtifactTypeEnum.DCAE_INVENTORY_TOSCA.getType(), ResourceTypeEnum.CP},
+                {LifeCycleStatesEnum.CHECKIN, ArtifactTypeEnum.DCAE_INVENTORY_JSON.getType(), ResourceTypeEnum.CP},
+                {LifeCycleStatesEnum.CHECKIN, ArtifactTypeEnum.DCAE_INVENTORY_POLICY.getType(), ResourceTypeEnum.CP},
+                {LifeCycleStatesEnum.CHECKIN, ArtifactTypeEnum.DCAE_INVENTORY_DOC.getType(), ResourceTypeEnum.CP},
+                {LifeCycleStatesEnum.CHECKIN, ArtifactTypeEnum.DCAE_INVENTORY_BLUEPRINT.getType(), ResourceTypeEnum.CP},
+                {LifeCycleStatesEnum.CHECKIN, ArtifactTypeEnum.DCAE_INVENTORY_EVENT.getType(), ResourceTypeEnum.CP},
+                {LifeCycleStatesEnum.CHECKIN, ArtifactTypeEnum.SNMP_POLL.getType(), ResourceTypeEnum.CP},
+                {LifeCycleStatesEnum.CHECKIN, ArtifactTypeEnum.SNMP_TRAP.getType(), ResourceTypeEnum.CP},
+        };
+    }
+
+    @Test(dataProvider = "updateArtifactOnVfcVlCpRIViaExternalAPI")
+    public void updateArtifactOnVfcVlCpRIViaExternalAPI(LifeCycleStatesEnum chosenLifeCycleState, String artifactType, ResourceTypeEnum resourceTypeEnum) throws Exception {
+        getExtendTest().log(Status.INFO, String.format("chosenLifeCycleState: %s, artifactType: %s", chosenLifeCycleState, artifactType));
+        Component component = uploadArtifactOnAssetViaExternalAPI(ComponentTypeEnum.RESOURCE_INSTANCE, LifeCycleStatesEnum.CHECKOUT, artifactType, resourceTypeEnum);
+        updateArtifactOnAssetViaExternalAPI(component, ComponentTypeEnum.RESOURCE_INSTANCE, chosenLifeCycleState, artifactType);
+
+
+        // for certify version check that previous version exist, and that it artifact can be download + checksum
+        if (chosenLifeCycleState.equals(LifeCycleStatesEnum.CERTIFY)) {
+            // Download the uploaded artifact via external API
+            downloadResourceDeploymentArtifactExternalAPIAndComparePayLoadOfArtifactType(component, artifactType, ElementFactory.getDefaultUser(UserRoleEnum.DESIGNER), ComponentTypeEnum.RESOURCE_INSTANCE);
+        }
+    }
+
+    @DataProvider(name = "updateArtifactOnVFViaExternalAPIByDifferentUserThenCreatorOfAsset", parallel = true)
+    public static Object[][] dataProviderUpdateArtifactOnVFViaExternalAPIByDifferentUserThenCreatorOfAsset() {
+        return new Object[][]{
+                {ComponentTypeEnum.RESOURCE, UserRoleEnum.ADMIN, LifeCycleStatesEnum.CHECKOUT, ArtifactTypeEnum.OTHER.getType()},
+                {ComponentTypeEnum.SERVICE, UserRoleEnum.ADMIN, LifeCycleStatesEnum.CHECKOUT, ArtifactTypeEnum.OTHER.getType()},
+                {ComponentTypeEnum.RESOURCE_INSTANCE, UserRoleEnum.ADMIN, LifeCycleStatesEnum.CHECKOUT, ArtifactTypeEnum.DCAE_INVENTORY_TOSCA.getType()},
+
+                {ComponentTypeEnum.RESOURCE, UserRoleEnum.ADMIN, LifeCycleStatesEnum.CHECKOUT, ArtifactTypeEnum.OTHER.getType()},
+                {ComponentTypeEnum.SERVICE, UserRoleEnum.ADMIN, LifeCycleStatesEnum.CHECKOUT, ArtifactTypeEnum.OTHER.getType()},
+                {ComponentTypeEnum.RESOURCE_INSTANCE, UserRoleEnum.ADMIN, LifeCycleStatesEnum.CHECKOUT, ArtifactTypeEnum.DCAE_INVENTORY_TOSCA.getType()},
+
+                {ComponentTypeEnum.RESOURCE, UserRoleEnum.TESTER, LifeCycleStatesEnum.CHECKIN, ArtifactTypeEnum.OTHER.getType()},
+                {ComponentTypeEnum.SERVICE, UserRoleEnum.TESTER, LifeCycleStatesEnum.CHECKIN, ArtifactTypeEnum.OTHER.getType()},
+                {ComponentTypeEnum.RESOURCE_INSTANCE, UserRoleEnum.TESTER, LifeCycleStatesEnum.CHECKIN, ArtifactTypeEnum.DCAE_INVENTORY_TOSCA.getType()},
+                {ComponentTypeEnum.RESOURCE, UserRoleEnum.TESTER, LifeCycleStatesEnum.CHECKOUT, ArtifactTypeEnum.OTHER.getType()},
+                {ComponentTypeEnum.SERVICE, UserRoleEnum.TESTER, LifeCycleStatesEnum.CHECKOUT, ArtifactTypeEnum.OTHER.getType()},
+                {ComponentTypeEnum.RESOURCE_INSTANCE, UserRoleEnum.TESTER, LifeCycleStatesEnum.CHECKOUT, ArtifactTypeEnum.DCAE_INVENTORY_TOSCA.getType()},
+
+                {ComponentTypeEnum.RESOURCE, UserRoleEnum.OPS, LifeCycleStatesEnum.CHECKIN, ArtifactTypeEnum.OTHER.getType()},
+                {ComponentTypeEnum.SERVICE, UserRoleEnum.OPS, LifeCycleStatesEnum.CHECKIN, ArtifactTypeEnum.OTHER.getType()},
+                {ComponentTypeEnum.RESOURCE_INSTANCE, UserRoleEnum.OPS, LifeCycleStatesEnum.CHECKIN, ArtifactTypeEnum.DCAE_INVENTORY_TOSCA.getType()},
+                {ComponentTypeEnum.RESOURCE, UserRoleEnum.OPS, LifeCycleStatesEnum.CHECKOUT, ArtifactTypeEnum.OTHER.getType()},
+                {ComponentTypeEnum.SERVICE, UserRoleEnum.OPS, LifeCycleStatesEnum.CHECKOUT, ArtifactTypeEnum.OTHER.getType()},
+                {ComponentTypeEnum.RESOURCE_INSTANCE, UserRoleEnum.OPS, LifeCycleStatesEnum.CHECKOUT, ArtifactTypeEnum.DCAE_INVENTORY_TOSCA.getType()},
+
+                {ComponentTypeEnum.RESOURCE, UserRoleEnum.GOVERNOR, LifeCycleStatesEnum.CHECKIN, ArtifactTypeEnum.OTHER.getType()},
+                {ComponentTypeEnum.SERVICE, UserRoleEnum.GOVERNOR, LifeCycleStatesEnum.CHECKIN, ArtifactTypeEnum.OTHER.getType()},
+                {ComponentTypeEnum.RESOURCE_INSTANCE, UserRoleEnum.GOVERNOR, LifeCycleStatesEnum.CHECKIN, ArtifactTypeEnum.DCAE_INVENTORY_TOSCA.getType()},
+                {ComponentTypeEnum.RESOURCE, UserRoleEnum.GOVERNOR, LifeCycleStatesEnum.CHECKOUT, ArtifactTypeEnum.OTHER.getType()},
+                {ComponentTypeEnum.SERVICE, UserRoleEnum.GOVERNOR, LifeCycleStatesEnum.CHECKOUT, ArtifactTypeEnum.OTHER.getType()},
+                {ComponentTypeEnum.RESOURCE_INSTANCE, UserRoleEnum.GOVERNOR, LifeCycleStatesEnum.CHECKOUT, ArtifactTypeEnum.DCAE_INVENTORY_TOSCA.getType()},
+        };
+    }
+
+    // External API
+    // Update artifact by different user then creator of asset - Fail
+    @Test(dataProvider = "updateArtifactOnVFViaExternalAPIByDifferentUserThenCreatorOfAsset")
+    public void updateArtifactOnVFViaExternalAPIByDifferentUserThenCreatorOfAsset(ComponentTypeEnum componentTypeEnum, UserRoleEnum userRoleEnum, LifeCycleStatesEnum lifeCycleStatesEnum, String artifactType) throws Exception {
+        getExtendTest().log(Status.INFO, String.format("componentTypeEnum: %s, userRoleEnum: %s, lifeCycleStatesEnum: %s, artifactType: %s", componentTypeEnum, userRoleEnum, lifeCycleStatesEnum, artifactType));
+        Component component = uploadArtifactOnAssetViaExternalAPI(componentTypeEnum, LifeCycleStatesEnum.CHECKIN, artifactType, null);
+        ErrorInfo errorInfo = ErrorValidationUtils.parseErrorConfigYaml(ActionStatus.RESTRICTED_OPERATION.name());
+        List<String> variables = asList();
+        updateArtifactOnAssetViaExternalAPI(component, componentTypeEnum, lifeCycleStatesEnum, artifactType, errorInfo, variables, userRoleEnum);
+    }
+
+    @DataProvider(name = "updateArtifactOnAssetWhichNotExist", parallel = true)
+    public static Object[][] dataProviderUpdateArtifactOnAssetWhichNotExist() {
+        return new Object[][]{
+                {ComponentTypeEnum.SERVICE, ArtifactTypeEnum.OTHER.getType(), null},
+                {ComponentTypeEnum.RESOURCE, ArtifactTypeEnum.OTHER.getType(), null},
+                {ComponentTypeEnum.RESOURCE_INSTANCE, ArtifactTypeEnum.DCAE_INVENTORY_TOSCA.getType(), ResourceTypeEnum.VF},
+        };
+    }
+
+    // External API
+    // Upload artifact on VF via external API - happy flow
+    @Test(dataProvider = "updateArtifactOnAssetWhichNotExist")
+    public void updateArtifactOnAssetWhichNotExist(ComponentTypeEnum componentTypeEnum, String artifactType, ResourceTypeEnum resourceTypeEnum) throws Exception {
+        getExtendTest().log(Status.INFO, String.format("componentTypeEnum: %s, artifactType: %s", componentTypeEnum, artifactType));
+        Component component = uploadArtifactOnAssetViaExternalAPI(componentTypeEnum, LifeCycleStatesEnum.CHECKIN, artifactType, resourceTypeEnum);
+
+        // get updated artifact data
+        Map<String, ArtifactDefinition> deploymentArtifacts = getDeploymentArtifactsOfAsset(component, componentTypeEnum);
+        ArtifactReqDetails artifactReqDetails = getUpdatedArtifact(deploymentArtifacts, artifactType);
+        String artifactUUID = deploymentArtifacts.get(artifactReqDetails.getArtifactLabel()).getArtifactUUID();
+
+        // Invalid artifactUUID
+        String invalidArtifactUUID = "12341234-1234-1234-1234-123412341234";
+        ErrorInfo errorInfo = ErrorValidationUtils.parseErrorConfigYaml(ActionStatus.ARTIFACT_NOT_FOUND.name());
+        List<String> variables = asList(invalidArtifactUUID);
+
+        if (componentTypeEnum.equals(ComponentTypeEnum.RESOURCE_INSTANCE)) {
+            updateArtifactOfAssetIncludingValiditionOfAuditAndResponseCode(component, ElementFactory.getDefaultUser(UserRoleEnum.DESIGNER),
+                    component.getComponentInstances().get(0), artifactReqDetails, invalidArtifactUUID, errorInfo, variables, null, true);
+        } else {
+            updateArtifactOfAssetIncludingValiditionOfAuditAndResponseCode(component, ElementFactory.getDefaultUser(UserRoleEnum.DESIGNER),
+                    null, artifactReqDetails, invalidArtifactUUID, errorInfo, variables, null, true);
+
+        }
+
+        // Invalid componentUUID
+//		errorInfo = ErrorValidationUtils.parseErrorConfigYaml(ActionStatus.RESOURCE_NOT_FOUND.name());
+//		variables = asList("null");
+
+        if (componentTypeEnum.equals(ComponentTypeEnum.RESOURCE_INSTANCE)) {
+            component.getComponentInstances().get(0).setNormalizedName("invalidNormalizedName");
+
+            errorInfo = ErrorValidationUtils.parseErrorConfigYaml(ActionStatus.COMPONENT_INSTANCE_NOT_FOUND_ON_CONTAINER.name());
+
+            variables = asList("invalidNormalizedName", ComponentTypeEnum.RESOURCE_INSTANCE.getValue().toLowerCase(), ComponentTypeEnum.SERVICE.getValue(), component.getName());
+            updateArtifactOfAssetIncludingValiditionOfAuditAndResponseCode(component, ElementFactory.getDefaultUser(UserRoleEnum.DESIGNER),
+                    component.getComponentInstances().get(0), artifactReqDetails, artifactUUID, errorInfo, variables, LifeCycleStatesEnum.CHECKIN, true);
+        } else {
+            component.setUUID("invalidComponentUUID");
+
+            errorInfo = ErrorValidationUtils.parseErrorConfigYaml(ActionStatus.RESOURCE_NOT_FOUND.name());
+            variables = asList("null");
+
+            updateArtifactOfAssetIncludingValiditionOfAuditAndResponseCode(component, ElementFactory.getDefaultUser(UserRoleEnum.DESIGNER),
+                    null, artifactReqDetails, artifactUUID, errorInfo, variables, LifeCycleStatesEnum.CHECKIN, false);
+        }
+        performClean();
+    }
+
+    @DataProvider(name = "updateArtifactOnAssetWhichInInvalidStateForUploading", parallel = true)
+    public static Object[][] dataProviderUpdateProviderDeleteArtifactOnAssetWhichInInvalidStateForUploading() {
+        return new Object[][]{
+                {ComponentTypeEnum.SERVICE, ArtifactTypeEnum.OTHER.getType()},
+        };
+    }
+
+    @Test(dataProvider = "updateArtifactOnAssetWhichInInvalidStateForUploading")
+    public void updateArtifactOnAssetWhichInInvalidStateForUploading(ComponentTypeEnum componentTypeEnum, String artifactType) throws Exception {
+        getExtendTest().log(Status.INFO, String.format("componentTypeEnum: %s, artifactType: %s", componentTypeEnum, artifactType));
+        Component component = uploadArtifactOnAssetViaExternalAPI(componentTypeEnum, LifeCycleStatesEnum.CHECKIN, artifactType, null);
+        ErrorInfo errorInfo = ErrorValidationUtils.parseErrorConfigYaml(ActionStatus.COMPONENT_IN_CERT_IN_PROGRESS_STATE.name());
+        List<String> variables = asList(component.getName(), component.getComponentType().toString().toLowerCase(), ElementFactory.getDefaultUser(UserRoleEnum.TESTER).getFirstName(),
+                ElementFactory.getDefaultUser(UserRoleEnum.TESTER).getLastName(), ElementFactory.getDefaultUser(UserRoleEnum.TESTER).getUserId());
+        updateArtifactOnAssetViaExternalAPI(component, componentTypeEnum, LifeCycleStatesEnum.STARTCERTIFICATION, artifactType, errorInfo, variables, UserRoleEnum.DESIGNER);
+
+    }
+
+    @DataProvider(name = "updateInvalidArtifactTypeExtensionLabelDescriptionCheckSumDuplicateLabelViaExternalAPI", parallel = true)
+    public static Object[][] dataProviderUpdateInvalidArtifactTypeExtensionLabelDescriptionCheckSumDuplicateLabelViaExternalAPI() {
+        return new Object[][]{
+                {LifeCycleStatesEnum.CHECKOUT, ComponentTypeEnum.RESOURCE, "updateArtifactWithInvalidCheckSum"},
+                {LifeCycleStatesEnum.CHECKOUT, ComponentTypeEnum.SERVICE, "updateArtifactWithInvalidCheckSum"},
+                {LifeCycleStatesEnum.CHECKOUT, ComponentTypeEnum.RESOURCE_INSTANCE, "updateArtifactWithInvalidCheckSum"},
+                {LifeCycleStatesEnum.CHECKIN, ComponentTypeEnum.RESOURCE, "updateArtifactWithInvalidCheckSum"},
+                {LifeCycleStatesEnum.CHECKIN, ComponentTypeEnum.SERVICE, "updateArtifactWithInvalidCheckSum"},
+                {LifeCycleStatesEnum.CHECKIN, ComponentTypeEnum.RESOURCE_INSTANCE, "updateArtifactWithInvalidCheckSum"},
+                {LifeCycleStatesEnum.CERTIFICATIONREQUEST, ComponentTypeEnum.SERVICE, "updateArtifactWithInvalidCheckSum"},
+                {LifeCycleStatesEnum.CERTIFICATIONREQUEST, ComponentTypeEnum.RESOURCE_INSTANCE, "updateArtifactWithInvalidCheckSum"},
+
+                {LifeCycleStatesEnum.CHECKOUT, ComponentTypeEnum.RESOURCE, "updateArtifactWithInvalidNameToLong"},
+                {LifeCycleStatesEnum.CHECKOUT, ComponentTypeEnum.SERVICE, "updateArtifactWithInvalidNameToLong"},
+                {LifeCycleStatesEnum.CHECKOUT, ComponentTypeEnum.RESOURCE_INSTANCE, "updateArtifactWithInvalidNameToLong"},
+                {LifeCycleStatesEnum.CHECKIN, ComponentTypeEnum.RESOURCE, "updateArtifactWithInvalidNameToLong"},
+                {LifeCycleStatesEnum.CHECKIN, ComponentTypeEnum.SERVICE, "updateArtifactWithInvalidNameToLong"},
+                {LifeCycleStatesEnum.CHECKIN, ComponentTypeEnum.RESOURCE_INSTANCE, "updateArtifactWithInvalidNameToLong"},
+                {LifeCycleStatesEnum.CERTIFICATIONREQUEST, ComponentTypeEnum.SERVICE, "updateArtifactWithInvalidNameToLong"},
+                {LifeCycleStatesEnum.CERTIFICATIONREQUEST, ComponentTypeEnum.RESOURCE_INSTANCE, "updateArtifactWithInvalidNameToLong"},
+
+                {LifeCycleStatesEnum.CHECKOUT, ComponentTypeEnum.RESOURCE, "updateArtifactWithInvalidNameEmpty"},
+                {LifeCycleStatesEnum.CHECKOUT, ComponentTypeEnum.SERVICE, "updateArtifactWithInvalidNameEmpty"},
+                {LifeCycleStatesEnum.CHECKOUT, ComponentTypeEnum.RESOURCE_INSTANCE, "updateArtifactWithInvalidNameEmpty"},
+                {LifeCycleStatesEnum.CHECKIN, ComponentTypeEnum.RESOURCE, "updateArtifactWithInvalidNameEmpty"},
+                {LifeCycleStatesEnum.CHECKIN, ComponentTypeEnum.SERVICE, "updateArtifactWithInvalidNameEmpty"},
+                {LifeCycleStatesEnum.CHECKIN, ComponentTypeEnum.RESOURCE_INSTANCE, "updateArtifactWithInvalidNameEmpty"},
+                {LifeCycleStatesEnum.CERTIFICATIONREQUEST, ComponentTypeEnum.SERVICE, "updateArtifactWithInvalidNameEmpty"},
+                {LifeCycleStatesEnum.CERTIFICATIONREQUEST, ComponentTypeEnum.RESOURCE_INSTANCE, "updateArtifactWithInvalidNameEmpty"},
+
+                {LifeCycleStatesEnum.CHECKOUT, ComponentTypeEnum.RESOURCE, "updateArtifactWithInvalidLabelToLong"},
+                {LifeCycleStatesEnum.CHECKOUT, ComponentTypeEnum.SERVICE, "updateArtifactWithInvalidLabelToLong"},
+                {LifeCycleStatesEnum.CHECKOUT, ComponentTypeEnum.RESOURCE_INSTANCE, "updateArtifactWithInvalidLabelToLong"},
+                {LifeCycleStatesEnum.CHECKIN, ComponentTypeEnum.RESOURCE, "updateArtifactWithInvalidLabelToLong"},
+                {LifeCycleStatesEnum.CHECKIN, ComponentTypeEnum.SERVICE, "updateArtifactWithInvalidLabelToLong"},
+                {LifeCycleStatesEnum.CHECKIN, ComponentTypeEnum.RESOURCE_INSTANCE, "updateArtifactWithInvalidLabelToLong"},
+                {LifeCycleStatesEnum.CERTIFICATIONREQUEST, ComponentTypeEnum.SERVICE, "updateArtifactWithInvalidLabelToLong"},
+                {LifeCycleStatesEnum.CERTIFICATIONREQUEST, ComponentTypeEnum.RESOURCE_INSTANCE, "updateArtifactWithInvalidLabelToLong"},
+
+                {LifeCycleStatesEnum.CHECKOUT, ComponentTypeEnum.RESOURCE, "updateArtifactWithInvalidLabelEmpty"},
+                {LifeCycleStatesEnum.CHECKOUT, ComponentTypeEnum.SERVICE, "updateArtifactWithInvalidLabelEmpty"},
+                {LifeCycleStatesEnum.CHECKOUT, ComponentTypeEnum.RESOURCE_INSTANCE, "updateArtifactWithInvalidLabelEmpty"},
+                {LifeCycleStatesEnum.CHECKIN, ComponentTypeEnum.RESOURCE, "updateArtifactWithInvalidLabelEmpty"},
+                {LifeCycleStatesEnum.CHECKIN, ComponentTypeEnum.SERVICE, "updateArtifactWithInvalidLabelEmpty"},
+                {LifeCycleStatesEnum.CHECKIN, ComponentTypeEnum.RESOURCE_INSTANCE, "updateArtifactWithInvalidLabelEmpty"},
+                {LifeCycleStatesEnum.CERTIFICATIONREQUEST, ComponentTypeEnum.SERVICE, "updateArtifactWithInvalidLabelEmpty"},
+                {LifeCycleStatesEnum.CERTIFICATIONREQUEST, ComponentTypeEnum.RESOURCE_INSTANCE, "updateArtifactWithInvalidLabelEmpty"},
+
+                {LifeCycleStatesEnum.CHECKOUT, ComponentTypeEnum.RESOURCE, "updateArtifactWithInvalidDescriptionToLong"},
+                {LifeCycleStatesEnum.CHECKOUT, ComponentTypeEnum.SERVICE, "updateArtifactWithInvalidDescriptionToLong"},
+                {LifeCycleStatesEnum.CHECKOUT, ComponentTypeEnum.RESOURCE_INSTANCE, "updateArtifactWithInvalidDescriptionToLong"},
+                {LifeCycleStatesEnum.CHECKIN, ComponentTypeEnum.RESOURCE, "updateArtifactWithInvalidDescriptionToLong"},
+                {LifeCycleStatesEnum.CHECKIN, ComponentTypeEnum.SERVICE, "updateArtifactWithInvalidDescriptionToLong"},
+                {LifeCycleStatesEnum.CHECKIN, ComponentTypeEnum.RESOURCE_INSTANCE, "updateArtifactWithInvalidDescriptionToLong"},
+                {LifeCycleStatesEnum.CERTIFICATIONREQUEST, ComponentTypeEnum.SERVICE, "updateArtifactWithInvalidDescriptionToLong"},
+                {LifeCycleStatesEnum.CERTIFICATIONREQUEST, ComponentTypeEnum.RESOURCE_INSTANCE, "updateArtifactWithInvalidDescriptionToLong"},
+
+                {LifeCycleStatesEnum.CHECKOUT, ComponentTypeEnum.RESOURCE, "updateArtifactWithInvalidDescriptionEmpty"},
+                {LifeCycleStatesEnum.CHECKOUT, ComponentTypeEnum.SERVICE, "updateArtifactWithInvalidDescriptionEmpty"},
+                {LifeCycleStatesEnum.CHECKOUT, ComponentTypeEnum.RESOURCE_INSTANCE, "updateArtifactWithInvalidDescriptionEmpty"},
+                {LifeCycleStatesEnum.CHECKIN, ComponentTypeEnum.RESOURCE, "updateArtifactWithInvalidDescriptionEmpty"},
+                {LifeCycleStatesEnum.CHECKIN, ComponentTypeEnum.SERVICE, "updateArtifactWithInvalidDescriptionEmpty"},
+                {LifeCycleStatesEnum.CHECKIN, ComponentTypeEnum.RESOURCE_INSTANCE, "updateArtifactWithInvalidDescriptionEmpty"},
+                {LifeCycleStatesEnum.CERTIFICATIONREQUEST, ComponentTypeEnum.SERVICE, "updateArtifactWithInvalidDescriptionEmpty"},
+                {LifeCycleStatesEnum.CERTIFICATIONREQUEST, ComponentTypeEnum.RESOURCE_INSTANCE, "updateArtifactWithInvalidDescriptionEmpty"},
+        };
+    }
+
+    // InvalidArtifact + check audit & response code function
+    @Test(dataProvider = "updateInvalidArtifactTypeExtensionLabelDescriptionCheckSumDuplicateLabelViaExternalAPI")
+    public void updateInvalidArtifactTypeExtensionLabelDescriptionCheckSumDuplicateLabelViaExternalAPI(LifeCycleStatesEnum chosenLifeCycleState,
+                                                                                                       ComponentTypeEnum componentTypeEnum, String uploadArtifactTestType) throws Exception {
+        getExtendTest().log(Status.INFO, String.format("chosenLifeCycleState: %s, componentTypeEnum: %s, uploadArtifactTestType: %s", chosenLifeCycleState, componentTypeEnum, uploadArtifactTestType));
+        Component component;
+        ComponentInstance componentInstance = null;
+        String artifactType;
+
+        if (ComponentTypeEnum.RESOURCE_INSTANCE == componentTypeEnum) {
+            artifactType = ArtifactTypeEnum.DCAE_INVENTORY_DOC.toString();
+            component = uploadArtifactOnAssetViaExternalAPI(componentTypeEnum, LifeCycleStatesEnum.CHECKIN, artifactType, null);
+            componentInstance = component.getComponentInstances().get(0);
+        } else {
+            artifactType = ArtifactTypeEnum.OTHER.toString();
+            component = uploadArtifactOnAssetViaExternalAPI(componentTypeEnum, LifeCycleStatesEnum.CHECKIN, artifactType, null);
+        }
+
+        component = AtomicOperationUtils.changeComponentState(component, UserRoleEnum.DESIGNER, chosenLifeCycleState, true).getLeft();
+
+        switch (uploadArtifactTestType) {
+            case "updateArtifactWithInvalidCheckSum":
+                updateArtifactWithInvalidCheckSum(component, ElementFactory.getDefaultUser(UserRoleEnum.DESIGNER), artifactType, componentInstance);
+                break;
+            case "updateArtifactWithInvalidNameToLong":
+                updateArtifactWithInvalidNameToLong(component, ElementFactory.getDefaultUser(UserRoleEnum.DESIGNER), artifactType, componentInstance);
+                break;
+            case "updateArtifactWithInvalidNameEmpty":
+                updateArtifactWithInvalidNameEmpty(component, ElementFactory.getDefaultUser(UserRoleEnum.DESIGNER), artifactType, componentInstance);
+                break;
+            case "updateArtifactWithInvalidLabelToLong":
+                updateArtifactWithInvalidLabelToLong(component, ElementFactory.getDefaultUser(UserRoleEnum.DESIGNER), artifactType, componentInstance);
+                break;
+            case "updateArtifactWithInvalidLabelEmpty":
+                updateArtifactWithInvalidLabelEmpty(component, ElementFactory.getDefaultUser(UserRoleEnum.DESIGNER), artifactType, componentInstance);
+                break;
+            case "updateArtifactWithInvalidDescriptionToLong":
+                updateArtifactWithInvalidDescriptionToLong(component, ElementFactory.getDefaultUser(UserRoleEnum.DESIGNER), artifactType, componentInstance);
+                break;
+            case "updateArtifactWithInvalidDescriptionEmpty":
+            default:
+                updateArtifactWithInvalidDescriptionEmpty(component, ElementFactory.getDefaultUser(UserRoleEnum.DESIGNER), artifactType, componentInstance);
+                break;
+        }
+
+///////////////////////////////////////////////////////////////////////////////		
+//		// TODO: there is defect when checking invalid type
+////		// Upload artifact with invalid type via external API
+////		// invalid type
+////		String artifactType = artifactReqDetails.getArtifactType();
+////		artifactReqDetails.setArtifactType("invalidType");
+////		restResponse = uploadArtifactOfAssetIncludingValiditionOfAuditAndResponseCode(resourceDetails, ElementFactory.getDefaultUser(UserRoleEnum.DESIGNER), artifactReqDetails, componentResourceInstanceDetails);
+////		// empty type
+////		artifactReqDetails.setArtifactType("");
+////		restResponse = uploadArtifactOfAssetIncludingValiditionOfAuditAndResponseCode(resourceDetails, ElementFactory.getDefaultUser(UserRoleEnum.DESIGNER), artifactReqDetails, componentResourceInstanceDetails);
+////		artifactReqDetails.setArtifactType(artifactType);
+///////////////////////////////////////////////////////////////////////////////			
+    }
+
+    // TODO
+    // Update artifact with invalid checksum via external API
+    protected void updateArtifactWithInvalidCheckSum(Component component, User sdncModifierDetails, String artifactType, ComponentInstance componentInstance) throws Exception {
+        ErrorInfo errorInfo = ErrorValidationUtils.parseErrorConfigYaml(ActionStatus.ARTIFACT_INVALID_MD5.name());
+        List<String> variables = asList();
+    }
+
+
+    // Update artifact with valid type & invalid name via external API - name to long
+    protected void updateArtifactWithInvalidNameToLong(Component component, User sdncModifierDetails, String artifactType,
+                                                       ComponentInstance componentInstance) throws Exception {
+
+        ArtifactReqDetails artifactReqDetails = ElementFactory.getArtifactByType("ci", artifactType, true, true);
+        String artifactUUID = getFirstArtifactUuidFromComponent(component);
+
+        ErrorInfo errorInfo = ErrorValidationUtils.parseErrorConfigYaml(ActionStatus.EXCEEDS_LIMIT.name());
+        List<String> variables = asList("artifact name", "255");
+        artifactReqDetails.setArtifactName("invalGGfdsiofhdsouhfoidshfoidshoifhsdoifhdsouihfdsofhiufdsinvalGGfdsiofhdsouhfoidshfoidshoifhsdoifhdsouihfdsofhiufdsghiufghodhfioudsgafodsgaiofudsghifudsiugfhiufawsouipfhgawseiupfsadiughdfsoiuhgfaighfpasdghfdsaqgfdsgdfgidTypeinvalGGfdsiofhdsouhfoidshfoidshoifhsdoifhdsouihfdsofhiufdsghiufghodhfioudsgafodsgaiofudsghifudsiugfhiufawsouipfhgawseiupfsadiughdfsoiuhgfaighfpasdghfdsaqgfdsgdfgidTypeghiufghodhfioudsgafodsgaiofudsghifudsiugfhiufawsouipfhgawseiupfsadiughdfsoiuhgfaighfpasdghfdsaqgfdsgdfgidType");
+
+        if (componentInstance != null) {
+            updateArtifactOfAssetIncludingValiditionOfAuditAndResponseCode(component, ElementFactory.getDefaultUser(UserRoleEnum.DESIGNER),
+                    component.getComponentInstances().get(0), artifactReqDetails, artifactUUID, errorInfo, variables, null, true);
+        } else {
+            updateArtifactOfAssetIncludingValiditionOfAuditAndResponseCode(component, ElementFactory.getDefaultUser(UserRoleEnum.DESIGNER),
+                    null, artifactReqDetails, artifactUUID, errorInfo, variables, null, true);
+
+        }
+    }
+
+    // Update artifact with valid type & invalid name via external API - name is empty
+    protected void updateArtifactWithInvalidNameEmpty(Component component, User sdncModifierDetails, String artifactType,
+                                                      ComponentInstance componentInstance) throws Exception {
+
+        ArtifactReqDetails artifactReqDetails = ElementFactory.getArtifactByType("ci", artifactType, true, true);
+        String artifactUUID = getFirstArtifactUuidFromComponent(component);
+
+        ErrorInfo errorInfo = ErrorValidationUtils.parseErrorConfigYaml(ActionStatus.MISSING_ARTIFACT_NAME.name());
+        List<String> variables = asList();
+        artifactReqDetails.setArtifactName("");
+
+        if (componentInstance != null) {
+            updateArtifactOfAssetIncludingValiditionOfAuditAndResponseCode(component, ElementFactory.getDefaultUser(UserRoleEnum.DESIGNER),
+                    component.getComponentInstances().get(0), artifactReqDetails, artifactUUID, errorInfo, variables, null, true);
+        } else {
+            updateArtifactOfAssetIncludingValiditionOfAuditAndResponseCode(component, ElementFactory.getDefaultUser(UserRoleEnum.DESIGNER),
+                    null, artifactReqDetails, artifactUUID, errorInfo, variables, null, true);
+
+        }
+    }
+
+    // Update artifact with valid type & invalid label via external API - label to long -
+//	according to the newest AID doc artifactLabel, artifactType, artifactGroupType parameters should be ignored 
+    protected void updateArtifactWithInvalidLabelToLong(Component component, User sdncModifierDetails, String artifactType,
+                                                        ComponentInstance componentInstance) throws Exception {
+
+        ArtifactReqDetails artifactReqDetails = ElementFactory.getArtifactByType("ci", artifactType, true, true);
+        String artifactUUID = getFirstArtifactUuidFromComponent(component);
+
+        ErrorInfo errorInfo = ErrorValidationUtils.parseErrorConfigYaml(ActionStatus.OK.name());
+        artifactReqDetails.setArtifactLabel("invalGGfdsiofhdsouhfoidshfoidshoifhsdoifhdsouihfdsofhiufdsghiufghodhfioudsgafodsgaiofudsghifudsiugfhiufawsouipfhgawseiupfsadiughdfsoiuhgfaighfpasdghfdsaqgfdsgdfgidTypeinvalGGfdsiofhdsouhfoidshfoidshoifhsdoifhdsouihfdsofhiufdsghiufghodhfioudsgafodsgaiofudsghifudsiugfhiufawsouipfhgawseiupfsadiughdfsoiuhgfaighfpasdghfdsaqgfdsgdfgidType");
+
+        if (componentInstance != null) {
+            updateArtifactOfAssetIncludingValiditionOfAuditAndResponseCode(component, ElementFactory.getDefaultUser(UserRoleEnum.DESIGNER),
+                    component.getComponentInstances().get(0), artifactReqDetails, artifactUUID, errorInfo, null, null, true);
+        } else {
+            updateArtifactOfAssetIncludingValiditionOfAuditAndResponseCode(component, ElementFactory.getDefaultUser(UserRoleEnum.DESIGNER),
+                    null, artifactReqDetails, artifactUUID, errorInfo, null, null, true);
+
+        }
+    }
+
+    // Update artifact with valid type & invalid label via external API - label is empty
+//		according to the newest AID doc artifactLabel, artifactType, artifactGroupType parameters should be ignored 
+    protected void updateArtifactWithInvalidLabelEmpty(Component component, User sdncModifierDetails, String artifactType,
+                                                       ComponentInstance componentInstance) throws Exception {
+
+        ArtifactReqDetails artifactReqDetails = ElementFactory.getArtifactByType("ci", artifactType, true, true);
+        String artifactUUID = getFirstArtifactUuidFromComponent(component);
+
+        ErrorInfo errorInfo = ErrorValidationUtils.parseErrorConfigYaml(ActionStatus.OK.name());
+        artifactReqDetails.setArtifactLabel("");
+
+        if (componentInstance != null) {
+            updateArtifactOfAssetIncludingValiditionOfAuditAndResponseCode(component, ElementFactory.getDefaultUser(UserRoleEnum.DESIGNER),
+                    component.getComponentInstances().get(0), artifactReqDetails, artifactUUID, errorInfo, null, null, true);
+        } else {
+            updateArtifactOfAssetIncludingValiditionOfAuditAndResponseCode(component, ElementFactory.getDefaultUser(UserRoleEnum.DESIGNER),
+                    null, artifactReqDetails, artifactUUID, errorInfo, null, null, true);
+
+        }
+    }
+
+    // Update artifact with invalid description via external API - to long description
+    protected void updateArtifactWithInvalidDescriptionToLong(Component component, User sdncModifierDetails, String artifactType,
+                                                              ComponentInstance componentInstance) throws Exception {
+
+        ArtifactReqDetails artifactReqDetails = ElementFactory.getArtifactByType("ci", artifactType, true, true);
+        String artifactUUID = getFirstArtifactUuidFromComponent(component);
+
+        ErrorInfo errorInfo = ErrorValidationUtils.parseErrorConfigYaml(ActionStatus.EXCEEDS_LIMIT.name());
+        List<String> variables = asList("artifact description", ValidationUtils.ARTIFACT_DESCRIPTION_MAX_LENGTH.toString());
+        artifactReqDetails.setDescription("invalGGfdsiofhdsouhfoidshfoidshoifhsdoifhdsouihfdsofhiufdsinvalGGfdsiofhdsouhfoidshfoidshoifhsdoifhdsouihfdsofhiufdsghiufghodhfioudsgafodsgaiofudsghifudsiugfhiufawsouipfhgawseiupfsadiughdfsoiuhgfaighfpasdghfdsaqgfdsgdfgidTypeinvalGGfdsiofhdsouhfoidshfoidshoifhsdoifhdsouihfdsofhiufdsghiufghodhfioudsgafodsgaiofudsghifudsiugfhiufawsouipfhgawseiupfsadiughdfsoiuhgfaighfpasdghfdsaqgfdsgdfgidTypeghiufghodhfioudsgafodsgaiofudsghifudsiugfhiufawsouipfhgawseiupfsadiughdfsoiuhgfaighfpasdghfdsaqgfdsgdfgidType");
+
+        if (componentInstance != null) {
+            updateArtifactOfAssetIncludingValiditionOfAuditAndResponseCode(component, ElementFactory.getDefaultUser(UserRoleEnum.DESIGNER),
+                    component.getComponentInstances().get(0), artifactReqDetails, artifactUUID, errorInfo, variables, null, true);
+        } else {
+            updateArtifactOfAssetIncludingValiditionOfAuditAndResponseCode(component, ElementFactory.getDefaultUser(UserRoleEnum.DESIGNER),
+                    null, artifactReqDetails, artifactUUID, errorInfo, variables, null, true);
+
+        }
+    }
+
+    public String getFirstArtifactUuidFromComponent(Component component) {
+        String artifactUUID = null;
+        Map<String, ArtifactDefinition> deploymentArtifacts;
+        if (component.getComponentInstances() != null) {
+            deploymentArtifacts = component.getComponentInstances().get(0).getDeploymentArtifacts();
+        } else {
+            deploymentArtifacts = component.getDeploymentArtifacts();
+        }
+
+        for (String key : deploymentArtifacts.keySet()) {
+            if (key.startsWith("ci")) {
+                artifactUUID = deploymentArtifacts.get(key).getArtifactUUID();
+                break;
+            }
+        }
+        return artifactUUID;
+    }
+
+    // Update artifact with invalid description via external API - empty description
+    protected void updateArtifactWithInvalidDescriptionEmpty(Component component, User sdncModifierDetails, String artifactType,
+                                                             ComponentInstance componentInstance) throws Exception {
+
+        ArtifactReqDetails artifactReqDetails = ElementFactory.getArtifactByType("ci", artifactType, true, true);
+        String artifactUUID = getFirstArtifactUuidFromComponent(component);
+
+        ErrorInfo errorInfo = ErrorValidationUtils.parseErrorConfigYaml(ActionStatus.MISSING_DATA.name());
+        List<String> variables = asList("artifact description");
+        artifactReqDetails.setDescription("");
+
+        if (componentInstance != null) {
+            updateArtifactOfAssetIncludingValiditionOfAuditAndResponseCode(component, ElementFactory.getDefaultUser(UserRoleEnum.DESIGNER),
+                    component.getComponentInstances().get(0), artifactReqDetails, artifactUUID, errorInfo, variables, null, true);
+        } else {
+            updateArtifactOfAssetIncludingValiditionOfAuditAndResponseCode(component, ElementFactory.getDefaultUser(UserRoleEnum.DESIGNER),
+                    null, artifactReqDetails, artifactUUID, errorInfo, variables, null, true);
+        }
+    }
+
+    // Unhappy flow - get chosen life cycle state, artifact type and asset type
+    // update artifact via external API + check audit & response code
+    // Download artifact via external API + check audit & response code
+    // Check artifact version, uuid & checksusm
+    protected Component updateArtifactOnAssetViaExternalAPI(Component component, ComponentTypeEnum componentTypeEnum, LifeCycleStatesEnum chosenLifeCycleState, String artifactType, ErrorInfo errorInfo, List<String> variables, UserRoleEnum userRoleEnum) throws Exception {
+        String componentVersionBeforeUpdate = null;
+
+        // get updated artifact data
+        component = AtomicOperationUtils.changeComponentState(component, UserRoleEnum.DESIGNER, chosenLifeCycleState, true).getLeft();
+        componentVersionBeforeUpdate = component.getVersion();
+
+        Map<String, ArtifactDefinition> deploymentArtifacts = getDeploymentArtifactsOfAsset(component, componentTypeEnum);
+        ArtifactReqDetails artifactReqDetails = getUpdatedArtifact(deploymentArtifacts, artifactType);
+
+        String artifactName = artifactReqDetails.getArtifactLabel();
+        String artifactUUID = deploymentArtifacts.get(artifactName).getArtifactUUID();
+        String artifactVersionBeforeUpdate = deploymentArtifacts.get(artifactName).getArtifactVersion();
+        int numberOfArtifact = deploymentArtifacts.size();
+
+        ArtifactReqDetails updateArtifactReqDetails = ElementFactory.getArtifactByType(ArtifactTypeEnum.SNMP_POLL.name(), ArtifactTypeEnum.SNMP_POLL.name(), true, true);
+        updateArtifactReqDetails.setPayload("dGVzdA==");
+
+        // create component/s & upload artifact via external api
+        if (ComponentTypeEnum.RESOURCE_INSTANCE == componentTypeEnum) {
+            updateArtifactOfAssetIncludingValiditionOfAuditAndResponseCode(component, ElementFactory.getDefaultUser(userRoleEnum),
+                    component.getComponentInstances().get(0), updateArtifactReqDetails, artifactUUID, errorInfo, variables, chosenLifeCycleState, true);
+        } else {
+            updateArtifactOfAssetIncludingValiditionOfAuditAndResponseCode(component, ElementFactory.getDefaultUser(userRoleEnum),
+                    null, updateArtifactReqDetails, artifactUUID, errorInfo, variables, chosenLifeCycleState, true);
+        }
+
+        if (component.getComponentType().equals(ComponentTypeEnum.SERVICE)) {
+            component = AtomicOperationUtils.getServiceObjectByNameAndVersion(UserRoleEnum.DESIGNER, component.getName(), component.getVersion());
+        } else {
+            component = AtomicOperationUtils.getResourceObjectByNameAndVersion(UserRoleEnum.DESIGNER, component.getName(), component.getVersion());
+        }
+
+        // Get list of deployment artifact + download them via external API
+        if (ComponentTypeEnum.RESOURCE_INSTANCE == componentTypeEnum) {
+            deploymentArtifacts = component.getComponentInstances().get(0).getDeploymentArtifacts();
+        } else {
+            deploymentArtifacts = component.getDeploymentArtifacts();
+        }
+        Assert.assertEquals(numberOfArtifact, deploymentArtifacts.keySet().size(), "Expected that number of deployment artifact will be same as before.");
+        Assert.assertEquals(componentVersionBeforeUpdate, component.getVersion(), "Expected that check-out component will not change version number.");
+        if (errorInfo.getCode().equals(200)) {
+            Assert.assertNotEquals(String.valueOf((Integer.parseInt(artifactVersionBeforeUpdate))), deploymentArtifacts.get(artifactName).getArtifactVersion(), "Artifact version should be changed.");
+            Assert.assertNotEquals(artifactUUID, deploymentArtifacts.get(artifactName).getArtifactUUID(), "Artifact UUID should be changed.");
+        } else {
+            Assert.assertEquals(String.valueOf((Integer.parseInt(artifactVersionBeforeUpdate))), deploymentArtifacts.get(artifactName).getArtifactVersion(), "Artifact version should not be changed.");
+            Assert.assertEquals(artifactUUID, deploymentArtifacts.get(artifactName).getArtifactUUID(), "Artifact UUID should not be changed.");
+        }
+        return component;
+    }
+
+    protected RestResponse updateArtifactOfAssetIncludingValiditionOfAuditAndResponseCode(Component component, User sdncModifierDetails,
+                                                                                          ComponentInstance componentInstance, ArtifactReqDetails artifactReqDetails, String artifactUUID, ErrorInfo errorInfo, List<String> variables, LifeCycleStatesEnum lifeCycleStatesEnum, Boolean resourceNameInAudit) throws Exception {
+        RestResponse restResponse;
+
+        if (componentInstance != null) {
+            restResponse = ArtifactRestUtils.externalAPIUpdateArtifactOfComponentInstanceOnAsset(component, sdncModifierDetails, artifactReqDetails, componentInstance, artifactUUID);
+        } else {
+            restResponse = ArtifactRestUtils.externalAPIUpdateArtifactOfTheAsset(component, sdncModifierDetails, artifactReqDetails, artifactUUID);
+
+        }
+        // validate response code
+        Integer responseCode = restResponse.getErrorCode();
+        Assert.assertEquals(responseCode, errorInfo.getCode(), "Response code is not correct.");
+        component = AtomicOperationUtils.getComponentObject(component, UserRoleEnum.DESIGNER);
+        return restResponse;
+    }
+
+
+    // This function get component, user & if updatedPayload or not
+    // It will create default payload / updated payload of artifact
+    // And download artifact of component which starts with ci
+    protected RestResponse downloadResourceDeploymentArtifactExternalAPIAndComparePayLoadOfArtifactType(Component component, String artifactType, User sdncModifierDetails, ComponentTypeEnum componentTypeEnum) throws IOException, Exception {
+        // Download the uploaded artifact via external API
+        ArtifactReqDetails artifactReqDetails = ElementFactory.getArtifactByType("abcd", artifactType, true, false);
+        String artifactName = null;
+        for (String key : component.getDeploymentArtifacts().keySet()) {
+            if (key.startsWith("ci")) {
+                artifactName = key;
+                break;
+            }
+        }
+        return downloadResourceDeploymentArtifactExternalAPI(component, component.getDeploymentArtifacts().get(artifactName), sdncModifierDetails, artifactReqDetails, componentTypeEnum);
+    }
+
+    // Get deployment artifact of RI
+    protected Map<String, ArtifactDefinition> getDeploymentArtifactsOfAsset(Component component, ComponentTypeEnum componentTypeEnum) {
+        Map<String, ArtifactDefinition> deploymentArtifacts = null;
+        if (ComponentTypeEnum.RESOURCE_INSTANCE == componentTypeEnum) {
+            for (ComponentInstance componentInstance : component.getComponentInstances()) {
+                if (componentInstance.getNormalizedName().startsWith("ci")) {
+                    deploymentArtifacts = componentInstance.getDeploymentArtifacts();
+                    break;
+                }
+            }
+        } else {
+            deploymentArtifacts = component.getDeploymentArtifacts();
+        }
+        return deploymentArtifacts;
+    }
+
+    // get deploymentArtifact of asset and artifactType -> generate new artifact that can be updated on the asset
+    protected ArtifactReqDetails getUpdatedArtifact(Map<String, ArtifactDefinition> deploymentArtifacts, String artifactType) throws IOException, Exception {
+        ArtifactReqDetails artifactReqDetails = ElementFactory.getArtifactByType("ci", artifactType, true, true);
+
+        for (String key : deploymentArtifacts.keySet()) {
+            if (key.startsWith("ci")) {
+                artifactReqDetails.setArtifactDisplayName(deploymentArtifacts.get(key).getArtifactDisplayName());
+                artifactReqDetails.setArtifactName(deploymentArtifacts.get(key).getArtifactName());
+                artifactReqDetails.setArtifactLabel(deploymentArtifacts.get(key).getArtifactLabel());
+                break;
+            }
+        }
+        return artifactReqDetails;
+    }
+
+    // Happy flow - get chosen life cycle state, artifact type and asset type
+    // update artifact via external API + check audit & response code
+    // Download artifact via external API + check audit & response code
+    // Check artifact version, uuid & checksusm
+    protected Component updateArtifactOnAssetViaExternalAPI(Component component, ComponentTypeEnum componentTypeEnum, LifeCycleStatesEnum chosenLifeCycleState, String artifactType) throws Exception {
+        RestResponse restResponse = null;
+        int numberOfArtifact = 0;
+        String artifactVersionBeforeUpdate = null;
+        String artifactName = null;
+        String componentVersionBeforeUpdate = null;
+
+        // get updated artifact data
+        ArtifactReqDetails artifactReqDetails = ElementFactory.getArtifactByType("ci", artifactType, true, true);
+        String artifactUUID = null;
+        Map<String, ArtifactDefinition> deploymentArtifacts;
+        deploymentArtifacts = getDeploymentArtifactsOfAsset(component, componentTypeEnum);
+
+        for (String key : deploymentArtifacts.keySet()) {
+            if (key.startsWith("ci")) {
+                artifactName = key;
+                artifactVersionBeforeUpdate = deploymentArtifacts.get(key).getArtifactVersion();
+                artifactUUID = deploymentArtifacts.get(key).getArtifactUUID();
+                artifactReqDetails.setArtifactDisplayName(deploymentArtifacts.get(key).getArtifactDisplayName());
+                artifactReqDetails.setArtifactName(deploymentArtifacts.get(key).getArtifactName());
+                artifactReqDetails.setArtifactLabel(deploymentArtifacts.get(key).getArtifactLabel());
+                break;
+            }
+        }
+
+        component = AtomicOperationUtils.changeComponentState(component, UserRoleEnum.DESIGNER, chosenLifeCycleState, true).getLeft();
+        componentVersionBeforeUpdate = component.getVersion();
+        deploymentArtifacts = getDeploymentArtifactsOfAsset(component, componentTypeEnum);
+        numberOfArtifact = deploymentArtifacts.size();
+
+        // create component/s & upload artifact via external api
+        if (ComponentTypeEnum.RESOURCE_INSTANCE == componentTypeEnum) {
+            restResponse = updateArtifactOfRIIncludingValiditionOfAuditAndResponseCode(component, component.getComponentInstances().get(0), ElementFactory.getDefaultUser(UserRoleEnum.DESIGNER), artifactReqDetails, artifactUUID, 200);
+        } else {
+            restResponse = updateArtifactOfAssetIncludingValiditionOfAuditAndResponseCode(component, ElementFactory.getDefaultUser(UserRoleEnum.DESIGNER), artifactReqDetails, artifactUUID, 200);
+        }
+
+        ArtifactDefinition responseArtifact = ResponseParser.convertArtifactDefinitionResponseToJavaObject(restResponse.getResponse());
+        component = getNewerVersionOfComponent(component, chosenLifeCycleState);
+
+        // Get list of deployment artifact + download them via external API
+        deploymentArtifacts = getDeploymentArtifactsOfAsset(component, componentTypeEnum);
+        Assert.assertEquals(numberOfArtifact, deploymentArtifacts.keySet().size(), "Expected that number of deployment artifact will be same as before.");
+        Assert.assertEquals(String.valueOf((Integer.parseInt(artifactVersionBeforeUpdate) + 1)), deploymentArtifacts.get(artifactName).getArtifactVersion(), "Expected that aftifact version will increase by one.");
+
+        if (chosenLifeCycleState == LifeCycleStatesEnum.CHECKOUT) {
+            Assert.assertEquals(componentVersionBeforeUpdate, component.getVersion(), "Expected that check-out component will not change version number.");
+        } else {
+            Assert.assertEquals(String.format("%.1f", (Double.parseDouble(componentVersionBeforeUpdate) + 0.1)), component.getVersion(), "Expected that non check-out component version will increase by 0.1.");
+        }
+
+        // Download the uploaded artifact via external API
+        downloadResourceDeploymentArtifactExternalAPI(component, deploymentArtifacts.get(responseArtifact.getArtifactLabel()), ElementFactory.getDefaultUser(UserRoleEnum.DESIGNER), artifactReqDetails, componentTypeEnum);
+
+        return component;
+    }
+
+
+    // Update artifact via external API + Check auditing for upload operation + Check response of external API
+    protected RestResponse updateArtifactOfRIIncludingValiditionOfAuditAndResponseCode(Component component, ComponentInstance componentInstance, User sdncModifierDetails, ArtifactReqDetails artifactReqDetails, String artifactUUID, Integer expectedResponseCode) throws Exception {
+        RestResponse restResponse = ArtifactRestUtils.externalAPIUpdateArtifactOfComponentInstanceOnAsset(component, ElementFactory.getDefaultUser(UserRoleEnum.DESIGNER), artifactReqDetails, component.getComponentInstances().get(0), artifactUUID);
+
+        // Check response of external API
+        Integer responseCode = restResponse.getErrorCode();
+        Assert.assertEquals(responseCode, expectedResponseCode, "Response code is not correct.");
+        return restResponse;
+    }
+
+
+    // Update artifact via external API + Check auditing for upload operation + Check response of external API
+    protected RestResponse updateArtifactOfAssetIncludingValiditionOfAuditAndResponseCode(Component component, User sdncModifierDetails, ArtifactReqDetails artifactReqDetails, String artifactUUID, Integer expectedResponseCode) throws Exception {
+        RestResponse restResponse = ArtifactRestUtils.externalAPIUpdateArtifactOfTheAsset(component, ElementFactory.getDefaultUser(UserRoleEnum.DESIGNER), artifactReqDetails, artifactUUID);
+
+        // Check response of external API
+        Integer responseCode = restResponse.getErrorCode();
+        Assert.assertEquals(responseCode, expectedResponseCode, "Response code is not correct.");
+        return restResponse;
+    }
+
+
+    ////////////////////////////////////////////////////////////////////////////////////
+    ////////////////////////////////////////////////////////////////////////////////////
+    ////////////////////////////////////////////////////////////////////////////////////
+    //					Delete External API											  //
+    ////////////////////////////////////////////////////////////////////////////////////
+    ////////////////////////////////////////////////////////////////////////////////////
+    ////////////////////////////////////////////////////////////////////////////////////
+    @DataProvider(name = "deleteArtifactForServiceViaExternalAPI", parallel = true)
+    public static Object[][] dataProviderDeleteArtifactForServiceViaExternalAPI() {
+        return new Object[][]{
+                {LifeCycleStatesEnum.CHECKOUT, ArtifactTypeEnum.YANG_XML.getType()},
+                {LifeCycleStatesEnum.CHECKOUT, ArtifactTypeEnum.VNF_CATALOG.getType()},
+                {LifeCycleStatesEnum.CHECKOUT, ArtifactTypeEnum.MODEL_INVENTORY_PROFILE.getType()},
+                {LifeCycleStatesEnum.CHECKOUT, ArtifactTypeEnum.MODEL_QUERY_SPEC.getType()},
+                {LifeCycleStatesEnum.CHECKOUT, ArtifactTypeEnum.OTHER.getType()},
+                {LifeCycleStatesEnum.CHECKIN, ArtifactTypeEnum.YANG_XML.getType()},
+                {LifeCycleStatesEnum.CHECKIN, ArtifactTypeEnum.VNF_CATALOG.getType()},
+                {LifeCycleStatesEnum.CHECKIN, ArtifactTypeEnum.MODEL_INVENTORY_PROFILE.getType()},
+                {LifeCycleStatesEnum.CHECKIN, ArtifactTypeEnum.MODEL_QUERY_SPEC.getType()},
+                {LifeCycleStatesEnum.CHECKIN, ArtifactTypeEnum.OTHER.getType()},
+                {LifeCycleStatesEnum.CERTIFICATIONREQUEST, ArtifactTypeEnum.YANG_XML.getType()},
+                {LifeCycleStatesEnum.CERTIFICATIONREQUEST, ArtifactTypeEnum.VNF_CATALOG.getType()},
+                {LifeCycleStatesEnum.CERTIFICATIONREQUEST, ArtifactTypeEnum.MODEL_INVENTORY_PROFILE.getType()},
+                {LifeCycleStatesEnum.CERTIFICATIONREQUEST, ArtifactTypeEnum.MODEL_QUERY_SPEC.getType()},
+                {LifeCycleStatesEnum.CERTIFICATIONREQUEST, ArtifactTypeEnum.OTHER.getType()},
+                {LifeCycleStatesEnum.CERTIFY, ArtifactTypeEnum.YANG_XML.getType()},
+                {LifeCycleStatesEnum.CERTIFY, ArtifactTypeEnum.VNF_CATALOG.getType()},
+                {LifeCycleStatesEnum.CERTIFY, ArtifactTypeEnum.MODEL_INVENTORY_PROFILE.getType()},
+                {LifeCycleStatesEnum.CERTIFY, ArtifactTypeEnum.MODEL_QUERY_SPEC.getType()},
+                {LifeCycleStatesEnum.CERTIFY, ArtifactTypeEnum.OTHER.getType()}
+        };
+    }
+
+    // Delete artifact for Service - Success
+    @Test(dataProvider = "deleteArtifactForServiceViaExternalAPI")
+    public void deleteArtifactForServiceViaExternalAPI(LifeCycleStatesEnum lifeCycleStatesEnum, String artifactType) throws Exception {
+        getExtendTest().log(Status.INFO, String.format("lifeCycleStatesEnum: %s, artifactType: %s", lifeCycleStatesEnum, artifactType));
+        Component component = uploadArtifactOnAssetViaExternalAPI(ComponentTypeEnum.SERVICE, LifeCycleStatesEnum.CHECKOUT, artifactType, null);
+        deleteArtifactOnAssetViaExternalAPI(component, ComponentTypeEnum.SERVICE, lifeCycleStatesEnum);
+    }
+
+    @DataProvider(name = "deleteArtifactForVFViaExternalAPI", parallel = true)
+    public static Object[][] dataProviderDeleteArtifactForVFViaExternalAPI() {
+        return new Object[][]{
+                {LifeCycleStatesEnum.CHECKOUT, ArtifactTypeEnum.DCAE_JSON.getType()},
+                {LifeCycleStatesEnum.CHECKOUT, ArtifactTypeEnum.DCAE_POLICY.getType()},
+                {LifeCycleStatesEnum.CHECKOUT, ArtifactTypeEnum.DCAE_EVENT.getType()},
+                {LifeCycleStatesEnum.CHECKOUT, ArtifactTypeEnum.APPC_CONFIG.getType()},
+                {LifeCycleStatesEnum.CHECKOUT, ArtifactTypeEnum.DCAE_DOC.getType()},
+                {LifeCycleStatesEnum.CHECKOUT, ArtifactTypeEnum.DCAE_TOSCA.getType()},
+                {LifeCycleStatesEnum.CHECKOUT, ArtifactTypeEnum.YANG_XML.getType()},
+                {LifeCycleStatesEnum.CHECKOUT, ArtifactTypeEnum.VNF_CATALOG.getType()},
+                {LifeCycleStatesEnum.CHECKOUT, ArtifactTypeEnum.VF_LICENSE.getType()},
+                {LifeCycleStatesEnum.CHECKOUT, ArtifactTypeEnum.VENDOR_LICENSE.getType()},
+                {LifeCycleStatesEnum.CHECKOUT, ArtifactTypeEnum.MODEL_INVENTORY_PROFILE.getType()},
+                {LifeCycleStatesEnum.CHECKOUT, ArtifactTypeEnum.MODEL_QUERY_SPEC.getType()},
+                {LifeCycleStatesEnum.CHECKOUT, ArtifactTypeEnum.OTHER.getType()},
+
+                {LifeCycleStatesEnum.CHECKIN, ArtifactTypeEnum.DCAE_JSON.getType()},
+                {LifeCycleStatesEnum.CHECKIN, ArtifactTypeEnum.DCAE_POLICY.getType()},
+                {LifeCycleStatesEnum.CHECKIN, ArtifactTypeEnum.DCAE_EVENT.getType()},
+                {LifeCycleStatesEnum.CHECKIN, ArtifactTypeEnum.APPC_CONFIG.getType()},
+                {LifeCycleStatesEnum.CHECKIN, ArtifactTypeEnum.DCAE_DOC.getType()},
+                {LifeCycleStatesEnum.CHECKIN, ArtifactTypeEnum.DCAE_TOSCA.getType()},
+                {LifeCycleStatesEnum.CHECKIN, ArtifactTypeEnum.YANG_XML.getType()},
+                {LifeCycleStatesEnum.CHECKIN, ArtifactTypeEnum.VNF_CATALOG.getType()},
+                {LifeCycleStatesEnum.CHECKIN, ArtifactTypeEnum.VF_LICENSE.getType()},
+                {LifeCycleStatesEnum.CHECKIN, ArtifactTypeEnum.VENDOR_LICENSE.getType()},
+                {LifeCycleStatesEnum.CHECKIN, ArtifactTypeEnum.MODEL_INVENTORY_PROFILE.getType()},
+                {LifeCycleStatesEnum.CHECKIN, ArtifactTypeEnum.MODEL_QUERY_SPEC.getType()},
+                {LifeCycleStatesEnum.CHECKIN, ArtifactTypeEnum.OTHER.getType()},
+        };
+    }
+
+    // Delete artifact for VF - Success
+    @Test(dataProvider = "deleteArtifactForVFViaExternalAPI")
+    public void deleteArtifactForVFViaExternalAPI(LifeCycleStatesEnum lifeCycleStatesEnum, String artifactType) throws Exception {
+        getExtendTest().log(Status.INFO, String.format("lifeCycleStatesEnum: %s, artifactType: %s", lifeCycleStatesEnum, artifactType));
+        Component component = uploadArtifactOnAssetViaExternalAPI(ComponentTypeEnum.RESOURCE, LifeCycleStatesEnum.CHECKOUT, artifactType, null);
+        deleteArtifactOnAssetViaExternalAPI(component, ComponentTypeEnum.RESOURCE, lifeCycleStatesEnum);
+    }
+
+    @DataProvider(name = "deleteArtifactForVfcVlCpViaExternalAPI", parallel = true)
+    public static Object[][] dataProviderDeleteArtifactForVfcVlCpViaExternalAPI() {
+        return new Object[][]{
+                {LifeCycleStatesEnum.CHECKOUT, ArtifactTypeEnum.YANG_XML.getType(), ResourceTypeEnum.VFC},
+                {LifeCycleStatesEnum.CHECKOUT, ArtifactTypeEnum.VNF_CATALOG.getType(), ResourceTypeEnum.VFC},
+                {LifeCycleStatesEnum.CHECKOUT, ArtifactTypeEnum.VF_LICENSE.getType(), ResourceTypeEnum.VFC},
+                {LifeCycleStatesEnum.CHECKOUT, ArtifactTypeEnum.VENDOR_LICENSE.getType(), ResourceTypeEnum.VFC},
+                {LifeCycleStatesEnum.CHECKOUT, ArtifactTypeEnum.MODEL_INVENTORY_PROFILE.getType(), ResourceTypeEnum.VFC},
+                {LifeCycleStatesEnum.CHECKOUT, ArtifactTypeEnum.MODEL_QUERY_SPEC.getType(), ResourceTypeEnum.VFC},
+                {LifeCycleStatesEnum.CHECKOUT, ArtifactTypeEnum.OTHER.getType(), ResourceTypeEnum.VFC},
+                {LifeCycleStatesEnum.CHECKOUT, ArtifactTypeEnum.SNMP_POLL.getType(), ResourceTypeEnum.VFC},
+                {LifeCycleStatesEnum.CHECKOUT, ArtifactTypeEnum.SNMP_TRAP.getType(), ResourceTypeEnum.VFC},
+
+                {LifeCycleStatesEnum.CHECKOUT, ArtifactTypeEnum.YANG_XML.getType(), ResourceTypeEnum.VL},
+                {LifeCycleStatesEnum.CHECKOUT, ArtifactTypeEnum.VNF_CATALOG.getType(), ResourceTypeEnum.VL},
+                {LifeCycleStatesEnum.CHECKOUT, ArtifactTypeEnum.VF_LICENSE.getType(), ResourceTypeEnum.VL},
+                {LifeCycleStatesEnum.CHECKOUT, ArtifactTypeEnum.VENDOR_LICENSE.getType(), ResourceTypeEnum.VL},
+                {LifeCycleStatesEnum.CHECKOUT, ArtifactTypeEnum.MODEL_INVENTORY_PROFILE.getType(), ResourceTypeEnum.VL},
+                {LifeCycleStatesEnum.CHECKOUT, ArtifactTypeEnum.MODEL_QUERY_SPEC.getType(), ResourceTypeEnum.VL},
+                {LifeCycleStatesEnum.CHECKOUT, ArtifactTypeEnum.OTHER.getType(), ResourceTypeEnum.VL},
+                {LifeCycleStatesEnum.CHECKOUT, ArtifactTypeEnum.SNMP_POLL.getType(), ResourceTypeEnum.VL},
+                {LifeCycleStatesEnum.CHECKOUT, ArtifactTypeEnum.SNMP_TRAP.getType(), ResourceTypeEnum.VL},
+
+                {LifeCycleStatesEnum.CHECKOUT, ArtifactTypeEnum.YANG_XML.getType(), ResourceTypeEnum.CP},
+                {LifeCycleStatesEnum.CHECKOUT, ArtifactTypeEnum.VNF_CATALOG.getType(), ResourceTypeEnum.CP},
+                {LifeCycleStatesEnum.CHECKOUT, ArtifactTypeEnum.VF_LICENSE.getType(), ResourceTypeEnum.CP},
+                {LifeCycleStatesEnum.CHECKOUT, ArtifactTypeEnum.VENDOR_LICENSE.getType(), ResourceTypeEnum.CP},
+                {LifeCycleStatesEnum.CHECKOUT, ArtifactTypeEnum.MODEL_INVENTORY_PROFILE.getType(), ResourceTypeEnum.CP},
+                {LifeCycleStatesEnum.CHECKOUT, ArtifactTypeEnum.MODEL_QUERY_SPEC.getType(), ResourceTypeEnum.CP},
+                {LifeCycleStatesEnum.CHECKOUT, ArtifactTypeEnum.OTHER.getType(), ResourceTypeEnum.CP},
+                {LifeCycleStatesEnum.CHECKOUT, ArtifactTypeEnum.SNMP_POLL.getType(), ResourceTypeEnum.CP},
+                {LifeCycleStatesEnum.CHECKOUT, ArtifactTypeEnum.SNMP_TRAP.getType(), ResourceTypeEnum.CP},
+
+                {LifeCycleStatesEnum.CHECKIN, ArtifactTypeEnum.YANG_XML.getType(), ResourceTypeEnum.VFC},
+                {LifeCycleStatesEnum.CHECKIN, ArtifactTypeEnum.VNF_CATALOG.getType(), ResourceTypeEnum.VFC},
+                {LifeCycleStatesEnum.CHECKIN, ArtifactTypeEnum.VF_LICENSE.getType(), ResourceTypeEnum.VFC},
+                {LifeCycleStatesEnum.CHECKIN, ArtifactTypeEnum.VENDOR_LICENSE.getType(), ResourceTypeEnum.VFC},
+                {LifeCycleStatesEnum.CHECKIN, ArtifactTypeEnum.MODEL_INVENTORY_PROFILE.getType(), ResourceTypeEnum.VFC},
+                {LifeCycleStatesEnum.CHECKIN, ArtifactTypeEnum.MODEL_QUERY_SPEC.getType(), ResourceTypeEnum.VFC},
+                {LifeCycleStatesEnum.CHECKIN, ArtifactTypeEnum.OTHER.getType(), ResourceTypeEnum.VFC},
+                {LifeCycleStatesEnum.CHECKIN, ArtifactTypeEnum.SNMP_POLL.getType(), ResourceTypeEnum.VFC},
+                {LifeCycleStatesEnum.CHECKIN, ArtifactTypeEnum.SNMP_TRAP.getType(), ResourceTypeEnum.VFC},
+
+                {LifeCycleStatesEnum.CHECKIN, ArtifactTypeEnum.YANG_XML.getType(), ResourceTypeEnum.VL},
+                {LifeCycleStatesEnum.CHECKIN, ArtifactTypeEnum.VNF_CATALOG.getType(), ResourceTypeEnum.VL},
+                {LifeCycleStatesEnum.CHECKIN, ArtifactTypeEnum.VF_LICENSE.getType(), ResourceTypeEnum.VL},
+                {LifeCycleStatesEnum.CHECKIN, ArtifactTypeEnum.VENDOR_LICENSE.getType(), ResourceTypeEnum.VL},
+                {LifeCycleStatesEnum.CHECKIN, ArtifactTypeEnum.MODEL_INVENTORY_PROFILE.getType(), ResourceTypeEnum.VL},
+                {LifeCycleStatesEnum.CHECKIN, ArtifactTypeEnum.MODEL_QUERY_SPEC.getType(), ResourceTypeEnum.VL},
+                {LifeCycleStatesEnum.CHECKIN, ArtifactTypeEnum.OTHER.getType(), ResourceTypeEnum.VL},
+                {LifeCycleStatesEnum.CHECKIN, ArtifactTypeEnum.SNMP_POLL.getType(), ResourceTypeEnum.VL},
+                {LifeCycleStatesEnum.CHECKIN, ArtifactTypeEnum.SNMP_TRAP.getType(), ResourceTypeEnum.VL},
+
+                {LifeCycleStatesEnum.CHECKIN, ArtifactTypeEnum.YANG_XML.getType(), ResourceTypeEnum.CP},
+                {LifeCycleStatesEnum.CHECKIN, ArtifactTypeEnum.VNF_CATALOG.getType(), ResourceTypeEnum.CP},
+                {LifeCycleStatesEnum.CHECKIN, ArtifactTypeEnum.VF_LICENSE.getType(), ResourceTypeEnum.CP},
+                {LifeCycleStatesEnum.CHECKIN, ArtifactTypeEnum.VENDOR_LICENSE.getType(), ResourceTypeEnum.CP},
+                {LifeCycleStatesEnum.CHECKIN, ArtifactTypeEnum.MODEL_INVENTORY_PROFILE.getType(), ResourceTypeEnum.CP},
+                {LifeCycleStatesEnum.CHECKIN, ArtifactTypeEnum.MODEL_QUERY_SPEC.getType(), ResourceTypeEnum.CP},
+                {LifeCycleStatesEnum.CHECKIN, ArtifactTypeEnum.OTHER.getType(), ResourceTypeEnum.CP},
+                {LifeCycleStatesEnum.CHECKIN, ArtifactTypeEnum.SNMP_POLL.getType(), ResourceTypeEnum.CP},
+                {LifeCycleStatesEnum.CHECKIN, ArtifactTypeEnum.SNMP_TRAP.getType(), ResourceTypeEnum.CP},
+        };
+    }
+
+    // Delete artifact for VFC, VL, CP - Success
+    @Test(dataProvider = "deleteArtifactForVfcVlCpViaExternalAPI")
+    public void deleteArtifactForVfcVlCpViaExternalAPI(LifeCycleStatesEnum lifeCycleStatesEnum, String artifactType, ResourceTypeEnum resourceTypeEnum) throws Exception {
+        getExtendTest().log(Status.INFO, String.format("lifeCycleStatesEnum: %s, artifactType: %s, resourceTypeEnum: %s", lifeCycleStatesEnum, artifactType, resourceTypeEnum));
+        Component component = uploadArtifactOnAssetViaExternalAPI(ComponentTypeEnum.RESOURCE, LifeCycleStatesEnum.CHECKOUT, artifactType, resourceTypeEnum);
+        deleteArtifactOnAssetViaExternalAPI(component, ComponentTypeEnum.RESOURCE, lifeCycleStatesEnum);
+    }
+
+    @DataProvider(name = "deleteArtifactOnRIViaExternalAPI", parallel = true)
+    public static Object[][] dataProviderDeleteArtifactOnRIViaExternalAPI() {
+        return new Object[][]{
+                {LifeCycleStatesEnum.CHECKOUT, ArtifactTypeEnum.DCAE_INVENTORY_TOSCA.getType(), null},
+                {LifeCycleStatesEnum.CHECKOUT, ArtifactTypeEnum.DCAE_INVENTORY_JSON.getType(), null},
+                {LifeCycleStatesEnum.CHECKOUT, ArtifactTypeEnum.DCAE_INVENTORY_POLICY.getType(), null},
+                {LifeCycleStatesEnum.CHECKOUT, ArtifactTypeEnum.DCAE_INVENTORY_DOC.getType(), null},
+                {LifeCycleStatesEnum.CHECKOUT, ArtifactTypeEnum.DCAE_INVENTORY_BLUEPRINT.getType(), null},
+                {LifeCycleStatesEnum.CHECKOUT, ArtifactTypeEnum.DCAE_INVENTORY_EVENT.getType(), null},
+
+                {LifeCycleStatesEnum.CHECKIN, ArtifactTypeEnum.DCAE_INVENTORY_TOSCA.getType(), null},
+                {LifeCycleStatesEnum.CHECKIN, ArtifactTypeEnum.DCAE_INVENTORY_JSON.getType(), null},
+                {LifeCycleStatesEnum.CHECKIN, ArtifactTypeEnum.DCAE_INVENTORY_POLICY.getType(), null},
+                {LifeCycleStatesEnum.CHECKIN, ArtifactTypeEnum.DCAE_INVENTORY_DOC.getType(), null},
+                {LifeCycleStatesEnum.CHECKIN, ArtifactTypeEnum.DCAE_INVENTORY_BLUEPRINT.getType(), null},
+                {LifeCycleStatesEnum.CHECKIN, ArtifactTypeEnum.DCAE_INVENTORY_EVENT.getType(), null},
+
+        };
+    }
+
+
+    @Test(dataProvider = "deleteArtifactOnRIViaExternalAPI")
+    public void deleteArtifactOnRIViaExternalAPI(LifeCycleStatesEnum chosenLifeCycleState, String artifactType, ResourceTypeEnum resourceTypeEnum) throws Exception {
+        getExtendTest().log(Status.INFO, String.format("chosenLifeCycleState: %s, artifactType: %s", chosenLifeCycleState, artifactType));
+        Component component = uploadArtifactOnAssetViaExternalAPI(ComponentTypeEnum.RESOURCE_INSTANCE, LifeCycleStatesEnum.CHECKOUT, artifactType, resourceTypeEnum);
+        deleteArtifactOnAssetViaExternalAPI(component, ComponentTypeEnum.RESOURCE_INSTANCE, chosenLifeCycleState);
+    }
+
+    @DataProvider(name = "deleteArtifactOnVfcVlCpRIViaExternalAPI", parallel = true)
+    public static Object[][] dataProviderDeleteArtifactOnVfcVlCpRIViaExternalAPI() {
+        return new Object[][]{
+                {LifeCycleStatesEnum.CHECKOUT, ArtifactTypeEnum.DCAE_INVENTORY_TOSCA.getType(), ResourceTypeEnum.VFC},
+                {LifeCycleStatesEnum.CHECKOUT, ArtifactTypeEnum.DCAE_INVENTORY_JSON.getType(), ResourceTypeEnum.VFC},
+                {LifeCycleStatesEnum.CHECKOUT, ArtifactTypeEnum.DCAE_INVENTORY_POLICY.getType(), ResourceTypeEnum.VFC},
+                {LifeCycleStatesEnum.CHECKOUT, ArtifactTypeEnum.DCAE_INVENTORY_DOC.getType(), ResourceTypeEnum.VFC},
+                {LifeCycleStatesEnum.CHECKOUT, ArtifactTypeEnum.DCAE_INVENTORY_BLUEPRINT.getType(), ResourceTypeEnum.VFC},
+                {LifeCycleStatesEnum.CHECKOUT, ArtifactTypeEnum.DCAE_INVENTORY_EVENT.getType(), ResourceTypeEnum.VFC},
+                {LifeCycleStatesEnum.CHECKOUT, ArtifactTypeEnum.SNMP_POLL.getType(), ResourceTypeEnum.VFC},
+                {LifeCycleStatesEnum.CHECKOUT, ArtifactTypeEnum.SNMP_TRAP.getType(), ResourceTypeEnum.VFC},
+
+
+                {LifeCycleStatesEnum.CHECKOUT, ArtifactTypeEnum.DCAE_INVENTORY_TOSCA.getType(), ResourceTypeEnum.VL},
+                {LifeCycleStatesEnum.CHECKOUT, ArtifactTypeEnum.DCAE_INVENTORY_JSON.getType(), ResourceTypeEnum.VL},
+                {LifeCycleStatesEnum.CHECKOUT, ArtifactTypeEnum.DCAE_INVENTORY_POLICY.getType(), ResourceTypeEnum.VL},
+                {LifeCycleStatesEnum.CHECKOUT, ArtifactTypeEnum.DCAE_INVENTORY_DOC.getType(), ResourceTypeEnum.VL},
+                {LifeCycleStatesEnum.CHECKOUT, ArtifactTypeEnum.DCAE_INVENTORY_BLUEPRINT.getType(), ResourceTypeEnum.VL},
+                {LifeCycleStatesEnum.CHECKOUT, ArtifactTypeEnum.DCAE_INVENTORY_EVENT.getType(), ResourceTypeEnum.VL},
+                {LifeCycleStatesEnum.CHECKOUT, ArtifactTypeEnum.SNMP_POLL.getType(), ResourceTypeEnum.VL},
+                {LifeCycleStatesEnum.CHECKOUT, ArtifactTypeEnum.SNMP_TRAP.getType(), ResourceTypeEnum.VL},
+
+                {LifeCycleStatesEnum.CHECKOUT, ArtifactTypeEnum.DCAE_INVENTORY_TOSCA.getType(), ResourceTypeEnum.CP},
+                {LifeCycleStatesEnum.CHECKOUT, ArtifactTypeEnum.DCAE_INVENTORY_JSON.getType(), ResourceTypeEnum.CP,},
+                {LifeCycleStatesEnum.CHECKOUT, ArtifactTypeEnum.DCAE_INVENTORY_POLICY.getType(), ResourceTypeEnum.CP},
+                {LifeCycleStatesEnum.CHECKOUT, ArtifactTypeEnum.DCAE_INVENTORY_DOC.getType(), ResourceTypeEnum.CP},
+                {LifeCycleStatesEnum.CHECKOUT, ArtifactTypeEnum.DCAE_INVENTORY_BLUEPRINT.getType(), ResourceTypeEnum.CP},
+                {LifeCycleStatesEnum.CHECKOUT, ArtifactTypeEnum.DCAE_INVENTORY_EVENT.getType(), ResourceTypeEnum.CP},
+                {LifeCycleStatesEnum.CHECKOUT, ArtifactTypeEnum.SNMP_POLL.getType(), ResourceTypeEnum.CP},
+                {LifeCycleStatesEnum.CHECKOUT, ArtifactTypeEnum.SNMP_TRAP.getType(), ResourceTypeEnum.CP},
+
+
+                {LifeCycleStatesEnum.CHECKIN, ArtifactTypeEnum.DCAE_INVENTORY_TOSCA.getType(), ResourceTypeEnum.VFC},
+                {LifeCycleStatesEnum.CHECKIN, ArtifactTypeEnum.DCAE_INVENTORY_JSON.getType(), ResourceTypeEnum.VFC},
+                {LifeCycleStatesEnum.CHECKIN, ArtifactTypeEnum.DCAE_INVENTORY_POLICY.getType(), ResourceTypeEnum.VFC},
+                {LifeCycleStatesEnum.CHECKIN, ArtifactTypeEnum.DCAE_INVENTORY_DOC.getType(), ResourceTypeEnum.VFC},
+                {LifeCycleStatesEnum.CHECKIN, ArtifactTypeEnum.DCAE_INVENTORY_BLUEPRINT.getType(), ResourceTypeEnum.VFC},
+                {LifeCycleStatesEnum.CHECKIN, ArtifactTypeEnum.DCAE_INVENTORY_EVENT.getType(), ResourceTypeEnum.VFC},
+                {LifeCycleStatesEnum.CHECKIN, ArtifactTypeEnum.SNMP_POLL.getType(), ResourceTypeEnum.VFC},
+                {LifeCycleStatesEnum.CHECKIN, ArtifactTypeEnum.SNMP_TRAP.getType(), ResourceTypeEnum.VFC},
+
+                {LifeCycleStatesEnum.CHECKIN, ArtifactTypeEnum.DCAE_INVENTORY_TOSCA.getType(), ResourceTypeEnum.VL},
+                {LifeCycleStatesEnum.CHECKIN, ArtifactTypeEnum.DCAE_INVENTORY_JSON.getType(), ResourceTypeEnum.VL},
+                {LifeCycleStatesEnum.CHECKIN, ArtifactTypeEnum.DCAE_INVENTORY_POLICY.getType(), ResourceTypeEnum.VL},
+                {LifeCycleStatesEnum.CHECKIN, ArtifactTypeEnum.DCAE_INVENTORY_DOC.getType(), ResourceTypeEnum.VL},
+                {LifeCycleStatesEnum.CHECKIN, ArtifactTypeEnum.DCAE_INVENTORY_BLUEPRINT.getType(), ResourceTypeEnum.VL},
+                {LifeCycleStatesEnum.CHECKIN, ArtifactTypeEnum.DCAE_INVENTORY_EVENT.getType(), ResourceTypeEnum.VL},
+                {LifeCycleStatesEnum.CHECKIN, ArtifactTypeEnum.SNMP_POLL.getType(), ResourceTypeEnum.VL},
+                {LifeCycleStatesEnum.CHECKIN, ArtifactTypeEnum.SNMP_TRAP.getType(), ResourceTypeEnum.VL},
+
+                {LifeCycleStatesEnum.CHECKIN, ArtifactTypeEnum.DCAE_INVENTORY_TOSCA.getType(), ResourceTypeEnum.CP},
+                {LifeCycleStatesEnum.CHECKIN, ArtifactTypeEnum.DCAE_INVENTORY_JSON.getType(), ResourceTypeEnum.CP},
+                {LifeCycleStatesEnum.CHECKIN, ArtifactTypeEnum.DCAE_INVENTORY_POLICY.getType(), ResourceTypeEnum.CP},
+                {LifeCycleStatesEnum.CHECKIN, ArtifactTypeEnum.DCAE_INVENTORY_DOC.getType(), ResourceTypeEnum.CP},
+                {LifeCycleStatesEnum.CHECKIN, ArtifactTypeEnum.DCAE_INVENTORY_BLUEPRINT.getType(), ResourceTypeEnum.CP},
+                {LifeCycleStatesEnum.CHECKIN, ArtifactTypeEnum.DCAE_INVENTORY_EVENT.getType(), ResourceTypeEnum.CP},
+                {LifeCycleStatesEnum.CHECKIN, ArtifactTypeEnum.SNMP_POLL.getType(), ResourceTypeEnum.CP},
+                {LifeCycleStatesEnum.CHECKIN, ArtifactTypeEnum.SNMP_TRAP.getType(), ResourceTypeEnum.CP},
+        };
+    }
+
+    @Test(dataProvider = "deleteArtifactOnVfcVlCpRIViaExternalAPI")
+    public void deleteArtifactOnVfcVlCpRIViaExternalAPI(LifeCycleStatesEnum chosenLifeCycleState, String artifactType, ResourceTypeEnum resourceTypeEnum) throws Exception {
+        getExtendTest().log(Status.INFO, String.format("chosenLifeCycleState: %s, artifactType: %s", chosenLifeCycleState, artifactType));
+        Component component = uploadArtifactOnAssetViaExternalAPI(ComponentTypeEnum.RESOURCE_INSTANCE, LifeCycleStatesEnum.CHECKOUT, artifactType, resourceTypeEnum);
+        deleteArtifactOnAssetViaExternalAPI(component, ComponentTypeEnum.RESOURCE_INSTANCE, chosenLifeCycleState);
+    }
+
+    @DataProvider(name = "deleteArtifactOnVFViaExternalAPIByDiffrentUserThenCreatorOfAsset", parallel = true)
+    public static Object[][] dataProviderDeleteArtifactOnVFViaExternalAPIByDiffrentUserThenCreatorOfAsset() {
+        return new Object[][]{
+                {ComponentTypeEnum.RESOURCE, UserRoleEnum.ADMIN, LifeCycleStatesEnum.CHECKOUT, ArtifactTypeEnum.OTHER.getType()},
+                {ComponentTypeEnum.SERVICE, UserRoleEnum.ADMIN, LifeCycleStatesEnum.CHECKOUT, ArtifactTypeEnum.OTHER.getType()},
+                {ComponentTypeEnum.RESOURCE_INSTANCE, UserRoleEnum.ADMIN, LifeCycleStatesEnum.CHECKOUT, ArtifactTypeEnum.DCAE_INVENTORY_TOSCA.getType()},
+
+                {ComponentTypeEnum.RESOURCE, UserRoleEnum.TESTER, LifeCycleStatesEnum.CHECKIN, ArtifactTypeEnum.OTHER.getType()},
+                {ComponentTypeEnum.SERVICE, UserRoleEnum.TESTER, LifeCycleStatesEnum.CHECKIN, ArtifactTypeEnum.OTHER.getType()},
+                {ComponentTypeEnum.RESOURCE_INSTANCE, UserRoleEnum.TESTER, LifeCycleStatesEnum.CHECKIN, ArtifactTypeEnum.DCAE_INVENTORY_TOSCA.getType()},
+                {ComponentTypeEnum.RESOURCE, UserRoleEnum.TESTER, LifeCycleStatesEnum.CHECKOUT, ArtifactTypeEnum.OTHER.getType()},
+                {ComponentTypeEnum.SERVICE, UserRoleEnum.TESTER, LifeCycleStatesEnum.CHECKOUT, ArtifactTypeEnum.OTHER.getType()},
+                {ComponentTypeEnum.RESOURCE_INSTANCE, UserRoleEnum.TESTER, LifeCycleStatesEnum.CHECKOUT, ArtifactTypeEnum.DCAE_INVENTORY_TOSCA.getType()},
+
+                {ComponentTypeEnum.RESOURCE, UserRoleEnum.ADMIN, LifeCycleStatesEnum.CHECKIN, ArtifactTypeEnum.OTHER.getType()},
+                {ComponentTypeEnum.SERVICE, UserRoleEnum.ADMIN, LifeCycleStatesEnum.CHECKIN, ArtifactTypeEnum.OTHER.getType()},
+                {ComponentTypeEnum.RESOURCE_INSTANCE, UserRoleEnum.ADMIN, LifeCycleStatesEnum.CHECKIN, ArtifactTypeEnum.DCAE_INVENTORY_TOSCA.getType()},
+                {ComponentTypeEnum.RESOURCE, UserRoleEnum.ADMIN, LifeCycleStatesEnum.CHECKOUT, ArtifactTypeEnum.OTHER.getType()},
+                {ComponentTypeEnum.SERVICE, UserRoleEnum.ADMIN, LifeCycleStatesEnum.CHECKOUT, ArtifactTypeEnum.OTHER.getType()},
+                {ComponentTypeEnum.RESOURCE_INSTANCE, UserRoleEnum.ADMIN, LifeCycleStatesEnum.CHECKOUT, ArtifactTypeEnum.DCAE_INVENTORY_TOSCA.getType()},
+
+                {ComponentTypeEnum.RESOURCE, UserRoleEnum.OPS, LifeCycleStatesEnum.CHECKIN, ArtifactTypeEnum.OTHER.getType()},
+                {ComponentTypeEnum.SERVICE, UserRoleEnum.OPS, LifeCycleStatesEnum.CHECKIN, ArtifactTypeEnum.OTHER.getType()},
+                {ComponentTypeEnum.RESOURCE_INSTANCE, UserRoleEnum.OPS, LifeCycleStatesEnum.CHECKIN, ArtifactTypeEnum.DCAE_INVENTORY_TOSCA.getType()},
+                {ComponentTypeEnum.RESOURCE, UserRoleEnum.OPS, LifeCycleStatesEnum.CHECKOUT, ArtifactTypeEnum.OTHER.getType()},
+                {ComponentTypeEnum.SERVICE, UserRoleEnum.OPS, LifeCycleStatesEnum.CHECKOUT, ArtifactTypeEnum.OTHER.getType()},
+                {ComponentTypeEnum.RESOURCE_INSTANCE, UserRoleEnum.OPS, LifeCycleStatesEnum.CHECKOUT, ArtifactTypeEnum.DCAE_INVENTORY_TOSCA.getType()},
+
+                {ComponentTypeEnum.RESOURCE, UserRoleEnum.GOVERNOR, LifeCycleStatesEnum.CHECKIN, ArtifactTypeEnum.OTHER.getType()},
+                {ComponentTypeEnum.SERVICE, UserRoleEnum.GOVERNOR, LifeCycleStatesEnum.CHECKIN, ArtifactTypeEnum.OTHER.getType()},
+                {ComponentTypeEnum.RESOURCE_INSTANCE, UserRoleEnum.GOVERNOR, LifeCycleStatesEnum.CHECKIN, ArtifactTypeEnum.DCAE_INVENTORY_TOSCA.getType()},
+                {ComponentTypeEnum.RESOURCE, UserRoleEnum.GOVERNOR, LifeCycleStatesEnum.CHECKOUT, ArtifactTypeEnum.OTHER.getType()},
+                {ComponentTypeEnum.SERVICE, UserRoleEnum.GOVERNOR, LifeCycleStatesEnum.CHECKOUT, ArtifactTypeEnum.OTHER.getType()},
+                {ComponentTypeEnum.RESOURCE_INSTANCE, UserRoleEnum.GOVERNOR, LifeCycleStatesEnum.CHECKOUT, ArtifactTypeEnum.DCAE_INVENTORY_TOSCA.getType()},
+        };
+    }
+
+    // External API
+    // Delete artifact by different user then creator of asset - Fail
+    @Test(dataProvider = "deleteArtifactOnVFViaExternalAPIByDiffrentUserThenCreatorOfAsset")
+    public void deleteArtifactOnVFViaExternalAPIByDiffrentUserThenCreatorOfAsset(ComponentTypeEnum componentTypeEnum, UserRoleEnum userRoleEnum, LifeCycleStatesEnum lifeCycleStatesEnum, String artifactType) throws Exception {
+        getExtendTest().log(Status.INFO, String.format("componentTypeEnum: %s, userRoleEnum %s, lifeCycleStatesEnum %s, artifactType: %s", componentTypeEnum, userRoleEnum, lifeCycleStatesEnum, artifactType));
+        Component component = uploadArtifactOnAssetViaExternalAPI(componentTypeEnum, lifeCycleStatesEnum, artifactType, null);
+        Map<String, ArtifactDefinition> deploymentArtifacts = getDeploymentArtifactsOfAsset(component, componentTypeEnum);
+
+        String artifactUUID = null;
+        for (String key : deploymentArtifacts.keySet()) {
+            if (key.startsWith("ci")) {
+                artifactUUID = deploymentArtifacts.get(key).getArtifactUUID();
+                break;
+            }
+        }
+
+        ErrorInfo errorInfo = ErrorValidationUtils.parseErrorConfigYaml(ActionStatus.RESTRICTED_OPERATION.name());
+        List<String> variables = asList();
+
+        if (componentTypeEnum.equals(ComponentTypeEnum.RESOURCE_INSTANCE)) {
+            deleteArtifactOfAssetIncludingValiditionOfAuditAndResponseCode(component, ElementFactory.getDefaultUser(userRoleEnum),
+                    component.getComponentInstances().get(0), artifactUUID, errorInfo, variables, lifeCycleStatesEnum, true);
+        } else {
+            deleteArtifactOfAssetIncludingValiditionOfAuditAndResponseCode(component, ElementFactory.getDefaultUser(userRoleEnum),
+                    null, artifactUUID, errorInfo, variables, lifeCycleStatesEnum, true);
+        }
+
+        //TODO
+//		downloadResourceDeploymentArtifactExternalAPI(component, ElementFactory.getDefaultUser(UserRoleEnum.DESIGNER), artifactUUID, componentTypeEnum);
+    }
+
+
+    @DataProvider(name = "deleteArtifactOnAssetWhichNotExist", parallel = true)
+    public static Object[][] dataProviderDeleteArtifactOnAssetWhichNotExist() {
+        return new Object[][]{
+                {ComponentTypeEnum.SERVICE, ArtifactTypeEnum.OTHER.getType(), null},
+                {ComponentTypeEnum.RESOURCE, ArtifactTypeEnum.OTHER.getType(), null},
+                {ComponentTypeEnum.RESOURCE_INSTANCE, ArtifactTypeEnum.DCAE_INVENTORY_TOSCA.getType(), ResourceTypeEnum.VF},
+        };
+    }
+
+    // External API
+    // Upload artifact on VF via external API - happy flow
+    @Test(dataProvider = "deleteArtifactOnAssetWhichNotExist")
+    public void deleteArtifactOnAssetWhichNotExist(ComponentTypeEnum componentTypeEnum, String artifactType, ResourceTypeEnum resourceTypeEnum) throws Exception {
+        getExtendTest().log(Status.INFO, String.format("componentTypeEnum: %s, artifactType: %s", componentTypeEnum, artifactType));
+        Component component = uploadArtifactOnAssetViaExternalAPI(componentTypeEnum, LifeCycleStatesEnum.CHECKIN, artifactType, resourceTypeEnum);
+
+        Map<String, ArtifactDefinition> deploymentArtifacts = getDeploymentArtifactsOfAsset(component, componentTypeEnum);
+
+        String artifactUUID = null;
+        for (String key : deploymentArtifacts.keySet()) {
+            if (key.startsWith("ci")) {
+                artifactUUID = deploymentArtifacts.get(key).getArtifactUUID();
+                break;
+            }
+        }
+
+        // Invalid artifactUUID
+        String invalidArtifactUUID = "12341234-1234-1234-1234-123412341234";
+        ErrorInfo errorInfo = ErrorValidationUtils.parseErrorConfigYaml(ActionStatus.ARTIFACT_NOT_FOUND.name());
+        List<String> variables = asList(invalidArtifactUUID);
+
+        if (componentTypeEnum.equals(ComponentTypeEnum.RESOURCE_INSTANCE)) {
+            deleteArtifactOfAssetIncludingValiditionOfAuditAndResponseCode(component, ElementFactory.getDefaultUser(UserRoleEnum.DESIGNER),
+                    component.getComponentInstances().get(0), invalidArtifactUUID, errorInfo, variables, null, true);
+        } else {
+            deleteArtifactOfAssetIncludingValiditionOfAuditAndResponseCode(component, ElementFactory.getDefaultUser(UserRoleEnum.DESIGNER),
+                    null, invalidArtifactUUID, errorInfo, variables, null, true);
+
+        }
+        // Invalid componentUUID
+        if (componentTypeEnum.equals(ComponentTypeEnum.RESOURCE_INSTANCE)) {
+            component.getComponentInstances().get(0).setNormalizedName("invalidNormalizedName");
+            errorInfo = ErrorValidationUtils.parseErrorConfigYaml(ActionStatus.COMPONENT_INSTANCE_NOT_FOUND_ON_CONTAINER.name());
+            variables = asList("invalidNormalizedName", ComponentTypeEnum.RESOURCE_INSTANCE.getValue().toLowerCase(), ComponentTypeEnum.SERVICE.getValue(), component.getName());
+            deleteArtifactOfAssetIncludingValiditionOfAuditAndResponseCode(component, ElementFactory.getDefaultUser(UserRoleEnum.DESIGNER),
+                    component.getComponentInstances().get(0), artifactUUID, errorInfo, variables, LifeCycleStatesEnum.CHECKIN, true);
+        } else {
+            component.setUUID("invalidComponentUUID");
+            if (componentTypeEnum.equals(ComponentTypeEnum.RESOURCE)) {
+                errorInfo = ErrorValidationUtils.parseErrorConfigYaml(ActionStatus.RESOURCE_NOT_FOUND.name());
+            } else {
+                errorInfo = ErrorValidationUtils.parseErrorConfigYaml(ActionStatus.SERVICE_NOT_FOUND.name());
+            }
+            variables = asList("invalidComponentUUID");
+            deleteArtifactOfAssetIncludingValiditionOfAuditAndResponseCode(component, ElementFactory.getDefaultUser(UserRoleEnum.DESIGNER),
+                    null, artifactUUID, errorInfo, variables, LifeCycleStatesEnum.CHECKIN, false);
+        }
+
+    }
+
+    @DataProvider(name = "deleteArtifactOnAssetWhichInInvalidStateForUploading", parallel = true)
+    public static Object[][] dataProviderDeleteArtifactOnAssetWhichInInvalidStateForUploading() {
+        return new Object[][]{
+                {ComponentTypeEnum.SERVICE, ArtifactTypeEnum.OTHER.getType()},
+        };
+    }
+
+
+    @Test(dataProvider = "deleteArtifactOnAssetWhichInInvalidStateForUploading")
+    public void deleteArtifactOnAssetWhichInInvalidStateForUploading(ComponentTypeEnum componentTypeEnum, String artifactType) throws Exception {
+        getExtendTest().log(Status.INFO, String.format("componentTypeEnum: %s, artifactType: %s", componentTypeEnum, artifactType));
+        Component component = uploadArtifactOnAssetViaExternalAPI(componentTypeEnum, LifeCycleStatesEnum.CHECKOUT, artifactType, null);
+        component = AtomicOperationUtils.changeComponentState(component, UserRoleEnum.DESIGNER, LifeCycleStatesEnum.STARTCERTIFICATION, true).getLeft();
+
+        Map<String, ArtifactDefinition> deploymentArtifacts = getDeploymentArtifactsOfAsset(component, componentTypeEnum);
+        String artifactUUID = null;
+        for (String key : deploymentArtifacts.keySet()) {
+            if (key.startsWith("ci")) {
+                artifactUUID = deploymentArtifacts.get(key).getArtifactUUID();
+                break;
+            }
+        }
+        // Invalid artifactUUID
+        ErrorInfo errorInfo = ErrorValidationUtils.parseErrorConfigYaml(ActionStatus.COMPONENT_IN_CERT_IN_PROGRESS_STATE.name());
+        List<String> variables = asList(component.getName(), component.getComponentType().toString().toLowerCase(), ElementFactory.getDefaultUser(UserRoleEnum.TESTER).getFirstName(),
+                ElementFactory.getDefaultUser(UserRoleEnum.TESTER).getLastName(), ElementFactory.getDefaultUser(UserRoleEnum.TESTER).getUserId());
+
+        if (componentTypeEnum.equals(ComponentTypeEnum.RESOURCE_INSTANCE)) {
+            deleteArtifactOfAssetIncludingValiditionOfAuditAndResponseCode(component, ElementFactory.getDefaultUser(UserRoleEnum.DESIGNER),
+                    component.getComponentInstances().get(0), artifactUUID, errorInfo, variables, null, true);
+        } else {
+            deleteArtifactOfAssetIncludingValiditionOfAuditAndResponseCode(component, ElementFactory.getDefaultUser(UserRoleEnum.DESIGNER),
+                    null, artifactUUID, errorInfo, variables, null, true);
+
+        }
+
+    }
+
+    @DataProvider(name = "deleteArtifactOfVfcVlCpForVfciVliCpiViaExternalAPI", parallel = true)
+    public static Object[][] dataProviderDeleteArtifactOfVfcVlCpForVfciVliCpiViaExternalAPI() {
+        return new Object[][]{
+                {ResourceTypeEnum.VFC},
+                {ResourceTypeEnum.VL},
+                {ResourceTypeEnum.CP}
+        };
+    }
+
+    // Verify that it cannot delete VFC/VL/CP artifact on VFCi/VLi/CPi - Failure flow
+    @Test(dataProvider = "deleteArtifactOfVfcVlCpForVfciVliCpiViaExternalAPI")
+    public void deleteArtifactOfVfcVlCpForVfciVliCpiViaExternalAPI(ResourceTypeEnum resourceTypeEnum) throws Exception {
+
+        getExtendTest().log(Status.INFO, String.format("resourceTypeEnum: %s", resourceTypeEnum));
+
+        Component resourceInstanceDetails = getComponentInTargetLifeCycleState(ComponentTypeEnum.RESOURCE.getValue(), UserRoleEnum.DESIGNER, LifeCycleStatesEnum.CHECKOUT, resourceTypeEnum);
+        ArtifactReqDetails artifactReqDetails = ElementFactory.getArtifactByType("ci", ArtifactTypeEnum.SNMP_TRAP.getType(), true, false);
+        uploadArtifactOfAssetIncludingValiditionOfAuditAndResponseCode(resourceInstanceDetails, ElementFactory.getDefaultUser(UserRoleEnum.DESIGNER), artifactReqDetails, 200);
+        resourceInstanceDetails = AtomicOperationUtils.changeComponentState(resourceInstanceDetails, UserRoleEnum.DESIGNER, LifeCycleStatesEnum.CHECKIN, true).getLeft();
+        Component component = getComponentInTargetLifeCycleState(ComponentTypeEnum.RESOURCE.toString(), UserRoleEnum.DESIGNER, LifeCycleStatesEnum.CHECKOUT, null);
+        AtomicOperationUtils.addComponentInstanceToComponentContainer(resourceInstanceDetails, component, UserRoleEnum.DESIGNER, true).left().value();
+        component = AtomicOperationUtils.getResourceObjectByNameAndVersion(UserRoleEnum.DESIGNER, component.getName(), component.getVersion());
+
+        ErrorInfo errorInfo = ErrorValidationUtils.parseErrorConfigYaml(ActionStatus.OK.name());
+        Map<String, ArtifactDefinition> deploymentArtifacts;
+        deploymentArtifacts = getDeploymentArtifactsOfAsset(component, ComponentTypeEnum.RESOURCE_INSTANCE);
+        String artifactUUID = null;
+        for (String key : deploymentArtifacts.keySet()) {
+            if (key.startsWith("ci")) {
+                artifactUUID = deploymentArtifacts.get(key).getArtifactUUID();
+                break;
+            }
+        }
+        List<String> variables = asList(artifactUUID);
+        deleteArtifactOfAssetIncludingValiditionOfAuditAndResponseCode(component, ElementFactory.getDefaultUser(UserRoleEnum.DESIGNER),
+                component.getComponentInstances().get(0), artifactUUID, errorInfo, variables, null, true);
+    }
+
+    protected RestResponse deleteArtifactOfAssetIncludingValiditionOfAuditAndResponseCode(Component component, User sdncModifierDetails,
+                                                                                          ComponentInstance componentInstance, String artifactUUID, ErrorInfo errorInfo, List<String> variables, LifeCycleStatesEnum lifeCycleStatesEnum, Boolean resourceNameInAudit) throws Exception {
+        RestResponse restResponse;
+
+        if (componentInstance != null) {
+            restResponse = ArtifactRestUtils.externalAPIDeleteArtifactOfComponentInstanceOnAsset(component, sdncModifierDetails, componentInstance, artifactUUID);
+        } else {
+            restResponse = ArtifactRestUtils.externalAPIDeleteArtifactOfTheAsset(component, sdncModifierDetails, artifactUUID);
+
+        }
+
+        // validate response code
+        Integer responseCode = restResponse.getErrorCode();
+        Assert.assertEquals(responseCode, errorInfo.getCode(), "Response code is not correct.");
+        return restResponse;
+
+    }
+
+
+    // Happy flow - get chosen life cycle state, artifact type and asset type
+    // delete artifact via external API + check audit & response code
+    protected Component deleteArtifactOnAssetViaExternalAPI(Component component, ComponentTypeEnum componentTypeEnum, LifeCycleStatesEnum chosenLifeCycleState) throws Exception {
+        String artifactName = null;
+        component = AtomicOperationUtils.changeComponentState(component, UserRoleEnum.DESIGNER, chosenLifeCycleState, true).getLeft();
+        if (!LifeCycleStatesEnum.CHECKOUT.equals(chosenLifeCycleState)) {
+            component = AtomicOperationUtils.getComponentObject(component, UserRoleEnum.DESIGNER);
+        } else {
+            component = getNewerVersionOfComponent(component, chosenLifeCycleState);
+        }
+        // get updated artifact data
+        String artifactUUID = null;
+        int moduleTypeArtifact = 0;
+        Map<String, ArtifactDefinition> deploymentArtifacts = getDeploymentArtifactsOfAsset(component, componentTypeEnum);
+
+        for (String key : deploymentArtifacts.keySet()) {
+            if (key.startsWith("ci") && StringUtils.isNotEmpty(deploymentArtifacts.get(key).getArtifactUUID())) {
+                artifactName = key;
+                artifactUUID = deploymentArtifacts.get(key).getArtifactUUID();
+
+                if (deploymentArtifacts.get(key).getArtifactType().equals(ArtifactTypeEnum.VF_MODULES_METADATA)) {
+                    moduleTypeArtifact = 1;
+                }
+                break;
+            }
+        }
+
+        String componentVersionBeforeDelete = component.getVersion();
+        int numberOfArtifact = deploymentArtifacts.size();
+
+        // create component/s & upload artifact via external api
+        if (ComponentTypeEnum.RESOURCE_INSTANCE == componentTypeEnum) {
+            deleteArtifactOfRIIncludingValiditionOfAuditAndResponseCode(component, component.getComponentInstances().get(0), ElementFactory.getDefaultUser(UserRoleEnum.DESIGNER), artifactUUID, 200);
+        } else {
+            deleteArtifactOfAssetIncludingValiditionOfAuditAndResponseCode(component, ElementFactory.getDefaultUser(UserRoleEnum.DESIGNER), artifactUUID, 200);
+        }
+
+        component = updateComponentDetailsByLifeCycleState(chosenLifeCycleState, component);
+
+        // Get list of deployment artifact + download them via external API
+        deploymentArtifacts = getDeploymentArtifactsOfAsset(component, componentTypeEnum);
+        if (deploymentArtifacts.get(artifactName) != null) {
+            Assert.assertTrue(false, "Expected that deleted artifact will not appear in deployment artifact list.");
+        }
+        if ((LifeCycleStatesEnum.CERTIFICATIONREQUEST.equals(chosenLifeCycleState)) && (ComponentTypeEnum.RESOURCE_INSTANCE.equals(componentTypeEnum)) && (!component.getComponentType().toString().equals(ComponentTypeEnum.RESOURCE.toString()))) {
+            Assert.assertEquals(numberOfArtifact - 1 - moduleTypeArtifact, deploymentArtifacts.keySet().size(), "Expected that number of deployment artifact (one deleted and one vfmodule) will decrease by two.");
+        } else {
+            Assert.assertEquals(numberOfArtifact - 1, deploymentArtifacts.keySet().size(), "Expected that number of deployment artifact will decrease by one.");
+        }
+
+        if (chosenLifeCycleState == LifeCycleStatesEnum.CHECKOUT) {
+            Assert.assertEquals(componentVersionBeforeDelete, component.getVersion(), "Expected that check-out component will not change version number.");
+        } else {
+            Assert.assertEquals(String.format("%.1f", (Double.parseDouble(componentVersionBeforeDelete) + 0.1)), component.getVersion(), "Expected that non check-out component version will increase by 0.1.");
+        }
+
+        downloadResourceDeploymentArtifactExternalAPI(component, ElementFactory.getDefaultUser(UserRoleEnum.DESIGNER), artifactUUID, componentTypeEnum);
+
+        return component;
+    }
+
+    // Delete artifact via external API + Check auditing for upload operation + Check response of external API
+    protected RestResponse deleteArtifactOfRIIncludingValiditionOfAuditAndResponseCode(Component component, ComponentInstance componentInstance, User sdncModifierDetails, String artifactUUID, Integer expectedResponseCode) throws Exception {
+        RestResponse restResponse = ArtifactRestUtils.externalAPIDeleteArtifactOfComponentInstanceOnAsset(component, ElementFactory.getDefaultUser(UserRoleEnum.DESIGNER), component.getComponentInstances().get(0), artifactUUID);
+
+        // Check response of external API
+        Integer responseCode = restResponse.getErrorCode();
+        Assert.assertEquals(responseCode, expectedResponseCode, "Response code is not correct.");
+//		component = AtomicOperationUtils.getComponentObject(component, UserRoleEnum.DESIGNER);
+        return restResponse;
+    }
+
+
+    // Delete artifact via external API + Check auditing for upload operation + Check response of external API
+    protected RestResponse deleteArtifactOfAssetIncludingValiditionOfAuditAndResponseCode(Component component, User sdncModifierDetails, String artifactUUID, Integer expectedResponseCode) throws Exception {
+        RestResponse restResponse = ArtifactRestUtils.externalAPIDeleteArtifactOfTheAsset(component, ElementFactory.getDefaultUser(UserRoleEnum.DESIGNER), artifactUUID);
+
+        // Check response of external API
+        Integer responseCode = restResponse.getErrorCode();
+        Assert.assertEquals(responseCode, expectedResponseCode, "Response code is not correct.");
+//		component = AtomicOperationUtils.getComponentObject(component, UserRoleEnum.DESIGNER);
+        return restResponse;
+    }
+
+
+    // download deployment via external api + check response code for success (200) + get artifactReqDetails and verify payload + verify audit
+    protected RestResponse downloadResourceDeploymentArtifactExternalAPI(Component component, User sdncModifierDetails, String artifactUUID, ComponentTypeEnum componentTypeEnum) throws Exception {
+        RestResponse restResponse;
+
+        if (componentTypeEnum == ComponentTypeEnum.RESOURCE_INSTANCE) {
+            restResponse = ArtifactRestUtils.getComponentInstanceDeploymentArtifactExternalAPI(component.getUUID(), component.getComponentInstances().get(0).getNormalizedName(), artifactUUID, ElementFactory.getDefaultUser(UserRoleEnum.DESIGNER), component.getComponentType().toString());
+        } else {
+            restResponse = ArtifactRestUtils.getResourceDeploymentArtifactExternalAPI(component.getUUID(), artifactUUID, ElementFactory.getDefaultUser(UserRoleEnum.DESIGNER), component.getComponentType().toString());
+        }
+
+        Integer responseCode = restResponse.getErrorCode();
+        Integer expectedCode = 404;
+        Assert.assertEquals(responseCode, expectedCode, "Response code is not correct.");
+
+        return restResponse;
+
+    }
+
+
+    public Component getComponentInTargetLifeCycleState(String componentType, UserRoleEnum creatorUser, LifeCycleStatesEnum targetLifeCycleState, ResourceTypeEnum resourceTypeEnum) throws Exception {
+        Component resourceDetails = null;
+
+        if ((componentType.toLowerCase().equals("vf")) || (componentType.toLowerCase().equals("resource"))) {
+            if (resourceTypeEnum == null) {
+                resourceTypeEnum = ResourceTypeEnum.VF;
+            }
+            Either<Resource, RestResponse> createdResource = AtomicOperationUtils.createResourcesByTypeNormTypeAndCatregory(resourceTypeEnum, NormativeTypesEnum.ROOT, ResourceCategoryEnum.GENERIC_INFRASTRUCTURE, creatorUser, true);
+            resourceDetails = createdResource.left().value();
+            resourceDetails = AtomicOperationUtils.changeComponentState(resourceDetails, creatorUser, targetLifeCycleState, true).getLeft();
+        } else {
+            Either<Service, RestResponse> createdResource = AtomicOperationUtils.createDefaultService(creatorUser, true);
+            resourceDetails = createdResource.left().value();
+            // Add artifact to service if asked for certifcationrequest - must be at least one artifact for the flow
+            if ((LifeCycleStatesEnum.CERTIFICATIONREQUEST == targetLifeCycleState) || (LifeCycleStatesEnum.STARTCERTIFICATION == targetLifeCycleState)) {
+                AtomicOperationUtils.uploadArtifactByType(ArtifactTypeEnum.OTHER, resourceDetails, UserRoleEnum.DESIGNER, true, true).left().value();
+            }
+            resourceDetails = AtomicOperationUtils.changeComponentState(resourceDetails, creatorUser, targetLifeCycleState, true).getLeft();
+        }
+        return resourceDetails;
+    }
+
+}
diff --git a/integration-tests/src/test/java/org/openecomp/sdc/externalApis/DeploymentValiditaion.java b/integration-tests/src/test/java/org/openecomp/sdc/externalApis/DeploymentValiditaion.java
new file mode 100644
index 0000000000..9b77603dcf
--- /dev/null
+++ b/integration-tests/src/test/java/org/openecomp/sdc/externalApis/DeploymentValiditaion.java
@@ -0,0 +1,322 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * SDC
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.sdc.externalApis;
+
+import com.aventstack.extentreports.Status;
+import org.apache.commons.io.FileUtils;
+import org.junit.Rule;
+import org.junit.rules.TestName;
+import org.openecomp.sdc.be.datatypes.enums.ComponentTypeEnum;
+import org.openecomp.sdc.be.datatypes.enums.ResourceTypeEnum;
+import org.openecomp.sdc.be.model.Resource;
+import org.openecomp.sdc.be.model.User;
+import org.openecomp.sdc.be.model.category.CategoryDefinition;
+import org.openecomp.sdc.be.model.category.SubCategoryDefinition;
+import org.openecomp.sdc.ci.tests.api.ComponentBaseTest;
+import org.openecomp.sdc.ci.tests.datatypes.PropertyReqDetails;
+import org.openecomp.sdc.ci.tests.datatypes.enums.UserRoleEnum;
+import org.openecomp.sdc.ci.tests.datatypes.http.RestResponse;
+import org.openecomp.sdc.ci.tests.utils.general.AtomicOperationUtils;
+import org.openecomp.sdc.ci.tests.utils.general.ElementFactory;
+import org.openecomp.sdc.ci.tests.utils.rest.CatalogRestUtils;
+import org.openecomp.sdc.ci.tests.utils.rest.CategoryRestUtils;
+import org.openecomp.sdc.ci.tests.utils.rest.ResponseParser;
+import org.testng.annotations.BeforeTest;
+import org.testng.annotations.Test;
+import org.yaml.snakeyaml.Yaml;
+
+import java.io.File;
+import java.io.IOException;
+import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
+import java.nio.file.Paths;
+import java.util.*;
+import java.util.stream.Collectors;
+
+import static org.testng.AssertJUnit.assertTrue;
+
+public class DeploymentValiditaion extends ComponentBaseTest{
+
+	@Rule
+	public static TestName name = new TestName();
+// These tests should run in executable jar only on deployed environment
+	public DeploymentValiditaion() {
+		super();
+	}
+
+	protected final static String categoryFilterKey = "category";
+	protected final static String subCategoryFilterKey = "subCategory";
+	protected  String attVersionStr ;
+	protected String pathPrefix;
+
+
+	 public static List<File> listf(String directoryName) {
+	        File directory = new File(directoryName);
+
+	        List<File> resultList = new ArrayList<>();
+
+	        // get all the files from a directory
+	        File[] fList = directory.listFiles();
+	        resultList.addAll(Arrays.asList(fList));
+	        for (File file : fList) {
+	            if (file.isFile()) {
+	                System.out.println(file.getAbsolutePath());
+	            } else if (file.isDirectory()) {
+	                resultList.addAll(listf(file.getAbsolutePath()));
+	            }
+	        }
+	        //System.out.println(fList);
+	        return resultList;
+	    }
+	@BeforeTest
+	public void beforeTest() throws Exception{
+		RestResponse attVersion = CatalogRestUtils.getOsVersion();
+		attVersionStr = ResponseParser.getVersionFromResponse(attVersion);
+		pathPrefix = File.separator+"opt"+File.separator+"app"+File.separator+"asdc_kits"+File.separator+"catalog-be-"+attVersionStr+File.separator+"import"+File.separator+"tosca"+File.separator;
+	}
+
+	/*@Test
+	public void pasrseNormativies() throws Exception{
+
+
+		String path = pathPrefix+"normative-types";
+		String path2 = pathPrefix+"heat-types";
+
+		List<File> yamlList1 = getYamlFilesList(path);
+		List<String> nodeNamesFromYamlList1 = getNodeNamesFromYamlList(yamlList1);
+		List<File> yamlList2 = getYamlFilesList(path2);
+		List<String> nodeNamesFromYamlList2 = getNodeNamesFromYamlList(yamlList2);
+
+
+		List<String> expectedList = new ArrayList<>();
+		expectedList.addAll(nodeNamesFromYamlList1);
+		expectedList.addAll(nodeNamesFromYamlList2);
+		System.out.println("list of normatives from files:::::::::::");
+		expectedList.forEach(System.out::println);
+		getExtendTest().log(Status.INFO, "list of normatives from files:");
+		getExtendTest().log(Status.INFO,expectedList.toString());
+
+		String[] filter = { categoryFilterKey + "=" + ResourceCategoryEnum.GENERIC_ABSTRACT.getCategory(), subCategoryFilterKey + "=" + ResourceCategoryEnum.GENERIC_ABSTRACT.getSubCategory() };
+		RestResponse assetResponse = AssetRestUtils.getComponentListByAssetType(true, AssetTypeEnum.RESOURCES);
+		Map<String, String> resourceAssetList = AssetRestUtils.getResourceAssetMap(assetResponse);
+		Map<String, String> resourceListFiltteredByWholeVersion = AssetRestUtils.getResourceListFiltteredByWholeVersion(resourceAssetList);
+		List<String> resourceToscaNamesList = AssetRestUtils.getResourceObjectByNameAndVersionToscaNamesList(resourceListFiltteredByWholeVersion);
+		System.out.println("list of normatives from APIs:::::::::::");
+		resourceToscaNamesList.forEach(System.out::println);
+		getExtendTest().log(Status.INFO, "list of normatives from APIs:");
+		getExtendTest().log(Status.INFO, resourceToscaNamesList.toString());
+
+		boolean good = true;
+		List<String> missingNormatives =  new ArrayList<>();
+
+		for (int i = 0; i < expectedList.size(); i ++) {
+		    if (!resourceToscaNamesList.contains(expectedList.get(i))) {
+		        good = false;
+		        missingNormatives.add(expectedList.get(i));
+		    }
+		}
+
+		System.out.println("<<<<<<<<<MISSING NORMATIVES>>>>>>");
+		missingNormatives.forEach(System.out::println);
+		getExtendTest().log(Status.INFO, "MISSING NORMATIVES:");
+		getExtendTest().log(Status.INFO, missingNormatives.toString());
+
+		assertTrue("missing normatives ",  good);
+
+	}*/
+
+
+	public List<String> getNodeNamesFromYamlList(List<File> yamlList) throws IOException {
+		List<String> nodeNameList = new ArrayList<>();
+
+		for (File file : yamlList) {
+		    String content = new String(Files.readAllBytes(Paths.get(file.getPath())), StandardCharsets.UTF_8);
+			Yaml yaml = new Yaml();
+			Map<String, Object> load = (Map<String, Object>) yaml.load(content);
+			Map<String, Object> topology_template = (Map<String, Object>) load.get("node_types");
+//			String string = topology_template.keySet().toString().replaceAll("tosca.nodes.", "");
+			String string = topology_template.keySet().iterator().next().toString();
+			System.out.println(string +" -----> "  +file.getPath());
+			nodeNameList.add(string);
+		}
+		return nodeNameList;
+	}
+
+
+	public List<File> getYamlFilesList(String path) throws IOException {
+		List<File> yamlList = new ArrayList<>();
+		File dir = new File(path);
+		String[] extensions = new String[] { "yml" };
+		System.out.println("Getting all .yml files in " + dir.getCanonicalPath()
+				+ " including those in subdirectories");
+		List<File> files = (List<File>) FileUtils.listFiles(dir, extensions, true);
+		for (File file : files) {
+			System.out.println("file: " + file.getCanonicalPath());
+			yamlList.add(file);
+		}
+		return yamlList;
+	}
+
+	@Test
+	public void pasrseDataTypes() throws Exception{
+
+		String path = pathPrefix+"data-types"+File.separator+"dataTypes.yml";
+	    String content = new String(Files.readAllBytes(Paths.get(path)), StandardCharsets.UTF_8);
+
+		Yaml yaml = new Yaml();
+		Map<String, Object> load = (Map<String, Object>) yaml.load(content);
+		List<String> listOfDataTypes = new ArrayList<>();
+		listOfDataTypes.addAll(load.keySet());
+		System.out.println("<<<<<<<< List of Data Types >>>>>>>>>");
+		listOfDataTypes.forEach(System.out::println);
+		getExtendTest().log(Status.INFO, "List of Data Types:");
+		getExtendTest().log(Status.INFO, listOfDataTypes.toString());
+
+		Resource resource = AtomicOperationUtils.createResourceByType(ResourceTypeEnum.VF, UserRoleEnum.DESIGNER, true).left().value();
+		PropertyReqDetails defaultProperty = ElementFactory.getDefaultListProperty();
+
+		defaultProperty.setPropertyDefaultValue(null);
+		for (String dataType : listOfDataTypes) {
+			defaultProperty.setPropertyType(dataType);
+			defaultProperty.setName(dataType);
+			System.out.println("Adding proporty with data type: ----> " + dataType);
+			getExtendTest().log(Status.INFO, "Adding proporty with data type: ----> " + dataType);
+			AtomicOperationUtils.addCustomPropertyToResource(defaultProperty, resource, UserRoleEnum.DESIGNER, true);
+		}
+
+		listOfDataTypes.forEach(System.out::println);
+
+	}
+
+	@Test
+	public void pasrseCategories() throws Exception{
+
+		String path = pathPrefix+"categories"+File.separator+"categoryTypes.yml";
+	    String content = new String(Files.readAllBytes(Paths.get(path)), StandardCharsets.UTF_8);
+
+		List<String> serviceCategories = new ArrayList<>();
+		List<String> resourceCategories = new ArrayList<>();
+
+		Yaml yaml = new Yaml();
+		Map<String, Object> load = (Map<String, Object>) yaml.load(content);
+		Map<String, Map> services = (Map<String, Map>) load.get("services");
+		Map<String, Map> resources = (Map<String, Map>) load.get("resources");
+
+		Map<String, List<String>> resourcesListFromFile = new HashMap<>() ;
+
+		//retrieve subcategories
+		for ( String resourceCategoryName : resources.keySet()) {
+			Map<String, Map> subcategory = (Map) resources.get(resourceCategoryName).get("subcategories");
+
+			resourceCategories = new ArrayList<String>();
+			for (String subcategoryName : subcategory.keySet()) {
+				String name = (String) subcategory.get(subcategoryName).get("name");
+				resourceCategories.add(name);
+			}
+			resourcesListFromFile.put(resources.get(resourceCategoryName).get("name").toString(), resourceCategories);
+		}
+
+			System.out.println(resourcesListFromFile.toString());
+			getExtendTest().log(Status.INFO, "Expected categories:");
+			getExtendTest().log(Status.INFO, resourcesListFromFile.toString());
+
+		//retrieve service categories
+//		for ( String serviceCategoryName : services.keySet()) {
+//			String name = (String) services.get(serviceCategoryName).get("name");
+//			serviceCategories.add(name);
+//				}	
+//		serviceCategories.forEach(System.out::println);
+
+			//retrieve resource list from URL
+
+			Map<String, List<CategoryDefinition>> categoriesMap = getCategories();
+			List<CategoryDefinition> resourceSubCategories = categoriesMap.get(ComponentTypeEnum.RESOURCE_PARAM_NAME);
+			List<SubCategoryDefinition> subcategories;
+			for (CategoryDefinition categoryDefinition : resourceSubCategories) {
+				subcategories =  categoryDefinition.getSubcategories();
+			}
+//			subcategories.stream().collect(toMap(i -> i, i -> items.get(i)));
+
+//			resourceSubCategories.stream().collect(
+//	                Collectors.groupingBy(CategoryDefinition::getName, Collectors.groupingBy(SubCategoryDefinition::getName)));
+
+//			resourceSubCategories.stream().filter(p->p.getSubcategories()).map(m->m.getName()).collect(Collectors.toList()).collect(Collectors.toMap(CategoryDefinition::getName,m));
+
+
+			Map<String, List<String>> resourceMapFromUrl = resourceSubCategories.stream().collect(Collectors.toMap( e -> e.getName() , e -> e.getSubcategories().stream().map(e1 -> e1.getName()).collect(Collectors.toList())));
+
+			getExtendTest().log(Status.INFO, "Actual categories:");
+			getExtendTest().log(Status.INFO, resourceMapFromUrl.toString());
+
+
+			assertTrue("missing categories ", resourceMapFromUrl.keySet().containsAll(resourcesListFromFile.keySet()));
+
+	}
+
+
+	public Map<String, List<CategoryDefinition>> getCategories() throws Exception {
+
+		User defaultAdminUser = ElementFactory.getDefaultUser(UserRoleEnum.ADMIN);
+
+		Map<String,List<CategoryDefinition>> map = new HashMap<String,List<CategoryDefinition>>();
+
+
+		RestResponse allResourceCategories = CategoryRestUtils.getAllCategories(defaultAdminUser, ComponentTypeEnum.RESOURCE_PARAM_NAME);
+		RestResponse allServiceCategories = CategoryRestUtils.getAllCategories(defaultAdminUser, ComponentTypeEnum.SERVICE_PARAM_NAME);
+
+		List<CategoryDefinition> parsedResourceCategories = ResponseParser.parseCategories(allResourceCategories);
+		List<CategoryDefinition> parsedServiceCategories = ResponseParser.parseCategories(allServiceCategories);
+
+		map.put(ComponentTypeEnum.RESOURCE_PARAM_NAME, parsedResourceCategories);
+		map.put(ComponentTypeEnum.SERVICE_PARAM_NAME, parsedServiceCategories);
+
+		return map;
+	}
+
+
+
+/*	@Test (enabled=false)
+	public void pasrseCategoriesClass2() throws IOException{
+
+		String path = "C:\\Git_work\\Git_UGN\\d2-sdnc\\catalog-be\\src\\main\\resources\\import\\tosca\\categories\\categoryTypes.yml";
+
+		FileReader reader = new FileReader(path);
+		Yaml yaml=new Yaml();
+
+
+		Map<?, ?> map = (Map<?, ?>) yaml.load(reader);
+
+		Collection<Map> values = (Collection<Map>) map.values();
+		for (Map map2 : values) {
+			Collection values2 = map2.values();
+			for (Object object : values2) {
+
+
+			}
+		}
+
+		List<Object> collect = values.stream().map(e -> e.get("name")).collect(Collectors.toList());
+
+//		resourcesArrayList.stream().filter(s -> s.getName().toLowerCase().startsWith("ci") && !s.getName().toLowerCase().equals("cindervolume")).map(e -> e.getUniqueId()).collect(Collectors.toList()).forEach((i)
+
+	}*/
+
+}
diff --git a/integration-tests/src/test/java/org/openecomp/sdc/externalApis/GetAssetServlet.java b/integration-tests/src/test/java/org/openecomp/sdc/externalApis/GetAssetServlet.java
new file mode 100644
index 0000000000..2657ddfcb5
--- /dev/null
+++ b/integration-tests/src/test/java/org/openecomp/sdc/externalApis/GetAssetServlet.java
@@ -0,0 +1,286 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * SDC
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.sdc.externalApis;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.google.gson.Gson;
+import org.apache.commons.codec.binary.Base64;
+import org.apache.commons.io.IOUtils;
+import org.apache.http.HttpResponse;
+import org.apache.http.client.methods.HttpGet;
+import org.apache.http.impl.client.CloseableHttpClient;
+import org.apache.http.impl.client.HttpClients;
+import org.junit.Rule;
+import org.junit.rules.TestName;
+import org.openecomp.sdc.be.datatypes.elements.ConsumerDataDefinition;
+import org.openecomp.sdc.be.datatypes.enums.AssetTypeEnum;
+import org.openecomp.sdc.be.datatypes.enums.ComponentTypeEnum;
+import org.openecomp.sdc.be.datatypes.enums.ResourceTypeEnum;
+import org.openecomp.sdc.be.model.ArtifactUiDownloadData;
+import org.openecomp.sdc.be.model.Resource;
+import org.openecomp.sdc.be.model.Service;
+import org.openecomp.sdc.be.model.User;
+import org.openecomp.sdc.ci.tests.api.ComponentBaseTest;
+import org.openecomp.sdc.ci.tests.api.Urls;
+import org.openecomp.sdc.ci.tests.datatypes.*;
+import org.openecomp.sdc.ci.tests.datatypes.enums.ArtifactTypeEnum;
+import org.openecomp.sdc.ci.tests.datatypes.enums.LifeCycleStatesEnum;
+import org.openecomp.sdc.ci.tests.datatypes.enums.UserRoleEnum;
+import org.openecomp.sdc.ci.tests.datatypes.http.HttpHeaderEnum;
+import org.openecomp.sdc.ci.tests.datatypes.http.RestResponse;
+import org.openecomp.sdc.ci.tests.utils.Utils;
+import org.openecomp.sdc.ci.tests.utils.general.AtomicOperationUtils;
+import org.openecomp.sdc.ci.tests.utils.general.ElementFactory;
+import org.openecomp.sdc.ci.tests.utils.rest.ArtifactRestUtils;
+import org.openecomp.sdc.ci.tests.utils.rest.AssetRestUtils;
+import org.openecomp.sdc.ci.tests.utils.rest.BaseRestUtils;
+import org.openecomp.sdc.common.api.Constants;
+import org.testng.annotations.Test;
+
+import java.io.InputStream;
+import java.util.ArrayList;
+import java.util.List;
+
+import static org.testng.AssertJUnit.assertEquals;
+
+public class GetAssetServlet extends ComponentBaseTest {
+
+	protected User sdncUserDetails = ElementFactory.getDefaultUser(UserRoleEnum.DESIGNER);
+	protected User sdncAdminUserDetails = ElementFactory.getDefaultUser(UserRoleEnum.ADMIN);
+	protected ConsumerDataDefinition consumerDataDefinition;
+
+	@Rule
+	public static TestName name = new TestName();
+
+	Gson gson = new Gson();
+
+//	@BeforeMethod
+//	public void setup() throws Exception {
+//
+//		AtomicOperationUtils.createDefaultConsumer(true);
+//
+//	}
+
+	@Test // (enabled = false)
+	public void getResourceAssetSuccess() throws Exception {
+
+//		CassandraUtils.truncateAllKeyspaces();
+		List<String> expectedAssetNamesList = new ArrayList<>();
+		ResourceReqDetails resourceDetails = ElementFactory.getDefaultResourceByType(ResourceTypeEnum.VF, sdncUserDetails);
+		Resource resource = AtomicOperationUtils.createResourceByResourceDetails(resourceDetails, UserRoleEnum.DESIGNER, true).left().value();
+		expectedAssetNamesList.add(resourceDetails.getName());
+
+		resourceDetails = ElementFactory.getDefaultResourceByType(ResourceTypeEnum.VF, sdncUserDetails);
+		resource = AtomicOperationUtils.createResourceByResourceDetails(resourceDetails, UserRoleEnum.DESIGNER, true).left().value();
+		resource = (Resource) AtomicOperationUtils.changeComponentState(resource, UserRoleEnum.DESIGNER, LifeCycleStatesEnum.CERTIFY, true).getLeft();
+		resource = (Resource) AtomicOperationUtils.changeComponentState(resource, UserRoleEnum.DESIGNER, LifeCycleStatesEnum.CHECKOUT, true).getLeft();
+		resource = (Resource) AtomicOperationUtils.changeComponentState(resource, UserRoleEnum.DESIGNER, LifeCycleStatesEnum.CHECKIN, true).getLeft();
+		resource = (Resource) AtomicOperationUtils.changeComponentState(resource, UserRoleEnum.DESIGNER, LifeCycleStatesEnum.CHECKOUT, true).getLeft();
+		expectedAssetNamesList.add(resourceDetails.getName());
+
+		resourceDetails = ElementFactory.getDefaultResourceByType(ResourceTypeEnum.VF, sdncUserDetails);
+		resource = AtomicOperationUtils.createResourceByResourceDetails(resourceDetails, UserRoleEnum.DESIGNER, true).left().value();
+		resource = (Resource) AtomicOperationUtils.changeComponentState(resource, UserRoleEnum.DESIGNER, LifeCycleStatesEnum.CERTIFY, true).getLeft();
+		resource = (Resource) AtomicOperationUtils.changeComponentState(resource, UserRoleEnum.DESIGNER, LifeCycleStatesEnum.CERTIFY, true).getLeft();
+		resource = (Resource) AtomicOperationUtils.changeComponentState(resource, UserRoleEnum.DESIGNER, LifeCycleStatesEnum.CERTIFY, true).getLeft();
+		expectedAssetNamesList.add(resourceDetails.getName());
+
+		resourceDetails = ElementFactory.getDefaultResourceByType(ResourceTypeEnum.VF, sdncUserDetails);
+		resource = AtomicOperationUtils.createResourceByResourceDetails(resourceDetails, UserRoleEnum.DESIGNER, true).left().value();
+		resource = (Resource) AtomicOperationUtils.changeComponentState(resource, UserRoleEnum.DESIGNER, LifeCycleStatesEnum.CHECKIN, true).getLeft();
+		resource = (Resource) AtomicOperationUtils.changeComponentState(resource, UserRoleEnum.DESIGNER, LifeCycleStatesEnum.CHECKOUT, true).getLeft();
+		resource = (Resource) AtomicOperationUtils.changeComponentState(resource, UserRoleEnum.DESIGNER, LifeCycleStatesEnum.CHECKIN, true).getLeft();
+		resource = (Resource) AtomicOperationUtils.changeComponentState(resource, UserRoleEnum.DESIGNER, LifeCycleStatesEnum.CHECKOUT, true).getLeft();
+		resource = (Resource) AtomicOperationUtils.changeComponentState(resource, UserRoleEnum.DESIGNER, LifeCycleStatesEnum.CHECKIN, true).getLeft();
+		expectedAssetNamesList.add(resourceDetails.getName());
+
+		resourceDetails = ElementFactory.getDefaultResourceByType(ResourceTypeEnum.VF, sdncUserDetails);
+		resource = AtomicOperationUtils.createResourceByResourceDetails(resourceDetails, UserRoleEnum.DESIGNER, true).left().value();
+		resource = (Resource) AtomicOperationUtils.changeComponentState(resource, UserRoleEnum.DESIGNER, LifeCycleStatesEnum.CHECKIN, true).getLeft();
+		resource = (Resource) AtomicOperationUtils.changeComponentState(resource, UserRoleEnum.DESIGNER, LifeCycleStatesEnum.CHECKOUT, true).getLeft();
+		resource = (Resource) AtomicOperationUtils.changeComponentState(resource, UserRoleEnum.DESIGNER, LifeCycleStatesEnum.CHECKIN, true).getLeft();
+		resource = (Resource) AtomicOperationUtils.changeComponentState(resource, UserRoleEnum.DESIGNER, LifeCycleStatesEnum.CHECKOUT, true).getLeft();
+		expectedAssetNamesList.add(resourceDetails.getName());
+
+		resourceDetails = ElementFactory.getDefaultResourceByType(ResourceTypeEnum.VF, sdncUserDetails);
+		resource = AtomicOperationUtils.createResourceByResourceDetails(resourceDetails, UserRoleEnum.DESIGNER, true).left().value();
+		resource = (Resource) AtomicOperationUtils.changeComponentState(resource, UserRoleEnum.DESIGNER, LifeCycleStatesEnum.STARTCERTIFICATION, true).getLeft();
+		expectedAssetNamesList.add(resourceDetails.getName());
+
+/*		resourceDetails = ElementFactory.getDefaultResourceByType(ResourceTypeEnum.VF, sdncUserDetails);
+		resource = AtomicOperationUtils.createResourceByResourceDetails(resourceDetails, UserRoleEnum.DESIGNER, true).left().value();
+		resource = (Resource) AtomicOperationUtils.changeComponentState(resource, UserRoleEnum.DESIGNER, LifeCycleStatesEnum.CERTIFY, true).getLeft();
+		resource = (Resource) AtomicOperationUtils.changeComponentState(resource, UserRoleEnum.DESIGNER, LifeCycleStatesEnum.CERTIFICATIONREQUEST, true).getLeft();
+		expectedAssetNamesList.add(resourceDetails.getName());*/
+
+		System.out.println("6 VF resources were created");
+
+		RestResponse assetResponse = AssetRestUtils.getComponentListByAssetType(true, AssetTypeEnum.RESOURCES);
+		BaseRestUtils.checkSuccess(assetResponse);
+
+		List<ResourceAssetStructure> resourceAssetList = AssetRestUtils.getResourceAssetList(assetResponse);
+		List<String> getActualAssetNamesList = AssetRestUtils.getResourceNamesList(resourceAssetList);
+		Utils.compareArrayLists(getActualAssetNamesList, expectedAssetNamesList, "Element");
+
+		AssetRestUtils.checkComponentTypeInObjectList(resourceAssetList, ComponentTypeEnum.RESOURCE);
+
+	/*	// Validate audit message
+		ExpectedExternalAudit expectedAssetListAudit = ElementFactory.getDefaultAssetListAudit(AssetTypeEnum.RESOURCES, AuditingActionEnum.GET_ASSET_LIST);
+		Map <AuditingFieldsKey, String> body = new HashMap<>();
+        body.put(AuditingFieldsKey.AUDIT_RESOURCE_URL, expectedAssetListAudit.getRESOURCE_URL());
+        AuditValidationUtils.validateExternalAudit(expectedAssetListAudit, AuditingActionEnum.GET_ASSET_LIST.getName(), body);*/
+
+	}
+
+	@Test // (enabled = false)
+	public void getServiceAssetSuccess() throws Exception {
+
+//		CassandraUtils.truncateAllKeyspaces();
+		List<String> expectedAssetNamesList = new ArrayList<>();
+		ArtifactReqDetails artifactDetails = ElementFactory.getArtifactByType(ArtifactTypeEnum.OTHER, ArtifactTypeEnum.OTHER, true);
+
+		ServiceReqDetails serviceDetails = ElementFactory.getDefaultService();
+		Service service = AtomicOperationUtils.createCustomService(serviceDetails, UserRoleEnum.DESIGNER, true).left().value();
+		expectedAssetNamesList.add(serviceDetails.getName());
+
+		serviceDetails = ElementFactory.getDefaultService();
+		service = AtomicOperationUtils.createCustomService(serviceDetails, UserRoleEnum.DESIGNER, true).left().value();
+		RestResponse addInformationalArtifactToService = ArtifactRestUtils.addInformationalArtifactToService(artifactDetails, ElementFactory.getDefaultUser(UserRoleEnum.DESIGNER), service.getUniqueId());
+		BaseRestUtils.checkSuccess(addInformationalArtifactToService);
+		service = (Service) AtomicOperationUtils.changeComponentState(service, UserRoleEnum.DESIGNER, LifeCycleStatesEnum.CERTIFY, true).getLeft();
+		service = (Service) AtomicOperationUtils.changeComponentState(service, UserRoleEnum.DESIGNER, LifeCycleStatesEnum.CHECKOUT, true).getLeft();
+		service = (Service) AtomicOperationUtils.changeComponentState(service, UserRoleEnum.DESIGNER, LifeCycleStatesEnum.CHECKIN, true).getLeft();
+		service = (Service) AtomicOperationUtils.changeComponentState(service, UserRoleEnum.DESIGNER, LifeCycleStatesEnum.CHECKOUT, true).getLeft();
+		expectedAssetNamesList.add(serviceDetails.getName());
+
+		serviceDetails = ElementFactory.getDefaultService();
+		service = AtomicOperationUtils.createCustomService(serviceDetails, UserRoleEnum.DESIGNER, true).left().value();
+		addInformationalArtifactToService = ArtifactRestUtils.addInformationalArtifactToService(artifactDetails, ElementFactory.getDefaultUser(UserRoleEnum.DESIGNER), service.getUniqueId());
+		BaseRestUtils.checkSuccess(addInformationalArtifactToService);
+		service = (Service) AtomicOperationUtils.changeComponentState(service, UserRoleEnum.DESIGNER, LifeCycleStatesEnum.CERTIFY, true).getLeft();
+		service = (Service) AtomicOperationUtils.changeComponentState(service, UserRoleEnum.DESIGNER, LifeCycleStatesEnum.CERTIFY, true).getLeft();
+		service = (Service) AtomicOperationUtils.changeComponentState(service, UserRoleEnum.DESIGNER, LifeCycleStatesEnum.CERTIFY, true).getLeft();
+		expectedAssetNamesList.add(serviceDetails.getName());
+
+		serviceDetails = ElementFactory.getDefaultService();
+		service = AtomicOperationUtils.createCustomService(serviceDetails, UserRoleEnum.DESIGNER, true).left().value();
+		service = (Service) AtomicOperationUtils.changeComponentState(service, UserRoleEnum.DESIGNER, LifeCycleStatesEnum.CHECKIN, true).getLeft();
+		service = (Service) AtomicOperationUtils.changeComponentState(service, UserRoleEnum.DESIGNER, LifeCycleStatesEnum.CHECKOUT, true).getLeft();
+		service = (Service) AtomicOperationUtils.changeComponentState(service, UserRoleEnum.DESIGNER, LifeCycleStatesEnum.CHECKIN, true).getLeft();
+		service = (Service) AtomicOperationUtils.changeComponentState(service, UserRoleEnum.DESIGNER, LifeCycleStatesEnum.CHECKOUT, true).getLeft();
+		service = (Service) AtomicOperationUtils.changeComponentState(service, UserRoleEnum.DESIGNER, LifeCycleStatesEnum.CHECKIN, true).getLeft();
+		expectedAssetNamesList.add(serviceDetails.getName());
+
+		serviceDetails = ElementFactory.getDefaultService();
+		service = AtomicOperationUtils.createCustomService(serviceDetails, UserRoleEnum.DESIGNER, true).left().value();
+		service = (Service) AtomicOperationUtils.changeComponentState(service, UserRoleEnum.DESIGNER, LifeCycleStatesEnum.CHECKIN, true).getLeft();
+		service = (Service) AtomicOperationUtils.changeComponentState(service, UserRoleEnum.DESIGNER, LifeCycleStatesEnum.CHECKOUT, true).getLeft();
+		service = (Service) AtomicOperationUtils.changeComponentState(service, UserRoleEnum.DESIGNER, LifeCycleStatesEnum.CHECKIN, true).getLeft();
+		service = (Service) AtomicOperationUtils.changeComponentState(service, UserRoleEnum.DESIGNER, LifeCycleStatesEnum.CHECKOUT, true).getLeft();
+		expectedAssetNamesList.add(serviceDetails.getName());
+
+		serviceDetails = ElementFactory.getDefaultService();
+		service = AtomicOperationUtils.createCustomService(serviceDetails, UserRoleEnum.DESIGNER, true).left().value();
+		addInformationalArtifactToService = ArtifactRestUtils.addInformationalArtifactToService(artifactDetails, ElementFactory.getDefaultUser(UserRoleEnum.DESIGNER), service.getUniqueId());
+		BaseRestUtils.checkSuccess(addInformationalArtifactToService);
+		service = (Service) AtomicOperationUtils.changeComponentState(service, UserRoleEnum.DESIGNER, LifeCycleStatesEnum.STARTCERTIFICATION, true).getLeft();
+		expectedAssetNamesList.add(serviceDetails.getName());
+
+		serviceDetails = ElementFactory.getDefaultService();
+		service = AtomicOperationUtils.createCustomService(serviceDetails, UserRoleEnum.DESIGNER, true).left().value();
+		addInformationalArtifactToService = ArtifactRestUtils.addInformationalArtifactToService(artifactDetails, ElementFactory.getDefaultUser(UserRoleEnum.DESIGNER), service.getUniqueId());
+		BaseRestUtils.checkSuccess(addInformationalArtifactToService);
+		service = (Service) AtomicOperationUtils.changeComponentState(service, UserRoleEnum.DESIGNER, LifeCycleStatesEnum.CERTIFY, true).getLeft();
+		service = (Service) AtomicOperationUtils.changeComponentState(service, UserRoleEnum.DESIGNER, LifeCycleStatesEnum.CERTIFICATIONREQUEST, true).getLeft();
+		expectedAssetNamesList.add(serviceDetails.getName());
+
+		System.out.println("7 Services were created");
+
+		RestResponse assetResponse = AssetRestUtils.getComponentListByAssetType(true, AssetTypeEnum.SERVICES);
+		BaseRestUtils.checkSuccess(assetResponse);
+
+		List<ServiceAssetStructure> serviceAssetList = AssetRestUtils.getServiceAssetList(assetResponse);
+		List<String> getActualAssetNamesList = AssetRestUtils.getServiceNamesList(serviceAssetList);
+		Utils.compareArrayLists(getActualAssetNamesList, expectedAssetNamesList, "Element");
+
+		/*// Validate audit message
+		ExpectedExternalAudit expectedAssetListAudit = ElementFactory.getDefaultAssetListAudit(AssetTypeEnum.SERVICES, AuditingActionEnum.GET_ASSET_LIST);
+		Map <AuditingFieldsKey, String> body = new HashMap<>();
+        body.put(AuditingFieldsKey.AUDIT_RESOURCE_URL, expectedAssetListAudit.getRESOURCE_URL());
+        AuditValidationUtils.validateExternalAudit(expectedAssetListAudit, AuditingActionEnum.GET_ASSET_LIST.getName(), body);*/
+
+	}
+
+	@Test(enabled = true)
+	public void getToscaModelSuccess() throws Exception {
+
+		Resource resource;
+		HttpResponse assetResponse;
+		HttpResponse response;
+		InputStream inputStream;
+		ArtifactUiDownloadData artifactUiDownloadData;
+		int len;
+		byte[] res;
+		byte[] fromUiDownload;
+		String fileName;
+		try (CloseableHttpClient httpclient = HttpClients.createDefault()) {
+			ResourceReqDetails resourceDetails = ElementFactory.getDefaultResourceByType(ResourceTypeEnum.VF, sdncUserDetails);
+			resource = AtomicOperationUtils.createResourceByResourceDetails(resourceDetails, UserRoleEnum.DESIGNER, true).left().value();
+			assetResponse = AssetRestUtils.getComponentToscaModel(AssetTypeEnum.RESOURCES, resource.getUUID());
+			resource = (Resource) AtomicOperationUtils.changeComponentState(resource, UserRoleEnum.DESIGNER, LifeCycleStatesEnum.CERTIFY, true).getLeft();
+			String artId = resource.getToscaArtifacts().get("assettoscacsar").getEsId();
+			String url = String.format(Urls.UI_DOWNLOAD_RESOURCE_ARTIFACT, config.getCatalogBeHost(), config.getCatalogBePort(), resource.getUniqueId(), artId);
+			HttpGet httpGet = createGetRequest(url);
+			response = httpclient.execute(httpGet);
+		}
+		inputStream = response.getEntity().getContent();
+		artifactUiDownloadData = getArtifactUiDownloadData(IOUtils.toString(inputStream));
+		assetResponse = AssetRestUtils.getComponentToscaModel(AssetTypeEnum.RESOURCES, resource.getUUID());
+		inputStream = assetResponse.getEntity().getContent();
+		len = (int) assetResponse.getEntity().getContentLength();
+		res = new byte[len];
+		inputStream.read(res, 0, len);
+		fromUiDownload = artifactUiDownloadData.getBase64Contents().getBytes();
+		assertEquals(Base64.encodeBase64(res), fromUiDownload);
+		fileName = assetResponse.getFirstHeader(Constants.CONTENT_DISPOSITION_HEADER).getValue();
+		assertEquals(fileName, new StringBuilder().append("attachment; filename=\"")
+				.append(artifactUiDownloadData.getArtifactName()).append("\"").toString());
+	}
+
+
+	private HttpGet createGetRequest(String url) {
+		HttpGet httpGet = new HttpGet(url);
+		httpGet.addHeader(HttpHeaderEnum.USER_ID.getValue(), sdncUserDetails.getUserId());
+		return httpGet;
+	}
+
+	private ArtifactUiDownloadData getArtifactUiDownloadData(String artifactUiDownloadDataStr) throws Exception {
+
+		ObjectMapper mapper = new ObjectMapper();
+		try {
+			ArtifactUiDownloadData artifactUiDownloadData = mapper.readValue(artifactUiDownloadDataStr, ArtifactUiDownloadData.class);
+			return artifactUiDownloadData;
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
+		return null;
+	}
+}
diff --git a/integration-tests/src/test/java/org/openecomp/sdc/externalApis/GetCSARofVF.java b/integration-tests/src/test/java/org/openecomp/sdc/externalApis/GetCSARofVF.java
new file mode 100644
index 0000000000..a56f994bbc
--- /dev/null
+++ b/integration-tests/src/test/java/org/openecomp/sdc/externalApis/GetCSARofVF.java
@@ -0,0 +1,231 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * SDC
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.sdc.externalApis;
+
+import org.junit.Rule;
+import org.junit.rules.TestName;
+import org.openecomp.sdc.be.datatypes.enums.AssetTypeEnum;
+import org.openecomp.sdc.be.datatypes.enums.ResourceTypeEnum;
+import org.openecomp.sdc.be.model.Component;
+import org.openecomp.sdc.be.model.Resource;
+import org.openecomp.sdc.be.model.Service;
+import org.openecomp.sdc.ci.tests.api.ComponentBaseTest;
+import org.openecomp.sdc.ci.tests.datatypes.enums.ArtifactTypeEnum;
+import org.openecomp.sdc.ci.tests.datatypes.enums.LifeCycleStatesEnum;
+import org.openecomp.sdc.ci.tests.datatypes.enums.UserRoleEnum;
+import org.openecomp.sdc.ci.tests.utils.general.AtomicOperationUtils;
+import org.openecomp.sdc.ci.tests.utils.rest.AssetRestUtils;
+import org.testng.annotations.BeforeMethod;
+import org.testng.annotations.Test;
+
+import java.io.File;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Enumeration;
+import java.util.List;
+import java.util.zip.ZipEntry;
+import java.util.zip.ZipException;
+import java.util.zip.ZipFile;
+
+import static org.testng.AssertJUnit.assertTrue;
+
+public class GetCSARofVF extends ComponentBaseTest {
+
+//	protected User sdncUserDetails = ElementFactory.getDefaultUser(UserRoleEnum.DESIGNER);
+//	protected User sdncAdminUserDetails = ElementFactory.getDefaultUser(UserRoleEnum.ADMIN);
+//	protected ConsumerDataDefinition consumerDataDefinition;
+
+	@Rule
+	public static TestName name = new TestName();
+
+//	Gson gson = new Gson();
+
+	@BeforeMethod
+	public void setup() throws Exception {
+
+//		AtomicOperationUtils.createDefaultConsumer(true);
+//		CassandraUtils.truncateAllKeyspaces();
+		
+
+	}
+	
+	@Test
+	public void getResourceToscaModelCheckOutState() throws Exception {
+
+
+		Resource resource = AtomicOperationUtils.createResourceByType(ResourceTypeEnum.VF, UserRoleEnum.DESIGNER, true).left().value();
+		
+//		HttpResponse componentToscaModel = AssetRestUtils.getComponentToscaModel(AssetTypeEnum.RESOURCES, resource.getUUID());
+		File toscaModelCsarFile = AssetRestUtils.getToscaModelCsarFile(AssetTypeEnum.RESOURCES, resource.getUUID());
+		
+		// validate tosca structure  
+		validateCsarContent(resource, toscaModelCsarFile);
+	
+	/*	// Validate audit message
+		validateAudit(resource);*/
+
+	}
+
+
+	
+	@Test
+	public void getResourceToscaModelCheckInState() throws Exception {
+		
+		Resource resource = AtomicOperationUtils.createResourceByType(ResourceTypeEnum.VF, UserRoleEnum.DESIGNER, true).left().value();
+		
+		AtomicOperationUtils.changeComponentState(resource, UserRoleEnum.DESIGNER, LifeCycleStatesEnum.CHECKIN, true);
+		
+//		HttpResponse componentToscaModel = AssetRestUtils.getComponentToscaModel(AssetTypeEnum.RESOURCES, resource.getUUID());
+		File toscaModelCsarFile = AssetRestUtils.getToscaModelCsarFile(AssetTypeEnum.RESOURCES, resource.getUUID());
+		
+		// validate tosca structure  
+		validateCsarContent(resource, toscaModelCsarFile);
+	
+		/*// Validate audit message
+		validateAudit(resource);*/
+
+	}
+	
+	@Test
+	public void getRsourceToscaModelCertifyState() throws Exception {
+		
+		Resource resource = AtomicOperationUtils.createResourceByType(ResourceTypeEnum.VF, UserRoleEnum.DESIGNER, true).left().value();
+		
+		AtomicOperationUtils.changeComponentState(resource, UserRoleEnum.DESIGNER, LifeCycleStatesEnum.CERTIFY, true);
+		
+//		HttpResponse componentToscaModel = AssetRestUtils.getComponentToscaModel(AssetTypeEnum.RESOURCES, resource.getUUID());
+		File toscaModelCsarFile = AssetRestUtils.getToscaModelCsarFile(AssetTypeEnum.RESOURCES, resource.getUUID());
+		
+		// validate tosca structure  
+		validateCsarContent(resource, toscaModelCsarFile);
+	
+		/*// Validate audit message
+		validateAudit(resource);*/
+
+	}
+	
+	
+	@Test
+	public void getServiceToscaModelCheckOutState() throws Exception {
+
+		Service service = AtomicOperationUtils.createDefaultService(UserRoleEnum.DESIGNER, true).left().value();
+		
+//		HttpResponse componentToscaModel = AssetRestUtils.getComponentToscaModel(AssetTypeEnum.RESOURCES, resource.getUUID());
+		File toscaModelCsarFile = AssetRestUtils.getToscaModelCsarFile(AssetTypeEnum.SERVICES, service.getUUID());
+		
+		// validate tosca structure  
+		validateCsarContent(service, toscaModelCsarFile);
+	
+		/*validateAudit(service);*/
+
+	}
+	
+	@Test
+	public void getServiceToscaModelCheckInState() throws Exception {
+		
+		Service service = AtomicOperationUtils.createDefaultService(UserRoleEnum.DESIGNER, true).left().value();
+		
+		AtomicOperationUtils.changeComponentState(service, UserRoleEnum.DESIGNER, LifeCycleStatesEnum.CHECKIN, true);
+		
+//		HttpResponse componentToscaModel = AssetRestUtils.getComponentToscaModel(AssetTypeEnum.RESOURCES, resource.getUUID());
+		File toscaModelCsarFile = AssetRestUtils.getToscaModelCsarFile(AssetTypeEnum.SERVICES, service.getUUID());
+		
+		// validate tosca structure  
+		validateCsarContent(service, toscaModelCsarFile);
+	
+		/*validateAudit(service);*/
+
+	}
+	
+	@Test
+	public void getServiceToscaModelCertifyState() throws Exception {
+		
+		Service service = AtomicOperationUtils.createDefaultService(UserRoleEnum.DESIGNER, true).left().value();
+		AtomicOperationUtils.uploadArtifactByType(ArtifactTypeEnum.OTHER, service, UserRoleEnum.DESIGNER, true, true);
+		AtomicOperationUtils.changeComponentState(service, UserRoleEnum.DESIGNER, LifeCycleStatesEnum.CERTIFY, true);
+		
+//		HttpResponse componentToscaModel = AssetRestUtils.getComponentToscaModel(AssetTypeEnum.RESOURCES, resource.getUUID());
+		File toscaModelCsarFile = AssetRestUtils.getToscaModelCsarFile(AssetTypeEnum.SERVICES, service.getUUID());
+		
+		// validate tosca structure  
+		validateCsarContent(service, toscaModelCsarFile);
+	
+		/*validateAudit(service);*/
+		
+	}
+	
+
+	/**
+	 * all files in list(expectedDefinitionFolderFileList) must be found in csar file 
+	 * @param resource
+	 * @param toscaModelCsarFile
+	 * @throws ZipException
+	 * @throws IOException
+	 */
+	public void validateCsarContent(Component resource, File toscaModelCsarFile) throws ZipException, IOException {
+		ZipFile zipFile = new ZipFile(toscaModelCsarFile);
+		List<String> expectedDefinitionFolderFileList = new ArrayList<String>();
+		expectedDefinitionFolderFileList.add("Definitions/"+ resource.getComponentType().getValue().toLowerCase()+"-"+ resource.getSystemName()+"-template.yml");
+		expectedDefinitionFolderFileList.add("Definitions/"+ resource.getComponentType().getValue().toLowerCase()+"-"+ resource.getSystemName()+"-template-interface.yml");
+		expectedDefinitionFolderFileList.add("Definitions/relationships.yml");
+		expectedDefinitionFolderFileList.add("Definitions/policies.yml");
+		expectedDefinitionFolderFileList.add("Definitions/nodes.yml");
+		expectedDefinitionFolderFileList.add("Definitions/interfaces.yml");
+		expectedDefinitionFolderFileList.add("Definitions/groups.yml");
+		expectedDefinitionFolderFileList.add("Definitions/data.yml");
+		expectedDefinitionFolderFileList.add("Definitions/capabilities.yml");
+		expectedDefinitionFolderFileList.add("Definitions/artifacts.yml");
+		expectedDefinitionFolderFileList.add("Definitions/annotations.yml");
+		
+		Enumeration<? extends ZipEntry> entries = zipFile.entries();
+		while(entries.hasMoreElements()){
+			ZipEntry nextElement = entries.nextElement();
+			if (!(nextElement.getName().contains("Artifacts")||nextElement.getName().contains("csar.meta"))){
+//				assertTrue("missing file in csar template", (nextElement.getName().equals("TOSCA-Metadata/TOSCA.meta") || 
+//						nextElement.getName().equals("Definitions/"+ resource.getComponentType().getValue().toLowerCase()+"-"+ resource.getSystemName()+"-template.yml")) ||
+//						nextElement.getName().equals("Definitions/"+ resource.getComponentType().getValue().toLowerCase()+"-"+ resource.getSystemName()+"-template-interface.yml"));
+				if(expectedDefinitionFolderFileList.contains(nextElement.getName())){
+					expectedDefinitionFolderFileList.remove(nextElement.getName());
+				}
+			}
+		}
+		zipFile.close();
+		assertTrue("missing files in csar template definitions folder", expectedDefinitionFolderFileList.size() == 0);
+	}
+	
+	/*public void validateAudit(Component resource) throws Exception {
+		ExpectedExternalAudit expectedAudit = null;
+		if (resource.getComponentType().equals(ComponentTypeEnum.RESOURCE)){
+		expectedAudit = ElementFactory.getDefaultExternalAuditObject(AssetTypeEnum.RESOURCES, AuditingActionEnum.GET_TOSCA_MODEL, ("/" + resource.getUUID() + "/toscaModel"));
+		}
+		else expectedAudit = ElementFactory.getDefaultExternalAuditObject(AssetTypeEnum.SERVICES, AuditingActionEnum.GET_TOSCA_MODEL, ("/" + resource.getUUID() + "/toscaModel"));
+		expectedAudit.setRESOURCE_NAME(resource.getName());
+		expectedAudit.setSERVICE_INSTANCE_ID(resource.getUUID());
+		expectedAudit.setRESOURCE_TYPE(resource.getComponentType().getValue());
+//		AuditValidationUtils.validateExternalAudit(expectedAudit, AuditingActionEnum.GET_TOSCA_MODEL.getName(),	null);
+
+		Map <AuditingFieldsKey, String> body = new HashMap<>();
+        body.put(AuditingFieldsKey.AUDIT_RESOURCE_NAME, expectedAudit.getRESOURCE_NAME());
+        AuditValidationUtils.validateExternalAudit(expectedAudit, AuditingActionEnum.GET_TOSCA_MODEL.getName(), body);
+
+	}*/
+	
+}
diff --git a/integration-tests/src/test/java/org/openecomp/sdc/externalApis/GetFilteredAssetServlet.java b/integration-tests/src/test/java/org/openecomp/sdc/externalApis/GetFilteredAssetServlet.java
new file mode 100644
index 0000000000..04203abd66
--- /dev/null
+++ b/integration-tests/src/test/java/org/openecomp/sdc/externalApis/GetFilteredAssetServlet.java
@@ -0,0 +1,583 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * SDC
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.sdc.externalApis;
+
+import org.junit.Rule;
+import org.junit.rules.TestName;
+import org.openecomp.sdc.be.dao.api.ActionStatus;
+import org.openecomp.sdc.be.datatypes.enums.AssetTypeEnum;
+import org.openecomp.sdc.be.datatypes.enums.ResourceTypeEnum;
+import org.openecomp.sdc.be.model.DistributionStatusEnum;
+import org.openecomp.sdc.be.model.Resource;
+import org.openecomp.sdc.be.model.Service;
+import org.openecomp.sdc.ci.tests.api.ComponentBaseTest;
+import org.openecomp.sdc.ci.tests.datatypes.*;
+import org.openecomp.sdc.ci.tests.datatypes.enums.*;
+import org.openecomp.sdc.ci.tests.datatypes.http.RestResponse;
+import org.openecomp.sdc.ci.tests.utils.Utils;
+import org.openecomp.sdc.ci.tests.utils.general.AtomicOperationUtils;
+import org.openecomp.sdc.ci.tests.utils.general.ElementFactory;
+import org.openecomp.sdc.ci.tests.utils.rest.*;
+import org.openecomp.sdc.ci.tests.utils.validation.ErrorValidationUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.testng.annotations.Test;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+import static org.testng.AssertJUnit.assertEquals;
+import static org.testng.AssertJUnit.assertNotNull;
+
+public class GetFilteredAssetServlet extends ComponentBaseTest {
+
+	private static Logger log = LoggerFactory.getLogger(GetAssetServlet.class.getName());
+	protected final static String categoryFilterKey = "category";
+	protected final static String subCategoryFilterKey = "subCategory";
+	protected final static String distributionStatusFilterKey = "distributionStatus";
+	protected final static String serviceKey = "service";
+	protected final static String resourceKey = "resource";
+	protected final static String resourceType = "resourceType";
+	protected final static String validFilterParameters = "[" + resourceType + ", "+ subCategoryFilterKey + ", " + categoryFilterKey + "]";
+
+	@Rule
+	public static TestName name = new TestName();
+
+//	@BeforeMethod
+//	public void setup() throws Exception {
+//		AtomicOperationUtils.createDefaultConsumer(true);
+//	}
+
+	// RESOURCE
+	// Success
+
+	@Test // (enabled = false)
+	public void getResourceAssetBySpecifiedCategory() throws Exception {
+		String[] filter = { categoryFilterKey + "=" + ResourceCategoryEnum.GENERIC_ABSTRACT.getCategory() };
+		List<String> expectedAssetNamesList = new ArrayList<>();
+
+		Resource resource1 = AtomicOperationUtils.createResourcesByTypeNormTypeAndCatregory(ResourceTypeEnum.VF, NormativeTypesEnum.COMPUTE, ResourceCategoryEnum.GENERIC_ABSTRACT, UserRoleEnum.DESIGNER, true).left().value();
+		expectedAssetNamesList.add(resource1.getName());
+		Resource resource2 = AtomicOperationUtils.createResourcesByTypeNormTypeAndCatregory(ResourceTypeEnum.VF, NormativeTypesEnum.DATABASE, ResourceCategoryEnum.GENERIC_NETWORK_ELEMENTS, UserRoleEnum.DESIGNER, true).left().value();
+		expectedAssetNamesList.add(resource2.getName());
+		Resource resource3 = AtomicOperationUtils.createResourcesByTypeNormTypeAndCatregory(ResourceTypeEnum.VF, NormativeTypesEnum.COMPUTE, ResourceCategoryEnum.NETWORK_CONNECTIVITY_CON_POINT, UserRoleEnum.DESIGNER, true).left().value();
+
+		RestResponse assetResponse = AssetRestUtils.getComponentListByAssetType(true, AssetTypeEnum.RESOURCES, filter);
+		BaseRestUtils.checkSuccess(assetResponse);
+
+		List<ResourceAssetStructure> resourceAssetList = AssetRestUtils.getResourceAssetList(assetResponse);
+		List<String> getActualAssetNamesList = AssetRestUtils.getResourceNamesList(resourceAssetList);
+		Utils.compareArrayLists(getActualAssetNamesList, expectedAssetNamesList, "Element");
+
+		/*// Validate audit message
+		validateSuccessAudit(filter, AssetTypeEnum.RESOURCES);*/
+
+	}
+
+	// 2 resources has the same category and different subcategory
+	@Test // (enabled = false)
+	public void getResourceAssetBySpecifiedCategoryAndSubCategory() throws Exception {
+		String[] filter = { categoryFilterKey + "=" + ResourceCategoryEnum.GENERIC_ABSTRACT.getCategory(), subCategoryFilterKey + "=" + ResourceCategoryEnum.GENERIC_ABSTRACT.getSubCategory() };
+		// String[] filter2 = {categoryFilterKey + "=" +
+		// ResourceCategoryEnum.GENERIC_NETWORK_ELEMENTS.getCategory(),
+		// subCategoryFilterKey + "=" +
+		// ResourceCategoryEnum.GENERIC_NETWORK_ELEMENTS.getSubCategory()};
+		List<String> expectedAssetNamesList = new ArrayList<>();
+
+		Resource resource1 = AtomicOperationUtils.createResourcesByTypeNormTypeAndCatregory(ResourceTypeEnum.VF, NormativeTypesEnum.COMPUTE, ResourceCategoryEnum.GENERIC_ABSTRACT, UserRoleEnum.DESIGNER, true).left().value();
+		expectedAssetNamesList.add(resource1.getName());
+		Resource resource2 = AtomicOperationUtils.createResourcesByTypeNormTypeAndCatregory(ResourceTypeEnum.VF, NormativeTypesEnum.DATABASE, ResourceCategoryEnum.GENERIC_NETWORK_ELEMENTS, UserRoleEnum.DESIGNER, true).left().value();
+
+		RestResponse assetResponse = AssetRestUtils.getComponentListByAssetType(true, AssetTypeEnum.RESOURCES, filter);
+		BaseRestUtils.checkSuccess(assetResponse);
+
+		List<ServiceAssetStructure> resourceAssetList = AssetRestUtils.getServiceAssetList(assetResponse);
+		List<String> getActualAssetNamesList = AssetRestUtils.getServiceNamesList(resourceAssetList);
+		Utils.compareArrayLists(getActualAssetNamesList, expectedAssetNamesList, "Element");
+
+		/*// Validate audit message
+		validateSuccessAudit(filter, AssetTypeEnum.RESOURCES);*/
+	}
+
+	@Test // (enabled = false)
+	public void getResourceAssetBySpecifiedSubCategoryAndCategory() throws Exception {
+		String[] filter = { subCategoryFilterKey + "=" + ResourceCategoryEnum.GENERIC_DATABASE.getSubCategory(), categoryFilterKey + "=" + ResourceCategoryEnum.GENERIC_DATABASE.getCategory(), };
+		List<String> expectedAssetNamesList = new ArrayList<>();
+
+		Resource resource1 = AtomicOperationUtils.createResourcesByTypeNormTypeAndCatregory(ResourceTypeEnum.VF, NormativeTypesEnum.COMPUTE, ResourceCategoryEnum.GENERIC_ABSTRACT, UserRoleEnum.DESIGNER, true).left().value();
+		Resource resource2 = AtomicOperationUtils.createResourcesByTypeNormTypeAndCatregory(ResourceTypeEnum.VF, NormativeTypesEnum.DATABASE, ResourceCategoryEnum.GENERIC_DATABASE, UserRoleEnum.DESIGNER, true).left().value();
+		expectedAssetNamesList.add(resource2.getName());
+
+		RestResponse assetResponse = AssetRestUtils.getComponentListByAssetType(true, AssetTypeEnum.RESOURCES, filter);
+		BaseRestUtils.checkSuccess(assetResponse);
+
+		List<ServiceAssetStructure> resourceAssetList = AssetRestUtils.getServiceAssetList(assetResponse);
+		List<String> getActualAssetNamesList = AssetRestUtils.getServiceNamesList(resourceAssetList);
+		Utils.compareArrayLists(getActualAssetNamesList, expectedAssetNamesList, "Element");
+
+		/*// Validate audit message
+		validateSuccessAudit(filter, AssetTypeEnum.RESOURCES);*/
+	}
+
+	// Failure
+	@Test // (enabled = false)
+	public void getResourceAssetCategoryNotExists() throws Exception {
+		String[] filter = { categoryFilterKey + "=" + "NotExistingCategory" };
+
+		RestResponse assetResponse = AssetRestUtils.getComponentListByAssetType(true, AssetTypeEnum.RESOURCES, filter);
+		ErrorInfo errorInfo = ErrorValidationUtils.parseErrorConfigYaml(ActionStatus.COMPONENT_CATEGORY_NOT_FOUND.name());
+
+		assertNotNull("check response object is not null after create resouce", assetResponse);
+		assertNotNull("check error code exists in response after create resource", assetResponse.getErrorCode());
+		assertEquals("Check response code after create resource", errorInfo.getCode(), assetResponse.getErrorCode());
+
+		List<String> variables = Arrays.asList(resourceKey, categoryFilterKey, "NotExistingCategory");
+		ErrorValidationUtils.checkBodyResponseOnError(ActionStatus.COMPONENT_CATEGORY_NOT_FOUND.name(), variables, assetResponse.getResponse());
+
+		/*// Validate audit message
+		validateFailureAudit(filter, errorInfo, variables, AssetTypeEnum.RESOURCES)*/;
+	}
+
+	@Test // (enabled = false)
+	public void getResourceAssetSubCategoryNotExists() throws Exception {
+		String[] filter = { categoryFilterKey + "=" + ResourceCategoryEnum.GENERIC_ABSTRACT.getCategory(), subCategoryFilterKey + "=" + "NotExistingSubCategory" };
+
+		RestResponse assetResponse = AssetRestUtils.getComponentListByAssetType(true, AssetTypeEnum.RESOURCES, filter);
+		ErrorInfo errorInfo = ErrorValidationUtils.parseErrorConfigYaml(ActionStatus.COMPONENT_SUB_CATEGORY_NOT_FOUND_FOR_CATEGORY.name());
+
+		assertNotNull("check response object is not null after create resouce", assetResponse);
+		assertNotNull("check error code exists in response after create resource", assetResponse.getErrorCode());
+		assertEquals("Check response code after create resource", errorInfo.getCode(), assetResponse.getErrorCode());
+
+		List<String> variables = Arrays.asList("Resource", "NotExistingSubCategory", ResourceCategoryEnum.GENERIC_ABSTRACT.getCategory());
+		ErrorValidationUtils.checkBodyResponseOnError(ActionStatus.COMPONENT_SUB_CATEGORY_NOT_FOUND_FOR_CATEGORY.name(), variables, assetResponse.getResponse());
+
+		/*// Validate audit message
+		validateFailureAudit(filter, errorInfo, variables, AssetTypeEnum.RESOURCES);*/
+	}
+
+	@Test // (enabled = false)
+	public void getResourceAssetCategoryNotExistsSubCategoryExists() throws Exception {
+		String[] filter = { subCategoryFilterKey + "=" + ResourceCategoryEnum.NETWORK_L2_3_GETEWAY.getSubCategory(), categoryFilterKey + "=" + "NotExistingCategory" };
+
+		RestResponse assetResponse = AssetRestUtils.getComponentListByAssetType(true, AssetTypeEnum.RESOURCES, filter);
+		ErrorInfo errorInfo = ErrorValidationUtils.parseErrorConfigYaml(ActionStatus.COMPONENT_CATEGORY_NOT_FOUND.name());
+
+		assertNotNull("check response object is not null after create resouce", assetResponse);
+		assertNotNull("check error code exists in response after create resource", assetResponse.getErrorCode());
+		assertEquals("Check response code after create resource", errorInfo.getCode(), assetResponse.getErrorCode());
+
+		List<String> variables = Arrays.asList(resourceKey, categoryFilterKey, "NotExistingCategory");
+		ErrorValidationUtils.checkBodyResponseOnError(ActionStatus.COMPONENT_CATEGORY_NOT_FOUND.name(), variables, assetResponse.getResponse());
+
+		/*// Validate audit message
+		validateFailureAudit(filter, errorInfo, variables, AssetTypeEnum.RESOURCES);*/
+	}
+
+	@Test // (enabled = false)
+	public void getResourceAssetInvalidFilterKey() throws Exception {
+		String[] filter = { subCategoryFilterKey + "1=" + ResourceCategoryEnum.NETWORK_L2_3_GETEWAY.getSubCategory(), categoryFilterKey + "=" + "NotExistingCategory" };
+
+		RestResponse assetResponse = AssetRestUtils.getComponentListByAssetType(true, AssetTypeEnum.RESOURCES, filter);
+		ErrorInfo errorInfo = ErrorValidationUtils.parseErrorConfigYaml(ActionStatus.INVALID_FILTER_KEY.name());
+
+		assertNotNull("check response object is not null after create resouce", assetResponse);
+		assertNotNull("check error code exists in response after create resource", assetResponse.getErrorCode());
+		assertEquals("Check response code after create resource", errorInfo.getCode(), assetResponse.getErrorCode());
+
+		List<String> variables = Arrays.asList(subCategoryFilterKey + "1", validFilterParameters);
+		ErrorValidationUtils.checkBodyResponseOnError(ActionStatus.INVALID_FILTER_KEY.name(), variables, assetResponse.getResponse());
+
+		/*// Validate audit message
+		validateFailureAudit(filter, errorInfo, variables, AssetTypeEnum.RESOURCES);*/
+	}
+
+	// ---------------------------------------------------------------------------------------------------------
+	// SERVICE
+	// Success
+	@Test // (enabled = false)
+	public void getServiceAssetBySpecifiedCategory() throws Exception {
+		String[] filter = { categoryFilterKey + "=" + ServiceCategoriesEnum.MOBILITY.getValue() };
+		List<String> expectedAssetNamesList = new ArrayList<>();
+
+		Service service1 = AtomicOperationUtils.createServiceByCategory(ServiceCategoriesEnum.MOBILITY, UserRoleEnum.DESIGNER, true).left().value();
+		expectedAssetNamesList.add(service1.getName());
+
+		RestResponse assetResponse = AssetRestUtils.getComponentListByAssetType(true, AssetTypeEnum.SERVICES, filter);
+		BaseRestUtils.checkSuccess(assetResponse);
+
+		List<ServiceAssetStructure> serviceAssetList = AssetRestUtils.getServiceAssetList(assetResponse);
+		List<String> getActualAssetNamesList = AssetRestUtils.getServiceNamesList(serviceAssetList);
+		Utils.compareArrayLists(getActualAssetNamesList, expectedAssetNamesList, "Element");
+
+		/*// Validate audit message
+		validateSuccessAudit(filter, AssetTypeEnum.SERVICES);*/
+	}
+
+	@Test // (enabled = false)
+	public void getServiceAssetBySpecifiedCategoryAndDistributionStatus() throws Exception {
+		String[] filter = { categoryFilterKey + "=" + ServiceCategoriesEnum.MOBILITY.getValue(), distributionStatusFilterKey + "=" + DistributionStatusEnum.DISTRIBUTION_NOT_APPROVED };
+		List<String> expectedAssetNamesList = new ArrayList<>();
+		ArtifactReqDetails artifactDetails = ElementFactory.getArtifactByType(ArtifactTypeEnum.OTHER, ArtifactTypeEnum.OTHER, true);
+
+		Service service1 = AtomicOperationUtils.createServiceByCategory(ServiceCategoriesEnum.MOBILITY, UserRoleEnum.DESIGNER, true).left().value();
+		expectedAssetNamesList.add(service1.getName());
+		Service service2 = AtomicOperationUtils.createServiceByCategory(ServiceCategoriesEnum.MOBILITY, UserRoleEnum.DESIGNER, true).left().value();
+		RestResponse addInformationalArtifactToService = ArtifactRestUtils.addInformationalArtifactToService(artifactDetails, ElementFactory.getDefaultUser(UserRoleEnum.DESIGNER), service2.getUniqueId());
+		BaseRestUtils.checkSuccess(addInformationalArtifactToService);
+		service2 = (Service) AtomicOperationUtils.changeComponentState(service2, UserRoleEnum.DESIGNER, LifeCycleStatesEnum.CERTIFY, true).getLeft();
+		expectedAssetNamesList.add(service2.getName());
+
+		RestResponse assetResponse = AssetRestUtils.getComponentListByAssetType(true, AssetTypeEnum.SERVICES, filter);
+		BaseRestUtils.checkSuccess(assetResponse);
+
+		List<ServiceAssetStructure> serviceAssetList = AssetRestUtils.getServiceAssetList(assetResponse);
+		List<String> getActualAssetNamesList = AssetRestUtils.getServiceNamesList(serviceAssetList);
+		Utils.compareArrayLists(getActualAssetNamesList, expectedAssetNamesList, "Element");
+
+		/*// Validate audit message
+		validateSuccessAudit(filter, AssetTypeEnum.SERVICES);*/
+	}
+
+	@Test // (enabled = false)
+	public void getServiceAssetByDistributionStatus() throws Exception {
+		String[] filter = { distributionStatusFilterKey + "=" + DistributionStatusEnum.DISTRIBUTION_NOT_APPROVED };
+		List<String> expectedAssetNamesList = new ArrayList<>();
+		ArtifactReqDetails artifactDetails = ElementFactory.getArtifactByType(ArtifactTypeEnum.OTHER, ArtifactTypeEnum.OTHER, true);
+
+		Service service1 = AtomicOperationUtils.createServiceByCategory(ServiceCategoriesEnum.MOBILITY, UserRoleEnum.DESIGNER, true).left().value();
+		expectedAssetNamesList.add(service1.getName());
+		Service service2 = AtomicOperationUtils.createServiceByCategory(ServiceCategoriesEnum.MOBILITY, UserRoleEnum.DESIGNER, true).left().value();
+		RestResponse addInformationalArtifactToService = ArtifactRestUtils.addInformationalArtifactToService(artifactDetails, ElementFactory.getDefaultUser(UserRoleEnum.DESIGNER), service2.getUniqueId());
+		BaseRestUtils.checkSuccess(addInformationalArtifactToService);
+		service2 = (Service) AtomicOperationUtils.changeComponentState(service2, UserRoleEnum.DESIGNER, LifeCycleStatesEnum.CERTIFY, true).getLeft();
+		ServiceRestUtils.approveServiceDistribution(service2.getUniqueId(), UserRoleEnum.GOVERNOR.getUserId());
+
+		RestResponse assetResponse = AssetRestUtils.getComponentListByAssetType(true, AssetTypeEnum.SERVICES, filter);
+		BaseRestUtils.checkSuccess(assetResponse);
+
+		List<ServiceAssetStructure> serviceAssetList = AssetRestUtils.getServiceAssetList(assetResponse);
+		List<String> getActualAssetNamesList = AssetRestUtils.getServiceNamesList(serviceAssetList);
+		Utils.compareArrayLists(getActualAssetNamesList, expectedAssetNamesList, "Element");
+
+		/*// Validate audit message
+		validateSuccessAudit(filter, AssetTypeEnum.SERVICES);*/
+	}
+
+	// Failure
+	@Test // (enabled = false)
+	public void getServiceAssetCategoryNotExists() throws Exception {
+		String[] filter = { categoryFilterKey + "=" + "NotExistingCategory" };
+
+		RestResponse assetResponse = AssetRestUtils.getComponentListByAssetType(true, AssetTypeEnum.SERVICES, filter);
+		ErrorInfo errorInfo = ErrorValidationUtils.parseErrorConfigYaml(ActionStatus.COMPONENT_CATEGORY_NOT_FOUND.name());
+
+		assertNotNull("check response object is not null after create resouce", assetResponse);
+		assertNotNull("check error code exists in response after create resource", assetResponse.getErrorCode());
+		assertEquals("Check response code after create resource", errorInfo.getCode(), assetResponse.getErrorCode());
+
+		List<String> variables = Arrays.asList(serviceKey, categoryFilterKey, "NotExistingCategory");
+		ErrorValidationUtils.checkBodyResponseOnError(ActionStatus.COMPONENT_CATEGORY_NOT_FOUND.name(), variables, assetResponse.getResponse());
+
+		/*// Validate audit message
+		validateFailureAudit(filter, errorInfo, variables, AssetTypeEnum.SERVICES);*/
+	}
+
+	@Test // (enabled = false)
+	public void getServiceAssetInvalidDistributionStatus() throws Exception {
+		String[] filter = { distributionStatusFilterKey + "=" + "NotExistingDistributionStatus" };
+		RestResponse assetResponse = AssetRestUtils.getComponentListByAssetType(true, AssetTypeEnum.SERVICES, filter);
+		ErrorInfo errorInfo = ErrorValidationUtils.parseErrorConfigYaml(ActionStatus.COMPONENT_CATEGORY_NOT_FOUND.name());
+
+		assertNotNull("check response object is not null after create resouce", assetResponse);
+		assertNotNull("check error code exists in response after create resource", assetResponse.getErrorCode());
+		assertEquals("Check response code after create resource", errorInfo.getCode(), assetResponse.getErrorCode());
+
+		List<String> variables = Arrays.asList(serviceKey, distributionStatusFilterKey, "NotExistingDistributionStatus");
+		ErrorValidationUtils.checkBodyResponseOnError(ActionStatus.COMPONENT_CATEGORY_NOT_FOUND.name(), variables, assetResponse.getResponse());
+
+		/*// Validate audit message
+		validateFailureAudit(filter, errorInfo, variables, AssetTypeEnum.SERVICES);*/
+	}
+
+	@Test // (enabled = false)
+	public void getServiceAssetCategoryExitsDistributionStatusInvalid() throws Exception {
+		String[] filter = { categoryFilterKey + "=" + ServiceCategoriesEnum.MOBILITY.getValue(), distributionStatusFilterKey + "=" + "NotExistingDistributionStatus" };
+
+		RestResponse assetResponse = AssetRestUtils.getComponentListByAssetType(true, AssetTypeEnum.SERVICES, filter);
+		ErrorInfo errorInfo = ErrorValidationUtils.parseErrorConfigYaml(ActionStatus.COMPONENT_CATEGORY_NOT_FOUND.name());
+
+		assertNotNull("check response object is not null after create resouce", assetResponse);
+		assertNotNull("check error code exists in response after create resource", assetResponse.getErrorCode());
+		assertEquals("Check response code after create resource", errorInfo.getCode(), assetResponse.getErrorCode());
+
+		List<String> variables = Arrays.asList(serviceKey, distributionStatusFilterKey, "NotExistingDistributionStatus");
+		ErrorValidationUtils.checkBodyResponseOnError(ActionStatus.COMPONENT_CATEGORY_NOT_FOUND.name(), variables, assetResponse.getResponse());
+
+		/*// Validate audit message
+		validateFailureAudit(filter, errorInfo, variables, AssetTypeEnum.SERVICES);*/
+	}
+
+	@Test // (enabled = false)
+	public void getServiceAssetCategoryNotExistsDistributionStatus() throws Exception {
+		String[] filter = { distributionStatusFilterKey + "=" + DistributionStatusEnum.DISTRIBUTION_NOT_APPROVED, categoryFilterKey + "=" + "NotExistingCategory" };
+
+		RestResponse assetResponse = AssetRestUtils.getComponentListByAssetType(true, AssetTypeEnum.SERVICES, filter);
+		ErrorInfo errorInfo = ErrorValidationUtils.parseErrorConfigYaml(ActionStatus.COMPONENT_CATEGORY_NOT_FOUND.name());
+
+		assertNotNull("check response object is not null after create resouce", assetResponse);
+		assertNotNull("check error code exists in response after create resource", assetResponse.getErrorCode());
+		assertEquals("Check response code after create resource", errorInfo.getCode(), assetResponse.getErrorCode());
+
+		List<String> variables = Arrays.asList(serviceKey, categoryFilterKey, "NotExistingCategory");
+		ErrorValidationUtils.checkBodyResponseOnError(ActionStatus.COMPONENT_CATEGORY_NOT_FOUND.name(), variables, assetResponse.getResponse());
+
+		/*// Validate audit message
+		validateFailureAudit(filter, errorInfo, variables, AssetTypeEnum.SERVICES);*/
+	}
+
+	@Test // (enabled = false)
+	public void getServiceAssetInvalidFilterKey() throws Exception {
+		String[] filter = { distributionStatusFilterKey + "1=" + DistributionStatusEnum.DISTRIBUTION_NOT_APPROVED, categoryFilterKey + "=" + ServiceCategoriesEnum.MOBILITY.getValue() };
+
+		RestResponse assetResponse = AssetRestUtils.getComponentListByAssetType(true, AssetTypeEnum.SERVICES, filter);
+		ErrorInfo errorInfo = ErrorValidationUtils.parseErrorConfigYaml(ActionStatus.INVALID_FILTER_KEY.name());
+
+		assertNotNull("check response object is not null after create resouce", assetResponse);
+		assertNotNull("check error code exists in response after create resource", assetResponse.getErrorCode());
+		assertEquals("Check response code after create resource", errorInfo.getCode(), assetResponse.getErrorCode());
+
+		List<String> variables = Arrays.asList(distributionStatusFilterKey + "1", "[" + categoryFilterKey + ", " + distributionStatusFilterKey + "]");
+		ErrorValidationUtils.checkBodyResponseOnError(ActionStatus.INVALID_FILTER_KEY.name(), variables, assetResponse.getResponse());
+
+		/*// Validate audit message
+		validateFailureAudit(filter, errorInfo, variables, AssetTypeEnum.SERVICES);*/
+
+	}
+	
+	@Test
+	public void getFilteredResourceAssetCategoryNotFound() throws Exception {
+
+		String query = "category=Application%20L3%2B";
+		RestResponse assetResponse = AssetRestUtils.getFilteredComponentList(AssetTypeEnum.RESOURCES, query);
+		BaseRestUtils.checkErrorResponse(assetResponse, ActionStatus.COMPONENT_CATEGORY_NOT_FOUND, "resource", "category", "Application L3+");
+
+		/*// Validate audit message
+		ExpectedExternalAudit expectedAssetListAudit = ElementFactory.getFilteredAssetListAuditCategoryNotFound(AssetTypeEnum.RESOURCES, "?" + query, "Application L3+");
+		Map <AuditingFieldsKey, String> body = new HashMap<>();
+        body.put(AuditingFieldsKey.AUDIT_RESOURCE_URL, expectedAssetListAudit.getRESOURCE_URL());
+        AuditValidationUtils.validateExternalAudit(expectedAssetListAudit, AuditingActionEnum.GET_FILTERED_ASSET_LIST.getName(), body);*/
+
+	}
+	
+	@Test
+	public void getFilteredResourceAssetSuccess() throws Exception {
+
+		List<String> expectedAssetNamesList = new ArrayList<>();
+
+		ResourceReqDetails resourceDetails = ElementFactory.getDefaultResource(ResourceCategoryEnum.APPLICATION_L4_APP_SERVER);
+		resourceDetails.setResourceType(ResourceTypeEnum.VF.name());
+		Resource resource = AtomicOperationUtils.createResourceByResourceDetails(resourceDetails, UserRoleEnum.DESIGNER, true).left().value();
+		expectedAssetNamesList.add(resource.getName());
+
+		resourceDetails = ElementFactory.getDefaultResource(ResourceCategoryEnum.APPLICATION_L4_BORDER);
+		resourceDetails.setResourceType(ResourceTypeEnum.VFC.name());
+		resource = AtomicOperationUtils.createResourceByResourceDetails(resourceDetails, UserRoleEnum.DESIGNER, true).left().value();
+		resource = (Resource) AtomicOperationUtils.changeComponentState(resource, UserRoleEnum.DESIGNER, LifeCycleStatesEnum.CERTIFY, true).getLeft();
+		resource = (Resource) AtomicOperationUtils.changeComponentState(resource, UserRoleEnum.DESIGNER, LifeCycleStatesEnum.CHECKOUT, true).getLeft();
+		resource = (Resource) AtomicOperationUtils.changeComponentState(resource, UserRoleEnum.DESIGNER, LifeCycleStatesEnum.CHECKIN, true).getLeft();
+		resource = (Resource) AtomicOperationUtils.changeComponentState(resource, UserRoleEnum.DESIGNER, LifeCycleStatesEnum.CHECKOUT, true).getLeft();
+
+		resourceDetails = ElementFactory.getDefaultResource(ResourceCategoryEnum.GENERIC_INFRASTRUCTURE);
+		resourceDetails.setResourceType(ResourceTypeEnum.VF.name());
+		resource = AtomicOperationUtils.createResourceByResourceDetails(resourceDetails, UserRoleEnum.DESIGNER, true).left().value();
+		resource = (Resource) AtomicOperationUtils.changeComponentState(resource, UserRoleEnum.DESIGNER, LifeCycleStatesEnum.CERTIFY, true).getLeft();
+		resource = (Resource) AtomicOperationUtils.changeComponentState(resource, UserRoleEnum.DESIGNER, LifeCycleStatesEnum.CERTIFY, true).getLeft();
+		resource = (Resource) AtomicOperationUtils.changeComponentState(resource, UserRoleEnum.DESIGNER, LifeCycleStatesEnum.CERTIFY, true).getLeft();
+
+		resourceDetails = ElementFactory.getDefaultResource(ResourceCategoryEnum.APPLICATION_L4_FIREWALL);
+		resourceDetails.setResourceType(ResourceTypeEnum.VF.name());
+		resource = AtomicOperationUtils.createResourceByResourceDetails(resourceDetails, UserRoleEnum.DESIGNER, true).left().value();
+		resource = (Resource) AtomicOperationUtils.changeComponentState(resource, UserRoleEnum.DESIGNER, LifeCycleStatesEnum.CERTIFY, true).getLeft();
+		resource = (Resource) AtomicOperationUtils.changeComponentState(resource, UserRoleEnum.DESIGNER, LifeCycleStatesEnum.CERTIFY, true).getLeft();
+		resource = (Resource) AtomicOperationUtils.changeComponentState(resource, UserRoleEnum.DESIGNER, LifeCycleStatesEnum.CERTIFY, true).getLeft();
+		expectedAssetNamesList.add(resource.getName());
+
+		log.debug("4 resources created");
+		String query = "category=Application%20L4%2B";
+		RestResponse assetResponse = AssetRestUtils.getFilteredComponentList(AssetTypeEnum.RESOURCES, query);
+		BaseRestUtils.checkSuccess(assetResponse);
+
+		List<ResourceAssetStructure> resourceAssetList = AssetRestUtils.getResourceAssetList(assetResponse);
+		List<String> getActualAssetNamesList = AssetRestUtils.getResourceNamesList(resourceAssetList);
+		Utils.compareArrayLists(getActualAssetNamesList, expectedAssetNamesList, "Element");
+
+//			Andrey L. This condition can not be checked in case resources list has two or ore different resource types
+//			AssetRestUtils.checkResourceTypeInObjectList(resourceAssetList, ResourceTypeEnum.VF);
+
+		/*// Validate audit message
+		validateFilteredAudit(query, AssetTypeEnum.RESOURCES);*/
+
+	}
+
+	/*@Test
+	public void getFilteredServiceAssetInformationalSuccess() throws Exception {
+
+		List<String> expectedAssetNamesList = new ArrayList<>();
+		ArtifactReqDetails artifactDetails = ElementFactory.getArtifactByType(ArtifactTypeEnum.OTHER, ArtifactTypeEnum.OTHER, true);
+		artifactDetails.setArtifactGroupType(ArtifactGroupTypeEnum.INFORMATIONAL.getType());
+
+		ServiceReqDetails serviceDetails = ElementFactory.getDefaultService();
+		Service service = AtomicOperationUtils.createCustomService(serviceDetails, UserRoleEnum.DESIGNER, true).left().value();
+
+		serviceDetails = ElementFactory.getDefaultService();
+		service = AtomicOperationUtils.createCustomService(serviceDetails, UserRoleEnum.DESIGNER, true).left().value();
+		RestResponse addInformationalArtifactToService = ArtifactRestUtils.addInformationalArtifactToService(artifactDetails, ElementFactory.getDefaultUser(UserRoleEnum.DESIGNER), service.getUniqueId());
+		BaseRestUtils.checkSuccess(addInformationalArtifactToService);
+		service = (Service) AtomicOperationUtils.changeComponentState(service, UserRoleEnum.DESIGNER, LifeCycleStatesEnum.CERTIFY, true).getLeft();
+
+		ServiceReqDetails certifyService = new ServiceReqDetails(service);
+		LifecycleRestUtils.changeDistributionStatus(certifyService, certifyService.getVersion(), ElementFactory.getDefaultUser(UserRoleEnum.GOVERNOR), null, DistributionStatusEnum.DISTRIBUTION_APPROVED);
+		AtomicOperationUtils.distributeService(service, false);
+		expectedAssetNamesList.add(service.getName());
+
+		serviceDetails = ElementFactory.getDefaultService();
+		service = AtomicOperationUtils.createCustomService(serviceDetails, UserRoleEnum.DESIGNER, true).left().value();
+		addInformationalArtifactToService = ArtifactRestUtils.addInformationalArtifactToService(artifactDetails, ElementFactory.getDefaultUser(UserRoleEnum.DESIGNER), service.getUniqueId());
+		BaseRestUtils.checkSuccess(addInformationalArtifactToService);
+		service = (Service) AtomicOperationUtils.changeComponentState(service, UserRoleEnum.DESIGNER, LifeCycleStatesEnum.CERTIFY, true).getLeft();
+		service = (Service) AtomicOperationUtils.changeComponentState(service, UserRoleEnum.DESIGNER, LifeCycleStatesEnum.CERTIFY, true).getLeft();
+		service = (Service) AtomicOperationUtils.changeComponentState(service, UserRoleEnum.DESIGNER, LifeCycleStatesEnum.CERTIFY, true).getLeft();
+		certifyService = new ServiceReqDetails(service);
+		LifecycleRestUtils.changeDistributionStatus(certifyService, certifyService.getVersion(), ElementFactory.getDefaultUser(UserRoleEnum.GOVERNOR), null, DistributionStatusEnum.DISTRIBUTION_APPROVED);
+		AtomicOperationUtils.distributeService(service, false);
+		expectedAssetNamesList.add(service.getName());
+
+		serviceDetails = ElementFactory.getDefaultService();
+		service = AtomicOperationUtils.createCustomService(serviceDetails, UserRoleEnum.DESIGNER, true).left().value();
+		service = (Service) AtomicOperationUtils.changeComponentState(service, UserRoleEnum.DESIGNER, LifeCycleStatesEnum.CHECKIN, true).getLeft();
+		service = (Service) AtomicOperationUtils.changeComponentState(service, UserRoleEnum.DESIGNER, LifeCycleStatesEnum.CHECKOUT, true).getLeft();
+		service = (Service) AtomicOperationUtils.changeComponentState(service, UserRoleEnum.DESIGNER, LifeCycleStatesEnum.CHECKIN, true).getLeft();
+		service = (Service) AtomicOperationUtils.changeComponentState(service, UserRoleEnum.DESIGNER, LifeCycleStatesEnum.CHECKOUT, true).getLeft();
+		service = (Service) AtomicOperationUtils.changeComponentState(service, UserRoleEnum.DESIGNER, LifeCycleStatesEnum.CHECKIN, true).getLeft();
+
+		serviceDetails = ElementFactory.getDefaultService();
+		service = AtomicOperationUtils.createCustomService(serviceDetails, UserRoleEnum.DESIGNER, true).left().value();
+		service = (Service) AtomicOperationUtils.changeComponentState(service, UserRoleEnum.DESIGNER, LifeCycleStatesEnum.CHECKIN, true).getLeft();
+		service = (Service) AtomicOperationUtils.changeComponentState(service, UserRoleEnum.DESIGNER, LifeCycleStatesEnum.CHECKOUT, true).getLeft();
+		service = (Service) AtomicOperationUtils.changeComponentState(service, UserRoleEnum.DESIGNER, LifeCycleStatesEnum.CHECKIN, true).getLeft();
+		service = (Service) AtomicOperationUtils.changeComponentState(service, UserRoleEnum.DESIGNER, LifeCycleStatesEnum.CHECKOUT, true).getLeft();
+
+		String query = "distributionStatus=Distributed";
+		RestResponse assetResponse = AssetRestUtils.getFilteredComponentList(AssetTypeEnum.SERVICES, query);
+		BaseRestUtils.checkSuccess(assetResponse);
+
+		List<ServiceAssetStructure> resourceAssetList = AssetRestUtils.getServiceAssetList(assetResponse);
+		List<String> getActualAssetNamesList = AssetRestUtils.getServiceNamesList(resourceAssetList);
+		Utils.compareArrayLists(getActualAssetNamesList, expectedAssetNamesList, "Element");
+
+	}*/
+
+	@Test
+	public void getFilteredServiceAssetDeploymentSuccess() throws Exception {
+
+		List<String> expectedAssetNamesList = new ArrayList<>();
+		ArtifactReqDetails artifactDetails = ElementFactory.getArtifactByType(ArtifactTypeEnum.OTHER, ArtifactTypeEnum.OTHER, true);
+
+		ServiceReqDetails serviceDetails = ElementFactory.getDefaultService();
+		Service service = AtomicOperationUtils.createCustomService(serviceDetails, UserRoleEnum.DESIGNER, true).left().value();
+
+		serviceDetails = ElementFactory.getDefaultService();
+		service = AtomicOperationUtils.createCustomService(serviceDetails, UserRoleEnum.DESIGNER, true).left().value();
+		RestResponse addInformationalArtifactToService = ArtifactRestUtils.addInformationalArtifactToService(artifactDetails, ElementFactory.getDefaultUser(UserRoleEnum.DESIGNER), service.getUniqueId());
+		BaseRestUtils.checkSuccess(addInformationalArtifactToService);
+		service = (Service) AtomicOperationUtils.changeComponentState(service, UserRoleEnum.DESIGNER, LifeCycleStatesEnum.CERTIFY, true).getLeft();
+
+		ServiceReqDetails certifyService = new ServiceReqDetails(service);
+		LifecycleRestUtils.changeDistributionStatus(certifyService, certifyService.getVersion(), ElementFactory.getDefaultUser(UserRoleEnum.GOVERNOR), null, DistributionStatusEnum.DISTRIBUTED);
+		AtomicOperationUtils.distributeService(service, false);
+		expectedAssetNamesList.add(service.getName());
+
+		serviceDetails = ElementFactory.getDefaultService();
+		service = AtomicOperationUtils.createCustomService(serviceDetails, UserRoleEnum.DESIGNER, true).left().value();
+		addInformationalArtifactToService = ArtifactRestUtils.addInformationalArtifactToService(artifactDetails, ElementFactory.getDefaultUser(UserRoleEnum.DESIGNER), service.getUniqueId());
+		BaseRestUtils.checkSuccess(addInformationalArtifactToService);
+		service = (Service) AtomicOperationUtils.changeComponentState(service, UserRoleEnum.DESIGNER, LifeCycleStatesEnum.CERTIFY, true).getLeft();
+		service = (Service) AtomicOperationUtils.changeComponentState(service, UserRoleEnum.DESIGNER, LifeCycleStatesEnum.CERTIFY, true).getLeft();
+		service = (Service) AtomicOperationUtils.changeComponentState(service, UserRoleEnum.DESIGNER, LifeCycleStatesEnum.CERTIFY, true).getLeft();
+		certifyService = new ServiceReqDetails(service);
+		LifecycleRestUtils.changeDistributionStatus(certifyService, certifyService.getVersion(), ElementFactory.getDefaultUser(UserRoleEnum.GOVERNOR), null, DistributionStatusEnum.DISTRIBUTED);
+		AtomicOperationUtils.distributeService(service, false);
+		expectedAssetNamesList.add(service.getName());
+
+		serviceDetails = ElementFactory.getDefaultService();
+		service = AtomicOperationUtils.createCustomService(serviceDetails, UserRoleEnum.DESIGNER, true).left().value();
+		service = (Service) AtomicOperationUtils.changeComponentState(service, UserRoleEnum.DESIGNER, LifeCycleStatesEnum.CHECKIN, true).getLeft();
+		service = (Service) AtomicOperationUtils.changeComponentState(service, UserRoleEnum.DESIGNER, LifeCycleStatesEnum.CHECKOUT, true).getLeft();
+		service = (Service) AtomicOperationUtils.changeComponentState(service, UserRoleEnum.DESIGNER, LifeCycleStatesEnum.CHECKIN, true).getLeft();
+		service = (Service) AtomicOperationUtils.changeComponentState(service, UserRoleEnum.DESIGNER, LifeCycleStatesEnum.CHECKOUT, true).getLeft();
+		service = (Service) AtomicOperationUtils.changeComponentState(service, UserRoleEnum.DESIGNER, LifeCycleStatesEnum.CHECKIN, true).getLeft();
+
+		serviceDetails = ElementFactory.getDefaultService();
+		service = AtomicOperationUtils.createCustomService(serviceDetails, UserRoleEnum.DESIGNER, true).left().value();
+		service = (Service) AtomicOperationUtils.changeComponentState(service, UserRoleEnum.DESIGNER, LifeCycleStatesEnum.CHECKIN, true).getLeft();
+		service = (Service) AtomicOperationUtils.changeComponentState(service, UserRoleEnum.DESIGNER, LifeCycleStatesEnum.CHECKOUT, true).getLeft();
+		service = (Service) AtomicOperationUtils.changeComponentState(service, UserRoleEnum.DESIGNER, LifeCycleStatesEnum.CHECKIN, true).getLeft();
+		service = (Service) AtomicOperationUtils.changeComponentState(service, UserRoleEnum.DESIGNER, LifeCycleStatesEnum.CHECKOUT, true).getLeft();
+
+		String query = "distributionStatus=Distributed";
+		RestResponse assetResponse = AssetRestUtils.getFilteredComponentList(AssetTypeEnum.SERVICES, query);
+		BaseRestUtils.checkSuccess(assetResponse);
+
+		List<ServiceAssetStructure> resourceAssetList = AssetRestUtils.getServiceAssetList(assetResponse);
+		List<String> getActualAssetNamesList = AssetRestUtils.getServiceNamesList(resourceAssetList);
+		Utils.compareArrayLists(getActualAssetNamesList, expectedAssetNamesList, "Element");
+
+		/*// Validate audit message
+		validateFilteredAudit(query, AssetTypeEnum.SERVICES);*/
+	}
+
+	/*private void validateSuccessAudit(String[] filter, AssetTypeEnum assetType) throws Exception {
+		ExpectedExternalAudit expectedAssetListAudit = ElementFactory.getDefaultAssetListAudit(assetType, AuditingActionEnum.GET_FILTERED_ASSET_LIST);
+		expectedAssetListAudit.setRESOURCE_URL(AssetRestUtils.buildUrlWithFilter(expectedAssetListAudit.getRESOURCE_URL(), filter));
+		Map<AuditingFieldsKey, String> body = new HashMap<>();
+		body.put(AuditingFieldsKey.AUDIT_RESOURCE_URL, expectedAssetListAudit.getRESOURCE_URL());
+		AuditValidationUtils.validateExternalAudit(expectedAssetListAudit, AuditingActionEnum.GET_FILTERED_ASSET_LIST.getName(), body);
+	}
+
+	private void validateFilteredAudit(String query, AssetTypeEnum assetType) throws Exception {
+		ExpectedExternalAudit expectedAssetListAudit = ElementFactory.getDefaultFilteredAssetListAudit(assetType, "?" + query);
+		Map<AuditingFieldsKey, String> body = new HashMap<>();
+		body.put(AuditingFieldsKey.AUDIT_RESOURCE_URL, expectedAssetListAudit.getRESOURCE_URL());
+		AuditValidationUtils.validateExternalAudit(expectedAssetListAudit, AuditingActionEnum.GET_FILTERED_ASSET_LIST.getName(), body);
+	}
+
+	private void validateFailureAudit(String[] filter, ErrorInfo errorInfo, List<String> variables, AssetTypeEnum assetType) throws Exception {
+		ExpectedExternalAudit expectedAssetListAudit = ElementFactory.getDefaultAssetListAudit(assetType, AuditingActionEnum.GET_FILTERED_ASSET_LIST);
+		expectedAssetListAudit.setRESOURCE_URL(AssetRestUtils.buildUrlWithFilter(expectedAssetListAudit.getRESOURCE_URL(), filter));
+		expectedAssetListAudit.setSTATUS(errorInfo.getCode().toString());
+		expectedAssetListAudit.setDESC(AuditValidationUtils.buildAuditDescription(errorInfo, variables));
+		Map<AuditingFieldsKey, String> body = new HashMap<>();
+		body.put(AuditingFieldsKey.AUDIT_RESOURCE_URL, expectedAssetListAudit.getRESOURCE_URL());
+		AuditValidationUtils.validateExternalAudit(expectedAssetListAudit, AuditingActionEnum.GET_FILTERED_ASSET_LIST.getName(), body);
+	}*/
+}
diff --git a/integration-tests/src/test/java/org/openecomp/sdc/externalApis/GetSpecificAssetMetadataServlet.java b/integration-tests/src/test/java/org/openecomp/sdc/externalApis/GetSpecificAssetMetadataServlet.java
new file mode 100644
index 0000000000..dbecc1467f
--- /dev/null
+++ b/integration-tests/src/test/java/org/openecomp/sdc/externalApis/GetSpecificAssetMetadataServlet.java
@@ -0,0 +1,401 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * SDC
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.sdc.externalApis;
+
+import org.junit.Rule;
+import org.junit.rules.TestName;
+import org.openecomp.sdc.be.dao.api.ActionStatus;
+import org.openecomp.sdc.be.datatypes.enums.AssetTypeEnum;
+import org.openecomp.sdc.be.datatypes.enums.ResourceTypeEnum;
+import org.openecomp.sdc.be.model.Resource;
+import org.openecomp.sdc.be.model.Service;
+import org.openecomp.sdc.ci.tests.api.ComponentBaseTest;
+import org.openecomp.sdc.ci.tests.datatypes.ResourceDetailedAssetStructure;
+import org.openecomp.sdc.ci.tests.datatypes.ServiceDetailedAssetStructure;
+import org.openecomp.sdc.ci.tests.datatypes.enums.ArtifactTypeEnum;
+import org.openecomp.sdc.ci.tests.datatypes.enums.LifeCycleStatesEnum;
+import org.openecomp.sdc.ci.tests.datatypes.enums.UserRoleEnum;
+import org.openecomp.sdc.ci.tests.datatypes.http.RestResponse;
+import org.openecomp.sdc.ci.tests.utils.general.AtomicOperationUtils;
+import org.openecomp.sdc.ci.tests.utils.general.ElementFactory;
+import org.openecomp.sdc.ci.tests.utils.rest.*;
+import org.openecomp.sdc.ci.tests.utils.validation.ErrorValidationUtils;
+import org.testng.annotations.Test;
+
+import java.util.ArrayList;
+
+public class GetSpecificAssetMetadataServlet extends ComponentBaseTest {
+
+	@Rule
+	public static TestName name = new TestName();
+
+//	@BeforeMethod
+//	public void setup() throws Exception {
+//		AtomicOperationUtils.createDefaultConsumer(true);
+//	}
+
+	// get specific asset metadata
+
+	// Resource
+	@Test // (enabled = false)
+	public void getResourceAssetMetadataSuccess() throws Exception {
+
+		Resource resourceVF = AtomicOperationUtils.createResourceByType(ResourceTypeEnum.VF, UserRoleEnum.DESIGNER, true).left().value();
+
+		RestResponse assetResponse = AssetRestUtils.getAssetMetadataByAssetTypeAndUuid(true, AssetTypeEnum.RESOURCES, resourceVF.getUUID());
+		BaseRestUtils.checkSuccess(assetResponse);
+
+		ResourceDetailedAssetStructure resourceAssetMetadata = AssetRestUtils.getResourceAssetMetadata(assetResponse);
+		AssetRestUtils.resourceMetadataValidatior(resourceAssetMetadata, resourceVF, AssetTypeEnum.RESOURCES);
+
+	/*	// Validate audit message
+		validateAudit(resourceVF, AssetTypeEnum.RESOURCES);*/
+	}
+
+	@Test // (enabled = false)
+	public void getResourceAssetMetadataWithResourceInstancesSuccess() throws Exception {
+
+		Resource resourceVF = AtomicOperationUtils.createResourceByType(ResourceTypeEnum.VF, UserRoleEnum.DESIGNER, true).left().value();
+		Resource resource2 = AtomicOperationUtils.createResourceByType(ResourceTypeEnum.VFC, UserRoleEnum.DESIGNER, true).left().value();
+		resource2 = (Resource) AtomicOperationUtils.changeComponentState(resource2, UserRoleEnum.DESIGNER, LifeCycleStatesEnum.CHECKIN, true).getLeft();
+
+		AtomicOperationUtils.addComponentInstanceToComponentContainer(resource2, resourceVF, UserRoleEnum.DESIGNER,	true);
+		resourceVF = ResponseParser.parseToObjectUsingMapper(ResourceRestUtils.getResource(resourceVF.getUniqueId()).getResponse(), Resource.class);
+
+		RestResponse assetResponse = AssetRestUtils.getAssetMetadataByAssetTypeAndUuid(true, AssetTypeEnum.RESOURCES, resourceVF.getUUID());
+		BaseRestUtils.checkSuccess(assetResponse);
+
+		ResourceDetailedAssetStructure resourceAssetMetadata = AssetRestUtils.getResourceAssetMetadata(assetResponse);
+		AssetRestUtils.resourceMetadataValidatior(resourceAssetMetadata, resourceVF, AssetTypeEnum.RESOURCES);
+
+		/*// Validate audit message
+		validateAudit(resourceVF, AssetTypeEnum.RESOURCES);*/
+	}
+
+	@Test // (enabled = false)
+	public void getResourceAssetMetadataWithNonCertifiedResourceInstancesSuccess() throws Exception {
+
+		Resource resourceVF = AtomicOperationUtils.createResourceByType(ResourceTypeEnum.VF, UserRoleEnum.DESIGNER, true).left().value();
+		Resource resource2 = AtomicOperationUtils.createResourceByType(ResourceTypeEnum.VFC, UserRoleEnum.DESIGNER, true).left().value();
+		resource2 = (Resource) AtomicOperationUtils.changeComponentState(resource2, UserRoleEnum.DESIGNER, LifeCycleStatesEnum.CHECKIN, true).getLeft();
+		Resource resource3 = AtomicOperationUtils.createResourceByType(ResourceTypeEnum.VFC, UserRoleEnum.DESIGNER, true).left().value();
+		resource3 = (Resource) AtomicOperationUtils.changeComponentState(resource3, UserRoleEnum.DESIGNER, LifeCycleStatesEnum.CHECKIN, true).getLeft();
+
+		AtomicOperationUtils.addComponentInstanceToComponentContainer(resource2, resourceVF, UserRoleEnum.DESIGNER, true);
+		AtomicOperationUtils.addComponentInstanceToComponentContainer(resource3, resourceVF, UserRoleEnum.DESIGNER, true);
+
+		// certify resource2 and add to VF(VF with resource2 0.1, 1.0 and 1.1
+		// versions)
+		resource2 = (Resource) AtomicOperationUtils.changeComponentState(resource2, UserRoleEnum.DESIGNER, LifeCycleStatesEnum.CERTIFY, true).getLeft();
+		AtomicOperationUtils.addComponentInstanceToComponentContainer(resource2, resourceVF, UserRoleEnum.DESIGNER, true);
+		resource2 = (Resource) AtomicOperationUtils.changeComponentState(resource2, UserRoleEnum.DESIGNER, LifeCycleStatesEnum.CHECKIN, true).getLeft();
+		AtomicOperationUtils.addComponentInstanceToComponentContainer(resource2, resourceVF, UserRoleEnum.DESIGNER, true);
+		resourceVF = ResponseParser.parseToObjectUsingMapper(ResourceRestUtils.getResource(resourceVF.getUniqueId()).getResponse(), Resource.class);
+
+		RestResponse assetResponse = AssetRestUtils.getAssetMetadataByAssetTypeAndUuid(true, AssetTypeEnum.RESOURCES, resourceVF.getUUID());
+		BaseRestUtils.checkSuccess(assetResponse);
+
+		ResourceDetailedAssetStructure resourceAssetMetadata = AssetRestUtils.getResourceAssetMetadata(assetResponse);
+		AssetRestUtils.resourceMetadataValidatior(resourceAssetMetadata, resourceVF, AssetTypeEnum.RESOURCES);
+
+	/*	// Validate audit message
+		validateAudit(resourceVF, AssetTypeEnum.RESOURCES);*/
+	}
+
+	/*@Test // (enabled = false)
+	public void getResourceAssetMetadataWithResourceInstancesVfInSubmitForTestingSuccess() throws Exception {
+
+		Resource resourceVF = AtomicOperationUtils.createResourceByType(ResourceTypeEnum.VF, UserRoleEnum.DESIGNER, true).left().value();
+		Resource resource2 = AtomicOperationUtils.createResourceByType(ResourceTypeEnum.VFC, UserRoleEnum.DESIGNER, true).left().value();
+		resource2 = (Resource) AtomicOperationUtils.changeComponentState(resource2, UserRoleEnum.DESIGNER, LifeCycleStatesEnum.CERTIFY, true).getLeft();
+		Resource resource3 = AtomicOperationUtils.createResourceByType(ResourceTypeEnum.VFC, UserRoleEnum.DESIGNER, true).left().value();
+		resource3 = (Resource) AtomicOperationUtils.changeComponentState(resource3, UserRoleEnum.DESIGNER, LifeCycleStatesEnum.CERTIFY, true).getLeft();
+
+		AtomicOperationUtils.addComponentInstanceToComponentContainer(resource2, resourceVF, UserRoleEnum.DESIGNER, true);
+		AtomicOperationUtils.addComponentInstanceToComponentContainer(resource3, resourceVF, UserRoleEnum.DESIGNER, true);
+
+		// certify resource2 and add to VF(VF with resource2 1.0, 2.0 and 3.0
+		// versions)
+		resource2 = (Resource) AtomicOperationUtils.changeComponentState(resource2, UserRoleEnum.DESIGNER, LifeCycleStatesEnum.CERTIFY, true).getLeft();
+		AtomicOperationUtils.addComponentInstanceToComponentContainer(resource2, resourceVF, UserRoleEnum.DESIGNER, true);
+		resource2 = (Resource) AtomicOperationUtils.changeComponentState(resource2, UserRoleEnum.DESIGNER, LifeCycleStatesEnum.CERTIFY, true).getLeft();
+		AtomicOperationUtils.addComponentInstanceToComponentContainer(resource2, resourceVF, UserRoleEnum.DESIGNER, true);
+		resourceVF = (Resource) AtomicOperationUtils.changeComponentState(resourceVF, UserRoleEnum.DESIGNER, LifeCycleStatesEnum.CERTIFICATIONREQUEST, true).getLeft();
+
+		RestResponse assetResponse = AssetRestUtils.getAssetMetadataByAssetTypeAndUuid(true, AssetTypeEnum.RESOURCES, resourceVF.getUUID());
+		BaseRestUtils.checkSuccess(assetResponse);
+
+		ResourceDetailedAssetStructure resourceAssetMetadata = AssetRestUtils.getResourceAssetMetadata(assetResponse);
+		AssetRestUtils.resourceMetadataValidatior(resourceAssetMetadata, resourceVF, AssetTypeEnum.RESOURCES);
+
+	*//*	// Validate audit message
+		validateAudit(resourceVF, AssetTypeEnum.RESOURCES);*//*
+	}*/
+
+	@Test // (enabled = false)
+	public void getResourceAssetMetadataWithResourceInstancesVfInStartCertificationSuccess() throws Exception {
+
+		Resource resourceVF = AtomicOperationUtils.createResourceByType(ResourceTypeEnum.VF, UserRoleEnum.DESIGNER, true).left().value();
+		Resource resource2 = AtomicOperationUtils.createResourceByType(ResourceTypeEnum.VFC, UserRoleEnum.DESIGNER, true).left().value();
+		resource2 = (Resource) AtomicOperationUtils.changeComponentState(resource2, UserRoleEnum.DESIGNER, LifeCycleStatesEnum.CERTIFY, true).getLeft();
+		Resource resource3 = AtomicOperationUtils.createResourceByType(ResourceTypeEnum.VFC, UserRoleEnum.DESIGNER, true).left().value();
+		resource3 = (Resource) AtomicOperationUtils.changeComponentState(resource3, UserRoleEnum.DESIGNER, LifeCycleStatesEnum.CERTIFY, true).getLeft();
+
+		AtomicOperationUtils.addComponentInstanceToComponentContainer(resource2, resourceVF, UserRoleEnum.DESIGNER,	true);
+		AtomicOperationUtils.addComponentInstanceToComponentContainer(resource3, resourceVF, UserRoleEnum.DESIGNER,	true);
+
+		// certify resource2 and add to VF(VF with resource2 1.0, 2.0 and 3.0
+		// versions)
+		resource2 = (Resource) AtomicOperationUtils.changeComponentState(resource2, UserRoleEnum.DESIGNER, LifeCycleStatesEnum.CERTIFY, true).getLeft();
+		AtomicOperationUtils.addComponentInstanceToComponentContainer(resource2, resourceVF, UserRoleEnum.DESIGNER,	true);
+		resource2 = (Resource) AtomicOperationUtils.changeComponentState(resource2, UserRoleEnum.DESIGNER, LifeCycleStatesEnum.CERTIFY, true).getLeft();
+		AtomicOperationUtils.addComponentInstanceToComponentContainer(resource2, resourceVF, UserRoleEnum.DESIGNER,	true);
+		resourceVF = (Resource) AtomicOperationUtils.changeComponentState(resourceVF, UserRoleEnum.DESIGNER, LifeCycleStatesEnum.STARTCERTIFICATION, true).getLeft();
+
+		RestResponse assetResponse = AssetRestUtils.getAssetMetadataByAssetTypeAndUuid(true, AssetTypeEnum.RESOURCES, resourceVF.getUUID());
+		BaseRestUtils.checkSuccess(assetResponse);
+
+		ResourceDetailedAssetStructure resourceAssetMetadata = AssetRestUtils.getResourceAssetMetadata(assetResponse);
+		AssetRestUtils.resourceMetadataValidatior(resourceAssetMetadata, resourceVF, AssetTypeEnum.RESOURCES);
+
+		/*// Validate audit message
+		validateAudit(resourceVF, AssetTypeEnum.RESOURCES);*/
+	}
+
+	@Test // (enabled = false)
+	public void getResourceAssetMetadataWithResourceInstancesCertifiedVFSuccess() throws Exception {
+
+		Resource resourceVF = AtomicOperationUtils.createResourceByType(ResourceTypeEnum.VF, UserRoleEnum.DESIGNER, true).left().value();
+		Resource resource2 = AtomicOperationUtils.createResourceByType(ResourceTypeEnum.VFC, UserRoleEnum.DESIGNER, true).left().value();
+		resource2 = (Resource) AtomicOperationUtils.changeComponentState(resource2, UserRoleEnum.DESIGNER, LifeCycleStatesEnum.CERTIFY, true).getLeft();
+		Resource resource3 = AtomicOperationUtils.createResourceByType(ResourceTypeEnum.VFC, UserRoleEnum.DESIGNER, true).left().value();
+		resource3 = (Resource) AtomicOperationUtils.changeComponentState(resource3, UserRoleEnum.DESIGNER, LifeCycleStatesEnum.CERTIFY, true).getLeft();
+
+		AtomicOperationUtils.addComponentInstanceToComponentContainer(resource2, resourceVF, UserRoleEnum.DESIGNER, true);
+		AtomicOperationUtils.addComponentInstanceToComponentContainer(resource3, resourceVF, UserRoleEnum.DESIGNER,	true);
+
+		// certify resource2 and add to VF(VF with resource2 1.0, 2.0 and 3.0
+		// versions)
+		resource2 = (Resource) AtomicOperationUtils.changeComponentState(resource2, UserRoleEnum.DESIGNER, LifeCycleStatesEnum.CERTIFY, true).getLeft();
+		AtomicOperationUtils.addComponentInstanceToComponentContainer(resource2, resourceVF, UserRoleEnum.DESIGNER,	true);
+		resource2 = (Resource) AtomicOperationUtils.changeComponentState(resource2, UserRoleEnum.DESIGNER, LifeCycleStatesEnum.CERTIFY, true).getLeft();
+		AtomicOperationUtils.addComponentInstanceToComponentContainer(resource2, resourceVF, UserRoleEnum.DESIGNER,	true);
+		resourceVF = (Resource) AtomicOperationUtils.changeComponentState(resourceVF, UserRoleEnum.DESIGNER, LifeCycleStatesEnum.CERTIFY, true).getLeft();
+
+		RestResponse assetResponse = AssetRestUtils.getAssetMetadataByAssetTypeAndUuid(true, AssetTypeEnum.RESOURCES, resourceVF.getUUID());
+		BaseRestUtils.checkSuccess(assetResponse);
+
+		ResourceDetailedAssetStructure resourceAssetMetadata = AssetRestUtils.getResourceAssetMetadata(assetResponse);
+		AssetRestUtils.resourceMetadataValidatior(resourceAssetMetadata, resourceVF, AssetTypeEnum.RESOURCES);
+
+	/*	// Validate audit message
+		validateAudit(resourceVF, AssetTypeEnum.RESOURCES);*/
+	}
+
+	/*@Test // (enabled = false)
+	public void getResourceAssetMetadataWithNonCertifiedResourceInstancesAndArtifactsSuccess() throws Exception {
+
+		Resource resourceVF = AtomicOperationUtils.createResourceByType(ResourceTypeEnum.VF, UserRoleEnum.DESIGNER, true).left().value();
+		Resource resource2 = AtomicOperationUtils.createResourceByType(ResourceTypeEnum.VFC, UserRoleEnum.DESIGNER, true).left().value();
+		resource2 = (Resource) AtomicOperationUtils.changeComponentState(resource2, UserRoleEnum.DESIGNER, LifeCycleStatesEnum.CHECKIN, true).getLeft();
+		Resource resource3 = AtomicOperationUtils.createResourceByType(ResourceTypeEnum.VFC, UserRoleEnum.DESIGNER, true).left().value();
+		resource3 = (Resource) AtomicOperationUtils.changeComponentState(resource3, UserRoleEnum.DESIGNER, LifeCycleStatesEnum.CERTIFICATIONREQUEST, true).getLeft();
+
+		AtomicOperationUtils.addComponentInstanceToComponentContainer(resource2, resourceVF, UserRoleEnum.DESIGNER,	true);
+		AtomicOperationUtils.addComponentInstanceToComponentContainer(resource3, resourceVF, UserRoleEnum.DESIGNER,	true);
+
+		AtomicOperationUtils.uploadArtifactByType(ArtifactTypeEnum.VENDOR_LICENSE, resourceVF, UserRoleEnum.DESIGNER, true, true);
+		AtomicOperationUtils.uploadArtifactByType(ArtifactTypeEnum.APPC_CONFIG, resourceVF, UserRoleEnum.DESIGNER, true, true);
+		resourceVF = ResponseParser.parseToObjectUsingMapper(ResourceRestUtils.getResource(resourceVF.getUniqueId()).getResponse(), Resource.class);
+
+		RestResponse assetResponse = AssetRestUtils.getAssetMetadataByAssetTypeAndUuid(true, AssetTypeEnum.RESOURCES, resourceVF.getUUID());
+		BaseRestUtils.checkSuccess(assetResponse);
+
+		ResourceDetailedAssetStructure resourceAssetMetadata = AssetRestUtils.getResourceAssetMetadata(assetResponse);
+		AssetRestUtils.resourceMetadataValidatior(resourceAssetMetadata, resourceVF, AssetTypeEnum.RESOURCES);
+
+	}*/
+
+
+	// Import CSAR
+
+	// Service
+	@Test // (enabled = false)
+	public void getServiceAssetMetadataSuccess() throws Exception {
+
+		Service service = AtomicOperationUtils.createDefaultService(UserRoleEnum.DESIGNER, true).left().value();
+
+		RestResponse assetResponse = AssetRestUtils.getAssetMetadataByAssetTypeAndUuid(true, AssetTypeEnum.SERVICES, service.getUUID());
+		BaseRestUtils.checkSuccess(assetResponse);
+
+		ServiceDetailedAssetStructure serviceAssetMetadata = AssetRestUtils.getServiceAssetMetadata(assetResponse);
+		AssetRestUtils.serviceMetadataValidatior(serviceAssetMetadata, service, AssetTypeEnum.SERVICES);
+
+		/*// Validate audit message
+		validateAudit(service, AssetTypeEnum.SERVICES);*/
+	}
+
+	@Test // (enabled = false)
+	public void getServiceAssetMetadataWithResourceInstancesSuccess() throws Exception {
+
+		Service service = AtomicOperationUtils.createDefaultService(UserRoleEnum.DESIGNER, true).left().value();
+		Resource resourceVF = AtomicOperationUtils.createResourceByType(ResourceTypeEnum.VF, UserRoleEnum.DESIGNER, true).left().value();
+		resourceVF = (Resource) AtomicOperationUtils.changeComponentState(resourceVF, UserRoleEnum.DESIGNER, LifeCycleStatesEnum.CHECKIN, true).getLeft();
+
+		AtomicOperationUtils.addComponentInstanceToComponentContainer(resourceVF, service, UserRoleEnum.DESIGNER, true);
+		service = ResponseParser.parseToObjectUsingMapper(ServiceRestUtils.getService(service.getUniqueId(), ElementFactory.getDefaultUser(UserRoleEnum.DESIGNER)).getResponse(),Service.class);
+
+		RestResponse assetResponse = AssetRestUtils.getAssetMetadataByAssetTypeAndUuid(true, AssetTypeEnum.SERVICES, service.getUUID());
+		BaseRestUtils.checkSuccess(assetResponse);
+
+		ServiceDetailedAssetStructure serviceAssetMetadata = AssetRestUtils.getServiceAssetMetadata(assetResponse);
+		AssetRestUtils.serviceMetadataValidatior(serviceAssetMetadata, service, AssetTypeEnum.SERVICES);
+
+		/*// Validate audit message
+		validateAudit(service, AssetTypeEnum.SERVICES);*/
+
+	}
+
+	@Test // (enabled = false)
+	public void getServiceAssetMetadataWithNonCertifiedResourceInstancesWithArtifactsSuccess() throws Exception {
+
+		Service service = AtomicOperationUtils.createDefaultService(UserRoleEnum.DESIGNER, true).left().value();
+
+		Resource resourceVF = AtomicOperationUtils.createResourceByType(ResourceTypeEnum.VF, UserRoleEnum.DESIGNER, true).left().value();
+		AtomicOperationUtils.uploadArtifactByType(ArtifactTypeEnum.VENDOR_LICENSE, resourceVF, UserRoleEnum.DESIGNER, true, true);
+		resourceVF = (Resource) AtomicOperationUtils.changeComponentState(resourceVF, UserRoleEnum.DESIGNER, LifeCycleStatesEnum.CHECKIN, true).getLeft();
+
+		Resource resourceVF2 = AtomicOperationUtils.createResourceByType(ResourceTypeEnum.VF, UserRoleEnum.DESIGNER, true).left().value();
+		AtomicOperationUtils.uploadArtifactByType(ArtifactTypeEnum.APPC_CONFIG, resourceVF2, UserRoleEnum.DESIGNER, true, true);
+		resourceVF2 = (Resource) AtomicOperationUtils.changeComponentState(resourceVF2, UserRoleEnum.DESIGNER, LifeCycleStatesEnum.CHECKIN, true).getLeft();
+
+		AtomicOperationUtils.addComponentInstanceToComponentContainer(resourceVF, service, UserRoleEnum.DESIGNER, true);
+		AtomicOperationUtils.addComponentInstanceToComponentContainer(resourceVF2, service, UserRoleEnum.DESIGNER, true);
+		resourceVF = (Resource) AtomicOperationUtils
+				.changeComponentState(resourceVF, UserRoleEnum.DESIGNER, LifeCycleStatesEnum.CERTIFY, true).getLeft();
+		AtomicOperationUtils.addComponentInstanceToComponentContainer(resourceVF, service, UserRoleEnum.DESIGNER, true);
+
+		// service with 0.1, 0.1 and 1.0 RIs versions
+		service = ResponseParser.parseToObjectUsingMapper(ServiceRestUtils.getService(service.getUniqueId(), ElementFactory.getDefaultUser(UserRoleEnum.DESIGNER)).getResponse(), Service.class);
+
+		RestResponse assetResponse = AssetRestUtils.getAssetMetadataByAssetTypeAndUuid(true, AssetTypeEnum.SERVICES, service.getUUID());
+		BaseRestUtils.checkSuccess(assetResponse);
+
+		ServiceDetailedAssetStructure serviceAssetMetadata = AssetRestUtils.getServiceAssetMetadata(assetResponse);
+		AssetRestUtils.serviceMetadataValidatior(serviceAssetMetadata, service, AssetTypeEnum.SERVICES);
+
+		/*// Validate audit message
+		validateAudit(service, AssetTypeEnum.SERVICES);*/
+
+	}
+
+	@Test // (enabled = false)
+	public void getServiceAssetMetadataWithCertifiedResourceInstancesAndArtifactsOnRIsAndServiceSuccess()
+			throws Exception {
+
+		Service service = AtomicOperationUtils.createDefaultService(UserRoleEnum.DESIGNER, true).left().value();
+
+		Resource resourceVF = AtomicOperationUtils.createResourceByType(ResourceTypeEnum.VF, UserRoleEnum.DESIGNER, true).left().value();
+		AtomicOperationUtils.uploadArtifactByType(ArtifactTypeEnum.VENDOR_LICENSE, resourceVF, UserRoleEnum.DESIGNER, true, true);
+		resourceVF = (Resource) AtomicOperationUtils.changeComponentState(resourceVF, UserRoleEnum.DESIGNER, LifeCycleStatesEnum.CERTIFY, true).getLeft();
+
+		Resource resourceVF2 = AtomicOperationUtils.createResourceByType(ResourceTypeEnum.VF, UserRoleEnum.DESIGNER, true).left().value();
+		AtomicOperationUtils.uploadArtifactByType(ArtifactTypeEnum.APPC_CONFIG, resourceVF2, UserRoleEnum.DESIGNER, true, true);
+		resourceVF2 = (Resource) AtomicOperationUtils.changeComponentState(resourceVF2, UserRoleEnum.DESIGNER, LifeCycleStatesEnum.CERTIFY, true).getLeft();
+
+		AtomicOperationUtils.addComponentInstanceToComponentContainer(resourceVF, service, UserRoleEnum.DESIGNER, true);
+		AtomicOperationUtils.addComponentInstanceToComponentContainer(resourceVF2, service, UserRoleEnum.DESIGNER, true);
+		resourceVF = (Resource) AtomicOperationUtils.changeComponentState(resourceVF, UserRoleEnum.DESIGNER, LifeCycleStatesEnum.CHECKOUT, true).getLeft();
+		AtomicOperationUtils.uploadArtifactByType(ArtifactTypeEnum.MODEL_INVENTORY_PROFILE, resourceVF, UserRoleEnum.DESIGNER, true, true);
+		resourceVF = (Resource) AtomicOperationUtils.changeComponentState(resourceVF, UserRoleEnum.DESIGNER, LifeCycleStatesEnum.CERTIFY, true).getLeft();
+		AtomicOperationUtils.addComponentInstanceToComponentContainer(resourceVF, service, UserRoleEnum.DESIGNER, true);
+
+		// service with resourceVF 1.0(1 art), 2.0(2 art) versions and
+		// resourceVF2 1.0(1 art), service 1 artifact version
+		AtomicOperationUtils.uploadArtifactByType(ArtifactTypeEnum.MODEL_INVENTORY_PROFILE, service, UserRoleEnum.DESIGNER, true, true);
+		service = ResponseParser.parseToObjectUsingMapper(ServiceRestUtils.getService(service.getUniqueId(), ElementFactory.getDefaultUser(UserRoleEnum.DESIGNER)).getResponse(), Service.class);
+
+		RestResponse assetResponse = AssetRestUtils.getAssetMetadataByAssetTypeAndUuid(true, AssetTypeEnum.SERVICES, service.getUUID());
+		BaseRestUtils.checkSuccess(assetResponse);
+
+		ServiceDetailedAssetStructure serviceAssetMetadata = AssetRestUtils.getServiceAssetMetadata(assetResponse);
+		AssetRestUtils.serviceMetadataValidatior(serviceAssetMetadata, service, AssetTypeEnum.SERVICES);
+
+		/*// Validate audit message
+		validateAudit(service, AssetTypeEnum.SERVICES);*/
+
+	}
+
+	@Test // (enabled = false)
+	public void getServiceAssetMetadataWithResourceInstancesServiceInSubmitForTestingSuccess() throws Exception {
+
+		Service service = AtomicOperationUtils.createDefaultService(UserRoleEnum.DESIGNER, true).left().value();
+
+		Resource resourceVF = AtomicOperationUtils.createResourceByType(ResourceTypeEnum.VF, UserRoleEnum.DESIGNER, true).left().value();
+		AtomicOperationUtils.uploadArtifactByType(ArtifactTypeEnum.VENDOR_LICENSE, resourceVF, UserRoleEnum.DESIGNER, true, true);
+		resourceVF = (Resource) AtomicOperationUtils.changeComponentState(resourceVF, UserRoleEnum.DESIGNER, LifeCycleStatesEnum.CERTIFY, true).getLeft();
+
+		Resource resourceVF2 = AtomicOperationUtils.createResourceByType(ResourceTypeEnum.VF, UserRoleEnum.DESIGNER, true).left().value();
+		AtomicOperationUtils.uploadArtifactByType(ArtifactTypeEnum.APPC_CONFIG, resourceVF2, UserRoleEnum.DESIGNER, true, true);
+		resourceVF = (Resource) AtomicOperationUtils.changeComponentState(resourceVF2, UserRoleEnum.DESIGNER, LifeCycleStatesEnum.CERTIFY, true).getLeft();
+
+		AtomicOperationUtils.addComponentInstanceToComponentContainer(resourceVF, service, UserRoleEnum.DESIGNER, true);
+		AtomicOperationUtils.addComponentInstanceToComponentContainer(resourceVF2, service, UserRoleEnum.DESIGNER, true);
+		resourceVF = (Resource) AtomicOperationUtils.changeComponentState(resourceVF, UserRoleEnum.DESIGNER, LifeCycleStatesEnum.CHECKOUT, true).getLeft();
+		AtomicOperationUtils.uploadArtifactByType(ArtifactTypeEnum.MODEL_INVENTORY_PROFILE, resourceVF, UserRoleEnum.DESIGNER, true, true);
+		resourceVF = (Resource) AtomicOperationUtils.changeComponentState(resourceVF, UserRoleEnum.DESIGNER, LifeCycleStatesEnum.CERTIFY, true).getLeft();
+		AtomicOperationUtils.addComponentInstanceToComponentContainer(resourceVF, service, UserRoleEnum.DESIGNER, true);
+
+		// service with resourceVF 1.0(1 art), 2.0(2 art) versions and
+		// resourceVF2 1.0(1 art), service 1 artifact version
+		AtomicOperationUtils.uploadArtifactByType(ArtifactTypeEnum.MODEL_INVENTORY_PROFILE, service, UserRoleEnum.DESIGNER, true, true);
+		service = (Service) AtomicOperationUtils.changeComponentState(service, UserRoleEnum.DESIGNER, LifeCycleStatesEnum.CERTIFY, true).getLeft();
+
+		RestResponse assetResponse = AssetRestUtils.getAssetMetadataByAssetTypeAndUuid(true, AssetTypeEnum.SERVICES, service.getUUID());
+		BaseRestUtils.checkSuccess(assetResponse);
+
+		ServiceDetailedAssetStructure serviceAssetMetadata = AssetRestUtils.getServiceAssetMetadata(assetResponse);
+		AssetRestUtils.serviceMetadataValidatior(serviceAssetMetadata, service, AssetTypeEnum.SERVICES);
+
+		/*// Validate audit message
+		validateAudit(service, AssetTypeEnum.SERVICES);*/
+	}
+
+	@Test // (enabled = false)
+	public void getServiceAssetMetadataServiceNotFound() throws Exception {
+
+		String serviceUuid = "notExistingServiceUuid";
+		RestResponse assetResponse = AssetRestUtils.getAssetMetadataByAssetTypeAndUuid(true, AssetTypeEnum.SERVICES, serviceUuid);
+
+		// Validate audit message
+		ArrayList<String> variables = new ArrayList<>();
+		variables.add(serviceUuid);
+		ErrorValidationUtils.checkBodyResponseOnError(ActionStatus.SERVICE_NOT_FOUND.name(), variables, assetResponse.getResponse());
+	}
+
+	/*private void validateAudit(Component component, AssetTypeEnum assetType) throws Exception {
+		ExpectedExternalAudit expectedAssetListAudit = ElementFactory.getDefaultAssetMetadataAudit(assetType, component);
+		Map<AuditingFieldsKey, String> body = new HashMap<>();
+		body.put(AuditingFieldsKey.AUDIT_RESOURCE_URL, expectedAssetListAudit.getRESOURCE_URL());
+		AuditValidationUtils.validateExternalAudit(expectedAssetListAudit, AuditingActionEnum.GET_ASSET_METADATA.getName(), body);
+	}*/
+
+}
diff --git a/integration-tests/src/test/java/org/openecomp/sdc/externalApis/SearchFilterCategoryExternalAPI.java b/integration-tests/src/test/java/org/openecomp/sdc/externalApis/SearchFilterCategoryExternalAPI.java
new file mode 100644
index 0000000000..a54e2c4c3b
--- /dev/null
+++ b/integration-tests/src/test/java/org/openecomp/sdc/externalApis/SearchFilterCategoryExternalAPI.java
@@ -0,0 +1,320 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * SDC
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.sdc.externalApis;
+
+import com.google.gson.Gson;
+import com.google.gson.JsonArray;
+import com.google.gson.JsonElement;
+import com.google.gson.JsonParser;
+import org.json.simple.parser.JSONParser;
+import org.junit.Rule;
+import org.junit.rules.TestName;
+import org.openecomp.sdc.be.dao.api.ActionStatus;
+import org.openecomp.sdc.be.datatypes.enums.AssetTypeEnum;
+import org.openecomp.sdc.be.datatypes.enums.ResourceTypeEnum;
+import org.openecomp.sdc.be.model.Resource;
+import org.openecomp.sdc.be.model.category.CategoryDefinition;
+import org.openecomp.sdc.be.model.category.SubCategoryDefinition;
+import org.openecomp.sdc.ci.tests.api.ComponentBaseTest;
+import org.openecomp.sdc.ci.tests.config.Config;
+import org.openecomp.sdc.ci.tests.datatypes.ResourceReqDetails;
+import org.openecomp.sdc.ci.tests.datatypes.enums.NormativeTypesEnum;
+import org.openecomp.sdc.ci.tests.datatypes.enums.ResourceCategoryEnum;
+import org.openecomp.sdc.ci.tests.datatypes.enums.SearchCriteriaEnum;
+import org.openecomp.sdc.ci.tests.datatypes.enums.UserRoleEnum;
+import org.openecomp.sdc.ci.tests.datatypes.http.RestResponse;
+import org.openecomp.sdc.ci.tests.utils.general.AtomicOperationUtils;
+import org.openecomp.sdc.ci.tests.utils.general.ElementFactory;
+import org.openecomp.sdc.ci.tests.utils.rest.CategoryRestUtils;
+import org.openecomp.sdc.ci.tests.utils.rest.ResourceRestUtils;
+import org.openecomp.sdc.ci.tests.utils.validation.ErrorValidationUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.testng.Assert;
+import org.testng.annotations.DataProvider;
+import org.testng.annotations.Test;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Random;
+
+public class SearchFilterCategoryExternalAPI extends ComponentBaseTest {
+
+	private static Logger log = LoggerFactory.getLogger(CRUDExternalAPI.class.getName());
+
+	protected Config config = Config.instance();
+	protected String contentTypeHeaderData = "application/json";
+	protected String acceptHeaderDate = "application/json";
+
+	protected Gson gson = new Gson();
+	protected JSONParser jsonParser = new JSONParser();
+
+//	@BeforeMethod
+//	public void init() throws Exception{
+//		AtomicOperationUtils.createDefaultConsumer(true);
+//	}
+	
+	;
+	@Rule 
+	public static TestName name = new TestName();
+
+	// Search for invalid resourceType
+	@Test
+	public void searchWithInvalidFilter() throws Exception {
+		RestResponse restResponse = ResourceRestUtils.getResourceListFilterByCriteria(ElementFactory.getDefaultUser(UserRoleEnum.DESIGNER), AssetTypeEnum.RESOURCES.getValue(), SearchCriteriaEnum.RESOURCE_TYPE.getValue() + "invalid", ResourceTypeEnum.VFC.toString());
+		
+		Integer expectedResponseCode = 400;
+		Assert.assertEquals(restResponse.getErrorCode(), expectedResponseCode);
+		
+		List<String> variables = Arrays.asList("resourceTypeinvalid", "[resourceType, subCategory, category]");
+		ErrorValidationUtils.checkBodyResponseOnError(ActionStatus.INVALID_FILTER_KEY.name(), variables, restResponse.getResponse());
+
+		/*validateFailureAudit(variables);*/
+	}
+
+	/*private void validateFailureAudit(List<String> variables) throws Exception {
+		ExpectedExternalAudit expectedExternalAudit = ElementFactory.getDefaultExternalAuditObject(AssetTypeEnum.RESOURCES, AuditingActionEnum.GET_FILTERED_ASSET_LIST, "?" + SearchCriteriaEnum.RESOURCE_TYPE.getValue() + "invalid=" + ResourceTypeEnum.VFC.toString());
+		ErrorInfo errorInfo = ErrorValidationUtils.parseErrorConfigYaml(ActionStatus.INVALID_FILTER_KEY.name());
+		expectedExternalAudit.setDESC(AuditValidationUtils.buildAuditDescription(errorInfo, variables));
+		expectedExternalAudit.setSTATUS("400");
+		Map<AuditingFieldsKey, String> body = new HashMap<>();
+		body.put(AuditingFieldsKey.AUDIT_RESOURCE_URL, expectedExternalAudit.getRESOURCE_URL());
+		AuditValidationUtils.validateAuditExternalSearchAPI(expectedExternalAudit, AuditingActionEnum.GET_FILTERED_ASSET_LIST.getName(), body);
+	}*/
+
+	@DataProvider(name="searchForResourceTypeNegativeTest", parallel=true) 
+	public static Object[][] dataProviderSearchForResourceTypeNegativeTest() {
+		return new Object[][] {
+			{"invalidResourceType"},
+			{""}
+			};
+	}
+	
+	// Search for invalid resourceType
+	@Test(dataProvider="searchForResourceTypeNegativeTest")
+	public void searchForResourceTypeNegativeTest(String resourceType) throws Exception {
+		RestResponse restResponse = ResourceRestUtils.getResourceListFilterByCriteria(ElementFactory.getDefaultUser(UserRoleEnum.DESIGNER), AssetTypeEnum.RESOURCES.getValue(), SearchCriteriaEnum.RESOURCE_TYPE.getValue(), resourceType);
+		
+		Integer expectedResponseCode = 400;
+		Assert.assertEquals(restResponse.getErrorCode(), expectedResponseCode);
+		
+		List<String> variables = Arrays.asList();
+		ErrorValidationUtils.checkBodyResponseOnError(ActionStatus.INVALID_CONTENT.name(), variables, restResponse.getResponse());
+
+		/*ExpectedExternalAudit expectedExternalAudit = ElementFactory.getDefaultExternalAuditObject(AssetTypeEnum.RESOURCES, AuditingActionEnum.GET_FILTERED_ASSET_LIST, "?" + SearchCriteriaEnum.RESOURCE_TYPE.getValue() + "=" + resourceType);
+		ErrorInfo errorInfo = ErrorValidationUtils.parseErrorConfigYaml(ActionStatus.INVALID_CONTENT.name());
+		expectedExternalAudit.setDESC(AuditValidationUtils.buildAuditDescription(errorInfo, variables));
+		expectedExternalAudit.setSTATUS("400");
+		Map <AuditingFieldsKey, String> body = new HashMap<>();
+		body.put(AuditingFieldsKey.AUDIT_RESOURCE_URL, expectedExternalAudit.getRESOURCE_URL());
+		AuditValidationUtils.validateAuditExternalSearchAPI(expectedExternalAudit, AuditingActionEnum.GET_FILTERED_ASSET_LIST.getName(), body);*/
+	}
+	
+	// Searching for resource filter incorrect resource type using external API
+	@Test
+	public void searchingForResouceFilterIncorrectResouceTypeUsingExternalAPI() throws Exception {
+		Resource resource = AtomicOperationUtils.createResourcesByTypeNormTypeAndCatregory(ResourceTypeEnum.VF, NormativeTypesEnum.ROOT, ResourceCategoryEnum.GENERIC_DATABASE, UserRoleEnum.DESIGNER, true).left().value();
+		List<String> createdResoucesName = new ArrayList<String>();
+		createdResoucesName.add(resource.getName());
+		
+		for(ResourceTypeEnum resourceTypeEnum: ResourceTypeEnum.values()) {
+			// Create resource for each type so it will not return 404
+			AtomicOperationUtils.createResourcesByTypeNormTypeAndCatregory(resourceTypeEnum, NormativeTypesEnum.ROOT, ResourceCategoryEnum.GENERIC_DATABASE, UserRoleEnum.DESIGNER, true).left().value();
+
+			RestResponse restResponse = ResourceRestUtils.getResourceListFilterByCriteria(ElementFactory.getDefaultUser(UserRoleEnum.DESIGNER), AssetTypeEnum.RESOURCES.getValue(), SearchCriteriaEnum.RESOURCE_TYPE.getValue(), resourceTypeEnum.toString());
+			
+			Integer expectedResponseCode = 200;
+			Assert.assertEquals(restResponse.getErrorCode(), expectedResponseCode);
+			if(resourceTypeEnum == ResourceTypeEnum.VF) {
+				validateJsonContainResource(restResponse.getResponse(), createdResoucesName, true);
+			} else {
+				validateJsonContainResource(restResponse.getResponse(), createdResoucesName, false);
+			}
+			
+			
+			/*ExpectedExternalAudit expectedExternalAudit = ElementFactory.getDefaultExternalAuditObject(AssetTypeEnum.RESOURCES, AuditingActionEnum.GET_FILTERED_ASSET_LIST, "?" + SearchCriteriaEnum.RESOURCE_TYPE.getValue() + "=" + resourceTypeEnum.toString());
+			Map <AuditingFieldsKey, String> body = new HashMap<>();
+			body.put(AuditingFieldsKey.AUDIT_RESOURCE_URL, expectedExternalAudit.getRESOURCE_URL());
+			AuditValidationUtils.validateAuditExternalSearchAPI(expectedExternalAudit, AuditingActionEnum.GET_FILTERED_ASSET_LIST.getName(), body);*/
+		}
+	}
+	
+	// Searching for several resource types using external API
+	@Test
+	public void searchingForSeveralResouceTypesUsingExternalAPI() throws Exception {
+		performClean();
+		for(ResourceTypeEnum resourceTypeEnum: ResourceTypeEnum.values()) {
+			List<String> createdResoucesName = new ArrayList<String>();
+			Resource resource = AtomicOperationUtils.createResourcesByTypeNormTypeAndCatregory(resourceTypeEnum, NormativeTypesEnum.ROOT, ResourceCategoryEnum.GENERIC_DATABASE, UserRoleEnum.DESIGNER, true).left().value();
+			createdResoucesName.add(resource.getName());
+			
+			RestResponse restResponse = ResourceRestUtils.getResourceListFilterByCriteria(ElementFactory.getDefaultUser(UserRoleEnum.DESIGNER), AssetTypeEnum.RESOURCES.getValue(), SearchCriteriaEnum.RESOURCE_TYPE.getValue(), resourceTypeEnum.toString());
+			
+			Integer expectedResponseCode = 200;
+			Assert.assertEquals(restResponse.getErrorCode(), expectedResponseCode);
+			validateJsonContainResource(restResponse.getResponse(), createdResoucesName, true);
+			
+			/*ExpectedExternalAudit expectedExternalAudit = ElementFactory.getDefaultExternalAuditObject(AssetTypeEnum.RESOURCES, AuditingActionEnum.GET_FILTERED_ASSET_LIST, "?" + SearchCriteriaEnum.RESOURCE_TYPE.getValue() + "=" + resourceTypeEnum.toString());
+			Map <AuditingFieldsKey, String> body = new HashMap<>();
+			body.put(AuditingFieldsKey.AUDIT_RESOURCE_URL, expectedExternalAudit.getRESOURCE_URL());
+			AuditValidationUtils.validateAuditExternalSearchAPI(expectedExternalAudit, AuditingActionEnum.GET_FILTERED_ASSET_LIST.getName(), body);*/
+		}
+	}
+	
+	// Searching for several resources of type VFCMT using external API
+	@Test
+	public void searchingForSeveralResourcesOfTypeVFCMTUsingExternalAPI() throws Exception {
+		performClean();
+		Random random = new Random();
+ 		int numberOfResouceToCreate = random.nextInt(5) + 1;	
+		List<String> createdResoucesName = new ArrayList<String>();
+		
+		for(int i=0; i<numberOfResouceToCreate; i++) {
+			
+			Resource resource = AtomicOperationUtils.createResourcesByTypeNormTypeAndCatregory(ResourceTypeEnum.VFCMT, NormativeTypesEnum.ROOT, ResourceCategoryEnum.GENERIC_DATABASE, UserRoleEnum.DESIGNER, true).left().value();
+			createdResoucesName.add(resource.getName());
+		}
+		
+		RestResponse restResponse = ResourceRestUtils.getResourceListFilterByCriteria(ElementFactory.getDefaultUser(UserRoleEnum.DESIGNER), AssetTypeEnum.RESOURCES.getValue(), SearchCriteriaEnum.RESOURCE_TYPE.getValue(), ResourceTypeEnum.VFCMT.toString());
+		
+		Integer expectedResponseCode = 200;
+		Assert.assertEquals(restResponse.getErrorCode(), expectedResponseCode);
+		validateJsonContainResource(restResponse.getResponse(), createdResoucesName, true);
+		
+		/*ExpectedExternalAudit expectedExternalAudit = ElementFactory.getDefaultExternalAuditObject(AssetTypeEnum.RESOURCES, AuditingActionEnum.GET_FILTERED_ASSET_LIST, "?" + SearchCriteriaEnum.RESOURCE_TYPE.getValue() + "=" + ResourceTypeEnum.VFCMT.toString());
+		AuditValidationUtils.validateAuditExternalSearchAPI(expectedExternalAudit, AuditingActionEnum.GET_FILTERED_ASSET_LIST.getName(), null);*/
+	}
+	
+	
+	
+	@DataProvider(name="normativeResourceCategory", parallel=true) 
+	public static Object[][] dataProviderNormativeResourceCategory() {
+		return new Object[][] {
+			{ResourceCategoryEnum.ALLOTTED_RESOURCE},
+			{ResourceCategoryEnum.TEMPLATE_MONITORING_TEMPLATE},
+			};
+	}
+	
+	// Verify exist of normative resource category from data provider
+	@Test(dataProvider="normativeResourceCategory")
+	public void normativeResourceCategory(ResourceCategoryEnum resourceCategoryEnum) throws Exception {
+		RestResponse restResponse = CategoryRestUtils.getAllCategories(ElementFactory.getDefaultUser(UserRoleEnum.DESIGNER), "resources");
+		validateJsonContainResourceCategory(restResponse.getResponse(), resourceCategoryEnum);
+		
+		Resource resource = AtomicOperationUtils.createResourcesByTypeNormTypeAndCatregory(ResourceTypeEnum.VF, NormativeTypesEnum.ROOT, resourceCategoryEnum, UserRoleEnum.DESIGNER, true).left().value();
+		List<String> createdResoucesName = new ArrayList<String>();
+		createdResoucesName.add(resource.getName());
+		
+		restResponse = ResourceRestUtils.getResourceListFilterByCategory(ElementFactory.getDefaultUser(UserRoleEnum.DESIGNER), AssetTypeEnum.RESOURCES.getValue(), resourceCategoryEnum.getCategory());
+		
+		Integer expectedResponseCode = 200;
+		Assert.assertEquals(restResponse.getErrorCode(), expectedResponseCode);
+		validateJsonContainResource(restResponse.getResponse(), createdResoucesName, true);
+	}
+	
+	// Verify search filter by sub-category
+	@Test
+	public void validateFilterBySubcategory() throws Exception {
+		ResourceCategoryEnum resourceCategoryEnum = getRandomCategoryFromResourceCategoryEnum();
+		
+		Resource resource = AtomicOperationUtils.createResourcesByTypeNormTypeAndCatregory(ResourceTypeEnum.VF, NormativeTypesEnum.ROOT, resourceCategoryEnum, UserRoleEnum.DESIGNER, true).left().value();
+		List<String> createdResoucesName = new ArrayList<String>();
+		createdResoucesName.add(resource.getName());
+		
+		RestResponse restResponse = ResourceRestUtils.getResourceListFilterBySubCategory(ElementFactory.getDefaultUser(UserRoleEnum.DESIGNER), AssetTypeEnum.RESOURCES.getValue(), resourceCategoryEnum.getSubCategory());
+		
+		Integer expectedResponseCode = 200;
+		Assert.assertEquals(restResponse.getErrorCode(), expectedResponseCode);
+		validateJsonContainResource(restResponse.getResponse(), createdResoucesName, true);
+	}
+	
+	
+	protected ResourceCategoryEnum getRandomCategoryFromResourceCategoryEnum() throws Exception {
+		Random random = new Random();
+		int randint = random.nextInt(ResourceCategoryEnum.values().length);
+		int i = 0;
+		for(ResourceCategoryEnum resourceTypeEnum: ResourceCategoryEnum.values()) {
+			if(randint == i) {
+				return resourceTypeEnum;
+			}
+			i++;
+		}
+		return null;
+	}
+	
+	protected CategoryDefinition getRandomCategory() throws Exception {
+		Random random = new Random();
+		
+		RestResponse restResponse = CategoryRestUtils.getAllCategories(ElementFactory.getDefaultUser(UserRoleEnum.DESIGNER), "resources");
+		Gson gson = new Gson();
+		JsonElement jelement = new JsonParser().parse(restResponse.getResponse());
+		JsonArray jsonArray = jelement.getAsJsonArray();
+		
+		CategoryDefinition categoryDefinition = gson.fromJson(jsonArray.get(random.nextInt(jsonArray.size())), CategoryDefinition.class);
+		
+		return categoryDefinition;
+	}
+	
+	protected void validateJsonContainResource(String json, List<String> resourceNameList, Boolean willBeFound) {
+		int lenResourceNameList = resourceNameList.size();
+		Gson gson = new Gson();
+		JsonElement jsonElement = new JsonParser().parse(json);
+		JsonArray jsonArray = jsonElement.getAsJsonArray();
+		for(JsonElement jElement: jsonArray) {
+			ResourceReqDetails jResource = gson.fromJson(jElement, ResourceReqDetails.class);
+			
+			if(resourceNameList.contains(jResource.getName())) {
+				resourceNameList.remove(jResource.getName());
+			}
+		}
+		
+		if(resourceNameList.size() != 0 && willBeFound) {			
+			Assert.assertTrue(false, "Created resource not found on search filtered by category.");
+		} else if (lenResourceNameList != resourceNameList.size() & !willBeFound) {
+			Assert.assertTrue(false, "Some of the resources found when expect that no resource will be found.");
+		}
+	}
+	
+	
+	
+	protected void validateJsonContainResourceCategory(String json, ResourceCategoryEnum resourceCategoryEnum) {
+		Gson gson = new Gson();
+		JsonElement jelement = new JsonParser().parse(json);
+		JsonArray jsonArray = jelement.getAsJsonArray();
+		for(JsonElement jsonElement : jsonArray){
+			CategoryDefinition categoryDefinition = gson.fromJson(jsonElement, CategoryDefinition.class);
+			
+			if(categoryDefinition.getName().equals(resourceCategoryEnum.getCategory())) { 
+				for(SubCategoryDefinition subcategory: categoryDefinition.getSubcategories()) {
+					if(subcategory.getName().equals(resourceCategoryEnum.getSubCategory())) {
+						return;
+					}
+				}
+			}
+			
+		}
+		
+		Assert.assertTrue(false, "Category and subcategory not found in categories list.");
+	}
+
+	
+}
diff --git a/integration-tests/src/test/java/org/openecomp/sdc/externalApis/UserAPIs.java b/integration-tests/src/test/java/org/openecomp/sdc/externalApis/UserAPIs.java
new file mode 100644
index 0000000000..749de6d44f
--- /dev/null
+++ b/integration-tests/src/test/java/org/openecomp/sdc/externalApis/UserAPIs.java
@@ -0,0 +1,547 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * SDC
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.sdc.externalApis;
+
+import com.google.gson.Gson;
+import com.google.gson.reflect.TypeToken;
+import org.junit.Rule;
+import org.junit.rules.TestName;
+import org.onap.portalsdk.core.restful.domain.EcompRole;
+import org.onap.portalsdk.core.restful.domain.EcompUser;
+import org.openecomp.sdc.be.datatypes.enums.ResourceTypeEnum;
+import org.openecomp.sdc.be.model.Resource;
+import org.openecomp.sdc.be.model.User;
+import org.openecomp.sdc.ci.tests.api.ComponentBaseTest;
+import org.openecomp.sdc.ci.tests.datatypes.enums.LifeCycleStatesEnum;
+import org.openecomp.sdc.ci.tests.datatypes.enums.UserRoleEnum;
+import org.openecomp.sdc.ci.tests.datatypes.http.RestResponse;
+import org.openecomp.sdc.ci.tests.utils.general.AtomicOperationUtils;
+import org.openecomp.sdc.ci.tests.utils.general.ElementFactory;
+import org.openecomp.sdc.ci.tests.utils.rest.BaseRestUtils;
+import org.openecomp.sdc.ci.tests.utils.rest.EcompUserRestUtils;
+import org.openecomp.sdc.ci.tests.utils.rest.ResourceRestUtils;
+import org.openecomp.sdc.ci.tests.utils.rest.UserRestUtils;
+import org.testng.Assert;
+import org.testng.annotations.Test;
+
+import java.io.IOException;
+import java.lang.reflect.Type;
+import java.util.*;
+
+import static org.testng.AssertJUnit.assertFalse;
+import static org.testng.AssertJUnit.assertTrue;
+
+public class UserAPIs extends ComponentBaseTest {
+	
+	@Rule
+	public static TestName name = new TestName();
+
+	public User adminUser = ElementFactory.getDefaultUser(UserRoleEnum.ADMIN);
+
+	
+	@Test
+	public void createUserAllPosibleRolesThenDeactivate() throws Exception {
+		
+		EcompUser ecompUser = new EcompUser();
+		EcompRole ecompRole = new EcompRole();
+		
+		List<EcompRole> allRoles = getAllRoles();
+	
+		for (EcompRole ecompRole2 : allRoles) {
+			try {
+				
+				///get list of users
+				List<EcompUser> allusersList = getAllusersList();
+				int sizeBeforeChange = allusersList.size();
+	
+				//create user
+				ecompUser.setLoginId(getUser());
+				ecompRole.setId((long) ecompRole2.getId());
+				ecompRole.setName(ecompRole2.getName());
+				System.out.println(ecompRole2.getName());
+				Set<EcompRole> setRoles = new HashSet<EcompRole>();
+				setRoles.add(ecompRole);
+				ecompUser.setRoles(setRoles);
+				RestResponse pushUser = EcompUserRestUtils.pushUser(ecompUser);
+				BaseRestUtils.checkSuccess(pushUser);
+				
+				///get list of users verify list size changed
+				allusersList = getAllusersList();
+				int sizeAfterChange = allusersList.size();
+				
+				Assert.assertEquals(sizeBeforeChange + 1, sizeAfterChange, "Expected that list will change.");
+				sizeBeforeChange = sizeAfterChange;
+				pushUser = EcompUserRestUtils.pushUser(ecompUser);	
+				
+				//deactivate user
+				ecompRole = new EcompRole();;
+				List<EcompRole> list= new ArrayList<EcompRole>();
+				list.add(ecompRole);
+				
+				RestResponse deactivateUserResponse = EcompUserRestUtils.pushUserRoles(ecompUser.getLoginId(), list);
+				BaseRestUtils.checkSuccess(deactivateUserResponse);
+				
+				///get list of users verify list size changed
+				allusersList = getAllusersList();
+				sizeAfterChange = allusersList.size();
+				Assert.assertEquals(sizeBeforeChange, sizeAfterChange + 1, "Expected that list will change.");
+				
+				} finally {
+				deleteUser(ecompUser.getLoginId());
+			}
+							
+		}
+					
+	}
+	
+	@Test
+	public void createSameUserTwiceTest() throws Exception {
+		
+		EcompUser ecompUser = new EcompUser();
+		EcompRole ecompRole = new EcompRole();
+		try {
+			
+			///get list of users
+			List<EcompUser> allusersList = getAllusersList();
+			int sizeBeforeChange = allusersList.size();
+
+			//create user
+			ecompUser.setLoginId(getUser());
+			ecompRole.setId((long) 1);
+			ecompRole.setName("TESTER");
+			Set<EcompRole> setRoles = new HashSet<EcompRole>();
+			setRoles.add(ecompRole);
+			ecompUser.setRoles(setRoles);
+			RestResponse pushUser = EcompUserRestUtils.pushUser(ecompUser);
+			BaseRestUtils.checkSuccess(pushUser);
+			
+			///get list of users verify list size changed
+			allusersList = getAllusersList();
+			int sizeAfterChange = allusersList.size();
+					
+			assertTrue("List is Equel" , sizeBeforeChange != sizeAfterChange );
+			pushUser = EcompUserRestUtils.pushUser(ecompUser);	
+			
+		} finally {
+			deleteUser(ecompUser.getLoginId());
+		}
+		
+	}
+	
+	@Test
+	public void createSameUserTwiceDiffrentDataTest() throws Exception {
+		
+		EcompUser ecompUser = new EcompUser();
+		EcompRole ecompRole = new EcompRole();
+		try {
+			///get list of users
+			List<EcompUser> allusersList = getAllusersList();
+			int sizeBeforeChange = allusersList.size();
+
+			//create user
+			ecompUser.setLoginId(getUser());
+			ecompRole.setId((long) 1);
+			ecompRole.setName("TESTER");
+			Set<EcompRole> setRoles = new HashSet<EcompRole>();
+			setRoles.add(ecompRole);
+			ecompUser.setRoles(setRoles);
+			RestResponse pushUser = EcompUserRestUtils.pushUser(ecompUser);
+			BaseRestUtils.checkSuccess(pushUser);
+			
+			///get list of users verify list size changed
+			allusersList = getAllusersList();
+			int sizeAfterChange = allusersList.size();
+					
+			assertTrue("Lists are Equal" , sizeBeforeChange != sizeAfterChange );
+			
+			//update role
+			ecompRole.setId((long) 2);
+			ecompRole.setName("DESIGNER");
+			setRoles = new HashSet<EcompRole>();
+			setRoles.add(ecompRole);
+			ecompUser.setRoles(setRoles);
+			
+			pushUser = EcompUserRestUtils.pushUser(ecompUser);	
+			
+		} finally {
+			deleteUser(ecompUser.getLoginId());
+		}
+		
+	}
+	
+	@Test
+	public void updateUserRoleTest() throws Exception {
+		
+		EcompUser ecompUser = new EcompUser();
+		EcompRole ecompRole = new EcompRole();
+		try {
+			//create user
+			ecompUser.setLoginId(getUser());
+			ecompRole.setId((long) 1);
+			ecompRole.setName("TESTER");
+			Set<EcompRole> setRoles = new HashSet<EcompRole>();
+			setRoles.add(ecompRole);
+			ecompUser.setRoles(setRoles);
+			RestResponse pushUser = EcompUserRestUtils.pushUser(ecompUser);
+			BaseRestUtils.checkSuccess(pushUser);
+			
+			List<EcompRole> userRolesBefore = getUserRoles(ecompUser);
+			
+			//update role
+			ecompRole = new EcompRole();
+			ecompRole.setId((long) 2);
+			ecompRole.setName("DESIGNER");
+			List<EcompRole> list= new ArrayList<EcompRole>();
+			list.add(ecompRole);
+			
+			EcompUserRestUtils.pushUserRoles(ecompUser.getLoginId(), list);
+			
+			List<EcompRole> userRolesAfter = getUserRoles(ecompUser); 
+			
+			assertFalse("role wasn't changed", userRolesBefore.equals(userRolesAfter));
+		} finally {
+			deleteUser(ecompUser.getLoginId());
+		}
+		
+	}
+
+	@Test
+	public void addUserCreateResource() throws Exception {
+		
+		EcompUser ecompUser = new EcompUser();
+		EcompRole ecompRole = new EcompRole();
+		Resource resource = new Resource();
+		
+		try {
+			//create user
+			ecompUser.setLoginId(getUser());
+			ecompRole.setId((long) 2);
+			ecompRole.setName("DESIGNER");
+			Set<EcompRole> setRoles = new HashSet<EcompRole>();
+			setRoles.add(ecompRole);
+			ecompUser.setRoles(setRoles);
+			RestResponse pushUser = EcompUserRestUtils.pushUser(ecompUser);
+			BaseRestUtils.checkSuccess(pushUser);
+			
+			UserRoleEnum.DESIGNER.setUserId(ecompUser.getLoginId());
+			resource = AtomicOperationUtils.createResourceByType(ResourceTypeEnum.VF, UserRoleEnum.DESIGNER, true).left().value();
+			
+		} finally {
+			ResourceRestUtils.deleteResource(resource.getUniqueId(), adminUser.getUserId());
+			deleteUser(ecompUser.getLoginId());
+		}
+		
+	}
+	
+	// First try update to Tester and verify it not success
+	// Then try to deactivate and verify it not success
+	@Test
+	public void changeUserRoleWithCheckOutResourceThenDeactivate() throws Exception {
+		EcompUser ecompUser = new EcompUser();
+		EcompRole ecompRole = new EcompRole();
+		Resource resource = new Resource();		
+		try {
+			//create user
+			ecompUser.setLoginId(getUser());
+			ecompRole.setId((long) 2);
+			ecompRole.setName("DESIGNER");
+			Set<EcompRole> setRoles = new HashSet<EcompRole>();
+			setRoles.add(ecompRole);
+			ecompUser.setRoles(setRoles);
+			RestResponse pushUser = EcompUserRestUtils.pushUser(ecompUser);
+			BaseRestUtils.checkSuccess(pushUser);
+			
+			UserRoleEnum.DESIGNER.setUserId(ecompUser.getLoginId());
+			resource = AtomicOperationUtils.createResourceByType(ResourceTypeEnum.VF, UserRoleEnum.DESIGNER, true).left().value();
+			
+			int sizeBeforeChange = getAllusersList().size();
+			
+			//update role
+			ecompRole = new EcompRole();
+			ecompRole.setId((long) 1);
+			ecompRole.setName("TESTER");
+			List<EcompRole> list= new ArrayList<EcompRole>();
+			list.add(ecompRole);
+			
+			RestResponse pushUserRoles = EcompUserRestUtils.pushUserRoles(ecompUser.getLoginId(), list);
+			Assert.assertEquals(pushUserRoles.getErrorCode(), (Integer)BaseRestUtils.STATUS_CODE_UNSUPPORTED_ERROR, "Not correct response code");
+			
+			//deactivate user
+			ecompRole = new EcompRole();;
+			list= new ArrayList<EcompRole>();
+			list.add(ecompRole);
+			
+			RestResponse deactivateUserResponse = EcompUserRestUtils.pushUserRoles(ecompUser.getLoginId(), list);
+			Assert.assertEquals(deactivateUserResponse.getErrorCode(), (Integer)BaseRestUtils.STATUS_CODE_UNSUPPORTED_ERROR, "Not correct response code");
+			
+			///get list of users verify list size changed
+			int sizeAfterChange = getAllusersList().size();
+			Assert.assertEquals(sizeBeforeChange, sizeAfterChange, "Expected that list will not change.");
+			
+		} finally {
+			ResourceRestUtils.deleteResource(resource.getUniqueId(), adminUser.getUserId());
+			deleteUser(ecompUser.getLoginId());
+		}
+	}
+	
+	/*@Test
+	public void deactivateUserRoleWithStartTestingResource() throws Exception {
+		
+		EcompUser ecompUser = new EcompUser();
+		EcompRole ecompRole = new EcompRole();
+		Resource resource= new Resource();
+
+		try {
+			//create user
+			ecompUser.setLoginId(getUser());
+			ecompRole.setId((long) 2);
+			ecompRole.setName("DESIGNER");
+			Set<EcompRole> setRoles = new HashSet<EcompRole>();
+			setRoles.add(ecompRole);
+			ecompUser.setRoles(setRoles);
+			RestResponse pushUser = EcompUserRestUtils.pushUser(ecompUser);
+			BaseRestUtils.checkSuccess(pushUser);
+			int sizeBeforeChange = getAllusersList().size();
+			UserRoleEnum.DESIGNER.setUserId(ecompUser.getLoginId());
+			
+			resource = AtomicOperationUtils.createResourceByType(ResourceTypeEnum.VF, UserRoleEnum.DESIGNER, true).left().value();
+			AtomicOperationUtils.changeComponentState(resource, UserRoleEnum.DESIGNER, LifeCycleStatesEnum.CERTIFICATIONREQUEST, true);
+			
+			
+			//update role
+			ecompRole = new EcompRole();
+			ecompRole.setId((long) 1);
+			ecompRole.setName("TESTER");
+			List<EcompRole> list= new ArrayList<EcompRole>();
+			list.add(ecompRole);
+			
+			RestResponse pushUserRoles = EcompUserRestUtils.pushUserRoles(ecompUser.getLoginId(), list);
+			BaseRestUtils.checkSuccess(pushUserRoles);
+			
+			UserRoleEnum.TESTER.setUserId(ecompUser.getLoginId());
+			AtomicOperationUtils.changeComponentState(resource, UserRoleEnum.TESTER, LifeCycleStatesEnum.STARTCERTIFICATION, true);
+			
+			//deactivate user
+			ecompRole = new EcompRole();;
+			list= new ArrayList<EcompRole>();
+			list.add(ecompRole);
+			
+			RestResponse deactivateUserResponse = EcompUserRestUtils.pushUserRoles(ecompUser.getLoginId(), list);
+			Assert.assertEquals(deactivateUserResponse.getErrorCode(), (Integer)BaseRestUtils.STATUS_CODE_UNSUPPORTED_ERROR, "Not correct response code");
+			
+			///get list of users verify list size changed
+			int sizeAfterChange = getAllusersList().size();
+			Assert.assertEquals(sizeBeforeChange, sizeAfterChange, "Expected that list will not change.");
+			
+		} finally {
+			ResourceRestUtils.deleteResource(resource.getUniqueId(), adminUser.getUserId());
+			deleteUser(ecompUser.getLoginId());
+		}
+	}*/
+	
+	@Test
+	public void changeUserRoleWithStartTestingResource() throws Exception {
+		
+		EcompUser ecompUser = new EcompUser();
+		EcompRole ecompRole = new EcompRole();
+		Resource resource= new Resource();
+
+		try {
+			//create user
+			ecompUser.setLoginId(getUser());
+			ecompRole.setId((long) 2);
+			ecompRole.setName("DESIGNER");
+			Set<EcompRole> setRoles = new HashSet<EcompRole>();
+			setRoles.add(ecompRole);
+			ecompUser.setRoles(setRoles);
+			RestResponse pushUser = EcompUserRestUtils.pushUser(ecompUser);
+			BaseRestUtils.checkSuccess(pushUser);
+			
+			UserRoleEnum.DESIGNER.setUserId(ecompUser.getLoginId());
+			
+			resource = AtomicOperationUtils.createResourceByType(ResourceTypeEnum.VF, UserRoleEnum.DESIGNER, true).left().value();
+			AtomicOperationUtils.changeComponentState(resource, UserRoleEnum.DESIGNER, LifeCycleStatesEnum.STARTCERTIFICATION, true);
+			
+			
+			//update role
+			ecompRole = new EcompRole();
+			ecompRole.setId((long) 1);
+			ecompRole.setName("TESTER");
+			List<EcompRole> list= new ArrayList<EcompRole>();
+			list.add(ecompRole);
+			
+			RestResponse pushUserRoles = EcompUserRestUtils.pushUserRoles(ecompUser.getLoginId(), list);
+			BaseRestUtils.checkSuccess(pushUserRoles);
+			
+		} finally {
+			ResourceRestUtils.deleteResource(resource.getUniqueId(), adminUser.getUserId());
+			deleteUser(ecompUser.getLoginId());
+		}
+	}
+	
+	@Test
+	public void fillAllEcompFields() throws Exception {
+		EcompUser ecompUser = new EcompUser();
+		EcompRole ecompRole = new EcompRole();
+		try {
+
+			///get list of users
+			List<EcompUser> allusersList = getAllusersList();
+			int sizeBeforeChange = allusersList.size();
+
+			//create user
+			ecompUser.setLoginId(getUser());
+			ecompUser.setOrgId((long) 123);
+			ecompUser.setManagerId("ci4321");
+			ecompUser.setFirstName("firstName");
+			ecompUser.setMiddleInitial("middleInitial");
+			ecompUser.setLastName("lastName");
+			ecompUser.setPhone("phone");
+			ecompUser.setEmail("email@email.com");
+			ecompUser.setHrid("hrid");
+			ecompUser.setOrgUserId("orgUserId");
+			ecompUser.setOrgCode("orgCode");
+			ecompUser.setOrgManagerUserId("ci1234");
+			ecompUser.setJobTitle("jobTitle");
+			ecompUser.setActive(true);
+			
+			
+			ecompRole.setId((long) 1);
+			ecompRole.setName("TESTER");
+			Set<EcompRole> setRoles = new HashSet<EcompRole>();
+			setRoles.add(ecompRole);
+			ecompUser.setRoles(setRoles);
+			RestResponse pushUser = EcompUserRestUtils.pushUser(ecompUser);
+			BaseRestUtils.checkSuccess(pushUser);
+			
+			///get list of users verify list size changed
+			allusersList = getAllusersList();
+			int sizeAfterChange = allusersList.size();
+					
+			assertTrue("List is Equel" , sizeBeforeChange != sizeAfterChange );
+			
+		} finally {
+			
+			deleteUser(ecompUser.getLoginId());
+		}
+	}
+	
+	@Test
+	public void missingMandatoryFieldRole() throws Exception {
+		
+		EcompUser ecompUser = new EcompUser();
+		try {
+			///get list of users
+			List<EcompUser> allusersList = getAllusersList();
+			int sizeBeforeChange = allusersList.size();
+
+			//create user
+			ecompUser.setLoginId(getUser());
+			RestResponse pushUser = EcompUserRestUtils.pushUser(ecompUser);
+			BaseRestUtils.checkSuccess(pushUser);
+			
+			///get list of users verify list size changed
+			allusersList = getAllusersList();
+			int sizeAfterChange = allusersList.size();
+					
+			assertTrue("List is Equel" , sizeBeforeChange != sizeAfterChange );
+			
+		} finally {
+			deleteUser(ecompUser.getLoginId());
+		}
+	}
+	
+	@Test
+	public void missingMandatoryFieldATTid() throws Exception {
+		
+		EcompUser ecompUser = new EcompUser();
+		EcompRole ecompRole = new EcompRole();
+		try {
+			
+			//create user
+			ecompUser.setLoginId("");
+			ecompRole.setId((long) 1);
+			ecompRole.setName("TESTER");
+			Set<EcompRole> setRoles = new HashSet<EcompRole>();
+			setRoles.add(ecompRole);
+			ecompUser.setRoles(setRoles);
+			RestResponse pushUser = EcompUserRestUtils.pushUser(ecompUser);
+			assertTrue("wrong response code :" , pushUser.getErrorCode() == BaseRestUtils.STATUS_CODE_INVALID_CONTENT);
+			
+		} finally {
+			deleteUser(ecompUser.getLoginId());
+		}
+		
+		
+	}
+
+	private List<EcompRole> getUserRoles(EcompUser ecompUser) throws IOException {
+		RestResponse userRoles = EcompUserRestUtils.getUserRoles(ecompUser.getLoginId());
+		Type listType = new TypeToken<List<EcompRole>>() {}.getType();
+		List<EcompRole> roleList = new Gson().fromJson(userRoles.getResponse(), listType);
+		return roleList;
+	}
+
+	private void deleteUser(String userId) throws IOException {
+		User defaultUser = ElementFactory.getDefaultUser(UserRoleEnum.DESIGNER);
+		defaultUser.setUserId(userId);
+		
+		UserRestUtils.deleteUser(defaultUser, adminUser, true);
+	}
+	
+	private  List<EcompUser> getAllusersList() throws IOException {
+		RestResponse allUsers = EcompUserRestUtils.getAllUsers();
+		
+		Type listType = new TypeToken<List<EcompUser>>() {}.getType();
+		List<EcompUser> usersList = new Gson().fromJson(allUsers.getResponse(), listType);
+		
+		return usersList;
+	}
+	
+	private  List<EcompRole> getAllRoles() throws IOException {
+		RestResponse allRoles = EcompUserRestUtils.getAllAvailableRoles();
+		
+		Type listType = new TypeToken<List<EcompRole>>() {}.getType();
+		List<EcompRole> availableRoles = new Gson().fromJson(allRoles.getResponse(), listType);
+		
+		return availableRoles;
+	}
+	
+	private String getUser() {
+		int nextInt = rnd.nextInt(8999) + 1000;
+//		String returnMe = "ci"+ new BigInteger(getRandomNumber(4));
+		String returnMe = "ci"+ nextInt;
+		System.out.println(returnMe);
+		
+		
+		return returnMe;
+	}
+	
+	private static Random rnd = new Random();
+
+	public static String getRandomNumber(int digCount) {
+	    StringBuilder sb = new StringBuilder(digCount);
+	    for(int i=1; i <= digCount; i++){
+	        sb.append((char)('0' + rnd.nextInt(10)));
+	    }
+	    return sb.toString();
+	}
+}
diff --git a/integration-tests/src/test/java/org/openecomp/sdc/externalApis/VFCMTExternalAPI.java b/integration-tests/src/test/java/org/openecomp/sdc/externalApis/VFCMTExternalAPI.java
new file mode 100644
index 0000000000..2eb3843639
--- /dev/null
+++ b/integration-tests/src/test/java/org/openecomp/sdc/externalApis/VFCMTExternalAPI.java
@@ -0,0 +1,375 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * SDC
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.sdc.externalApis;
+
+import com.google.gson.Gson;
+import com.google.gson.JsonArray;
+import com.google.gson.JsonElement;
+import org.json.simple.parser.JSONParser;
+import org.junit.Rule;
+import org.junit.rules.TestName;
+import org.openecomp.sdc.be.dao.api.ActionStatus;
+import org.openecomp.sdc.be.datatypes.enums.AssetTypeEnum;
+import org.openecomp.sdc.be.datatypes.enums.ResourceTypeEnum;
+import org.openecomp.sdc.be.model.User;
+import org.openecomp.sdc.ci.tests.api.ComponentBaseTest;
+import org.openecomp.sdc.ci.tests.config.Config;
+import org.openecomp.sdc.ci.tests.datatypes.ResourceAssetStructure;
+import org.openecomp.sdc.ci.tests.datatypes.ResourceExternalReqDetails;
+import org.openecomp.sdc.ci.tests.datatypes.ResourceReqDetails;
+import org.openecomp.sdc.ci.tests.datatypes.ServiceReqDetails;
+import org.openecomp.sdc.ci.tests.datatypes.enums.ErrorInfo;
+import org.openecomp.sdc.ci.tests.datatypes.enums.ResourceCategoryEnum;
+import org.openecomp.sdc.ci.tests.datatypes.enums.SearchCriteriaEnum;
+import org.openecomp.sdc.ci.tests.datatypes.enums.UserRoleEnum;
+import org.openecomp.sdc.ci.tests.datatypes.http.RestResponse;
+import org.openecomp.sdc.ci.tests.utils.general.ElementFactory;
+import org.openecomp.sdc.ci.tests.utils.rest.AssetRestUtils;
+import org.openecomp.sdc.ci.tests.utils.rest.ResourceRestUtils;
+import org.openecomp.sdc.ci.tests.utils.rest.ResourceRestUtilsExternalAPI;
+import org.openecomp.sdc.ci.tests.utils.validation.ErrorValidationUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.testng.Assert;
+import org.testng.annotations.DataProvider;
+import org.testng.annotations.Test;
+
+import java.util.List;
+
+import static java.util.Arrays.asList;
+import static org.testng.Assert.assertTrue;
+
+public class VFCMTExternalAPI extends ComponentBaseTest {
+
+	private static Logger log = LoggerFactory.getLogger(CRUDExternalAPI.class.getName());
+	protected static final String UPLOAD_ARTIFACT_PAYLOAD = "UHVUVFktVXNlci1LZXktRmlsZS0yOiBzc2gtcnNhDQpFbmNyeXB0aW9uOiBhZXMyNTYtY2JjDQpDb21tZW5wOA0K";
+	protected static final String UPLOAD_ARTIFACT_NAME = "TLV_prv.ppk";
+
+	protected Config config = Config.instance();
+	protected String contentTypeHeaderData = "application/json";
+	protected String acceptHeaderDate = "application/json";
+
+
+
+	protected Gson gson = new Gson();
+	protected JSONParser jsonParser = new JSONParser();
+
+
+	protected String serviceVersion;
+	protected ResourceReqDetails resourceDetails;
+	protected User sdncUserDetails;
+	protected ServiceReqDetails serviceDetails;
+	
+
+//	@BeforeMethod
+//	public synchronized void init() throws Exception{
+//		AtomicOperationUtils.createDefaultConsumer(true);
+//	}
+	
+	
+	@Rule 
+	public static TestName name = new TestName();
+
+	// Create VFCMT - validate response + search external api + retrieve metadata via external api  - success flow
+	@Test
+	public void createVfcmt() throws Exception {
+		User defaultUser = ElementFactory.getDefaultUser(UserRoleEnum.DESIGNER);
+		ResourceExternalReqDetails defaultResource = ElementFactory.getDefaultResourceByType("ci", ResourceCategoryEnum.TEMPLATE_MONITORING_TEMPLATE, defaultUser.getUserId(), ResourceTypeEnum.VFCMT.toString());
+		
+		RestResponse restResponse = ResourceRestUtilsExternalAPI.createResource(defaultResource, defaultUser);
+		ResourceAssetStructure parsedCreatedResponse = gson.fromJson(restResponse.getResponse(), ResourceAssetStructure.class);
+
+	/*	// auditing verification
+		AuditingActionEnum action = AuditingActionEnum.CREATE_RESOURCE_BY_API;
+		Map <AuditingFieldsKey, String> body = new HashMap<>();
+		body.put(AuditingFieldsKey.AUDIT_RESOURCE_NAME, parsedCreatedResponse.getName());
+		ExpectedResourceAuditJavaObject expectedResourceAuditJavaObject = ElementFactory.getDefaultCreateResourceExternalAPI(parsedCreatedResponse.getName());
+		AuditValidationUtils.validateAuditExternalCreateResource(expectedResourceAuditJavaObject, action.getName(), body);*/
+		
+		// search for vfcmt via external api - validate created resource exist
+		RestResponse searchResult = ResourceRestUtils.getResourceListFilterByCriteria(ElementFactory.getDefaultUser(UserRoleEnum.DESIGNER), AssetTypeEnum.RESOURCES.getValue(), SearchCriteriaEnum.RESOURCE_TYPE.getValue(), ResourceTypeEnum.VFCMT.toString());
+		JsonArray listSearchResult = gson.fromJson(searchResult.getResponse(), JsonArray.class);
+		boolean found = false;
+		for(JsonElement result: listSearchResult) {
+			ResourceAssetStructure parsedResult  = gson.fromJson(result, ResourceAssetStructure.class);
+			if(parsedResult.getName().equals(defaultResource.getName())) {
+				found = true;
+			}
+		}
+		Assert.assertEquals(found, true);
+		
+		// get created vfcmt metadata via external api - validate data
+		RestResponse resourceMetadata = AssetRestUtils.getAssetMetadataByAssetTypeAndUuid(true, AssetTypeEnum.RESOURCES, parsedCreatedResponse.getUuid());
+		ResourceAssetStructure parsedMetadata  = gson.fromJson(resourceMetadata.getResponse(), ResourceAssetStructure.class);
+		
+		Assert.assertEquals(parsedCreatedResponse.getUuid(), parsedMetadata.getUuid());
+		Assert.assertEquals(parsedCreatedResponse.getInvariantUUID(), parsedMetadata.getInvariantUUID());
+		Assert.assertEquals(parsedCreatedResponse.getName(), parsedMetadata.getName());
+		Assert.assertEquals(parsedCreatedResponse.getVersion(), parsedMetadata.getVersion());
+		Assert.assertEquals(parsedCreatedResponse.getCategory(), parsedMetadata.getCategory());
+		Assert.assertEquals(parsedCreatedResponse.getSubCategory(), parsedMetadata.getSubCategory());
+		Assert.assertEquals(parsedCreatedResponse.getResourceType(), parsedMetadata.getResourceType());
+		Assert.assertEquals(parsedCreatedResponse.getLifecycleState(), parsedMetadata.getLifecycleState());
+		Assert.assertEquals(parsedCreatedResponse.getLastUpdaterUserId(), parsedMetadata.getLastUpdaterUserId());
+		Assert.assertEquals(parsedCreatedResponse.getLastUpdaterFullName(), parsedMetadata.getLastUpdaterFullName());
+		Assert.assertEquals(parsedCreatedResponse.getToscaResourceName(), parsedMetadata.getToscaResourceName());
+	}
+	
+	
+	
+	// Create two VFCMT with same name - validate error + audit - failure flow
+	@Test
+	public void createTwoVfcmtWithSameName() throws Exception {
+		User defaultUser = ElementFactory.getDefaultUser(UserRoleEnum.DESIGNER);
+		ResourceExternalReqDetails defaultResource = ElementFactory.getDefaultResourceByType("ci", ResourceCategoryEnum.TEMPLATE_MONITORING_TEMPLATE, defaultUser.getUserId(), ResourceTypeEnum.VFCMT.toString());
+		
+		// create vfcmt
+		RestResponse firstTryToCreate = ResourceRestUtilsExternalAPI.createResource(defaultResource, defaultUser);
+		ResourceAssetStructure parsedCreatedResponse = gson.fromJson(firstTryToCreate.getResponse(), ResourceAssetStructure.class);
+
+		/*// auditing verification
+		AuditingActionEnum action = AuditingActionEnum.CREATE_RESOURCE_BY_API;
+		Map <AuditingFieldsKey, String> body = new HashMap<>();
+		body.put(AuditingFieldsKey.AUDIT_RESOURCE_NAME, parsedCreatedResponse.getName());
+		ExpectedResourceAuditJavaObject expectedResourceAuditJavaObject = ElementFactory.getDefaultCreateResourceExternalAPI(parsedCreatedResponse.getName());	
+		AuditValidationUtils.validateAuditExternalCreateResource(expectedResourceAuditJavaObject, action.getName(), body);*/
+		
+		// try to create another vfcmt wit same name
+		RestResponse secondTryToCreate = ResourceRestUtilsExternalAPI.createResource(defaultResource, defaultUser);
+		Assert.assertEquals((int)secondTryToCreate.getErrorCode(), 409);
+		
+		/*body.put(AuditingFieldsKey.AUDIT_STATUS, "409");
+		ErrorInfo errorInfo = ErrorValidationUtils.parseErrorConfigYaml(ActionStatus.COMPONENT_NAME_ALREADY_EXIST.name());
+		List<String> variables = asList(ComponentTypeEnum.RESOURCE.getValue(), defaultResource.getName());
+		expectedResourceAuditJavaObject.setDesc(AuditValidationUtils.buildAuditDescription(errorInfo, variables));
+		expectedResourceAuditJavaObject.setStatus("409");
+		AuditValidationUtils.validateAuditExternalCreateResource(expectedResourceAuditJavaObject, action.getName(), body);*/
+	}
+	
+	
+	
+	@DataProvider(name="createVfcmtVariousFailureFlows", parallel=true)
+	public static Object[][] dataProviderCreateVfcmtVariousFailureFlows() {
+		return new Object[][] {
+			{"name_missing"},
+			{"name_to_long"},
+			{"name_with_invalid_char"},
+			{"description_missing"},
+			{"description_to_long"},
+			{"description_with_invalid_char"},
+			{"resource_type_missing"},
+			{"resource_type_invalid"},
+			{"category_type_missing"},
+			{"category_type_invalid"},
+			{"subcategory_type_missing"},
+			{"subcategory_type_invalid"},
+			{"vendor_name_missing"},
+			{"vendor_name_to_long"},
+			{"vendor_name_with_invalid_char"},
+			{"vendor_release_missing"},
+			{"vendor_release_to_long"},
+			{"vendor_release_with_invalid_char"},
+			{"tags_missing"},
+			{"tags_to_long"},
+			{"tags_invalid"},
+			{"icon_missing"},
+			{"user_contact_missing"},
+			{"user_contact_invalid"},
+			};
+	}
+	
+	// Various failure flows
+	@Test(dataProvider="createVfcmtVariousFailureFlows")
+	public void createVfcmtVariousFailureFlows(String flow) throws Exception {
+		
+		User defaultUser = ElementFactory.getDefaultUser(UserRoleEnum.DESIGNER);
+		ResourceExternalReqDetails defaultResource = ElementFactory.getDefaultResourceByType("ci", ResourceCategoryEnum.TEMPLATE_MONITORING_TEMPLATE, defaultUser.getUserId(), ResourceTypeEnum.VFCMT.toString());
+		
+		ErrorInfo errorInfo = null;
+		/*List<String> variables = null;
+		AuditingActionEnum action = AuditingActionEnum.CREATE_RESOURCE_BY_API;
+		ExpectedResourceAuditJavaObject expectedResourceAuditJavaObject = ElementFactory.getDefaultCreateResourceExternalAPI(defaultResource.getName());	
+		Map <AuditingFieldsKey, String> body = new HashMap<>();
+		body.put(AuditingFieldsKey.AUDIT_RESOURCE_NAME, defaultResource.getName());*/
+		
+		switch (flow) {
+		case "name_missing":
+			defaultResource.setName("");
+			List<String> resourceTags = defaultResource.getTags();
+			resourceTags.add("");
+			defaultResource.setTags(resourceTags);
+			errorInfo = ErrorValidationUtils.parseErrorConfigYaml(ActionStatus.MISSING_COMPONENT_NAME.name());
+			/*expectedResourceAuditJavaObject.setResourceName("");
+			variables = asList(ComponentTypeEnum.RESOURCE.getValue());
+			body.put(AuditingFieldsKey.AUDIT_RESOURCE_NAME, "");*/
+			break;
+		case "name_to_long":
+			defaultResource.setName("asdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjk1asdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjk1asdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjk1asdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjk1");
+			errorInfo = ErrorValidationUtils.parseErrorConfigYaml(ActionStatus.COMPONENT_NAME_EXCEEDS_LIMIT.name());
+			/*expectedResourceAuditJavaObject.setResourceName("asdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjk1asdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjk1asdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjk1asdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjk1");
+			variables = asList(ComponentTypeEnum.RESOURCE.getValue(), "1024");
+			body.put(AuditingFieldsKey.AUDIT_RESOURCE_NAME, "asdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjk1asdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjk1asdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjk1asdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjk1");*/
+			break;
+		case "name_with_invalid_char":
+			defaultResource.setName("!@#$%^&*(");
+			errorInfo = ErrorValidationUtils.parseErrorConfigYaml(ActionStatus.INVALID_COMPONENT_NAME.name());
+			/*expectedResourceAuditJavaObject.setResourceName("!@#$%^&*(");
+			variables = asList(ComponentTypeEnum.RESOURCE.getValue());
+			body.put(AuditingFieldsKey.AUDIT_RESOURCE_NAME, "!@#$%^&*(");*/
+			break;
+		case "description_missing":
+			defaultResource.setDescription("");
+			errorInfo = ErrorValidationUtils.parseErrorConfigYaml(ActionStatus.COMPONENT_MISSING_DESCRIPTION.name());
+			/*expectedResourceAuditJavaObject.setDesc("");
+			variables = asList(ComponentTypeEnum.RESOURCE.getValue());*/
+			break;
+		case "description_to_long":
+			defaultResource.setDescription("asdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjk1asdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjk1asdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjk1asdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjk1");
+			errorInfo = ErrorValidationUtils.parseErrorConfigYaml(ActionStatus.COMPONENT_DESCRIPTION_EXCEEDS_LIMIT.name());
+			/*expectedResourceAuditJavaObject.setDesc("asdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjk1asdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjk1asdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjk1asdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjklasdfghjk1");
+			variables = asList(ComponentTypeEnum.RESOURCE.getValue(), "1024");*/
+			break;
+		case "description_with_invalid_char":
+			defaultResource.setDescription("\uC2B5");
+			errorInfo = ErrorValidationUtils.parseErrorConfigYaml(ActionStatus.COMPONENT_INVALID_DESCRIPTION.name());
+			/*expectedResourceAuditJavaObject.setDesc("t");
+			variables = asList(ComponentTypeEnum.RESOURCE.getValue());*/
+			break;
+		// TODO: defect on the flow - need to get error instead create VFC
+		case "resource_type_missing":
+			defaultResource.setResourceType("");
+			errorInfo = ErrorValidationUtils.parseErrorConfigYaml(ActionStatus.INVALID_CONTENT.name());
+			/*expectedResourceAuditJavaObject.setResourceType("");
+			variables = asList(ComponentTypeEnum.RESOURCE.getValue());*/
+			break;
+		// TODO: in audit RESOURCE_NAME is empty
+		case "resource_type_invalid":
+			defaultResource.setResourceType("invalid");
+			errorInfo = ErrorValidationUtils.parseErrorConfigYaml(ActionStatus.INVALID_RESOURCE_TYPE.name());
+			/*expectedResourceAuditJavaObject.setResourceType(ComponentTypeEnum.RESOURCE.getValue());
+			variables = asList(ComponentTypeEnum.RESOURCE.getValue());*/
+			break;
+		case "category_type_missing":
+			defaultResource.setCategory("");
+			errorInfo = ErrorValidationUtils.parseErrorConfigYaml(ActionStatus.COMPONENT_MISSING_CATEGORY.name());
+			/*variables = asList(ComponentTypeEnum.RESOURCE.getValue());*/
+			break;
+		// TODO: not correct response code in this flow - 500 instead 400
+		case "category_type_invalid":
+			defaultResource.setCategory("invalid");
+			errorInfo = ErrorValidationUtils.parseErrorConfigYaml(ActionStatus.COMPONENT_INVALID_CATEGORY.name());
+			/*variables = asList(ComponentTypeEnum.RESOURCE.getValue());*/
+			break;
+		case "subcategory_type_missing":
+			defaultResource.setSubcategory("");
+			errorInfo = ErrorValidationUtils.parseErrorConfigYaml(ActionStatus.COMPONENT_MISSING_SUBCATEGORY.name());
+			/*variables = asList(ComponentTypeEnum.RESOURCE.getValue());*/
+			break;
+		// TODO: not correct error - it not missing it not correct
+		case "subcategory_type_invalid":
+			defaultResource.setSubcategory("invalid");
+			errorInfo = ErrorValidationUtils.parseErrorConfigYaml(ActionStatus.COMPONENT_INVALID_SUBCATEGORY.name());
+			/*variables = asList(ComponentTypeEnum.RESOURCE.getValue());*/
+			break;
+		case "vendor_name_missing":
+			defaultResource.setVendorName("");
+			errorInfo = ErrorValidationUtils.parseErrorConfigYaml(ActionStatus.MISSING_VENDOR_NAME.name());
+			/*variables = asList(ComponentTypeEnum.RESOURCE.getValue());*/
+			break;
+		case "vendor_name_to_long":
+			defaultResource.setVendorName("asdffasdffasdffasdffasdffasdffasdffasdffasdffasdffasdffasdffasdffasdffasdffasdffasdffasdffasdffasdffasdffasdffasdffasdffasdffasdffasdffasdffasdffasdffasdffasdffasdffasdffasdffasdffasdffasdffasdffasdffasdffasdffasdffasdffasdffasdffasdffasdff");
+			errorInfo = ErrorValidationUtils.parseErrorConfigYaml(ActionStatus.VENDOR_NAME_EXCEEDS_LIMIT.name());
+			/*variables = asList(ValidationUtils.VENDOR_NAME_MAX_LENGTH.toString());*/
+			break;
+		case "vendor_name_with_invalid_char":
+			defaultResource.setVendorName("!@#$*()&*^%$#@");
+			errorInfo = ErrorValidationUtils.parseErrorConfigYaml(ActionStatus.INVALID_VENDOR_NAME.name());
+			/*variables = asList(ComponentTypeEnum.RESOURCE.getValue());*/
+			break;
+		case "vendor_release_missing":
+			defaultResource.setVendorRelease("");
+			errorInfo = ErrorValidationUtils.parseErrorConfigYaml(ActionStatus.MISSING_VENDOR_RELEASE.name());
+			/*variables = asList(ComponentTypeEnum.RESOURCE.getValue());*/
+			break;
+		case "vendor_release_to_long":
+			defaultResource.setVendorRelease("asdffasdffasdffasdffasdffasdffasdffasdffasdffasdffasdffasdffasdffasdffasdffasdffasdffasdffasdffasdffasdffasdffasdffasdffasdffasdffasdffasdffasdffasdffasdffasdffasdffasdffasdffasdffasdffasdffasdffasdffasdffasdffasdffasdffasdffasdffasdffasdff");
+			errorInfo = ErrorValidationUtils.parseErrorConfigYaml(ActionStatus.VENDOR_RELEASE_EXCEEDS_LIMIT.name());
+			/*variables = asList("25");*/
+			break;
+		case "vendor_release_with_invalid_char":
+			defaultResource.setVendorRelease("!@#$*()&*^%$#@");
+			errorInfo = ErrorValidationUtils.parseErrorConfigYaml(ActionStatus.INVALID_VENDOR_RELEASE.name());
+			/*variables = asList(ComponentTypeEnum.RESOURCE.getValue());*/
+			break;
+		case "tags_missing":
+			defaultResource.setTags(asList(""));
+			errorInfo = ErrorValidationUtils.parseErrorConfigYaml(ActionStatus.INVALID_FIELD_FORMAT.name());
+			/*variables = asList(ComponentTypeEnum.RESOURCE.getValue(), "tag");*/
+			break;
+		case "tags_to_long":
+			defaultResource.setTags(asList("asdffasdffasdffasdffasdffasdffasdffasdffasdffasdffasdffasdffasdffasdffasdffasdffasdffasdffasdffasdffasdffasdffasdffasdffasdffasdffasdffasdffasdffasdffasdffasdffasdffasdffasdffasdffasdffasdffasdffasdffasdffasdffasdffasdffasdffasdffasdffasdffasdffasdffasdffasdffasdffasdffasdffasdffasdffasdffasdffasdffasdffasdffasdffasdffasdffasdffasdffasdffasdffasdffasdffasdffasdffasdffasdffasdffasdffasdffasdffasdffasdffasdffasdffasdffasdffasdffasdffasdffasdffasdffasdffasdffasdffasdffasdffasdffasdffasdffasdffasdffasdffasdffasdffasdffasdffasdffasdffasdffasdffasdffasdffasdffasdffasdffasdffasdffasdffasdffasdffasdffasdffasdffasdffasdffasdffasdffasdffasdffasdffasdffasdffasdffasdffasdffasdffasdffasdffasdffasdffasdffasdffasdffasdffasdffasdffasdffasdffasdffasdffasdffasdffasdffasdffasdffasdffasdffasdffasdffasdffasdffasdffasdffasdffasdffasdffasdffasdffasdffasdffasdffasdffasdffasdffasdffasdffasdffasdffasdffasdffasdffasdffasdffasdffasdffasdffasdffasdffasdffasdffasdffasdffasdffasdffasdffasdffasdffasdffasdffasdffasdffasdffasdffasdffasdffasdffasdffasdffasdffasdffasdffasdffasdffasdffasdffasdffasdffasdffasdffasdffasdffasdffasdffasdffasdffasdffasdffasdffasdffasdffasdffasdffasdffasdffasdffasdffasdffasdffasdffasdffasdffasdffasdffasdffasdffasdffasdffasdffasdffasdffasdffasdffasdffasdffasdffasdffasdffasdffasdffasdffasdffasdffasdffasdffasdffasdffasdffasdffasdffasdffasdffasdffasdffasdffasdffasdffasdffasdffasdffasdffasdffasdffasdffasdffasdffasdffasdffasdffasdff"));
+			errorInfo = ErrorValidationUtils.parseErrorConfigYaml(ActionStatus.COMPONENT_SINGLE_TAG_EXCEED_LIMIT.name());
+			/*variables = asList("1024");*/
+			break;
+		case "tags_invalid":
+			defaultResource.setTags(asList("asfdg"));
+			errorInfo = ErrorValidationUtils.parseErrorConfigYaml(ActionStatus.COMPONENT_INVALID_TAGS_NO_COMP_NAME.name());
+			/*variables = asList(ComponentTypeEnum.RESOURCE.getValue());*/
+			break;
+		case "icon_missing":
+			defaultResource.setIcon("");
+			errorInfo = ErrorValidationUtils.parseErrorConfigYaml(ActionStatus.COMPONENT_MISSING_ICON.name());
+			/*variables = asList(ComponentTypeEnum.RESOURCE.getValue());*/
+			break;
+		case "user_contact_missing":
+			defaultResource.setContactId("");
+			errorInfo = ErrorValidationUtils.parseErrorConfigYaml(ActionStatus.COMPONENT_MISSING_CONTACT.name());
+			/*variables = asList(ComponentTypeEnum.RESOURCE.getValue());*/
+			break;
+		case "user_contact_invalid":
+		default:
+			defaultResource.setContactId("abcderfffdfdfdabcderfffdfdfdabcderfffdfdfdabcderfffdfdfdabcderfffdfdfdabcderfffdfdfdabcderfffdfdfdabcderfffdfdfdabcderfffdfdfdabcderfffdfdfdabcderfffdfdfdabcderfffdfdfdabcderfffdfdfdabcderfffdfdfdabcderfffdfdfdabcderfffdfdfdabcderfffdfdfdabcderfffdfdfdabcderfffdfdfdabcderfffdfdfdabcderfffdfdfdabcderfffdfdfdabcderfffdfdfdabcderfffdfdfdabcderfffdfdfdabcderfffdfdfdabcderfffdfdfdabcderfffdfdfdabcderfffdfdfdabcderfffdfdfdabcderfffdfdfdabcderfffdfdfdabcderfffdfdfdabcderfffdfdfdabcderfffdfdfd");
+			errorInfo = ErrorValidationUtils.parseErrorConfigYaml(ActionStatus.COMPONENT_INVALID_CONTACT.name());
+			/*variables = asList(ComponentTypeEnum.RESOURCE.getValue());*/
+			break;
+		}
+			
+		// create vfcmt
+		RestResponse restResponse = ResourceRestUtilsExternalAPI.createResource(defaultResource, defaultUser);
+		assertTrue(errorInfo.getCode().equals(restResponse.getErrorCode()), "Expected response code on [" + flow + "] is: " + errorInfo.getCode() + ", actual is: " + restResponse.getErrorCode());
+		
+		/*expectedResourceAuditJavaObject.setStatus(errorInfo.getCode().toString());
+		expectedResourceAuditJavaObject.setDesc(AuditValidationUtils.buildAuditDescription(errorInfo, variables));
+		AuditValidationUtils.validateAuditExternalCreateResource(expectedResourceAuditJavaObject, action.getName(), body);*/
+		
+	}
+	
+
+
+	
+	
+	
+	
+	
+	
+
+	
+}
diff --git a/integration-tests/src/test/java/org/openecomp/sdc/internalApis/annotations/AnnotationsTest.java b/integration-tests/src/test/java/org/openecomp/sdc/internalApis/annotations/AnnotationsTest.java
new file mode 100644
index 0000000000..63f855c9f8
--- /dev/null
+++ b/integration-tests/src/test/java/org/openecomp/sdc/internalApis/annotations/AnnotationsTest.java
@@ -0,0 +1,221 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * SDC
+ * ================================================================================
+ * 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=========================================================
+ */
+
+package org.openecomp.sdc.internalApis.annotations;
+
+import com.google.common.collect.ImmutableSet;
+import com.google.common.collect.Maps;
+import org.apache.commons.lang3.tuple.Pair;
+import org.junit.Rule;
+import org.junit.rules.TestName;
+import org.openecomp.sdc.be.dao.utils.MapUtil;
+import org.openecomp.sdc.be.datatypes.elements.Annotation;
+import org.openecomp.sdc.be.datatypes.enums.ResourceTypeEnum;
+import org.openecomp.sdc.be.model.*;
+import org.openecomp.sdc.be.model.utils.ComponentUtilities;
+import org.openecomp.sdc.ci.tests.api.ComponentBaseTest;
+import org.openecomp.sdc.ci.tests.datatypes.ResourceReqDetails;
+import org.openecomp.sdc.ci.tests.datatypes.enums.LifeCycleStatesEnum;
+import org.openecomp.sdc.ci.tests.datatypes.enums.NormativeTypesEnum;
+import org.openecomp.sdc.ci.tests.datatypes.enums.ResourceCategoryEnum;
+import org.openecomp.sdc.ci.tests.datatypes.enums.UserRoleEnum;
+import org.openecomp.sdc.ci.tests.datatypes.http.RestResponse;
+import org.openecomp.sdc.ci.tests.tosca.datatypes.ToscaAnnotationsTypesDefinition;
+import org.openecomp.sdc.ci.tests.utils.general.AtomicOperationUtils;
+import org.openecomp.sdc.ci.tests.utils.general.ElementFactory;
+import org.openecomp.sdc.ci.tests.utils.general.FileHandling;
+import org.openecomp.sdc.ci.tests.utils.rest.PropertyRestUtils;
+import org.testng.annotations.Test;
+
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.stream.Collectors;
+
+import static java.util.stream.Collectors.groupingBy;
+import static java.util.stream.Collectors.toMap;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.Assert.assertTrue;
+import static org.openecomp.sdc.ci.tests.tosca.datatypes.ToscaAnnotationsTypesDefinition.SOURCE_ANNOTATION;
+import static org.openecomp.sdc.ci.tests.utils.ToscaTypesDefinitionUtils.getToscaAnnotationsFromCsar;
+import static org.openecomp.sdc.ci.tests.utils.general.AtomicOperationUtils.*;
+import static org.openecomp.sdc.ci.tests.utils.general.ElementFactory.getDefaultUser;
+import static org.openecomp.sdc.ci.tests.utils.rest.InputsRestUtils.deleteInputFromComponent;
+import static org.openecomp.sdc.ci.tests.utils.validation.BaseValidationUtils.checkSuccess;
+import static org.springframework.util.CollectionUtils.isEmpty;
+
+public class AnnotationsTest extends ComponentBaseTest{
+
+    private static final String PCM_FLAVOR_NAME = "pcm_flavor_name";
+    private static final String AVAILABILITY_ZONE = "availabilityzone_name";
+    private static final String NET_NAME = "net_name";
+    private static final String NF_NAMING_CODE = "nf_naming_code";
+    private static final String [] PROPS_TO_DECLARE = new String [] {PCM_FLAVOR_NAME, AVAILABILITY_ZONE, NET_NAME, NF_NAMING_CODE};
+    private static final String CSAR_WITH_ANNOTATIONS_V1 = "SIROV_annotations_VSP.csar";
+    private static final String CSAR_WITH_ANNOTATIONS_V2 = "SIROV_annotations_VSP_V2.csar";
+    private static final String SRIOV_PATH = FileHandling.getFilePath("SRIOV");
+
+    @Rule
+    public static TestName name = new TestName();
+
+    public AnnotationsTest() {
+        super();
+    }
+
+    @Test
+    public void whenExportingToscaOfTopologyTemplate_annotationTypeYamlExist_sourceAnnotationExist() throws Exception {
+        User sdncModifierDetails = ElementFactory.getDefaultUser(UserRoleEnum.DESIGNER);
+        ResourceReqDetails resourceDetails = ElementFactory.getDefaultResourceByType("exportToscaAnnotationsYml", NormativeTypesEnum.ROOT, ResourceCategoryEnum.GENERIC_INFRASTRUCTURE, sdncModifierDetails.getUserId(), ResourceTypeEnum.VF.toString());
+        Resource createdVF = AtomicOperationUtils.createResourceByResourceDetails(resourceDetails, UserRoleEnum.DESIGNER, true).left().value();
+        ToscaAnnotationsTypesDefinition toscaAnnotations = getToscaAnnotationsFromCsar(createdVF, sdncModifierDetails);
+        assertTrue(toscaAnnotations.getAnnotation_types().containsKey(SOURCE_ANNOTATION));
+    }
+
+    @Test
+    public void whenDeclaringAnInputFromPropertyWhichOriginatedFromInputWithAnnotation_copyAnnotationsToNewInput() throws Exception {
+        Resource vfWithAnnotationsV1 = importAnnotationsCsarAndCheckIn();
+        Service service = createDefaultService(UserRoleEnum.DESIGNER, true).left().value();
+        ComponentInstance createdCmptInstance = addComponentInstanceToComponentContainer(vfWithAnnotationsV1, service).left().value();
+        Service fetchedService = getServiceObject(service.getUniqueId());
+        List<ComponentInstanceInput> declaredProps = declareProperties(fetchedService, createdCmptInstance, PROPS_TO_DECLARE);
+        verifyAnnotationsOnDeclaredInputs(vfWithAnnotationsV1, fetchedService, declaredProps);
+        Service serviceAfterPropertyDeclaration = getServiceObject(service.getUniqueId());
+        deleteDeclaredInputsAndVerifySuccess(serviceAfterPropertyDeclaration);
+    }
+
+    @Test
+    public void onChangeVersion_copyAnnotationsFromNewVspToServiceInputs() throws Exception {
+        Resource vfWithAnnotationsV1 = importAnnotationsCsarAndCheckIn();
+        Service service = createDefaultService(UserRoleEnum.DESIGNER, true).left().value();
+        ComponentInstance createdCmptInstance = addComponentInstanceToComponentContainer(vfWithAnnotationsV1, service).left().value();
+        Service fetchedService = getServiceObject(service.getUniqueId());
+        declareProperties(fetchedService, createdCmptInstance, PROPS_TO_DECLARE);
+
+        Resource vfWithAnnotationsV2 = updateAnnotationsCsarAndCheckIn(vfWithAnnotationsV1);
+        Pair<Component, ComponentInstance> changeVersionRes = changeComponentInstanceVersion(service, createdCmptInstance, vfWithAnnotationsV2, UserRoleEnum.DESIGNER, true).left().value();
+        Component serviceAfterChangeVersion = changeVersionRes.getKey();
+        ComponentInstance newInstance = changeVersionRes.getRight();
+        List<ComponentInstanceInput> declaredProps = getInstanceProperties(serviceAfterChangeVersion, newInstance.getUniqueId(), PROPS_TO_DECLARE);
+        verifyAnnotationsOnDeclaredInputs(vfWithAnnotationsV2, serviceAfterChangeVersion, declaredProps);
+
+    }
+
+    private void verifyAnnotationsOnDeclaredInputs(Resource vfWithAnnotations, Component fetchedService, List<ComponentInstanceInput> declaredProps) throws Exception {
+        Map<String, InputDefinition> serviceLevelInputsByProperty = getCreatedInputsByProperty(fetchedService, declaredProps);
+        Map<String, List<Annotation>> annotationsFromVfLevelInputs = getAnnotationsByInputName(vfWithAnnotations);
+        verifyInputsAnnotation(serviceLevelInputsByProperty, declaredProps, annotationsFromVfLevelInputs);
+    }
+
+    private Map<String, List<Annotation>> getAnnotationsByInputName(Resource resource) {
+        return resource.getInputs()
+                .stream()
+                .collect(toMap(InputDefinition::getName, input -> ComponentUtilities.getInputAnnotations(resource, input.getName())));
+    }
+
+    private void deleteDeclaredInputsAndVerifySuccess(Component service) throws Exception {
+        for (InputDefinition declaredInput : service.getInputs()) {
+            RestResponse deleteInputResponse = deleteInputFromComponent(service, declaredInput.getUniqueId());
+            checkSuccess(deleteInputResponse);
+        }
+        Service fetchedService = getServiceObject(service.getUniqueId());
+        assertThat(fetchedService.getInputs()).isNullOrEmpty();
+    }
+
+    private void verifyInputsAnnotation(Map<String, InputDefinition> inputsByProperty, List<ComponentInstanceInput> declaredProps, Map<String, List<Annotation>> expectedAnnotationsByInput) {
+        Map<String, ComponentInstanceInput> propsByName = MapUtil.toMap(declaredProps, ComponentInstanceInput::getName);
+
+        InputDefinition declaredFromPcmFlavourName = findInputDeclaredFromProperty(PCM_FLAVOR_NAME, inputsByProperty, propsByName);
+        verifyInputAnnotations(declaredFromPcmFlavourName, expectedAnnotationsByInput.get(PCM_FLAVOR_NAME));
+
+        InputDefinition declaredFromAvailabilityZone = findInputDeclaredFromProperty(AVAILABILITY_ZONE, inputsByProperty, propsByName);
+        verifyInputAnnotations(declaredFromAvailabilityZone, expectedAnnotationsByInput.get(AVAILABILITY_ZONE));
+
+        InputDefinition declaredFromNetName = findInputDeclaredFromProperty(NET_NAME, inputsByProperty, propsByName);
+        verifyInputAnnotations(declaredFromNetName, expectedAnnotationsByInput.get(NET_NAME));
+
+        InputDefinition declaredFromNFNamingCode = findInputDeclaredFromProperty(NF_NAMING_CODE, inputsByProperty, propsByName);
+        verifyInputHasNoAnnotations(declaredFromNFNamingCode);
+    }
+
+    private void verifyInputHasNoAnnotations(InputDefinition inputWithoutAnnotation) {
+        assertThat(inputWithoutAnnotation.getAnnotations()).isNullOrEmpty();
+    }
+
+    private InputDefinition findInputDeclaredFromProperty(String propName, Map<String, InputDefinition> inputsByProperty, Map<String, ComponentInstanceInput> propsByName) {
+        String propId = propsByName.get(propName).getUniqueId();
+        return inputsByProperty.get(propId);
+    }
+
+    private Map<String, InputDefinition> getCreatedInputsByProperty(Component service, List<ComponentInstanceInput> declaredProps) throws Exception {
+        Service fetchedService = getServiceObject(service.getUniqueId());
+        List<InputDefinition> inputs = fetchedService.getInputs();
+        return filterInputsCreatedByDeclaringFromProperties(declaredProps, inputs);
+    }
+
+    private Map<String, InputDefinition> filterInputsCreatedByDeclaringFromProperties(List<ComponentInstanceInput> declaredProps, List<InputDefinition> inputs) {
+        List<String> declaredPropsIds = declaredProps.stream().map(ComponentInstanceInput::getUniqueId).collect(Collectors.toList());
+        Map<String, InputDefinition> inputsByPropertyId = MapUtil.toMap(inputs, InputDefinition::getPropertyId);
+        return Maps.filterKeys(inputsByPropertyId, declaredPropsIds::contains);
+    }
+
+    private Resource importAnnotationsCsarAndCheckIn() throws Exception {
+        Resource annotationsVF = importResourceFromCsar(ResourceTypeEnum.VF, UserRoleEnum.DESIGNER, CSAR_WITH_ANNOTATIONS_V1, SRIOV_PATH);
+        changeComponentState(annotationsVF, UserRoleEnum.DESIGNER, LifeCycleStatesEnum.CHECKIN, true);
+        return annotationsVF;
+    }
+
+    private Resource updateAnnotationsCsarAndCheckIn(Resource vfToUpdate) throws Exception {
+        changeComponentState(vfToUpdate, UserRoleEnum.DESIGNER, LifeCycleStatesEnum.CHECKOUT, true);
+        Resource annotationsVfV2 = updateResourceFromCsar(vfToUpdate, UserRoleEnum.DESIGNER, CSAR_WITH_ANNOTATIONS_V2, SRIOV_PATH);
+        changeComponentState(annotationsVfV2, UserRoleEnum.DESIGNER, LifeCycleStatesEnum.CHECKIN, true);
+        return annotationsVfV2;
+    }
+
+    private List<ComponentInstanceInput> declareProperties(Service service, ComponentInstance instance, String ... propertiesToDeclareNames) throws Exception {
+        Map<String, List<ComponentInstanceInput>> propertiesToDeclare = getServiceInstancesProps(service, instance.getUniqueId(), propertiesToDeclareNames);
+        RestResponse restResponse = PropertyRestUtils.declareProporties(service, propertiesToDeclare, getDefaultUser(UserRoleEnum.DESIGNER));
+        checkSuccess(restResponse);
+        return propertiesToDeclare.get(instance.getUniqueId());
+    }
+
+    private List<ComponentInstanceInput> getInstanceProperties(Component service, String ofInstance, String ... propsNames) {
+        return getServiceInstancesProps(service, ofInstance, propsNames).get(ofInstance);
+    }
+
+    private void verifyInputAnnotations(InputDefinition input, List<Annotation> expectedAnnotations) {
+        if (isEmpty(expectedAnnotations)) {
+            assertThat(input.getAnnotations()).isNullOrEmpty();
+            return;
+        }
+        assertThat(input.getAnnotations())
+                .usingElementComparatorOnFields("type", "name", "properties")
+                .isNotEmpty()
+                .containsExactlyElementsOf(expectedAnnotations);
+    }
+
+    private Map<String, List<ComponentInstanceInput>> getServiceInstancesProps(Component fromService, String ofInstance, String ... propsToDeclareNames) {
+        Set<String> propsToDeclare = ImmutableSet.<String>builder().add(propsToDeclareNames).build();
+        List<ComponentInstanceInput> componentInstancesInputs = fromService.getComponentInstancesInputs().get(ofInstance);
+        return componentInstancesInputs.stream()
+                .filter(insInput -> propsToDeclare.contains(insInput.getName()))
+                .collect(groupingBy((i) -> ofInstance));
+    }
+
+}
diff --git a/integration-tests/src/test/java/org/openecomp/sdc/post/Install.java b/integration-tests/src/test/java/org/openecomp/sdc/post/Install.java
new file mode 100644
index 0000000000..322a3171ad
--- /dev/null
+++ b/integration-tests/src/test/java/org/openecomp/sdc/post/Install.java
@@ -0,0 +1,70 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * SDC
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.sdc.post;
+
+import org.openecomp.sdc.be.dao.DAOJanusGraphStrategy;
+import org.openecomp.sdc.be.dao.janusgraph.JanusGraphClient;
+import org.openecomp.sdc.be.dao.janusgraph.JanusGraphOperationStatus;
+
+import java.io.File;
+
+public class Install {
+	public static void main(String[] args) {
+
+		if (args == null || args.length == 0) {
+			System.out.println("Usage: org.openecomp.sdc.post.Install path_to_janusgraph.properties");
+			System.exit(1);
+		}
+		String janusGraphPropsFile = args[0];
+
+		if (!isFileExists(janusGraphPropsFile)) {
+			System.exit(2);
+		}
+
+		if (!createJanusGraphSchema(janusGraphPropsFile)) {
+			System.exit(3);
+		}
+
+		System.exit(0);
+	}
+
+	private static boolean createJanusGraphSchema(String janusGraphPropsFile) {
+		JanusGraphClient janusGraphClient = new JanusGraphClient(new DAOJanusGraphStrategy());
+		JanusGraphOperationStatus status = janusGraphClient.createGraph(janusGraphPropsFile);
+		if (JanusGraphOperationStatus.OK == status) {
+			System.out.println("JanusGraph schema ,indexes and default values created successfully.");
+			return true;
+		} else {
+			System.out.println(
+					"Problem while creating janusgraph schema ,indexes and default values. (" + status.name() + ")");
+			return false;
+		}
+	}
+
+	private static boolean isFileExists(String janusGraphPropsFile) {
+		File f = new File(janusGraphPropsFile);
+		if (!f.exists()) {
+			System.out.println(janusGraphPropsFile + " not found");
+			return false;
+		}
+		return true;
+	}
+}
diff --git a/integration-tests/src/test/resources/Files/PNFs/pmDictionary.yml b/integration-tests/src/test/resources/Files/PNFs/pmDictionary.yml
new file mode 100644
index 0000000000..fa3ed531e7
--- /dev/null
+++ b/integration-tests/src/test/resources/Files/PNFs/pmDictionary.yml
@@ -0,0 +1,98 @@
+---
+# PM Dictionary Schema
+pmMetaData: { presence: required, structure: {
+  pmHeader: { presence: required, structure: {
+    pmDefVsn: { presence: required, comment: “Version of the PM Dictionary artifact that contains this measurement.  Vendor defined.”},
+    pmDefSchemaVsn: { presence: required, comment: “PM Dictionary schema version from the VES Event Registration specification.”},
+    nfType: { presence: required, comment: “NF type to whom this measurement applies.  This should match the nfName-vendor string used in the fileReady or perf3gpp eventName.”}
+  } } ,
+  pmFields: { presence: required, structure: {
+    measType: { presence: required, comment: “Measurement name used in PM file, in 3GPP format where specified, else vendor defined. Names for 3GPP-defined 4G measurements are specified in 3GPP TS 32.425 item e). Names for 3GPP-defined 5G measurements are specified in 3GPP TS 28.552 item e). Vendor defined names are preceded with VS.”},
+    iMeasType: { presence: required, comment: “Vendor defined integer identifier for the measType, used for efficiency in GPB.  Must be combined with measInfoId to identify a specific measurement.”},
+    measDescription: { presence: required, comment: “Text description of the purpose of the measurement, what information does the measurement provide.”},
+    measCondition: { presence: required, comment: “Text description of the condition that causes the measurement to be updated.”},
+    measResultType: { presence: required, value: [integer], comment: “Data type of the measurement result.”},
+    measResultRange: { presence: optional, comment: “Range of the measurement result.  Only necessary when the range is smaller than the full range of the data type.”},
+    measResultUnits: { presence: required, value: [seconds, minutes, nanoseconds, microseconds, dB, number, kilobytes, bytes, ethernetFrames, packets, users], comment: “Units of measure of the measurement result.”},
+    measObjClass: { presence: required, comment: “Object class of the measurement.”},
+    measCollectionMethod: { presence: required, value: [CC, SI, DER, Gauge, Average], comment: “Measurement collection method of the measurement.  CC, SI, DER and Gauge are as defined in 3GPP.  Average contains the average value of the measurement during the granularity period.”},
+    measLastChange: { presence: required, comment: “Version of the PM Dictionary artifact the last time this measurement was added, modified or deleted.”},
+    measChangeType: { presence: required, value: [added, modified, deleted], comment: “Indicates the type of change that occurred during the measLastChange.”},
+    measInfoId: { presence: required, comment: “Name for a group of related measurements, in 3GPP format where specified, else vendor defined. Family names for 3GPP-defined 4G measurements are specified in 3GPP TS 32.425 Section 3.1. Family names for 3GPP-defined 5G measurements are specified in 3GPP TS 28.552 Section 3.4.”},
+    iMeasInfoId: { presence: required, comment: “Vendor defined integer identifier for the measInfoId, used for efficiency in GPB.”},
+    measFamily: { presence: required, comment: “Abbreviation for a family of measurements, in 3GPP format where specified, else vendor defined.”},
+    measAdditionalFields: { presence: required, comment: “This section contains vendor specific measurement fields.”, structure: {
+      measAggregationLevels: { presence: required, value: [NRBTS, NRCellCU, NRCellDU, IPNO, IPSEC, ETHIF], comment: “A list of one or more aggregations levels that Nokia recommends for this measurement.  For example, if the value is NRBTS NRCellCU, then Nokia recommends that this measurement be aggregated on the 5G BTS level and the 5G CU Cell level.”},
+      measTriggerType: { presence: optional, value: [Event, Sample], comment: “Indicates whether this measurement is triggered by an event or is sampled.”}
+    } }
+  } }
+} }
+---
+pmMetaData:
+  pmHeader:
+    nfType: gnb-Nokia
+    pmDefSchemaVsn: 2.0
+    pmDefVsn: 5G19_1906_002
+  pmFields:
+    iMeasInfoId: 2204
+    iMeasType: 1
+    measCollectionMethod: CC
+    measCondition: "This measurement is updated when X2AP: SgNB Modification Required message is sent to MeNB with the SCG Change Indication set as PSCellChange."
+    measDescription: "This counter indicates the number of intra gNB intra frequency PSCell change attempts."
+    measFamily: NINFC
+    measInfoId: "NR Intra Frequency PSCell Change"
+    measLastChange: 5G18A_1807_003
+    measObjClass: NGCELL
+    measResultRange: 0-4096
+    measResultType: integer
+    measResultUnits: number
+    measType: VS.NINFC.IntraFrPscelChAttempt
+    measAdditionalFields:
+      vendorField1: X
+      vendorField2: B
+---
+pmMetaData:
+  pmHeader:
+    nfType: gnb-Nokia
+    pmDefSchemaVsn: 2.0
+    pmDefVsn: 5G19_1906_002
+  pmFields:
+    iMeasInfoId: 2204
+    iMeasType: 2
+    measCollectionMethod: CC
+    measCondition: "This measurement is updated when the TDCoverall timer has elapsed before gNB receives the X2AP: SgNB Modification Confirm message."
+    measDescription: "This measurement the number of intra gNB intra frequency PSCell change failures due to TDCoverall timer expiry."
+    measFamily: NINFC
+    measInfoId: "NR Intra Frequency PSCell Change"
+    measLastChange: 5G18A_1807_003
+    measObjClass: NGCELL
+    measResultRange: 0-4096
+    measResultType: integer
+    measResultUnits: number
+    measType: VS.NINFC.IntraFrPscelChFailTdcExp
+    measAdditionalFields:
+      vendorField1: Y
+---
+pmMetaData:
+  pmHeader:
+    nfType: gnb-Nokia
+    pmDefSchemaVsn: 2.0
+    pmDefVsn: 5G19_1906_002
+  pmFields:
+    iMeasInfoId: 2206
+    iMeasType: 1
+    measCollectionMethod: CC
+    measCondition: "This measurement is updated when MeNB replies to X2AP: SgNB Modification Required message with the X2AP: SgNB Modification Refuse message."
+    measDescription: "This counter indicates the number of intra gNB intra frequency PSCell change failures due to MeNB refusal."
+    measFamily: NINFC
+    measInfoId: "NR Intra Frequency PSCell Change"
+    measLastChange: 5G19_1906_002
+    measObjClass: NGCELL
+    measResultRange: 0-4096
+    measResultType: integer
+    measResultUnits: number
+    measType: VS.NINFC.IntraFrPscelChFailMenbRef
+    measAdditionalFields:
+      vendorField1: Z
+      vendorField2: A
+...
diff --git a/integration-tests/src/test/resources/Files/PNFs/sample-pnf-1.0.1-SNAPSHOT.csar b/integration-tests/src/test/resources/Files/PNFs/sample-pnf-1.0.1-SNAPSHOT.csar
new file mode 100644
index 0000000000..b4d2b3eda3
--- /dev/null
+++ b/integration-tests/src/test/resources/Files/PNFs/sample-pnf-1.0.1-SNAPSHOT.csar
diff --git a/integration-tests/src/test/resources/Files/PNFs/sample-pnf-custom-type.csar b/integration-tests/src/test/resources/Files/PNFs/sample-pnf-custom-type.csar
new file mode 100644
index 0000000000..e4e60b26d1
--- /dev/null
+++ b/integration-tests/src/test/resources/Files/PNFs/sample-pnf-custom-type.csar
diff --git a/integration-tests/src/test/resources/Files/PNFs/sample-signed-pnf-1.0.1-SNAPSHOT.zip b/integration-tests/src/test/resources/Files/PNFs/sample-signed-pnf-1.0.1-SNAPSHOT.zip
new file mode 100644
index 0000000000..fecb45aaaf
--- /dev/null
+++ b/integration-tests/src/test/resources/Files/PNFs/sample-signed-pnf-1.0.1-SNAPSHOT.zip
diff --git a/integration-tests/src/test/resources/Files/PNFs/sample-signed-pnf-cms-includes-cert-1.0.1-SNAPSHOT.zip b/integration-tests/src/test/resources/Files/PNFs/sample-signed-pnf-cms-includes-cert-1.0.1-SNAPSHOT.zip
new file mode 100644
index 0000000000..676a9ff777
--- /dev/null
+++ b/integration-tests/src/test/resources/Files/PNFs/sample-signed-pnf-cms-includes-cert-1.0.1-SNAPSHOT.zip
diff --git a/integration-tests/src/test/resources/Files/VNFs/Huawei_vHSS.csar b/integration-tests/src/test/resources/Files/VNFs/Huawei_vHSS.csar
new file mode 100644
index 0000000000..316d5690f5
--- /dev/null
+++ b/integration-tests/src/test/resources/Files/VNFs/Huawei_vHSS.csar
diff --git a/integration-tests/src/test/resources/Files/VNFs/Huawei_vMME.csar b/integration-tests/src/test/resources/Files/VNFs/Huawei_vMME.csar
new file mode 100644
index 0000000000..fe313fff86
--- /dev/null
+++ b/integration-tests/src/test/resources/Files/VNFs/Huawei_vMME.csar
diff --git a/integration-tests/src/test/resources/Files/VNFs/ZteEpcMmeVf.csar b/integration-tests/src/test/resources/Files/VNFs/ZteEpcMmeVf.csar
new file mode 100644
index 0000000000..184c223ec2
--- /dev/null
+++ b/integration-tests/src/test/resources/Files/VNFs/ZteEpcMmeVf.csar
diff --git a/integration-tests/src/test/resources/Files/VNFs/base_vfw.zip b/integration-tests/src/test/resources/Files/VNFs/base_vfw.zip
new file mode 100644
index 0000000000..b8273defea
--- /dev/null
+++ b/integration-tests/src/test/resources/Files/VNFs/base_vfw.zip
diff --git a/integration-tests/src/test/resources/Files/VNFs/base_vvg.zip b/integration-tests/src/test/resources/Files/VNFs/base_vvg.zip
new file mode 100644
index 0000000000..dc9ef5d823
--- /dev/null
+++ b/integration-tests/src/test/resources/Files/VNFs/base_vvg.zip
diff --git a/integration-tests/src/test/resources/Files/VNFs/database-substitution-mappings.csar b/integration-tests/src/test/resources/Files/VNFs/database-substitution-mappings.csar
new file mode 100644
index 0000000000..6fbf240977
--- /dev/null
+++ b/integration-tests/src/test/resources/Files/VNFs/database-substitution-mappings.csar
diff --git a/integration-tests/src/test/resources/Files/VNFs/infra.zip b/integration-tests/src/test/resources/Files/VNFs/infra.zip
new file mode 100644
index 0000000000..09eb9cd648
--- /dev/null
+++ b/integration-tests/src/test/resources/Files/VNFs/infra.zip
diff --git a/integration-tests/src/test/resources/Files/VNFs/resource-ZteEpcMmeVf-csar_fix.csar b/integration-tests/src/test/resources/Files/VNFs/resource-ZteEpcMmeVf-csar_fix.csar
new file mode 100644
index 0000000000..72d3d0c869
--- /dev/null
+++ b/integration-tests/src/test/resources/Files/VNFs/resource-ZteEpcMmeVf-csar_fix.csar
diff --git a/integration-tests/src/test/resources/Files/VNFs/vLB.zip b/integration-tests/src/test/resources/Files/VNFs/vLB.zip
new file mode 100644
index 0000000000..b61ca1b83b
--- /dev/null
+++ b/integration-tests/src/test/resources/Files/VNFs/vLB.zip
diff --git a/integration-tests/src/test/resources/Files/VNFs/vLBMS.zip b/integration-tests/src/test/resources/Files/VNFs/vLBMS.zip
new file mode 100644
index 0000000000..c542870bad
--- /dev/null
+++ b/integration-tests/src/test/resources/Files/VNFs/vLBMS.zip
diff --git a/integration-tests/src/test/resources/Files/VNFs/vSBC_update_v03.csar b/integration-tests/src/test/resources/Files/VNFs/vSBC_update_v03.csar
new file mode 100644
index 0000000000..65d66cd693
--- /dev/null
+++ b/integration-tests/src/test/resources/Files/VNFs/vSBC_update_v03.csar
diff --git a/integration-tests/src/test/resources/Files/VNFs/vbng.zip b/integration-tests/src/test/resources/Files/VNFs/vbng.zip
new file mode 100644
index 0000000000..ab5163d9ed
--- /dev/null
+++ b/integration-tests/src/test/resources/Files/VNFs/vbng.zip
diff --git a/integration-tests/src/test/resources/Files/VNFs/vbrgemu.zip b/integration-tests/src/test/resources/Files/VNFs/vbrgemu.zip
new file mode 100644
index 0000000000..28c69a570f
--- /dev/null
+++ b/integration-tests/src/test/resources/Files/VNFs/vbrgemu.zip
diff --git a/integration-tests/src/test/resources/Files/VNFs/vesEvent.yml b/integration-tests/src/test/resources/Files/VNFs/vesEvent.yml
new file mode 100644
index 0000000000..ce6a152154
--- /dev/null
+++ b/integration-tests/src/test/resources/Files/VNFs/vesEvent.yml
@@ -0,0 +1,282 @@
+---
+event: {
+  presence: required,
+  action: [ any, any, baseStationSynchronizationProblem,
+            contact technical support ],
+  structure: {
+    commonEventHeader: {
+      presence: required,
+      structure: {
+        domain: {
+          presence: required,
+          value: fault
+        },
+        eventName: {
+          presence: required,
+          value: 'Fault_1'
+        },
+        eventId: {
+          presence: required
+        },
+        nfNamingCode: {
+          value: mrfx
+        },
+        priority: {
+          presence: required,
+          value: 'Medium'
+        },
+        reportingEntityId: {
+          presence: required
+        },
+        reportingEntityName: {
+          presence: required
+        },
+        sequence: {
+          presence: required
+        },
+        sourceId: {
+          presence: required
+        },
+        sourceName: {
+          presence: required
+        },
+        startEpochMicrosec: {
+          presence: required
+        },
+        lastEpochMicrosec: {
+          presence: required
+        },
+        version: {
+          presence: required,
+          value: 3.0
+        }
+      }
+    },
+    faultFields: {
+      presence: required,
+      structure: {
+        eventCategory: {
+          presence: optional,
+          comment: 'Equipment Alarm'
+        },
+        alarmCondition: {
+          presence: required,
+          value: alarm003
+        },
+        eventSeverity: {
+          presence: required,
+          value: MAJOR
+        },
+        eventSourceType: {
+          presence: required,
+          value: virtualNetworkFunction
+        },
+        faultFieldsVersion: {
+          presence: required,
+          value: 2.0
+        },
+        specificProblem: {
+          presence: required,
+          value: "Configuration file was corrupt or not present"
+        },
+        vfStatus: {
+          presence: required,
+          value: "Requesting Termination"
+        },
+        alarmAdditionalInformation: {
+          required: true,
+          comment: "Comment"
+        }
+      }
+    }
+  },
+  comment: "comment2"
+}
+
+---
+
+event: {
+  presence: required,
+  action: [ any, any, baseStationConnectivityLost,
+            contact technical support ],
+  structure: {
+    commonEventHeader: {
+      presence: required,
+      structure: {
+        domain: {
+          presence: required,
+          value: fault
+        },
+        eventName: {
+          presence: required,
+          value: 'Fault_2'
+        },
+        eventId: {
+          presence: required
+        },
+        nfNamingCode: {
+          value: mrfx
+        },
+        priority: {
+          presence: required,
+          value: 'Medium'
+        },
+        reportingEntityId: {
+          presence: required
+        },
+        reportingEntityName: {
+          presence: required
+        },
+        sequence: {
+          presence: required
+        },
+        sourceId: {
+          presence: required
+        },
+        sourceName: {
+          presence: required
+        },
+        startEpochMicrosec: {
+          presence: required
+        },
+        lastEpochMicrosec: {
+          presence: required
+        },
+        version: {
+          presence: required,
+          value: 3.0
+        }
+      }
+    },
+    faultFields: {
+      presence: required,
+      structure: {
+        eventCategory: {
+          presence: optional,
+          comment: 'Communications Alarm'
+        },
+        alarmCondition: {
+          presence: required,
+          value: 'baseStationConnectivityLost'
+        },
+        eventSeverity: {
+          presence: required
+        },
+        eventSourceType: {
+          presence: required,
+          value: 'virtualNetworkFunction'
+        },
+        faultFieldsVersion: {
+          presence: required,
+          value: 2.0
+        },
+        specificProblem: {
+          presence: required
+        },
+        vfStatus: {
+          presence: required,
+          value: "Active"
+        },
+        alarmAdditionalInformation: {
+          required: true,
+          comment: "comment'
+          "
+        }
+      }
+    }
+  },
+  comment: "comment2
+  ",
+}
+
+---
+event: {
+  presence: required,
+  action: [ any, any, baseStationSoftwareManagementProblem,
+            contact technical support ],
+  structure: {
+    commonEventHeader: {
+      presence: required,
+      structure: {
+        domain: {
+          presence: required,
+          value: fault
+        },
+        eventName: {
+          presence: required,
+          value: 'Fault_3'
+        },
+        eventId: {
+          presence: required
+        },
+        nfNamingCode: {
+          value: mrfx
+        },
+        priority: {
+          presence: required,
+          value: 'Medium'
+        },
+        reportingEntityId: {
+          presence: required
+        },
+        reportingEntityName: {
+          presence: required
+        },
+        sequence: {
+          presence: required
+        },
+        sourceId: {
+          presence: required
+        },
+        sourceName: {
+          presence: required
+        },
+        startEpochMicrosec: {
+          presence: required
+        },
+        lastEpochMicrosec: {
+          presence: required
+        },
+        version: {
+          presence: required,
+          value: 3.0
+        }
+      }
+    },
+    faultFields: {
+      presence: required,
+      structure: {
+        eventCategory: {
+          presence: optional,
+          comment: 'Processing Error'
+        },
+        alarmCondition: {
+          presence: required,
+          value: 'baseStationsoftwareManagementProblem'
+        },
+        eventSeverity: {
+          presence: required
+        },
+        eventSourceType: {
+          presence: required
+        },
+        faultFieldsVersion: {
+          presence: required,
+          value: 3.0
+        },
+        specificProblem: {
+          presence: required
+        },
+        vfStatus: {
+          presence: required,
+          value: "Active"
+        },
+        alarmAdditionalInformation: {
+          required: true,
+          comment: "comment"
+        }
+      }
+    }
+  },
+  comment: "comment2"
+}
\ No newline at end of file
diff --git a/integration-tests/src/test/resources/Files/VNFs/vfw.zip b/integration-tests/src/test/resources/Files/VNFs/vfw.zip
new file mode 100644
index 0000000000..b8273defea
--- /dev/null
+++ b/integration-tests/src/test/resources/Files/VNFs/vfw.zip
diff --git a/integration-tests/src/test/resources/Files/VNFs/vgmux.zip b/integration-tests/src/test/resources/Files/VNFs/vgmux.zip
new file mode 100644
index 0000000000..56de952150
--- /dev/null
+++ b/integration-tests/src/test/resources/Files/VNFs/vgmux.zip
diff --git a/integration-tests/src/test/resources/Files/VNFs/vgw.zip b/integration-tests/src/test/resources/Files/VNFs/vgw.zip
new file mode 100644
index 0000000000..7a14718c2c
--- /dev/null
+++ b/integration-tests/src/test/resources/Files/VNFs/vgw.zip
diff --git a/integration-tests/src/test/resources/Files/VNFs/vsp-vgw.csar b/integration-tests/src/test/resources/Files/VNFs/vsp-vgw.csar
new file mode 100644
index 0000000000..316d5690f5
--- /dev/null
+++ b/integration-tests/src/test/resources/Files/VNFs/vsp-vgw.csar
diff --git a/integration-tests/src/test/resources/Files/VNFs/vvg.zip b/integration-tests/src/test/resources/Files/VNFs/vvg.zip
new file mode 100644
index 0000000000..dc9ef5d823
--- /dev/null
+++ b/integration-tests/src/test/resources/Files/VNFs/vvg.zip
diff --git a/integration-tests/src/test/resources/cert/root.cert b/integration-tests/src/test/resources/cert/root.cert
new file mode 100644
index 0000000000..11c827ac6f
--- /dev/null
+++ b/integration-tests/src/test/resources/cert/root.cert
@@ -0,0 +1,23 @@
+-----BEGIN CERTIFICATE-----
+MIID3zCCAsegAwIBAgIUQ7qc+oRcxS9++2Vd+ufBuSRzITkwDQYJKoZIhvcNAQEL
+BQAwfzELMAkGA1UEBhMCSVIxDTALBgNVBAgMBE9OQVAxDDAKBgNVBAcMA1NEQzER
+MA8GA1UECgwIT05BUC1TREMxGDAWBgNVBAMMD29yZy5vbmFwLnNkYy5jYTEmMCQG
+CSqGSIb3DQEJARYXb25hcC1zZGNAbGlzdHMub25hcC5vcmcwHhcNMTkxMDI5MTE0
+MzU3WhcNMzkxMDI0MTE0MzU3WjB/MQswCQYDVQQGEwJJUjENMAsGA1UECAwET05B
+UDEMMAoGA1UEBwwDU0RDMREwDwYDVQQKDAhPTkFQLVNEQzEYMBYGA1UEAwwPb3Jn
+Lm9uYXAuc2RjLmNhMSYwJAYJKoZIhvcNAQkBFhdvbmFwLXNkY0BsaXN0cy5vbmFw
+Lm9yZzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANkzC40LeZGiN07u
+Sy3crOkJBwulOIXHyWfWbiTbdgd0SebPccYRke3W4IQok/X/j1pNJtgdHHVcqznn
+wVLcDoHjfy+wIX5EBv4zCDMAXDJ+NQE0HXOCiGGReUXVmnrZDDx30D0wgtZyvZlB
+ziMhshjhVsX2OlJL4Dr33ztLnNq8NvCxsTqCVoL4N5ax7Vfi8v9JQOPletdxRfpS
+UOECdpOzua+6DxWsglqKbWb0F9SWfnYRgKEqqotLDHGPKSIK9nduMLTpihqdukTN
+Ud68Jp+TvhpIX47VTW5J0n9rYvjh7pTzICKjEygWcQBIUIuAsg8e9JQoyzbPV0mp
+nQL4DwMCAwEAAaNTMFEwHQYDVR0OBBYEFLEM1nLbWBpDorCskxldxIXY3u2rMB8G
+A1UdIwQYMBaAFLEM1nLbWBpDorCskxldxIXY3u2rMA8GA1UdEwEB/wQFMAMBAf8w
+DQYJKoZIhvcNAQELBQADggEBADkYWsK8mayXAmMWll7A2VY7PIBSsoqiPAN/Vr5Y
+BUD0wnAI55CN38iD6Yg1q5u380oc7OsbonwwVE1iIgf1ptg9GOMoNqGFPXGSqobE
+JfYiFBCeXZHjbv9ZpF8/YnI2iqMV0dQGJ27uOYkFPv41HYLBYrtw+oULpcU+Bd18
+lK7JVvyKj7vn9oFZn880Jdrcm+u0FD35usCO090a1hXnmAftaBRqXK2F0fttit5n
+yu4UU9oc/e0Z24ScXBcYRorEYc7U88D6oRTz8zPp1LIcTqxIsJigbNRTGArTJLLW
+pvB8br2xl31PJ3KFTswpT8SzJN8OnuCID6Cuc4QcEzbYU7U=
+-----END CERTIFICATE-----
diff --git a/integration-tests/src/test/resources/ci/conf/attsdc-packages.yaml b/integration-tests/src/test/resources/ci/conf/attsdc-packages.yaml
new file mode 100644
index 0000000000..5d1a3e1537
--- /dev/null
+++ b/integration-tests/src/test/resources/ci/conf/attsdc-packages.yaml
@@ -0,0 +1,12 @@
+packages:
+ - org.openecomp.sdc.ci.tests.execute.general
+ - org.openecomp.sdc.ci.tests.execute.user
+ - org.openecomp.sdc.ci.tests.execute.property
+ - org.openecomp.sdc.ci.tests.execute.lifecycle
+ - org.openecomp.sdc.ci.tests.execute.resource
+ - org.openecomp.sdc.ci.tests.execute.service
+ - org.openecomp.sdc.ci.tests.execute.artifacts
+ - org.openecomp.sdc.ci.tests.execute.imports
+ - org.openecomp.sdc.ci.tests.execute.category
+ - org.openecomp.sdc.ci.tests.execute.distribution  
+ - org.openecomp.sdc.ci.tests.execute.product
\ No newline at end of file
diff --git a/integration-tests/src/test/resources/ci/conf/attsdc.yaml b/integration-tests/src/test/resources/ci/conf/attsdc.yaml
new file mode 100644
index 0000000000..29357b28b2
--- /dev/null
+++ b/integration-tests/src/test/resources/ci/conf/attsdc.yaml
@@ -0,0 +1,97 @@
+outputFolder: target
+reportName: index.html
+catalogBeHost: 127.0.0.1
+catalogFeHost: 127.0.0.1
+onboardingBeHost: 127.0.0.1
+onboardingBePort: 8081
+esHost: eshost
+disributionClientHost: disClient
+catalogFePort: 8181
+catalogBePort: 8080
+disributionClientPort: 8181
+isDistributionClientRunning: true
+esPort: 9200
+neoHost: neoHost
+neoPort: 7474
+neoDBusername: neo4j	
+neoDBpassword: 123456
+windowsDownloadDirectory: "c:\\apache-ftpserver-1.1.0\\res\\home"
+systemUnderDebug: false
+resourceConfigDir: src/test/resources/CI/tests
+componentsConfigDir: src/test/resources/CI/components
+importResourceConfigDir: ../catalog-be/src/main/resources/import/tosca/capability-types
+importResourceTestsConfigDir: src/test/resources/CI/importResourceTests
+errorConfigurationFile: ../catalog-be/src/main/resources/config/error-configuration.yaml
+configurationFile: ../catalog-be/src/main/resources/config/configuration.yaml
+importTypesConfigDir: src/test/resources/CI/importTypesTest
+
+
+janusGraphPropertiesFile: src/main/resources/ci/conf/janusgraph.properties
+cassandraHost: 127.0.0.1
+cassandraAuthenticate: false
+cassandraUsername: koko
+cassandraPassword: bobo
+cassandraSsl: false
+cassandraTruststorePath : /path/path
+cassandraTruststorePassword : 123123
+cassandraAuditKeySpace: sdcaudit
+cassandraArtifactKeySpace: sdcartifact
+url: http://localhost:8285/sdc1
+
+sdcHttpMethod: http
+localDataCenter: DC-Automate01
+
+stopOnClassFailure: false
+
+#List of non-abstract resources to keep during janus graph cleanup between tests
+#Only 1.0 version will be kept
+resourcesNotToDelete:
+     - Compute
+     - Database
+     - ObjectStorage
+     - BlockStorage
+     - LoadBalancer
+     - Port
+     - Network
+     - Root
+     - ContainerApplication
+     - ContainerRuntime
+     - DBMS
+     - SoftwareComponent
+     - WebApplication
+     - WebServer
+     - CinderVolume
+     - ContrailVirtualNetwork
+     - NeutronNet
+     - NeutronPort
+     - NovaServer
+     - AbstractSubstitute
+     - ContrailAbstractSubstitute
+     - ContrailCompute
+     - ContrailNetworkRules
+     - ContrailPort
+     - ContrailV2NetworkRules
+     - ContrailV2VirtualMachineInterface
+     - ContrailV2VirtualNetwork
+     - ContrailVirtualNetwork
+     - VL ELINE
+     - SecurityRules
+     - VL
+
+#Resource categories to keep (including all their subcategories)
+resourceCategoriesNotToDelete:
+     - Generic
+     - Network L2-3
+     - Network L4+
+     - Application L4+
+     - Network Connectivity
+     - DCAE Component
+     - Template
+     - Allotted Resource
+
+#Service categories to keep
+serviceCategoriesNotToDelete:
+     - Mobility
+     - Network L1-3
+     - Network L4+
+     - VoIP Call Control
\ No newline at end of file
diff --git a/integration-tests/src/test/resources/ci/conf/credentials.yaml b/integration-tests/src/test/resources/ci/conf/credentials.yaml
new file mode 100644
index 0000000000..05f9a71c5c
--- /dev/null
+++ b/integration-tests/src/test/resources/ci/conf/credentials.yaml
@@ -0,0 +1,48 @@
+    designer: {
+        username: cs0008,
+        password: 123123a,
+        firstname: SDC,
+        lastname: SDC2
+    }
+    admin: {
+        username: jh0003,
+        password: 123123a,
+        firstname: SDC,
+        lastname: SDC2
+    }
+    ops: {
+        username: op0001,
+        password: 123123a,
+        firstname: SDC,
+        lastname: SDC2
+    }
+    tester: {
+        username: jm0007,
+        password: 123123a,
+        firstname: SDC,
+        lastname: SDC2
+    }
+    governor: {
+        username: gv0001,
+        password: 123123a,
+        firstname: SDC,
+        lastname: SDC2
+    }
+    product_strategist: {
+        username: m99126,
+        password: 123123a,
+        firstname: SDC,
+        lastname: SDC2
+    }
+    product_manager: {
+        username: m99127,
+        password: 123123a,
+        firstname: SDC,
+        lastname: SDC2
+    }
+    product_local: {
+        username: pm0001,
+        password: 123123a,
+        firstname: SDC,
+        lastname: SDC2
+    }
\ No newline at end of file
diff --git a/integration-tests/src/test/resources/ci/conf/extent-config.xml b/integration-tests/src/test/resources/ci/conf/extent-config.xml
new file mode 100644
index 0000000000..4eb7f681aa
--- /dev/null
+++ b/integration-tests/src/test/resources/ci/conf/extent-config.xml
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<extentreports>
+    <configuration>
+        <!-- report theme -->
+        <!-- standard, dark -->
+        <theme>standard</theme>
+    
+        <!-- document encoding -->
+        <!-- defaults to UTF-8 -->
+        <encoding>UTF-8</encoding>
+        
+        <!-- protocol for script and stylesheets -->
+        <!-- defaults to https -->
+        <protocol>https</protocol>
+        
+        <!-- title of the document -->
+        <documentTitle>ASDC Automation Report</documentTitle>
+        
+        <!-- report name - displayed at top-nav -->
+        <reportName> ASDC Automation Report </reportName>
+        
+        <!-- report headline - displayed at top-nav, after reportHeadline -->
+        <reportHeadline></reportHeadline>
+        
+        <!-- global date format override -->
+        <!-- defaults to yyyy-MM-dd -->
+        <dateFormat>yyyy-MM-dd</dateFormat>
+        
+        <!-- global time format override -->
+        <!-- defaults to HH:mm:ss -->
+        <timeFormat>HH:mm:ss</timeFormat>
+        
+        <!-- custom javascript -->
+        <scripts>
+            <![CDATA[
+                $(document).ready(function() {
+                    $('.logo-content' ).remove();
+                    $('.charts div:nth-child(2)').remove();  
+                });
+            ]]>
+        </scripts>
+        
+        <!-- custom styles -->
+        <styles>
+            <![CDATA[
+                .report-name {padding-top: 1px; font-size: 15px; font-weight: bold;}
+            ]]>
+        </styles>
+    </configuration>
+</extentreports>
\ No newline at end of file
diff --git a/integration-tests/src/test/resources/ci/conf/janusgraph.properties b/integration-tests/src/test/resources/ci/conf/janusgraph.properties
new file mode 100644
index 0000000000..6cf8068bcd
--- /dev/null
+++ b/integration-tests/src/test/resources/ci/conf/janusgraph.properties
@@ -0,0 +1,11 @@
+storage.backend=cql
+storage.hostname=127.0.0.1
+storage.port=9042
+
+cache.db-cache = false
+cache.db-cache-clean-wait = 20
+cache.db-cache-time = 180000
+cache.db-cache-size = 0.5
+
+cache.tx-cache-size = 500000
+storage.cql.keyspace=sdctitan
diff --git a/integration-tests/src/test/resources/ci/conf/log4j2.properties b/integration-tests/src/test/resources/ci/conf/log4j2.properties
new file mode 100644
index 0000000000..a8944dba13
--- /dev/null
+++ b/integration-tests/src/test/resources/ci/conf/log4j2.properties
@@ -0,0 +1,46 @@
+status = error
+dest = err
+name = PropertiesConfig
+
+property.filename = ${targetlog}logs/ci-log.out
+
+#filter.threshold.type = ThresholdFilter
+#filter.threshold.level = debug
+
+appender.rolling.type = RollingFile
+appender.rolling.name = RollingFile
+appender.rolling.fileName = ${filename}
+appender.rolling.filePattern = ${targetlog}logs/ci-%d{MM-dd-yy-HH-mm-ss}-%i.log.gz
+appender.rolling.layout.type = PatternLayout
+appender.rolling.layout.pattern = %d{yyyy-MM-dd HH:mm:ss} %5p [%10c] : %m%n
+appender.rolling.policies.type = Policies
+appender.rolling.policies.size.type = SizeBasedTriggeringPolicy
+appender.rolling.policies.size.size=5MB
+appender.rolling.strategy.type = DefaultRolloverStrategy
+appender.rolling.strategy.max = 10
+
+appender.console.type = Console
+appender.console.name = STDOUT
+appender.console.layout.type = PatternLayout
+appender.console.layout.pattern = %d{yyyy-MM-dd HH:mm:ss} %5p %10c:%L - %m%n
+appender.console.filter.threshold.type = ThresholdFilter
+appender.console.filter.threshold.level = info
+
+logger.rolling.name = RollingAppender
+logger.rolling.level = info
+logger.rolling.additivity = false
+logger.rolling.appenderRef.rolling.ref = RollingFile
+
+logger.org.apache.cassandra.service.StorageProxy.level=info
+logger.org.janusgraph.diskstorage.cassandra.CassandraTransaction.level =info
+logger.org.janusgraph.diskstorage.cassandra.CassandraTransaction.appendRef.rolling.ref = RollingFile
+logger.org.janusgraph.diskstorage.cassandra.CassandraTransaction.appendRef.stdout.ref = STDOUT
+
+logger.org.openecomp.sdc.ci.tests.utils.level = info
+logger.org.openecomp.sdc.ci.tests.utils.appendRef.rolling.ref = RollingFile
+logger.org.openecomp.sdc.ci.tests.utils.appendRef.stdout.ref = STDOUT
+logger.org.openecomp.sdc.ci.tests.utils.additivity = false
+
+rootLogger.level = info
+rootLogger.appenderRef.stdout.ref = STDOUT
+rootLogger.appenderRef.rolling.ref = RollingFile
diff --git a/integration-tests/src/test/resources/ci/conf/log4j2.xml b/integration-tests/src/test/resources/ci/conf/log4j2.xml
new file mode 100644
index 0000000000..5295d45a47
--- /dev/null
+++ b/integration-tests/src/test/resources/ci/conf/log4j2.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Configuration status="ERROR">
+	<Appenders>
+		<File name="fileAppender" fileName="logfile.log" append="false">
+			<PatternLayout pattern="%d %-5p [%c{1}] %m %n"/>
+		</File>
+	</Appenders>
+	<Loggers>
+		<Root level="info">
+			<AppenderRef ref="fileAppender"/>
+		</Root>
+	</Loggers>
+</Configuration>
\ No newline at end of file
diff --git a/integration-tests/src/test/resources/ci/conf/testngLifeCycle.xml b/integration-tests/src/test/resources/ci/conf/testngLifeCycle.xml
new file mode 100644
index 0000000000..005bdba0f3
--- /dev/null
+++ b/integration-tests/src/test/resources/ci/conf/testngLifeCycle.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE suite SYSTEM "http://testng.org/testng-1.0.dtd">
+<suite name="lifeCycle" parallel="none">
+  <test name="Test">
+    <classes>
+      <class name="org.openecomp.sdc.ci.tests.execute.lifecycle.LCSbaseTest"/>
+    </classes>
+  </test> <!-- Test -->
+</suite> <!-- lifeCycle -->
diff --git a/integration-tests/src/test/resources/ci/conf/truststore b/integration-tests/src/test/resources/ci/conf/truststore
new file mode 100644
index 0000000000..bdec93d862
--- /dev/null
+++ b/integration-tests/src/test/resources/ci/conf/truststore
diff --git a/integration-tests/src/test/resources/ci/testSuites/CRUDArtifacts.xml b/integration-tests/src/test/resources/ci/testSuites/CRUDArtifacts.xml
new file mode 100644
index 0000000000..923777542c
--- /dev/null
+++ b/integration-tests/src/test/resources/ci/testSuites/CRUDArtifacts.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE suite SYSTEM "http://testng.org/testng-1.0.dtd">
+<suite name="CRUDArtifacts" configfailurepolicy="continue" verbose="2"  parallel="tests" thread-count="10">
+
+  <test name="Test">
+    <classes>
+      <class 
+      name="org.openecomp.sdc.externalApis.CRUDExternalAPI">
+   			   <methods>
+				<!-- 	<include name="uploadArtifactOnVFViaExternalAPI" />
+					<include name="uploadArtifactOnServiceViaExternalAPI" />
+					<include name="uploadArtifactOnRIViaExternalAPI" />
+					<include name="uploadInvalidArtifactTypeExtensionLabelDescriptionCheckSumDuplicateLabelViaExternalAPI" />
+					<include name="uploadArtifactOnVFViaExternalAPIByDiffrentUserThenCreatorOfAsset" />
+					<include name="uploadArtifactOnAssetWhichNotExist" />
+					<include name="uploadArtifactOnAssetWhichInInvalidStateForUploading" />
+					
+					
+					<include name="updateArtifactForServiceViaExternalAPI" />
+					<include name="updateArtifactForVFViaExternalAPI" />
+					<include name="updateArtifactOnRIViaExternalAPI" />
+					<include name="updateArtifactOnVFViaExternalAPIByDiffrentUserThenCreatorOfAsset" />
+					<include name="updateArtifactOnAssetWhichNotExist" />
+					<include name="updateArtifactOnAssetWhichInInvalidStateForUploading" />
+					<include name="updateInvalidArtifactTypeExtensionLabelDescriptionCheckSumDuplicateLabelViaExternalAPI" />
+					
+					
+					<include name="deleteArtifactForServiceViaExternalAPI" />
+					<include name="deleteArtifactForVFViaExternalAPI" />
+					<include name="deleteArtifactOnRIViaExternalAPI" />
+					<include name="deleteArtifactOnVFViaExternalAPIByDiffrentUserThenCreatorOfAsset" />
+					<include name="deleteArtifactOnAssetWhichNotExist" />
+					<include name="deleteArtifactOnAssetWhichInInvalidStateForUploading" /> -->
+					
+					<include name="deleteArtifactForServiceViaExternalAPI" />
+				</methods>
+      
+      </class>
+      
+    </classes>
+  </test> <!-- Test -->
+</suite> <!-- Suite -->
\ No newline at end of file
diff --git a/integration-tests/src/test/resources/ci/testSuites/ExternalApiSanity.xml b/integration-tests/src/test/resources/ci/testSuites/ExternalApiSanity.xml
new file mode 100644
index 0000000000..02594526cb
--- /dev/null
+++ b/integration-tests/src/test/resources/ci/testSuites/ExternalApiSanity.xml
@@ -0,0 +1,68 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE suite SYSTEM "http://testng.org/testng-1.0.dtd">
+<suite name="CRUDArtifacts" configfailurepolicy="continue" verbose="2"  parallel="methods" thread-count="2" data-provider-thread-count="2">
+
+  <test name="Test">
+    <classes>
+      <class name="org.openecomp.sdc.externalApis.CRUDExternalAPI">
+   		<methods>
+			<include name="uploadArtifactOnVfcVlCpViaExternalAPI" invocation-numbers="0" />
+			<include name="uploadArtifactOnVFViaExternalAPI" invocation-numbers="0" />
+			<include name="uploadArtifactOnServiceViaExternalAPI" invocation-numbers="0" />
+			<include name="uploadArtifactOnRIViaExternalAPI" invocation-numbers="0" />
+			<include name="uploadArtifactOnVfcVlCpRIViaExternalAPI" invocation-numbers="0" />
+			<include name="updateArtifactForServiceViaExternalAPI" invocation-numbers="0" />
+			<include name="updateArtifactForVFViaExternalAPI" invocation-numbers="0" />
+			<include name="updateArtifactForVfcVlCpViaExternalAPI" invocation-numbers="0" />
+			<include name="updateArtifactOfVfcVlCpForVfciVliCpiViaExternalAPI" invocation-numbers="0" />
+			<include name="updateArtifactOnRIViaExternalAPI" invocation-numbers="0" />
+			<include name="updateArtifactOnVfcVlCpRIViaExternalAPI" invocation-numbers="0" />
+			<include name="deleteArtifactForServiceViaExternalAPI" invocation-numbers="0" />
+			<include name="deleteArtifactForVFViaExternalAPI" invocation-numbers="0" />
+			<include name="deleteArtifactOnRIViaExternalAPI" invocation-numbers="0" />
+			<include name="deleteArtifactOnVfcVlCpRIViaExternalAPI" invocation-numbers="0" />
+			<include name="deleteArtifactOnAssetWhichNotExist" />			
+		</methods>
+      </class>
+      <class name="org.openecomp.sdc.ci.tests.execute.artifacts.DownloadComponentArt">
+        <methods>
+            <include name="downloadArtifactOfComponentInstanceFromServiceViaExternalAPI"/>
+        </methods>
+      </class>
+      <class name="org.openecomp.sdc.externalApis.GetFilteredAssetServlet">
+        <methods>
+            <include name="getResourceAssetBySpecifiedCategory"/>
+            <include name="getServiceAssetBySpecifiedCategory"/>
+        </methods>
+      </class>
+      <class name="org.openecomp.sdc.externalApis.SearchFilterCategoryExternalAPI">
+        <methods>
+            <include name="normativeResourceCategory" invocation-numbers="0"/>
+        </methods>
+      </class>      
+      <class name="org.openecomp.sdc.externalApis.GetCSARofVF">
+        <methods>
+            <include name="getServiceToscaModelCheckInState"/>
+            <include name="getRsourceToscaModelCertifyState"/>
+        </methods>
+      </class>
+      <class name="org.openecomp.sdc.externalApis.GetFilteredAssetServlet">
+        <methods>
+            <include name="getResourceAssetBySpecifiedCategory"/>
+            <include name="getServiceAssetBySpecifiedCategory"/>
+        </methods>
+      </class>
+      <class name="org.openecomp.sdc.externalApis.GetSpecificAssetMetadataServlet">
+        <methods>
+            <include name="getResourceAssetMetadataSuccess"/>
+            <include name="getServiceAssetMetadataWithResourceInstancesSuccess"/>
+        </methods>
+      </class>
+      <class name="org.openecomp.sdc.externalApis.AssetLifeCycle">
+        <methods>
+            <include name="theFlow"/>
+        </methods>
+      </class>
+    </classes>
+  </test> <!-- Test -->
+</suite> <!-- Suite -->
\ No newline at end of file
diff --git a/integration-tests/src/test/resources/ci/testSuites/SearchExternalAPI.xml b/integration-tests/src/test/resources/ci/testSuites/SearchExternalAPI.xml
new file mode 100644
index 0000000000..8d21be4381
--- /dev/null
+++ b/integration-tests/src/test/resources/ci/testSuites/SearchExternalAPI.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE suite SYSTEM "http://testng.org/testng-1.0.dtd">
+<suite name="CRUDArtifacts" configfailurepolicy="continue" verbose="2"  parallel="tests" thread-count="10">
+
+  <test name="Test">
+    <classes>
+      <class 
+      name="org.openecomp.sdc.externalApis.SearchFilterCategoryExternalAPI">
+   			   <methods>
+
+					<include name="searchWithInvalidFilter" />
+					<include name="searchForResourceTypeNegativeTest" />
+					<include name="searchingForResouceFilterIncorrectResouceTypeUsingExternalAPI" />
+					<include name="searchingForSeveralResouceTypesUsingExternalAPI" />
+					<include name="searchingForSeveralResourcesOfTypeVFCMTUsingExternalAPI" />
+					<include name="normativeResourceCategory" />		
+				</methods>
+      
+      </class>
+      
+    </classes>
+  </test> <!-- Test -->
+</suite> <!-- Suite -->
\ No newline at end of file
diff --git a/integration-tests/src/test/resources/ci/testSuites/artifacts.xml b/integration-tests/src/test/resources/ci/testSuites/artifacts.xml
new file mode 100644
index 0000000000..1352e75d58
--- /dev/null
+++ b/integration-tests/src/test/resources/ci/testSuites/artifacts.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE suite SYSTEM "http://testng.org/testng-1.0.dtd">
+<suite name="Artifacts">
+  <test name="Artifacts">
+    <classes>
+      <class name="org.openecomp.sdc.ci.tests.execute.artifacts.DownloadComponentArt"/>
+      <class name="org.openecomp.sdc.ci.tests.execute.artifacts.ValidateHeatArtFieldsTypes"/>
+      <class name="org.openecomp.sdc.ci.tests.execute.artifacts.PlaceHolderValidations"/>
+    </classes>
+  </test>
+</suite> <!-- Artifacts -->
diff --git a/integration-tests/src/test/resources/ci/testSuites/cap_req.xml b/integration-tests/src/test/resources/ci/testSuites/cap_req.xml
new file mode 100644
index 0000000000..8298af2da5
--- /dev/null
+++ b/integration-tests/src/test/resources/ci/testSuites/cap_req.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE suite SYSTEM "http://testng.org/testng-1.0.dtd">
+<suite name="Cap_Req" >
+	<test name="Cap_Req">
+		<classes>
+			<class name="org.openecomp.sdc.ci.tests.requirements.RequirementsTest"/>
+			<class name="org.openecomp.sdc.ci.tests.capability.CapabilitiesTest"/>
+		</classes>
+	</test>
+</suite> <!-- Artifacts -->
diff --git a/integration-tests/src/test/resources/ci/testSuites/category.xml b/integration-tests/src/test/resources/ci/testSuites/category.xml
new file mode 100644
index 0000000000..3de83431e8
--- /dev/null
+++ b/integration-tests/src/test/resources/ci/testSuites/category.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE suite SYSTEM "http://testng.org/testng-1.0.dtd">
+<suite name="category">
+  <test name="Test">
+    <classes>
+      <class name="org.openecomp.sdc.ci.tests.execute.category.GroupingTest"/>
+      <class name="org.openecomp.sdc.ci.tests.execute.category.SubCategoriesTest"/>
+    </classes>
+  </test> <!-- Test -->
+</suite> <!-- category -->
diff --git a/integration-tests/src/test/resources/ci/testSuites/ciFull.xml b/integration-tests/src/test/resources/ci/testSuites/ciFull.xml
new file mode 100644
index 0000000000..7a9558ed7a
--- /dev/null
+++ b/integration-tests/src/test/resources/ci/testSuites/ciFull.xml
@@ -0,0 +1,97 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE suite SYSTEM "http://testng.org/testng-1.0.dtd">
+<suite name="ciFull" configfailurepolicy="continue" verbose="2">
+  <test name="Category">
+    <classes>
+      <class name="org.openecomp.sdc.ci.tests.execute.category.CatalogDataApiTest"/>
+      <class name="org.openecomp.sdc.ci.tests.execute.category.GroupingTest">
+        <methods>
+          <exclude name="createProductGroupForNonExistingCategory"/>
+          <exclude name="createProductGroupForNonExistingSunCategory"/>
+          <exclude name="getProductCategoryHierarchySuccessFlow"/>
+        </methods>
+      </class>
+
+      <class name="org.openecomp.sdc.ci.tests.execute.category.SubCategoriesTest">
+        <methods>
+          <exclude name="createProductSubCategoryForNonExistingCategory"/>
+          <exclude name="createResourceSubCategoryForNonExistingCategory"/>
+          <exclude name="getResourceCategoryHierarchySuccessFlow"/>
+        </methods>
+      </class>
+    </classes>
+  </test> <!-- Test -->
+  <test name="Distribution">
+    <classes>
+      <class
+        name="org.openecomp.sdc.ci.tests.execute.distribution.AuthanticationTests"/>
+      <class
+        name="org.openecomp.sdc.ci.tests.execute.distribution.DistributionDownloadArtifactTest">
+        <methods>
+          <exclude name="downloadServiceArtifact_ServiceVersionNotFound"/>
+        </methods>
+      </class>
+    </classes>
+  </test> <!-- Test -->
+  <test name="General">
+    <classes>
+      <class name="org.openecomp.sdc.ci.tests.execute.general.FeProxyTest"/>
+      <class name="org.openecomp.sdc.ci.tests.execute.general.UuidTest"/>
+    </classes>
+  </test>
+  <test name="Resource">
+    <classes>
+      <class name="org.openecomp.sdc.ci.tests.execute.resource.SimultaneousApiTest"/>
+      <class name="org.openecomp.sdc.ci.tests.execute.resource.UpdateResourceMetadataTest">
+        <methods>
+          <exclude name="UpdateResourceCategory_negativeFlow"/>
+        </methods>
+      </class>
+      <class name="org.openecomp.sdc.ci.tests.execute.resource.VFResourceInstanceNameCRUD"/>
+      <class name="org.openecomp.sdc.ci.tests.execute.resource.ResourceApiTest"/>
+      <class
+        name="org.openecomp.sdc.ci.tests.execute.resource.ValidateExtendedVfData"/>
+    </classes>
+  </test>
+  <test name="Product">
+    <classes>
+      <class
+        name="org.openecomp.sdc.ci.tests.execute.product.ProductUndoCheckoutTest">
+        <methods>
+          <exclude name="undoCheckOutNotExist"/>
+        </methods>
+      </class>
+      <class
+        name="org.openecomp.sdc.ci.tests.execute.product.ProductGetFollowedTest"/>
+      <class
+        name="org.openecomp.sdc.ci.tests.execute.product.ProductToscaYamlGenerationTest"/>
+      <class name="org.openecomp.sdc.ci.tests.execute.product.ProductCheckinTest">
+        <methods>
+          <exclude name="checkInProductNotExist"/>
+        </methods>
+      </class>
+      <class name="org.openecomp.sdc.ci.tests.execute.product.ProductCheckoutTest"/>
+      <class
+        name="org.openecomp.sdc.ci.tests.execute.product.ProductCreateWithValidationsTest">
+        <methods>
+          <exclude name="createProductDescriptionRemoveSpacesFromBeginning"/>
+          <exclude name="createProductDescriptionRemoveSpacesFromTheEnd"/>
+          <exclude name="createProductDescriptionValidCharacters01"/>
+          <exclude name="createProductDescriptionValidCharacters02"/>
+        </methods>
+      </class>
+    </classes>
+  </test>
+  <test name="Service">
+    <classes>
+      <class name="org.openecomp.sdc.ci.tests.execute.service.GetAllServiceVersions"/>
+    </classes>
+  </test>
+  <test name="Artifacts">
+    <classes>
+      <class name="org.openecomp.sdc.ci.tests.execute.artifacts.DownloadComponentArt"/>
+      <class name="org.openecomp.sdc.ci.tests.execute.artifacts.ValidateHeatArtFieldsTypes"/>
+      <class name="org.openecomp.sdc.ci.tests.execute.artifacts.PlaceHolderValidations"/>
+    </classes>
+  </test>
+</suite> 
\ No newline at end of file
diff --git a/integration-tests/src/test/resources/ci/testSuites/externalAPIs.xml b/integration-tests/src/test/resources/ci/testSuites/externalAPIs.xml
new file mode 100644
index 0000000000..7c9d6d9d9c
--- /dev/null
+++ b/integration-tests/src/test/resources/ci/testSuites/externalAPIs.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE suite SYSTEM "http://testng.org/testng-1.0.dtd">
+<suite name="externalApis" configfailurepolicy="continue" verbose="2" parallel="methods" thread-count="1" data-provider-thread-count="8">
+	<test name="ExternalApis"> 
+		<classes>	
+			
+			<class name="org.openecomp.sdc.externalApis.VFCMTExternalAPI"/>
+			<class name="org.openecomp.sdc.externalApis.CRUDExternalAPI"/> 
+			<class name="org.openecomp.sdc.externalApis.DeploymentValiditaion"/>  
+ 			<class name="org.openecomp.sdc.externalApis.GetAssetServlet"/>
+			<class name="org.openecomp.sdc.externalApis.GetCSARofVF"/>
+			<class name="org.openecomp.sdc.externalApis.GetFilteredAssetServlet"/>
+			<class name="org.openecomp.sdc.externalApis.GetSpecificAssetMetadataServlet"/>
+			<class name="org.openecomp.sdc.externalApis.SearchFilterCategoryExternalAPI"/>
+			<class name="org.openecomp.sdc.externalApis.AssetLifeCycle"/>
+			<class name="org.openecomp.sdc.externalApis.UserAPIs"/>
+
+			<class name="org.openecomp.sdc.internalApis.annotations.AnnotationsTest"/>
+
+			
+<!-- 	      <class name="org.openecomp.sdc.ci.tests.execute.product.ChangeServiceInstanceVersionTest"/>
+			      <class name="org.openecomp.sdc.ci.tests.execute.product.ProductCheckinTest"/>
+			      <class name="org.openecomp.sdc.ci.tests.execute.product.ProductCheckoutTest"/>
+			      <class name="org.openecomp.sdc.ci.tests.execute.product.ProductComponentInstanceCRUDTest"/>
+			      <class name="org.openecomp.sdc.ci.tests.execute.product.ProductCreateWithValidationsTest"/>
+			      <class name="org.openecomp.sdc.ci.tests.execute.product.ProductCrudTest"/>
+			      <class name="org.openecomp.sdc.ci.tests.execute.product.ProductGetFollowedTest"/>
+			      <class name="org.openecomp.sdc.ci.tests.execute.product.ProductUndoCheckoutTest"/>    -->
+			
+			
+		</classes>
+	</test>
+</suite> 
\ No newline at end of file
diff --git a/integration-tests/src/test/resources/ci/testSuites/general.xml b/integration-tests/src/test/resources/ci/testSuites/general.xml
new file mode 100644
index 0000000000..a63f36423e
--- /dev/null
+++ b/integration-tests/src/test/resources/ci/testSuites/general.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE suite SYSTEM "http://testng.org/testng-1.0.dtd">
+<suite name="General">
+  <test name="Test">
+    <classes>
+      <class name="org.openecomp.sdc.ci.tests.execute.general.UuidTest"/>
+    </classes>
+  </test> <!-- Test -->
+</suite> <!-- General -->
diff --git a/integration-tests/src/test/resources/ci/testSuites/imports.xml b/integration-tests/src/test/resources/ci/testSuites/imports.xml
new file mode 100644
index 0000000000..b9374cf47a
--- /dev/null
+++ b/integration-tests/src/test/resources/ci/testSuites/imports.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE suite SYSTEM "http://testng.org/testng-1.0.dtd">
+<suite name="Imports">
+  <test name="Imports">
+    <classes>
+      <class name="org.openecomp.sdc.ci.tests.execute.imports.ImportGenericResourceCITest"/>
+    </classes>
+  </test> <!-- Test -->
+</suite> <!-- Imports -->
diff --git a/integration-tests/src/test/resources/ci/testSuites/normatives.xml b/integration-tests/src/test/resources/ci/testSuites/normatives.xml
new file mode 100644
index 0000000000..02da714578
--- /dev/null
+++ b/integration-tests/src/test/resources/ci/testSuites/normatives.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ Copyright © 2018 European Support Limited
+  ~
+  ~ 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.
+  -->
+
+<!DOCTYPE suite SYSTEM "http://testng.org/testng-1.0.dtd">
+<suite name="normatives" >
+	<test name="InterfaceLifecycleTypes">
+		<classes>
+			<class name="org.openecomp.sdc.ci.tests.execute.globaltypes.InterfaceLifecycleTypesTest"/>
+		</classes>
+	</test>
+</suite> 
\ No newline at end of file
diff --git a/integration-tests/src/test/resources/ci/testSuites/onapApiSanity.xml b/integration-tests/src/test/resources/ci/testSuites/onapApiSanity.xml
new file mode 100644
index 0000000000..9fcd043cd3
--- /dev/null
+++ b/integration-tests/src/test/resources/ci/testSuites/onapApiSanity.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE suite SYSTEM "http://testng.org/testng-1.0.dtd">
+<suite name="externalApis" configfailurepolicy="continue" verbose="2" parallel="methods" thread-count="1" data-provider-thread-count="1">
+	<parameter name="makeDistribution"  value="false"/>
+	<parameter name="makeToscaValidation"  value="true"/>
+	<test name="ExternalApis"> 
+		<classes>
+			<class name="org.openecomp.sdc.ci.tests.sanity.Onboard"/>
+		</classes>
+	</test>
+</suite>
\ No newline at end of file
diff --git a/integration-tests/src/test/resources/ci/testSuites/pass.xml b/integration-tests/src/test/resources/ci/testSuites/pass.xml
new file mode 100644
index 0000000000..731d73675c
--- /dev/null
+++ b/integration-tests/src/test/resources/ci/testSuites/pass.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE suite SYSTEM "http://testng.org/testng-1.0.dtd">
+<suite name="externalApis" configfailurepolicy="continue" verbose="2" parallel="methods" thread-count="1" data-provider-thread-count="1">
+    <parameter name="makeDistribution"  value="false"/>
+    <parameter name="makeToscaValidation"  value="true"/>
+    <test name="passTest">
+
+ <classes>
+    <class
+            name="org.openecomp.sdc.ci.tests.sanity.Onboard">
+        <methods>
+            <include name="passTest" />
+        </methods>
+    </class>
+
+    </classes>
+    </test>
+</suite>
\ No newline at end of file
diff --git a/integration-tests/src/test/resources/ci/testSuites/product.xml b/integration-tests/src/test/resources/ci/testSuites/product.xml
new file mode 100644
index 0000000000..101b94a6bb
--- /dev/null
+++ b/integration-tests/src/test/resources/ci/testSuites/product.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE suite SYSTEM "http://testng.org/testng-1.0.dtd">
+<suite name="Product">
+  <test name="Test">
+    <classes>
+      <class name="org.openecomp.sdc.ci.tests.execute.product.ProductLifecycleTest"/>
+      <class name="org.openecomp.sdc.ci.tests.execute.product.ProductUndoCheckoutTest"/>
+      <class name="org.openecomp.sdc.ci.tests.execute.product.ProductCheckinTest"/>
+      <class name="org.openecomp.sdc.ci.tests.execute.product.ProductCheckoutTest"/>
+    </classes>
+  </test> <!-- Test -->
+</suite> <!-- Product -->
diff --git a/integration-tests/src/test/resources/ci/testSuites/productAPIs.xml b/integration-tests/src/test/resources/ci/testSuites/productAPIs.xml
new file mode 100644
index 0000000000..df9aa9f152
--- /dev/null
+++ b/integration-tests/src/test/resources/ci/testSuites/productAPIs.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE suite SYSTEM "http://testng.org/testng-1.0.dtd">
+<suite name="productAPIs" configfailurepolicy="continue" verbose="2" parallel="tests"
+  thread-count="6">
+
+  <test name="Test">
+    <classes>
+      <class name="org.openecomp.sdc.ci.tests.execute.product.ProductCheckinTest"/>
+      <class name="org.openecomp.sdc.ci.tests.execute.product.ProductCheckoutTest"/>
+      <class name="org.openecomp.sdc.ci.tests.execute.product.ProductCreateWithValidationsTest"/>
+      <class name="org.openecomp.sdc.ci.tests.execute.product.ProductGetFollowedTest"/>
+      <class name="org.openecomp.sdc.ci.tests.execute.product.ProductUndoCheckoutTest"/>
+    </classes>
+  </test> <!-- Test -->
+</suite> <!-- Suite -->
\ No newline at end of file
diff --git a/integration-tests/src/test/resources/ci/testSuites/property.xml b/integration-tests/src/test/resources/ci/testSuites/property.xml
new file mode 100644
index 0000000000..b7dba95f16
--- /dev/null
+++ b/integration-tests/src/test/resources/ci/testSuites/property.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE suite SYSTEM "http://testng.org/testng-1.0.dtd">
+<suite name="Property" >
+  <test name="Test">
+    <classes>
+      <class name="org.openecomp.sdc.ci.tests.execute.property.PropertyApisTest"/>
+      <class name="org.openecomp.sdc.ci.tests.execute.property.AdditionalInformationServletTest"/>
+    </classes>
+  </test> <!-- Test -->
+</suite> <!-- Property -->
diff --git a/integration-tests/src/test/resources/ci/testSuites/resource.xml b/integration-tests/src/test/resources/ci/testSuites/resource.xml
new file mode 100644
index 0000000000..4fd0e43a02
--- /dev/null
+++ b/integration-tests/src/test/resources/ci/testSuites/resource.xml
@@ -0,0 +1,123 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE suite SYSTEM "http://testng.org/testng-1.0.dtd">
+<suite name="Sanity" configfailurepolicy="continue">
+
+  <test verbose="2" name="Sanity">
+    <classes>
+
+      <class name="org.openecomp.sdc.ci.tests.execute.category.CatalogDataApiTest"/>
+
+      <class name="org.openecomp.sdc.ci.tests.execute.distribution.AuthanticationTests">
+        <methods>
+          <include name="downloadServiceArtifactSuccessWithAutantication"/>
+        </methods>
+      </class>
+
+      <class
+        name="org.openecomp.sdc.ci.tests.execute.distribution.DistributionDownloadArtifactTest">
+        <methods>
+          <include name="downloadResourceArtifactSuccess"/>
+        </methods>
+      </class>
+
+      <class name="org.openecomp.sdc.ci.tests.execute.general.FeProxyTest"/>
+
+      <class name="org.openecomp.sdc.ci.tests.execute.general.UuidTest">
+        <methods>
+          <include name="testE2EUuidHeaderReturnedAndPreserved"/>
+        </methods>
+      </class>
+
+      <class name="org.openecomp.sdc.ci.tests.execute.imports.ImportGenericResourceCITest">
+        <methods>
+          <include name="importAllTestResources"/>
+          <include name="testImportCheckoutAndUpdateUserResource"/>
+          <include name="testImportWithUpdateNormativeType"/>
+        </methods>
+      </class>
+
+      <class name="org.openecomp.sdc.ci.tests.execute.property.AdditionalInformationServletTest">
+        <methods>
+          <include name="createResourceAdditionalInformationTestDuringLifecycle"/>
+          <include name="updateResourceAdditionalInformationTest"/>
+          <include name="deleteResourceAdditionalInformationTest"/>
+        </methods>
+      </class>
+
+      <class name="org.openecomp.sdc.ci.tests.execute.property.PropertyApisTest">
+        <methods>
+          <include name="testPropertyApis"/>
+        </methods>
+      </class>
+
+      <class name="org.openecomp.sdc.ci.tests.execute.resource.GetAllResourceVersions">
+        <methods>
+          <include name="getResourceAllVersions_version15"/>
+        </methods>
+      </class>
+
+      <class name="org.openecomp.sdc.ci.tests.execute.resource.ResourceApiTest">
+        <methods>
+          <include name="updateResourceMetadataSuccess"/>
+        </methods>
+      </class>
+
+      <class name="org.openecomp.sdc.ci.tests.execute.resource.UpdateResourceMetadataTest">
+        <methods>
+          <include name="UpdateDerivedFromSuccess"/>
+        </methods>
+      </class>
+
+      <class name="org.openecomp.sdc.ci.tests.execute.service.GetComponentAuditApiTest">
+        <methods>
+          <include name="testServiceAuditCertifiedVersion"/>
+        </methods>
+      </class>
+
+      <class name="org.openecomp.sdc.ci.tests.execute.user.ActivateDeActivateDeleteUser">
+        <methods>
+          <include name="authorizeDeActivatedUser"/>
+        </methods>
+      </class>
+
+      <!-- Product tests start-->
+      <class name="org.openecomp.sdc.ci.tests.execute.product.ProductCheckinTest">
+        <methods>
+          <include name="checkInProductByCreator"/>
+        </methods>
+      </class>
+
+      <class name="org.openecomp.sdc.ci.tests.execute.product.ProductCheckoutTest">
+        <methods>
+          <include name="checkOutProductByPmNotInContacts"/>
+        </methods>
+      </class>
+
+      <class name="org.openecomp.sdc.ci.tests.execute.product.ProductGetFollowedTest">
+        <methods>
+          <include name="followedPageTest"/>
+        </methods>
+      </class>
+      <class name="org.openecomp.sdc.ci.tests.execute.product.ProductUndoCheckoutTest">
+        <methods>
+          <include name="undoCheckOutProductByPm"/>
+        </methods>
+      </class>
+      <class name="org.openecomp.sdc.ci.tests.execute.interfaceoperation.InterfaceOperationsTest">
+        <methods>
+          <include name="addInterfaceOperationsOfGlobalTypeOnResource"/>
+          <include name="addInterfaceOperationsOnResource"/>
+          <include name="getInterfaceOperationsFromResource"/>
+          <include name="updateInterfaceOperationsOnResource"/>
+          <include name="deleteInterfaceOperationsFromResource"/>
+          <include name="addInterfaceOperationsOfGlobalTypeOnPNFResource"/>
+          <include name="addInterfaceOperationsOnPNFResource"/>
+          <include name="getInterfaceOperationsFromPNFResource"/>
+          <include name="updateInterfaceOperationsOnPNFResource"/>
+          <include name="deleteInterfaceOperationsFromPNFResource"/>
+        </methods>
+      </class>
+      <!-- Product tests end-->
+    </classes>
+  </test> <!-- Test -->
+</suite> <!-- Sanity -->
diff --git a/integration-tests/src/test/resources/ci/testSuites/sanity.xml b/integration-tests/src/test/resources/ci/testSuites/sanity.xml
new file mode 100644
index 0000000000..320c3ccd43
--- /dev/null
+++ b/integration-tests/src/test/resources/ci/testSuites/sanity.xml
@@ -0,0 +1,228 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE suite SYSTEM "http://testng.org/testng-1.0.dtd">
+<suite name="Sanity" configfailurepolicy="continue" verbose="2">
+
+  <test name="sanityE2Eflows">
+    <classes>
+      <class name="org.openecomp.sdc.ci.tests.sanity.CrudE2E"/>
+    </classes>
+  </test>
+
+  <test name="General">
+    <classes>
+      <class name="org.openecomp.sdc.ci.tests.execute.general.FeProxyTest"/>
+      <class name="org.openecomp.sdc.ci.tests.execute.general.UuidTest">
+        <methods>
+          <include name="testE2EUuidHeaderReturnedAndPreserved"/>
+        </methods>
+      </class>
+    </classes>
+  </test>
+
+  <test name="ArtifactOnInstance">
+    <classes>
+    </classes>
+  </test>
+
+  <test name="Artifact">
+    <classes>
+      <class
+        name="org.openecomp.sdc.ci.tests.execute.artifacts.DownloadComponentArt">
+        <methods>
+          <include name="downloadArtifactFromResourceTest"/>
+          <include name="downloadArtifactFromServiceTest"/>
+        </methods>
+      </class>
+    </classes>
+  </test>
+
+  <test name="Service">
+    <classes>
+      <class
+        name="org.openecomp.sdc.ci.tests.execute.service.GetComponentAuditApiTest">
+        <methods>
+          <include name="testServiceAuditCertifiedVersion"/>
+        </methods>
+      </class>
+
+    </classes>
+  </test>
+
+  <test name="Resource">
+    <classes>
+      <class
+        name="org.openecomp.sdc.ci.tests.execute.resource.GetAllResourceVersions">
+        <methods>
+          <include name="getResourceAllVersions_version15"/>
+        </methods>
+      </class>
+
+      <class name="org.openecomp.sdc.ci.tests.execute.resource.ResourceApiTest">
+        <methods>
+          <include name="updateResourceMetadataSuccess"/>
+        </methods>
+      </class>
+
+      <class
+        name="org.openecomp.sdc.ci.tests.execute.resource.UpdateResourceMetadataTest">
+        <methods>
+          <include name="UpdateDerivedFromSuccess"/>
+        </methods>
+      </class>
+    </classes>
+  </test>
+  <test name="Product">
+    <classes>
+      <class name="org.openecomp.sdc.ci.tests.execute.product.ProductCheckinTest">
+        <methods>
+          <include name="checkInProductByCreator"/>
+        </methods>
+      </class>
+      <class name="org.openecomp.sdc.ci.tests.execute.product.ProductCheckoutTest">
+        <methods>
+          <include name="checkOutProductByPmNotInContacts"/>
+        </methods>
+      </class>
+      <class
+        name="org.openecomp.sdc.ci.tests.execute.product.ProductGetFollowedTest">
+        <methods>
+          <include name="followedPageTest"/>
+        </methods>
+      </class>
+      <class
+        name="org.openecomp.sdc.ci.tests.execute.product.ProductUndoCheckoutTest">
+        <methods>
+          <include name="undoCheckOutProductByPm"/>
+        </methods>
+      </class>
+      <!-- Product tests end -->
+    </classes>
+  </test>
+  <test name="Catalog">
+    <classes>
+      <class name="org.openecomp.sdc.ci.tests.execute.category.CatalogDataApiTest"/>
+    </classes>
+  </test>
+
+  <test name="distribution">
+    <classes>
+      <class
+        name="org.openecomp.sdc.ci.tests.execute.distribution.AuthanticationTests">
+        <methods>
+          <include name="downloadServiceArtifactSuccessWithAutantication"/>
+        </methods>
+      </class>
+
+      <class
+        name="org.openecomp.sdc.ci.tests.execute.distribution.DistributionDownloadArtifactTest">
+        <methods>
+          <include name="downloadResourceArtifactSuccess"/>
+        </methods>
+      </class>
+    </classes>
+  </test>
+
+  <test name="Category">
+    <classes>
+    </classes>
+  </test>
+
+  <test name="Imports">
+    <classes>
+      <class
+        name="org.openecomp.sdc.ci.tests.execute.imports.ImportGenericResourceCITest">
+        <methods>
+          <include name="importAllTestResources"/>
+          <include name="testImportCheckoutAndUpdateUserResource"/>
+          <include name="testImportWithUpdateNormativeType"/>
+        </methods>
+      </class>
+      <class
+        name="org.openecomp.sdc.ci.tests.execute.imports.ImportToscaCapabilitiesWithProperties">
+        <methods>
+          <include name="importNodeTypeWithCapabilityWithPropertiesFromYmlSucceed"/>
+          <include
+            name="importResourceWithCapabilityWithPropertiesOverridingCapTypePropertiesSucceed"/>
+        </methods>
+      </class>
+    </classes>
+  </test> <!-- Test -->
+
+  <test name="attribute">
+    <classes>
+      <class
+        name="org.openecomp.sdc.ci.tests.execute.attribute.ComponentInstanceAttributeTest">
+        <methods>
+          <include name="testUpdateAttributeOnResourceInstance"/>
+        </methods>
+      </class>
+    </classes>
+  </test>
+
+  <test name="inputs">
+    <classes>
+      <class
+        name="org.openecomp.sdc.ci.tests.execute.inputs.InputsApiTests">
+        <methods>
+          <include name="testInputsMainFunctionality"/>
+        </methods>
+      </class>
+    </classes>
+  </test>
+
+  <test name="property">
+    <classes>
+      <class
+        name="org.openecomp.sdc.ci.tests.execute.property.AdditionalInformationServletTest">
+        <methods>
+          <include name="createResourceAdditionalInformationTestDuringLifecycle"/>
+          <include name="updateResourceAdditionalInformationTest"/>
+          <include name="deleteResourceAdditionalInformationTest"/>
+        </methods>
+      </class>
+
+      <class name="org.openecomp.sdc.ci.tests.execute.property.PropertyApisTest">
+        <methods>
+          <include name="testPropertyApis"/>
+        </methods>
+      </class>
+      <class name="org.openecomp.sdc.ci.tests.execute.property.ComponentInstancePropertyTest">
+        <methods>
+          <include name="nestedVfResourceProperty3Levels"/>
+        </methods>
+      </class>
+
+    </classes>
+  </test>
+
+  <test name="User">
+    <classes>
+
+    </classes>
+  </test>
+
+  <test name="ExternalApis">
+    <classes>
+      <class name="org.openecomp.sdc.externalApis.GetAssetServlet">
+        <methods>
+          <include name="getResourceAssetSuccess"/>
+        </methods>
+      </class>
+      <class name="org.openecomp.sdc.externalApis.GetFilteredAssetServlet">
+        <methods>
+          <include name="getResourceAssetBySpecifiedCategoryAndSubCategory"/>
+          <include name="getServiceAssetBySpecifiedCategoryAndDistributionStatus"/>
+        </methods>
+      </class>
+      <class name="org.openecomp.sdc.externalApis.GetSpecificAssetMetadataServlet">
+        <methods>
+          <include name="getResourceAssetMetadataWithResourceInstancesSuccess"/>
+          <include
+            name="getServiceAssetMetadataWithCertifiedResourceInstancesAndArtifactsOnRIsAndServiceSuccess"/>
+        </methods>
+      </class>
+    </classes>
+  </test>
+
+
+</suite>
\ No newline at end of file
diff --git a/integration-tests/src/test/resources/ci/testSuites/service.xml b/integration-tests/src/test/resources/ci/testSuites/service.xml
new file mode 100644
index 0000000000..9c662764ea
--- /dev/null
+++ b/integration-tests/src/test/resources/ci/testSuites/service.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE suite SYSTEM "http://testng.org/testng-1.0.dtd">
+<suite name="Service">
+  <test name="Service">
+    <classes>
+      <class name="org.openecomp.sdc.ci.tests.execute.service.GetAllServiceVersions"/>
+      <class name="org.openecomp.sdc.ci.tests.execute.interfaceoperation.InterfaceOperationsTest">
+        <methods>
+          <include name="addInterfaceOperationsOnService"/>
+          <include name="getInterfaceOperationsFromService"/>
+          <include name="updateInterfaceOperationsOnService"/>
+          <include name="deleteInterfaceOperationsFromService"/>
+          <include name="testCreateOperationWithLocalInterfaceAndDownloadArtifact"/>
+        </methods>
+      </class>
+    </classes>
+  </test>
+</suite> <!-- Service -->
diff --git a/integration-tests/src/test/resources/ci/testSuites/testngLifeCycle.xml b/integration-tests/src/test/resources/ci/testSuites/testngLifeCycle.xml
new file mode 100644
index 0000000000..7f1cba4d9c
--- /dev/null
+++ b/integration-tests/src/test/resources/ci/testSuites/testngLifeCycle.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE suite SYSTEM "http://testng.org/testng-1.0.dtd">
+<suite name="lifeCycle">
+  <test name="Test">
+    <classes>
+      <class name="org.openecomp.sdc.ci.tests.execute.lifecycle.LCSbaseTest"/>
+    </classes>
+  </test> <!-- Test -->
+</suite> <!-- lifeCycle -->
diff --git a/integration-tests/src/test/resources/ci/testSuites/user.xml b/integration-tests/src/test/resources/ci/testSuites/user.xml
new file mode 100644
index 0000000000..3ab1f971fb
--- /dev/null
+++ b/integration-tests/src/test/resources/ci/testSuites/user.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE suite SYSTEM "http://testng.org/testng-1.0.dtd">
+<suite name="User">
+  <test name="Test">
+    <classes>
+      <class name="org.openecomp.sdc.ci.tests.execute.user.ActivateDeActivateDeleteUser"/>
+    </classes>
+  </test> <!-- Test -->
+</suite> <!-- User -->
diff --git a/pom.xml b/pom.xml
index 2aef579be0..656e7fc117 100644
--- a/pom.xml
+++ b/pom.xml
@@ -569,8 +569,8 @@ Modifications copyright (c) 2018-2019 Nokia
         <module>asdctool</module>
         <module>catalog-ui</module>
         <module>catalog-fe</module>
-        <module>test-apis-ci</module>
-        <module>ui-ci</module>
+<!--        <module>test-apis-ci</module>-->
+<!--        <module>ui-ci</module>-->
         <module>sdc-os-chef</module>
         <module>utils/webseal-simulator</module>
         <module>integration-tests</module>
diff --git a/test-apis-ci/src/main/java/org/openecomp/sdc/ci/tests/config/Config.java b/test-apis-ci/src/main/java/org/openecomp/sdc/ci/tests/config/Config.java
index d11d0489bf..82fdde4b84 100644
--- a/test-apis-ci/src/main/java/org/openecomp/sdc/ci/tests/config/Config.java
+++ b/test-apis-ci/src/main/java/org/openecomp/sdc/ci/tests/config/Config.java
@@ -178,13 +178,7 @@ public class Config {
 
 		String configFile = System.getProperty("config.resource");
 		if (configFile == null) {
-			if (System.getProperty("os.name").contains("Windows")) {
-				configFile = WINDOWS_CONFIG_FILE;
-			} else if (System.getProperty("os.name").contains("Mac")) {
-				configFile = WINDOWS_CONFIG_FILE;
-			} else {
-				throw new RuntimeException("Please Add Jvm Argument config.resource");
-			}
+			configFile = WINDOWS_CONFIG_FILE;
 		}
 
 		File file = new File(configFile);