diff options
Diffstat (limited to 'aai-service/provider/src')
8 files changed, 325 insertions, 157 deletions
diff --git a/aai-service/provider/src/main/java/org/onap/ccsdk/sli/adaptors/aai/AAIClientRESTExecutor.java b/aai-service/provider/src/main/java/org/onap/ccsdk/sli/adaptors/aai/AAIClientRESTExecutor.java index 906cd838..b6eacb7a 100755 --- a/aai-service/provider/src/main/java/org/onap/ccsdk/sli/adaptors/aai/AAIClientRESTExecutor.java +++ b/aai-service/provider/src/main/java/org/onap/ccsdk/sli/adaptors/aai/AAIClientRESTExecutor.java @@ -722,7 +722,7 @@ public class AAIClientRESTExecutor implements AAIExecutorInterface { } public void logMetricResponse(int responseCode, String responseDescription){ - ml.logResponse(responseCode < 400 ? "SUCCESS" : "FAILURE", Integer.toString(responseCode), responseDescription); + ml.logResponse(responseCode < 400 ? "COMPLETE" : "ERROR", Integer.toString(responseCode), responseDescription); } protected void LOGwriteFirstTrace(String method, String url) { diff --git a/aai-service/provider/src/main/java/org/onap/ccsdk/sli/adaptors/aai/AAIDeclarations.java b/aai-service/provider/src/main/java/org/onap/ccsdk/sli/adaptors/aai/AAIDeclarations.java index d1b148d5..1df3cce4 100755 --- a/aai-service/provider/src/main/java/org/onap/ccsdk/sli/adaptors/aai/AAIDeclarations.java +++ b/aai-service/provider/src/main/java/org/onap/ccsdk/sli/adaptors/aai/AAIDeclarations.java @@ -721,17 +721,6 @@ public abstract class AAIDeclarations implements AAIClient { if(!itemRemoved) return QueryStatus.NOT_FOUND; - -// AAIRequest masterRequest = new GenericVnfRequest(); -// masterRequest.addRequestProperty(GenericVnfRequest.VNF_ID, vnfId); -// relationshipRequest.addMasterRequest(masterRequest); -// Map<String, String> attributes = objectToProperties(vnf); -// try { -// Boolean result = getExecutor().delete(relationshipRequest, attributes.get(AAIRequest.RESOURCE_VERSION)); -// } catch (AAIServiceException e) { -// return QueryStatus.FAILURE; -// } - try { this.postGenericVnfData(vnf.getVnfId(), vnf); } catch (AAIServiceException exc) { diff --git a/aai-service/provider/src/main/java/org/onap/ccsdk/sli/adaptors/aai/AAIService.java b/aai-service/provider/src/main/java/org/onap/ccsdk/sli/adaptors/aai/AAIService.java index 9e6e60f9..1e2940ca 100755 --- a/aai-service/provider/src/main/java/org/onap/ccsdk/sli/adaptors/aai/AAIService.java +++ b/aai-service/provider/src/main/java/org/onap/ccsdk/sli/adaptors/aai/AAIService.java @@ -1344,7 +1344,7 @@ public class AAIService extends AAIDeclarations implements AAIClient, SvcLogicRe } public void logMetricResponse(String requestId, int responseCode, String responseDescription){ - ml.logResponse(responseCode < 400 ? "SUCCESS" : "FAILURE", Integer.toString(responseCode), responseDescription); + ml.logResponse(responseCode < 400 ? "COMPLETE" : "ERROR", Integer.toString(responseCode), responseDescription); } public void logKeyError(String keys){ diff --git a/aai-service/provider/src/main/java/org/onap/ccsdk/sli/adaptors/aai/GenericVnfRequest.java b/aai-service/provider/src/main/java/org/onap/ccsdk/sli/adaptors/aai/GenericVnfRequest.java deleted file mode 100644 index 7aabb8dc..00000000 --- a/aai-service/provider/src/main/java/org/onap/ccsdk/sli/adaptors/aai/GenericVnfRequest.java +++ /dev/null @@ -1,144 +0,0 @@ -/*- - * ============LICENSE_START======================================================= - * openECOMP : SDN-C - * ================================================================================ - * 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.onap.ccsdk.sli.adaptors.aai; - -import java.io.UnsupportedEncodingException; -import java.net.MalformedURLException; -import java.net.URL; -import java.util.Properties; - -import org.onap.ccsdk.sli.adaptors.aai.data.AAIDatum; -import org.openecomp.aai.inventory.v11.GenericVnf; - -import com.fasterxml.jackson.core.JsonProcessingException; -import com.fasterxml.jackson.databind.ObjectMapper; - -public class GenericVnfRequest extends AAIRequest { - - // tenant (1602) - public static final String GENERIC_VNF_PATH = "org.onap.ccsdk.sli.adaptors.aai.path.generic.vnf"; - public static final String GENERIC_VNF_QUERY_PATH = "org.onap.ccsdk.sli.adaptors.aai.path.generic.vnf.query"; - - private final String generic_vnf_path; - private final String generic_vnf_query_path; - - public static final String GENERIC_VNF_ID = "generic_vnf.vnf_id"; - public static final String VNF_ID = "vnf_id"; - - - public GenericVnfRequest() { - generic_vnf_path = configProperties.getProperty(GENERIC_VNF_PATH); - generic_vnf_query_path = configProperties.getProperty(GENERIC_VNF_QUERY_PATH); - } - - - @Override - public URL getRequestUrl(String method, String resourceVersion) throws UnsupportedEncodingException, MalformedURLException { - - String request_url = targetUri+generic_vnf_path; - String key = VNF_ID; - if(requestProperties.containsKey(GENERIC_VNF_ID)) { - key = GENERIC_VNF_ID; - } - - if(!requestProperties.containsKey(key)) { - aaiService.logKeyError(String.format("%s,%s", VNF_ID, GENERIC_VNF_ID)); - } - - String encoded_vnf = encodeQuery(requestProperties.getProperty(key)); - request_url = request_url.replace("{vnf-id}", encoded_vnf) ; - if(resourceVersion != null) { - request_url = request_url +"?resource-version="+resourceVersion; - } - URL http_req_url = new URL(request_url); - - aaiService.LOGwriteFirstTrace(method, http_req_url.toString()); - aaiService.LOGwriteDateTrace("vnf-id", requestProperties.getProperty(key)); - - return http_req_url; - } - - @Override - public URL getRequestQueryUrl(String method) throws UnsupportedEncodingException, MalformedURLException { - - String request_url = targetUri+generic_vnf_path; - - String key = VNF_ID; - if(requestProperties.containsKey(GENERIC_VNF_ID)) { - key = GENERIC_VNF_ID; - } - - if(!requestProperties.containsKey(key)) { - aaiService.logKeyError(String.format("%s,%s", VNF_ID, GENERIC_VNF_ID)); - } - - String encoded_vnf = encodeQuery(requestProperties.getProperty(key)); - request_url = request_url.replace("{vnf-id}", encoded_vnf) ; - URL http_req_url = new URL(request_url); - - aaiService.LOGwriteFirstTrace(method, http_req_url.toString()); - aaiService.LOGwriteDateTrace("vnf-id", requestProperties.getProperty(key)); - - return http_req_url; - } - - - @Override - public String toJSONString() { - ObjectMapper mapper = getObjectMapper(); - GenericVnf tenant = (GenericVnf)requestDatum; - String json_text = null; - try { - json_text = mapper.writeValueAsString(tenant); - } catch (JsonProcessingException exc) { - handleException(this, exc); - return null; - } - return json_text; - } - - - @Override - public String[] getArgsList() { - String[] args = {VNF_ID, GENERIC_VNF_ID}; - return args; - } - - - @Override - public Class<? extends AAIDatum> getModelClass() { - return GenericVnf.class; - } - - - public static String processPathData(String request_url, Properties requestProperties) throws UnsupportedEncodingException { - - String key = VNF_ID; - if(requestProperties.containsKey(GENERIC_VNF_ID)) { - key = GENERIC_VNF_ID; - } - String encoded_vnf = encodeQuery(requestProperties.getProperty(key)); - request_url = request_url.replace("{vnf-id}", encoded_vnf) ; - - return request_url; - } -} diff --git a/aai-service/provider/src/test/java/org/onap/ccsdk/sli/adaptors/aai/AAIClientRESTExecutorTest.java b/aai-service/provider/src/test/java/org/onap/ccsdk/sli/adaptors/aai/AAIClientRESTExecutorTest.java new file mode 100644 index 00000000..9905991a --- /dev/null +++ b/aai-service/provider/src/test/java/org/onap/ccsdk/sli/adaptors/aai/AAIClientRESTExecutorTest.java @@ -0,0 +1,117 @@ +package org.onap.ccsdk.sli.adaptors.aai; + +import java.util.HashMap; +import java.util.Map; +import java.util.Properties; + +import org.junit.BeforeClass; +import org.junit.Test; + +public class AAIClientRESTExecutorTest { + + private static AAIClientRESTExecutor aaiExecute; + @BeforeClass + public static void setUpBeforeClass() throws Exception { + Properties properties = new Properties(); + properties.setProperty("org.onap.ccsdk.sli.adaptors.aai.host.certificate.ignore", "true"); + properties.setProperty("org.onap.ccsdk.sli.adaptors.aai.client.name", "SDNC"); + properties.setProperty("org.onap.ccsdk.sli.adaptors.aai.client.psswd", "SDNC"); + properties.setProperty("org.onap.ccsdk.sli.adaptors.aai.application", "CCSDK"); + properties.setProperty("org.onap.ccsdk.sli.adaptors.aai.uri", "http://localhost:8181"); + properties.setProperty("connection.timeout", "60000"); + properties.setProperty("read.timeout", "60000"); + aaiExecute = new AAIClientRESTExecutor(properties); + + + } + + @Test + public void testGet() { + Map<String, String> nameValues = new HashMap<>(); + nameValues.put("generic-vnf.vnf-id", "vnf-001"); + AAIRequest request = AAIRequest.createRequest("generic-vnf", nameValues); + try { + aaiExecute.get(request); + } catch (AAIServiceException e) { + } + assert(true); + } + + @Test + public void testPost() { + Map<String, String> nameValues = new HashMap<>(); + nameValues.put("generic-vnf.vnf-id", "vnf-001"); + AAIRequest request = AAIRequest.createRequest("generic-vnf", nameValues); + try { + aaiExecute.get(request); + } catch (AAIServiceException e) { + } + assert(true); + } + + @Test + public void testDelete() { + Map<String, String> nameValues = new HashMap<>(); + nameValues.put("generic-vnf.vnf-id", "vnf-001"); + AAIRequest request = AAIRequest.createRequest("generic-vnf", nameValues); + try { + aaiExecute.get(request); + } catch (AAIServiceException e) { + } + assert(true); + } + + @Test + public void testQuery() { + Map<String, String> nameValues = new HashMap<>(); + nameValues.put("generic-vnf.vnf-id", "vnf-001"); + AAIRequest request = AAIRequest.createRequest("generic-vnf", nameValues); + try { + aaiExecute.get(request); + } catch (AAIServiceException e) { + } + assert(true); + } + + @Test + public void testPatch() { + Map<String, String> nameValues = new HashMap<>(); + nameValues.put("generic-vnf.vnf-id", "vnf-001"); + AAIRequest request = AAIRequest.createRequest("generic-vnf", nameValues); + try { + aaiExecute.patch(request, "1234567890"); + } catch (AAIServiceException e) { + } + assert(true); + } + + + + @Test + public void testLOGwriteFirstTrace() { + try { + aaiExecute.LOGwriteFirstTrace("GET", null); + } catch (Exception e) { + } + assert(true); + } + + @Test + public void testLOGwriteDateTrace() { + try { + aaiExecute.LOGwriteDateTrace("GET", "<----- test data ------>"); + } catch (Exception e) { + } + assert(true); + } + + @Test + public void testLOGwriteEndingTrace() { + try { + aaiExecute.LOGwriteEndingTrace(200, "GET", "<----- test data ------>"); + } catch (Exception e) { + } + assert(true); + } + +} diff --git a/aai-service/provider/src/test/java/org/onap/ccsdk/sli/adaptors/aai/AAIServiceProviderTest.java b/aai-service/provider/src/test/java/org/onap/ccsdk/sli/adaptors/aai/AAIServiceProviderTest.java new file mode 100644 index 00000000..bfe3738e --- /dev/null +++ b/aai-service/provider/src/test/java/org/onap/ccsdk/sli/adaptors/aai/AAIServiceProviderTest.java @@ -0,0 +1,31 @@ +package org.onap.ccsdk.sli.adaptors.aai; + +import org.junit.BeforeClass; +import org.junit.Test; + +public class AAIServiceProviderTest { + + private static AAIServiceProvider provider = null; + + @BeforeClass + public static void setUpBeforeClass() throws Exception { + } + + @Test + public void testAAIServiceProvider() { + provider = new AAIServiceProvider(); + } + + @Test + public void testGetProperties() { + provider.getProperties(); + assert(true); + } + + @Test + public void testDeterminePropertiesFile() { + provider.determinePropertiesFile(); + assert(true); + } + +} diff --git a/aai-service/provider/src/test/java/org/onap/ccsdk/sli/adaptors/aai/NamedQueryRequestTest.java b/aai-service/provider/src/test/java/org/onap/ccsdk/sli/adaptors/aai/NamedQueryRequestTest.java new file mode 100644 index 00000000..155945de --- /dev/null +++ b/aai-service/provider/src/test/java/org/onap/ccsdk/sli/adaptors/aai/NamedQueryRequestTest.java @@ -0,0 +1,88 @@ +package org.onap.ccsdk.sli.adaptors.aai; + +import static org.junit.Assert.*; + +import java.io.UnsupportedEncodingException; +import java.net.MalformedURLException; +import java.net.URISyntaxException; +import java.net.URL; + +import org.junit.AfterClass; +import org.junit.BeforeClass; +import org.junit.Test; +import org.onap.ccsdk.sli.adaptors.aai.data.AAIDatum; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +public class NamedQueryRequestTest { + + private static final Logger LOG = LoggerFactory.getLogger(NamedQueryRequestTest.class); + + private static AAIRequest request; + + @BeforeClass + public static void setUp() throws Exception { + + request = new NamedQueryRequest(); + LOG.info("\nEchoRequestTest.setUp\n"); + } + + @AfterClass + public static void tearDown() throws Exception { + request = null; + LOG.info("----------------------- EchoRequestTest.tearDown -----------------------"); + } + + @Test + public void runGetRequestUrlTest() { + LOG.info("----------------------- Test: " + new Object(){}.getClass().getEnclosingMethod().getName() + " -----------------------"); + + URL url; + try { + url = request.getRequestUrl("GET", null); + assertNotNull(url); + } catch (UnsupportedEncodingException | MalformedURLException | URISyntaxException exc) { + LOG.error("Failed test", exc); + } + + } + + @Test + public void runToJSONStringTest() { + LOG.info("----------------------- Test: " + new Object(){}.getClass().getEnclosingMethod().getName() + " -----------------------"); + + try { + String json = request.toJSONString(); + assertNotNull(json); + } catch (Exception exc) { + LOG.error("Failed test", exc); + } + + } + + @Test + public void runGetArgsListTest() { + LOG.info("----------------------- Test: " + new Object(){}.getClass().getEnclosingMethod().getName() + " -----------------------"); + + try { + String[] args = request.getArgsList(); + assertNotNull(args); + } catch (Exception exc) { + LOG.error("Failed test", exc); + } + + } + + @Test + public void runGetModelTest() { + LOG.info("----------------------- Test: " + new Object(){}.getClass().getEnclosingMethod().getName() + " -----------------------"); + + try { + Class<? extends AAIDatum> clazz = request.getModelClass(); + assertNotNull(clazz); + } catch (Exception exc) { + LOG.error("Failed test", exc); + } + + } +} diff --git a/aai-service/provider/src/test/java/org/onap/ccsdk/sli/adaptors/aai/NodesQueryRequestTest.java b/aai-service/provider/src/test/java/org/onap/ccsdk/sli/adaptors/aai/NodesQueryRequestTest.java new file mode 100644 index 00000000..17ae5220 --- /dev/null +++ b/aai-service/provider/src/test/java/org/onap/ccsdk/sli/adaptors/aai/NodesQueryRequestTest.java @@ -0,0 +1,87 @@ +package org.onap.ccsdk.sli.adaptors.aai; + +import static org.junit.Assert.assertNotNull; + +import java.net.URL; +import java.util.Properties; + +import org.junit.BeforeClass; +import org.junit.Test; +import org.onap.ccsdk.sli.adaptors.aai.data.AAIDatum; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +public class NodesQueryRequestTest { + + private static final Logger LOG = LoggerFactory.getLogger(NodesQueryRequestTest.class); + + private static AAIRequest request; + + @BeforeClass + public static void setUp() throws Exception { + Properties properties = new Properties(); + properties.setProperty("org.onap.ccsdk.sli.adaptors.aai.host.certificate.ignore", "true"); + properties.setProperty("org.onap.ccsdk.sli.adaptors.aai.client.name", "SDNC"); + properties.setProperty("org.onap.ccsdk.sli.adaptors.aai.client.psswd", "SDNC"); + properties.setProperty("org.onap.ccsdk.sli.adaptors.aai.application", "CCSDK"); + properties.setProperty("org.onap.ccsdk.sli.adaptors.aai.uri", "http://localhost:8181"); + properties.setProperty("connection.timeout", "60000"); + properties.setProperty("read.timeout", "60000"); + properties.setProperty("org.onap.ccsdk.sli.adaptors.aai.query.nodes","/aai/v11/search/nodes-query?search-node-type={node-type}&filter={entity-identifier}:EQUALS:{entity-name}"); + + AAIRequest.configProperties = properties; + request = new NodesQueryRequest(); + LOG.info("\nEchoRequestTest.setUp\n"); + } + + @Test + public void runGetRequestUrlTest() { + LOG.info("----------------------- Test: " + new Object(){}.getClass().getEnclosingMethod().getName() + " -----------------------"); + + try { + URL url = request.getRequestUrl("GET", null); + } catch (Exception exc) { + } + assert(true); + + } + + @Test + public void runToJSONStringTest() { + LOG.info("----------------------- Test: " + new Object(){}.getClass().getEnclosingMethod().getName() + " -----------------------"); + + try { + String json = request.toJSONString(); + assertNotNull(json); + } catch (Exception exc) { + LOG.error("Failed test", exc); + } + + } + + @Test + public void runGetArgsListTest() { + LOG.info("----------------------- Test: " + new Object(){}.getClass().getEnclosingMethod().getName() + " -----------------------"); + + try { + String[] args = request.getArgsList(); + assertNotNull(args); + } catch (Exception exc) { + LOG.error("Failed test", exc); + } + + } + + @Test + public void runGetModelTest() { + LOG.info("----------------------- Test: " + new Object(){}.getClass().getEnclosingMethod().getName() + " -----------------------"); + + try { + Class<? extends AAIDatum> clazz = request.getModelClass(); + assertNotNull(clazz); + } catch (Exception exc) { + LOG.error("Failed test", exc); + } + + } +} |