From 38f720752af4d4aad8c4e467a288d9048659f688 Mon Sep 17 00:00:00 2001 From: Rob Daugherty Date: Wed, 14 Mar 2018 02:07:32 -0400 Subject: 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 --- .../mso-sdnc-adapter/WebContent/WEB-INF/web.xml | 4 + adapters/mso-sdnc-adapter/pom.xml | 2 +- .../sdnc/sdncrest/SDNCServiceRequestConnector.java | 9 +- .../sdnc/sdncrest/SDNCServiceRequestTask.java | 8 ++ .../mso/adapters/sdnc/impl/InvestigationTest.java | 114 ++++++++++++++++ .../adapters/sdnc/impl/RequestTunablesTest.java | 35 +++-- .../adapters/sdnc/sdncrest/ObjectMappingTest.java | 85 ++++++------ .../src/test/resources/mso.sdnc.properties | 152 +++++++++++++++++++++ .../src/test/resources/sdnc_adapter_request.xml | 48 +++++++ 9 files changed, 390 insertions(+), 67 deletions(-) create mode 100644 adapters/mso-sdnc-adapter/src/test/java/org/openecomp/mso/adapters/sdnc/impl/InvestigationTest.java create mode 100644 adapters/mso-sdnc-adapter/src/test/resources/mso.sdnc.properties create mode 100644 adapters/mso-sdnc-adapter/src/test/resources/sdnc_adapter_request.xml (limited to 'adapters/mso-sdnc-adapter') 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 @@ -25,6 +25,10 @@ resteasy.resources 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 + + resteasy.providers + org.openecomp.mso.adapters.providers.JettisonStyleMapperProvider + resteasy.servlet.mapping.prefix /rest 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 @@ 4.3.2.RELEASE - \ No newline at end of file + 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 + + sdncRequestId-test + serviceInstanceId-test + + assign + service-topology-operation + + callbackURL-test + msoAction-test + + + + requestId-test + MSO + + + + CreateServiceInstance + + + serviceId-test + subscriptionServiceType-test + + + modelInvariantUuid-test + modelUuid-test + modelVersion-test + modelName-test + + serviceInstanceId-test + + globalSubscriberId-test + + + serviceInstanceName-test + + + paramName + paramValue + + + + + \ No newline at end of file -- cgit 1.2.3-korg