From: Jim Hahn Date: Thu, 16 Apr 2020 17:19:30 +0000 (+0000) Subject: Merge "Fix policy engine JUnit that hung on ubuntu 18.04" X-Git-Tag: 1.6.3~6 X-Git-Url: https://gerrit.onap.org/r/gitweb?p=policy%2Fengine.git;a=commitdiff_plain;h=128e3258acdf973a42e81adc75aeae3df7d46cb9;hp=00747e7214c75e5af92cc0977c98d2df0d6db629 Merge "Fix policy engine JUnit that hung on ubuntu 18.04" --- diff --git a/BRMSGateway/config.properties b/BRMSGateway/config.properties index 71c5036cc..585e0027a 100644 --- a/BRMSGateway/config.properties +++ b/BRMSGateway/config.properties @@ -77,7 +77,7 @@ ping_interval=30000 # # # -brms.dependency.version=1.6.1-SNAPSHOT +brms.dependency.version=1.6.2-SNAPSHOT ENVIRONMENT = DEVL diff --git a/BRMSGateway/dependency.json b/BRMSGateway/dependency.json index 93668940f..1b450e3c1 100644 --- a/BRMSGateway/dependency.json +++ b/BRMSGateway/dependency.json @@ -3,112 +3,112 @@ "default": [{ "groupId": "org.onap.policy.drools-applications.controlloop.templates", "artifactId": "template.demo", - "version": "1.6.1-SNAPSHOT" + "version": "1.6.2-SNAPSHOT" }, { "groupId": "org.onap.policy.models.policy-models-interactions.model-impl", "artifactId": "events", - "version": "2.2.3-SNAPSHOT" + "version": "2.2.5-SNAPSHOT" }, { "groupId": "org.onap.policy.models.policy-models-interactions.model-impl", "artifactId": "rest", - "version": "2.2.3-SNAPSHOT" + "version": "2.2.5-SNAPSHOT" }, { "groupId": "org.onap.policy.models.policy-models-interactions.model-impl", "artifactId": "appc", - "version": "2.2.3-SNAPSHOT" + "version": "2.2.5-SNAPSHOT" }, { "groupId": "org.onap.policy.models.policy-models-interactions.model-impl", "artifactId": "aai", - "version": "2.2.3-SNAPSHOT" + "version": "2.2.5-SNAPSHOT" }, { "groupId": "org.onap.policy.models.policy-models-interactions.model-impl", "artifactId": "so", - "version": "2.2.3-SNAPSHOT" + "version": "2.2.5-SNAPSHOT" }, { "groupId": "org.onap.policy.models.policy-models-interactions.model-impl", "artifactId": "sdnc", - "version": "2.2.3-SNAPSHOT" + "version": "2.2.5-SNAPSHOT" }, { "groupId": "org.onap.policy.models.policy-models-interactions.model-impl", "artifactId": "sdnr", - "version": "2.2.3-SNAPSHOT" + "version": "2.2.5-SNAPSHOT" }], "amsterdam": [{ "groupId": "org.onap.policy.models.policy-models-interactions.model-impl", "artifactId": "events", - "version": "2.2.3-SNAPSHOT" + "version": "2.2.5-SNAPSHOT" }, { "groupId": "org.onap.policy.models.policy-models-interactions.model-impl", "artifactId": "appc", - "version": "2.2.3-SNAPSHOT" + "version": "2.2.5-SNAPSHOT" }, { "groupId": "org.onap.policy.models.policy-models-interactions.model-impl", "artifactId": "appclcm", - "version": "2.2.3-SNAPSHOT" + "version": "2.2.5-SNAPSHOT" }, { "groupId": "org.onap.policy.models.policy-models-interactions.model-impl", "artifactId": "vfc", - "version": "2.2.3-SNAPSHOT" + "version": "2.2.5-SNAPSHOT" }, { "groupId": "org.onap.policy.models.policy-models-interactions.model-impl", "artifactId": "so", - "version": "2.2.3-SNAPSHOT" + "version": "2.2.5-SNAPSHOT" }, { "groupId": "org.onap.policy.models.policy-models-interactions.model-impl", "artifactId": "sdnr", - "version": "2.2.3-SNAPSHOT" + "version": "2.2.5-SNAPSHOT" }, { "groupId": "org.onap.policy.models.policy-models-interactions.model-impl", "artifactId": "sdnc", - "version": "2.2.3-SNAPSHOT" + "version": "2.2.5-SNAPSHOT" }, { "groupId": "org.onap.policy.models.policy-models-interactions.model-impl", "artifactId": "aai", - "version": "2.2.3-SNAPSHOT" + "version": "2.2.5-SNAPSHOT" }, { "groupId": "org.onap.policy.models.policy-models-interactions.model-impl", "artifactId": "sdc", - "version": "2.2.3-SNAPSHOT" + "version": "2.2.5-SNAPSHOT" }, { "groupId": "org.onap.policy.drools-applications.controlloop.common", "artifactId": "eventmanager", - "version": "1.6.1-SNAPSHOT" + "version": "1.6.2-SNAPSHOT" }, { "groupId": "org.onap.policy.drools-applications.controlloop.common", "artifactId": "guard", - "version": "1.6.1-SNAPSHOT" + "version": "1.6.2-SNAPSHOT" }, { "groupId": "org.onap.policy.models.policy-models-interactions.model-actors", "artifactId": "actorServiceProvider", - "version": "2.2.3-SNAPSHOT" + "version": "2.2.5-SNAPSHOT" }, { "groupId": "org.onap.policy.models.policy-models-interactions.model-actors", "artifactId": "actor.appc", - "version": "2.2.3-SNAPSHOT" + "version": "2.2.5-SNAPSHOT" }, { "groupId": "org.onap.policy.models.policy-models-interactions.model-actors", "artifactId": "actor.appclcm", - "version": "2.2.3-SNAPSHOT" + "version": "2.2.5-SNAPSHOT" }, { "groupId": "org.onap.policy.models.policy-models-interactions.model-actors", "artifactId": "actor.so", - "version": "2.2.3-SNAPSHOT" + "version": "2.2.5-SNAPSHOT" }, { "groupId": "org.onap.policy.models.policy-models-interactions.model-actors", "artifactId": "actor.sdnc", - "version": "2.2.3-SNAPSHOT" + "version": "2.2.5-SNAPSHOT" }, { "groupId": "org.onap.policy.models.policy-models-interactions.model-actors", "artifactId": "actor.sdnr", - "version": "2.2.3-SNAPSHOT" + "version": "2.2.5-SNAPSHOT" }, { "groupId": "org.onap.policy.models.policy-models-interactions.model-actors", "artifactId": "actor.vfc", - "version": "2.2.3-SNAPSHOT" + "version": "2.2.5-SNAPSHOT" }, { "groupId": "org.onap.policy.models.policy-models-interactions", "artifactId": "model-yaml", - "version": "2.2.3-SNAPSHOT" + "version": "2.2.5-SNAPSHOT" }, { "groupId": "com.att.research.xacml", "artifactId": "xacml-pdp", diff --git a/BRMSGateway/pom.xml b/BRMSGateway/pom.xml index 68a5a08fc..c34def84c 100644 --- a/BRMSGateway/pom.xml +++ b/BRMSGateway/pom.xml @@ -23,7 +23,7 @@ org.onap.policy.engine PolicyEngineSuite - 1.6.2-SNAPSHOT + 1.6.3-SNAPSHOT BRMSGateway This application will take in BRMS rules and acts as interface between PR and PDP XACML diff --git a/BRMSGateway/src/main/java/org/onap/policy/brms/api/BrmsPush.java b/BRMSGateway/src/main/java/org/onap/policy/brms/api/BrmsPush.java index ee94c6f96..4e01b0a84 100644 --- a/BRMSGateway/src/main/java/org/onap/policy/brms/api/BrmsPush.java +++ b/BRMSGateway/src/main/java/org/onap/policy/brms/api/BrmsPush.java @@ -117,7 +117,7 @@ public class BrmsPush { private static final Logger LOGGER = FlexLogger.getLogger(BrmsPush.class.getName()); private static final String PROJECTSLOCATION = "RuleProjects"; private static final String[] GOALS = {"clean", "deploy"}; - private static final String DEFAULT_VERSION = "1.6.1-SNAPSHOT"; + private static final String DEFAULT_VERSION = "1.6.2-SNAPSHOT"; private static final String DEPENDENCY_FILE = "dependency.json"; private static final String PROP_AES_KEY = "org.onap.policy.encryption.aes.key"; public static final String BRMSPERSISTENCE = "brmsEclipselink.persistencexml"; diff --git a/BRMSGateway/src/test/resources/config.properties b/BRMSGateway/src/test/resources/config.properties index 5ad9b9e1a..c7522cfe4 100644 --- a/BRMSGateway/src/test/resources/config.properties +++ b/BRMSGateway/src/test/resources/config.properties @@ -81,6 +81,6 @@ ping_interval=30000 # # # -brms.dependency.version=1.6.0 +brms.dependency.version=1.6.2-SNAPSHOT ENVIRONMENT = DEVL diff --git a/LogParser/pom.xml b/LogParser/pom.xml index ec39cce82..534cdbee6 100644 --- a/LogParser/pom.xml +++ b/LogParser/pom.xml @@ -24,7 +24,7 @@ org.onap.policy.engine PolicyEngineSuite - 1.6.2-SNAPSHOT + 1.6.3-SNAPSHOT LogParser diff --git a/ONAP-PAP-REST/pom.xml b/ONAP-PAP-REST/pom.xml index 161b941a0..3b518ca2d 100644 --- a/ONAP-PAP-REST/pom.xml +++ b/ONAP-PAP-REST/pom.xml @@ -28,7 +28,7 @@ org.onap.policy.engine PolicyEngineSuite - 1.6.2-SNAPSHOT + 1.6.3-SNAPSHOT 4.3.10.Final diff --git a/ONAP-PDP-REST/pom.xml b/ONAP-PDP-REST/pom.xml index 61b5e307b..490839ad7 100644 --- a/ONAP-PDP-REST/pom.xml +++ b/ONAP-PDP-REST/pom.xml @@ -23,7 +23,7 @@ org.onap.policy.engine PolicyEngineSuite - 1.6.2-SNAPSHOT + 1.6.3-SNAPSHOT ONAP-PDP-REST ONAP PDP REST diff --git a/ONAP-PDP/pom.xml b/ONAP-PDP/pom.xml index 6643b85f6..4a7e63ab5 100644 --- a/ONAP-PDP/pom.xml +++ b/ONAP-PDP/pom.xml @@ -27,7 +27,7 @@ org.onap.policy.engine PolicyEngineSuite - 1.6.2-SNAPSHOT + 1.6.3-SNAPSHOT diff --git a/ONAP-REST/pom.xml b/ONAP-REST/pom.xml index f2cf39005..405148952 100644 --- a/ONAP-REST/pom.xml +++ b/ONAP-REST/pom.xml @@ -26,7 +26,7 @@ org.onap.policy.engine PolicyEngineSuite - 1.6.2-SNAPSHOT + 1.6.3-SNAPSHOT ONAP-REST ONAP REST diff --git a/ONAP-SDK-APP/pom.xml b/ONAP-SDK-APP/pom.xml index 097bc5460..f98f82824 100644 --- a/ONAP-SDK-APP/pom.xml +++ b/ONAP-SDK-APP/pom.xml @@ -22,7 +22,7 @@ org.onap.policy.engine PolicyEngineSuite - 1.6.2-SNAPSHOT + 1.6.3-SNAPSHOT ONAP-SDK-APP war diff --git a/ONAP-XACML/pom.xml b/ONAP-XACML/pom.xml index 9fd78c50f..99873ca61 100644 --- a/ONAP-XACML/pom.xml +++ b/ONAP-XACML/pom.xml @@ -24,7 +24,7 @@ org.onap.policy.engine PolicyEngineSuite - 1.6.2-SNAPSHOT + 1.6.3-SNAPSHOT ONAP-XACML jar diff --git a/POLICY-SDK-APP/pom.xml b/POLICY-SDK-APP/pom.xml index cfe85ef2d..d0be7941a 100644 --- a/POLICY-SDK-APP/pom.xml +++ b/POLICY-SDK-APP/pom.xml @@ -22,7 +22,7 @@ org.onap.policy.engine PolicyEngineSuite - 1.6.2-SNAPSHOT + 1.6.3-SNAPSHOT POLICY-SDK-APP war diff --git a/POLICY-SDK-APP/src/main/webapp/app/policyApp/main/policyEditor.html b/POLICY-SDK-APP/src/main/webapp/app/policyApp/main/policyEditor.html index 8a7a45d5f..0493afce1 100644 --- a/POLICY-SDK-APP/src/main/webapp/app/policyApp/main/policyEditor.html +++ b/POLICY-SDK-APP/src/main/webapp/app/policyApp/main/policyEditor.html @@ -41,7 +41,8 @@ - + + diff --git a/PolicyEngineAPI/pom.xml b/PolicyEngineAPI/pom.xml index 280d25a35..8a93e98af 100644 --- a/PolicyEngineAPI/pom.xml +++ b/PolicyEngineAPI/pom.xml @@ -24,7 +24,7 @@ org.onap.policy.engine PolicyEngineSuite - 1.6.2-SNAPSHOT + 1.6.3-SNAPSHOT PolicyEngineAPI diff --git a/PolicyEngineClient/pom.xml b/PolicyEngineClient/pom.xml index a0e22cbee..8886a7941 100644 --- a/PolicyEngineClient/pom.xml +++ b/PolicyEngineClient/pom.xml @@ -24,7 +24,7 @@ org.onap.policy.engine PolicyEngineSuite - 1.6.2-SNAPSHOT + 1.6.3-SNAPSHOT PolicyEngineClient diff --git a/PolicyEngineUtils/pom.xml b/PolicyEngineUtils/pom.xml index 4d32ac14f..3df31c8d5 100644 --- a/PolicyEngineUtils/pom.xml +++ b/PolicyEngineUtils/pom.xml @@ -24,7 +24,7 @@ org.onap.policy.engine PolicyEngineSuite - 1.6.2-SNAPSHOT + 1.6.3-SNAPSHOT PolicyEngineUtils diff --git a/TestSuite/Performance/pom.xml b/TestSuite/Performance/pom.xml index f2bc64946..d1fef7343 100644 --- a/TestSuite/Performance/pom.xml +++ b/TestSuite/Performance/pom.xml @@ -23,7 +23,7 @@ org.onap.policy.engine TestSuite - 1.6.2-SNAPSHOT + 1.6.3-SNAPSHOT Performance diff --git a/TestSuite/Stability/pom.xml b/TestSuite/Stability/pom.xml index 201c8530a..ce729211a 100644 --- a/TestSuite/Stability/pom.xml +++ b/TestSuite/Stability/pom.xml @@ -23,7 +23,7 @@ org.onap.policy.engine TestSuite - 1.6.2-SNAPSHOT + 1.6.3-SNAPSHOT Stability diff --git a/TestSuite/pom.xml b/TestSuite/pom.xml index 8b21f9bbe..467f4643a 100644 --- a/TestSuite/pom.xml +++ b/TestSuite/pom.xml @@ -23,7 +23,7 @@ org.onap.policy.engine PolicyEngineSuite - 1.6.2-SNAPSHOT + 1.6.3-SNAPSHOT TestSuite pom diff --git a/docs/index.rst b/docs/index.rst index 4b9227fe7..b25b12305 100644 --- a/docs/index.rst +++ b/docs/index.rst @@ -1,4 +1,5 @@ .. This work is licensed under a Creative Commons Attribution 4.0 International License. +.. _master_index: Policy Engine (Legacy) ---------------------- diff --git a/docs/platform/architecture.rst b/docs/platform/architecture.rst index 19f774c65..2eb3e88f0 100644 --- a/docs/platform/architecture.rst +++ b/docs/platform/architecture.rst @@ -1,6 +1,7 @@ .. This work is licensed under a .. Creative Commons Attribution 4.0 International License. .. http://creativecommons.org/licenses/by/4.0 +.. _architecture: Architecture @@ -10,7 +11,7 @@ Architecture :depth: 3 POLICY is a subsystem of ONAP that maintains, distributes, and operates on the -set of rules that underlie ONAP’s control, orchestration, and management +set of rules that underlie ONAP's control, orchestration, and management functions. POLICY provides a logically centralized environment for the creation and @@ -136,14 +137,14 @@ selected conditions in effect at that time. Some examples of types of policies are: -* VNF placement — rules governing where VNFs should be placed, including +* VNF placement - rules governing where VNFs should be placed, including affinity rules -* Data and feed management — what data to collect and when, retention periods, +* Data and feed management - what data to collect and when, retention periods, and when to send alarms about issues -* Access control — who (or what) can have access to which data -* Trigger conditions and actions — what conditions are actionable, and what to +* Access control - who (or what) can have access to which data +* Trigger conditions and actions - what conditions are actionable, and what to do under those conditions -* Interactions — how interactions between change management and +* Interactions - how interactions between change management and fault/performance management are handled (for example, should closed loops be disabled during maintenance?) @@ -190,7 +191,7 @@ correct component in a control loop such as the MSO, a Controller, or DCAE. Policy engines such as XACML and Drools also enforce policies and can trigger other components as a result (for example, causing a controller to take specific actions specified by the policy). Additionally, some policies -(“Guard Policies”) may enforce checks against decided actions. +("Guard Policies") may enforce checks against decided actions. Policy Unification and Organization diff --git a/packages/base/pom.xml b/packages/base/pom.xml index 2e00c8461..5715ceb32 100755 --- a/packages/base/pom.xml +++ b/packages/base/pom.xml @@ -25,7 +25,7 @@ org.onap.policy.engine packages - 1.6.2-SNAPSHOT + 1.6.3-SNAPSHOT base diff --git a/packages/base/src/files/install/servers/brmsgw/config.properties b/packages/base/src/files/install/servers/brmsgw/config.properties index a92201d2e..2666b8ca4 100644 --- a/packages/base/src/files/install/servers/brmsgw/config.properties +++ b/packages/base/src/files/install/servers/brmsgw/config.properties @@ -84,7 +84,7 @@ test_via_jmx=${{test_via_jmx}} ping_interval=30000 -brms.dependency.version=1.6.1-SNAPSHOT +brms.dependency.version=1.6.2-SNAPSHOT CLIENT_FILE=client.properties diff --git a/packages/docker/pom.xml b/packages/docker/pom.xml index 417aa0efd..a62e25d71 100644 --- a/packages/docker/pom.xml +++ b/packages/docker/pom.xml @@ -27,7 +27,7 @@ org.onap.policy.engine packages - 1.6.2-SNAPSHOT + 1.6.3-SNAPSHOT docker diff --git a/packages/install/pom.xml b/packages/install/pom.xml index 4e1db791b..63ef0bdf1 100644 --- a/packages/install/pom.xml +++ b/packages/install/pom.xml @@ -25,7 +25,7 @@ org.onap.policy.engine packages - 1.6.2-SNAPSHOT + 1.6.3-SNAPSHOT install diff --git a/packages/install/src/files/brmsgw.conf b/packages/install/src/files/brmsgw.conf index e60a9aead..7dd1153ba 100644 --- a/packages/install/src/files/brmsgw.conf +++ b/packages/install/src/files/brmsgw.conf @@ -59,5 +59,5 @@ CLIENT_ID=PDPServer CLIENT_KEY=test ENVIRONMENT=DEVL -BRMS_DEPENDENCY_VERSION=1.6.1-SNAPSHOT -BRMS_MODELS_DEPENDENCY_VERSION=2.2.3-SNAPSHOT +BRMS_DEPENDENCY_VERSION=1.6.2-SNAPSHOT +BRMS_MODELS_DEPENDENCY_VERSION=2.2.5-SNAPSHOT diff --git a/packages/pom.xml b/packages/pom.xml index 6e5569093..2bec2a50a 100644 --- a/packages/pom.xml +++ b/packages/pom.xml @@ -25,7 +25,7 @@ org.onap.policy.engine PolicyEngineSuite - 1.6.2-SNAPSHOT + 1.6.3-SNAPSHOT packages pom diff --git a/pom.xml b/pom.xml index 6fb508fbd..91ae711de 100644 --- a/pom.xml +++ b/pom.xml @@ -24,12 +24,12 @@ org.onap.policy.parent integration - 3.1.1 + 3.1.2 org.onap.policy.engine PolicyEngineSuite - 1.6.2-SNAPSHOT + 1.6.3-SNAPSHOT pom policy-engine The ONAP Policy Engine main pom @@ -54,8 +54,8 @@ 1.3.3 1.18 6.8.2 - 1.6.3-SNAPSHOT - 2.2.3-SNAPSHOT + 1.6.4 + 2.2.4 PolicyEngineUtils diff --git a/releases/1.6.2-container.yaml b/releases/1.6.2-container.yaml new file mode 100644 index 000000000..88566e08f --- /dev/null +++ b/releases/1.6.2-container.yaml @@ -0,0 +1,8 @@ +distribution_type: 'container' +container_release_tag: '1.6.2' +project: 'policy-engine' +log_dir: 'policy-engine-maven-docker-stage-master/304' +ref: 99fad3e83f8282299e59077d8826362990c695a9 +containers: + - name: 'policy-pe' + version: '1.6.2-20200415T1303' diff --git a/releases/1.6.2.yaml b/releases/1.6.2.yaml new file mode 100644 index 000000000..c268e5a0d --- /dev/null +++ b/releases/1.6.2.yaml @@ -0,0 +1,4 @@ +distribution_type: 'maven' +version: '1.6.2' +project: 'policy-engine' +log_dir: 'policy-engine-maven-stage-master/305/' diff --git a/version.properties b/version.properties index 5be42c80d..d6bddbc2d 100644 --- a/version.properties +++ b/version.properties @@ -24,7 +24,7 @@ major=1 minor=6 -patch=2 +patch=3 base_version=${major}.${minor}.${patch}