summaryrefslogtreecommitdiffstats
path: root/src/test/java/org
diff options
context:
space:
mode:
authorsebdet <sebastien.determe@intl.att.com>2019-10-08 17:53:08 +0200
committerSébastien Determe <sebastien.determe@intl.att.com>2019-10-08 16:41:30 +0000
commit74303b71e884cbaf6099031973d6c37e31c55bf3 (patch)
treec73a6112e2db01d7179a4803a6dd046dd4366f4a /src/test/java/org
parent0efeb6b141cb4abe84af8eb38e26d5ed1ab73bb0 (diff)
DCAE inventory calls in camel
Move the HTTP/HTTPS calls to camel so that there is no issue with the previous code that does not support the config required for HTTP4 Camel Issue-ID: CLAMP-532 Change-Id: I83db0da5bbe6906890d0d6aa9b529c264e5f9b20 Signed-off-by: sebdet <sebastien.determe@intl.att.com>
Diffstat (limited to 'src/test/java/org')
-rw-r--r--src/test/java/org/onap/clamp/clds/client/DcaeInventoryServicesTest.java125
-rw-r--r--src/test/java/org/onap/clamp/clds/it/HttpConnectionManagerItCase.java146
2 files changed, 0 insertions, 271 deletions
diff --git a/src/test/java/org/onap/clamp/clds/client/DcaeInventoryServicesTest.java b/src/test/java/org/onap/clamp/clds/client/DcaeInventoryServicesTest.java
deleted file mode 100644
index a66694cd6..000000000
--- a/src/test/java/org/onap/clamp/clds/client/DcaeInventoryServicesTest.java
+++ /dev/null
@@ -1,125 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP CLAMP
- * ================================================================================
- * Copyright (C) 2019 Huawei Technologies Co., Ltd.
- * ================================================================================
- * 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.clamp.clds.client;
-
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.core.Is.is;
-import static org.hamcrest.core.IsNull.nullValue;
-import static org.onap.clamp.clds.client.DcaeInventoryServices.DCAE_INVENTORY_RETRY_INTERVAL;
-import static org.onap.clamp.clds.client.DcaeInventoryServices.DCAE_INVENTORY_RETRY_LIMIT;
-import static org.onap.clamp.clds.client.DcaeInventoryServices.DCAE_INVENTORY_URL;
-import static org.powermock.api.mockito.PowerMockito.when;
-
-import java.io.IOException;
-
-import org.json.simple.parser.ParseException;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.runners.MockitoJUnitRunner;
-import org.onap.clamp.clds.config.ClampProperties;
-import org.onap.clamp.clds.model.dcae.DcaeInventoryResponse;
-import org.onap.clamp.clds.model.dcae.DcaeLinks;
-import org.onap.clamp.clds.model.dcae.DcaeOperationStatusResponse;
-import org.onap.clamp.util.HttpConnectionManager;
-
-
-@RunWith(MockitoJUnitRunner.class)
-public class DcaeInventoryServicesTest {
-
- @Mock
- private HttpConnectionManager httpConnectionManager;
-
- @Mock
- private ClampProperties properties;
-
- private static final String resourceUuid = "023a3f0d-1161-45ff-b4cf-8918a8ccf3ad";
- private static final String serviceUuid = "4cc5b45a-1f63-4194-8100-cd8e14248c92";
- private static final String artifactName = "tca_2.yaml";
- private static final String queryString = "?asdcResourceId=" + resourceUuid + "&asdcServiceId=" + serviceUuid
- + "&typeName=" + artifactName;
- private static final String url = "http://localhost:8085" + "/dcae-service-types" + queryString;
-
- @Test
- public void testDcaeInventoryResponse() throws ParseException, InterruptedException, IOException {
- when(properties.getStringValue(DCAE_INVENTORY_URL)).thenReturn("http://localhost:8085");
- when(properties.getStringValue(DCAE_INVENTORY_RETRY_LIMIT)).thenReturn("1");
- when(properties.getStringValue(DCAE_INVENTORY_RETRY_INTERVAL)).thenReturn("100");
- String responseStr = "{\"totalCount\":1, "
- + "\"items\":[{\"typeId\":\"typeId-32147723-d323-48f9-a325-bcea8d728025\","
- + " \"typeName\":\"typeName-32147723-d323-48f9-a325-bcea8d728025\"}]}";
- when(httpConnectionManager.doHttpRequest(url, "GET", null, null,
- "DCAE", null, null))
- .thenReturn(responseStr);
-
- DcaeInventoryServices services = new DcaeInventoryServices(properties,
- httpConnectionManager);
- DcaeInventoryResponse response = services.getDcaeInformation(artifactName, serviceUuid, resourceUuid);
- assertThat(response.getTypeId(),is("typeId-32147723-d323-48f9-a325-bcea8d728025"));
- assertThat(response.getTypeName(),is("typeName-32147723-d323-48f9-a325-bcea8d728025"));
- }
-
- @Test
- public void testDcaeInventoryResponseWithZeroCount() throws ParseException, InterruptedException, IOException {
- when(properties.getStringValue(DCAE_INVENTORY_URL)).thenReturn("http://localhost:8085");
- when(properties.getStringValue(DCAE_INVENTORY_RETRY_LIMIT)).thenReturn("1");
- when(properties.getStringValue(DCAE_INVENTORY_RETRY_INTERVAL)).thenReturn("100");
- when(httpConnectionManager.doHttpRequest(url, "GET", null, null,
- "DCAE", null, null))
- .thenReturn("{\"totalCount\":0}\"}]}");
- DcaeInventoryServices services = new DcaeInventoryServices(properties,
- httpConnectionManager);
- DcaeInventoryResponse response = services.getDcaeInformation(artifactName, serviceUuid, resourceUuid);
- assertThat(response, nullValue());
- }
-
- @Test
- public void testDcaeInventoryResponsePojo() {
- DcaeInventoryResponse response = new DcaeInventoryResponse();
- response.setTypeId("typeId-32147723-d323-48f9-a325-bcea8d728025");
- response.setTypeName("typeName-32147723-d323-48f9-a325-bcea8d728025");
- assertThat(response.getTypeId(),is("typeId-32147723-d323-48f9-a325-bcea8d728025"));
- assertThat(response.getTypeName(),is("typeName-32147723-d323-48f9-a325-bcea8d728025"));
- }
-
- @Test
- public void testDcaeOperationStatusResponsePojo() {
- DcaeLinks links = new DcaeLinks();
- links.setSelf("selfUrl");
- links.setStatus("state");
- links.setUninstall("uninstallUrl");
- DcaeOperationStatusResponse response = new DcaeOperationStatusResponse();
- response.setRequestId("testId");
- response.setError("errorMessage");
- response.setLinks(links);
- response.setOperationType("install");
- response.setStatus("state");
- assertThat(response.getRequestId(),is("testId"));
- assertThat(response.getError(),is("errorMessage"));
- assertThat(response.getOperationType(),is("install"));
- assertThat(response.getStatus(),is("state"));
- assertThat(response.getLinks().getSelf(),is("selfUrl"));
- assertThat(response.getLinks().getStatus(),is("state"));
- assertThat(response.getLinks().getUninstall(),is("uninstallUrl"));
- }
-} \ No newline at end of file
diff --git a/src/test/java/org/onap/clamp/clds/it/HttpConnectionManagerItCase.java b/src/test/java/org/onap/clamp/clds/it/HttpConnectionManagerItCase.java
deleted file mode 100644
index beb07504a..000000000
--- a/src/test/java/org/onap/clamp/clds/it/HttpConnectionManagerItCase.java
+++ /dev/null
@@ -1,146 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP CLAMP
- * ================================================================================
- * Copyright (C) 2017-2018 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============================================
- * Modifications copyright (c) 2018 Nokia
- * ===================================================================
- *
- */
-
-package org.onap.clamp.clds.it;
-
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
-
-import java.io.IOException;
-import java.security.KeyManagementException;
-import java.security.NoSuchAlgorithmException;
-import java.security.cert.CertificateException;
-import java.security.cert.X509Certificate;
-
-import javax.net.ssl.HostnameVerifier;
-import javax.net.ssl.HttpsURLConnection;
-import javax.net.ssl.SSLContext;
-import javax.net.ssl.SSLSession;
-import javax.net.ssl.TrustManager;
-import javax.net.ssl.X509TrustManager;
-import javax.ws.rs.BadRequestException;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.onap.clamp.util.HttpConnectionManager;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.boot.test.context.SpringBootTest.WebEnvironment;
-import org.springframework.test.context.TestPropertySource;
-import org.springframework.test.context.junit4.SpringRunner;
-
-/**
- * Test HTTP and HTTPS settings + redirection of HTTP to HTTPS.
- */
-@RunWith(SpringRunner.class)
-@SpringBootTest(webEnvironment = WebEnvironment.DEFINED_PORT)
-@TestPropertySource(locations = "classpath:https/https-test.properties")
-public class HttpConnectionManagerItCase {
-
- @Value("${server.port}")
- private String httpsPort;
- @Value("${server.http-to-https-redirection.port}")
- private String httpPort;
-
- @Autowired
- HttpConnectionManager httpConnectionManager;
-
- private static TrustManager[] trustAllCerts = new TrustManager[] { new X509TrustManager() {
-
- @Override
- public java.security.cert.X509Certificate[] getAcceptedIssuers() {
- return null;
- }
-
- @Override
- public void checkClientTrusted(X509Certificate[] arg0, String arg1) throws CertificateException {
- }
-
- @Override
- public void checkServerTrusted(X509Certificate[] arg0, String arg1) throws CertificateException {
- }
- } };
-
- private void enableSslNoCheck() throws NoSuchAlgorithmException, KeyManagementException {
- SSLContext sc = SSLContext.getInstance("SSL");
- sc.init(null, trustAllCerts, new java.security.SecureRandom());
- HttpsURLConnection.setDefaultSSLSocketFactory(sc.getSocketFactory());
- HostnameVerifier allHostsValid = new HostnameVerifier() {
-
- @Override
- public boolean verify(String hostname, SSLSession session) {
- return true;
- }
- };
- // set the allTrusting verifier
- HttpsURLConnection.setDefaultHostnameVerifier(allHostsValid);
- }
-
- @Before
- public void setupEnvBeforeTest() throws KeyManagementException, NoSuchAlgorithmException {
- enableSslNoCheck();
- }
-
- @Test
- public void testHttpGet() throws Exception {
- String response = httpConnectionManager.doHttpRequest("http://localhost:" + this.httpPort + "/swagger.html",
- "GET", null, null, "DCAE", null, null);
- assertNotNull(response);
- // Should be a redirection so 302, so empty
- assertTrue(response.isEmpty());
- }
-
- @Test
- public void testHttpsGet() throws Exception {
- String response = httpConnectionManager.doHttpRequest("https://localhost:" + this.httpsPort + "/swagger.html",
- "GET", null, null, "DCAE", null, null);
- assertNotNull(response);
- // Should contain something
- assertTrue(!response.isEmpty());
- }
-
- @Test(expected = BadRequestException.class)
- public void testHttpsGet404() throws IOException {
- httpConnectionManager.doHttpRequest("https://localhost:" + this.httpsPort + "/swaggerx.html", "GET", null, null,
- "DCAE", null, null);
- fail("Should have raised an BadRequestException");
- }
-
- @Test(expected = BadRequestException.class)
- public void testHttpsPost404() throws IOException {
- httpConnectionManager.doHttpRequest("https://localhost:" + this.httpsPort + "/swaggerx.html", "POST", "",
- "application/json", "DCAE", null, null);
- fail("Should have raised an BadRequestException");
- }
-
- @Test(expected = BadRequestException.class)
- public void testHttpException() throws IOException {
- httpConnectionManager.doHttpRequest("http://localhost:" + this.httpsPort + "/swagger.html", "GET", null, null,
- "DCAE", null, null);
- fail("Should have raised an BadRequestException");
- }
-}