X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=main%2Fsrc%2Ftest%2Fjava%2Forg%2Fonap%2Fpolicy%2Fapi%2Fmain%2Frest%2FTestApiRestServer.java;h=5896b3528604194aa5a9811e26938f655e2b7618;hb=c4cb758f37e353db3da474f9ae8199d139bcec55;hp=ae654c6c6cc987da294f805074203603a373e7d6;hpb=5f919673b13d8fd40a6a90b97f4e662ade068304;p=policy%2Fapi.git diff --git a/main/src/test/java/org/onap/policy/api/main/rest/TestApiRestServer.java b/main/src/test/java/org/onap/policy/api/main/rest/TestApiRestServer.java index ae654c6c..5896b352 100644 --- a/main/src/test/java/org/onap/policy/api/main/rest/TestApiRestServer.java +++ b/main/src/test/java/org/onap/policy/api/main/rest/TestApiRestServer.java @@ -2,8 +2,8 @@ * ============LICENSE_START======================================================= * Copyright (C) 2018 Samsung Electronics Co., Ltd. All rights reserved. * Copyright (C) 2019-2021 AT&T Intellectual Property. All rights reserved. - * Modifications Copyright (C) 2019-2020 Nordix Foundation. - * Modifications Copyright (C) 2020-2022 Bell Canada. All rights reserved. + * Modifications Copyright (C) 2019-2020, 2022-2023 Nordix Foundation. + * Modifications Copyright (C) 2020-2023 Bell Canada. 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. @@ -24,62 +24,47 @@ package org.onap.policy.api.main.rest; import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNull; - +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNull; + +import jakarta.ws.rs.client.Invocation; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.core.Response.Status; import java.io.File; import java.io.IOException; -import java.security.SecureRandom; import java.util.List; import java.util.Map; -import javax.net.ssl.SSLContext; -import javax.net.ssl.TrustManager; -import javax.ws.rs.client.Client; -import javax.ws.rs.client.ClientBuilder; -import javax.ws.rs.client.Entity; -import javax.ws.rs.client.Invocation; -import javax.ws.rs.client.WebTarget; -import javax.ws.rs.core.Response; -import javax.ws.rs.core.Response.Status; -import org.glassfish.jersey.client.ClientProperties; -import org.glassfish.jersey.client.authentication.HttpAuthenticationFeature; -import org.junit.BeforeClass; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Test; import org.onap.policy.api.main.PolicyApiApplication; -import org.onap.policy.common.endpoints.http.server.YamlMessageBodyHandler; +import org.onap.policy.api.main.rest.utils.CommonTestRestController; import org.onap.policy.common.endpoints.report.HealthCheckReport; -import org.onap.policy.common.gson.GsonMessageBodyHandler; import org.onap.policy.common.utils.coder.StandardCoder; -import org.onap.policy.common.utils.coder.StandardYamlCoder; import org.onap.policy.common.utils.network.NetworkUtil; import org.onap.policy.common.utils.resources.ResourceUtils; import org.onap.policy.common.utils.resources.TextFileUtils; import org.onap.policy.common.utils.security.SelfSignedKeyStore; import org.onap.policy.models.errors.concepts.ErrorResponse; import org.onap.policy.models.tosca.authorative.concepts.ToscaServiceTemplate; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.boot.web.server.LocalServerPort; +import org.springframework.boot.test.web.server.LocalServerPort; import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.annotation.DirtiesContext.ClassMode; import org.springframework.test.context.ActiveProfiles; import org.springframework.test.context.DynamicPropertyRegistry; import org.springframework.test.context.DynamicPropertySource; -import org.springframework.test.context.junit4.SpringRunner; /** * Class to perform unit test of {@link ApiRestController}. * * @author Chenfei Gao (cgao@research.att.com) */ -@RunWith(SpringRunner.class) @SpringBootTest(classes = PolicyApiApplication.class, webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT) -@ActiveProfiles("test") +@ActiveProfiles({ "test", "default" }) @DirtiesContext(classMode = ClassMode.AFTER_CLASS) -public class TestApiRestServer { +class TestApiRestServer extends CommonTestRestController { private static final String ALIVE = "alive"; private static final String SELF = NetworkUtil.getHostname(); @@ -88,7 +73,6 @@ public class TestApiRestServer { private static final String APP_YAML = "application/yaml"; private static final String HEALTHCHECK_ENDPOINT = "healthcheck"; - private static final String STATISTICS_ENDPOINT = "statistics"; private static final String OP_POLICY_NAME_VCPE = "operational.restart"; @@ -123,7 +107,10 @@ public class TestApiRestServer { private static final String POLICIES = "policies"; + private static final String TOSCA_POLICY_VER_RESOURCE = + "policytypes/onap.restart.tca.snapshot.yaml"; // @formatter:off + private static final String[] TOSCA_POLICY_RESOURCE_NAMES = {"policies/vCPE.policy.monitoring.input.tosca.json", "policies/vCPE.policy.monitoring.input.tosca.yaml", "policies/vDNS.policy.monitoring.input.tosca.json", "policies/vDNS.policy.monitoring.input.tosca.v2.yaml"}; @@ -134,6 +121,9 @@ public class TestApiRestServer { private static final String TOSCA_POLICYTYPE_OP_RESOURCE = "policytypes/onap.policies.controlloop.operational.Common.yaml"; + private static final String TOSCA_POLICYTYPE_VER_RESOURCE = + "policytypes/onap.policies.monitoring.cdap.tca.hi.lo.app.snapshot.yaml"; + private static final String[] TOSCA_POLICYTYPE_RESOURCE_NAMES = { "policytypes/onap.policies.monitoring.tcagen2.yaml", "policytypes/onap.policies.monitoring.dcaegen2.collectors.datafile.datafile-app-server.yaml", @@ -163,23 +153,19 @@ public class TestApiRestServer { // @formatter:on private static final StandardCoder standardCoder = new StandardCoder(); - private static StandardYamlCoder standardYamlCoder = new StandardYamlCoder(); private static SelfSignedKeyStore keystore; @LocalServerPort private int apiPort; - @Autowired - private ApiStatisticsManager mgr; - /** * Initializes parameters and set up test environment. * * @throws IOException on I/O exceptions * @throws InterruptedException if interrupted */ - @BeforeClass - public static void setupParameters() throws IOException, InterruptedException { + @BeforeAll + static void setupParameters() throws IOException, InterruptedException { keystore = new SelfSignedKeyStore(); } @@ -194,9 +180,14 @@ public class TestApiRestServer { } @Test - public void testCreatePolicyTypes() throws Exception { + void testSwagger() throws Exception { + super.testSwagger(apiPort); + } + + @Test + void testCreatePolicyTypes() throws Exception { for (String resrcName : TOSCA_POLICYTYPE_RESOURCE_NAMES) { - Response rawResponse = createResource(POLICYTYPES, resrcName); + Response rawResponse = createResource(POLICYTYPES, resrcName, apiPort); assertEquals(Response.Status.OK.getStatusCode(), rawResponse.getStatus()); ToscaServiceTemplate response = rawResponse.readEntity(ToscaServiceTemplate.class); assertNotNull(response); @@ -204,21 +195,21 @@ public class TestApiRestServer { } // Send a policy type with a null value to trigger an error - Response rawResponse = readResource(POLICYTYPES, APP_JSON); + Response rawResponse = readResource(POLICYTYPES, APP_JSON, apiPort); assertEquals(Response.Status.OK.getStatusCode(), rawResponse.getStatus()); ToscaServiceTemplate response = rawResponse.readEntity(ToscaServiceTemplate.class); String firstPolicyType = response.getPolicyTypes().keySet().iterator().next(); response.getPolicyTypes().put(firstPolicyType, null); - Response rawResponse2 = createResource(POLICYTYPES, standardCoder.encode(response)); + Response rawResponse2 = createResource(POLICYTYPES, standardCoder.encode(response), apiPort); assertEquals(Response.Status.NOT_FOUND.getStatusCode(), rawResponse2.getStatus()); ErrorResponse errorResponse = rawResponse2.readEntity(ErrorResponse.class); assertEquals("no policy types specified on service template", errorResponse.getErrorMessage()); } @Test - public void testCreatePolicies() throws Exception { + void testCreatePolicies() throws Exception { for (String resrcName : TOSCA_POLICY_RESOURCE_NAMES) { - Response rawResponse = createResource(POLICYTYPES_TCA_POLICIES, resrcName); + Response rawResponse = createResource(POLICYTYPES_TCA_POLICIES, resrcName, apiPort); assertEquals(Response.Status.OK.getStatusCode(), rawResponse.getStatus()); } @@ -232,7 +223,8 @@ public class TestApiRestServer { TextFileUtils.putStringAsTextFile(toscaPolicy, "src/test/resources/policies/BadTestPolicy.yaml"); Response rawResponse2 = - createResource(POLICYTYPES_TCA_POLICIES, "src/test/resources/policies/BadTestPolicy.yaml"); + createResource(POLICYTYPES_TCA_POLICIES, + "src/test/resources/policies/BadTestPolicy.yaml", apiPort); assertEquals(Response.Status.NOT_ACCEPTABLE.getStatusCode(), rawResponse2.getStatus()); ErrorResponse errorResponse = rawResponse2.readEntity(ErrorResponse.class); assertThat(errorResponse.getErrorMessage()) @@ -240,9 +232,9 @@ public class TestApiRestServer { } @Test - public void testSimpleCreatePolicies() throws Exception { + void testSimpleCreatePolicies() throws Exception { for (String resrcName : TOSCA_POLICIES_RESOURCE_NAMES) { - Response rawResponse = createResource(POLICIES, resrcName); + Response rawResponse = createResource(POLICIES, resrcName, apiPort); assertEquals(Response.Status.OK.getStatusCode(), rawResponse.getStatus()); } @@ -256,41 +248,51 @@ public class TestApiRestServer { toscaPolicy = toscaPolicy.replaceAll("onap.restart.tca", "onap.restart.tca.IDontExist"); TextFileUtils.putStringAsTextFile(toscaPolicy, "src/test/resources/policies/BadTestPolicy.yaml"); - Response rawResponse2 = createResource(POLICIES, "src/test/resources/policies/BadTestPolicy.yaml"); + Response rawResponse2 = + createResource(POLICIES, "src/test/resources/policies/BadTestPolicy.yaml", apiPort); ErrorResponse errorResponse = rawResponse2.readEntity(ErrorResponse.class); assertEquals(Response.Status.NOT_ACCEPTABLE.getStatusCode(), rawResponse2.getStatus()); assertThat(errorResponse.getErrorMessage()) .contains("item \"policy type\" value \"IDontExist:1.0.0\" INVALID, not found"); } + @Test + void testPoliciesVersioning() throws Exception { + var rawResponse = createResource(POLICYTYPES, TOSCA_POLICYTYPE_VER_RESOURCE, apiPort); + assertEquals(Response.Status.OK.getStatusCode(), rawResponse.getStatus()); + + rawResponse = createResource(POLICIES, TOSCA_POLICY_VER_RESOURCE, apiPort); + assertEquals(Response.Status.OK.getStatusCode(), rawResponse.getStatus()); + } + @SuppressWarnings("unchecked") @Test - public void testToscaCompliantOpDroolsPolicies() throws Exception { - Response rawResponse = createResource(POLICYTYPES, TOSCA_POLICYTYPE_OP_RESOURCE); + void testToscaCompliantOpDroolsPolicies() throws Exception { + Response rawResponse = createResource(POLICYTYPES, TOSCA_POLICYTYPE_OP_RESOURCE, apiPort); assertEquals(Response.Status.OK.getStatusCode(), rawResponse.getStatus()); - rawResponse = readResource(POLICYTYPES_DROOLS_VERSION, APP_JSON); + rawResponse = readResource(POLICYTYPES_DROOLS_VERSION, APP_JSON, apiPort); assertEquals(Response.Status.OK.getStatusCode(), rawResponse.getStatus()); - rawResponse = createResource(POLICIES, TOSCA_POLICY_OP_DROOLS_VCPE_RESOURSE_JSON); + rawResponse = createResource(POLICIES, TOSCA_POLICY_OP_DROOLS_VCPE_RESOURSE_JSON, apiPort); assertEquals(Response.Status.OK.getStatusCode(), rawResponse.getStatus()); - rawResponse = createResource(POLICIES, TOSCA_POLICY_OP_DROOLS_VCPE_RESOURSE_YAML); + rawResponse = createResource(POLICIES, TOSCA_POLICY_OP_DROOLS_VCPE_RESOURSE_YAML, apiPort); assertEquals(Response.Status.OK.getStatusCode(), rawResponse.getStatus()); - rawResponse = readResource(POLICYTYPES_DROOLS_POLICIES_VCPE_VERSION, APP_JSON); + rawResponse = readResource(POLICYTYPES_DROOLS_POLICIES_VCPE_VERSION, APP_JSON, apiPort); assertEquals(Response.Status.OK.getStatusCode(), rawResponse.getStatus()); - rawResponse = deleteResource(POLICYTYPES_DROOLS_POLICIES_VCPE_VERSION, APP_JSON); + rawResponse = deleteResource(POLICYTYPES_DROOLS_POLICIES_VCPE_VERSION, APP_JSON, apiPort); assertEquals(Response.Status.OK.getStatusCode(), rawResponse.getStatus()); - rawResponse = createResource(POLICIES, TOSCA_POLICY_OP_DROOLS_VCPE_RESOURSE_YAML); + rawResponse = createResource(POLICIES, TOSCA_POLICY_OP_DROOLS_VCPE_RESOURSE_YAML, apiPort); assertEquals(Response.Status.OK.getStatusCode(), rawResponse.getStatus()); - rawResponse = readResource(POLICYTYPES_DROOLS_POLICIES_VCPE_VERSION, APP_JSON); + rawResponse = readResource(POLICYTYPES_DROOLS_POLICIES_VCPE_VERSION, APP_JSON, apiPort); assertEquals(Response.Status.OK.getStatusCode(), rawResponse.getStatus()); - rawResponse = readResource(POLICYTYPES_DROOLS_POLICIES_VCPE_VERSION, APP_YAML); + rawResponse = readResource(POLICYTYPES_DROOLS_POLICIES_VCPE_VERSION, APP_YAML, apiPort); assertEquals(Response.Status.OK.getStatusCode(), rawResponse.getStatus()); ToscaServiceTemplate toscaVcpeSt = rawResponse.readEntity(ToscaServiceTemplate.class); @@ -311,170 +313,156 @@ public class TestApiRestServer { assertEquals("APPC", operation.get("actor")); assertEquals("Restart", operation.get("operation")); - rawResponse = deleteResource(POLICYTYPES_DROOLS_POLICIES_VCPE_VERSION, APP_JSON); + rawResponse = deleteResource(POLICYTYPES_DROOLS_POLICIES_VCPE_VERSION, APP_JSON, apiPort); assertEquals(Response.Status.OK.getStatusCode(), rawResponse.getStatus()); } @Test - public void testHealthCheckSuccessJson() throws Exception { + void testHealthCheckSuccessJson() throws Exception { testHealthCheckSuccess(APP_JSON); } @Test - public void testHealthCheckSuccessYaml() throws Exception { + void testHealthCheckSuccessYaml() throws Exception { testHealthCheckSuccess(APP_YAML); } private void testHealthCheckSuccess(String mediaType) throws Exception { - final Invocation.Builder invocationBuilder = sendHttpsRequest(HEALTHCHECK_ENDPOINT, mediaType); + final Invocation.Builder invocationBuilder = sendHttpsRequest( + HEALTHCHECK_ENDPOINT, mediaType, apiPort); final HealthCheckReport report = invocationBuilder.get(HealthCheckReport.class); validateHealthCheckReport(NAME, SELF, true, 200, ALIVE, report); } @Test - public void testApiStatistics_200_Json() throws Exception { - testApiStatistics_200(APP_JSON); - } - - @Test - public void testApiStatistics_200_Yaml() throws Exception { - testApiStatistics_200(APP_YAML); - } - - private void testApiStatistics_200(String mediaType) throws Exception { - Invocation.Builder invocationBuilder = sendHttpsRequest(STATISTICS_ENDPOINT, mediaType); - StatisticsReport report = invocationBuilder.get(StatisticsReport.class); - validateStatisticsReport(report, 200); - updateApiStatistics(); - invocationBuilder = sendHttpsRequest(STATISTICS_ENDPOINT, mediaType); - report = invocationBuilder.get(StatisticsReport.class); - validateStatisticsReport(report, 200); - // ApiStatisticsManager.resetAllStatistics(); - } - - @Test - public void testReadPolicyTypesJson() throws Exception { + void testReadPolicyTypesJson() throws Exception { testReadPolicyTypes(APP_JSON); } @Test - public void testReadPolicyTypesYaml() throws Exception { + void testReadPolicyTypesYaml() throws Exception { testReadPolicyTypes(APP_YAML); } private void testReadPolicyTypes(String mediaType) throws Exception { - Response rawResponse = readResource("policytypes/onap.policies.optimization.resource.HpaPolicy", mediaType); + Response rawResponse = + readResource("policytypes/onap.policies.optimization.resource.HpaPolicy", mediaType, + apiPort); assertEquals(Response.Status.OK.getStatusCode(), rawResponse.getStatus()); ToscaServiceTemplate namingServiceTemplate = rawResponse.readEntity(ToscaServiceTemplate.class); assertNotNull(namingServiceTemplate); assertEquals(3, namingServiceTemplate.getPolicyTypesAsMap().size()); assertEquals(5, namingServiceTemplate.getDataTypesAsMap().size()); - rawResponse = readResource(POLICYTYPES, mediaType); + rawResponse = readResource(POLICYTYPES, mediaType, apiPort); assertEquals(Response.Status.OK.getStatusCode(), rawResponse.getStatus()); ToscaServiceTemplate response = rawResponse.readEntity(ToscaServiceTemplate.class); assertFalse(response.getPolicyTypes().isEmpty()); - rawResponse = readResource(POLICYTYPES_TCA, mediaType); + rawResponse = readResource(POLICYTYPES_TCA, mediaType, apiPort); assertEquals(Response.Status.OK.getStatusCode(), rawResponse.getStatus()); - rawResponse = readResource(POLICYTYPES_TCA_VERSION, mediaType); + rawResponse = readResource(POLICYTYPES_TCA_VERSION, mediaType, apiPort); assertEquals(Response.Status.OK.getStatusCode(), rawResponse.getStatus()); - rawResponse = readResource(POLICYTYPES_TCA_LATEST, mediaType); + rawResponse = readResource(POLICYTYPES_TCA_LATEST, mediaType, apiPort); assertEquals(Response.Status.OK.getStatusCode(), rawResponse.getStatus()); - rawResponse = readResource(POLICYTYPES_COLLECTOR, mediaType); + rawResponse = readResource(POLICYTYPES_COLLECTOR, mediaType, apiPort); assertEquals(Response.Status.OK.getStatusCode(), rawResponse.getStatus()); - rawResponse = readResource(POLICYTYPES_COLLECTOR_VERSION, mediaType); + rawResponse = readResource(POLICYTYPES_COLLECTOR_VERSION, mediaType, apiPort); assertEquals(Response.Status.OK.getStatusCode(), rawResponse.getStatus()); - rawResponse = readResource(POLICYTYPES_COLLECTOR_LATEST, mediaType); + rawResponse = readResource(POLICYTYPES_COLLECTOR_LATEST, mediaType, apiPort); assertEquals(Response.Status.OK.getStatusCode(), rawResponse.getStatus()); - rawResponse = readResource(POLICYTYPES_DROOLS, mediaType); + rawResponse = readResource(POLICYTYPES_DROOLS, mediaType, apiPort); assertEquals(Response.Status.OK.getStatusCode(), rawResponse.getStatus()); - rawResponse = readResource(POLICYTYPES_DROOLS_VERSION, mediaType); + rawResponse = readResource(POLICYTYPES_DROOLS_VERSION, mediaType, apiPort); assertEquals(Response.Status.OK.getStatusCode(), rawResponse.getStatus()); - rawResponse = readResource(POLICYTYPES_DROOLS_VERSION_LATEST, mediaType); + rawResponse = readResource(POLICYTYPES_DROOLS_VERSION_LATEST, mediaType, apiPort); assertEquals(Response.Status.OK.getStatusCode(), rawResponse.getStatus()); - rawResponse = readResource(POLICYTYPES_NAMING_VERSION, mediaType); + rawResponse = readResource(POLICYTYPES_NAMING_VERSION, mediaType, apiPort); assertEquals(Response.Status.OK.getStatusCode(), rawResponse.getStatus()); } @Test - public void testDeletePolicyTypeJson() throws Exception { + void testDeletePolicyTypeJson() throws Exception { testDeletePolicyType(APP_JSON); } @Test - public void testDeletePolicyTypeYaml() throws Exception { + void testDeletePolicyTypeYaml() throws Exception { testDeletePolicyType(APP_YAML); } private void testDeletePolicyType(String mediaType) throws Exception { - Response rawResponse = deleteResource("policytypes/onap.policies.IDoNotExist/versions/1.0.0", mediaType); + Response rawResponse = deleteResource("policytypes/onap.policies.IDoNotExist/versions/1.0.0", + mediaType, apiPort); assertEquals(Response.Status.NOT_FOUND.getStatusCode(), rawResponse.getStatus()); - rawResponse = createResource(POLICYTYPES, "policytypes/onap.policies.Test.yaml"); + rawResponse = createResource(POLICYTYPES, "policytypes/onap.policies.Test.yaml", apiPort); assertEquals(Response.Status.OK.getStatusCode(), rawResponse.getStatus()); - rawResponse = readResource("policytypes/onap.policies.Test/versions/1.0.0", mediaType); + rawResponse = + readResource("policytypes/onap.policies.Test/versions/1.0.0", mediaType, apiPort); assertEquals(Response.Status.OK.getStatusCode(), rawResponse.getStatus()); - rawResponse = deleteResource("policytypes/onap.policies.Test/versions/1.0.0", mediaType); + rawResponse = + deleteResource("policytypes/onap.policies.Test/versions/1.0.0", mediaType, apiPort); assertEquals(Response.Status.OK.getStatusCode(), rawResponse.getStatus()); - rawResponse = readResource("policytypes/onap.policies.Test/versions/1.0.0", mediaType); + rawResponse = + readResource("policytypes/onap.policies.Test/versions/1.0.0", mediaType, apiPort); assertEquals(Response.Status.NOT_FOUND.getStatusCode(), rawResponse.getStatus()); } @Test - public void testReadPoliciesJson() throws Exception { + void testReadPoliciesJson() throws Exception { testReadPolicies(APP_JSON); } @Test - public void testReadPoliciesYaml() throws Exception { + void testReadPoliciesYaml() throws Exception { testReadPolicies(APP_YAML); } private void testReadPolicies(String mediaType) throws Exception { for (String resrcName : TOSCA_POLICY_RESOURCE_NAMES) { - Response rawResponse = createResource(POLICYTYPES_TCA_POLICIES, resrcName); + Response rawResponse = createResource(POLICYTYPES_TCA_POLICIES, resrcName, apiPort); assertEquals(Response.Status.OK.getStatusCode(), rawResponse.getStatus()); } - Response rawResponse = readResource(POLICYTYPES_TCA_POLICIES, mediaType); + Response rawResponse = readResource(POLICYTYPES_TCA_POLICIES, mediaType, apiPort); assertEquals(Response.Status.OK.getStatusCode(), rawResponse.getStatus()); - rawResponse = readResource(POLICYTYPES_TCA_POLICIES_VCPE, mediaType); + rawResponse = readResource(POLICYTYPES_TCA_POLICIES_VCPE, mediaType, apiPort); assertEquals(Response.Status.OK.getStatusCode(), rawResponse.getStatus()); - rawResponse = readResource(POLICYTYPES_TCA_POLICIES_VCPE_VERSION1, mediaType); + rawResponse = readResource(POLICYTYPES_TCA_POLICIES_VCPE_VERSION1, mediaType, apiPort); assertEquals(Response.Status.OK.getStatusCode(), rawResponse.getStatus()); - rawResponse = readResource(POLICYTYPES_TCA_POLICIES_VCPE_LATEST, mediaType); + rawResponse = readResource(POLICYTYPES_TCA_POLICIES_VCPE_LATEST, mediaType, apiPort); assertEquals(Response.Status.OK.getStatusCode(), rawResponse.getStatus()); - rawResponse = deleteResource(POLICYTYPES_TCA_POLICIES_VCPE_VERSION1, mediaType); + rawResponse = deleteResource(POLICYTYPES_TCA_POLICIES_VCPE_VERSION1, mediaType, apiPort); assertEquals(Response.Status.OK.getStatusCode(), rawResponse.getStatus()); } @Test - public void testNamingPolicyGet() throws Exception { + void testNamingPolicyGet() throws Exception { Response rawResponse = readResource("policytypes/onap.policies.Naming/versions/1.0.0/" - + "policies/SDNC_Policy.ONAP_NF_NAMING_TIMESTAMP/versions/1.0.0", APP_JSON); + + "policies/SDNC_Policy.ONAP_NF_NAMING_TIMESTAMP/versions/1.0.0", APP_JSON, apiPort); assertEquals(Response.Status.OK.getStatusCode(), rawResponse.getStatus()); rawResponse = readResource("policytypes/onap.policies.Naming/versions/1.0.0/" - + "policies/SDNC_Policy.ONAP_NF_NAMING_TIMESTAMP/versions/1.0.0?mode=referenced", APP_JSON); + + "policies/SDNC_Policy.ONAP_NF_NAMING_TIMESTAMP/versions/1.0.0?mode=referenced", APP_JSON, apiPort); assertEquals(Response.Status.OK.getStatusCode(), rawResponse.getStatus()); ToscaServiceTemplate namingServiceTemplate = rawResponse.readEntity(ToscaServiceTemplate.class); @@ -483,7 +471,7 @@ public class TestApiRestServer { assertEquals(3, namingServiceTemplate.getDataTypesAsMap().size()); rawResponse = readResource("policytypes/onap.policies.Naming/versions/1.0.0/" - + "policies/SDNC_Policy.ONAP_NF_NAMING_TIMESTAMP/versions/latest?mode=referenced", APP_JSON); + + "policies/SDNC_Policy.ONAP_NF_NAMING_TIMESTAMP/versions/latest?mode=referenced", APP_JSON, apiPort); assertEquals(Response.Status.OK.getStatusCode(), rawResponse.getStatus()); namingServiceTemplate = rawResponse.readEntity(ToscaServiceTemplate.class); @@ -491,8 +479,8 @@ public class TestApiRestServer { assertEquals(1, namingServiceTemplate.getPolicyTypesAsMap().size()); assertEquals(3, namingServiceTemplate.getDataTypesAsMap().size()); - rawResponse = - readResource("policytypes/onap.policies.Naming/versions/1.0.0/policies?mode=referenced", APP_JSON); + rawResponse = readResource("policytypes/onap.policies.Naming/versions/1.0.0/policies" + + "?mode=referenced", APP_JSON, apiPort); assertEquals(Response.Status.OK.getStatusCode(), rawResponse.getStatus()); namingServiceTemplate = rawResponse.readEntity(ToscaServiceTemplate.class); @@ -501,7 +489,7 @@ public class TestApiRestServer { assertEquals(3, namingServiceTemplate.getDataTypesAsMap().size()); rawResponse = readResource("policytypes/onap.policies.Naming/versions/1.0.0/" - + "policies/SDNC_Policy.ONAP_NF_NAMING_TIMESTAMP/versions/1.0.0", APP_JSON); + + "policies/SDNC_Policy.ONAP_NF_NAMING_TIMESTAMP/versions/1.0.0", APP_JSON, apiPort); assertEquals(Response.Status.OK.getStatusCode(), rawResponse.getStatus()); namingServiceTemplate = rawResponse.readEntity(ToscaServiceTemplate.class); @@ -511,7 +499,7 @@ public class TestApiRestServer { assertNull(namingServiceTemplate.getDataTypes()); rawResponse = readResource("policytypes/onap.policies.Naming/versions/1.0.0/" - + "policies/SDNC_Policy.ONAP_NF_NAMING_TIMESTAMP/versions/latest", APP_JSON); + + "policies/SDNC_Policy.ONAP_NF_NAMING_TIMESTAMP/versions/latest", APP_JSON, apiPort); assertEquals(Response.Status.OK.getStatusCode(), rawResponse.getStatus()); namingServiceTemplate = rawResponse.readEntity(ToscaServiceTemplate.class); @@ -519,7 +507,9 @@ public class TestApiRestServer { assertNull(namingServiceTemplate.getPolicyTypes()); assertNull(namingServiceTemplate.getDataTypes()); - rawResponse = readResource("policytypes/onap.policies.Naming/versions/1.0.0/policies", APP_JSON); + rawResponse = + readResource("policytypes/onap.policies.Naming/versions/1.0.0/policies", APP_JSON, + apiPort); assertEquals(Response.Status.OK.getStatusCode(), rawResponse.getStatus()); namingServiceTemplate = rawResponse.readEntity(ToscaServiceTemplate.class); @@ -529,268 +519,175 @@ public class TestApiRestServer { } @Test - public void testDeletePoliciesJson() throws Exception { + void testDeletePoliciesJson() throws Exception { testDeletePolicies(APP_JSON); } @Test - public void testDeletePoliciesYaml() throws Exception { + void testDeletePoliciesYaml() throws Exception { testDeletePolicies(APP_YAML); } private void testDeletePolicies(String mediaType) throws Exception { - Response rawResponse = deleteResource(POLICYTYPES_TCA_POLICIES_VCPE_VERSION1, mediaType); + Response rawResponse = deleteResource(POLICYTYPES_TCA_POLICIES_VCPE_VERSION1, mediaType, apiPort); assertEquals(Response.Status.NOT_FOUND.getStatusCode(), rawResponse.getStatus()); ErrorResponse error = rawResponse.readEntity(ErrorResponse.class); assertEquals("policy onap.restart.tca:1.0.0 not found", error.getErrorMessage()); } @Test - public void testDeletePolicyVersionJson() throws Exception { + void testDeletePolicyVersionJson() throws Exception { testDeletePolicyVersion(APP_JSON); } @Test - public void testDeletePolicyVersionYaml() throws Exception { + void testDeletePolicyVersionYaml() throws Exception { testDeletePolicyVersion(APP_YAML); } private void testDeletePolicyVersion(String mediaType) throws Exception { for (String resrcName : TOSCA_POLICYTYPE_RESOURCE_NAMES) { - Response rawResponse = createResource(POLICYTYPES, resrcName); + Response rawResponse = createResource(POLICYTYPES, resrcName, apiPort); assertEquals(Response.Status.OK.getStatusCode(), rawResponse.getStatus()); ToscaServiceTemplate response = rawResponse.readEntity(ToscaServiceTemplate.class); assertNotNull(response); assertFalse(response.getPolicyTypes().isEmpty()); } for (String resrcName : TOSCA_POLICY_RESOURCE_NAMES) { - Response rawResponse = createResource(POLICYTYPES_TCA_POLICIES, resrcName); + Response rawResponse = createResource(POLICYTYPES_TCA_POLICIES, resrcName, apiPort); assertEquals(Response.Status.OK.getStatusCode(), rawResponse.getStatus()); } - Response rawResponse = deleteResource(POLICYTYPES_TCA_POLICIES_VCPE_VERSION1, mediaType); + Response rawResponse = deleteResource(POLICYTYPES_TCA_POLICIES_VCPE_VERSION1, mediaType, apiPort); assertEquals(Response.Status.OK.getStatusCode(), rawResponse.getStatus()); - rawResponse = readResource(POLICYTYPES_TCA_POLICIES_VCPE_VERSION1, mediaType); + rawResponse = readResource(POLICYTYPES_TCA_POLICIES_VCPE_VERSION1, mediaType, apiPort); assertEquals(Response.Status.NOT_FOUND.getStatusCode(), rawResponse.getStatus()); ErrorResponse errorResponse = rawResponse.readEntity(ErrorResponse.class); assertEquals("policies for onap.restart.tca:1.0.0 do not exist", errorResponse.getErrorMessage()); - rawResponse = readResource(POLICYTYPES_TCA_POLICIES_VCPE, mediaType); + rawResponse = readResource(POLICYTYPES_TCA_POLICIES_VCPE, mediaType, apiPort); assertEquals(Response.Status.NOT_FOUND.getStatusCode(), rawResponse.getStatus()); errorResponse = rawResponse.readEntity(ErrorResponse.class); assertEquals("policies for onap.restart.tca:null do not exist", errorResponse.getErrorMessage()); - rawResponse = readResource(POLICYTYPES_TCA_POLICIES_VCPE_LATEST, mediaType); + rawResponse = readResource(POLICYTYPES_TCA_POLICIES_VCPE_LATEST, mediaType, apiPort); assertEquals(Response.Status.NOT_FOUND.getStatusCode(), rawResponse.getStatus()); errorResponse = rawResponse.readEntity(ErrorResponse.class); assertEquals("policies for onap.restart.tca:null do not exist", errorResponse.getErrorMessage()); } @Test - public void testGetAllVersionOfPolicyJson() throws Exception { + void testGetAllVersionOfPolicyJson() throws Exception { testGetAllVersionOfPolicy(APP_JSON); } @Test - public void testGetAllVersionOfPolicyYaml() throws Exception { + void testGetAllVersionOfPolicyYaml() throws Exception { testGetAllVersionOfPolicy(APP_YAML); } private void testGetAllVersionOfPolicy(String mediaType) throws Exception { for (String resrcName : TOSCA_POLICYTYPE_RESOURCE_NAMES) { - Response rawResponse = createResource(POLICYTYPES, resrcName); + Response rawResponse = createResource(POLICYTYPES, resrcName, apiPort); assertEquals(Response.Status.OK.getStatusCode(), rawResponse.getStatus()); ToscaServiceTemplate response = rawResponse.readEntity(ToscaServiceTemplate.class); assertNotNull(response); assertFalse(response.getPolicyTypes().isEmpty()); } for (String resrcName : TOSCA_POLICY_RESOURCE_NAMES) { - Response rawResponse = createResource(POLICYTYPES_TCA_POLICIES, resrcName); + Response rawResponse = createResource(POLICYTYPES_TCA_POLICIES, resrcName, apiPort); assertEquals(Response.Status.OK.getStatusCode(), rawResponse.getStatus()); } - Response rawResponse = readResource(POLICYTYPES_TCA_POLICIES, mediaType); + Response rawResponse = readResource(POLICYTYPES_TCA_POLICIES, mediaType, apiPort); assertEquals(Response.Status.OK.getStatusCode(), rawResponse.getStatus()); } @Test - public void testGetPoliciesJson() throws Exception { + void testGetPoliciesJson() throws Exception { getPolicies(APP_JSON); } @Test - public void testGetPoliciesYaml() throws Exception { + void testGetPoliciesYaml() throws Exception { getPolicies(APP_YAML); } private void getPolicies(String mediaType) throws Exception { for (String resrcName : TOSCA_POLICYTYPE_RESOURCE_NAMES) { - Response rawResponse = createResource(POLICYTYPES, resrcName); + Response rawResponse = createResource(POLICYTYPES, resrcName, apiPort); assertThat(rawResponse.getStatus()).isEqualTo(Response.Status.OK.getStatusCode()); ToscaServiceTemplate response = rawResponse.readEntity(ToscaServiceTemplate.class); assertThat(response).isNotNull(); assertThat(response.getPolicyTypes()).isNotEmpty(); } for (String resrcName : TOSCA_POLICY_RESOURCE_NAMES) { - Response rawResponse = createResource(POLICYTYPES_TCA_POLICIES, resrcName); + Response rawResponse = createResource(POLICYTYPES_TCA_POLICIES, resrcName, apiPort); assertThat(rawResponse.getStatus()).isEqualTo(Response.Status.OK.getStatusCode()); } - Response rawResponse = readResource(POLICIES, mediaType); + Response rawResponse = readResource(POLICIES, mediaType, apiPort); assertThat(rawResponse.getStatus()).isEqualTo(Response.Status.OK.getStatusCode()); ToscaServiceTemplate response = rawResponse.readEntity(ToscaServiceTemplate.class); assertThat(response.getToscaTopologyTemplate().getPolicies()).isNotEmpty(); } @Test - public void testGetSpecificPolicyJson() throws Exception { + void testGetSpecificPolicyJson() throws Exception { getSpecificPolicy(APP_JSON); } @Test - public void testGetSpecificPolicyYaml() throws Exception { + void testGetSpecificPolicyYaml() throws Exception { getSpecificPolicy(APP_YAML); } private void getSpecificPolicy(String mediaType) throws Exception { for (String resrcName : TOSCA_POLICYTYPE_RESOURCE_NAMES) { - Response rawResponse = createResource(POLICYTYPES, resrcName); + Response rawResponse = createResource(POLICYTYPES, resrcName, apiPort); assertThat(rawResponse.getStatus()).isEqualTo(Response.Status.OK.getStatusCode()); ToscaServiceTemplate response = rawResponse.readEntity(ToscaServiceTemplate.class); assertThat(response).isNotNull(); assertThat(response.getPolicyTypes()).isNotEmpty(); } for (String resrcName : TOSCA_POLICY_RESOURCE_NAMES) { - Response rawResponse = createResource(POLICYTYPES_TCA_POLICIES, resrcName); + Response rawResponse = createResource(POLICYTYPES_TCA_POLICIES, resrcName, apiPort); assertThat(rawResponse.getStatus()).isEqualTo(Response.Status.OK.getStatusCode()); } - Response rawResponse = readResource(POLICIES_VCPE_VERSION1, mediaType); + Response rawResponse = readResource(POLICIES_VCPE_VERSION1, mediaType, apiPort); assertThat(rawResponse.getStatus()).isEqualTo(Response.Status.OK.getStatusCode()); ToscaServiceTemplate response = rawResponse.readEntity(ToscaServiceTemplate.class); assertThat(response.getToscaTopologyTemplate().getPolicies()).hasSize(1); } @Test - public void testDeleteSpecificPolicy() throws Exception { + void testDeleteSpecificPolicy() throws Exception { Response rawResponse; for (String resrcName : TOSCA_POLICYTYPE_RESOURCE_NAMES) { - rawResponse = createResource(POLICYTYPES, resrcName); + rawResponse = createResource(POLICYTYPES, resrcName, apiPort); assertThat(rawResponse.getStatus()).isEqualTo(Response.Status.OK.getStatusCode()); ToscaServiceTemplate response = rawResponse.readEntity(ToscaServiceTemplate.class); assertThat(response).isNotNull(); assertThat(response.getPolicyTypes()).isNotEmpty(); } for (String resrcName : TOSCA_POLICY_RESOURCE_NAMES) { - rawResponse = createResource(POLICYTYPES_TCA_POLICIES, resrcName); + rawResponse = createResource(POLICYTYPES_TCA_POLICIES, resrcName, apiPort); assertThat(rawResponse.getStatus()).isEqualTo(Response.Status.OK.getStatusCode()); } - rawResponse = readResource(POLICIES_VCPE_VERSION1, APP_JSON); + rawResponse = readResource(POLICIES_VCPE_VERSION1, APP_JSON, apiPort); assertThat(rawResponse.getStatus()).isEqualTo(Response.Status.OK.getStatusCode()); // delete a particular policy - rawResponse = deleteResource(POLICIES_VCPE_VERSION1, APP_JSON); + rawResponse = deleteResource(POLICIES_VCPE_VERSION1, APP_JSON, apiPort); assertThat(rawResponse.getStatus()).isEqualTo(Response.Status.OK.getStatusCode()); - rawResponse = readResource(POLICIES_VCPE_VERSION1, APP_JSON); + rawResponse = readResource(POLICIES_VCPE_VERSION1, APP_JSON, apiPort); assertThat(rawResponse.getStatus()).isEqualTo(Status.NOT_FOUND.getStatusCode()); - rawResponse = deleteResource(POLICIES_VCPE_VERSION1, APP_JSON); + rawResponse = deleteResource(POLICIES_VCPE_VERSION1, APP_JSON, apiPort); assertThat(rawResponse.getStatus()).isEqualTo(Status.NOT_FOUND.getStatusCode()); } - - private Response createResource(String endpoint, String resourceName) throws Exception { - - String mediaType = APP_JSON; // default media type - ToscaServiceTemplate rawServiceTemplate = new ToscaServiceTemplate(); - if (resourceName.endsWith(".json")) { - rawServiceTemplate = - standardCoder.decode(ResourceUtils.getResourceAsString(resourceName), ToscaServiceTemplate.class); - } else if (resourceName.endsWith(".yaml") || resourceName.endsWith(".yml")) { - mediaType = APP_YAML; - rawServiceTemplate = standardYamlCoder.decode(ResourceUtils.getResourceAsString(resourceName), - ToscaServiceTemplate.class); - } - - final Invocation.Builder invocationBuilder; - - invocationBuilder = sendHttpsRequest(endpoint, mediaType); - - Entity entity = Entity.entity(rawServiceTemplate, mediaType); - return invocationBuilder.post(entity); - } - - private Response readResource(String endpoint, String mediaType) throws Exception { - - final Invocation.Builder invocationBuilder; - - invocationBuilder = sendHttpsRequest(endpoint, mediaType); - - return invocationBuilder.get(); - - } - - private Response deleteResource(String endpoint, String mediaType) throws Exception { - - final Invocation.Builder invocationBuilder; - - invocationBuilder = sendHttpsRequest(endpoint, mediaType); - - return invocationBuilder.delete(); - } - - private Invocation.Builder sendHttpsRequest(final String endpoint, String mediaType) throws Exception { - - final TrustManager[] noopTrustManager = NetworkUtil.getAlwaysTrustingManager(); - - final SSLContext sc = SSLContext.getInstance("TLSv1.2"); - sc.init(null, noopTrustManager, new SecureRandom()); - final ClientBuilder clientBuilder = - ClientBuilder.newBuilder().sslContext(sc).hostnameVerifier((host, session) -> true); - final Client client = clientBuilder.build(); - final HttpAuthenticationFeature feature = HttpAuthenticationFeature.basic("policyadmin", "zb!XztG34"); - client.register(feature); - - client.property(ClientProperties.METAINF_SERVICES_LOOKUP_DISABLE, "true"); - if (APP_JSON.equalsIgnoreCase(mediaType)) { - client.register(GsonMessageBodyHandler.class); - } else if (APP_YAML.equalsIgnoreCase(mediaType)) { - client.register(YamlMessageBodyHandler.class); - } - - final WebTarget webTarget = client.target("https://localhost:" + apiPort + "/policy/api/v1/" + endpoint); - - final Invocation.Builder invocationBuilder = webTarget.request(mediaType); - - if (!NetworkUtil.isTcpPortOpen("localhost", apiPort, 60, 1000L)) { - throw new IllegalStateException("cannot connect to port " + apiPort); - } - return invocationBuilder; - } - - private void updateApiStatistics() { - mgr.updateTotalApiCallCount(); - mgr.updateApiCallSuccessCount(); - mgr.updateApiCallFailureCount(); - mgr.updateTotalPolicyGetCount(); - mgr.updateTotalPolicyPostCount(); - mgr.updateTotalPolicyTypeGetCount(); - mgr.updateTotalPolicyTypePostCount(); - mgr.updatePolicyGetSuccessCount(); - mgr.updatePolicyGetFailureCount(); - mgr.updatePolicyPostSuccessCount(); - mgr.updatePolicyPostFailureCount(); - mgr.updatePolicyTypeGetSuccessCount(); - mgr.updatePolicyTypeGetFailureCount(); - mgr.updatePolicyTypePostSuccessCount(); - mgr.updatePolicyTypePostFailureCount(); - } - - private void validateStatisticsReport(final StatisticsReport report, final int code) { - - assertEquals(code, report.getCode()); - } - private void validateHealthCheckReport(final String name, final String url, final boolean healthy, final int code, final String message, final HealthCheckReport report) { @@ -800,4 +697,4 @@ public class TestApiRestServer { assertEquals(code, report.getCode()); assertEquals(message, report.getMessage()); } -} \ No newline at end of file +}