private boolean https;
private boolean aaf;
-
public String getHost() {
return host;
}
*
*/
public class XacmlPdpParameterGroup implements ParameterGroup {
+ private static final String PARAM_REST_SERVER = "restServerParameters";
+ private static final String PARAM_APPLICATION_PATH = "applicationPath";
private String name;
private RestServerParameters restServerParameters;
+ private String applicationPath;
/**
* Create the xacml pdp parameter group.
*
* @param name the parameter group name
*/
- public XacmlPdpParameterGroup(final String name, final RestServerParameters restServerParameters) {
+ public XacmlPdpParameterGroup(final String name, final RestServerParameters restServerParameters,
+ final String applicationPath) {
this.name = name;
this.restServerParameters = restServerParameters;
+ this.applicationPath = applicationPath;
}
/**
return restServerParameters;
}
+ /**
+ * Returns the path where applications will store their data.
+ *
+ * @return String to the path
+ */
+ public String getApplicationPath() {
+ return applicationPath;
+ }
+
/**
* Validate the parameter group.
*
validationResult.setResult("name", ValidationStatus.INVALID, "must be a non-blank string");
}
if (restServerParameters == null) {
- validationResult.setResult("restServerParameters", ValidationStatus.INVALID,
+ validationResult.setResult(PARAM_REST_SERVER, ValidationStatus.INVALID,
"must have restServerParameters to configure xacml pdp rest server");
} else {
- validationResult.setResult("restServerParameters", restServerParameters.validate());
+ validationResult.setResult(PARAM_REST_SERVER, restServerParameters.validate());
+ }
+ //
+ // Validate the application path directory
+ //
+ if (applicationPath == null || applicationPath.isEmpty()) {
+ validationResult.setResult(PARAM_APPLICATION_PATH, ValidationStatus.INVALID,
+ "must have application path for applications to store policies and data.");
}
return validationResult;
}
--- /dev/null
+/*-
+ * ============LICENSE_START=======================================================
+ * Copyright (C) 2019 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ * ============LICENSE_END=========================================================
+ */
+
+package org.onap.policy.pdpx.main.rest;
+
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.ServiceLoader;
+
+import org.onap.policy.models.decisions.concepts.DecisionRequest;
+import org.onap.policy.pdp.xacml.application.common.XacmlApplicationServiceProvider;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class XacmlPdpApplicationManager {
+ private static final Logger LOGGER = LoggerFactory.getLogger(XacmlPdpApplicationManager.class);
+
+ private static boolean needsInit = true;
+ private static ServiceLoader<XacmlApplicationServiceProvider> applicationLoader;
+ private static Map<String, XacmlApplicationServiceProvider> providerActionMap = new HashMap<>();
+
+ private XacmlPdpApplicationManager() {
+ super();
+ }
+
+ /**
+ * One time to initialize the applications upon startup.
+ */
+ public static void initializeApplications(Path applicationPath) {
+ //
+ // If we have already done this
+ //
+ if (! needsInit) {
+ LOGGER.error("Already initialized the applications");
+ return;
+ }
+ //
+ // Load service
+ //
+ applicationLoader = ServiceLoader.load(XacmlApplicationServiceProvider.class);
+ //
+ // Iterate through them
+ //
+ Iterator<XacmlApplicationServiceProvider> iterator = applicationLoader.iterator();
+ while (iterator.hasNext()) {
+ //
+ // Get the application
+ //
+ XacmlApplicationServiceProvider application = iterator.next();
+ LOGGER.info("Application {} supports {}", application.applicationName(),
+ application.supportedPolicyTypes());
+ //
+ // Iterate each application
+ //
+ int pathCount = 1;
+ for (String action : application.actionDecisionsSupported()) {
+ //
+ // Save the actions that it supports
+ //
+ providerActionMap.put(action, application);
+ //
+ // Create a unique path for the application to store its data
+ // May need to scan this name to remove unsafe characters etc.
+ // But for debugging purposes, its good to use the application name
+ //
+ //
+ Path path = Paths.get(applicationPath.toAbsolutePath().toString(),
+ application.applicationName(), Integer.toString(pathCount++));
+ //
+ // Have the application initialize
+ //
+ application.initialize(path);
+ }
+ }
+ //
+ // we have initialized
+ //
+ needsInit = false;
+ }
+
+ public static XacmlApplicationServiceProvider findApplication(DecisionRequest request) {
+ return providerActionMap.get(request.getAction());
+ }
+
+ /**
+ * Returns the current count of policy types supported. This could be misleading a bit
+ * as some applications can support wildcard of policy types. Eg. onap.Monitoring.* as
+ * well as individual types/versions. Nevertheless useful for debugging and testing.
+ *
+ * @return Total count added from all applications
+ */
+ public static long getPolicyTypeCount() {
+ Iterator<XacmlApplicationServiceProvider> iterator = applicationLoader.iterator();
+ long types = 0;
+ while (iterator.hasNext()) {
+ XacmlApplicationServiceProvider application = iterator.next();
+ types += application.supportedPolicyTypes().size();
+ }
+ return types;
+ }
+
+}
import io.swagger.annotations.ResponseHeader;
import io.swagger.annotations.SecurityDefinition;
import io.swagger.annotations.SwaggerDefinition;
+
import java.util.UUID;
+
import javax.ws.rs.Consumes;
import javax.ws.rs.GET;
import javax.ws.rs.HeaderParam;
import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.Response;
import javax.ws.rs.core.Response.ResponseBuilder;
+
import org.onap.policy.common.endpoints.report.HealthCheckReport;
-import org.onap.policy.pdpx.main.rest.model.Decision;
+import org.onap.policy.models.decisions.concepts.DecisionException;
+import org.onap.policy.models.decisions.concepts.DecisionRequest;
+import org.onap.policy.models.decisions.concepts.DecisionResponse;
+import org.onap.policy.models.errors.concepts.ErrorResponse;
import org.onap.policy.pdpx.main.rest.model.StatisticsReport;
import org.onap.policy.pdpx.main.rest.provider.DecisionProvider;
import org.onap.policy.pdpx.main.rest.provider.HealthCheckProvider;
.entity(new StatisticsProvider().fetchCurrentStatistics()).build();
}
+ /**
+ * Our decision entry point.
+ *
+ * @param body Should be a DecisionRequest object
+ * @param requestId Unique request id
+ * @return DecisionResponse or ErrorResponse object
+ */
@POST
@Path("/decision")
@ApiOperation(value = "Fetch the decision using specified decision parameters",
- notes = "Returns the policy decision from Policy Xacml PDP", response = Decision.class,
+ notes = "Returns the policy decision from Policy Xacml PDP", response = DecisionResponse.class,
responseHeaders = {
@ResponseHeader(name = "X-MinorVersion",
description = "Used to request or communicate a MINOR version back from the client"
extensions = {@Extension(name = "interface info",
properties = {@ExtensionProperty(name = "pdpx-version", value = "1.0.0"),
@ExtensionProperty(name = "last-mod-release", value = "Dublin")})})
- @ApiResponses(value = {@ApiResponse(code = 400, message = "Bad Request"),
+ @ApiResponses(value = {@ApiResponse(code = 400, message = "Bad Request", response = ErrorResponse.class),
@ApiResponse(code = 401, message = "Authentication Error"),
@ApiResponse(code = 403, message = "Authorization Error"),
@ApiResponse(code = 500, message = "Internal Server Error")})
- public Response decision(Decision body,
+ public Response decision(DecisionRequest body,
@HeaderParam("X-ONAP-RequestID") @ApiParam("RequestID for http transaction") UUID requestId) {
- return addLoggingHeaders(addVersionControlHeaders(Response.status(Response.Status.OK)), requestId)
- .entity(new DecisionProvider().fetchDecision()).build();
+ try {
+ return addLoggingHeaders(addVersionControlHeaders(Response.status(Response.Status.OK)), requestId)
+ .entity(new DecisionProvider().fetchDecision(body)).build();
+ } catch (DecisionException e) {
+ return addLoggingHeaders(
+ addVersionControlHeaders(Response.status((e.getErrorResponse().getResponseCode()))), requestId)
+ .entity(e.getErrorResponse()).build();
+ }
}
private ResponseBuilder addVersionControlHeaders(ResponseBuilder rb) {
package org.onap.policy.pdpx.main.rest;
+import java.nio.file.Paths;
import java.util.ArrayList;
-import java.util.Iterator;
import java.util.List;
import java.util.Properties;
-import java.util.ServiceLoader;
import org.onap.policy.common.capabilities.Startable;
import org.onap.policy.common.endpoints.http.server.HttpServletServer;
-import org.onap.policy.pdp.xacml.application.common.XacmlApplicationServiceProvider;
+import org.onap.policy.common.gson.GsonMessageBodyHandler;
import org.onap.policy.pdpx.main.parameters.RestServerParameters;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
private List<HttpServletServer> servers = new ArrayList<>();
private RestServerParameters restServerParameters;
-
- private ServiceLoader<XacmlApplicationServiceProvider> applicationLoader;
+ private String applicationPath;
/**
* Constructor for instantiating XacmlPdpRestServer.
*
* @param restServerParameters the rest server parameters
*/
- public XacmlPdpRestServer(final RestServerParameters restServerParameters) {
+ public XacmlPdpRestServer(final RestServerParameters restServerParameters, final String applicationPath) {
this.restServerParameters = restServerParameters;
+ this.applicationPath = applicationPath;
}
/**
public boolean start() {
try {
//
- // Look for existing policy types loaded into the system
+ // Initialize the applications - SEND PROPERTIES
+ //
+ XacmlPdpApplicationManager.initializeApplications(Paths.get(applicationPath));
+ //
+ // Update statistics manager on the policy types
//
- locateExistingPolicyTypes();
+ XacmlPdpStatisticsManager.setTotalPolicyTypesCount(XacmlPdpApplicationManager.getPolicyTypeCount());
//
// Get the server properties
//
String.valueOf(restServerParameters.isHttps()));
props.setProperty(HTTP_SERVER_SERVICES + SEPARATOR + restServerParameters.getName() + ".aaf",
String.valueOf(restServerParameters.isAaf()));
+ props.setProperty(HTTP_SERVER_SERVICES + SEPARATOR + restServerParameters.getName() + ".serialization.provider",
+ GsonMessageBodyHandler.class.getName());
return props;
}
- private void locateExistingPolicyTypes() {
- //
- // Load service
- //
- applicationLoader = ServiceLoader.load(XacmlApplicationServiceProvider.class);
- //
- // Iterate through them
- //
- StringBuilder strDump = new StringBuilder("Loaded applications:" + System.lineSeparator());
- Iterator<XacmlApplicationServiceProvider> iterator = applicationLoader.iterator();
- long types = 0;
- while (iterator.hasNext()) {
- XacmlApplicationServiceProvider application = iterator.next();
- strDump.append(application.applicationName());
- strDump.append(" supports ");
- strDump.append(application.supportedPolicyTypes());
- types += application.supportedPolicyTypes().size();
- strDump.append(System.lineSeparator());
- }
- LOGGER.debug("{}", strDump);
- //
- // Update statistics manager
- //
- XacmlPdpStatisticsManager.setTotalPolicyTypesCount(types);
- }
-
/**
* {@inheritDoc}.
*/
+++ /dev/null
-/*-
- * ============LICENSE_START=======================================================
- * Copyright (C) 2019 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-
-package org.onap.policy.pdpx.main.rest.model;
-
-import java.util.List;
-import java.util.Map;
-
-public class Decision {
-
- String onapName;
-
- String onapComponent;
-
- String onapInstance;
-
- String action;
-
- List<Map<String, Object>> resource;
-}
package org.onap.policy.pdpx.main.rest.provider;
-import org.onap.policy.pdpx.main.rest.model.Decision;
+import javax.ws.rs.core.Response.Status;
+
+import org.onap.policy.models.decisions.concepts.DecisionException;
+import org.onap.policy.models.decisions.concepts.DecisionRequest;
+import org.onap.policy.models.decisions.concepts.DecisionResponse;
+import org.onap.policy.pdp.xacml.application.common.XacmlApplicationServiceProvider;
+import org.onap.policy.pdpx.main.rest.XacmlPdpApplicationManager;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class DecisionProvider {
+ private static final Logger LOGGER = LoggerFactory.getLogger(DecisionProvider.class);
/**
* Retrieves the policy decision for the specified parameters.
+ * @param body
*
* @return the Decision object
*/
- public Decision fetchDecision() {
- // placeholder
- return new Decision();
+ public DecisionResponse fetchDecision(DecisionRequest request) {
+ LOGGER.debug("Fetching decision {}", request);
+ //
+ // Find application for this decision
+ //
+ XacmlApplicationServiceProvider application = findApplication(request);
+ //
+ // Cannot find application for action
+ //
+ return application.makeDecision(request);
+ }
+
+ private XacmlApplicationServiceProvider findApplication(DecisionRequest request) {
+ XacmlApplicationServiceProvider application = XacmlPdpApplicationManager.findApplication(request);
+ if (application != null) {
+ return application;
+ }
+ throw new DecisionException(Status.BAD_REQUEST, "No application for action " + request.getAction());
}
}
*/
private void startXacmlPdpRestServer() throws PolicyXacmlPdpException {
xacmlPdpParameterGroup.getRestServerParameters().setName(xacmlPdpParameterGroup.getName());
- restServer = new XacmlPdpRestServer(xacmlPdpParameterGroup.getRestServerParameters());
+ restServer = new XacmlPdpRestServer(xacmlPdpParameterGroup.getRestServerParameters(),
+ xacmlPdpParameterGroup.getApplicationPath());
if (!restServer.start()) {
throw new PolicyXacmlPdpException("Failed to start xacml pdp rest server. Check log for more details...");
}
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
+import java.io.File;
+import java.io.IOException;
+
+import org.junit.Before;
+import org.junit.ClassRule;
import org.junit.Test;
+import org.junit.rules.TemporaryFolder;
import org.onap.policy.common.parameters.GroupValidationResult;
/**
*/
public class TestXacmlPdpParameterGroup {
CommonTestData commonTestData = new CommonTestData();
+ private static File applicationPath;
+
+ @ClassRule
+ public static final TemporaryFolder applicationFolder = new TemporaryFolder();
+
+ @Before
+ public void setupPath() throws IOException {
+ applicationPath = applicationFolder.newFolder();
+ }
@Test
- public void testXacmlPdpParameterGroup() {
+ public void testXacmlPdpParameterGroup() throws IOException {
final RestServerParameters restServerParameters = commonTestData.getRestServerParameters(false);
final XacmlPdpParameterGroup pdpxParameters =
- new XacmlPdpParameterGroup(CommonTestData.PDPX_GROUP_NAME, restServerParameters);
+ new XacmlPdpParameterGroup(CommonTestData.PDPX_GROUP_NAME,
+ restServerParameters,
+ applicationPath.getAbsolutePath());
final GroupValidationResult validationResult = pdpxParameters.validate();
assertTrue(validationResult.isValid());
assertEquals(restServerParameters.getHost(), pdpxParameters.getRestServerParameters().getHost());
@Test
public void testXacmlPdpParameterGroup_NullName() {
final RestServerParameters restServerParameters = commonTestData.getRestServerParameters(false);
- final XacmlPdpParameterGroup pdpxParameters = new XacmlPdpParameterGroup(null, restServerParameters);
+ final XacmlPdpParameterGroup pdpxParameters = new XacmlPdpParameterGroup(null, restServerParameters,
+ applicationPath.getAbsolutePath());
final GroupValidationResult validationResult = pdpxParameters.validate();
assertFalse(validationResult.isValid());
assertEquals(null, pdpxParameters.getName());
public void testXacmlPdpParameterGroup_EmptyName() {
final RestServerParameters restServerParameters = commonTestData.getRestServerParameters(false);
- final XacmlPdpParameterGroup pdpxParameters = new XacmlPdpParameterGroup("", restServerParameters);
+ final XacmlPdpParameterGroup pdpxParameters = new XacmlPdpParameterGroup("", restServerParameters,
+ applicationPath.getAbsolutePath());
final GroupValidationResult validationResult = pdpxParameters.validate();
assertFalse(validationResult.isValid());
assertEquals("", pdpxParameters.getName());
final RestServerParameters restServerParameters = commonTestData.getRestServerParameters(true);
final XacmlPdpParameterGroup pdpxParameters =
- new XacmlPdpParameterGroup(CommonTestData.PDPX_GROUP_NAME, restServerParameters);
+ new XacmlPdpParameterGroup(CommonTestData.PDPX_GROUP_NAME, restServerParameters,
+ applicationPath.getAbsolutePath());
final GroupValidationResult validationResult = pdpxParameters.validate();
assertFalse(validationResult.isValid());
assertTrue(validationResult.getResult()
noArguments.parse(noArgumentString);
assertThatThrownBy(() -> new XacmlPdpParameterHandler().getParameters(noArguments))
- .hasMessage("validation error(s) on parameters from \"parameters/NoParameters.json\"\nparameter group "
- + "\"null\" type \"org.onap.policy.pdpx.main.parameters.XacmlPdpParameterGroup\" INVALID, "
- + "parameter group has status INVALID\n"
- + " field \"name\" type \"java.lang.String\" value \"null\" "
- + "INVALID, must be a non-blank string\n");
+ .hasMessage("validation error(s) on parameters from \"parameters/NoParameters.json\"\n"
+ + "parameter group \"null\" type "
+ + "\"org.onap.policy.pdpx.main.parameters.XacmlPdpParameterGroup\""
+ + " INVALID, parameter group has status INVALID\n"
+ + " field \"name\" type \"java.lang.String\" value \"null\" INVALID, "
+ + "must be a non-blank string\n"
+ + " field \"applicationPath\" type \"java.lang.String\" value \"null\" INVALID, "
+ + "must have application path for applications to store policies and data.\n");
}
@Test
--- /dev/null
+/*-
+ * ============LICENSE_START=======================================================
+ * Copyright (C) 2019 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ * ============LICENSE_END=========================================================
+ */
+
+package org.onap.policy.pdpx.main.rest;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.Assert.assertEquals;
+
+import java.io.IOException;
+import java.security.KeyManagementException;
+import java.security.NoSuchAlgorithmException;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Map;
+
+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.MediaType;
+import javax.ws.rs.core.Response;
+import javax.ws.rs.core.Response.Status;
+
+import org.glassfish.jersey.client.ClientConfig;
+import org.glassfish.jersey.client.authentication.HttpAuthenticationFeature;
+import org.junit.AfterClass;
+import org.junit.BeforeClass;
+import org.junit.Test;
+import org.onap.policy.common.endpoints.event.comm.bus.internal.BusTopicParams;
+import org.onap.policy.common.endpoints.http.client.HttpClient;
+import org.onap.policy.common.gson.GsonMessageBodyHandler;
+import org.onap.policy.common.utils.network.NetworkUtil;
+import org.onap.policy.models.decisions.concepts.DecisionRequest;
+import org.onap.policy.models.decisions.concepts.DecisionResponse;
+import org.onap.policy.models.errors.concepts.ErrorResponse;
+import org.onap.policy.pdpx.main.PolicyXacmlPdpException;
+import org.onap.policy.pdpx.main.startstop.Main;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class TestDecision {
+
+ private static final Logger LOGGER = LoggerFactory.getLogger(TestDecision.class);
+
+ private static Main main;
+
+ /**
+ * BeforeClass setup environment.
+ */
+ @BeforeClass
+ public static void beforeClass() {
+ System.setProperty("org.eclipse.jetty.util.log.class", "org.eclipse.jetty.util.log.StdErrLog");
+ System.setProperty("org.eclipse.jetty.LEVEL", "OFF");
+ main = startXacmlPdpService();
+ }
+
+ @AfterClass
+ public static void after() throws PolicyXacmlPdpException {
+ stopXacmlPdpService(main);
+ }
+
+ @Test
+ public void testDecision_UnsupportedAction() throws KeyManagementException, NoSuchAlgorithmException,
+ ClassNotFoundException {
+
+ LOGGER.info("Running test testDecision_UnsupportedAction");
+
+ DecisionRequest request = new DecisionRequest();
+ request.setOnapName("DROOLS");
+ request.setAction("foo");
+ Map<String, Object> guard = new HashMap<String, Object>();
+ guard.put("actor", "foo");
+ guard.put("recipe", "bar");
+ guard.put("target", "somevnf");
+ guard.put("clname", "phoneyloop");
+ request.setResource(guard);
+
+ ErrorResponse response = getErrorDecision(request);
+ LOGGER.info("Response {}", response);
+ assertThat(response.getResponseCode()).isEqualTo(Status.BAD_REQUEST);
+ assertThat(response.getErrorMessage()).isEqualToIgnoringCase("No application for action foo");
+ }
+
+ @Test
+ public void testDecision_Guard() throws InterruptedException, IOException {
+ LOGGER.info("Running test testDecision_Guard");
+
+ DecisionRequest request = new DecisionRequest();
+ request.setOnapName("DROOLS");
+ request.setAction("guard");
+ Map<String, Object> guard = new HashMap<String, Object>();
+ guard.put("actor", "foo");
+ guard.put("recipe", "bar");
+ guard.put("target", "somevnf");
+ guard.put("clname", "phoneyloop");
+ request.setResource(guard);
+
+ DecisionResponse response = getDecision(request);
+ LOGGER.info("Response {}", response);
+ //assertThat(response.getErrorMessage()).isEqualToIgnoringCase("No application for action foo");
+ }
+
+ private static Main startXacmlPdpService() {
+ final String[] XacmlPdpConfigParameters = {"-c", "parameters/XacmlPdpConfigParameters.json"};
+ return new Main(XacmlPdpConfigParameters);
+ }
+
+ private static void stopXacmlPdpService(final Main main) throws PolicyXacmlPdpException {
+ main.shutdown();
+ }
+
+ private DecisionResponse getDecision(DecisionRequest request) throws InterruptedException, IOException {
+ final ClientConfig clientConfig = new ClientConfig();
+
+ final HttpAuthenticationFeature feature = HttpAuthenticationFeature.basic("healthcheck", "zb!XztG34");
+ clientConfig.register(feature);
+
+ final Client client = ClientBuilder.newClient(clientConfig);
+ final WebTarget webTarget = client.target("http://localhost:6969/policy/pdpx/v1/decision");
+
+ final Invocation.Builder invocationBuilder = webTarget.request(MediaType.APPLICATION_JSON);
+
+ if (!NetworkUtil.isTcpPortOpen("localhost", 6969, 6, 10000L)) {
+ throw new IllegalStateException("Cannot connect to port 6969");
+ }
+
+ return invocationBuilder.post(Entity.json(request), DecisionResponse.class);
+ }
+
+ private ErrorResponse getErrorDecision(DecisionRequest request) throws KeyManagementException,
+ NoSuchAlgorithmException, ClassNotFoundException {
+
+ HttpClient client = getNoAuthHttpClient();
+
+ Entity<DecisionRequest> entityRequest = Entity.entity(request, MediaType.APPLICATION_JSON);
+ Response response = client.post("", entityRequest, Collections.emptyMap());
+
+ assertEquals(400, response.getStatus());
+
+ return HttpClient.getBody(response, ErrorResponse.class);
+ }
+
+ private HttpClient getNoAuthHttpClient()
+ throws KeyManagementException, NoSuchAlgorithmException, ClassNotFoundException {
+ return HttpClient.factory.build(BusTopicParams.builder()
+ .clientName("testDecisionClient")
+ .serializationProvider(GsonMessageBodyHandler.class.getName())
+ .useHttps(false).allowSelfSignedCerts(false).hostname("localhost").port(6969)
+ .basePath("policy/pdpx/v1/decision")
+ .userName("healthcheck").password("zb!XztG34").managed(true).build());
+ }
+
+
+}
\ No newline at end of file
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 org.glassfish.jersey.client.authentication.HttpAuthenticationFeature;
import org.junit.After;
import org.junit.BeforeClass;
+import org.junit.ClassRule;
import org.junit.Test;
+import org.junit.rules.TemporaryFolder;
import org.onap.policy.common.endpoints.report.HealthCheckReport;
import org.onap.policy.common.utils.network.NetworkUtil;
import org.onap.policy.pdpx.main.PolicyXacmlPdpException;
private static String KEYSTORE = System.getProperty("user.dir") + "/src/test/resources/ssl/policy-keystore";
private Main main;
private XacmlPdpRestServer restServer;
+ private static File applicationPath;
+
+ @ClassRule
+ public static final TemporaryFolder applicationFolder = new TemporaryFolder();
/**
* setup.
+ *
+ * @throws IOException exception if cannot create temporary folder
*/
@BeforeClass
- public static void setUp() {
+ public static void setUp() throws IOException {
System.setProperty("org.eclipse.jetty.util.log.class", "org.eclipse.jetty.util.log.StdErrLog");
System.setProperty("org.eclipse.jetty.LEVEL", "OFF");
-
+ applicationPath = applicationFolder.newFolder();
}
/**
public void testHealthCheckFailure() throws InterruptedException, IOException {
final RestServerParameters restServerParams = new CommonTestData().getRestServerParameters(false);
restServerParams.setName(CommonTestData.PDPX_GROUP_NAME);
- restServer = new XacmlPdpRestServer(restServerParams);
+ restServer = new XacmlPdpRestServer(restServerParams, applicationPath.getAbsolutePath());
restServer.start();
final Invocation.Builder invocationBuilder = sendHttpRequest(HEALTHCHECK_ENDPOINT);
final HealthCheckReport report = invocationBuilder.get(HealthCheckReport.class);
public void testStatistics_500() throws IOException, InterruptedException {
final RestServerParameters restServerParams = new CommonTestData().getRestServerParameters(false);
restServerParams.setName(CommonTestData.PDPX_GROUP_NAME);
- restServer = new XacmlPdpRestServer(restServerParams);
+ restServer = new XacmlPdpRestServer(restServerParams, applicationPath.getAbsolutePath());
restServer.start();
final Invocation.Builder invocationBuilder = sendHttpRequest(STATISTICS_ENDPOINT);
final StatisticsReport report = invocationBuilder.get(StatisticsReport.class);
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.fail;
+import java.io.File;
import java.io.IOException;
import javax.ws.rs.client.Client;
import javax.ws.rs.client.ClientBuilder;
import javax.ws.rs.core.MediaType;
import org.glassfish.jersey.client.ClientConfig;
import org.glassfish.jersey.client.authentication.HttpAuthenticationFeature;
+import org.junit.Before;
import org.junit.BeforeClass;
+import org.junit.ClassRule;
import org.junit.Test;
+import org.junit.rules.TemporaryFolder;
import org.onap.policy.common.utils.network.NetworkUtil;
import org.onap.policy.pdpx.main.PolicyXacmlPdpException;
import org.onap.policy.pdpx.main.parameters.CommonTestData;
public class TestXacmlPdpStatistics {
private static final Logger LOGGER = LoggerFactory.getLogger(TestXacmlPdpStatistics.class);
+ private static File applicationPath;
+ @ClassRule
+ public static final TemporaryFolder applicationFolder = new TemporaryFolder();
+
+ /**
+ * Turn off some debugging and create temporary folder for applications.
+ *
+ * @throws IOException If temporary folder fails
+ */
@BeforeClass
- public static void beforeClass() {
+ public static void beforeClass() throws IOException {
System.setProperty("org.eclipse.jetty.util.log.class", "org.eclipse.jetty.util.log.StdErrLog");
System.setProperty("org.eclipse.jetty.LEVEL", "OFF");
+ applicationPath = applicationFolder.newFolder();
}
@Test
public void testXacmlPdpStatistics_500() throws InterruptedException {
final RestServerParameters restServerParams = new CommonTestData().getRestServerParameters(false);
restServerParams.setName(CommonTestData.PDPX_GROUP_NAME);
- final XacmlPdpRestServer restServer = new XacmlPdpRestServer(restServerParams);
+ final XacmlPdpRestServer restServer = new XacmlPdpRestServer(restServerParams,
+ applicationPath.getAbsolutePath());
try {
restServer.start();
"port": 6969,
"userName": "healthcheck",
"password": "zb!XztG34"
- }
+ },
+ "applicationPath": "apps.test"
}
"port": 6969,
"userName": "healthcheck",
"password": "zb!XztG34"
- }
+ },
+ "applicationPath": "apps.test"
}
"userName":"healthcheck",
"password":"zb!XztG34",
"https":true
- }
+ },
+ "applicationPath": "apps.test"
}
\ No newline at end of file
Code Review / policy / xacml-pdp.git / commitdiff