Package rename

Step 2: package rename, fix pom.xml, fix integration tests

Issue-ID: INT-1869
Signed-off-by: Zebek Bogumil <bogumil.zebek@nokia.com>
Change-Id: Ia4c6823e4facc3791583fb39caba3bcc125b3af7

13 files changed, 65 insertions, 76 deletions

diff --git a/integration/pom.xml b/integration/pom.xml
index e56d838..834c6ae 100644
--- a/integration/pom.xml
+++ b/integration/pom.xml
@@ -24,14 +24,8 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
-    <parent>
-        <groupId>org.onap.integration.nfsimulator</groupId>
-        <artifactId>vesclient</artifactId>
-        <version>1.0.0-SNAPSHOT</version>
-        <relativePath>../../pom.xml</relativePath>
-    </parent>
-
-    <artifactId>pnf-simulator-integration</artifactId>
+    <groupId>org.onap.integration.simulators.nf-simulator.ves-client</groupId>
+    <artifactId>vesclient-integration</artifactId>
     <version>1.0.0-SNAPSHOT</version>
     <name>vesclient-integration</name>
 
@@ -47,6 +41,13 @@
         <maven.compiler.target>11</maven.compiler.target>
         <rest-assured.version>3.2.0</rest-assured.version>
         <mongo-java-driver.version>3.9.1</mongo-java-driver.version>
+        <spring-boot-starter.version>2.1.6.RELEASE</spring-boot-starter.version>
+        <spring-boot-starter-web.version>2.1.6.RELEASE</spring-boot-starter-web.version>
+        <spring-test.version>5.0.4.RELEASE</spring-test.version>
+        <spring-boot-starter-test.version>2.1.6.RELEASE</spring-boot-starter-test.version>
+        <gson.version>2.8.2</gson.version>
+        <docker-compose-rule-junit4.version>0.34.0</docker-compose-rule-junit4.version>
+        <assertj-core.version>3.19.0</assertj-core.version>
     </properties>
 
     <dependencies>
@@ -54,16 +55,19 @@
         <dependency>
             <groupId>org.assertj</groupId>
             <artifactId>assertj-core</artifactId>
+            <version>${assertj-core.version}</version>
             <scope>test</scope>
         </dependency>
 
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter</artifactId>
+            <version>${spring-boot-starter.version}</version>
         </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-web</artifactId>
+            <version>${spring-boot-starter-web.version}</version>
         </dependency>
 
         <dependency>
@@ -80,20 +84,24 @@
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-test</artifactId>
+            <version>${spring-test.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-test</artifactId>
+            <version>${spring-boot-starter-test.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>com.google.code.gson</groupId>
             <artifactId>gson</artifactId>
+            <version>${gson.version}</version>
         </dependency>
         <dependency>
             <groupId>com.palantir.docker.compose</groupId>
             <artifactId>docker-compose-rule-junit4</artifactId>
+            <version>${docker-compose-rule-junit4.version}</version>
         </dependency>
     </dependencies>
 
diff --git a/integration/src/main/java/org/onap/pnfsimulator/integration/Main.java b/integration/src/main/java/org/onap/integration/simulators/nfsimulator/vesclient/integration/Main.java
index 7288c2a..af3cdcc 100644
--- a/integration/src/main/java/org/onap/pnfsimulator/integration/Main.java
+++ b/integration/src/main/java/org/onap/integration/simulators/nfsimulator/vesclient/integration/Main.java
@@ -17,7 +17,7 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
-package org.onap.pnfsimulator.integration;
+package org.onap.integration.simulators.nfsimulator.vesclient.integration;
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
diff --git a/integration/src/main/java/org/onap/pnfsimulator/integration/VesSimulatorController.java b/integration/src/main/java/org/onap/integration/simulators/nfsimulator/vesclient/integration/VesSimulatorController.java
index 304df60..ee5c380 100644
--- a/integration/src/main/java/org/onap/pnfsimulator/integration/VesSimulatorController.java
+++ b/integration/src/main/java/org/onap/integration/simulators/nfsimulator/vesclient/integration/VesSimulatorController.java
@@ -7,9 +7,9 @@
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.onap.pnfsimulator.integration;
+package org.onap.integration.simulators.nfsimulator.vesclient.integration;
 
 import com.google.gson.Gson;
 import com.google.gson.JsonObject;
diff --git a/integration/src/main/java/org/onap/pnfsimulator/integration/VesSimulatorService.java b/integration/src/main/java/org/onap/integration/simulators/nfsimulator/vesclient/integration/VesSimulatorService.java
index 65e5d3e..f53864c 100644
--- a/integration/src/main/java/org/onap/pnfsimulator/integration/VesSimulatorService.java
+++ b/integration/src/main/java/org/onap/integration/simulators/nfsimulator/vesclient/integration/VesSimulatorService.java
@@ -7,9 +7,9 @@
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.onap.pnfsimulator.integration;
+package org.onap.integration.simulators.nfsimulator.vesclient.integration;
 
 import com.google.gson.JsonObject;
 import org.springframework.stereotype.Service;
diff --git a/integration/src/test/java/org/onap/pnfsimulator/integration/BasicAvailabilityTest.java b/integration/src/test/java/org/onap/integration/simulators/nfsimulator/vesclient/integration/BasicAvailabilityTest.java
index 323243c..268d738 100644
--- a/integration/src/test/java/org/onap/pnfsimulator/integration/BasicAvailabilityTest.java
+++ b/integration/src/test/java/org/onap/integration/simulators/nfsimulator/vesclient/integration/BasicAvailabilityTest.java
@@ -18,24 +18,19 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.onap.pnfsimulator.integration;
+package org.onap.integration.simulators.nfsimulator.vesclient.integration;
 
 import static io.restassured.RestAssured.given;
 import static io.restassured.RestAssured.when;
 import static org.assertj.core.api.AssertionsForClassTypes.assertThat;
 import static org.hamcrest.Matchers.equalTo;
-import static org.onap.pnfsimulator.integration.TestUtils.getCurrentIpAddress;
 
 import com.google.gson.JsonObject;
 
 import java.io.IOException;
-import java.net.Inet4Address;
-import java.net.NetworkInterface;
-import java.net.SocketException;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
-import java.util.Collections;
 import java.util.UUID;
 
 import io.restassured.response.Response;
@@ -71,7 +66,7 @@ public class BasicAvailabilityTest {
 
     @Before
     public void setUp() throws Exception {
-        currenVesSimulatorIp = getCurrentIpAddress();
+        currenVesSimulatorIp = TestUtils.getCurrentIpAddress();
     }
 
     @After
diff --git a/integration/src/test/java/org/onap/pnfsimulator/integration/OptionalTemplatesTest.java b/integration/src/test/java/org/onap/integration/simulators/nfsimulator/vesclient/integration/OptionalTemplatesTest.java
index 50ad1cd..33dcf97 100644
--- a/integration/src/test/java/org/onap/pnfsimulator/integration/OptionalTemplatesTest.java
+++ b/integration/src/test/java/org/onap/integration/simulators/nfsimulator/vesclient/integration/OptionalTemplatesTest.java
@@ -7,9 +7,9 @@
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -18,16 +18,11 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.onap.pnfsimulator.integration;
+package org.onap.integration.simulators.nfsimulator.vesclient.integration;
 
 import static io.restassured.RestAssured.given;
 import static org.assertj.core.api.AssertionsForClassTypes.assertThat;
 import static org.hamcrest.Matchers.equalTo;
-import static org.onap.pnfsimulator.integration.TestUtils.COMMON_EVENT_HEADER;
-import static org.onap.pnfsimulator.integration.TestUtils.PATCHED;
-import static org.onap.pnfsimulator.integration.TestUtils.SINGLE_EVENT_URL;
-import static org.onap.pnfsimulator.integration.TestUtils.findSourceNameInMongoDB;
-import static org.onap.pnfsimulator.integration.TestUtils.getCurrentIpAddress;
 
 import com.google.gson.JsonObject;
 import java.time.Instant;
@@ -58,7 +53,7 @@ public class OptionalTemplatesTest {
 
     @Before
     public void setUp() throws Exception {
-        currentVesSimulatorIp = getCurrentIpAddress();
+        currentVesSimulatorIp = TestUtils.getCurrentIpAddress();
     }
 
     @After
@@ -92,7 +87,7 @@ public class OptionalTemplatesTest {
             .contentType("application/json")
             .body(body)
             .when()
-            .post(SINGLE_EVENT_URL)
+            .post(TestUtils.SINGLE_EVENT_URL)
             .then()
             .statusCode(HttpStatus.ACCEPTED.value())
             .body("message", equalTo("Accepted"));
@@ -105,22 +100,22 @@ public class OptionalTemplatesTest {
 
         JsonObject value = parameterCaptor.getValue();
         assertThat(value
-            .getAsJsonObject(COMMON_EVENT_HEADER)
+            .getAsJsonObject(TestUtils.COMMON_EVENT_HEADER)
             .get("sourceName").getAsString()).isEqualTo("Single_sourceName");
         assertThat(value
-            .getAsJsonObject(COMMON_EVENT_HEADER)
+            .getAsJsonObject(TestUtils.COMMON_EVENT_HEADER)
             .get("eventId1").getAsString()).hasSize(20);
         assertThat(value
-            .getAsJsonObject(COMMON_EVENT_HEADER)
+            .getAsJsonObject(TestUtils.COMMON_EVENT_HEADER)
             .get("eventId2").getAsString()).isEqualTo("10");
         assertThat(value
-            .getAsJsonObject(COMMON_EVENT_HEADER)
+            .getAsJsonObject(TestUtils.COMMON_EVENT_HEADER)
             .get("eventId3").getAsString()).isEqualTo("1");
         assertThat(value
-            .getAsJsonObject(COMMON_EVENT_HEADER)
+            .getAsJsonObject(TestUtils.COMMON_EVENT_HEADER)
             .get("eventId4").getAsInt()).isEqualTo(10);
         assertThat(value
-            .getAsJsonObject(COMMON_EVENT_HEADER)
+            .getAsJsonObject(TestUtils.COMMON_EVENT_HEADER)
             .get("eventId5").getAsLong()).isBetween(currentTimestamp, afterExecution);
     }
 
@@ -143,7 +138,7 @@ public class OptionalTemplatesTest {
             .contentType("application/json")
             .body(body)
             .when()
-            .post(SINGLE_EVENT_URL)
+            .post(TestUtils.SINGLE_EVENT_URL)
             .then()
             .statusCode(HttpStatus.ACCEPTED.value())
             .body("message", equalTo("Accepted"));
@@ -153,8 +148,8 @@ public class OptionalTemplatesTest {
             Mockito.timeout(3000))
             .sendEventToDmaapV5(parameterCaptor.capture());
 
-        Document sourceNameInMongoDB = findSourceNameInMongoDB();
-        Assertions.assertThat(sourceNameInMongoDB.get(PATCHED))
+        Document sourceNameInMongoDB = TestUtils.findSourceNameInMongoDB();
+        Assertions.assertThat(sourceNameInMongoDB.get(TestUtils.PATCHED))
             .isEqualTo("{\"commonEventHeader\":{\"sourceName\":\"HistoricalEvent\",\"version\":3}}");
     }
 
diff --git a/integration/src/test/java/org/onap/pnfsimulator/integration/SearchInTemplatesTest.java b/integration/src/test/java/org/onap/integration/simulators/nfsimulator/vesclient/integration/SearchInTemplatesTest.java
index 9d4ff3b..a0d8742 100644
--- a/integration/src/test/java/org/onap/pnfsimulator/integration/SearchInTemplatesTest.java
+++ b/integration/src/test/java/org/onap/integration/simulators/nfsimulator/vesclient/integration/SearchInTemplatesTest.java
@@ -7,9 +7,9 @@
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.onap.pnfsimulator.integration;
+package org.onap.integration.simulators.nfsimulator.vesclient.integration;
 
 import static io.restassured.RestAssured.given;
 import static java.nio.file.Files.readAllBytes;
diff --git a/integration/src/test/java/org/onap/pnfsimulator/integration/SingleEventTest.java b/integration/src/test/java/org/onap/integration/simulators/nfsimulator/vesclient/integration/SingleEventTest.java
index 3ad1385..7d15842 100644
--- a/integration/src/test/java/org/onap/pnfsimulator/integration/SingleEventTest.java
+++ b/integration/src/test/java/org/onap/integration/simulators/nfsimulator/vesclient/integration/SingleEventTest.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.onap.pnfsimulator.integration;
+package org.onap.integration.simulators.nfsimulator.vesclient.integration;
 
 import com.google.gson.JsonObject;
 import org.assertj.core.api.Assertions;
@@ -40,10 +40,6 @@ import java.util.List;
 import static io.restassured.RestAssured.given;
 import static org.hamcrest.Matchers.equalTo;
 import static org.hamcrest.Matchers.stringContainsInOrder;
-import static org.onap.pnfsimulator.integration.TestUtils.PATCHED;
-import static org.onap.pnfsimulator.integration.TestUtils.SINGLE_EVENT_URL;
-import static org.onap.pnfsimulator.integration.TestUtils.findSourceNameInMongoDB;
-import static org.onap.pnfsimulator.integration.TestUtils.getCurrentIpAddress;
 
 @RunWith(SpringRunner.class)
 @SpringBootTest(classes = {Main.class, TestConfiguration.class}, webEnvironment = SpringBootTest.WebEnvironment.DEFINED_PORT)
@@ -56,7 +52,7 @@ public class SingleEventTest {
 
     @Before
     public void setUp() throws Exception {
-        currentVesSimulatorIp = getCurrentIpAddress();
+        currentVesSimulatorIp = TestUtils.getCurrentIpAddress();
     }
 
     @After
@@ -82,7 +78,7 @@ public class SingleEventTest {
             .contentType("application/json")
             .body(body)
             .when()
-            .post(SINGLE_EVENT_URL)
+            .post(TestUtils.SINGLE_EVENT_URL)
             .then()
             .statusCode(421)
             .body("message",
@@ -107,7 +103,7 @@ public class SingleEventTest {
             .contentType("application/json")
             .body(body)
             .when()
-            .post(SINGLE_EVENT_URL)
+            .post(TestUtils.SINGLE_EVENT_URL)
             .then()
             .statusCode(HttpStatus.BAD_REQUEST.value())
             .body("message",
@@ -134,7 +130,7 @@ public class SingleEventTest {
             .contentType("application/json")
             .body(body)
             .when()
-            .post(SINGLE_EVENT_URL)
+            .post(TestUtils.SINGLE_EVENT_URL)
             .then()
             .statusCode(HttpStatus.ACCEPTED.value())
             .body("message", equalTo("Accepted"));
@@ -144,8 +140,8 @@ public class SingleEventTest {
             Mockito.timeout(3000))
             .sendEventToDmaapV5(parameterCaptor.capture());
 
-        Document sourceNameInMongoDB = findSourceNameInMongoDB();
-        Assertions.assertThat(sourceNameInMongoDB.get(PATCHED))
+        Document sourceNameInMongoDB = TestUtils.findSourceNameInMongoDB();
+        Assertions.assertThat(sourceNameInMongoDB.get(TestUtils.PATCHED))
             .isEqualTo("{\"commonEventHeader\":{\"sourceName\":\"HistoricalEvent\",\"version\":3}}");
     }
 }
diff --git a/integration/src/test/java/org/onap/pnfsimulator/integration/TemplatesManagementTest.java b/integration/src/test/java/org/onap/integration/simulators/nfsimulator/vesclient/integration/TemplatesManagementTest.java
index 7e74dd4..ecaa0db 100644
--- a/integration/src/test/java/org/onap/pnfsimulator/integration/TemplatesManagementTest.java
+++ b/integration/src/test/java/org/onap/integration/simulators/nfsimulator/vesclient/integration/TemplatesManagementTest.java
@@ -7,9 +7,9 @@
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.onap.pnfsimulator.integration;
+package org.onap.integration.simulators.nfsimulator.vesclient.integration;
 
 import static io.restassured.RestAssured.given;
 
diff --git a/integration/src/test/java/org/onap/pnfsimulator/integration/TestConfiguration.java b/integration/src/test/java/org/onap/integration/simulators/nfsimulator/vesclient/integration/TestConfiguration.java
index 19ae050..cbfca42 100644
--- a/integration/src/test/java/org/onap/pnfsimulator/integration/TestConfiguration.java
+++ b/integration/src/test/java/org/onap/integration/simulators/nfsimulator/vesclient/integration/TestConfiguration.java
@@ -7,9 +7,9 @@
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.onap.pnfsimulator.integration;
+package org.onap.integration.simulators.nfsimulator.vesclient.integration;
 
 import org.mockito.Mockito;
 import org.springframework.context.annotation.Bean;
diff --git a/integration/src/test/java/org/onap/pnfsimulator/integration/TestUtils.java b/integration/src/test/java/org/onap/integration/simulators/nfsimulator/vesclient/integration/TestUtils.java
index f7df5e9..8ad3ddd 100644
--- a/integration/src/test/java/org/onap/pnfsimulator/integration/TestUtils.java
+++ b/integration/src/test/java/org/onap/integration/simulators/nfsimulator/vesclient/integration/TestUtils.java
@@ -1,4 +1,4 @@
-package org.onap.pnfsimulator.integration;
+package org.onap.integration.simulators.nfsimulator.vesclient.integration;
 
 import com.mongodb.MongoClient;
 import com.mongodb.MongoClientOptions;
diff --git a/integration/src/test/java/org/onap/pnfsimulator/integration/VariablesReplacement.java b/integration/src/test/java/org/onap/integration/simulators/nfsimulator/vesclient/integration/VariablesReplacement.java
index ae7970c..da93e60 100644
--- a/integration/src/test/java/org/onap/pnfsimulator/integration/VariablesReplacement.java
+++ b/integration/src/test/java/org/onap/integration/simulators/nfsimulator/vesclient/integration/VariablesReplacement.java
@@ -1,15 +1,10 @@
-package org.onap.pnfsimulator.integration;
+package org.onap.integration.simulators.nfsimulator.vesclient.integration;
 
 import static io.restassured.RestAssured.given;
 import static org.assertj.core.api.AssertionsForClassTypes.assertThat;
 import static org.hamcrest.Matchers.equalTo;
-import static org.onap.pnfsimulator.integration.TestUtils.getCurrentIpAddress;
 
 import com.google.gson.JsonObject;
-import java.net.Inet4Address;
-import java.net.NetworkInterface;
-import java.net.SocketException;
-import java.util.Collections;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -31,7 +26,7 @@ public class VariablesReplacement {
 
     @Before
     public void setUp() throws Exception {
-        currentVesSimulatorIp = getCurrentIpAddress();
+        currentVesSimulatorIp = TestUtils.getCurrentIpAddress();
     }
 
     @Test
diff --git a/integration/src/test/java/org/onap/pnfsimulator/integration/suites/DockerBasedTestsSuite.java b/integration/src/test/java/org/onap/integration/simulators/nfsimulator/vesclient/integration/suites/DockerBasedTestsSuite.java
index f6a4c24..16638ac 100644
--- a/integration/src/test/java/org/onap/pnfsimulator/integration/suites/DockerBasedTestsSuite.java
+++ b/integration/src/test/java/org/onap/integration/simulators/nfsimulator/vesclient/integration/suites/DockerBasedTestsSuite.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.onap.pnfsimulator.integration.suites;
+package org.onap.integration.simulators.nfsimulator.vesclient.integration.suites;
 
 import com.palantir.docker.compose.DockerComposeRule;
 import com.palantir.docker.compose.connection.waiting.HealthChecks;
@@ -27,12 +27,12 @@ import org.junit.ClassRule;
 import org.junit.runner.RunWith;
 import org.junit.runners.Suite;
 import org.junit.runners.Suite.SuiteClasses;
-import org.onap.pnfsimulator.integration.BasicAvailabilityTest;
-import org.onap.pnfsimulator.integration.OptionalTemplatesTest;
-import org.onap.pnfsimulator.integration.SearchInTemplatesTest;
-import org.onap.pnfsimulator.integration.SingleEventTest;
-import org.onap.pnfsimulator.integration.TemplatesManagementTest;
-import org.onap.pnfsimulator.integration.VariablesReplacement;
+import org.onap.integration.simulators.nfsimulator.vesclient.integration.OptionalTemplatesTest;
+import org.onap.integration.simulators.nfsimulator.vesclient.integration.BasicAvailabilityTest;
+import org.onap.integration.simulators.nfsimulator.vesclient.integration.SearchInTemplatesTest;
+import org.onap.integration.simulators.nfsimulator.vesclient.integration.SingleEventTest;
+import org.onap.integration.simulators.nfsimulator.vesclient.integration.TemplatesManagementTest;
+import org.onap.integration.simulators.nfsimulator.vesclient.integration.VariablesReplacement;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.http.HttpStatus;