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=7780ea7d0570e86809a91034f6c709ed9c8fb99e;hb=f0d03b320e772df782a968411f269dc089d1f897;hp=3636d62557f154c53f3c1c8228d9bf9d6e5a865c;hpb=aff0352cc138a494ec105947d446a54d5fa035cf;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 3636d625..7780ea7d 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 @@ -1,8 +1,8 @@ /*- * ============LICENSE_START======================================================= * Copyright (C) 2018 Samsung Electronics Co., Ltd. All rights reserved. - * Copyright (C) 2019 AT&T Intellectual Property. All rights reserved. - * Modifications Copyright (C) 2019 Nordix Foundation. + * Copyright (C) 2019-2020 AT&T Intellectual Property. All rights reserved. + * Modifications Copyright (C) 2019-2020 Nordix Foundation. * ================================================================================ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -22,43 +22,43 @@ 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.assertTrue; -import static org.junit.Assert.fail; +import java.io.File; +import java.io.IOException; import java.lang.reflect.Constructor; import java.lang.reflect.Modifier; import java.security.SecureRandom; -import java.security.cert.X509Certificate; import java.util.Base64; import java.util.Collections; +import java.util.List; +import java.util.Map; import java.util.Properties; import javax.net.ssl.SSLContext; import javax.net.ssl.TrustManager; -import javax.net.ssl.X509TrustManager; 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 org.glassfish.jersey.client.ClientConfig; + import org.glassfish.jersey.client.ClientProperties; import org.glassfish.jersey.client.authentication.HttpAuthenticationFeature; -import org.junit.After; +import org.junit.AfterClass; +import org.junit.BeforeClass; import org.junit.Test; -import org.onap.policy.api.main.exception.PolicyApiException; import org.onap.policy.api.main.parameters.ApiParameterGroup; import org.onap.policy.api.main.parameters.CommonTestData; import org.onap.policy.api.main.rest.provider.PolicyProvider; import org.onap.policy.api.main.rest.provider.PolicyTypeProvider; import org.onap.policy.api.main.startstop.Main; -import org.onap.policy.common.endpoints.http.server.RestServer; import org.onap.policy.common.endpoints.http.server.YamlMessageBodyHandler; -import org.onap.policy.common.endpoints.parameters.RestServerParameters; import org.onap.policy.common.endpoints.report.HealthCheckReport; import org.onap.policy.common.gson.GsonMessageBodyHandler; import org.onap.policy.common.parameters.ParameterService; @@ -66,24 +66,20 @@ 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.models.base.PfModelException; import org.onap.policy.models.errors.concepts.ErrorResponse; import org.onap.policy.models.provider.PolicyModelsProviderParameters; import org.onap.policy.models.tosca.authorative.concepts.ToscaServiceTemplate; import org.onap.policy.models.tosca.legacy.concepts.LegacyGuardPolicyInput; import org.onap.policy.models.tosca.legacy.concepts.LegacyOperationalPolicy; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; /** - * Class to perform unit test of {@link ApiRestServer}. + * Class to perform unit test of {@link ApiRestController}. * * @author Chenfei Gao (cgao@research.att.com) */ public class TestApiRestServer { - - private static final Logger LOGGER = LoggerFactory.getLogger(TestApiRestServer.class); - private static final String NOT_ALIVE = "not alive"; private static final String ALIVE = "alive"; private static final String SELF = NetworkUtil.getHostname(); private static final String NAME = "Policy API"; @@ -93,6 +89,10 @@ public class TestApiRestServer { private static final String HEALTHCHECK_ENDPOINT = "healthcheck"; private static final String STATISTICS_ENDPOINT = "statistics"; + private static final String OP_POLICY_NAME_VCPE = "operational.restart"; + private static final String OP_POLICY_NAME_VDNS = "operational.scaleout"; + private static final String OP_POLICY_NAME_VFW = "operational.modifyconfig"; + private static final String POLICYTYPES = "policytypes"; private static final String POLICYTYPES_TCA = "policytypes/onap.policies.monitoring.cdap.tca.hi.lo.app"; private static final String POLICYTYPES_COLLECTOR = @@ -106,17 +106,29 @@ public class TestApiRestServer { private static final String POLICYTYPES_COLLECTOR_LATEST = "policytypes/onap.policies.monitoring.dcaegen2.collectors.datafile.datafile-app-server/versions/latest"; + private static final String POLICYTYPES_DROOLS = "policytypes/onap.policies.controlloop.operational.common.Drools"; + private static final String POLICYTYPES_DROOLS_VERSION = POLICYTYPES_DROOLS + "/versions/1.0.0"; + private static final String POLICYTYPES_DROOLS_VERSION_LATEST = POLICYTYPES_DROOLS + "/versions/latest"; + + private static final String POLICYTYPES_NAMING_VERSION = + POLICYTYPES + "/onap.policies.Naming/versions/1.0.0"; + private static final String POLICYTYPES_TCA_POLICIES = "policytypes/onap.policies.monitoring.cdap.tca.hi.lo.app/versions/1.0.0/policies"; private static final String POLICYTYPES_TCA_POLICIES_VCPE = "policytypes/onap.policies.monitoring.cdap.tca.hi.lo.app/versions/1.0.0/policies/onap.restart.tca"; - private static final String POLICYTYPES_TCA_POLICIES_VCPE_VERSION = "policytypes/" + private static final String POLICYTYPES_TCA_POLICIES_VCPE_VERSION1 = "policytypes/" + "onap.policies.monitoring.cdap.tca.hi.lo.app/versions/1.0.0/policies/onap.restart.tca/versions/1.0.0"; + private static final String POLICYTYPES_TCA_POLICIES_VCPE_VERSION2 = "policytypes/" + + "onap.policies.monitoring.cdap.tca.hi.lo.app/versions/1.0.0/policies/onap.restart.tca/versions/2.0.0"; private static final String POLICYTYPES_TCA_POLICIES_VCPE_LATEST = "policytypes/" + "onap.policies.monitoring.cdap.tca.hi.lo.app/versions/1.0.0/policies/onap.restart.tca/versions/latest"; private static final String POLICYTYPES_TCA_POLICIES_VCPE_DEPLOYED = "policytypes/" + "onap.policies.monitoring.cdap.tca.hi.lo.app/versions/1.0.0/policies/onap.restart.tca/versions/deployed"; + private static final String POLICYTYPES_DROOLS_POLICIES_VCPE_VERSION = + POLICYTYPES_DROOLS_VERSION + "/policies/" + OP_POLICY_NAME_VCPE + "/versions/1.0.0"; + private static final String GUARD_POLICIES = "policytypes/onap.policies.controlloop.Guard/versions/1.0.0/policies"; private static final String GUARD_POLICIES_VDNS_FL_LATEST = "policytypes/onap.policies.controlloop.Guard/versions/1.0.0/policies/guard.frequency.scaleout" @@ -135,53 +147,53 @@ public class TestApiRestServer { private static final String OPS_POLICIES = "policytypes/onap.policies.controlloop.Operational/versions/1.0.0/policies"; private static final String OPS_POLICIES_VCPE_LATEST = - "policytypes/onap.policies.controlloop.Operational/versions/1.0.0/policies/operational.restart" + "policytypes/onap.policies.controlloop.Operational/versions/1.0.0/policies/" + OP_POLICY_NAME_VCPE + "/versions/latest"; private static final String OPS_POLICIES_VCPE_DEPLOYED = - "policytypes/onap.policies.controlloop.Operational/versions/1.0.0/policies/operational.restart" + "policytypes/onap.policies.controlloop.Operational/versions/1.0.0/policies/" + OP_POLICY_NAME_VCPE + "/versions/deployed"; private static final String OPS_POLICIES_VDNS_LATEST = - "policytypes/onap.policies.controlloop.Operational/versions/1.0.0/policies/operational.scaleout" + "policytypes/onap.policies.controlloop.Operational/versions/1.0.0/policies/" + OP_POLICY_NAME_VDNS + "/versions/latest"; private static final String OPS_POLICIES_VFIREWALL_LATEST = - "policytypes/onap.policies.controlloop.Operational/versions/1.0.0/policies/operational.modifyconfig" + "policytypes/onap.policies.controlloop.Operational/versions/1.0.0/policies/" + OP_POLICY_NAME_VFW + "/versions/latest"; private static final String OPS_POLICIES_VCPE_VERSION = "policytypes/" - + "onap.policies.controlloop.Operational/versions/1.0.0/policies/operational.restart/versions/1"; + + "onap.policies.controlloop.Operational/versions/1.0.0/policies/" + OP_POLICY_NAME_VCPE + "/versions/1"; private static final String OPS_POLICIES_VDNS_VERSION = "policytypes/" - + "onap.policies.controlloop.Operational/versions/1.0.0/policies/operational.scaleout/versions/1"; + + "onap.policies.controlloop.Operational/versions/1.0.0/policies/" + OP_POLICY_NAME_VDNS + "/versions/1"; private static final String OPS_POLICIES_VFIREWALL_VERSION = "policytypes/" - + "onap.policies.controlloop.Operational/versions/1.0.0/policies/operational.modifyconfig/versions/1"; + + "onap.policies.controlloop.Operational/versions/1.0.0/policies/" + OP_POLICY_NAME_VFW + "/versions/1"; private static final String POLICIES = "policies"; private static final String KEYSTORE = System.getProperty("user.dir") + "/src/test/resources/ssl/policy-keystore"; - private static final CommonTestData COMMON_TEST_DATA = new CommonTestData(); - private Main main; - private RestServer restServer; - private StandardCoder standardCoder = new StandardCoder(); - private StandardYamlCoder standardYamlCoder = new StandardYamlCoder(); - private int port; // @formatter:off - private String[] toscaPolicyResourceNames = { + private static final String[] TOSCA_POLICY_RESOURCE_NAMES = { "policies/vCPE.policy.monitoring.input.tosca.json", - "policies/vCPE.policy.monitoring.input.tosca.yaml", + "policies/vCPE.policy.monitoring.input.tosca.v2.yaml", "policies/vDNS.policy.monitoring.input.tosca.json", - "policies/vDNS.policy.monitoring.input.tosca.yaml", - "policies/vFirewall.policy.monitoring.input.tosca.json", - "policies/vFirewall.policy.monitoring.input.tosca.yaml" + "policies/vDNS.policy.monitoring.input.tosca.v2.yaml" }; - private String[] toscaPoliciesResourceNames = { + private static final String[] TOSCA_POLICIES_RESOURCE_NAMES = { "policies/vCPE.policies.optimization.input.tosca.json", - "policies/vCPE.policies.optimization.input.tosca.yaml" + "policies/vCPE.policies.optimization.input.tosca.v2.yaml" }; - private String[] toscaPolicyTypeResourceNames = { + private static final String TOSCA_POLICYTYPE_OP_RESOURCE = + "policytypes/onap.policies.controlloop.operational.Common.yaml"; + + private static final String LEGACY_POLICYTYPE_OP_RESOURCE = + "policytypes/onap.policies.controlloop.Operational.yaml"; + + private static final String[] TOSCA_POLICYTYPE_RESOURCE_NAMES = { "policytypes/onap.policies.monitoring.cdap.tca.hi.lo.app.yaml", "policytypes/onap.policies.monitoring.dcaegen2.collectors.datafile.datafile-app-server.yaml", "policytypes/onap.policies.Optimization.yaml", - "policytypes/onap.policies.controlloop.Operational.yaml", + LEGACY_POLICYTYPE_OP_RESOURCE, + TOSCA_POLICYTYPE_OP_RESOURCE, + "policytypes/onap.policies.controlloop.operational.common.Drools.yaml", "policytypes/onap.policies.controlloop.guard.Blacklist.yaml", "policytypes/onap.policies.controlloop.guard.FrequencyLimiter.yaml", "policytypes/onap.policies.controlloop.guard.MinMax.yaml", @@ -197,15 +209,21 @@ public class TestApiRestServer { "policytypes/onap.policies.optimization.resource.VnfPolicy.yaml" }; - private String[] legacyGuardPolicyResourceNames = { + private static final String TOSCA_POLICY_OP_DROOLS_VCPE_RESOURSE_JSON = + "policies/vCPE.policy.operational.input.tosca.json"; + + private static final String TOSCA_POLICY_OP_DROOLS_VCPE_RESOURSE_YAML = + "policies/vCPE.policy.operational.input.tosca.yaml"; + + private static final String[] LEGACY_GUARD_POLICY_RESOURCE_NAMES = { "policies/vDNS.policy.guard.frequency.input.json", "policies/vDNS.policy.guard.minmax.input.json" }; - private String[] legacyOperationalPolicyResourceNames = { - "policies/vCPE.policy.operational.input.json", - "policies/vDNS.policy.operational.input.json", - "policies/vFirewall.policy.operational.input.json" + private static final String[] LEGACY_OPERATIONAL_POLICY_RESOURCE_NAMES = { + "policies/vCPE.policy.operational.legacy.input.json", + "policies/vDNS.policy.operational.legacy.input.json", + "policies/vFirewall.policy.operational.legacy.input.json" }; private static PolicyModelsProviderParameters providerParams; @@ -215,41 +233,60 @@ public class TestApiRestServer { // @formatter:on + private static final StandardCoder standardCoder = new StandardCoder(); + + private static int apiPort; + private static Main apiMain; + + private static StandardYamlCoder standardYamlCoder = new StandardYamlCoder(); + /** - * Initializes parameters. + * Initializes parameters and set up test environment. * * @throws PfModelException the PfModel parsing exception + * @throws IOException on I/O exceptions */ - private void setupParameters() throws PfModelException { - - standardCoder = new StandardCoder(); + @BeforeClass + public static void setupParameters() throws PfModelException, IOException { providerParams = new PolicyModelsProviderParameters(); + // H2, use "org.mariadb.jdbc.Driver" and "jdbc:mariadb://localhost:3306/policy" for locally installed MariaDB providerParams.setDatabaseDriver("org.h2.Driver"); providerParams.setDatabaseUrl("jdbc:h2:mem:testdb"); providerParams.setDatabaseUser("policy"); providerParams.setDatabasePassword(Base64.getEncoder().encodeToString("P01icY".getBytes())); providerParams.setPersistenceUnit("ToscaConceptTest"); - apiParamGroup = new ApiParameterGroup("ApiGroup", null, providerParams, Collections.emptyList()); + apiParamGroup = new ApiParameterGroup("ApiGroup", null, providerParams, + Collections.emptyList(), Collections.emptyList()); ParameterService.register(apiParamGroup, true); + policyTypeProvider = new PolicyTypeProvider(); policyProvider = new PolicyProvider(); + + apiPort = NetworkUtil.allocPort(); + + final String[] apiConfigParameters = new String[2]; + final Properties systemProps = System.getProperties(); + systemProps.put("javax.net.ssl.keyStore", KEYSTORE); + systemProps.put("javax.net.ssl.keyStorePassword", "Pol1cy_0nap"); + System.setProperties(systemProps); + new CommonTestData().makeParameters("src/test/resources/parameters/ApiConfigParameters_Https.json", + "src/test/resources/parameters/ApiConfigParameters_HttpsXXX.json", apiPort); + apiConfigParameters[0] = "-c"; + apiConfigParameters[1] = "src/test/resources/parameters/ApiConfigParameters_HttpsXXX.json"; + + apiMain = new Main(apiConfigParameters); } /** * Method for cleanup after each test. */ - @After - public void teardown() throws Exception { - if (policyTypeProvider != null) { - policyTypeProvider.close(); - } - if (policyProvider != null) { - policyProvider.close(); - } - if (main != null) { - stopApiService(main); - } else if (restServer != null) { - restServer.stop(); + @AfterClass + public static void teardown() throws Exception { + policyTypeProvider.close(); + policyProvider.close(); + + if (apiMain != null) { + apiMain.shutdown(); } } @@ -261,1315 +298,756 @@ public class TestApiRestServer { assertTrue(Modifier.isPrivate(constructor.getModifiers())); constructor.setAccessible(true); constructor.newInstance(); + } catch (final Exception exp) { assertTrue(exp.getCause().toString().contains("Instantiation of the class is not allowed")); } } @Test - public void testCreatePolicyTypes() { - try { - main = startApiService(true); - for (String resrcName : toscaPolicyTypeResourceNames) { - Response rawResponse = createResource(POLICYTYPES, resrcName, true); - assertEquals(Response.Status.OK.getStatusCode(), rawResponse.getStatus()); - ToscaServiceTemplate response = rawResponse.readEntity(ToscaServiceTemplate.class); - assertNotNull(response); - assertFalse(response.getPolicyTypes().isEmpty()); - } - } catch (Exception exp) { - fail("Test should not throw an exception"); - } - } - - @Test - public void testCreatePolicies() { - try { - main = startApiService(true); - for (String resrcName : toscaPolicyResourceNames) { - Response rawResponse = createResource(POLICYTYPES_TCA_POLICIES, resrcName, true); - assertEquals(Response.Status.NOT_FOUND.getStatusCode(), rawResponse.getStatus()); - ErrorResponse error = rawResponse.readEntity(ErrorResponse.class); - assertEquals("policy type with ID onap.policies.monitoring.cdap.tca.hi.lo.app:1.0.0 does not exist", - error.getErrorMessage()); - } - } catch (Exception exp) { - fail("Test should not throw an exception"); - } - } - - @Test - public void testCreatePoliciesPersistent() throws Exception { - setupParameters(); // setup DB - main = startApiService(true); - for (String resrcName : toscaPolicyResourceNames) { - Response rawResponse = createResource(POLICYTYPES_TCA_POLICIES, resrcName, true); + public void testCreatePolicyTypes() throws Exception { + for (String resrcName : TOSCA_POLICYTYPE_RESOURCE_NAMES) { + Response rawResponse = createResource(POLICYTYPES, resrcName); assertEquals(Response.Status.OK.getStatusCode(), rawResponse.getStatus()); ToscaServiceTemplate response = rawResponse.readEntity(ToscaServiceTemplate.class); assertNotNull(response); - assertFalse(response.getToscaTopologyTemplate().getPolicies().isEmpty()); + assertFalse(response.getPolicyTypes().isEmpty()); } - } - @Test - public void testSimpleCreatePolicies() throws Exception { - main = startApiService(true); - for (String resrcName : toscaPoliciesResourceNames) { - Response rawResponse = createResource(POLICIES, resrcName, true); - assertEquals(Response.Status.BAD_REQUEST.getStatusCode(), rawResponse.getStatus()); - ErrorResponse error = rawResponse.readEntity(ErrorResponse.class); - assertEquals("policy type onap.policies.optimization.resource.AffinityPolicy:1.0.0 for " - + "policy OSDF_CASABLANCA.Affinity_Default:1.0.0 does not exist", error.getErrorMessage()); - } + // Send a policy type with a null value to trigger an error + Response rawResponse = readResource(POLICYTYPES, APP_JSON); + 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)); + 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 testSimpleCreatePoliciesPersistent() throws Exception { - setupParameters(); // setup DB - main = startApiService(true); - for (String resrcName : toscaPoliciesResourceNames) { - Response rawResponse = createResource(POLICIES, resrcName, true); + public void testCreatePolicies() throws Exception { + for (String resrcName : TOSCA_POLICY_RESOURCE_NAMES) { + Response rawResponse = createResource(POLICYTYPES_TCA_POLICIES, resrcName); assertEquals(Response.Status.OK.getStatusCode(), rawResponse.getStatus()); - ToscaServiceTemplate response = rawResponse.readEntity(ToscaServiceTemplate.class); - assertNotNull(response); - assertFalse(response.getToscaTopologyTemplate().getPolicies().isEmpty()); } - } - @Test - public void testCreateGuardPolicies() { - try { - main = startApiService(true); - for (String resrcName : legacyGuardPolicyResourceNames) { - Response rawResponse = createGuardPolicy(GUARD_POLICIES, resrcName, true); - assertEquals(Response.Status.BAD_REQUEST.getStatusCode(), rawResponse.getStatus()); - } - } catch (Exception exp) { - fail("Test should not throw an exception"); - } - } + new File("src/test/resources/policies/BadTestPolicy.yaml").deleteOnExit(); - @Test - public void testCreateGuardPoliciesPersistent() { - try { - setupParameters(); // setup DB - main = startApiService(true); - for (String resrcName : legacyGuardPolicyResourceNames) { - Response rawResponse = createGuardPolicy(GUARD_POLICIES, resrcName, true); - assertEquals(Response.Status.OK.getStatusCode(), rawResponse.getStatus()); - } - } catch (Exception exp) { - fail("Test should not throw an exception"); - } - } + // Send a policy with no policy type trigger an error + String toscaPolicy = ResourceUtils + .getResourceAsString(TOSCA_POLICY_RESOURCE_NAMES[TOSCA_POLICIES_RESOURCE_NAMES.length - 1]); - @Test - public void testCreateOperationalPolicies() { - try { - main = startApiService(true); - for (String resrcName : legacyOperationalPolicyResourceNames) { - Response rawResponse = createOperationalPolicy(OPS_POLICIES, resrcName, true); - assertEquals(Response.Status.BAD_REQUEST.getStatusCode(), rawResponse.getStatus()); - } - } catch (Exception exp) { - fail("Test should not throw an exception"); - } - } + toscaPolicy = toscaPolicy.replaceAll("onap.policies.monitoring.cdap.tca.hi.lo.app", ""); + TextFileUtils.putStringAsTextFile(toscaPolicy, "src/test/resources/policies/BadTestPolicy.yaml"); - @Test - public void testCreateOperationalPoliciesPersistent() { - try { - setupParameters(); // setup DB - main = startApiService(true); - for (String resrcName : legacyOperationalPolicyResourceNames) { - Response rawResponse = createOperationalPolicy(OPS_POLICIES, resrcName, true); - assertEquals(Response.Status.OK.getStatusCode(), rawResponse.getStatus()); - } - } catch (Exception exp) { - fail("Test should not throw an exception"); - } + Response rawResponse2 = + createResource(POLICYTYPES_TCA_POLICIES, "src/test/resources/policies/BadTestPolicy.yaml"); + assertEquals(Response.Status.NOT_ACCEPTABLE.getStatusCode(), rawResponse2.getStatus()); + ErrorResponse errorResponse = rawResponse2.readEntity(ErrorResponse.class); + assertThat(errorResponse.getErrorMessage()) + .contains("entity in incoming fragment does not equal existing entity"); } @Test - public void testHttpsCreatePolicyTypes() { - try { - main = startApiService(false); - for (String resrcName : toscaPolicyTypeResourceNames) { - Response rawResponse = createResource(POLICYTYPES, resrcName, false); - assertEquals(Response.Status.OK.getStatusCode(), rawResponse.getStatus()); - ToscaServiceTemplate response = rawResponse.readEntity(ToscaServiceTemplate.class); - assertNotNull(response); - assertFalse(response.getPolicyTypes().isEmpty()); - } - } catch (Exception exp) { - fail("Test should not throw an exception"); + public void testSimpleCreatePolicies() throws Exception { + for (String resrcName : TOSCA_POLICIES_RESOURCE_NAMES) { + Response rawResponse = createResource(POLICIES, resrcName); + assertEquals(Response.Status.OK.getStatusCode(), rawResponse.getStatus()); } - } - @Test - public void testHttpsCreatePolicies() { - try { - main = startApiService(false); - for (String resrcName : toscaPolicyResourceNames) { - Response rawResponse = createResource(POLICYTYPES_TCA_POLICIES, resrcName, false); - assertEquals(Response.Status.NOT_FOUND.getStatusCode(), rawResponse.getStatus()); - ErrorResponse error = rawResponse.readEntity(ErrorResponse.class); - assertEquals("policy type with ID onap.policies.monitoring.cdap.tca.hi.lo.app:1.0.0 does not exist", - error.getErrorMessage()); - } - } catch (Exception exp) { - fail("Test should not throw an exception"); - } + new File("src/test/resources/policies/BadTestPolicy.yaml").deleteOnExit(); + + // Send a policy with no policy type trigger an error + String toscaPolicy = ResourceUtils + .getResourceAsString(TOSCA_POLICY_RESOURCE_NAMES[TOSCA_POLICIES_RESOURCE_NAMES.length - 1]); + + toscaPolicy = toscaPolicy.replaceAll("onap.policies.monitoring.cdap.tca.hi.lo.app", ""); + TextFileUtils.putStringAsTextFile(toscaPolicy, "src/test/resources/policies/BadTestPolicy.yaml"); + + Response rawResponse2 = createResource(POLICIES, "src/test/resources/policies/BadTestPolicy.yaml"); + ErrorResponse errorResponse = rawResponse2.readEntity(ErrorResponse.class); + assertEquals(Response.Status.NOT_ACCEPTABLE.getStatusCode(), rawResponse2.getStatus()); + assertThat(errorResponse.getErrorMessage()).contains("policy type NULL:1.0.0 referenced in policy not found"); } @Test - public void testHttpsCreatePoliciesPersistent() throws Exception { - setupParameters(); // setup DB - main = startApiService(false); - for (String resrcName : toscaPolicyResourceNames) { - Response rawResponse = createResource(POLICYTYPES_TCA_POLICIES, resrcName, false); + public void testCreateGuardPolicies() throws Exception { + for (String resrcName : LEGACY_GUARD_POLICY_RESOURCE_NAMES) { + Response rawResponse = createGuardPolicy(GUARD_POLICIES, resrcName); assertEquals(Response.Status.OK.getStatusCode(), rawResponse.getStatus()); - ToscaServiceTemplate response = rawResponse.readEntity(ToscaServiceTemplate.class); - assertNotNull(response); - assertFalse(response.getToscaTopologyTemplate().getPolicies().isEmpty()); } - } - @Test - public void testHttpsSimpleCreatePolicies() throws Exception { - main = startApiService(false); - for (String resrcName : toscaPoliciesResourceNames) { - Response rawResponse = createResource(POLICIES, resrcName, false); - assertEquals(Response.Status.BAD_REQUEST.getStatusCode(), rawResponse.getStatus()); - ErrorResponse error = rawResponse.readEntity(ErrorResponse.class); - assertEquals("policy type onap.policies.optimization.resource.AffinityPolicy:1.0.0 for " - + "policy OSDF_CASABLANCA.Affinity_Default:1.0.0 does not exist", error.getErrorMessage()); - } + Response rawResponse = deleteResource(GUARD_POLICIES_VDNS_FL_VERSION, APP_JSON); + assertEquals(Response.Status.OK.getStatusCode(), rawResponse.getStatus()); + + rawResponse = deleteResource(GUARD_POLICIES_VDNS_MINMAX_VERSION, APP_JSON); + assertEquals(Response.Status.OK.getStatusCode(), rawResponse.getStatus()); } @Test - public void testHttpsSimpleCreatePoliciesPersistent() throws Exception { - setupParameters(); // setup DB - main = startApiService(false); - for (String resrcName : toscaPoliciesResourceNames) { - Response rawResponse = createResource(POLICIES, resrcName, false); + public void testCreateOperationalPolicies() throws Exception { + for (String resrcName : LEGACY_OPERATIONAL_POLICY_RESOURCE_NAMES) { + Response rawResponse = createOperationalPolicy(OPS_POLICIES, resrcName); assertEquals(Response.Status.OK.getStatusCode(), rawResponse.getStatus()); - ToscaServiceTemplate response = rawResponse.readEntity(ToscaServiceTemplate.class); - assertNotNull(response); - assertFalse(response.getToscaTopologyTemplate().getPolicies().isEmpty()); } - } - @Test - public void testHttpsCreateGuardPolicies() { - try { - main = startApiService(false); - for (String resrcName : legacyGuardPolicyResourceNames) { - Response rawResponse = createGuardPolicy(GUARD_POLICIES, resrcName, false); - assertEquals(Response.Status.BAD_REQUEST.getStatusCode(), rawResponse.getStatus()); - } - } catch (Exception exp) { - fail("Test should not throw an exception"); - } - } + Response rawResponse = deleteResource(OPS_POLICIES + "/operational.restart/versions/1", APP_JSON); + assertEquals(Response.Status.OK.getStatusCode(), rawResponse.getStatus()); - @Test - public void testHttpsCreateOperationalPolicies() { - try { - main = startApiService(false); - for (String resrcName : legacyOperationalPolicyResourceNames) { - Response rawResponse = createOperationalPolicy(OPS_POLICIES, resrcName, false); - assertEquals(Response.Status.BAD_REQUEST.getStatusCode(), rawResponse.getStatus()); - } - } catch (Exception exp) { - fail("Test should not throw an exception"); - } - } + rawResponse = deleteResource(OPS_POLICIES + "/operational.scaleout/versions/1", APP_JSON); + assertEquals(Response.Status.OK.getStatusCode(), rawResponse.getStatus()); - @Test - public void testHealthCheckSuccessJson() { - testHealthCheckSuccess(APP_JSON); + rawResponse = deleteResource(OPS_POLICIES + "/operational.modifyconfig/versions/1", APP_JSON); + assertEquals(Response.Status.OK.getStatusCode(), rawResponse.getStatus()); } + @SuppressWarnings("unchecked") @Test - public void testHealthCheckSuccessYaml() { - testHealthCheckSuccess(APP_YAML); - } + public void testToscaCompliantOpDroolsPolicies() throws Exception { + Response rawResponse = createResource(POLICYTYPES, TOSCA_POLICYTYPE_OP_RESOURCE); + assertEquals(Response.Status.OK.getStatusCode(), rawResponse.getStatus()); + rawResponse = readResource(POLICYTYPES_DROOLS_VERSION, APP_JSON); + // + // PLD not sure how to fix this? How do I merge 2 policy types? + // + ErrorResponse errorResponse = rawResponse.readEntity(ErrorResponse.class); + System.err.println(errorResponse.getErrorMessage()); + assertEquals(Response.Status.OK.getStatusCode(), rawResponse.getStatus()); + rawResponse = createResource(POLICIES, TOSCA_POLICY_OP_DROOLS_VCPE_RESOURSE_JSON); + assertEquals(Response.Status.OK.getStatusCode(), rawResponse.getStatus()); - private void testHealthCheckSuccess(String mediaType) { + rawResponse = createResource(POLICIES, TOSCA_POLICY_OP_DROOLS_VCPE_RESOURSE_YAML); + assertEquals(Response.Status.OK.getStatusCode(), rawResponse.getStatus()); - try { - main = startApiService(true); - final Invocation.Builder invocationBuilder = sendHttpRequest(HEALTHCHECK_ENDPOINT, mediaType); - final HealthCheckReport report = invocationBuilder.get(HealthCheckReport.class); - validateHealthCheckReport(NAME, SELF, true, 200, ALIVE, report); - } catch (final Exception exp) { - LOGGER.error("testHealthCheckSuccess failed", exp); - fail("Test should not throw an exception"); - } - } + rawResponse = readResource(POLICYTYPES_DROOLS_POLICIES_VCPE_VERSION, APP_JSON); + assertEquals(Response.Status.OK.getStatusCode(), rawResponse.getStatus()); - @Test - public void testHealthCheckFailureJson() { - testHealthCheckFailure(APP_JSON); - } + rawResponse = deleteResource(POLICYTYPES_DROOLS_POLICIES_VCPE_VERSION, APP_JSON); + assertEquals(Response.Status.OK.getStatusCode(), rawResponse.getStatus()); - @Test - public void testHealthCheckFailureYaml() { - testHealthCheckFailure(APP_YAML); - } + rawResponse = createResource(POLICIES, TOSCA_POLICY_OP_DROOLS_VCPE_RESOURSE_YAML); + assertEquals(Response.Status.OK.getStatusCode(), rawResponse.getStatus()); - private void testHealthCheckFailure(String mediaType) { - try { - port = NetworkUtil.allocPort(); - final RestServerParameters restServerParams = new CommonTestData().getRestServerParameters(false, port); - restServerParams.setName(CommonTestData.API_GROUP_NAME); - restServer = new RestServer(restServerParams, null, ApiRestController.class); - - restServer.start(); - final Invocation.Builder invocationBuilder = sendHttpRequest(HEALTHCHECK_ENDPOINT, mediaType); - final HealthCheckReport report = invocationBuilder.get(HealthCheckReport.class); - validateHealthCheckReport(NAME, SELF, false, 500, NOT_ALIVE, report); - assertTrue(restServer.isAlive()); - assertTrue(restServer.toString().startsWith("RestServer [servers=")); - } catch (Exception exp) { - fail("Test should not throw an exception"); - } - } + rawResponse = readResource(POLICYTYPES_DROOLS_POLICIES_VCPE_VERSION, APP_JSON); + assertEquals(Response.Status.OK.getStatusCode(), rawResponse.getStatus()); - @Test - public void testHttpsHealthCheckSuccessJson() { - testHttpsHealthCheckSuccess(APP_JSON); - } + rawResponse = readResource(POLICYTYPES_DROOLS_POLICIES_VCPE_VERSION, APP_YAML); + assertEquals(Response.Status.OK.getStatusCode(), rawResponse.getStatus()); - @Test - public void testHttpsHealthCheckSuccessYaml() { - testHttpsHealthCheckSuccess(APP_YAML); - } + ToscaServiceTemplate toscaVcpeSt = rawResponse.readEntity(ToscaServiceTemplate.class); + assertEquals(1, toscaVcpeSt.getToscaTopologyTemplate().getPolicies().size()); + assertEquals(OP_POLICY_NAME_VCPE, + toscaVcpeSt.getToscaTopologyTemplate().getPolicies().get(0).get(OP_POLICY_NAME_VCPE).getName()); - private void testHttpsHealthCheckSuccess(String mediaType) { - try { - main = startApiService(false); - final Invocation.Builder invocationBuilder = sendHttpsRequest(HEALTHCHECK_ENDPOINT, mediaType); - final HealthCheckReport report = invocationBuilder.get(HealthCheckReport.class); - validateHealthCheckReport(NAME, SELF, true, 200, ALIVE, report); - } catch (Exception exp) { - fail("Test should not throw an exception"); - } - } + Map props = + toscaVcpeSt.getToscaTopologyTemplate().getPolicies().get(0).get(OP_POLICY_NAME_VCPE).getProperties(); + assertNotNull(props); - @Test - public void testApiStatistics_200_Json() { - testApiStatistics_200(APP_JSON); - } + List operations = (List) props.get("operations"); + assertEquals(1, operations.size()); + assertEquals(props.get("trigger"), ((Map) operations.get(0)).get("id")); - @Test - public void testApiStatistics_200_Yaml() { - testApiStatistics_200(APP_YAML); - } + Map operation = + (Map) ((Map) operations.get(0)).get("operation"); + assertEquals("APPC", operation.get("actor")); + assertEquals("Restart", operation.get("operation")); - private void testApiStatistics_200(String mediaType) { - try { - main = startApiService(true); - Invocation.Builder invocationBuilder = sendHttpRequest(STATISTICS_ENDPOINT, mediaType); - StatisticsReport report = invocationBuilder.get(StatisticsReport.class); - validateStatisticsReport(report, 200); - updateApiStatistics(); - invocationBuilder = sendHttpRequest(STATISTICS_ENDPOINT, mediaType); - report = invocationBuilder.get(StatisticsReport.class); - validateStatisticsReport(report, 200); - ApiStatisticsManager.resetAllStatistics(); - } catch (Exception exp) { - fail("Test should not throw an exception"); - } + rawResponse = deleteResource(POLICYTYPES_DROOLS_POLICIES_VCPE_VERSION, APP_JSON); + assertEquals(Response.Status.OK.getStatusCode(), rawResponse.getStatus()); } @Test - public void testHttpsApiStatisticsJson() { - testHttpsApiStatistics(APP_JSON); + public void testHealthCheckSuccessJson() throws Exception { + testHealthCheckSuccess(APP_JSON); } @Test - public void testHttpsApiStatisticsYaml() { - testHttpsApiStatistics(APP_YAML); + public void testHealthCheckSuccessYaml() throws Exception { + testHealthCheckSuccess(APP_YAML); } - private void testHttpsApiStatistics(String mediaType) { - try { - main = startApiService(false); - final Invocation.Builder invocationBuilder = sendHttpsRequest(STATISTICS_ENDPOINT, mediaType); - final StatisticsReport report = invocationBuilder.get(StatisticsReport.class); - validateStatisticsReport(report, 200); - } catch (Exception exp) { - fail("Test should not throw an exception"); - } + private void testHealthCheckSuccess(String mediaType) throws Exception { + final Invocation.Builder invocationBuilder = sendHttpsRequest(HEALTHCHECK_ENDPOINT, mediaType); + final HealthCheckReport report = invocationBuilder.get(HealthCheckReport.class); + validateHealthCheckReport(NAME, SELF, true, 200, ALIVE, report); } @Test - public void testApiStatistics_500_Json() { - testApiStatistics_500(APP_JSON); + public void testApiStatistics_200_Json() throws Exception { + testApiStatistics_200(APP_JSON); } @Test - public void testApiStatistics_500_Yaml() { - testApiStatistics_500(APP_YAML); + public void testApiStatistics_200_Yaml() throws Exception { + testApiStatistics_200(APP_YAML); } - - private void testApiStatistics_500(String mediaType) { - try { - port = NetworkUtil.allocPort(); - final RestServerParameters restServerParams = new CommonTestData().getRestServerParameters(false, port); - restServerParams.setName(CommonTestData.API_GROUP_NAME); - restServer = new RestServer(restServerParams, null, ApiRestController.class); - - restServer.start(); - final Invocation.Builder invocationBuilder = sendHttpRequest(STATISTICS_ENDPOINT, mediaType); - final StatisticsReport report = invocationBuilder.get(StatisticsReport.class); - validateStatisticsReport(report, 500); - ApiStatisticsManager.resetAllStatistics(); - } catch (Exception exp) { - fail("Test should not throw an exception"); - } + 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() { + public void testReadPolicyTypesJson() throws Exception { testReadPolicyTypes(APP_JSON); } @Test - public void testReadPolicyTypesYaml() { + public void testReadPolicyTypesYaml() throws Exception { testReadPolicyTypes(APP_YAML); } - private void testReadPolicyTypes(String mediaType) { - try { - main = startApiService(true); - Response rawResponse = readResource(POLICYTYPES, true, mediaType); - assertEquals(Response.Status.OK.getStatusCode(), rawResponse.getStatus()); - ToscaServiceTemplate response = rawResponse.readEntity(ToscaServiceTemplate.class); - assertTrue(response.getPolicyTypes().isEmpty()); - - rawResponse = readResource(POLICYTYPES_TCA, true, mediaType); - assertEquals(Response.Status.NOT_FOUND.getStatusCode(), rawResponse.getStatus()); - ErrorResponse error = rawResponse.readEntity(ErrorResponse.class); - assertEquals("policy type with ID onap.policies.monitoring.cdap.tca.hi.lo.app:null does not exist", - error.getErrorMessage()); - - rawResponse = readResource(POLICYTYPES_TCA_VERSION, true, mediaType); - assertEquals(Response.Status.NOT_FOUND.getStatusCode(), rawResponse.getStatus()); - error = rawResponse.readEntity(ErrorResponse.class); - assertEquals("policy type with ID onap.policies.monitoring.cdap.tca.hi.lo.app:1.0.0 does not exist", - error.getErrorMessage()); - - rawResponse = readResource(POLICYTYPES_TCA_LATEST, true, mediaType); - assertEquals(Response.Status.NOT_FOUND.getStatusCode(), rawResponse.getStatus()); - error = rawResponse.readEntity(ErrorResponse.class); - assertEquals("policy type with ID onap.policies.monitoring.cdap.tca.hi.lo.app:null does not exist", - error.getErrorMessage()); - - rawResponse = readResource(POLICYTYPES_COLLECTOR, true, mediaType); - assertEquals(Response.Status.NOT_FOUND.getStatusCode(), rawResponse.getStatus()); - error = rawResponse.readEntity(ErrorResponse.class); - assertEquals("policy type with ID " - + "onap.policies.monitoring.dcaegen2.collectors.datafile.datafile-app-server:null does not exist", - error.getErrorMessage()); - - rawResponse = readResource(POLICYTYPES_COLLECTOR_VERSION, true, mediaType); - assertEquals(Response.Status.NOT_FOUND.getStatusCode(), rawResponse.getStatus()); - error = rawResponse.readEntity(ErrorResponse.class); - assertEquals("policy type with ID " - + "onap.policies.monitoring.dcaegen2.collectors.datafile.datafile-app-server:1.0.0 does not exist", - error.getErrorMessage()); - - rawResponse = readResource(POLICYTYPES_COLLECTOR_LATEST, true, mediaType); - assertEquals(Response.Status.NOT_FOUND.getStatusCode(), rawResponse.getStatus()); - error = rawResponse.readEntity(ErrorResponse.class); - assertEquals("policy type with ID " - + "onap.policies.monitoring.dcaegen2.collectors.datafile.datafile-app-server:null does not exist", - error.getErrorMessage()); - } catch (Exception exp) { - fail("Test should not throw an exception"); - } - } - - @Test - public void testReadPreloadPolicyTypesPersistentJson() throws Exception { - setupParameters(); - main = startApiService(true); - Response rawResponse = readResource(POLICYTYPES, true, APP_JSON); + private void testReadPolicyTypes(String mediaType) throws Exception { + Response rawResponse = readResource("policytypes/onap.policies.optimization.resource.HpaPolicy", mediaType); assertEquals(Response.Status.OK.getStatusCode(), rawResponse.getStatus()); - ToscaServiceTemplate response = rawResponse.readEntity(ToscaServiceTemplate.class); - assertEquals(28, response.getPolicyTypes().size()); - } + ToscaServiceTemplate namingServiceTemplate = rawResponse.readEntity(ToscaServiceTemplate.class); + assertNotNull(namingServiceTemplate); + assertEquals(3, namingServiceTemplate.getPolicyTypesAsMap().size()); + assertEquals(5, namingServiceTemplate.getDataTypesAsMap().size()); - @Test - public void testReadPreloadPolicyTypesPersistentYaml() throws Exception { - setupParameters(); - main = startApiService(true); - Response rawResponse = readResource(POLICYTYPES, true, APP_YAML); + rawResponse = readResource(POLICYTYPES, mediaType); assertEquals(Response.Status.OK.getStatusCode(), rawResponse.getStatus()); ToscaServiceTemplate response = rawResponse.readEntity(ToscaServiceTemplate.class); - assertEquals(28, response.getPolicyTypes().size()); - } + assertFalse(response.getPolicyTypes().isEmpty()); - @Test - public void testReadPolicyTypesPersistentJson() { - testReadPolicyTypesPersistent(APP_JSON); - } - - @Test - public void testReadPolicyTypesPersistentYaml() { - testReadPolicyTypesPersistent(APP_YAML); - } - - private void testReadPolicyTypesPersistent(String mediaType) { - try { - setupParameters(); - main = startApiService(true); - for (String resrcName : toscaPolicyTypeResourceNames) { - Response rawResponse = createResource(POLICYTYPES, resrcName, true); - assertEquals(Response.Status.OK.getStatusCode(), rawResponse.getStatus()); - ToscaServiceTemplate response = rawResponse.readEntity(ToscaServiceTemplate.class); - assertNotNull(response); - assertFalse(response.getPolicyTypes().isEmpty()); - } - - for (String resrcName : toscaPolicyResourceNames) { - Response rawResponse = createResource(POLICYTYPES_TCA_POLICIES, resrcName, true); - assertEquals(Response.Status.OK.getStatusCode(), rawResponse.getStatus()); - } - - Response rawResponse = readResource(POLICYTYPES_TCA, true, mediaType); - assertEquals(Response.Status.OK.getStatusCode(), rawResponse.getStatus()); + rawResponse = readResource(POLICYTYPES_TCA, mediaType); + assertEquals(Response.Status.OK.getStatusCode(), rawResponse.getStatus()); - rawResponse = readResource(POLICYTYPES_TCA_VERSION, true, mediaType); - assertEquals(Response.Status.OK.getStatusCode(), rawResponse.getStatus()); + rawResponse = readResource(POLICYTYPES_TCA_VERSION, mediaType); + assertEquals(Response.Status.OK.getStatusCode(), rawResponse.getStatus()); + rawResponse = readResource(POLICYTYPES_TCA_LATEST, mediaType); + assertEquals(Response.Status.OK.getStatusCode(), rawResponse.getStatus()); - rawResponse = readResource(POLICYTYPES_TCA_LATEST, true, mediaType); - assertEquals(Response.Status.OK.getStatusCode(), rawResponse.getStatus()); + rawResponse = readResource(POLICYTYPES_COLLECTOR, mediaType); + assertEquals(Response.Status.OK.getStatusCode(), rawResponse.getStatus()); + rawResponse = readResource(POLICYTYPES_COLLECTOR_VERSION, mediaType); + assertEquals(Response.Status.OK.getStatusCode(), rawResponse.getStatus()); - rawResponse = readResource(POLICYTYPES_COLLECTOR, true, mediaType); - assertEquals(Response.Status.OK.getStatusCode(), rawResponse.getStatus()); + rawResponse = readResource(POLICYTYPES_COLLECTOR_LATEST, mediaType); + assertEquals(Response.Status.OK.getStatusCode(), rawResponse.getStatus()); + rawResponse = readResource(POLICYTYPES_DROOLS, mediaType); + assertEquals(Response.Status.OK.getStatusCode(), rawResponse.getStatus()); - rawResponse = readResource(POLICYTYPES_COLLECTOR_VERSION, true, mediaType); - assertEquals(Response.Status.OK.getStatusCode(), rawResponse.getStatus()); + rawResponse = readResource(POLICYTYPES_DROOLS_VERSION, mediaType); + assertEquals(Response.Status.OK.getStatusCode(), rawResponse.getStatus()); + rawResponse = readResource(POLICYTYPES_DROOLS_VERSION_LATEST, mediaType); + assertEquals(Response.Status.OK.getStatusCode(), rawResponse.getStatus()); - rawResponse = readResource(POLICYTYPES_COLLECTOR_LATEST, true, mediaType); - assertEquals(Response.Status.OK.getStatusCode(), rawResponse.getStatus()); - } catch (Exception exp) { - fail("Test should not throw an exception"); - } + rawResponse = readResource(POLICYTYPES_NAMING_VERSION, mediaType); + assertEquals(Response.Status.OK.getStatusCode(), rawResponse.getStatus()); } @Test - public void testDeletePolicyTypeJson() { + public void testDeletePolicyTypeJson() throws Exception { testDeletePolicyType(APP_JSON); } @Test - public void testDeletePolicyTypeYaml() { + public void testDeletePolicyTypeYaml() throws Exception { testDeletePolicyType(APP_YAML); } - private void testDeletePolicyType(String mediaType) { - try { - main = startApiService(true); - Response rawResponse = deleteResource(POLICYTYPES_TCA_VERSION, true, mediaType); - assertEquals(Response.Status.NOT_FOUND.getStatusCode(), rawResponse.getStatus()); - ErrorResponse error = rawResponse.readEntity(ErrorResponse.class); - assertEquals("policy type with ID onap.policies.monitoring.cdap.tca.hi.lo.app:1.0.0 does not exist", - error.getErrorMessage()); - - rawResponse = deleteResource(POLICYTYPES_COLLECTOR_VERSION, true, mediaType); - assertEquals(Response.Status.NOT_FOUND.getStatusCode(), rawResponse.getStatus()); - error = rawResponse.readEntity(ErrorResponse.class); - assertEquals("policy type with ID " - + "onap.policies.monitoring.dcaegen2.collectors.datafile.datafile-app-server:1.0.0 does not exist", - error.getErrorMessage()); - } catch (Exception exp) { - fail("Test should not throw an exception"); - } - } + private void testDeletePolicyType(String mediaType) throws Exception { + Response rawResponse = deleteResource("policytypes/onap.policies.IDoNotExist/versions/1.0.0", mediaType); + assertEquals(Response.Status.NOT_FOUND.getStatusCode(), rawResponse.getStatus()); - @Test - public void testDeletePolicyTypePersistentJson() { - testDeletePolicyTypePersistent(APP_JSON); - } + rawResponse = createResource(POLICYTYPES, "policytypes/onap.policies.Test.yaml"); + assertEquals(Response.Status.OK.getStatusCode(), rawResponse.getStatus()); - @Test - public void testDeletePolicyTypePersistentYaml() { - testDeletePolicyTypePersistent(APP_YAML); - } + rawResponse = readResource("policytypes/onap.policies.Test/versions/1.0.0", mediaType); + assertEquals(Response.Status.OK.getStatusCode(), rawResponse.getStatus()); - private void testDeletePolicyTypePersistent(String mediaType) { - try { - setupParameters(); // setup DB - main = startApiService(true);// create policy types - for (String resrcName : toscaPolicyTypeResourceNames) { - Response rawResponse = createResource(POLICYTYPES, resrcName, true); - assertEquals(Response.Status.OK.getStatusCode(), rawResponse.getStatus()); - ToscaServiceTemplate response = rawResponse.readEntity(ToscaServiceTemplate.class); - assertNotNull(response); - assertFalse(response.getPolicyTypes().isEmpty()); - } - Response rawResponse = deleteResource(POLICYTYPES_TCA_VERSION, true, mediaType); - assertEquals(Response.Status.OK.getStatusCode(), rawResponse.getStatus()); - } catch (Exception exp) { - fail("Test should not throw an exception"); - } - } + rawResponse = deleteResource("policytypes/onap.policies.Test/versions/1.0.0", mediaType); + assertEquals(Response.Status.OK.getStatusCode(), rawResponse.getStatus()); + rawResponse = readResource("policytypes/onap.policies.Test/versions/1.0.0", mediaType); + assertEquals(Response.Status.NOT_FOUND.getStatusCode(), rawResponse.getStatus()); + } @Test - public void testReadPoliciesJson() { + public void testReadPoliciesJson() throws Exception { testReadPolicies(APP_JSON); } @Test - public void testReadPoliciesYaml() { + public void testReadPoliciesYaml() throws Exception { testReadPolicies(APP_YAML); } - private void testReadPolicies(String mediaType) { - try { - main = startApiService(true); - Response rawResponse = readResource(POLICYTYPES_TCA_POLICIES, true, mediaType); - assertEquals(Response.Status.NOT_FOUND.getStatusCode(), rawResponse.getStatus()); - ErrorResponse error = rawResponse.readEntity(ErrorResponse.class); - assertEquals( - "policy with ID null:null and " - + "type onap.policies.monitoring.cdap.tca.hi.lo.app:1.0.0 does not exist", - error.getErrorMessage()); - - rawResponse = readResource(POLICYTYPES_TCA_POLICIES_VCPE, true, mediaType); - assertEquals(Response.Status.NOT_FOUND.getStatusCode(), rawResponse.getStatus()); - error = rawResponse.readEntity(ErrorResponse.class); - assertEquals( - "policy with ID onap.restart.tca:null and " - + "type onap.policies.monitoring.cdap.tca.hi.lo.app:1.0.0 does not exist", - error.getErrorMessage()); - - rawResponse = readResource(POLICYTYPES_TCA_POLICIES_VCPE_VERSION, true, mediaType); - assertEquals(Response.Status.NOT_FOUND.getStatusCode(), rawResponse.getStatus()); - error = rawResponse.readEntity(ErrorResponse.class); - assertEquals( - "policy with ID onap.restart.tca:1.0.0 and " - + "type onap.policies.monitoring.cdap.tca.hi.lo.app:1.0.0 does not exist", - error.getErrorMessage()); - - rawResponse = readResource(POLICYTYPES_TCA_POLICIES_VCPE_LATEST, true, mediaType); - assertEquals(Response.Status.NOT_FOUND.getStatusCode(), rawResponse.getStatus()); - error = rawResponse.readEntity(ErrorResponse.class); - assertEquals( - "policy with ID onap.restart.tca:null and " - + "type onap.policies.monitoring.cdap.tca.hi.lo.app:1.0.0 does not exist", - error.getErrorMessage()); - } catch (Exception exp) { - fail("Test should not throw an exception"); + private void testReadPolicies(String mediaType) throws Exception { + for (String resrcName : TOSCA_POLICY_RESOURCE_NAMES) { + Response rawResponse = createResource(POLICYTYPES_TCA_POLICIES, resrcName); + assertEquals(Response.Status.OK.getStatusCode(), rawResponse.getStatus()); } - } - @Test - public void testReadPoliciesPersistentJson() { - testReadPoliciesPersistent(APP_JSON); + Response rawResponse = readResource(POLICYTYPES_TCA_POLICIES, mediaType); + assertEquals(Response.Status.OK.getStatusCode(), rawResponse.getStatus()); + + rawResponse = readResource(POLICYTYPES_TCA_POLICIES_VCPE, mediaType); + assertEquals(Response.Status.OK.getStatusCode(), rawResponse.getStatus()); + + rawResponse = readResource(POLICYTYPES_TCA_POLICIES_VCPE_VERSION1, mediaType); + assertEquals(Response.Status.OK.getStatusCode(), rawResponse.getStatus()); + + rawResponse = readResource(POLICYTYPES_TCA_POLICIES_VCPE_VERSION2, mediaType); + assertEquals(Response.Status.OK.getStatusCode(), rawResponse.getStatus()); + + rawResponse = readResource(POLICYTYPES_TCA_POLICIES_VCPE_LATEST, mediaType); + assertEquals(Response.Status.OK.getStatusCode(), rawResponse.getStatus()); + + rawResponse = deleteResource(POLICYTYPES_TCA_POLICIES_VCPE_VERSION1, mediaType); + assertEquals(Response.Status.OK.getStatusCode(), rawResponse.getStatus()); + + rawResponse = deleteResource(POLICYTYPES_TCA_POLICIES_VCPE_VERSION2, mediaType); + assertEquals(Response.Status.OK.getStatusCode(), rawResponse.getStatus()); } @Test - public void testReadPoliciesPersistentYaml() { - testReadPoliciesPersistent(APP_YAML); - } + public void testNamingPolicyGet() throws Exception { - private void testReadPoliciesPersistent(String mediaType) { - try { - setupParameters(); - main = startApiService(true); - for (String resrcName : toscaPolicyTypeResourceNames) { - Response rawResponse = createResource(POLICYTYPES, resrcName, true); - assertEquals(Response.Status.OK.getStatusCode(), rawResponse.getStatus()); - ToscaServiceTemplate response = rawResponse.readEntity(ToscaServiceTemplate.class); - assertNotNull(response); - assertFalse(response.getPolicyTypes().isEmpty()); - } - - for (String resrcName : toscaPolicyResourceNames) { - Response rawResponse = createResource(POLICYTYPES_TCA_POLICIES, resrcName, true); - assertEquals(Response.Status.OK.getStatusCode(), rawResponse.getStatus()); - } - - Response rawResponse; - rawResponse = readResource(POLICYTYPES_TCA, true, mediaType); - assertEquals(Response.Status.OK.getStatusCode(), rawResponse.getStatus()); + Response rawResponse = readResource("policytypes/onap.policies.Naming/versions/1.0.0/" + + "policies/SDNC_Policy.ONAP_VNF_NAMING_TIMESTAMP/versions/1.0.0", APP_JSON); + assertEquals(Response.Status.OK.getStatusCode(), rawResponse.getStatus()); - rawResponse = readResource(POLICYTYPES_TCA_POLICIES_VCPE, true, mediaType); - assertEquals(Response.Status.OK.getStatusCode(), rawResponse.getStatus()); + ToscaServiceTemplate namingServiceTemplate = rawResponse.readEntity(ToscaServiceTemplate.class); + assertEquals(1, namingServiceTemplate.getToscaTopologyTemplate().getPoliciesAsMap().size()); + assertEquals(1, namingServiceTemplate.getPolicyTypesAsMap().size()); + assertEquals(3, namingServiceTemplate.getDataTypesAsMap().size()); - rawResponse = readResource(POLICYTYPES_TCA_POLICIES_VCPE_VERSION, true, mediaType); - assertEquals(Response.Status.OK.getStatusCode(), rawResponse.getStatus()); + rawResponse = readResource("policytypes/onap.policies.Naming/versions/1.0.0/" + + "policies/SDNC_Policy.ONAP_VNF_NAMING_TIMESTAMP/versions/latest", APP_JSON); + assertEquals(Response.Status.OK.getStatusCode(), rawResponse.getStatus()); - rawResponse = readResource(POLICYTYPES_TCA_POLICIES_VCPE_LATEST, true, mediaType); - assertEquals(Response.Status.OK.getStatusCode(), rawResponse.getStatus()); - } catch (Exception exp) { - fail("Test should not throw an exception"); - } + namingServiceTemplate = rawResponse.readEntity(ToscaServiceTemplate.class); + assertEquals(1, namingServiceTemplate.getToscaTopologyTemplate().getPoliciesAsMap().size()); + assertEquals(1, namingServiceTemplate.getPolicyTypesAsMap().size()); + assertEquals(3, namingServiceTemplate.getDataTypesAsMap().size()); + + rawResponse = readResource("policytypes/onap.policies.Naming/versions/1.0.0/policies", APP_JSON); + assertEquals(Response.Status.OK.getStatusCode(), rawResponse.getStatus()); + + namingServiceTemplate = rawResponse.readEntity(ToscaServiceTemplate.class); + assertEquals(1, namingServiceTemplate.getToscaTopologyTemplate().getPoliciesAsMap().size()); + assertEquals(1, namingServiceTemplate.getPolicyTypesAsMap().size()); + assertEquals(3, namingServiceTemplate.getDataTypesAsMap().size()); } @Test - public void testDeletePoliciesJson() { + public void testDeletePoliciesJson() throws Exception { testDeletePolicies(APP_JSON); } @Test - public void testDeletePoliciesYaml() { + public void testDeletePoliciesYaml() throws Exception { testDeletePolicies(APP_YAML); } - private void testDeletePolicies(String mediaType) { - try { - main = startApiService(true); - Response rawResponse = deleteResource(POLICYTYPES_TCA_POLICIES_VCPE_VERSION, true, mediaType); - assertEquals(Response.Status.NOT_FOUND.getStatusCode(), rawResponse.getStatus()); - ErrorResponse error = rawResponse.readEntity(ErrorResponse.class); - assertEquals( - "policy with ID onap.restart.tca:1.0.0 and " - + "type onap.policies.monitoring.cdap.tca.hi.lo.app:1.0.0 does not exist", - error.getErrorMessage()); - } catch (Exception exp) { - fail("Test should not throw an exception"); - } + private void testDeletePolicies(String mediaType) throws Exception { + Response rawResponse = deleteResource(POLICYTYPES_TCA_POLICIES_VCPE_VERSION1, mediaType); + 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() { + public void testDeletePolicyVersionJson() throws Exception { testDeletePolicyVersion(APP_JSON); } @Test - public void testDeletePolicyVersionYaml() { + public void testDeletePolicyVersionYaml() throws Exception { testDeletePolicyVersion(APP_YAML); } - private void testDeletePolicyVersion(String mediaType) { - try { - setupParameters(); // setup DB - main = startApiService(true);// create policy types - for (String resrcName : toscaPolicyTypeResourceNames) { - Response rawResponse = createResource(POLICYTYPES, resrcName, true); - assertEquals(Response.Status.OK.getStatusCode(), rawResponse.getStatus()); - ToscaServiceTemplate response = rawResponse.readEntity(ToscaServiceTemplate.class); - assertNotNull(response); - assertFalse(response.getPolicyTypes().isEmpty()); - } - for (String resrcName : toscaPolicyResourceNames) { - Response rawResponse = createResource(POLICYTYPES_TCA_POLICIES, resrcName, true); - assertEquals(Response.Status.OK.getStatusCode(), rawResponse.getStatus()); - } - Response rawResponse = deleteResource(POLICYTYPES_TCA_POLICIES_VCPE_VERSION, true, mediaType); + private void testDeletePolicyVersion(String mediaType) throws Exception { + for (String resrcName : TOSCA_POLICYTYPE_RESOURCE_NAMES) { + Response rawResponse = createResource(POLICYTYPES, resrcName); + 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); assertEquals(Response.Status.OK.getStatusCode(), rawResponse.getStatus()); - } catch (Exception exp) { - fail("Test should not throw an exception"); } + Response rawResponse = deleteResource(POLICYTYPES_TCA_POLICIES_VCPE_VERSION1, mediaType); + assertEquals(Response.Status.OK.getStatusCode(), rawResponse.getStatus()); + + rawResponse = readResource(POLICYTYPES_TCA_POLICIES_VCPE_VERSION1, mediaType); + assertEquals(Response.Status.NOT_FOUND.getStatusCode(), rawResponse.getStatus()); + ErrorResponse errorResponse = rawResponse.readEntity(ErrorResponse.class); + assertEquals( + "policies for filter ToscaPolicyFilter(name=onap.restart.tca, version=1.0.0, versionPrefix=null, " + + "type=onap.policies.monitoring.cdap.tca.hi.lo.app, typeVersion=1.0.0) do not exist", + errorResponse.getErrorMessage()); + + rawResponse = deleteResource(POLICYTYPES_TCA_POLICIES_VCPE_VERSION2, mediaType); + assertEquals(Response.Status.OK.getStatusCode(), rawResponse.getStatus()); + + rawResponse = readResource(POLICYTYPES_TCA_POLICIES_VCPE_VERSION2, mediaType); + assertEquals(Response.Status.NOT_FOUND.getStatusCode(), rawResponse.getStatus()); + errorResponse = rawResponse.readEntity(ErrorResponse.class); + assertEquals("policies for onap.restart.tca:2.0.0 do not exist", errorResponse.getErrorMessage()); + + rawResponse = readResource(POLICYTYPES_TCA_POLICIES_VCPE, mediaType); + 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); + 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() { + public void testGetAllVersionOfPolicyJson() throws Exception { testGetAllVersionOfPolicy(APP_JSON); } @Test - public void testGetAllVersionOfPolicyYaml() { + public void testGetAllVersionOfPolicyYaml() throws Exception { testGetAllVersionOfPolicy(APP_YAML); } - private void testGetAllVersionOfPolicy(String mediaType) { - try { - setupParameters(); // setup DB - main = startApiService(true);// create policy types - for (String resrcName : toscaPolicyTypeResourceNames) { - Response rawResponse = createResource(POLICYTYPES, resrcName, true); - assertEquals(Response.Status.OK.getStatusCode(), rawResponse.getStatus()); - ToscaServiceTemplate response = rawResponse.readEntity(ToscaServiceTemplate.class); - assertNotNull(response); - assertFalse(response.getPolicyTypes().isEmpty()); - } - for (String resrcName : toscaPolicyResourceNames) { - Response rawResponse = createResource(POLICYTYPES_TCA_POLICIES, resrcName, true); - assertEquals(Response.Status.OK.getStatusCode(), rawResponse.getStatus()); - } - Response rawResponse = readResource(POLICYTYPES_TCA_POLICIES, true, mediaType); + private void testGetAllVersionOfPolicy(String mediaType) throws Exception { + for (String resrcName : TOSCA_POLICYTYPE_RESOURCE_NAMES) { + Response rawResponse = createResource(POLICYTYPES, resrcName); + 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); assertEquals(Response.Status.OK.getStatusCode(), rawResponse.getStatus()); - } catch (Exception exp) { - fail("Test should not throw an exception"); } + Response rawResponse = readResource(POLICYTYPES_TCA_POLICIES, mediaType); + assertEquals(Response.Status.OK.getStatusCode(), rawResponse.getStatus()); } - @Test - public void testReadGuardPoliciesJson() { + public void testReadGuardPoliciesJson() throws Exception { testReadGuardPolicies(APP_JSON); } @Test - public void testReadGuardPoliciesYaml() { + public void testReadGuardPoliciesYaml() throws Exception { testReadGuardPolicies(APP_YAML); } - private void testReadGuardPolicies(String mediaType) { - try { - main = startApiService(true); - Response rawResponse = readResource(GUARD_POLICIES_VDNS_FL_LATEST, true, mediaType); - assertEquals(Response.Status.BAD_REQUEST.getStatusCode(), rawResponse.getStatus()); - ErrorResponse error = rawResponse.readEntity(ErrorResponse.class); - assertEquals("no policy found for policy: guard.frequency.scaleout:null", error.getErrorMessage()); - - rawResponse = readResource(GUARD_POLICIES_VDNS_FL_VERSION, true, mediaType); - assertEquals(Response.Status.BAD_REQUEST.getStatusCode(), rawResponse.getStatus()); - error = rawResponse.readEntity(ErrorResponse.class); - assertEquals("no policy found for policy: guard.frequency.scaleout:1", error.getErrorMessage()); - - rawResponse = readResource(GUARD_POLICIES_VDNS_MINMAX_LATEST, true, mediaType); - assertEquals(Response.Status.BAD_REQUEST.getStatusCode(), rawResponse.getStatus()); - error = rawResponse.readEntity(ErrorResponse.class); - assertEquals("no policy found for policy: guard.minmax.scaleout:null", error.getErrorMessage()); - - rawResponse = readResource(GUARD_POLICIES_VDNS_MINMAX_VERSION, true, mediaType); - assertEquals(Response.Status.BAD_REQUEST.getStatusCode(), rawResponse.getStatus()); - error = rawResponse.readEntity(ErrorResponse.class); - assertEquals("no policy found for policy: guard.minmax.scaleout:1", error.getErrorMessage()); - } catch (Exception exp) { - fail("Test should not throw an exception"); + private void testReadGuardPolicies(String mediaType) throws Exception { + for (String resrcName : LEGACY_GUARD_POLICY_RESOURCE_NAMES) { + Response rawResponse = createGuardPolicy(GUARD_POLICIES, resrcName); + assertEquals(Response.Status.OK.getStatusCode(), rawResponse.getStatus()); } - } - @Test - public void testReadGuardPoliciesPersistentJson() { - testReadGuardPoliciesPersistent(APP_JSON); - } - - @Test - public void testReadGuardPoliciesPersistentYaml() { - testReadGuardPoliciesPersistent(APP_YAML); - } - - private void testReadGuardPoliciesPersistent(String mediaType) { - try { - setupParameters(); // setup DB - main = startApiService(true); - for (String resrcName : legacyGuardPolicyResourceNames) { - Response rawResponse = createGuardPolicy(GUARD_POLICIES, resrcName, true); - assertEquals(Response.Status.OK.getStatusCode(), rawResponse.getStatus()); - } - - Response rawResponse = readResource(GUARD_POLICIES_VDNS_FL_LATEST, true, mediaType); - assertEquals(Response.Status.OK.getStatusCode(), rawResponse.getStatus()); + Response rawResponse = readResource(GUARD_POLICIES_VDNS_FL_LATEST, mediaType); + assertEquals(Response.Status.OK.getStatusCode(), rawResponse.getStatus()); + rawResponse = readResource(GUARD_POLICIES_VDNS_FL_VERSION, mediaType); + assertEquals(Response.Status.OK.getStatusCode(), rawResponse.getStatus()); - rawResponse = readResource(GUARD_POLICIES_VDNS_FL_VERSION, true, mediaType); - assertEquals(Response.Status.OK.getStatusCode(), rawResponse.getStatus()); + rawResponse = readResource(GUARD_POLICIES_VDNS_MINMAX_LATEST, mediaType); + assertEquals(Response.Status.OK.getStatusCode(), rawResponse.getStatus()); - rawResponse = readResource(GUARD_POLICIES_VDNS_MINMAX_LATEST, true, mediaType); - assertEquals(Response.Status.OK.getStatusCode(), rawResponse.getStatus()); + rawResponse = readResource(GUARD_POLICIES_VDNS_MINMAX_VERSION, mediaType); + assertEquals(Response.Status.OK.getStatusCode(), rawResponse.getStatus()); + rawResponse = deleteResource(GUARD_POLICIES_VDNS_FL_VERSION, mediaType); + assertEquals(Response.Status.OK.getStatusCode(), rawResponse.getStatus()); - rawResponse = readResource(GUARD_POLICIES_VDNS_MINMAX_VERSION, true, mediaType); - assertEquals(Response.Status.OK.getStatusCode(), rawResponse.getStatus()); - } catch (Exception exp) { - fail("Test should not throw an exception"); - } + rawResponse = deleteResource(GUARD_POLICIES_VDNS_MINMAX_VERSION, APP_JSON); + assertEquals(Response.Status.OK.getStatusCode(), rawResponse.getStatus()); } - @Test - public void testReadOperationalPoliciesJson() { + public void testReadOperationalPoliciesJson() throws Exception { testReadOperationalPolicies(APP_JSON); } @Test - public void testReadOperationalPoliciesYaml() { + public void testReadOperationalPoliciesYaml() throws Exception { testReadOperationalPolicies(APP_YAML); } - private void testReadOperationalPolicies(String mediaType) { - try { - main = startApiService(true); - Response rawResponse = readResource(OPS_POLICIES_VCPE_LATEST, true, mediaType); - assertEquals(Response.Status.BAD_REQUEST.getStatusCode(), rawResponse.getStatus()); - ErrorResponse error = rawResponse.readEntity(ErrorResponse.class); - assertEquals("no policy found for policy: operational.restart:null", error.getErrorMessage()); - - rawResponse = readResource(OPS_POLICIES_VCPE_VERSION, true, mediaType); - assertEquals(Response.Status.BAD_REQUEST.getStatusCode(), rawResponse.getStatus()); - error = rawResponse.readEntity(ErrorResponse.class); - assertEquals("no policy found for policy: operational.restart:1", error.getErrorMessage()); - - rawResponse = readResource(OPS_POLICIES_VDNS_LATEST, true, mediaType); - assertEquals(Response.Status.BAD_REQUEST.getStatusCode(), rawResponse.getStatus()); - error = rawResponse.readEntity(ErrorResponse.class); - assertEquals("no policy found for policy: operational.scaleout:null", error.getErrorMessage()); - - rawResponse = readResource(OPS_POLICIES_VDNS_VERSION, true, mediaType); - assertEquals(Response.Status.BAD_REQUEST.getStatusCode(), rawResponse.getStatus()); - error = rawResponse.readEntity(ErrorResponse.class); - assertEquals("no policy found for policy: operational.scaleout:1", error.getErrorMessage()); - - rawResponse = readResource(OPS_POLICIES_VFIREWALL_LATEST, true, mediaType); - assertEquals(Response.Status.BAD_REQUEST.getStatusCode(), rawResponse.getStatus()); - error = rawResponse.readEntity(ErrorResponse.class); - assertEquals("no policy found for policy: operational.modifyconfig:null", error.getErrorMessage()); - - rawResponse = readResource(OPS_POLICIES_VFIREWALL_VERSION, true, mediaType); - assertEquals(Response.Status.BAD_REQUEST.getStatusCode(), rawResponse.getStatus()); - error = rawResponse.readEntity(ErrorResponse.class); - assertEquals("no policy found for policy: operational.modifyconfig:1", error.getErrorMessage()); - } catch (Exception exp) { - fail("Test should not throw an exception"); - } - } - - @Test - public void testReadOperationalPoliciesPersistentJson() { - testReadOperationalPoliciesPersistent(APP_JSON); - } - - @Test - public void testReadOperationalPoliciesPersistentYaml() { - testReadOperationalPoliciesPersistent(APP_YAML); - } - - private void testReadOperationalPoliciesPersistent(String mediaType) { - try { - setupParameters(); // setup DB - main = startApiService(true); - for (String resrcName : legacyOperationalPolicyResourceNames) { - Response rawResponse = createOperationalPolicy(OPS_POLICIES, resrcName, true); - assertEquals(Response.Status.OK.getStatusCode(), rawResponse.getStatus()); - } - - Response rawResponse = readResource(OPS_POLICIES_VCPE_LATEST, true, mediaType); + private void testReadOperationalPolicies(String mediaType) throws Exception { + for (String resrcName : LEGACY_OPERATIONAL_POLICY_RESOURCE_NAMES) { + Response rawResponse = createOperationalPolicy(OPS_POLICIES, resrcName); assertEquals(Response.Status.OK.getStatusCode(), rawResponse.getStatus()); + } + Response rawResponse = readResource(OPS_POLICIES_VCPE_LATEST, mediaType); + assertEquals(Response.Status.OK.getStatusCode(), rawResponse.getStatus()); - rawResponse = readResource(OPS_POLICIES_VCPE_VERSION, true, mediaType); - assertEquals(Response.Status.OK.getStatusCode(), rawResponse.getStatus()); + rawResponse = readResource(OPS_POLICIES_VCPE_VERSION, mediaType); + assertEquals(Response.Status.OK.getStatusCode(), rawResponse.getStatus()); + rawResponse = readResource(OPS_POLICIES_VDNS_LATEST, mediaType); + assertEquals(Response.Status.OK.getStatusCode(), rawResponse.getStatus()); - rawResponse = readResource(OPS_POLICIES_VDNS_LATEST, true, mediaType); - assertEquals(Response.Status.OK.getStatusCode(), rawResponse.getStatus()); + rawResponse = readResource(OPS_POLICIES_VDNS_VERSION, mediaType); + assertEquals(Response.Status.OK.getStatusCode(), rawResponse.getStatus()); + rawResponse = readResource(OPS_POLICIES_VFIREWALL_LATEST, mediaType); + assertEquals(Response.Status.OK.getStatusCode(), rawResponse.getStatus()); - rawResponse = readResource(OPS_POLICIES_VDNS_VERSION, true, mediaType); - assertEquals(Response.Status.OK.getStatusCode(), rawResponse.getStatus()); + rawResponse = readResource(OPS_POLICIES_VFIREWALL_VERSION, mediaType); + assertEquals(Response.Status.OK.getStatusCode(), rawResponse.getStatus()); + rawResponse = deleteResource(OPS_POLICIES + "/operational.restart/versions/1", APP_JSON); + assertEquals(Response.Status.OK.getStatusCode(), rawResponse.getStatus()); - rawResponse = readResource(OPS_POLICIES_VFIREWALL_LATEST, true, mediaType); - assertEquals(Response.Status.OK.getStatusCode(), rawResponse.getStatus()); + rawResponse = deleteResource(OPS_POLICIES + "/operational.scaleout/versions/1", APP_JSON); + assertEquals(Response.Status.OK.getStatusCode(), rawResponse.getStatus()); + rawResponse = deleteResource(OPS_POLICIES + "/operational.modifyconfig/versions/1", APP_JSON); + assertEquals(Response.Status.OK.getStatusCode(), rawResponse.getStatus()); - rawResponse = readResource(OPS_POLICIES_VFIREWALL_VERSION, true, mediaType); - assertEquals(Response.Status.OK.getStatusCode(), rawResponse.getStatus()); - } catch (Exception exp) { - fail("Test should not throw an exception"); - } } @Test - public void testDeleteGuardPolicyJson() { + public void testDeleteGuardPolicyJson() throws Exception { testDeleteGuardPolicy(APP_JSON); } @Test - public void testDeleteGuardPolicyYaml() { + public void testDeleteGuardPolicyYaml() throws Exception { testDeleteGuardPolicy(APP_YAML); } - private void testDeleteGuardPolicy(String mediaType) { - try { - main = startApiService(true); - Response rawResponse = deleteResource(GUARD_POLICIES_VDNS_FL_VERSION, true, mediaType); - assertEquals(Response.Status.BAD_REQUEST.getStatusCode(), rawResponse.getStatus()); - ErrorResponse error = rawResponse.readEntity(ErrorResponse.class); - assertEquals("no policy found for policy: guard.frequency.scaleout:1", error.getErrorMessage()); - } catch (Exception exp) { - fail("Test should not throw an exception"); + private void testDeleteGuardPolicy(String mediaType) throws Exception { + for (String resrcName : LEGACY_GUARD_POLICY_RESOURCE_NAMES) { + Response rawResponse = createGuardPolicy(GUARD_POLICIES, resrcName); + assertEquals(Response.Status.OK.getStatusCode(), rawResponse.getStatus()); } - } - - @Test - public void testDeleteGuardPolicyPersistentJson() { - testDeleteGuardPolicyPersistent(APP_JSON); - } - @Test - public void testDeleteGuardPolicyPersistentYaml() { - testDeleteGuardPolicyPersistent(APP_YAML); - } - - private void testDeleteGuardPolicyPersistent(String mediaType) { - try { - setupParameters(); // setup DB - main = startApiService(true); - - for (String resrcName : legacyGuardPolicyResourceNames) { - Response rawResponse = createGuardPolicy(GUARD_POLICIES, resrcName, true); - assertEquals(Response.Status.OK.getStatusCode(), rawResponse.getStatus()); - } + Response rawResponse = deleteResource(GUARD_POLICIES_VDNS_FL_VERSION, mediaType); + assertEquals(Response.Status.OK.getStatusCode(), rawResponse.getStatus()); - Response rawResponse = deleteResource(GUARD_POLICIES_VDNS_FL_VERSION, true, mediaType); - assertEquals(Response.Status.OK.getStatusCode(), rawResponse.getStatus()); - } catch (Exception exp) { - fail("Test should not throw an exception"); - } + rawResponse = deleteResource(GUARD_POLICIES_VDNS_MINMAX_VERSION, APP_JSON); + assertEquals(Response.Status.OK.getStatusCode(), rawResponse.getStatus()); } @Test - public void testGetDeployedVersionsOfGuardPolicyJson() { + public void testGetDeployedVersionsOfGuardPolicyJson() throws Exception { testGetDeployedVersionsOfGuardPolicy(APP_JSON); } @Test - public void testGetDeployedVersionsOfGuardPolicyYaml() { + public void testGetDeployedVersionsOfGuardPolicyYaml() throws Exception { testGetDeployedVersionsOfGuardPolicy(APP_YAML); } - private void testGetDeployedVersionsOfGuardPolicy(String mediaType) { - try { - main = startApiService(true); - Response rawResponse = readResource(GUARD_POLICIES_VDNS_FL_DEPLOYED, true, mediaType); - assertEquals(Response.Status.NOT_FOUND.getStatusCode(), rawResponse.getStatus()); - } catch (Exception exp) { - fail("Test should not throw an exception"); - } + private void testGetDeployedVersionsOfGuardPolicy(String mediaType) throws Exception { + Response rawResponse = readResource(GUARD_POLICIES_VDNS_FL_DEPLOYED, mediaType); + assertEquals(Response.Status.NOT_FOUND.getStatusCode(), rawResponse.getStatus()); + ErrorResponse errorResponse = rawResponse.readEntity(ErrorResponse.class); + assertEquals( + "could not find policy with ID guard.frequency.scaleout and type " + + "onap.policies.controlloop.guard.FrequencyLimiter:1.0.0 deployed in any pdp group", + errorResponse.getErrorMessage()); } @Test - public void testDeleteOperationalPolicyJson() { + public void testDeleteOperationalPolicyJson() throws Exception { testDeleteOperationalPolicy(APP_JSON); } @Test - public void testDeleteOperationalPolicyYaml() { + public void testDeleteOperationalPolicyYaml() throws Exception { testDeleteOperationalPolicy(APP_YAML); } - private void testDeleteOperationalPolicy(String mediaType) { - try { - main = startApiService(true); - Response rawResponse = deleteResource(OPS_POLICIES_VCPE_VERSION, true, mediaType); - assertEquals(Response.Status.BAD_REQUEST.getStatusCode(), rawResponse.getStatus()); - ErrorResponse error = rawResponse.readEntity(ErrorResponse.class); - assertEquals("no policy found for policy: operational.restart:1", error.getErrorMessage()); - } catch (Exception exp) { - fail("Test should not throw an exception"); - } - } - - @Test - public void testDeleteOperationalPolicyPersistentJson() { - testDeleteOperationalPolicyPersistent(APP_JSON); + private void testDeleteOperationalPolicy(String mediaType) throws Exception { + Response rawResponse = deleteResource(OPS_POLICIES_VCPE_VERSION, mediaType); + assertEquals(Response.Status.BAD_REQUEST.getStatusCode(), rawResponse.getStatus()); + ErrorResponse error = rawResponse.readEntity(ErrorResponse.class); + assertEquals("no policy found for policy: operational.restart:1", error.getErrorMessage()); } @Test - public void testDeleteOperationalPolicyPersistentYaml() { - testDeleteOperationalPolicyPersistent(APP_YAML); - } - - private void testDeleteOperationalPolicyPersistent(String mediaType) { - try { - setupParameters(); // setup DB - main = startApiService(true); - for (String resrcName : legacyOperationalPolicyResourceNames) { - Response rawResponse = createOperationalPolicy(OPS_POLICIES, resrcName, true); - assertEquals(Response.Status.OK.getStatusCode(), rawResponse.getStatus()); - } - Response rawResponse = deleteResource(OPS_POLICIES_VCPE_VERSION, true, mediaType); - assertEquals(Response.Status.OK.getStatusCode(), rawResponse.getStatus()); - } catch (Exception exp) { - fail("Test should not throw an exception"); - } - } - - - @Test - public void testGetDeployedVersionsOfPolicyJson() { + public void testGetDeployedVersionsOfPolicyJson() throws Exception { testGetDeployedVersionsOfPolicy(APP_JSON); } @Test - public void testGetDeployedVersionsOfPolicyYaml() { + public void testGetDeployedVersionsOfPolicyYaml() throws Exception { testGetDeployedVersionsOfPolicy(APP_YAML); } - private void testGetDeployedVersionsOfPolicy(String mediaType) { - try { - main = startApiService(true); - Response rawResponse = readResource(POLICYTYPES_TCA_POLICIES_VCPE_DEPLOYED, true, mediaType); - assertEquals(Response.Status.NOT_FOUND.getStatusCode(), rawResponse.getStatus()); - } catch (Exception exp) { - fail("Test should not throw an exception"); - } + private void testGetDeployedVersionsOfPolicy(String mediaType) throws Exception { + Response rawResponse = readResource(POLICYTYPES_TCA_POLICIES_VCPE_DEPLOYED, mediaType); + assertEquals(Response.Status.NOT_FOUND.getStatusCode(), rawResponse.getStatus()); + ErrorResponse errorResponse = rawResponse.readEntity(ErrorResponse.class); + assertEquals( + "could not find policy with ID onap.restart.tca and type " + + "onap.policies.monitoring.cdap.tca.hi.lo.app:1.0.0 deployed in any pdp group", + errorResponse.getErrorMessage()); } @Test - public void testGetLatestVersionOfOperationalPolicyJson() { + public void testGetLatestVersionOfOperationalPolicyJson() throws Exception { testGetLatestVersionOfOperationalPolicy(APP_JSON); } @Test - public void testGetLatestVersionOfOperationalPolicyYaml() { + public void testGetLatestVersionOfOperationalPolicyYaml() throws Exception { testGetLatestVersionOfOperationalPolicy(APP_YAML); } - private void testGetLatestVersionOfOperationalPolicy(String mediaType) { - try { - main = startApiService(true); - Response rawResponse = readResource(OPS_POLICIES_VDNS_LATEST, true, mediaType); - assertEquals(Response.Status.BAD_REQUEST.getStatusCode(), rawResponse.getStatus()); - } catch (Exception exp) { - fail("Test should not throw an exception"); - } + private void testGetLatestVersionOfOperationalPolicy(String mediaType) throws Exception { + Response rawResponse = readResource(OPS_POLICIES_VDNS_LATEST, mediaType); + assertEquals(Response.Status.BAD_REQUEST.getStatusCode(), rawResponse.getStatus()); + ErrorResponse errorResponse = rawResponse.readEntity(ErrorResponse.class); + assertEquals("no policy found for policy: " + OP_POLICY_NAME_VDNS + ":null", errorResponse.getErrorMessage()); } @Test - public void testGetSpecificVersionOfOperationalPolicyJson() { + public void testGetSpecificVersionOfOperationalPolicyJson() throws Exception { testGetSpecificVersionOfOperationalPolicy(APP_JSON); } @Test - public void testGetSpecificVersionOfOperationalPolicyYaml() { + public void testGetSpecificVersionOfOperationalPolicyYaml() throws Exception { testGetSpecificVersionOfOperationalPolicy(APP_YAML); } - private void testGetSpecificVersionOfOperationalPolicy(String mediaType) { - try { - main = startApiService(true); - Response rawResponse = readResource(OPS_POLICIES_VDNS_VERSION, true, mediaType); - assertEquals(Response.Status.BAD_REQUEST.getStatusCode(), rawResponse.getStatus()); - } catch (Exception exp) { - fail("Test should not throw an exception"); - } + private void testGetSpecificVersionOfOperationalPolicy(String mediaType) throws Exception { + Response rawResponse = readResource(OPS_POLICIES_VDNS_VERSION, mediaType); + assertEquals(Response.Status.BAD_REQUEST.getStatusCode(), rawResponse.getStatus()); + ErrorResponse errorResponse = rawResponse.readEntity(ErrorResponse.class); + assertEquals("no policy found for policy: " + OP_POLICY_NAME_VDNS + ":1", errorResponse.getErrorMessage()); } @Test - public void testGetDeployedVersionsOfOperationalPolicyJson() { + public void testGetDeployedVersionsOfOperationalPolicyJson() throws Exception { testGetDeployedVersionsOfOperationalPolicy(APP_JSON); } @Test - public void testGetDeployedVersionsOfOperationalPolicyYaml() { + public void testGetDeployedVersionsOfOperationalPolicyYaml() throws Exception { testGetDeployedVersionsOfOperationalPolicy(APP_YAML); } - private void testGetDeployedVersionsOfOperationalPolicy(String mediaType) { - try { - main = startApiService(true); - Response rawResponse = readResource(OPS_POLICIES_VCPE_DEPLOYED, true, mediaType); - assertEquals(Response.Status.NOT_FOUND.getStatusCode(), rawResponse.getStatus()); - } catch (Exception exp) { - fail("Test should not throw an exception"); - } - } - - @Test - public void testDeleteSpecificVersionOfOperationalPolicyJson() { - testDeleteSpecificVersionOfOperationalPolicy(APP_JSON); + private void testGetDeployedVersionsOfOperationalPolicy(String mediaType) throws Exception { + Response rawResponse = readResource(OPS_POLICIES_VCPE_DEPLOYED, mediaType); + assertEquals(Response.Status.NOT_FOUND.getStatusCode(), rawResponse.getStatus()); + ErrorResponse errorResponse = rawResponse.readEntity(ErrorResponse.class); + assertEquals( + "could not find policy with ID " + OP_POLICY_NAME_VCPE + " and type " + + "onap.policies.controlloop.Operational:1.0.0 deployed in any pdp group", + errorResponse.getErrorMessage()); } @Test - public void testDeleteSpecificVersionOfOperationalPolicyYaml() { - testDeleteSpecificVersionOfOperationalPolicy(APP_YAML); - } - - private void testDeleteSpecificVersionOfOperationalPolicy(String mediaType) { - try { - main = startApiService(true); - Response rawResponse = deleteResource(OPS_POLICIES_VDNS_VERSION, true, mediaType); - assertEquals(Response.Status.BAD_REQUEST.getStatusCode(), rawResponse.getStatus()); - } catch (Exception exp) { - fail("Test should not throw an exception"); - } + public void testDeleteSpecificVersionOfOperationalPolicy() throws Exception { + Response rawResponse = deleteResource(OPS_POLICIES_VDNS_VERSION, APP_YAML); + assertEquals(Response.Status.BAD_REQUEST.getStatusCode(), rawResponse.getStatus()); + ErrorResponse errorResponse = rawResponse.readEntity(ErrorResponse.class); + assertEquals("no policy found for policy: " + OP_POLICY_NAME_VDNS + ":1", errorResponse.getErrorMessage()); } - private Response createResource(String endpoint, String resourceName, boolean http) - throws Exception { + 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); + 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); + rawServiceTemplate = standardYamlCoder.decode(ResourceUtils.getResourceAsString(resourceName), + ToscaServiceTemplate.class); } final Invocation.Builder invocationBuilder; - if (http) { - invocationBuilder = sendHttpRequest(endpoint, mediaType); - } else { - invocationBuilder = sendHttpsRequest(endpoint, mediaType); - } + invocationBuilder = sendHttpsRequest(endpoint, mediaType); Entity entity = Entity.entity(rawServiceTemplate, mediaType); return invocationBuilder.post(entity); } - private Response createGuardPolicy(String endpoint, String resourceName, boolean http) - throws Exception { + private Response createGuardPolicy(String endpoint, String resourceName) throws Exception { String mediaType = APP_JSON; // default media type LegacyGuardPolicyInput rawGuardPolicy = new LegacyGuardPolicyInput(); if (resourceName.endsWith(".json")) { - rawGuardPolicy = standardCoder.decode( - ResourceUtils.getResourceAsString(resourceName), LegacyGuardPolicyInput.class); + rawGuardPolicy = + standardCoder.decode(ResourceUtils.getResourceAsString(resourceName), LegacyGuardPolicyInput.class); } else if (resourceName.endsWith(".yaml") || resourceName.endsWith(".yml")) { mediaType = APP_YAML; - rawGuardPolicy = standardYamlCoder.decode( - ResourceUtils.getResourceAsString(resourceName), LegacyGuardPolicyInput.class); + rawGuardPolicy = standardYamlCoder.decode(ResourceUtils.getResourceAsString(resourceName), + LegacyGuardPolicyInput.class); } final Invocation.Builder invocationBuilder; - if (http) { - invocationBuilder = sendHttpRequest(endpoint, mediaType); - } else { - invocationBuilder = sendHttpsRequest(endpoint, mediaType); - } + invocationBuilder = sendHttpsRequest(endpoint, mediaType); Entity entity = Entity.entity(rawGuardPolicy, mediaType); return invocationBuilder.post(entity); } - private Response createOperationalPolicy(String endpoint, String resourceName, boolean http) - throws Exception { + private Response createOperationalPolicy(String endpoint, String resourceName) throws Exception { String mediaType = APP_JSON; // default media type LegacyOperationalPolicy rawOpsPolicy = new LegacyOperationalPolicy(); if (resourceName.endsWith(".json")) { - rawOpsPolicy = standardCoder.decode( - ResourceUtils.getResourceAsString(resourceName), LegacyOperationalPolicy.class); + rawOpsPolicy = standardCoder.decode(ResourceUtils.getResourceAsString(resourceName), + LegacyOperationalPolicy.class); } else if (resourceName.endsWith(".yaml") || resourceName.endsWith(".yml")) { mediaType = APP_YAML; - rawOpsPolicy = standardYamlCoder.decode( - ResourceUtils.getResourceAsString(resourceName), LegacyOperationalPolicy.class); + rawOpsPolicy = standardYamlCoder.decode(ResourceUtils.getResourceAsString(resourceName), + LegacyOperationalPolicy.class); } final Invocation.Builder invocationBuilder; - if (http) { - invocationBuilder = sendHttpRequest(endpoint, mediaType); - } else { - invocationBuilder = sendHttpsRequest(endpoint, mediaType); - } + invocationBuilder = sendHttpsRequest(endpoint, mediaType); Entity entity = Entity.entity(rawOpsPolicy, mediaType); return invocationBuilder.post(entity); } - private Response readResource(String endpoint, boolean http, String mediaType) throws Exception { + private Response readResource(String endpoint, String mediaType) throws Exception { final Invocation.Builder invocationBuilder; - if (http) { - invocationBuilder = sendHttpRequest(endpoint, mediaType); - } else { - invocationBuilder = sendHttpsRequest(endpoint, mediaType); - } + invocationBuilder = sendHttpsRequest(endpoint, mediaType); return invocationBuilder.get(); } - private Response deleteResource(String endpoint, boolean http, String mediaType) throws Exception { + private Response deleteResource(String endpoint, String mediaType) throws Exception { final Invocation.Builder invocationBuilder; - if (http) { - invocationBuilder = sendHttpRequest(endpoint, mediaType); - } else { - invocationBuilder = sendHttpsRequest(endpoint, mediaType); - } + invocationBuilder = sendHttpsRequest(endpoint, mediaType); return invocationBuilder.delete(); } - private Main startApiService(final boolean http) throws Exception { - port = NetworkUtil.allocPort(); - - final String[] apiConfigParameters = new String[2]; - if (http) { - COMMON_TEST_DATA.makeParameters("src/test/resources/parameters/ApiConfigParameters.json", - "src/test/resources/parameters/ApiConfigParametersXXX.json", port); - apiConfigParameters[0] = "-c"; - apiConfigParameters[1] = "src/test/resources/parameters/ApiConfigParametersXXX.json"; - } else { - final Properties systemProps = System.getProperties(); - systemProps.put("javax.net.ssl.keyStore", KEYSTORE); - systemProps.put("javax.net.ssl.keyStorePassword", "Pol1cy_0nap"); - System.setProperties(systemProps); - COMMON_TEST_DATA.makeParameters("src/test/resources/parameters/ApiConfigParameters_Https.json", - "src/test/resources/parameters/ApiConfigParameters_HttpsXXX.json", port); - apiConfigParameters[0] = "-c"; - apiConfigParameters[1] = "src/test/resources/parameters/ApiConfigParameters_HttpsXXX.json"; - } - return new Main(apiConfigParameters); - } - - private void stopApiService(final Main main) throws PolicyApiException { - - main.shutdown(); - } - - private Invocation.Builder sendHttpRequest(final String endpoint, String mediaType) throws Exception { - - final ClientConfig clientConfig = new ClientConfig(); - - final HttpAuthenticationFeature feature = HttpAuthenticationFeature.basic("healthcheck", "zb!XztG34"); - clientConfig.register(feature); - - final Client client = ClientBuilder.newClient(clientConfig); - - 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("http://localhost:" + port + "/policy/api/v1/" + endpoint); - - final Invocation.Builder invocationBuilder = webTarget.request(mediaType); - - if (!NetworkUtil.isTcpPortOpen("localhost", port, 60, 1000L)) { - throw new IllegalStateException("cannot connect to port " + port); - } - return invocationBuilder; - } - private Invocation.Builder sendHttpsRequest(final String endpoint, String mediaType) throws Exception { - final TrustManager[] noopTrustManager = new TrustManager[] { new X509TrustManager() { - - @Override - public X509Certificate[] getAcceptedIssuers() { - return new X509Certificate[0]; - } - - @Override - public void checkClientTrusted(final java.security.cert.X509Certificate[] certs, final String authType) {} - - @Override - public void checkServerTrusted(final java.security.cert.X509Certificate[] certs, final String authType) {} - } }; + final TrustManager[] noopTrustManager = NetworkUtil.getAlwaysTrustingManager(); final SSLContext sc = SSLContext.getInstance("TLSv1.2"); sc.init(null, noopTrustManager, new SecureRandom()); @@ -1586,12 +1064,12 @@ public class TestApiRestServer { client.register(YamlMessageBodyHandler.class); } - final WebTarget webTarget = client.target("https://localhost:" + port + "/policy/api/v1/" + endpoint); + final WebTarget webTarget = client.target("https://localhost:" + apiPort + "/policy/api/v1/" + endpoint); final Invocation.Builder invocationBuilder = webTarget.request(mediaType); - if (!NetworkUtil.isTcpPortOpen("localhost", port, 60, 1000L)) { - throw new IllegalStateException("cannot connect to port " + port); + if (!NetworkUtil.isTcpPortOpen("localhost", apiPort, 60, 1000L)) { + throw new IllegalStateException("cannot connect to port " + apiPort); } return invocationBuilder; }