Optimize Build

Optimize the log output

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

15 files changed, 541 insertions, 711 deletions

diff --git a/integration-tests/pom.xml b/integration-tests/pom.xml
index 7583de400c..addb4519b7 100644
--- a/integration-tests/pom.xml
+++ b/integration-tests/pom.xml
@@ -55,6 +55,12 @@ limitations under the License.
 
     <dependencies>
         <dependency>
+            <groupId>ch.qos.logback</groupId>
+            <artifactId>logback-classic</artifactId>
+            <version>${logback.version}</version>
+        </dependency>
+
+        <dependency>
             <groupId>org.yaml</groupId>
             <artifactId>snakeyaml</artifactId>
             <version>${snakeyaml.version}</version>
diff --git a/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/utils/rest/ResponseParser.java b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/utils/rest/ResponseParser.java
index 996abb8e24..437dc684d8 100644
--- a/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/utils/rest/ResponseParser.java
+++ b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/utils/rest/ResponseParser.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.
@@ -20,36 +20,6 @@
 
 package org.onap.sdc.backend.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 ArtifactReqDetails;
-//import ResourceAssetStructure;
-//import ResourceRespJavaObject;
-//import ServiceDistributionStatus;
-//import RestResponse;
-//import VfModuleDefinition;
-//import 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;
@@ -80,619 +50,488 @@ 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) {
+    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 {
+            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());
+            //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, 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");
+
+        if (jArrReousrces != null && jArrServices != 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);
+
+        } else {
+            map.put("resources", new ArrayList<>());
+            map.put("services", 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;
-	}
+            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/resources/ci/conf/log4j2.properties b/integration-tests/src/test/resources/ci/conf/log4j2.properties
deleted file mode 100644
index a8944dba13..0000000000
--- a/integration-tests/src/test/resources/ci/conf/log4j2.properties
+++ /dev/null
@@ -1,46 +0,0 @@
-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
deleted file mode 100644
index 5295d45a47..0000000000
--- a/integration-tests/src/test/resources/ci/conf/log4j2.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?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/testSuites/backend/CRUDArtifacts.xml b/integration-tests/src/test/resources/ci/testSuites/backend/CRUDArtifacts.xml
index 0306e469ea..2dedb4ea64 100644
--- a/integration-tests/src/test/resources/ci/testSuites/backend/CRUDArtifacts.xml
+++ b/integration-tests/src/test/resources/ci/testSuites/backend/CRUDArtifacts.xml
@@ -1,6 +1,6 @@
 <?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">
+<suite name="CRUDArtifacts" configfailurepolicy="continue" parallel="tests" thread-count="10">
 
   <test name="Test">
     <classes>
diff --git a/integration-tests/src/test/resources/ci/testSuites/backend/ExternalApiSanity.xml b/integration-tests/src/test/resources/ci/testSuites/backend/ExternalApiSanity.xml
index b17a8e69a0..8b86c7ab13 100644
--- a/integration-tests/src/test/resources/ci/testSuites/backend/ExternalApiSanity.xml
+++ b/integration-tests/src/test/resources/ci/testSuites/backend/ExternalApiSanity.xml
@@ -1,6 +1,6 @@
 <?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">
+<suite name="CRUDArtifacts" configfailurepolicy="continue" parallel="methods" thread-count="2" data-provider-thread-count="2">
 
   <test name="Test">
     <classes>
diff --git a/integration-tests/src/test/resources/ci/testSuites/backend/SearchExternalAPI.xml b/integration-tests/src/test/resources/ci/testSuites/backend/SearchExternalAPI.xml
index b401c281bf..b65db48263 100644
--- a/integration-tests/src/test/resources/ci/testSuites/backend/SearchExternalAPI.xml
+++ b/integration-tests/src/test/resources/ci/testSuites/backend/SearchExternalAPI.xml
@@ -1,6 +1,6 @@
 <?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">
+<suite name="CRUDArtifacts" configfailurepolicy="continue" parallel="tests" thread-count="10">
 
   <test name="Test">
     <classes>
diff --git a/integration-tests/src/test/resources/ci/testSuites/backend/ciFull.xml b/integration-tests/src/test/resources/ci/testSuites/backend/ciFull.xml
index 963c568a8f..18be6fa488 100644
--- a/integration-tests/src/test/resources/ci/testSuites/backend/ciFull.xml
+++ b/integration-tests/src/test/resources/ci/testSuites/backend/ciFull.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE suite SYSTEM "http://testng.org/testng-1.0.dtd">
-<suite name="ciFull" configfailurepolicy="continue" verbose="2">
+<suite name="ciFull" configfailurepolicy="continue">
   <test name="Category">
     <classes>
       <class name="org.onap.sdc.backend.ci.tests.execute.category.CatalogDataApiTest"/>
diff --git a/integration-tests/src/test/resources/ci/testSuites/backend/externalAPIs.xml b/integration-tests/src/test/resources/ci/testSuites/backend/externalAPIs.xml
index 637ec3e4fa..41d6f6ec67 100644
--- a/integration-tests/src/test/resources/ci/testSuites/backend/externalAPIs.xml
+++ b/integration-tests/src/test/resources/ci/testSuites/backend/externalAPIs.xml
@@ -1,6 +1,6 @@
 <?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">
+<suite name="externalApis" configfailurepolicy="continue" parallel="methods" thread-count="1" data-provider-thread-count="8">
 	<test name="ExternalApis"> 
 		<classes>	
 			
diff --git a/integration-tests/src/test/resources/ci/testSuites/backend/onapApiSanity.xml b/integration-tests/src/test/resources/ci/testSuites/backend/onapApiSanity.xml
index 9f189107a5..8d5d2b2f08 100644
--- a/integration-tests/src/test/resources/ci/testSuites/backend/onapApiSanity.xml
+++ b/integration-tests/src/test/resources/ci/testSuites/backend/onapApiSanity.xml
@@ -1,6 +1,6 @@
 <?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">
+<suite name="externalApis" configfailurepolicy="continue" parallel="methods" thread-count="1" data-provider-thread-count="1">
 	<parameter name="makeDistribution"  value="false"/>
 	<parameter name="makeToscaValidation"  value="true"/>
 	<test name="ExternalApis"> 
diff --git a/integration-tests/src/test/resources/ci/testSuites/backend/pass.xml b/integration-tests/src/test/resources/ci/testSuites/backend/pass.xml
index 00df382cef..c124a4daac 100644
--- a/integration-tests/src/test/resources/ci/testSuites/backend/pass.xml
+++ b/integration-tests/src/test/resources/ci/testSuites/backend/pass.xml
@@ -1,6 +1,6 @@
 <?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">
+<suite name="externalApis" configfailurepolicy="continue" parallel="methods" thread-count="1" data-provider-thread-count="1">
     <parameter name="makeDistribution"  value="false"/>
     <parameter name="makeToscaValidation"  value="true"/>
     <test name="passTest">
diff --git a/integration-tests/src/test/resources/ci/testSuites/backend/productAPIs.xml b/integration-tests/src/test/resources/ci/testSuites/backend/productAPIs.xml
index bd5f06da15..ac7af87186 100644
--- a/integration-tests/src/test/resources/ci/testSuites/backend/productAPIs.xml
+++ b/integration-tests/src/test/resources/ci/testSuites/backend/productAPIs.xml
@@ -1,6 +1,6 @@
 <?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"
+<suite name="productAPIs" configfailurepolicy="continue" parallel="tests"
   thread-count="6">
 
   <test name="Test">
diff --git a/integration-tests/src/test/resources/ci/testSuites/backend/resource.xml b/integration-tests/src/test/resources/ci/testSuites/backend/resource.xml
index c2dd49011c..25fc105811 100644
--- a/integration-tests/src/test/resources/ci/testSuites/backend/resource.xml
+++ b/integration-tests/src/test/resources/ci/testSuites/backend/resource.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE suite SYSTEM "http://testng.org/testng-1.0.dtd">
 <suite name="Sanity" configfailurepolicy="continue">
 
-  <test verbose="2" name="Sanity">
+  <test name="Sanity">
     <classes>
 
       <class name="org.onap.sdc.backend.ci.tests.execute.category.CatalogDataApiTest"/>
diff --git a/integration-tests/src/test/resources/ci/testSuites/backend/sanity.xml b/integration-tests/src/test/resources/ci/testSuites/backend/sanity.xml
index 09323f2ea2..cc4aeda100 100644
--- a/integration-tests/src/test/resources/ci/testSuites/backend/sanity.xml
+++ b/integration-tests/src/test/resources/ci/testSuites/backend/sanity.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE suite SYSTEM "http://testng.org/testng-1.0.dtd">
-<suite name="Sanity" configfailurepolicy="continue" verbose="2">
+<suite name="Sanity" configfailurepolicy="continue">
 
   <test name="sanityE2Eflows">
     <classes>
diff --git a/integration-tests/src/test/resources/logback.xml b/integration-tests/src/test/resources/logback.xml
new file mode 100644
index 0000000000..559b69534a
--- /dev/null
+++ b/integration-tests/src/test/resources/logback.xml
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<configuration>
+    <property scope="system" name="ECOMP-component-name" value="SDC"/>
+    <property scope="system" name="ECOMP-subcomponent-name" value="SDC-TOOL"/>
+    <property name="default-log-pattern"
+              value="%d{yyyy-MM-dd'T'HH:mm:ss.SSSXXX}|%X{uuid}|%X{serviceInstanceID}|%thread||${ECOMP-subcomponent-name}|%X{userId}|%level|%X{alarmSeverity}|%X{localAddr}|${beFqdn}|%X{remoteAddr}|%logger{35}|%X{timer}|ActivityType=&lt;%M&gt;, Desc=&lt;%msg&gt;%n"/>
+
+
+    <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+        <encoder>
+            <pattern>${default-log-pattern}</pattern>
+        </encoder>
+    </appender>
+
+    <appender name="DEBUG_ROLLING"
+              class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <file>${HOME}/asdctool/logs/${ECOMP-component-name}/${ECOMP-subcomponent-name}/debug.log</file>
+
+
+        <rollingPolicy class="ch.qos.logback.core.rolling.FixedWindowRollingPolicy">
+            <fileNamePattern>${HOME}/asdctool/logs/${ECOMP-component-name}/${ECOMP-subcomponent-name}/debug.log.%i
+            </fileNamePattern>
+            <minIndex>1</minIndex>
+            <maxIndex>10</maxIndex>
+        </rollingPolicy>
+
+        <triggeringPolicy
+                class="ch.qos.logback.core.rolling.SizeBasedTriggeringPolicy">
+            <maxFileSize>20MB</maxFileSize>
+        </triggeringPolicy>
+        <encoder>
+            <pattern>${default-log-pattern}</pattern>
+        </encoder>
+    </appender>
+
+    <root level="INFO">
+        <appender-ref ref="DEBUG_ROLLING"/>
+        <appender-ref ref="STDOUT"/>
+    </root>
+
+    <logger name="org.openecomp.sdc" level="INFO"/>
+    <logger name="org.openecomp.sdc.asdctool.migration" level="INFO"/>
+
+</configuration>