private XacmlPdpActivator activator;
@Getter
- private String argumentMessage = null;
+ private String argumentMessage;
/**
* Instantiates the policy xacml pdp service.
/**
* Shut down Execution.
*
- * @throws PolicyXacmlPdpException on shutdown errors
*/
public synchronized void shutdown() {
// clear the xacml pdp activator
private static final Logger LOGGER = LoggerFactory.getLogger(XacmlPdpActivator.class);
private static final String[] MSG_TYPE_NAMES = {"messageName"};
- private static final String TOPIC = "POLICY-PDP-PAP";
+ private static final String TOPIC = "policy-pdp-pap";
@Getter
@Setter
private static XacmlPdpActivator current = null;
- private final XacmlPdpRestServer restServer;
// The parameters of this policy xacml pdp activator
private final XacmlPdpParameterGroup xacmlPdpParameterGroup;
/**
* POLICY-PDP-PAP client.
*/
- private BidirectionalTopicClient topicClient;
+ private final BidirectionalTopicClient topicClient;
/**
* Listens for messages on the topic, decodes them into a {@link PdpStatus} message, and then
final TopicSinkClient sinkClient;
final XacmlState state;
+ XacmlPdpRestServer restServer;
try {
HttpClient apiClient = HttpClientFactoryInstance.getClientFactory().build(apiClientParams);
"topicSources" : [{
"topic" : "POLICY-PDP-PAP",
"servers" : [ "message-router" ],
- "topicCommInfrastructure" : "dmaap",
+ "topicCommInfrastructure" : "kafka",
"fetchTimeout": 15000
}],
"topicSinks" : [{
"topic" : "POLICY-PDP-PAP",
"servers" : [ "message-router" ],
- "topicCommInfrastructure" : "dmaap"
+ "topicCommInfrastructure" : "kafka"
}]
}
}
+++ /dev/null
-{
- "dmaapProvider": {
- "name": "DMaaP simulator",
- "topicSweepSec": 300
- },
- "restServers": [
- {
- "name": "DMaaP simulator",
- "providerClass": "org.onap.policy.models.sim.dmaap.rest.DmaapSimRestControllerV1",
- "host": "0.0.0.0",
- "port": 3904,
- "https": false
- }
- ]
-}
\ No newline at end of file
#
# SPDX-License-Identifier: Apache-2.0
# ============LICENSE_END=========================================================
-version: '2'
+version: '3'
services:
- mariadb:
- image: ${CONTAINER_LOCATION}mariadb:${POLICY_MARIADB_VER}
- container_name: mariadb
- hostname: mariadb
- command: ['--lower-case-table-names=1', '--wait_timeout=28800']
- env_file: config/db/db.conf
- volumes:
- - ./config/db:/docker-entrypoint-initdb.d
- expose:
- - 3306
- message-router:
- image: ${CONTAINER_LOCATION}onap/policy-models-simulator:${POLICY_MODELS_VERSION}
- container_name: dmaap-simulator
- hostname: dmaap-simulator
- volumes:
- - ./config/sim:/opt/app/policy/simulators/etc/mounted:ro
- ports:
- - "3904:3904"
- expose:
- - 3904
- api:
- image: ${CONTAINER_LOCATION}onap/policy-api:${POLICY_API_VERSION}
- container_name: policy-api
- depends_on:
- - mariadb
- hostname: policy-api
- ports:
- - "6767:6969"
- expose:
- - 6767
- pap:
- image: ${CONTAINER_LOCATION}onap/policy-pap:${POLICY_PAP_VERSION}
- container_name: policy-pap
- depends_on:
- - mariadb
- - message-router
- - api
- hostname: policy-pap
- ports:
- - "6868:6969"
- expose:
- - 6868
- xacml-pdp:
- image: onap/policy-xacml-tutorial:${POLICY_XACML_TUTORIAL_VERSION}
- container_name: policy-xacml-pdp
- depends_on:
- - mariadb
- - message-router
- - api
- - pap
- hostname: policy-xacml-pdp
- ports:
- - "6969:6969"
- expose:
- - 6969
- start_dependencies:
- image: dadarek/wait-for-dependencies
- environment:
- TIMEOUT_LENGTH: 60
- container_name: policy-wait
- depends_on:
- - mariadb
- - message-router
- hostname: policy-wait
- command:
- mariadb:3306
- message-router:3904
- start_all:
- image: dadarek/wait-for-dependencies
- environment:
- TIMEOUT_LENGTH: 60
- container_name: policy-wait-all
- depends_on:
- - mariadb
- - message-router
- - api
- - pap
- - xacml-pdp
- hostname: policy-wait-all
- command:
- mariadb:3306
- message-router:3904
- api:6969
- pap:6969
- xacml-pdp:6969
+ mariadb:
+ image: ${CONTAINER_LOCATION}mariadb:${POLICY_MARIADB_VER}
+ container_name: mariadb
+ hostname: mariadb
+ command: [ '--lower-case-table-names=1', '--wait_timeout=28800' ]
+ env_file: config/db/db.conf
+ volumes:
+ - ./config/db:/docker-entrypoint-initdb.d
+ expose:
+ - 3306
+ api:
+ image: ${CONTAINER_LOCATION}onap/policy-api:${POLICY_API_VERSION}
+ container_name: policy-api
+ depends_on:
+ - mariadb
+ hostname: policy-api
+ ports:
+ - "6767:6969"
+ expose:
+ - 6767
+ pap:
+ image: ${CONTAINER_LOCATION}onap/policy-pap:${POLICY_PAP_VERSION}
+ container_name: policy-pap
+ depends_on:
+ - mariadb
+ - kafka
+ - api
+ hostname: policy-pap
+ ports:
+ - "6868:6969"
+ expose:
+ - 6868
+ xacml-pdp:
+ image: onap/policy-xacml-tutorial:${POLICY_XACML_TUTORIAL_VERSION}
+ container_name: policy-xacml-pdp
+ depends_on:
+ - mariadb
+ - pap
+ hostname: policy-xacml-pdp
+ ports:
+ - "6969:6969"
+ expose:
+ - 6969
+ start_dependencies:
+ image: dadarek/wait-for-dependencies
+ environment:
+ TIMEOUT_LENGTH: 60
+ container_name: policy-wait
+ depends_on:
+ - mariadb
+ - kafka
+ hostname: policy-wait
+ command:
+ mariadb:3306
+ kafka:9092
+ start_all:
+ image: dadarek/wait-for-dependencies
+ environment:
+ TIMEOUT_LENGTH: 60
+ container_name: policy-wait-all
+ depends_on:
+ - mariadb
+ - kafka
+ - api
+ - pap
+ - xacml-pdp
+ hostname: policy-wait-all
+ command:
+ mariadb:3306
+ kafka:9092
+ api:6969
+ pap:6969
+ xacml-pdp:6969
+ zookeeper:
+ image: confluentinc/cp-zookeeper:latest
+ environment:
+ ZOOKEEPER_CLIENT_PORT: 2181
+ ZOOKEEPER_TICK_TIME: 2000
+ ports:
+ - "2181:2181"
+ kafka:
+ image: confluentinc/cp-kafka:latest
+ container_name: kafka
+ depends_on:
+ - zookeeper
+ networks:
+ default:
+ aliases:
+ - message-router
+ ports:
+ - "29092:29092"
+ - "9092:9092"
+ environment:
+ KAFKA_BROKER_ID: 1
+ KAFKA_ZOOKEEPER_CONNECT: zookeeper:2181
+ KAFKA_ADVERTISED_LISTENERS: PLAINTEXT://kafka:9092,PLAINTEXT_HOST://localhost:29092
+ KAFKA_LISTENER_SECURITY_PROTOCOL_MAP: PLAINTEXT:PLAINTEXT,PLAINTEXT_HOST:PLAINTEXT
+ KAFKA_INTER_BROKER_LISTENER_NAME: PLAINTEXT
+ KAFKA_OFFSETS_TOPIC_REPLICATION_FACTOR: 1
if [ -z "$POLICY_XACML_TUTORIAL_VERSION" ]
then
- echo "Look up of the XACML tutorial version failed, have you built the tutorial docker iamge?"
+ echo "Look up of the XACML tutorial version failed, have you built the tutorial docker image?"
exit 1
else
export POLICY_XACML_TUTORIAL_VERSION
/*-
* ============LICENSE_START=======================================================
* Copyright (C) 2020 AT&T Intellectual Property. All rights reserved.
- * Modifications Copyright (C) 2021 Nordix Foundation.
+ * Modifications Copyright (C) 2021, 2023 Nordix Foundation.
* ================================================================================
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
package org.onap.policy.tutorial.tutorial;
-import java.util.Arrays;
import java.util.List;
import org.onap.policy.models.tosca.authorative.concepts.ToscaConceptIdentifier;
import org.onap.policy.pdp.xacml.application.common.ToscaPolicyTranslator;
@Override
public List<String> actionDecisionsSupported() {
- return Arrays.asList("authorize");
+ return List.of("authorize");
}
@Override
public synchronized List<ToscaConceptIdentifier> supportedPolicyTypes() {
- return Arrays.asList(supportedPolicyType);
+ return List.of(supportedPolicyType);
}
@Override
import org.onap.policy.common.utils.resources.TextFileUtils;
import org.onap.policy.models.decisions.concepts.DecisionRequest;
import org.onap.policy.models.decisions.concepts.DecisionResponse;
-import org.onap.policy.pdp.xacml.application.common.XacmlApplicationException;
import org.onap.policy.pdp.xacml.application.common.XacmlApplicationServiceProvider;
import org.onap.policy.pdp.xacml.application.common.XacmlPolicyUtils;
import org.onap.policy.pdp.xacml.xacmltest.TestUtils;
public class TutorialApplicationTest {
private static final Logger LOGGER = LoggerFactory.getLogger(TutorialApplicationTest.class);
- private static Properties properties = new Properties();
- private static File propertiesFile;
+ private static final Properties properties = new Properties();
private static XacmlApplicationServiceProvider service;
- private static StandardCoder gson = new StandardCoder();
+ private static final StandardCoder gson = new StandardCoder();
@ClassRule
public static final TemporaryFolder policyFolder = new TemporaryFolder();
/**
- * setup the tests.
+ * set up the tests.
*
* @throws Exception Should not have exceptions thrown.
*/
@BeforeClass
public static void setup() throws Exception {
//
- // Setup our temporary folder
+ // Set up our temporary folder
//
- XacmlPolicyUtils.FileCreator myCreator = (String filename) -> policyFolder.newFile(filename);
- propertiesFile = XacmlPolicyUtils.copyXacmlPropertiesContents("src/test/resources/xacml.properties", properties,
- myCreator);
+ XacmlPolicyUtils.FileCreator myCreator = policyFolder::newFile;
+ File propertiesFile = XacmlPolicyUtils
+ .copyXacmlPropertiesContents("src/test/resources/xacml.properties", properties, myCreator);
//
// Load XacmlApplicationServiceProvider service
//
}
@Test
- public void testSingleDecision() throws CoderException, XacmlApplicationException, IOException {
+ public void testSingleDecision() throws CoderException, IOException {
//
// Load a Decision request
//
assertThat(decision.getLeft().getAttributes()).isNotNull().hasSize(1)
.containsKey(XACML3.ID_ATTRIBUTE_CATEGORY_RESOURCE.stringValue());
//
- // This should be a deny
+ // This should be a "deny"
//
decisionRequest.getResource().put("user", "audit");
LOGGER.info("{}", gson.encode(decisionRequest, true));
@Test
- public void testMultiDecision() throws CoderException, XacmlApplicationException, IOException {
+ public void testMultiDecision() throws CoderException, IOException {
//
// Load a Decision request
//
assertThat(decision.getLeft()).isInstanceOf(TutorialResponse.class);
TutorialResponse tutorialResponse = (TutorialResponse) decision.getLeft();
assertThat(tutorialResponse.getPermissions()).hasSize(7);
- tutorialResponse.getPermissions().forEach(p -> checkPermission(p));
+ tutorialResponse.getPermissions().forEach(this::checkPermission);
}
private void checkPermission(TutorialResponsePermission permission) {
Object resourceAttributes = permission.getAttributes().get(XACML3.ID_ATTRIBUTE_CATEGORY_RESOURCE.stringValue());
assertThat(resourceAttributes).isNotNull().isInstanceOf(Map.class);
@SuppressWarnings("unchecked")
- String multiId = ((Map<String, String>) resourceAttributes).get("urn:org:onap:tutorial-multi-id").toString();
+ String multiId = ((Map<String, String>) resourceAttributes).get("urn:org:onap:tutorial-multi-id");
assertThat(Integer.parseInt(multiId)).isBetween(1, 7);
switch (multiId) {
- case "1":
+ case "1", "2", "4":
assertThat(permission.getStatus()).isEqualTo("Permit");
return;
- case "2":
- assertThat(permission.getStatus()).isEqualTo("Permit");
- return;
- case "3":
- assertThat(permission.getStatus()).isEqualTo("Deny");
- return;
- case "4":
- assertThat(permission.getStatus()).isEqualTo("Permit");
- return;
- case "5":
- assertThat(permission.getStatus()).isEqualTo("Deny");
- return;
- case "6":
- assertThat(permission.getStatus()).isEqualTo("Deny");
- return;
- case "7":
+ case "3", "5", "6", "7":
assertThat(permission.getStatus()).isEqualTo("Deny");
return;
default:
Code Review / policy / xacml-pdp.git / commitdiff