AT&T 1712 and 1802 release code

This is code from AT&T's 1712 and 1802 releases.

Change-Id: Ie1e85851e94bc66c4d9514a0226c221939531a04
Issue-ID: SO-425
Signed-off-by: Rob Daugherty <rd472p@att.com>

9 files changed, 390 insertions, 67 deletions

diff --git a/adapters/mso-sdnc-adapter/WebContent/WEB-INF/web.xml b/adapters/mso-sdnc-adapter/WebContent/WEB-INF/web.xml
index cce3f14ff9..99a659f139 100644
--- a/adapters/mso-sdnc-adapter/WebContent/WEB-INF/web.xml
+++ b/adapters/mso-sdnc-adapter/WebContent/WEB-INF/web.xml
@@ -26,6 +26,10 @@
     <param-value>org.openecomp.mso.logger.MsoLoggingServlet,org.openecomp.mso.adapters.sdnc.notify.SDNCNotifyResource,org.openecomp.mso.adapters.sdnc.impl.SDNCAdapterRestImpl,org.openecomp.mso.MsoStatusHandler,org.openecomp.mso.adapters.sdnc.sdncrest.SNIROResponse,org.openecomp.mso.adapters.sdnc.sdncrest.SDNCAdapterRest</param-value>
   </context-param>
   <context-param>
+    <param-name>resteasy.providers</param-name>
+    <param-value>org.openecomp.mso.adapters.providers.JettisonStyleMapperProvider</param-value>
+  </context-param>
+  <context-param>
     <param-name>resteasy.servlet.mapping.prefix</param-name>
     <param-value>/rest</param-value>
   </context-param>
diff --git a/adapters/mso-sdnc-adapter/pom.xml b/adapters/mso-sdnc-adapter/pom.xml
index b0457e968e..9a9a38079b 100644
--- a/adapters/mso-sdnc-adapter/pom.xml
+++ b/adapters/mso-sdnc-adapter/pom.xml
@@ -107,4 +107,4 @@
 			<version>4.3.2.RELEASE</version>
 		</dependency>
 	</dependencies>
-</project>
\ No newline at end of file
+</project>
diff --git a/adapters/mso-sdnc-adapter/src/main/java/org/openecomp/mso/adapters/sdnc/sdncrest/SDNCServiceRequestConnector.java b/adapters/mso-sdnc-adapter/src/main/java/org/openecomp/mso/adapters/sdnc/sdncrest/SDNCServiceRequestConnector.java
index 69e015ea50..10175d83b5 100644
--- a/adapters/mso-sdnc-adapter/src/main/java/org/openecomp/mso/adapters/sdnc/sdncrest/SDNCServiceRequestConnector.java
+++ b/adapters/mso-sdnc-adapter/src/main/java/org/openecomp/mso/adapters/sdnc/sdncrest/SDNCServiceRequestConnector.java
@@ -43,7 +43,6 @@ import org.openecomp.mso.logger.MsoLogger;
 public class SDNCServiceRequestConnector extends SDNCConnector {
 
     private static final MsoLogger LOGGER = MsoLogger.getMsoLogger (MsoLogger.Catalog.RA);
-    private static final String YES = "Y";
 	@Override
 	protected SDNCResponseCommon createResponseFromContent(int statusCode, String statusMessage,
 			String responseContent, TypedRequestTunables rt) {
@@ -58,7 +57,7 @@ public class SDNCServiceRequestConnector extends SDNCConnector {
 	@Override
 	protected SDNCErrorCommon createErrorResponse(int statusCode, String errMsg,
 			TypedRequestTunables rt) {
-		return new SDNCServiceError(rt.getReqId(), String.valueOf(statusCode), errMsg, YES);
+		return new SDNCServiceError(rt.getReqId(), String.valueOf(statusCode), errMsg, "Y");
 	}
 
 	/**
@@ -134,10 +133,10 @@ public class SDNCServiceRequestConnector extends SDNCConnector {
 			// ack-final-indicator is optional: default to "Y".
 
 			if (ackFinalIndicator == null || ackFinalIndicator.trim().isEmpty()) {
-				ackFinalIndicator = YES;
+				ackFinalIndicator = "Y";
 			}
 
-			if (!YES.equals(ackFinalIndicator) && !"N".equals(ackFinalIndicator)) {
+			if (!ackFinalIndicator.equals("Y") && !"N".equals(ackFinalIndicator)) {
 				throw new ParseException("Invalid ack-final-indicator in SDNC response: '" + ackFinalIndicator + "'", 0);
 			}
 
@@ -149,7 +148,7 @@ public class SDNCServiceRequestConnector extends SDNCConnector {
 
 			// If the response code in the message from SDNC was not 2XX, return SDNCServiceError.
 
-			if (!responseCode.matches("2[0-9][0-9]")) {
+			if (!responseCode.matches("2[0-9][0-9]") && !responseCode.equals("0")) {
 				// Not a 2XX response.  Return SDNCServiceError.
 				return new SDNCServiceError(svcRequestId, responseCode, responseMessage, ackFinalIndicator);
 			}
diff --git a/adapters/mso-sdnc-adapter/src/main/java/org/openecomp/mso/adapters/sdnc/sdncrest/SDNCServiceRequestTask.java b/adapters/mso-sdnc-adapter/src/main/java/org/openecomp/mso/adapters/sdnc/sdncrest/SDNCServiceRequestTask.java
index 2c5355f5fb..f3ae6d62f7 100644
--- a/adapters/mso-sdnc-adapter/src/main/java/org/openecomp/mso/adapters/sdnc/sdncrest/SDNCServiceRequestTask.java
+++ b/adapters/mso-sdnc-adapter/src/main/java/org/openecomp/mso/adapters/sdnc/sdncrest/SDNCServiceRequestTask.java
@@ -138,6 +138,14 @@ public class SDNCServiceRequestTask implements Runnable {
 
 			Element requestInformation = addChild(root, "request-information");
 			addTextChild(requestInformation, "request-id", request.getRequestInformation().getRequestId());
+			if(request.getRequestInformation().getRequestAction()!= null) {
+				addTextChild(requestInformation, "request-action",
+						request.getRequestInformation().getRequestAction());
+			}
+			if(request.getRequestInformation().getRequestSubAction()!= null) {
+				addTextChild(requestInformation, "request-sub-action",
+						request.getRequestInformation().getRequestSubAction());
+			}
 			addTextChild(requestInformation, "source", request.getRequestInformation().getSource());
 			addTextChild(requestInformation, "notification-url", request.getRequestInformation().getNotificationUrl());
 
diff --git a/adapters/mso-sdnc-adapter/src/test/java/org/openecomp/mso/adapters/sdnc/impl/InvestigationTest.java b/adapters/mso-sdnc-adapter/src/test/java/org/openecomp/mso/adapters/sdnc/impl/InvestigationTest.java
new file mode 100644
index 0000000000..234a9d2272
--- /dev/null
+++ b/adapters/mso-sdnc-adapter/src/test/java/org/openecomp/mso/adapters/sdnc/impl/InvestigationTest.java
@@ -0,0 +1,114 @@
+/*-

+ * ============LICENSE_START=======================================================

+ * ONAP - SO

+ * ================================================================================

+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.

+ * ================================================================================

+ * Licensed under the Apache License, Version 2.0 (the "License");

+ * you may not use this file except in compliance with the License.

+ * You may obtain a copy of the License at

+ * 

+ *      http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing, software

+ * distributed under the License is distributed on an "AS IS" BASIS,

+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

+ * See the License for the specific language governing permissions and

+ * limitations under the License.

+ * ============LICENSE_END=========================================================

+ */

+package org.openecomp.mso.adapters.sdnc.impl;

+

+import java.io.File;

+import java.io.IOException;

+import java.io.StringReader;

+import java.util.Scanner;

+import java.util.UUID;

+

+import javax.xml.parsers.DocumentBuilder;

+import javax.xml.parsers.DocumentBuilderFactory;

+import javax.xml.parsers.ParserConfigurationException;

+

+import org.junit.AfterClass;

+import org.junit.Before;

+import org.junit.Test;

+import org.openecomp.mso.properties.MsoJavaProperties;

+import org.openecomp.mso.properties.MsoPropertiesException;

+import org.openecomp.mso.properties.MsoPropertiesFactory;

+import org.w3c.dom.Document;

+import org.w3c.dom.Node;

+import org.w3c.dom.NodeList;

+import org.xml.sax.InputSource;

+import org.xml.sax.SAXException;

+

+public class InvestigationTest {

+	

+	private static MsoPropertiesFactory msoPropertiesFactory = new MsoPropertiesFactory();

+	

+	public static final String SDNC_PROP = MsoJavaProperties.class.getClassLoader().getResource("mso.sdnc.properties").toString().substring(5);

+	

+	@Before

+	public final void initBeforeEachTest() throws MsoPropertiesException {

+			msoPropertiesFactory.removeAllMsoProperties();

+			msoPropertiesFactory.initializeMsoProperties("MSO_PROP_SDNC_ADAPTER", SDNC_PROP);

+	}

+

+	@AfterClass

+	public static final void kill () throws MsoPropertiesException {

+

+		    msoPropertiesFactory.removeMsoProperties("MSO_PROP_SDNC_ADAPTER");

+	}

+

+	@Test

+	public void run() throws ParserConfigurationException, IOException, SAXException {

+		

+		RequestTunables rt = new RequestTunables("reqid","","svc-topology-operation","delete", msoPropertiesFactory);

+		rt.setTunables();

+		/*Document reqDoc = parse();

+		NodeList nodeList = reqDoc.getElementsByTagName("sdncadapterworkflow:SDNCRequestData");

+		Node node = null;

+		System.out.println("nodeList length: "+ nodeList.getLength());

+		for (int i =0; i<nodeList.getLength();i++){

+			node = nodeList.item(i);

+		}

+		

+		Document doc = nodeToDocument(node);

+		*/

+		Scanner scanner = new Scanner( new File("src/test/resources/sdnc_adapter_request.xml") );

+		String input = scanner.useDelimiter("\\A").next();

+		System.out.println("input: "+input);

+		scanner.close();

+		try {

+			DocumentBuilder db = DocumentBuilderFactory.newInstance().newDocumentBuilder();

+			InputSource is = new InputSource();

+			is.setCharacterStream(new StringReader(input));

+			Document reqDoc = db.parse(is);

+			String sdncReqBody = Utils.genSdncReq(reqDoc, rt);

+			System.out.println(sdncReqBody);

+			String uuid = UUID.randomUUID().toString();

+			System.out.println("uuid: "+uuid);

+		}catch(Exception ex) {

+			throw new IllegalStateException();

+		}

+		

+	}

+	public static Document parse() throws ParserConfigurationException, IOException, SAXException {

+	    DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();

+	    factory.setValidating(true);

+	    factory.setIgnoringElementContentWhitespace(true);

+	    DocumentBuilder builder = factory.newDocumentBuilder();

+	    File file = new File("src/test/resources/sdnc_adapter_request.xml");

+	    Document doc = builder.parse(file);

+	    return doc;

+	}

+	public static Document nodeToDocument (Node node) throws ParserConfigurationException {

+		DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();

+		factory.setNamespaceAware(true);

+		DocumentBuilder builder = factory.newDocumentBuilder();

+		Document newDocument = builder.newDocument();

+		Node importedNode = newDocument.importNode(node, true);

+		newDocument.appendChild(importedNode);

+		return newDocument;

+	}

+}

+
diff --git a/adapters/mso-sdnc-adapter/src/test/java/org/openecomp/mso/adapters/sdnc/impl/RequestTunablesTest.java b/adapters/mso-sdnc-adapter/src/test/java/org/openecomp/mso/adapters/sdnc/impl/RequestTunablesTest.java
index 55295fc3ea..17ba0d22f8 100644
--- a/adapters/mso-sdnc-adapter/src/test/java/org/openecomp/mso/adapters/sdnc/impl/RequestTunablesTest.java
+++ b/adapters/mso-sdnc-adapter/src/test/java/org/openecomp/mso/adapters/sdnc/impl/RequestTunablesTest.java
@@ -20,11 +20,8 @@
 
 package org.openecomp.mso.adapters.sdnc.impl;
 
-import java.lang.reflect.Constructor;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-
-import org.junit.BeforeClass;
+import org.junit.AfterClass;
+import org.junit.Before;
 import org.junit.Test;
 
 import org.openecomp.mso.properties.MsoJavaProperties;
@@ -33,22 +30,22 @@ import org.openecomp.mso.properties.MsoPropertiesFactory;
 
 public class RequestTunablesTest {
 
-	public static MsoPropertiesFactory msoPropertiesFactory = new MsoPropertiesFactory();
+	private static MsoPropertiesFactory msoPropertiesFactory = new MsoPropertiesFactory();
 	
-    /**
-     * This method is called before any test occurs.
-     * It creates a fake tree from scratch
-     * @throws MsoPropertiesException 
-     */
-    @BeforeClass
-    public static final void prepare () throws MsoPropertiesException {
-        ClassLoader classLoader = RequestTunablesTest.class.getClassLoader ();
-        String path = classLoader.getResource ("mso.properties").toString ().substring (5);
-        
-        msoPropertiesFactory.initializeMsoProperties(RequestTunables.MSO_PROP_SDNC_ADAPTER, path);
-      
-    }
+	public static final String SDNC_PROP = MsoJavaProperties.class.getClassLoader().getResource("mso.sdnc.properties").toString().substring(5);
+	
+	@Before
+	public final void initBeforeEachTest() throws MsoPropertiesException {
+			msoPropertiesFactory.removeAllMsoProperties();
+			msoPropertiesFactory.initializeMsoProperties("MSO_PROP_SDNC_ADAPTER", SDNC_PROP);
+	}
+
+	@AfterClass
+	public static final void kill () throws MsoPropertiesException {
 
+		    msoPropertiesFactory.removeMsoProperties("MSO_PROP_SDNC_ADAPTER");
+	}
+	
     /**
      * Test method for
      * {@link org.openecomp.mso.adapters.sdnc.impl.RequestTunables#RequestTunables(java.lang.String, java.lang.String, java.lang.String, java.lang.String)}
diff --git a/adapters/mso-sdnc-adapter/src/test/java/org/openecomp/mso/adapters/sdnc/sdncrest/ObjectMappingTest.java b/adapters/mso-sdnc-adapter/src/test/java/org/openecomp/mso/adapters/sdnc/sdncrest/ObjectMappingTest.java
index 1921a9961a..1746360af0 100644
--- a/adapters/mso-sdnc-adapter/src/test/java/org/openecomp/mso/adapters/sdnc/sdncrest/ObjectMappingTest.java
+++ b/adapters/mso-sdnc-adapter/src/test/java/org/openecomp/mso/adapters/sdnc/sdncrest/ObjectMappingTest.java
@@ -19,14 +19,9 @@
  */
 package org.openecomp.mso.adapters.sdnc.sdncrest;
 
-import org.openecomp.mso.adapters.sdncrest.SDNCEvent;
-import org.openecomp.mso.adapters.sdncrest.SDNCServiceError;
-import org.openecomp.mso.adapters.sdncrest.SDNCServiceRequest;
-import org.openecomp.mso.adapters.sdncrest.SDNCServiceResponse;
-import org.codehaus.jackson.map.DeserializationConfig;
-import org.codehaus.jackson.map.ObjectMapper;
-import org.codehaus.jackson.map.SerializationConfig;
-import org.junit.Test;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
 
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
@@ -34,9 +29,15 @@ import java.io.ObjectOutputStream;
 import java.io.Serializable;
 import java.util.Arrays;
 
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.assertEquals;
+import org.junit.Test;
+import org.openecomp.mso.adapters.sdncrest.SDNCEvent;
+import org.openecomp.mso.adapters.sdncrest.SDNCServiceError;
+import org.openecomp.mso.adapters.sdncrest.SDNCServiceRequest;
+import org.openecomp.mso.adapters.sdncrest.SDNCServiceResponse;
+
+import com.fasterxml.jackson.databind.DeserializationFeature;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.SerializationFeature;
 
 
 
@@ -102,14 +103,14 @@ public class ObjectMappingTest {
 		"}" + EOL;
 
 	private final String PARAMS =
-		"{\"entry\":[{\"key\":\"P1\",\"value\":\"V1\"},{\"key\":\"P2\",\"value\":\"V2\"},{\"key\":\"P3\",\"value\":\"V3\"}]}";
+		"{\"P1\":\"V1\",\"P2\":\"V2\",\"P3\":\"V3\"}";
 
 	@Test
 	public final void jsonToSDNCServiceRequest() throws Exception {
 		logTest();
 		ObjectMapper mapper = new ObjectMapper();
-		mapper.enable(SerializationConfig.Feature.WRAP_ROOT_VALUE);
-		mapper.enable(DeserializationConfig.Feature.UNWRAP_ROOT_VALUE);
+		mapper.enable(SerializationFeature.WRAP_ROOT_VALUE);
+		mapper.enable(DeserializationFeature.UNWRAP_ROOT_VALUE);
 
 		String json = SDNC_SERVICE_REQUEST;
 		json = json.replace("((BP-TIMEOUT))", "\"bpTimeout\": \"" + "PT5M" + "\"," + EOL);
@@ -135,8 +136,8 @@ public class ObjectMappingTest {
 	public final void jsonToSDNCServiceRequestWithoutOptionalFields() throws Exception {
 		logTest();
 		ObjectMapper mapper = new ObjectMapper();
-		mapper.enable(SerializationConfig.Feature.WRAP_ROOT_VALUE);
-		mapper.enable(DeserializationConfig.Feature.UNWRAP_ROOT_VALUE);
+		mapper.enable(SerializationFeature.WRAP_ROOT_VALUE);
+		mapper.enable(DeserializationFeature.UNWRAP_ROOT_VALUE);
 
 		// bpTimeout is optional.
 		String json = SDNC_SERVICE_REQUEST;
@@ -163,8 +164,8 @@ public class ObjectMappingTest {
 	public final void jsonFromSDNCServiceRequest() throws Exception {
 		logTest();
 		ObjectMapper mapper = new ObjectMapper();
-		mapper.enable(SerializationConfig.Feature.WRAP_ROOT_VALUE);
-		mapper.enable(DeserializationConfig.Feature.UNWRAP_ROOT_VALUE);
+		mapper.enable(SerializationFeature.WRAP_ROOT_VALUE);
+		mapper.enable(DeserializationFeature.UNWRAP_ROOT_VALUE);
 
 		// Convert source json string to object.
 		String json1 = SDNC_SERVICE_REQUEST;
@@ -188,8 +189,8 @@ public class ObjectMappingTest {
 	public final void jsonFromSDNCServiceRequestWithoutOptionalFields() throws Exception {
 		logTest();
 		ObjectMapper mapper = new ObjectMapper();
-		mapper.enable(SerializationConfig.Feature.WRAP_ROOT_VALUE);
-		mapper.enable(DeserializationConfig.Feature.UNWRAP_ROOT_VALUE);
+		mapper.enable(SerializationFeature.WRAP_ROOT_VALUE);
+		mapper.enable(DeserializationFeature.UNWRAP_ROOT_VALUE);
 
 		// Convert source json string to object.
 		String json1 = SDNC_SERVICE_REQUEST;
@@ -213,8 +214,8 @@ public class ObjectMappingTest {
 	public final void jsonToSDNCServiceResponse() throws Exception {
 		logTest();
 		ObjectMapper mapper = new ObjectMapper();
-		mapper.enable(SerializationConfig.Feature.WRAP_ROOT_VALUE);
-		mapper.enable(DeserializationConfig.Feature.UNWRAP_ROOT_VALUE);
+		mapper.enable(SerializationFeature.WRAP_ROOT_VALUE);
+		mapper.enable(DeserializationFeature.UNWRAP_ROOT_VALUE);
 
 		String json = SDNC_SERVICE_RESPONSE;
 		json = json.replace("((RESPONSE-MESSAGE))", "    \"responseMessage\": \"" + "OK" + "\"," + EOL);
@@ -234,8 +235,8 @@ public class ObjectMappingTest {
 	public final void jsonToSDNCServiceResponseWithoutOptionalFields() throws Exception {
 		logTest();
 		ObjectMapper mapper = new ObjectMapper();
-		mapper.enable(SerializationConfig.Feature.WRAP_ROOT_VALUE);
-		mapper.enable(DeserializationConfig.Feature.UNWRAP_ROOT_VALUE);
+		mapper.enable(SerializationFeature.WRAP_ROOT_VALUE);
+		mapper.enable(DeserializationFeature.UNWRAP_ROOT_VALUE);
 
 		// responseMessage is optional.
 		String json = SDNC_SERVICE_RESPONSE;
@@ -254,8 +255,8 @@ public class ObjectMappingTest {
 	public final void jsonFromSDNCServiceResponse() throws Exception {
 		logTest();
 		ObjectMapper mapper = new ObjectMapper();
-		mapper.enable(SerializationConfig.Feature.WRAP_ROOT_VALUE);
-		mapper.enable(DeserializationConfig.Feature.UNWRAP_ROOT_VALUE);
+		mapper.enable(SerializationFeature.WRAP_ROOT_VALUE);
+		mapper.enable(DeserializationFeature.UNWRAP_ROOT_VALUE);
 
 		// Convert source json string to object.
 		String json1 = SDNC_SERVICE_RESPONSE;
@@ -280,8 +281,8 @@ public class ObjectMappingTest {
 	public final void jsonFromSDNCServiceResponseWithoutOptionalFields() throws Exception {
 		logTest();
 		ObjectMapper mapper = new ObjectMapper();
-		mapper.enable(SerializationConfig.Feature.WRAP_ROOT_VALUE);
-		mapper.enable(DeserializationConfig.Feature.UNWRAP_ROOT_VALUE);
+		mapper.enable(SerializationFeature.WRAP_ROOT_VALUE);
+		mapper.enable(DeserializationFeature.UNWRAP_ROOT_VALUE);
 
 		// Convert source json string to object.
 		String json1 = SDNC_SERVICE_RESPONSE;
@@ -306,8 +307,8 @@ public class ObjectMappingTest {
 	public final void jsonToSDNCServiceError() throws Exception {
 		logTest();
 		ObjectMapper mapper = new ObjectMapper();
-		mapper.enable(SerializationConfig.Feature.WRAP_ROOT_VALUE);
-		mapper.enable(DeserializationConfig.Feature.UNWRAP_ROOT_VALUE);
+		mapper.enable(SerializationFeature.WRAP_ROOT_VALUE);
+		mapper.enable(DeserializationFeature.UNWRAP_ROOT_VALUE);
 
 		String json = SDNC_SERVICE_ERROR;
 		json = json.replace("((RESPONSE-MESSAGE))", "\"responseMessage\": \"" + "SOMETHING BAD" + "\"," + EOL);
@@ -323,8 +324,8 @@ public class ObjectMappingTest {
 	public final void jsonToSDNCServiceErrorWithoutOptionalFields() throws Exception {
 		logTest();
 		ObjectMapper mapper = new ObjectMapper();
-		mapper.enable(SerializationConfig.Feature.WRAP_ROOT_VALUE);
-		mapper.enable(DeserializationConfig.Feature.UNWRAP_ROOT_VALUE);
+		mapper.enable(SerializationFeature.WRAP_ROOT_VALUE);
+		mapper.enable(DeserializationFeature.UNWRAP_ROOT_VALUE);
 
 		// responseMessage is optional.
 		String json = SDNC_SERVICE_ERROR;
@@ -341,8 +342,8 @@ public class ObjectMappingTest {
 	public final void jsonFromSDNCServiceError() throws Exception {
 		logTest();
 		ObjectMapper mapper = new ObjectMapper();
-		mapper.enable(SerializationConfig.Feature.WRAP_ROOT_VALUE);
-		mapper.enable(DeserializationConfig.Feature.UNWRAP_ROOT_VALUE);
+		mapper.enable(SerializationFeature.WRAP_ROOT_VALUE);
+		mapper.enable(DeserializationFeature.UNWRAP_ROOT_VALUE);
 
 		// Convert source json string to object.
 		String json1 = SDNC_SERVICE_ERROR;
@@ -366,8 +367,8 @@ public class ObjectMappingTest {
 	public final void jsonFromSDNCServiceErrorWithoutOptionalFields() throws Exception {
 		logTest();
 		ObjectMapper mapper = new ObjectMapper();
-		mapper.enable(SerializationConfig.Feature.WRAP_ROOT_VALUE);
-		mapper.enable(DeserializationConfig.Feature.UNWRAP_ROOT_VALUE);
+		mapper.enable(SerializationFeature.WRAP_ROOT_VALUE);
+		mapper.enable(DeserializationFeature.UNWRAP_ROOT_VALUE);
 
 		// Convert source json string to object.
 		String json1 = SDNC_SERVICE_ERROR;
@@ -391,8 +392,8 @@ public class ObjectMappingTest {
 	public final void jsonToSDNCEvent() throws Exception {
 		logTest();
 		ObjectMapper mapper = new ObjectMapper();
-		mapper.enable(SerializationConfig.Feature.WRAP_ROOT_VALUE);
-		mapper.enable(DeserializationConfig.Feature.UNWRAP_ROOT_VALUE);
+		mapper.enable(SerializationFeature.WRAP_ROOT_VALUE);
+		mapper.enable(DeserializationFeature.UNWRAP_ROOT_VALUE);
 
 		String json = SDNC_EVENT;
 		json = json.replace(EOL + "((EVENT-PARAMS))", "," + EOL + "    \"params\": " + PARAMS + EOL);
@@ -410,8 +411,8 @@ public class ObjectMappingTest {
 	public final void jsonToSDNCEventWithoutOptionalFields() throws Exception {
 		logTest();
 		ObjectMapper mapper = new ObjectMapper();
-		mapper.enable(SerializationConfig.Feature.WRAP_ROOT_VALUE);
-		mapper.enable(DeserializationConfig.Feature.UNWRAP_ROOT_VALUE);
+		mapper.enable(SerializationFeature.WRAP_ROOT_VALUE);
+		mapper.enable(DeserializationFeature.UNWRAP_ROOT_VALUE);
 
 		// params are optional.
 		String json = SDNC_EVENT;
@@ -428,8 +429,8 @@ public class ObjectMappingTest {
 	public final void jsonFromSDNCEvent() throws Exception {
 		logTest();
 		ObjectMapper mapper = new ObjectMapper();
-		mapper.enable(SerializationConfig.Feature.WRAP_ROOT_VALUE);
-		mapper.enable(DeserializationConfig.Feature.UNWRAP_ROOT_VALUE);
+		mapper.enable(SerializationFeature.WRAP_ROOT_VALUE);
+		mapper.enable(DeserializationFeature.UNWRAP_ROOT_VALUE);
 
 		// Convert source json string to object.
 		String json1 = SDNC_EVENT;
diff --git a/adapters/mso-sdnc-adapter/src/test/resources/mso.sdnc.properties b/adapters/mso-sdnc-adapter/src/test/resources/mso.sdnc.properties
new file mode 100644
index 0000000000..f53e2d2b65
--- /dev/null
+++ b/adapters/mso-sdnc-adapter/src/test/resources/mso.sdnc.properties
@@ -0,0 +1,152 @@
+#MSO SDNCA Properties go here
+###
+### UNIQUE SDNCURLs for Requests supported by SDNCA. URLS have unique tags eg a format like sdncurlXY (XY is unique eg digits)
+###
+org.openecomp.mso.adapters.sdnc.sdncurl1=https://sdncodl.it.us.03.aic.cip.att.com:8443/restconf/operations/L3SDN-API:
+org.openecomp.mso.adapters.sdnc.sdncurl2=https://sdncodl.it.us.03.aic.cip.att.com:8443/restconf/config/L3SDN-API:
+org.openecomp.mso.adapters.sdnc.sdncurl3=https://sdncodl.it.us.03.aic.cip.att.com:8443/restconf/operations/AicHoming:
+org.openecomp.mso.adapters.sdnc.sdncurl4=https://sdncodl.it.us.03.aic.cip.att.com:8443/restconf/operations/Firewall-API:
+org.openecomp.mso.adapters.sdnc.sdncurl5=https://sdncodl.it.us.03.aic.cip.att.com:8443/restconf/config
+org.openecomp.mso.adapters.sdnc.sdncurl6=https://sdncodl.it.us.03.aic.cip.att.com:8443/restconf/operations/VNF-API:
+org.openecomp.mso.adapters.sdnc.sdncurl7=https://sdncodl.it.us.03.aic.cip.att.com:8443/restconf/operations/L3UCPE-API:
+org.openecomp.mso.adapters.sdnc.sdncurl8=https://sdncodl.it.us.03.aic.cip.att.com:8443/restconf/operations/NBNC-API:
+org.openecomp.mso.adapters.sdnc.sdncurl9=https://sdncodl.it.us.03.aic.cip.att.com:8443/restconf/operations/NORTHBOUND-API:service-topology-operation
+org.openecomp.mso.adapters.sdnc.sdncurl10=https://sdncodl.it.us.03.aic.cip.att.com:8443/restconf/operations/GENERIC-RESOURCE-API:
+org.openecomp.mso.adapters.sdnc.sdncurl11=https://sdncodl.it.us.03.aic.cip.att.com:8443/restconf/operations/VNFTOPOLOGYAIC-API:
+org.openecomp.mso.adapters.sdnc.sdncurl12=https://sdncodl.it.us.03.aic.cip.att.com:8443/
+org.openecomp.mso.adapters.sdnc.sdncurl13=http://mtznjv1fcbc01.kvm.cip.att.com:8181/restconf/operations/SDNW-API:
+#org.openecomp.mso.adapters.sdnc.sdncurl14=http://txcdtl01bb2697.itservices.sbc.com:8181/restconf/operations/GENERIC-RESOURCE-API:port-mirror-topology-operation
+org.openecomp.mso.adapters.sdnc.sdncurl14=http://mtanjv9sdbc51-eth1-0.aic.cip.att.com:8443/restconf/operations/GENERIC-RESOURCE-API:
+### BPEL ASYNC CALLBACK/NOTIFICATION URL
+###
+org.openecomp.mso.adapters.sdnc.bpelurl=http://mtanjv9mobp01-eth1-0.aic.cip.att.com:8080/mso/SDNCAdapterCallbackService
+org.openecomp.mso.adapters.sdnc.rest.bpelurl=http://mtanjv9mobp01-eth1-0.aic.cip.att.com:8080/mso/WorkflowMessage
+###
+### SDNC ASYNC NOTIFICATION/RESPONSE URL
+###
+org.openecomp.mso.adapters.sdnc.myurl=http://mtanjv9moja02-eth1-0.aic.cip.att.com:8080/adapters/rest/SDNCNotify
+### Production value diff from other servers
+org.openecomp.mso.adapters.sdnc.sdncauth=406B2AE613211B6FB52466DE6E1769AC
+org.openecomp.mso.adapters.sdnc.bpelauth=F8E9452B55DDE4CCE77547B0E748105C54CF5EF1351B4E2CBAABF2981EFE776D
+org.openecomp.mso.adapters.sdnc.sdncconnecttime=5000
+###
+### Distinct Requests Supported by SDNCA. sdncurls added on top of file. fields may be null eg msoaction,operation resulting in .. construct
+###
+###org.openecomp.mso.adapters.sdnc.MSOACTION.OPERATION.ACTION=METHOD|TIMEOUT|URL|HEADERNAME|NAMESPACE
+### 
+org.openecomp.mso.adapters.sdnc..service-homing-operation.homing=POST|60000|sdncurl3|sdnc-homing-header|com:att:sdnctl:aicHoming
+org.openecomp.mso.adapters.sdnc.infra..query=GET|60000|sdncurl5|
+org.openecomp.mso.adapters.sdnc.mobility..query=GET|60000|sdncurl5|
+org.openecomp.mso.adapters.sdnc.vfmodule..query=GET|60000|sdncurl12|
+org.openecomp.mso.adapters.sdnc...query=GET|60000|sdncurl2|
+org.openecomp.mso.adapters.sdnc...put=PUT|60000|sdncurl5|
+org.openecomp.mso.adapters.sdnc...restdelete=DELETE|60000|sdncurl5|
+org.openecomp.mso.adapters.sdnc.gammainternet.svc-topology-operation.assign=POST|60000|sdncurl1|sdnc-request-header|com:att:sdnctl:l3api
+org.openecomp.mso.adapters.sdnc.gammainternet.svc-topology-operation.delete=POST|250000|sdncurl1|sdnc-request-header|com:att:sdnctl:l3api
+org.openecomp.mso.adapters.sdnc.gammainternet.service-configuration-operation.reserve=POST|60000|sdncurl1|sdnc-request-header|com:att:sdnctl:l3api
+org.openecomp.mso.adapters.sdnc.gammainternet.service-configuration-operation.activate=POST|90000|sdncurl1|sdnc-request-header|com:att:sdnctl:l3api
+org.openecomp.mso.adapters.sdnc.gammainternet.service-configuration-operation.delete=POST|250000|sdncurl1|sdnc-request-header|com:att:sdnctl:l3api
+org.openecomp.mso.adapters.sdnc.gammainternet.service-configuration-operation.turnup=POST|60000|sdncurl1|sdnc-request-header|com:att:sdnctl:l3api
+org.openecomp.mso.adapters.sdnc.gammainternet.service-configuration-operation.changereserve=POST|60000|sdncurl1|sdnc-request-header|com:att:sdnctl:l3api
+org.openecomp.mso.adapters.sdnc.gammainternet.service-configuration-operation.changedelete=POST|250000|sdncurl1|sdnc-request-header|com:att:sdnctl:l3api
+org.openecomp.mso.adapters.sdnc.gammainternet.service-configuration-operation.changeactivate=POST|60000|sdncurl1|sdnc-request-header|com:att:sdnctl:l3api
+org.openecomp.mso.adapters.sdnc..feature-configuration-operation.activate=POST|60000|sdncurl4|sdnc-feature-request-header|com:att:sdnctl:firewallapi
+org.openecomp.mso.adapters.sdnc..feature-configuration-operation.changeactivate=POST|60000|sdncurl4|sdnc-feature-request-header|com:att:sdnctl:firewallapi
+org.openecomp.mso.adapters.sdnc..feature-configuration-operation.delete=POST|60000|sdncurl4|sdnc-feature-request-header|com:att:sdnctl:firewallapi
+org.openecomp.mso.adapters.sdnc..vnf-topology-operation.assign=POST|270000|sdncurl6|sdnc-request-header|org:openecomp:sdnctl:vnf
+org.openecomp.mso.adapters.sdnc..vnf-topology-operation.activate=POST|270000|sdncurl6|sdnc-request-header|org:openecomp:sdnctl:vnf
+org.openecomp.mso.adapters.sdnc..vnf-topology-operation.rollback=POST|270000|sdncurl6|sdnc-request-header|org:openecomp:sdnctl:vnf
+org.openecomp.mso.adapters.sdnc..vnf-topology-operation.delete=POST|270000|sdncurl6|sdnc-request-header|org:openecomp:sdnctl:vnf
+org.openecomp.mso.adapters.sdnc..vnf-topology-operation.changeassign=POST|270000|sdncurl6|sdnc-request-header|org:openecomp:sdnctl:vnf
+org.openecomp.mso.adapters.sdnc..vnf-topology-operation.changedelete=POST|270000|sdncurl6|sdnc-request-header|org:openecomp:sdnctl:vnf
+org.openecomp.mso.adapters.sdnc..network-topology-operation.reserve=POST|270000|sdncurl6|sdnc-request-header|org:openecomp:sdnctl:vnf
+org.openecomp.mso.adapters.sdnc..network-topology-operation.assign=POST|270000|sdncurl6|sdnc-request-header|org:openecomp:sdnctl:vnf
+org.openecomp.mso.adapters.sdnc..network-topology-operation.activate=POST|270000|sdncurl6|sdnc-request-header|org:openecomp:sdnctl:vnf
+org.openecomp.mso.adapters.sdnc..network-topology-operation.rollback=POST|270000|sdncurl6|sdnc-request-header|org:openecomp:sdnctl:vnf
+org.openecomp.mso.adapters.sdnc..network-topology-operation.delete=POST|270000|sdncurl6|sdnc-request-header|org:openecomp:sdnctl:vnf
+org.openecomp.mso.adapters.sdnc..network-topology-operation.changeassign=POST|270000|sdncurl6|sdnc-request-header|org:openecomp:sdnctl:vnf
+org.openecomp.mso.adapters.sdnc..network-topology-operation.changedelete=POST|270000|sdncurl6|sdnc-request-header|org:openecomp:sdnctl:vnf
+org.openecomp.mso.adapters.sdnc.ucpe.service-configuration-operation.prepare=POST|360000|sdncurl7|sdnc-request-header|com:att:sdnctl:l3ucpe
+org.openecomp.mso.adapters.sdnc.ucpe.service-configuration-operation.activate=POST|60000|sdncurl7|sdnc-request-header|com:att:sdnctl:l3ucpe
+org.openecomp.mso.adapters.sdnc.ucpe.service-configuration-operation.delete=POST|360000|sdncurl7|sdnc-request-header|com:att:sdnctl:l3ucpe
+org.openecomp.mso.adapters.sdnc.ucpe.service-configuration-operation.complete=POST|60000|sdncurl7|sdnc-request-header|com:att:sdnctl:l3ucpe
+org.openecomp.mso.adapters.sdnc.ucpe.service-configuration-operation.activatevnf=POST|600000|sdncurl7|sdnc-request-header|com:att:sdnctl:l3ucpe
+org.openecomp.mso.adapters.sdnc.ucpe.service-configuration-operation.designvnf=POST|60000|sdncurl7|sdnc-request-header|com:att:sdnctl:l3ucpe
+org.openecomp.mso.adapters.sdnc.ucpe.service-configuration-operation.removevnf=POST|60000|sdncurl7|sdnc-request-header|com:att:sdnctl:l3ucpe
+org.openecomp.mso.adapters.sdnc..svc-topology-operation.assign=POST|285000|sdncurl8|sdnc-request-header|com:att:sdnctl:nbncapi
+org.openecomp.mso.adapters.sdnc..svc-topology-operation.activate=POST|285000|sdncurl8|sdnc-request-header|com:att:sdnctl:nbncapi
+org.openecomp.mso.adapters.sdnc..svc-topology-operation.delete=POST|285000|sdncurl8|sdnc-request-header|com:att:sdnctl:nbncapi
+
+org.openecomp.mso.adapters.sdnc.service.ucpe.service-topology-assign-operation=POST|120000|sdncurl9|sdnc-request-header|com:att:sdnctl:northbound-api:v1
+org.openecomp.mso.adapters.sdnc.service.ucpe.service-topology-activate-operation=POST|90000|sdncurl9|sdnc-request-header|com:att:sdnctl:northbound-api:v1
+org.openecomp.mso.adapters.sdnc.service.ucpe-vnf.service-topology-cust-assign-operation=POST|90000|sdncurl9|sdnc-request-header|com:att:sdnctl:northbound-api:v1
+org.openecomp.mso.adapters.sdnc.service.ucpe-vnf.service-topology-cust-stage-operation=POST|90000|sdncurl9|sdnc-request-header|com:att:sdnctl:northbound-api:v1
+org.openecomp.mso.adapters.sdnc.service.ucpe-vnf.service-topology-cust-activate-operation=POST|90000|sdncurl9|sdnc-request-header|com:att:sdnctl:northbound-api:v1
+org.openecomp.mso.adapters.sdnc.service.ucpe-vnf.service-topology-cust-remove-operation=POST|90000|sdncurl9|sdnc-request-header|com:att:sdnctl:northbound-api:v1
+org.openecomp.mso.adapters.sdnc.service.dhv.service-topology-assign-operation=POST|120000|sdncurl9|sdnc-request-header|com:att:sdnctl:northbound-api:v1
+org.openecomp.mso.adapters.sdnc.service.infra.service-topology-infra-assign-operation=POST|120000|sdncurl9|sdnc-request-header|com:att:sdnctl:northbound-api:v1
+org.openecomp.mso.adapters.sdnc.service.infra.service-topology-infra-activate-operation=POST|90000|sdncurl9|sdnc-request-header|com:att:sdnctl:northbound-api:v1
+org.openecomp.mso.adapters.sdnc.service.vhnportal.service-topology-cust-assign-operation=POST|90000|sdncurl9|sdnc-request-header|com:att:sdnctl:northbound-api:v1
+org.openecomp.mso.adapters.sdnc.service.vhnportal.service-topology-cust-activate-operation=POST|90000|sdncurl9|sdnc-request-header|com:att:sdnctl:northbound-api:v1
+org.openecomp.mso.adapters.sdnc.service.vhngw.service-topology-cust-assign-operation=POST|90000|sdncurl9|sdnc-request-header|com:att:sdnctl:northbound-api:v1
+org.openecomp.mso.adapters.sdnc.service.vhngw.service-topology-infra-register-vnf-operation=POST|90000|sdncurl9|sdnc-request-header|com:att:sdnctl:northbound-api:v1
+org.openecomp.mso.adapters.sdnc.service.vhngw.service-topology-cust-activate-operation=POST|90000|sdncurl9|sdnc-request-header|com:att:sdnctl:northbound-api:v1
+org.openecomp.mso.adapters.sdnc.service.vvig.service-topology-cust-assign-operation=POST|90000|sdncurl9|sdnc-request-header|com:att:sdnctl:northbound-api:v1
+org.openecomp.mso.adapters.sdnc.service.vvig.service-topology-cust-activate-operation=POST|90000|sdncurl9|sdnc-request-header|com:att:sdnctl:northbound-api:v1
+org.openecomp.mso.adapters.sdnc.service.pe.service-topology-cust-assign-operation=POST|90000|sdncurl9|sdnc-request-header|com:att:sdnctl:northbound-api:v1
+org.openecomp.mso.adapters.sdnc.service.pe.service-topology-cust-stage-operation=POST|90000|sdncurl9|sdnc-request-header|com:att:sdnctl:northbound-api:v1
+org.openecomp.mso.adapters.sdnc.service.pe.service-topology-cust-activate-operation=POST|90000|sdncurl9|sdnc-request-header|com:att:sdnctl:northbound-api:v1
+
+org.openecomp.mso.adapters.sdnc..service-topology-operation.assign=POST|270000|sdncurl10|sdnc-request-header|com:att:sdnctl:generic-resource
+org.openecomp.mso.adapters.sdnc..service-topology-operation.rollback=POST|270000|sdncur10|sdnc-request-header|com:att:sdnctl:generic-resource
+org.openecomp.mso.adapters.sdnc..service-topology-operation.delete=POST|270000|sdncurl10|sdnc-request-header|com:att:sdnctl:generic-resource
+org.openecomp.mso.adapters.sdnc..service-topology-operation.deactivate=POST|270000|sdncurl10|sdnc-request-header|com:att:sdnctl:generic-resource
+org.openecomp.mso.adapters.sdnc.generic-resource.network-topology-operation.assign=POST|270000|sdncurl10|sdnc-request-header|com:att:sdnctl:generic-resource
+org.openecomp.mso.adapters.sdnc.generic-resource.network-topology-operation.unassign=POST|270000|sdncurl10|sdnc-request-header|com:att:sdnctl:generic-resource
+org.openecomp.mso.adapters.sdnc.generic-resource.network-topology-operation.activate=POST|270000|sdncurl10|sdnc-request-header|com:att:sdnctl:generic-resource
+org.openecomp.mso.adapters.sdnc.generic-resource.network-topology-operation.deactivate=POST|270000|sdncurl10|sdnc-request-header|com:att:sdnctl:generic-resource
+org.openecomp.mso.adapters.sdnc.generic-resource.vnf-topology-operation.assign=POST|270000|sdncurl10|sdnc-request-header|com:att:sdnctl:generic-resource
+org.openecomp.mso.adapters.sdnc.generic-resource.vnf-topology-operation.activate=POST|270000|sdncurl10|sdnc-request-header|com:att:sdnctl:generic-resource
+org.openecomp.mso.adapters.sdnc.generic-resource.vnf-topology-operation.unassign=POST|270000|sdncurl10|sdnc-request-header|com:att:sdnctl:generic-resource
+org.openecomp.mso.adapters.sdnc.generic-resource.vnf-topology-operation.deactivate=POST|270000|sdncurl10|sdnc-request-header|com:att:sdnctl:generic-resource
+org.openecomp.mso.adapters.sdnc.generic-resource.vnf-topology-operation.rollback=POST|270000|sdncurl10|sdnc-request-header|com:att:sdnctl:generic-resource
+org.openecomp.mso.adapters.sdnc.generic-resource.vnf-topology-operation.delete=POST|270000|sdncurl10|sdnc-request-header|com:att:sdnctl:generic-resource
+org.openecomp.mso.adapters.sdnc.generic-resource.vnf-topology-operation.changeassign=POST|270000|sdncurl10|sdnc-request-header|com:att:sdnctl:generic-resource
+org.openecomp.mso.adapters.sdnc.generic-resource.vnf-topology-operation.changedelete=POST|270000|sdncurl10|sdnc-request-header|com:att:sdnctl:generic-resource
+org.openecomp.mso.adapters.sdnc.generic-resource.vf-module-topology-operation.assign=POST|270000|sdncurl10|sdnc-request-header|com:att:sdnctl:generic-resource
+org.openecomp.mso.adapters.sdnc.generic-resource.vf-module-topology-operation.activate=POST|270000|sdncurl10|sdnc-request-header|com:att:sdnctl:generic-resource
+org.openecomp.mso.adapters.sdnc.generic-resource.vf-module-topology-operation.unassign=POST|270000|sdncurl10|sdnc-request-header|com:att:sdnctl:generic-resource
+org.openecomp.mso.adapters.sdnc.generic-resource.vf-module-topology-operation.deactivate=POST|270000|sdncurl10|sdnc-request-header|com:att:sdnctl:generic-resource
+org.openecomp.mso.adapters.sdnc.generic-resource.vf-module-topology-operation.rollback=POST|270000|sdncurl10|sdnc-request-header|com:att:sdnctl:generic-resource
+org.openecomp.mso.adapters.sdnc.generic-resource.vf-module-topology-operation.delete=POST|270000|sdncurl10|sdnc-request-header|com:att:sdnctl:generic-resource
+org.openecomp.mso.adapters.sdnc.generic-resource.vf-module-topology-operation.changeassign=POST|270000|sdncurl10|sdnc-request-header|com:att:sdnctl:generic-resource
+org.openecomp.mso.adapters.sdnc.generic-resource.vf-module-topology-operation.changedelete=POST|270000|sdncurl10|sdnc-request-header|com:att:sdnctl:generic-resource
+org.openecomp.mso.adapters.sdnc..contrail-route-topology-operation.assign=POST|270000|sdncurl10|sdnc-request-header|com:att:sdnctl:generic-resource
+org.openecomp.mso.adapters.sdnc..contrail-route-topology-operation.unassign=POST|270000|sdncurl10|sdnc-request-header|com:att:sdnctl:generic-resource
+org.openecomp.mso.adapters.sdnc..contrail-route-topology-operation.create=POST|270000|sdncurl10|sdnc-request-header|com:att:sdnctl:generic-resource
+org.openecomp.mso.adapters.sdnc..contrail-route-topology-operation.delete=POST|270000|sdncurl10|sdnc-request-header|com:att:sdnctl:generic-resource
+org.openecomp.mso.adapters.sdnc..contrail-route-topology-operation.activate=POST|270000|sdncurl10|sdnc-request-header|com:att:sdnctl:generic-resource
+org.openecomp.mso.adapters.sdnc..contrail-route-topology-operation.deactivate=POST|270000|sdncurl10|sdnc-request-header|com:att:sdnctl:generic-resource
+org.openecomp.mso.adapters.sdnc..security-zone-topology-operation.assign=POST|270000|sdncurl10|sdnc-request-header|com:att:sdnctl:generic-resource
+org.openecomp.mso.adapters.sdnc..security-zone-topology-operation.unassign=POST|270000|sdncurl10|sdnc-request-header|com:att:sdnctl:generic-resource
+org.openecomp.mso.adapters.sdnc..security-zone-topology-operation.create=POST|270000|sdncurl10|sdnc-request-header|com:att:sdnctl:generic-resource
+org.openecomp.mso.adapters.sdnc..security-zone-topology-operation.delete=POST|270000|sdncurl10|sdnc-request-header|com:att:sdnctl:generic-resource
+org.openecomp.mso.adapters.sdnc..security-zone-topology-operation.activate=POST|270000|sdncurl10|sdnc-request-header|com:att:sdnctl:generic-resource
+org.openecomp.mso.adapters.sdnc..security-zone-topology-operation.deactivate=POST|270000|sdncurl10|sdnc-request-header|com:att:sdnctl:generic-resource
+
+org.openecomp.mso.adapters.sdnc..vnf-topology-aic-operation.assign=POST|270000|sdncurl11|sdnc-request-header|com:att:sdnctl:vnftopologyaic
+org.openecomp.mso.adapters.sdnc..vnf-topology-aic-operation.activate=POST|270000|sdncurl11|sdnc-request-header|com:att:sdnctl:vnftopologyaic
+
+org.openecomp.mso.adapters.sdnc.TRANSPORT.service-topology-operation.assign=POST|270000|sdncurl13|sdnc-request-header|com:att:sdnctl:generic-resource
+org.openecomp.mso.adapters.sdnc.TRANSPORT.service-topology-operation.rollback=POST|270000|sdncur13|sdnc-request-header|com:att:sdnctl:generic-resource
+org.openecomp.mso.adapters.sdnc.TRANSPORT.service-topology-operation.delete=POST|270000|sdncurl13|sdnc-request-header|com:att:sdnctl:generic-resource
+org.openecomp.mso.adapters.sdnc.TRANSPORT.service-topology-operation.deactivate=POST|270000|sdncurl13|sdnc-request-header|com:att:sdnctl:generic-resource
+org.openecomp.mso.adapters.sdnc.TRANSPORT.service-topology-operation.activate=POST|270000|sdncurl13|sdnc-request-header|com:att:sdnctl:generic-resource
+
+org.openecomp.mso.adapters.sdnc..port-mirror-topology-operation.assign=POST|270000|sdncurl10|sdnc-request-header|com:att:sdnctl:generic-resource
+org.openecomp.mso.adapters.sdnc..port-mirror-topology-operation.activate=POST|270000|sdncurl10|sdnc-request-header|com:att:sdnctl:generic-resource
+org.openecomp.mso.adapters.sdnc..port-mirror-topology-operation.deactivate=POST|270000|sdncurl10|sdnc-request-header|com:att:sdnctl:generic-resource
+org.openecomp.mso.adapters.sdnc..port-mirror-topology-operation.enable=POST|270000|sdncurl10|sdnc-request-header|com:att:sdnctl:generic-resource
+org.openecomp.mso.adapters.sdnc..port-mirror-topology-operation.disable=POST|270000|sdncurl10|sdnc-request-header|com:att:sdnctl:generic-resource
+org.openecomp.mso.adapters.sdnc..port-mirror-topology-operation.delete=POST|270000|sdncurl10|sdnc-request-header|com:att:sdnctl:generic-resource
+
diff --git a/adapters/mso-sdnc-adapter/src/test/resources/sdnc_adapter_request.xml b/adapters/mso-sdnc-adapter/src/test/resources/sdnc_adapter_request.xml
new file mode 100644
index 0000000000..16a0399262
--- /dev/null
+++ b/adapters/mso-sdnc-adapter/src/test/resources/sdnc_adapter_request.xml
@@ -0,0 +1,48 @@
+<sdncadapterworkflow:SDNCAdapterWorkflowRequest
+	xmlns:ns5="http://org.openecomp/mso/request/types/v1"
+	xmlns:sdncadapterworkflow="http://org.openecomp/mso/workflow/schema/v1"
+	xmlns:sdncadapter="http://org.openecomp/workflow/sdnc/adapter/schema/v1">
+	<sdncadapter:RequestHeader>
+		<sdncadapter:RequestId>sdncRequestId-test</sdncadapter:RequestId>
+		<sdncadapter:SvcInstanceId>serviceInstanceId-test
+		</sdncadapter:SvcInstanceId>
+		<sdncadapter:SvcAction>assign</sdncadapter:SvcAction>
+		<sdncadapter:SvcOperation>service-topology-operation
+		</sdncadapter:SvcOperation>
+		<sdncadapter:CallbackUrl>callbackURL-test</sdncadapter:CallbackUrl>
+		<sdncadapter:MsoAction>msoAction-test</sdncadapter:MsoAction>
+	</sdncadapter:RequestHeader>
+	<sdncadapterworkflow:SDNCRequestData>
+		<request-information>
+			<request-id>requestId-test</request-id>
+			<source>MSO</source>
+			<notification-url />
+			<order-number />
+			<order-version />
+			<request-action>CreateServiceInstance</request-action>
+		</request-information>
+		<service-information>
+			<service-id>serviceId-test</service-id>
+			<subscription-service-type>subscriptionServiceType-test
+			</subscription-service-type>
+			<ecomp-model-information>
+				<model-invariant-uuid>modelInvariantUuid-test</model-invariant-uuid>
+				<model-uuid>modelUuid-test</model-uuid>
+				<model-version>modelVersion-test</model-version>
+				<model-name>modelName-test</model-name>
+			</ecomp-model-information>
+			<service-instance-id>serviceInstanceId-test</service-instance-id>
+			<subscriber-name />
+			<global-customer-id>globalSubscriberId-test</global-customer-id>
+		</service-information>
+		<service-request-input>
+			<service-instance-name>serviceInstanceName-test</service-instance-name>
+			<service-input-parameters>
+				<param>
+					<name>paramName</name>
+					<value>paramValue</value>
+				</param>
+			</service-input-parameters>
+		</service-request-input>
+	</sdncadapterworkflow:SDNCRequestData>
+</sdncadapterworkflow:SDNCAdapterWorkflowRequest>
\ No newline at end of file