Merge "Updates to Dublin release notes"
authorPamela Dragosh <pdragosh@research.att.com>
Tue, 28 May 2019 13:24:27 +0000 (13:24 +0000)
committerGerrit Code Review <gerrit@onap.org>
Tue, 28 May 2019 13:24:27 +0000 (13:24 +0000)
29 files changed:
BRMSGateway/config.properties
BRMSGateway/dependency.json
BRMSGateway/pom.xml
BRMSGateway/src/main/java/org/onap/policy/brms/api/BrmsPush.java
BRMSGateway/src/test/resources/config.properties
INFO.yaml
LogParser/pom.xml
ONAP-PAP-REST/pom.xml
ONAP-PDP-REST/pom.xml
ONAP-PDP-REST/src/main/java/org/onap/policy/pdp/rest/api/services/PdpApiService.java
ONAP-PDP/pom.xml
ONAP-REST/pom.xml
ONAP-SDK-APP/pom.xml
ONAP-XACML/pom.xml
POLICY-SDK-APP/pom.xml
PolicyEngineAPI/pom.xml
PolicyEngineClient/pom.xml
PolicyEngineUtils/pom.xml
TestSuite/Performance/pom.xml
TestSuite/Stability/pom.xml
TestSuite/pom.xml
packages/base/pom.xml
packages/base/src/files/install/servers/brmsgw/config.properties
packages/docker/pom.xml
packages/install/pom.xml
packages/install/src/files/brmsgw.conf
packages/pom.xml
pom.xml
version.properties

index 2ef1a28..aaa3215 100644 (file)
@@ -77,7 +77,7 @@ ping_interval=30000
 #
 #
 #
-brms.dependency.version=1.4.0-SNAPSHOT
+brms.dependency.version=1.4.2-SNAPSHOT
 
 ENVIRONMENT = DEVL
 
index 2408723..c741d46 100644 (file)
         "default": [{
             "groupId": "org.onap.policy.drools-applications.controlloop.templates",
             "artifactId": "template.demo",
-            "version": "1.4.0-SNAPSHOT"
+            "version": "1.4.2-SNAPSHOT"
         }, {
             "groupId": "org.onap.policy.models.policy-models-interactions.model-impl",
             "artifactId": "events",
-            "version": "2.0.0-SNAPSHOT"
+            "version": "2.0.2-SNAPSHOT"
         }, {
             "groupId": "org.onap.policy.models.policy-models-interactions.model-impl",
             "artifactId": "rest",
-            "version": "2.0.0-SNAPSHOT"
+            "version": "2.0.2-SNAPSHOT"
         }, {
             "groupId": "org.onap.policy.models.policy-models-interactions.model-impl",
             "artifactId": "appc",
-            "version": "2.0.0-SNAPSHOT"
+            "version": "2.0.2-SNAPSHOT"
         }, {
             "groupId": "org.onap.policy.models.policy-models-interactions.model-impl",
             "artifactId": "aai",
-            "version": "2.0.0-SNAPSHOT"
+            "version": "2.0.2-SNAPSHOT"
         }, {
             "groupId": "org.onap.policy.models.policy-models-interactions.model-impl",
             "artifactId": "so",
-            "version": "2.0.0-SNAPSHOT"
+            "version": "2.0.2-SNAPSHOT"
         }, {
             "groupId": "org.onap.policy.models.policy-models-interactions.model-impl",
             "artifactId": "sdnc",
-            "version": "2.0.0-SNAPSHOT"
+            "version": "2.0.2-SNAPSHOT"
         }, {
             "groupId": "org.onap.policy.models.policy-models-interactions.model-impl",
             "artifactId": "sdnr",
-            "version": "2.0.0-SNAPSHOT"
+            "version": "2.0.2-SNAPSHOT"
         }, {
             "groupId": "org.onap.policy.models.policy-models-interactions.model-impl",
             "artifactId": "trafficgenerator",
-            "version": "2.0.0-SNAPSHOT"
+            "version": "2.0.2-SNAPSHOT"
         }],
         "amsterdam": [{
             "groupId": "org.onap.policy.models.policy-models-interactions.model-impl",
             "artifactId": "events",
-            "version": "2.0.0-SNAPSHOT"
+            "version": "2.0.2-SNAPSHOT"
         }, {
             "groupId": "org.onap.policy.models.policy-models-interactions.model-impl",
             "artifactId": "appc",
-            "version": "2.0.0-SNAPSHOT"
+            "version": "2.0.2-SNAPSHOT"
         }, {
             "groupId": "org.onap.policy.models.policy-models-interactions.model-impl",
             "artifactId": "appclcm",
-            "version": "2.0.0-SNAPSHOT"
+            "version": "2.0.2-SNAPSHOT"
         }, {
             "groupId": "org.onap.policy.models.policy-models-interactions.model-impl",
             "artifactId": "vfc",
-            "version": "2.0.0-SNAPSHOT"
+            "version": "2.0.2-SNAPSHOT"
         }, {
             "groupId": "org.onap.policy.models.policy-models-interactions.model-impl",
             "artifactId": "so",
-            "version": "2.0.0-SNAPSHOT"
+            "version": "2.0.2-SNAPSHOT"
         }, {
             "groupId": "org.onap.policy.models.policy-models-interactions.model-impl",
             "artifactId": "sdnr",
-            "version": "2.0.0-SNAPSHOT"
+            "version": "2.0.2-SNAPSHOT"
         }, {
             "groupId": "org.onap.policy.models.policy-models-interactions.model-impl",
             "artifactId": "sdnc",
-            "version": "2.0.0-SNAPSHOT"
+            "version": "2.0.2-SNAPSHOT"
         }, {
             "groupId": "org.onap.policy.models.policy-models-interactions.model-impl",
             "artifactId": "aai",
-            "version": "2.0.0-SNAPSHOT"
+            "version": "2.0.2-SNAPSHOT"
         }, {
             "groupId": "org.onap.policy.models.policy-models-interactions.model-impl",
             "artifactId": "sdc",
-            "version": "2.0.0-SNAPSHOT"
+            "version": "2.0.2-SNAPSHOT"
         }, {
             "groupId": "org.onap.policy.models.policy-models-interactions.model-impl",
             "artifactId": "trafficgenerator",
-            "version": "2.0.0-SNAPSHOT"
+            "version": "2.0.2-SNAPSHOT"
         }, {
             "groupId": "org.onap.policy.drools-applications.controlloop.common",
             "artifactId": "eventmanager",
-            "version": "1.4.0-SNAPSHOT"
+            "version": "1.4.2-SNAPSHOT"
         }, {
             "groupId": "org.onap.policy.drools-applications.controlloop.common",
             "artifactId": "guard",
-            "version": "1.4.0-SNAPSHOT"
+            "version": "1.4.2-SNAPSHOT"
         }, {
             "groupId": "org.onap.policy.models.policy-models-interactions.model-actors",
             "artifactId": "actorServiceProvider",
-            "version": "2.0.0-SNAPSHOT"
+            "version": "2.0.2-SNAPSHOT"
         }, {
             "groupId": "org.onap.policy.models.policy-models-interactions.model-actors",
             "artifactId": "actor.appc",
-            "version": "2.0.0-SNAPSHOT"
+            "version": "2.0.2-SNAPSHOT"
         }, {
             "groupId": "org.onap.policy.models.policy-models-interactions.model-actors",
             "artifactId": "actor.appclcm",
-            "version": "2.0.0-SNAPSHOT"
+            "version": "2.0.2-SNAPSHOT"
         }, {
             "groupId": "org.onap.policy.models.policy-models-interactions.model-actors",
             "artifactId": "actor.so",
-            "version": "2.0.0-SNAPSHOT"
+            "version": "2.0.2-SNAPSHOT"
         }, {
             "groupId": "org.onap.policy.models.policy-models-interactions.model-actors",
             "artifactId": "actor.sdnc",
-            "version": "2.0.0-SNAPSHOT"
+            "version": "2.0.2-SNAPSHOT"
         }, {
             "groupId": "org.onap.policy.models.policy-models-interactions.model-actors",
             "artifactId": "actor.sdnr",
-            "version": "2.0.0-SNAPSHOT"
+            "version": "2.0.2-SNAPSHOT"
         }, {
             "groupId": "org.onap.policy.models.policy-models-interactions.model-actors",
             "artifactId": "actor.vfc",
-            "version": "2.0.0-SNAPSHOT"
+            "version": "2.0.2-SNAPSHOT"
         }, {
             "groupId": "org.onap.policy.models.policy-models-interactions",
             "artifactId": "model-yaml",
-            "version": "2.0.0-SNAPSHOT"
+            "version": "2.0.2-SNAPSHOT"
         }, {
             "groupId": "com.att.research.xacml",
             "artifactId": "xacml-pdp",
index 1922e90..3ef25d7 100644 (file)
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.onap.policy.engine</groupId>
         <artifactId>PolicyEngineSuite</artifactId>
-        <version>1.4.0-SNAPSHOT</version>
+        <version>1.4.2-SNAPSHOT</version>
     </parent>
     <artifactId>BRMSGateway</artifactId>
     <description>This application will take in BRMS rules and acts as interface between PR and PDP XACML</description>
index 548275c..38ca866 100644 (file)
@@ -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.4.0-SNAPSHOT";
+    private static final String DEFAULT_VERSION = "1.4.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";
index 08fd8be..b8fc09d 100644 (file)
@@ -81,6 +81,6 @@ ping_interval=30000
 #
 #
 #
-brms.dependency.version=1.4.0-SNAPSHOT
+brms.dependency.version=1.4.2-SNAPSHOT
 
 ENVIRONMENT = DEVL
index 3eef181..0984822 100644 (file)
--- a/INFO.yaml
+++ b/INFO.yaml
@@ -47,7 +47,7 @@ repositories:
 committers:
     - <<: *onap_releng_ptl
     - name: 'Jorge Hernandez'
-      email: 'jh1730@att.com'
+      email: 'jorge.hernandez-herrero@att.com'
       company: 'ATT'
       id: 'jhh'
       timezone: 'America/Illinois'
@@ -56,5 +56,21 @@ committers:
       company: 'Ericsson'
       id: 'liamfallon'
       timezone: 'Europe/Ireland'
+    - name: 'Jim Hahn'
+      email: 'jrh3@att.com'
+      company: 'ATT'
+      id: 'jrh3'
+      timezone: 'America/New_York'
+    - name: 'Ram Krishna Verma'
+      email: 'ram.krishna.verma@est.tech'
+      company: 'Ericsson'
+      id: 'ramverma'
+      timezone: 'Europe/Ireland'
 tsc:
     approval: 'https://lists.onap.org/pipermail/onap-tsc'
+    changes:
+        - type: 'Addition'
+          name: 'Jim Hahn'
+          name: 'Ram Krishna Verma'
+          link: https://lists.onap.org/g/onap-tsc/message/4977
+          link: https://lists.onap.org/g/onap-tsc/message/4976
index 035181d..d455df3 100644 (file)
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.onap.policy.engine</groupId>
         <artifactId>PolicyEngineSuite</artifactId>
-        <version>1.4.0-SNAPSHOT</version>
+        <version>1.4.2-SNAPSHOT</version>
     </parent>
     <artifactId>LogParser</artifactId>
     <dependencies>
index 9714e4d..043d1ac 100644 (file)
@@ -28,7 +28,7 @@
     <parent>
         <groupId>org.onap.policy.engine</groupId>
         <artifactId>PolicyEngineSuite</artifactId>
-        <version>1.4.0-SNAPSHOT</version>
+        <version>1.4.2-SNAPSHOT</version>
     </parent>
     <build>
         <plugins>
index bffc06b..61c0381 100644 (file)
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.onap.policy.engine</groupId>
         <artifactId>PolicyEngineSuite</artifactId>
-        <version>1.4.0-SNAPSHOT</version>
+        <version>1.4.2-SNAPSHOT</version>
     </parent>
     <artifactId>ONAP-PDP-REST</artifactId>
     <description>ONAP PDP REST</description>
index 8a7a8e0..7ecfb2d 100644 (file)
@@ -103,8 +103,7 @@ public abstract class PdpApiService {
 
     protected boolean validatePolicyNameAndScope(List<String> policyNames, List<String> policyTypes,
             List<PolicyNameType> policyList) {
-        String policyName = null;
-        String policyScope = null;
+
         String polType = null;
 
         if (policyTypes.size() == 1) {
@@ -117,13 +116,20 @@ public abstract class PdpApiService {
                 if (policyTypes.size() > 1) {
                     polType = policyTypes.get(i).trim();
                 }
-                if (polName.contains(".")) {
+
+                String policyName = null;
+                String policyScope = null;
+                if (polName.endsWith("xml")) {
+                    policyName = polName;
+                    policyScope = policyName.substring(0, StringUtils.lastOrdinalIndexOf(policyName, ".", 3));
+                } else if (polName.contains(".")) {
                     policyName = polName.substring(polName.lastIndexOf('.') + 1);
                     policyScope = polName.substring(0, polName.lastIndexOf('.'));
                 } else {
                     message = XACMLErrorConstants.ERROR_DATA_ISSUE + "No Policy Scope given.";
                     return false;
                 }
+
                 if (StringUtils.isBlank(policyName) || StringUtils.isBlank(policyScope)) {
                     message = XACMLErrorConstants.ERROR_DATA_ISSUE + "Invalid Policy Name.";
                     return false;
index 2bd4548..5c69d93 100644 (file)
@@ -27,7 +27,7 @@
     <parent>
         <groupId>org.onap.policy.engine</groupId>
         <artifactId>PolicyEngineSuite</artifactId>
-        <version>1.4.0-SNAPSHOT</version>
+        <version>1.4.2-SNAPSHOT</version>
     </parent>
     <dependencies>
         <dependency>
index 5d899fc..2ba4ebc 100644 (file)
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.onap.policy.engine</groupId>
         <artifactId>PolicyEngineSuite</artifactId>
-        <version>1.4.0-SNAPSHOT</version>
+        <version>1.4.2-SNAPSHOT</version>
     </parent>
     <artifactId>ONAP-REST</artifactId>
     <description>ONAP REST</description>
index 28cbf87..13b4418 100644 (file)
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onap.policy.engine</groupId>
         <artifactId>PolicyEngineSuite</artifactId>
-        <version>1.4.0-SNAPSHOT</version>
+        <version>1.4.2-SNAPSHOT</version>
     </parent>
     <artifactId>ONAP-SDK-APP</artifactId>
     <packaging>war</packaging>
index 0577080..80b50ac 100644 (file)
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.onap.policy.engine</groupId>
         <artifactId>PolicyEngineSuite</artifactId>
-        <version>1.4.0-SNAPSHOT</version>
+        <version>1.4.2-SNAPSHOT</version>
     </parent>
     <artifactId>ONAP-XACML</artifactId>
     <packaging>jar</packaging>
index c5da9dd..133e930 100644 (file)
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onap.policy.engine</groupId>
         <artifactId>PolicyEngineSuite</artifactId>
-        <version>1.4.0-SNAPSHOT</version>
+        <version>1.4.2-SNAPSHOT</version>
     </parent>
     <artifactId>POLICY-SDK-APP</artifactId>
     <packaging>war</packaging>
index 159d831..60179ca 100644 (file)
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.onap.policy.engine</groupId>
         <artifactId>PolicyEngineSuite</artifactId>
-        <version>1.4.0-SNAPSHOT</version>
+        <version>1.4.2-SNAPSHOT</version>
     </parent>
     <artifactId>PolicyEngineAPI</artifactId>
     <dependencies>
index feb9e51..03d6879 100644 (file)
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.onap.policy.engine</groupId>
         <artifactId>PolicyEngineSuite</artifactId>
-        <version>1.4.0-SNAPSHOT</version>
+        <version>1.4.2-SNAPSHOT</version>
     </parent>
     <artifactId>PolicyEngineClient</artifactId>
     <dependencies>
index 5a30f51..29c0373 100644 (file)
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.onap.policy.engine</groupId>
         <artifactId>PolicyEngineSuite</artifactId>
-        <version>1.4.0-SNAPSHOT</version>
+        <version>1.4.2-SNAPSHOT</version>
     </parent>
     <artifactId>PolicyEngineUtils</artifactId>
     <dependencies>
index 7a5b6a1..5782945 100644 (file)
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.onap.policy.engine</groupId>
     <artifactId>TestSuite</artifactId>
-    <version>1.4.0-SNAPSHOT</version>
+    <version>1.4.2-SNAPSHOT</version>
   </parent>
   <artifactId>Performance</artifactId>
   <properties>
index d520384..81e100b 100644 (file)
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.onap.policy.engine</groupId>
     <artifactId>TestSuite</artifactId>
-    <version>1.4.0-SNAPSHOT</version>
+    <version>1.4.2-SNAPSHOT</version>
   </parent>
   <artifactId>Stability</artifactId>
   <properties>
index 8c96319..fd68f82 100644 (file)
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.onap.policy.engine</groupId>
         <artifactId>PolicyEngineSuite</artifactId>
-        <version>1.4.0-SNAPSHOT</version>
+        <version>1.4.2-SNAPSHOT</version>
     </parent>
     <artifactId>TestSuite</artifactId>
     <packaging>pom</packaging>
index 18dc891..fefcc28 100755 (executable)
@@ -25,7 +25,7 @@
        <parent>
                <groupId>org.onap.policy.engine</groupId>
                <artifactId>packages</artifactId>
-               <version>1.4.0-SNAPSHOT</version>
+               <version>1.4.2-SNAPSHOT</version>
        </parent>
 
        <artifactId>base</artifactId>
index c16df02..1080f46 100644 (file)
@@ -84,9 +84,9 @@ test_via_jmx=${{test_via_jmx}}
 
 ping_interval=30000
 
-brms.dependency.version=1.3.0-SNAPSHOT
+brms.dependency.version=1.4.1-SNAPSHOT
 
 CLIENT_FILE=client.properties
 
 # AES key for password encryption in config files
-#org.onap.policy.encryption.aes.key=12345678901234567890123456789012
\ No newline at end of file
+#org.onap.policy.encryption.aes.key=12345678901234567890123456789012
index 04a65ad..93f8150 100644 (file)
@@ -25,7 +25,7 @@
        <parent>
                 <groupId>org.onap.policy.engine</groupId>
                 <artifactId>packages</artifactId>
-                <version>1.4.0-SNAPSHOT</version>
+                <version>1.4.2-SNAPSHOT</version>
        </parent>
 
        <artifactId>docker</artifactId>
index 72a978d..26d5c43 100644 (file)
@@ -25,7 +25,7 @@
        <parent>
                <groupId>org.onap.policy.engine</groupId>
                <artifactId>packages</artifactId>
-               <version>1.4.0-SNAPSHOT</version>
+               <version>1.4.2-SNAPSHOT</version>
        </parent>
 
        <artifactId>install</artifactId>
index bfd82a1..6d0f7d1 100644 (file)
@@ -59,5 +59,5 @@ CLIENT_ID=PDPServer
 CLIENT_KEY=test
 ENVIRONMENT=DEVL
 
-BRMS_DEPENDENCY_VERSION=1.4.0-SNAPSHOT
-BRMS_MODELS_DEPENDENCY_VERSION=2.0.0-SNAPSHOT
+BRMS_DEPENDENCY_VERSION=1.4.1-SNAPSHOT
+BRMS_MODELS_DEPENDENCY_VERSION=2.0.1-SNAPSHOT
index a1dc985..55a6cbe 100644 (file)
@@ -23,7 +23,7 @@
        <parent>
                <groupId>org.onap.policy.engine</groupId>
                <artifactId>PolicyEngineSuite</artifactId>
-               <version>1.4.0-SNAPSHOT</version>
+               <version>1.4.2-SNAPSHOT</version>
        </parent>
        <artifactId>packages</artifactId>
        <packaging>pom</packaging>
diff --git a/pom.xml b/pom.xml
index f1a5a74..85f44e4 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -28,7 +28,7 @@
     </parent>
     <groupId>org.onap.policy.engine</groupId>
     <artifactId>PolicyEngineSuite</artifactId>
-    <version>1.4.0-SNAPSHOT</version>
+    <version>1.4.2-SNAPSHOT</version>
     <packaging>pom</packaging>
     <name>policy-engine</name>
     <description>The ONAP Policy Engine main pom</description>
index c0fb9b1..739b15f 100644 (file)
@@ -24,7 +24,7 @@
 
 major=1
 minor=4
-patch=0
+patch=2
 
 base_version=${major}.${minor}.${patch}