diff options
| -rw-r--r-- | BRMSGateway/pom.xml | 21 | ||||
| -rw-r--r-- | LogParser/pom.xml | 47 | ||||
| -rw-r--r-- | ONAP-PAP-REST/pom.xml | 40 | ||||
| -rw-r--r-- | ONAP-PDP-REST/pom.xml | 40 | ||||
| -rw-r--r-- | ONAP-PDP/pom.xml | 31 | ||||
| -rw-r--r-- | ONAP-REST/pom.xml | 36 | ||||
| -rw-r--r-- | ONAP-SDK-APP/pom.xml | 10 | ||||
| -rw-r--r-- | ONAP-XACML/pom.xml | 45 | ||||
| -rw-r--r-- | POLICY-SDK-APP/pom.xml | 10 | ||||
| -rw-r--r-- | PolicyEngineAPI/pom.xml | 34 | ||||
| -rw-r--r-- | PolicyEngineUtils/pom.xml | 18 | ||||
| -rw-r--r-- | docs/platform/deployment.rst | 235 | ||||
| -rw-r--r-- | docs/platform/index.rst | 1 | ||||
| -rw-r--r-- | packages/pom.xml | 10 | ||||
| -rw-r--r-- | pom.xml | 67 |
15 files changed, 295 insertions, 350 deletions
diff --git a/BRMSGateway/pom.xml b/BRMSGateway/pom.xml index 76cbc1b6a..2f4612aba 100644 --- a/BRMSGateway/pom.xml +++ b/BRMSGateway/pom.xml @@ -46,15 +46,9 @@ </exclusions> </dependency> <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <version>4.11</version> - <scope>test</scope> - </dependency> - <dependency> <groupId>org.apache.maven</groupId> <artifactId>maven-model</artifactId> - <version>3.3.9</version> + <version>3.5.3</version> </dependency> <dependency> <groupId>org.apache.maven.shared</groupId> @@ -123,19 +117,6 @@ <artifactId>httpclient</artifactId> <version>${httpclient.version}</version> </dependency> - <!-- https://mvnrepository.com/artifact/org.powermock/powermock-api-mockito --> - <dependency> - <groupId>org.powermock</groupId> - <artifactId>powermock-api-mockito</artifactId> - <version>1.7.3</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.powermock</groupId> - <artifactId>powermock-module-junit4</artifactId> - <version>1.7.3</version> - <scope>test</scope> - </dependency> </dependencies> <build> <plugins> diff --git a/LogParser/pom.xml b/LogParser/pom.xml index 7ef977c94..11f84d6cb 100644 --- a/LogParser/pom.xml +++ b/LogParser/pom.xml @@ -22,14 +22,12 @@ <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> - <parent> <groupId>org.onap.policy.engine</groupId> <artifactId>PolicyEngineSuite</artifactId> <version>1.2.0-SNAPSHOT</version> </parent> <artifactId>LogParser</artifactId> - <dependencies> <dependency> <groupId>com.h2database</groupId> @@ -44,27 +42,11 @@ <groupId>org.onap.policy.common</groupId> <artifactId>ONAP-Logging</artifactId> <version>${project.version}</version> - <exclusions> - <exclusion> - <groupId>org.powermock</groupId> - <artifactId>powermock-module-junit4</artifactId> - </exclusion> - <exclusion> - <groupId>org.powermock</groupId> - <artifactId>powermock-api-mockito</artifactId> - </exclusion> - </exclusions> </dependency> <dependency> <groupId>org.onap.policy.common</groupId> <artifactId>integrity-monitor</artifactId> <version>${project.version}</version> - <exclusions> - <exclusion> - <groupId>org.powermock</groupId> - <artifactId>powermock-api-mockito</artifactId> - </exclusion> - </exclusions> </dependency> <dependency> <groupId>org.apache.logging.log4j</groupId> @@ -86,23 +68,6 @@ <artifactId>eclipselink</artifactId> <version>2.6.0</version> </dependency> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <version>4.11</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.mockito</groupId> - <artifactId>mockito-core</artifactId> - <version>2.7.22</version> - </dependency> - <!-- https://mvnrepository.com/artifact/org.mockito/mockito-all --> - <dependency> - <groupId>org.mockito</groupId> - <artifactId>mockito-all</artifactId> - <version>1.10.19</version> - </dependency> <dependency> <groupId>org.onap.policy.engine</groupId> <artifactId>PolicyEngineUtils</artifactId> @@ -130,18 +95,6 @@ </exclusion> </exclusions> </dependency> - <dependency> - <groupId>org.powermock</groupId> - <artifactId>powermock-module-junit4</artifactId> - <version>1.7.3</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.powermock</groupId> - <artifactId>powermock-api-mockito2</artifactId> - <version>1.7.3</version> - <scope>test</scope> - </dependency> </dependencies> <build> <plugins> diff --git a/ONAP-PAP-REST/pom.xml b/ONAP-PAP-REST/pom.xml index 65a544b0f..de3737837 100644 --- a/ONAP-PAP-REST/pom.xml +++ b/ONAP-PAP-REST/pom.xml @@ -21,7 +21,6 @@ <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> - <modelVersion>4.0.0</modelVersion> <artifactId>ONAP-PAP-REST</artifactId> <description>ONAP-PAP-REST</description> @@ -109,16 +108,6 @@ <groupId>org.onap.policy.common</groupId> <artifactId>ONAP-Logging</artifactId> <version>${project.version}</version> - <exclusions> - <exclusion> - <groupId>org.powermock</groupId> - <artifactId>powermock-module-junit4</artifactId> - </exclusion> - <exclusion> - <groupId>org.powermock</groupId> - <artifactId>powermock-api-mockito</artifactId> - </exclusion> - </exclusions> </dependency> <dependency> <groupId>javax.servlet</groupId> @@ -177,12 +166,6 @@ <version>3.2.0.201312181205-r</version> </dependency> <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <version>4.11</version> - <scope>test</scope> - </dependency> - <dependency> <groupId>org.apache.tomcat</groupId> <artifactId>tomcat-jdbc</artifactId> <version>8.0.24</version> @@ -212,20 +195,10 @@ <version>2.1.1</version> </dependency> <dependency> - <groupId>org.springframework</groupId> - <artifactId>spring-mock</artifactId> - <version>2.0.8</version> - </dependency> - <dependency> <groupId>org.onap.policy.drools-applications.controlloop.common</groupId> <artifactId>policy-yaml</artifactId> <version>${project.version}</version> </dependency> - <dependency> - <groupId>com.mockrunner</groupId> - <artifactId>mockrunner</artifactId> - <version>0.3.1</version> - </dependency> <!-- Spring --> <dependency> <groupId>org.springframework</groupId> @@ -331,19 +304,6 @@ <artifactId>tomcat-dbcp</artifactId> <version>8.5.9</version> </dependency> - <!-- https://mvnrepository.com/artifact/org.powermock/powermock-api-mockito --> - <dependency> - <groupId>org.powermock</groupId> - <artifactId>powermock-api-mockito</artifactId> - <version>1.7.3</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.powermock</groupId> - <artifactId>powermock-module-junit4</artifactId> - <version>1.7.3</version> - <scope>test</scope> - </dependency> </dependencies> <properties> <springframework.version>4.3.3.RELEASE</springframework.version> diff --git a/ONAP-PDP-REST/pom.xml b/ONAP-PDP-REST/pom.xml index f800a8f31..571d4b783 100644 --- a/ONAP-PDP-REST/pom.xml +++ b/ONAP-PDP-REST/pom.xml @@ -20,17 +20,13 @@ --> <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> - <modelVersion>4.0.0</modelVersion> - <parent> <groupId>org.onap.policy.engine</groupId> <artifactId>PolicyEngineSuite</artifactId> <version>1.2.0-SNAPSHOT</version> </parent> - <artifactId>ONAP-PDP-REST</artifactId> - <description>ONAP PDP REST</description> <properties> <springframework.version>4.3.3.RELEASE</springframework.version> @@ -48,26 +44,6 @@ </plugins> </build> <dependencies> - <!-- https://mvnrepository.com/artifact/org.powermock/powermock-api-mockito --> - <dependency> - <groupId>org.powermock</groupId> - <artifactId>powermock-api-mockito</artifactId> - <version>1.7.3</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.powermock</groupId> - <artifactId>powermock-module-junit4</artifactId> - <version>1.7.3</version> - <scope>test</scope> - </dependency> - <!-- https://mvnrepository.com/artifact/org.mockito/mockito-all --> - <dependency> - <groupId>org.mockito</groupId> - <artifactId>mockito-all</artifactId> - <version>1.10.19</version> - <scope>test</scope> - </dependency> <dependency> <groupId>com.h2database</groupId> <artifactId>h2</artifactId> @@ -142,12 +118,6 @@ <version>1.18</version> </dependency> <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <version>4.12</version> - <scope>test</scope> - </dependency> - <dependency> <groupId>javax.websocket</groupId> <artifactId>javax.websocket-api</artifactId> <version>1.1</version> @@ -172,16 +142,6 @@ </dependency> <dependency> <groupId>org.springframework</groupId> - <artifactId>spring-mock</artifactId> - <version>2.0.8</version> - </dependency> - <dependency> - <groupId>com.mockrunner</groupId> - <artifactId>mockrunner</artifactId> - <version>0.3.1</version> - </dependency> - <dependency> - <groupId>org.springframework</groupId> <artifactId>spring-core</artifactId> <version>${springframework.version}</version> </dependency> diff --git a/ONAP-PDP/pom.xml b/ONAP-PDP/pom.xml index a2cbc8b37..27c0ec1da 100644 --- a/ONAP-PDP/pom.xml +++ b/ONAP-PDP/pom.xml @@ -19,10 +19,8 @@ ============LICENSE_END========================================================= --> - <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> - <modelVersion>4.0.0</modelVersion> <artifactId>ONAP-PDP</artifactId> <description>ONAP-PDP</description> @@ -34,25 +32,6 @@ </parent> <dependencies> <dependency> - <groupId>org.mockito</groupId> - <artifactId>mockito-core</artifactId> - <version>1.10.19</version> - <scope>test</scope> - </dependency> - <!-- https://mvnrepository.com/artifact/org.powermock/powermock-api-mockito --> - <dependency> - <groupId>org.powermock</groupId> - <artifactId>powermock-api-mockito</artifactId> - <version>1.7.3</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.powermock</groupId> - <artifactId>powermock-module-junit4</artifactId> - <version>1.7.3</version> - <scope>test</scope> - </dependency> - <dependency> <groupId>org.onap.policy.engine</groupId> <version>${project.version}</version> <artifactId>ONAP-REST</artifactId> @@ -103,21 +82,11 @@ </exclusions> </dependency> <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <version>4.11</version> - </dependency> - <dependency> <groupId>org.onap.policy.drools-pdp</groupId> <artifactId>policy-endpoints</artifactId> <version>${project.version}</version> <scope>test</scope> </dependency> - <dependency> - <groupId>com.mockrunner</groupId> - <artifactId>mockrunner</artifactId> - <version>0.3.1</version> - </dependency> </dependencies> </project> diff --git a/ONAP-REST/pom.xml b/ONAP-REST/pom.xml index 920ef216f..6c0b18f32 100644 --- a/ONAP-REST/pom.xml +++ b/ONAP-REST/pom.xml @@ -38,26 +38,6 @@ <artifactId>snakeyaml</artifactId> <version>1.16</version> </dependency> - <!-- https://mvnrepository.com/artifact/org.powermock/powermock-api-mockito --> - <dependency> - <groupId>org.powermock</groupId> - <artifactId>powermock-api-mockito</artifactId> - <version>1.7.3</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.powermock</groupId> - <artifactId>powermock-module-junit4</artifactId> - <version>1.7.3</version> - <scope>test</scope> - </dependency> - <!-- https://mvnrepository.com/artifact/org.mockito/mockito-all --> - <dependency> - <groupId>org.mockito</groupId> - <artifactId>mockito-all</artifactId> - <version>1.10.19</version> - <scope>test</scope> - </dependency> <dependency> <groupId>com.h2database</groupId> <artifactId>h2</artifactId> @@ -118,22 +98,6 @@ <version>2.8.0</version> </dependency> <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <version>4.11</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.springframework</groupId> - <artifactId>spring-mock</artifactId> - <version>2.0.8</version> - </dependency> - <dependency> - <groupId>com.mockrunner</groupId> - <artifactId>mockrunner</artifactId> - <version>0.3.1</version> - </dependency> - <dependency> <groupId>org.eclipse.emf</groupId> <artifactId>org.eclipse.emf.ecore.xmi</artifactId> <version>2.11.0-v20150123-0347</version> diff --git a/ONAP-SDK-APP/pom.xml b/ONAP-SDK-APP/pom.xml index 9e6f1b21c..b6e797947 100644 --- a/ONAP-SDK-APP/pom.xml +++ b/ONAP-SDK-APP/pom.xml @@ -27,7 +27,6 @@ </parent> <artifactId>ONAP-SDK-APP</artifactId> <packaging>war</packaging> - <properties> <encoding>UTF-8</encoding> <epsdk.version>2.1.0</epsdk.version> @@ -261,6 +260,10 @@ <groupId>commons-collections</groupId> <artifactId>commons-collections</artifactId> </exclusion> + <exclusion> + <groupId>com.thoughtworks.xstream</groupId> + <artifactId>xstream</artifactId> + </exclusion> </exclusions> </dependency> <dependency> @@ -319,10 +322,5 @@ <artifactId>javax.servlet-api</artifactId> <version>3.1.0</version> </dependency> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <version>4.12</version> - </dependency> </dependencies> </project> diff --git a/ONAP-XACML/pom.xml b/ONAP-XACML/pom.xml index 8bfa06b35..4a30cd7b5 100644 --- a/ONAP-XACML/pom.xml +++ b/ONAP-XACML/pom.xml @@ -3,7 +3,7 @@ ============LICENSE_START======================================================= ONAP Policy Engine ================================================================================ - Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + Copyright (C) 2017-2018 AT&T Intellectual Property. All rights reserved. ================================================================================ Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -19,10 +19,8 @@ ============LICENSE_END========================================================= --> - <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> - <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.onap.policy.engine</groupId> @@ -32,25 +30,6 @@ <artifactId>ONAP-XACML</artifactId> <packaging>jar</packaging> <dependencies> - <!-- https://mvnrepository.com/artifact/org.powermock/powermock-api-mockito --> - <dependency> - <groupId>org.powermock</groupId> - <artifactId>powermock-api-mockito</artifactId> - <version>1.7.3</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.powermock</groupId> - <artifactId>powermock-module-junit4</artifactId> - <version>1.7.3</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.mockito</groupId> - <artifactId>mockito-core</artifactId> - <version>1.10.19</version> - <scope>test</scope> - </dependency> <dependency> <groupId>org.onap.policy.engine</groupId> <version>${project.version}</version> @@ -72,28 +51,6 @@ <version>4.4.4</version> </dependency> <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <version>4.11</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.springframework</groupId> - <artifactId>spring-mock</artifactId> - <version>2.0.8</version> - <exclusions> - <exclusion> - <groupId>commons-logging</groupId> - <artifactId>commons-logging</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>com.mockrunner</groupId> - <artifactId>mockrunner</artifactId> - <version>0.3.1</version> - </dependency> - <dependency> <groupId>com.att.research.xacml</groupId> <artifactId>xacml</artifactId> <version>1.0.1</version> diff --git a/POLICY-SDK-APP/pom.xml b/POLICY-SDK-APP/pom.xml index 3a8eaa456..08bc3c23c 100644 --- a/POLICY-SDK-APP/pom.xml +++ b/POLICY-SDK-APP/pom.xml @@ -90,6 +90,10 @@ <groupId>mysql</groupId> <artifactId>mysql-connector-java</artifactId> </exclusion> + <exclusion> + <groupId>com.thoughtworks.xstream</groupId> + <artifactId>xstream</artifactId> + </exclusion> </exclusions> </dependency> <!-- Spring --> @@ -253,12 +257,6 @@ <artifactId>yamlbeans</artifactId> <version>1.08</version> </dependency> - <!-- https://mvnrepository.com/artifact/org.easymock/easymock --> - <dependency> - <groupId>org.easymock</groupId> - <artifactId>easymock</artifactId> - <version>3.1</version> - </dependency> <!-- https://mvnrepository.com/artifact/org.yaml/snakeyaml --> <dependency> <groupId>org.yaml</groupId> diff --git a/PolicyEngineAPI/pom.xml b/PolicyEngineAPI/pom.xml index 6ffef7594..69e086978 100644 --- a/PolicyEngineAPI/pom.xml +++ b/PolicyEngineAPI/pom.xml @@ -22,35 +22,13 @@ <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> - <parent> <groupId>org.onap.policy.engine</groupId> <artifactId>PolicyEngineSuite</artifactId> <version>1.2.0-SNAPSHOT</version> </parent> - <artifactId>PolicyEngineAPI</artifactId> <dependencies> - <!-- https://mvnrepository.com/artifact/org.powermock/powermock-api-mockito --> - <dependency> - <groupId>org.powermock</groupId> - <artifactId>powermock-api-mockito</artifactId> - <version>1.7.3</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.powermock</groupId> - <artifactId>powermock-module-junit4</artifactId> - <version>1.7.3</version> - <scope>test</scope> - </dependency> - <!-- https://mvnrepository.com/artifact/org.mockito/mockito-all --> - <dependency> - <groupId>org.mockito</groupId> - <artifactId>mockito-all</artifactId> - <version>1.10.19</version> - <scope>test</scope> - </dependency> <dependency> <groupId>com.fasterxml.jackson.core</groupId> <artifactId>jackson-databind</artifactId> @@ -82,12 +60,6 @@ <version>${commons.fileupload.version}</version> </dependency> <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <version>4.11</version> - <scope>test</scope> - </dependency> - <dependency> <groupId>javax.websocket</groupId> <artifactId>javax.websocket-api</artifactId> <version>1.1</version> @@ -132,12 +104,6 @@ <groupId>org.onap.policy.engine</groupId> <artifactId>ONAP-XACML</artifactId> <version>${project.version}</version> - <exclusions> - <exclusion> - <groupId>org.powermock</groupId> - <artifactId>powermock-api-mockito</artifactId> - </exclusion> - </exclusions> </dependency> </dependencies> <build> diff --git a/PolicyEngineUtils/pom.xml b/PolicyEngineUtils/pom.xml index ac2b2a1a9..85b506a21 100644 --- a/PolicyEngineUtils/pom.xml +++ b/PolicyEngineUtils/pom.xml @@ -41,16 +41,6 @@ <groupId>org.onap.policy.common</groupId> <artifactId>ONAP-Logging</artifactId> <version>${project.version}</version> - <exclusions> - <exclusion> - <groupId>org.powermock</groupId> - <artifactId>powermock-module-junit4</artifactId> - </exclusion> - <exclusion> - <groupId>org.powermock</groupId> - <artifactId>powermock-core</artifactId> - </exclusion> - </exclusions> </dependency> <dependency> <groupId>org.eclipse.persistence</groupId> @@ -80,13 +70,7 @@ <dependency> <groupId>org.apache.maven</groupId> <artifactId>maven-model</artifactId> - <version>3.3.9</version> - </dependency> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <version>4.11</version> - <scope>test</scope> + <version>3.5.3</version> </dependency> <!-- CLM security fix - force use of xstream diff --git a/docs/platform/deployment.rst b/docs/platform/deployment.rst new file mode 100644 index 000000000..6152806c4 --- /dev/null +++ b/docs/platform/deployment.rst @@ -0,0 +1,235 @@ +.. This work is licensed under a Creative Commons Attribution 4.0 International License. +.. http://creativecommons.org/licenses/by/4.0 + +***************** +Policy Deployment +***************** + +.. contents:: + :depth: 3 + +Policy Helm Charts +^^^^^^^^^^^^^^^^^^ +The K8S helm charts in ONAP are hierarchical, where the chart of a container contains the charts of dependent containers. The policy helm chart captures the K8S configurations of PAP, PDP-X, Drools, BRMSGW, and nexus containers as shown below. + + +.. code-block:: bash + :caption: Policy Helm Chart Structure + :linenos: + + |-- Chart.yaml # Captures the meta-information of the PAP chart. For example, name and namespace. + |-- templates # Contains templates for the PAP deployment descriptors and PAP secrets. + | |-- NOTES.txt + | |-- configmap.yaml # The configuration-map of the PAP application running in a POD. + | |-- deployment.yaml # The deployment descriptor of the PAP POD. + | |-- secrets.yaml # Captures secret keys related to authentication. + | |-- service.yaml # The deployment descriptor of offered services by PAP. + |-- values.yaml # The configurations of the deployment descriptor and secret templates + |-- requirements.yaml # Captures information about dependent charts; which is policy-common in this scenario. + |-- resources # Captures resources required for deploying helm charts. + | |-- config # Captures the configurations of the PAP application. + | | |-- opt + | | | |-- policy + | | | |-- config + | | | |-- pe + | | |-- pe + | | |-- console.conf # The configurations of a backend server used in PAP. + | | |-- elk.conf # The configurations of the elastic search module. + | | |-- mysql.conf # The Configurations of the mysql database. + | | |-- pap-tweaks.sh + | | |-- pap.conf # The configurations of the PAP application. + | | |-- paplp.conf # The configurations of a JVM used by PAP. + | | |-- push-policies.sh + | |-- scripts # Captures scripts used by a container. + | |-- do-start.sh # The startup script of the PAP container. + | |-- update-vfw-op-policy.sh + |-- charts # The charts of dependent containers; brmsgw, drools, mariadb, pdp, policy-nexus, and policy-common + | |-- brmsgw # The helm chart for BRMSGW + | | |-- Chart.yaml # Captures the meta-information of the brmsgw chart. For example, name and namespace. + | | |-- requirements.yaml # Captures information about dependent charts; which is policy-common in this scenario. + | | |-- resources # Captures resources required for deploying helm charts. + | | | |-- config + | | | |-- pe + | | | |-- brmsgw-tweaks.sh + | | | |-- brmsgw.conf # The configurations of the brmsgw application. + | | |-- templates # Contains templates for the brmsgw deployment descriptors and brmsgw secrets. + | | | |-- NOTES.txt + | | | |-- configmap.yaml # The configuration-map of the brmsgw application running in a POD. + | | | |-- deployment.yaml # The deployment descriptor of the brmsgw POD. + | | | |-- service.yaml # The deployment descriptor of offered services by brmsgw. + | | |-- values.yaml # The configurations of the deployment descriptor templates + | |-- drools # The helm chart for drools + | | |-- Chart.yaml # Captures the meta-information of the brmsgw chart. For example, name and namespace. + | | |-- charts # The charts of nexus containers + | | | |-- nexus # The helm chart for nexus + | | | |-- Chart.yaml # Captures the meta-information of the nexus chart. For example, name and namespace. + | | | |-- requirements.yaml # Captures information about dependent charts; which is policy-common in this scenario. + | | | |-- templates # Contains templates for the nexus deployment descriptors and brmsgw secrets. + | | | | |-- NOTES.txt + | | | | |-- deployment.yaml # The deployment descriptor of the nexus POD. + | | | | |-- service.yaml # The deployment descriptor of offered services by nexus. + | | | |-- values.yaml # The configurations of the deployment descriptor templates + | | |-- requirements.yaml # Captures information about dependent charts; which is policy-common in this scenario. + | | |-- resources # Captures resources required for deploying helm charts. + | | | |-- config + | | | | |-- drools + | | | | | |-- settings.xml # The maven settings file for the Drools application. + | | | | |-- log + | | | | | |-- drools + | | | | | |-- logback.xml # The maven settings file for logging. + | | | | |-- opt + | | | | |-- policy + | | | | |-- config + | | | | |-- drools + | | | | |-- base.conf # The base configurations for drools + | | | | |-- drools-tweaks.sh + | | | | |-- keys + | | | | | |-- feature-healthcheck.conf # The configurations for the helth-check module. + | | | | | |-- policy-keystore + | | | | |-- policy-management.conf # The configurations for the policy management module. + | | | |-- scripts + | | | |-- do-start.sh # The startup script of the drools container. + | | | |-- update-vfw-op-policy.sh + | | |-- templates # Contains templates for the drools deployment descriptors and secrets. + | | | |-- NOTES.txt + | | | |-- configmap.yaml # The configuration-map of the drools application running in a POD. + | | | |-- deployment.yaml # The deployment descriptor of the drools POD. + | | | |-- secrets.yaml # Captures secret keys related to authentication. + | | | |-- service.yaml # The deployment descriptor of offered services by drools. + | | |-- values.yaml # The configurations of the deployment descriptor templates. + | |-- mariadb # The helm chart for mariadb + | | |-- Chart.yaml # Captures the meta-information of the mariadb chart. For example, name and namespace. + | | |-- requirements.yaml # Captures information about dependent charts; which is policy-common in this scenario. + | | |-- resources # Captures resources required for deploying helm charts. + | | | |-- config + | | | |-- db.sh # Startup script for mariadb. + | | |-- templates # Contains templates for the mariadb deployment descriptors and secrets. + | | | |-- NOTES.txt + | | | |-- configmap.yaml # The configuration-map of the mariadb application running in a POD. + | | | |-- deployment.yaml # The deployment descriptor of the mariadb POD. + | | | |-- pv.yaml # The persistence volume configurations. + | | | |-- pvc.yaml # The persistence volume claim configurations. + | | | |-- secrets.yaml # Captures secret keys related to authentication. + | | | |-- service.yaml # The deployment descriptor of offered services by maridb. + | | |-- values.yaml # The configurations of the deployment descriptor templates. + | |-- pdp # The helm chart for pdp. + | | |-- Chart.yaml # Captures the meta-information of the pdp chart. For example, name and namespace. + | | |-- requirements.yaml # Captures information about dependent charts; which is policy-common in this scenario. + | | |-- resources # Captures resources required for deploying helm charts. + | | | |-- config + | | | |-- log + | | | | |-- xacml-pdp-rest + | | | | |-- logback.xml # The maven settings file for logging. + | | | |-- pe + | | | |-- pdp-tweaks.sh + | | | |-- pdp.conf # The configurations of the pdp application. + | | | |-- pdplp.conf # The configurations of a JVM used by pdp. + | | |-- templates # Contains templates for the pdp deployment descriptors and secrets. + | | | |-- NOTES.txt + | | | |-- configmap.yaml # The configuration-map of the pdp application running in a POD. + | | | |-- service.yaml # The deployment descriptor of offered services by pdp. + | | | |-- statefulset.yaml # The stateful-set descriptor for pdp to support multiple container instances in a POD. + | | |-- values.yaml # The configurations of the deployment descriptor templates. + | |-- policy-brmsgw + | | |-- Chart.yaml + | | |-- requirements.yaml + | | |-- templates + | | | |-- NOTES.txt + | | | |-- configmap.yaml + | | | |-- deployment.yaml + | | | |-- secrets.yaml + | | | |-- service.yaml + | | |-- values.yaml # The configurations of the deployment descriptor templates. + | |-- policy-common # The helm chart that is commonly used across all policy containers. + | | |-- Chart.yaml # Captures the meta-information of the policy-common chart. For example, name and namespace. + | | |-- requirements.yaml # Captures information about dependent charts. + | | |-- resources # Captures resources required for deploying helm charts. + | | | |-- config + | | | |-- log + | | | | |-- filebeat + | | | | |-- filebeat.yml + | | | |-- pe + | | | | |-- base.conf # The base configurations applicable across many of the policy containers. + | | | | |-- brmsgw-tweaks.sh + | | | | |-- brmsgw.conf # The configurations of the brmsgw application. + | | | | |-- console.conf # The configurations of the console application. + | | | | |-- elk.conf # The configurations of the elastic search application. + | | | | |-- mysql.conf # The configurations of the mysql application. + | | | | |-- pap-tweaks.sh + | | | | |-- pap.conf # The configurations of the pap application. + | | | | |-- paplp.conf # The configurations of a JVM used by PAP. + | | | | |-- pdp-tweaks.sh + | | | | |-- pdp.conf # The configurations of the pdp application. + | | | | |-- pdplp.conf # The configurations of a JVM used by pdp. + | | | | |-- push-policies.sh + | | | |-- scripts + | | | |-- do-start.sh # The startup script of container. + | | |-- templates + | | | |-- NOTES.txt + | | | |-- configmap.yaml # The configuration-map applicable across any policy container. + | | |-- values.yaml # The configurations of the deployment descriptor templates. + | |-- policy-mariadb + | | |-- Chart.yaml + | | |-- requirements.yaml + | | |-- resources + | | | |-- config + | | | |-- db.sh + | | |-- templates + | | | |-- NOTES.txt + | | | |-- configmap.yaml + | | | |-- deployment.yaml + | | | |-- pv.yaml + | | | |-- pvc.yaml + | | | |-- secrets.yaml + | | | |-- service.yaml + | | |-- values.yaml + | |-- policy-nexus + | | |-- Chart.yaml + | | |-- requirements.yaml + | | |-- templates + | | | |-- NOTES.txt + | | | |-- deployment.yaml + | | | |-- secrets.yaml + | | | |-- service.yaml + | | |-- values.yaml + | |-- policy-pap + | | |-- Chart.yaml + | | |-- requirements.yaml + | | |-- resources + | | | |-- config + | | | |-- log + | | | |-- ep_sdk_app + | | | | |-- logback.xml + | | | |-- xacml-pap-rest + | | | |-- logback.xml + | | |-- templates + | | | |-- NOTES.txt + | | | |-- configmap.yaml + | | | |-- deployment.yaml + | | | |-- secrets.yaml + | | | |-- service.yaml + | | |-- values.yaml + | |-- policy-pdp + | |-- Chart.yaml + | |-- requirements.yaml + | |-- resources + | | |-- config + | | |-- log + | | |-- xacml-pdp-rest + | | |-- logback.xml + | |-- templates + | | |-- NOTES.txt + | | |-- configmap.yaml + | | |-- secrets.yaml + | | |-- service.yaml + | | |-- statefulset.yaml + | |-- values.yaml + + + +.. _PolicyConfigOfK8s : https://wiki.onap.org/display/DW/Policy+configuration+of+K8S + + + +End of Document + diff --git a/docs/platform/index.rst b/docs/platform/index.rst index 2b89ee752..c0cbaa3f4 100644 --- a/docs/platform/index.rst +++ b/docs/platform/index.rst @@ -10,6 +10,7 @@ Policy Engine Platform offeredapis.rst installation.rst policygui.rst + deployment.rst Policy Software Architecture ---------------------------- diff --git a/packages/pom.xml b/packages/pom.xml index 4e2885e22..6aff96da7 100644 --- a/packages/pom.xml +++ b/packages/pom.xml @@ -2,7 +2,7 @@ ============LICENSE_START======================================================= ONAP Policy Engine ================================================================================ - Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + Copyright (C) 2017-2018 AT&T Intellectual Property. All rights reserved. ================================================================================ Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -20,24 +20,18 @@ <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - <modelVersion>4.0.0</modelVersion> - <parent> <groupId>org.onap.policy.engine</groupId> <artifactId>PolicyEngineSuite</artifactId> <version>1.2.0-SNAPSHOT</version> </parent> - <artifactId>packages</artifactId> <packaging>pom</packaging> - <name>Policy Packages</name> <description>D2 ONAP Policy Installation Packages</description> - <profiles> <!-- DO NOT CHANGE THE *ORDER* IN WHICH THESE PROFILES ARE DEFINED! --> - <profile> <id>default</id> <activation> @@ -49,7 +43,6 @@ <module>docker</module> </modules> </profile> - <profile> <id>with-integration-tests</id> <modules> @@ -58,7 +51,6 @@ </modules> </profile> </profiles> - <modules> <module>base</module> <module>install</module> @@ -20,22 +20,18 @@ <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> - <parent> <groupId>org.onap.oparent</groupId> <artifactId>oparent</artifactId> <version>1.1.0</version> <relativePath/> </parent> - <groupId>org.onap.policy.engine</groupId> <artifactId>PolicyEngineSuite</artifactId> <version>1.2.0-SNAPSHOT</version> <packaging>pom</packaging> <name>policy-engine</name> - <description>The ONAP Policy Engine main pom</description> - <properties> <!-- Project common build settings --> <project.source.version>1.8</project.source.version> @@ -56,24 +52,18 @@ <sonar.jacoco.itReportPath>${project.basedir}/../target/code-coverage/jacoco-it.exec</sonar.jacoco.itReportPath> <sonar.dynamicAnalysis>reuseReports</sonar.dynamicAnalysis> - <!-- - Shared between policy/* project repositories - same version - --> + <!-- Shared between policy/* project repositories - same version --> <h2.version>1.4.186</h2.version> - <!-- - Shared between policy/* project repositories - different version - --> + <!-- Shared between policy/* project repositories - different version --> <!-- Project common dependency versions --> <jetty.plugin.version>9.2.3.v20140905</jetty.plugin.version> <dmaap.version>1.1.3</dmaap.version> <httpclient.version>4.5.5</httpclient.version> - <jackson.version>2.9.4</jackson.version> + <jackson.version>2.9.5</jackson.version> <commons.fileupload.version>1.3.3</commons.fileupload.version> </properties> - - <modules> <module>PolicyEngineUtils</module> <module>ONAP-XACML</module> @@ -89,7 +79,6 @@ <module>ONAP-SDK-APP</module> <module>packages</module> </modules> - <distributionManagement> <repository> <id>ecomp-releases</id> @@ -106,7 +95,6 @@ <url>dav:${nexusproxy}${sitePath}</url> </site> </distributionManagement> - <reporting> <plugins> <plugin> @@ -127,7 +115,6 @@ </plugin> </plugins> </reporting> - <dependencyManagement> <dependencies> <dependency> @@ -138,9 +125,7 @@ </dependency> </dependencies> </dependencyManagement> - <dependencies> - <dependency> <groupId>javax.servlet</groupId> <artifactId>javax.servlet-api</artifactId> @@ -152,8 +137,51 @@ <artifactId>xml-apis</artifactId> <version>1.3.03</version> </dependency> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <version>4.12</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.springframework</groupId> + <artifactId>spring-mock</artifactId> + <version>2.0.8</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>com.mockrunner</groupId> + <artifactId>mockrunner</artifactId> + <version>0.3.1</version> + <scope>test</scope> + </dependency> + <!-- https://mvnrepository.com/artifact/org.powermock/powermock-api-mockito --> + <dependency> + <groupId>org.powermock</groupId> + <artifactId>powermock-api-mockito</artifactId> + <version>1.7.3</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.powermock</groupId> + <artifactId>powermock-module-junit4</artifactId> + <version>1.7.3</version> + <scope>test</scope> + </dependency> + <!-- https://mvnrepository.com/artifact/org.mockito/mockito-all --> + <dependency> + <groupId>org.mockito</groupId> + <artifactId>mockito-all</artifactId> + <version>1.10.19</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.easymock</groupId> + <artifactId>easymock</artifactId> + <version>3.1</version> + <scope>test</scope> + </dependency> </dependencies> - <build> <plugins> <plugin> @@ -236,7 +264,6 @@ </plugin> <!-- The Jetty plugin allows us to easily test the development build by running jetty:run on the command line. --> - <plugin> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-maven-plugin</artifactId> |