Fix drools-pdp and applications mismatch names on docker compose x config folder

Issue-ID: POLICY-4125
Change-Id: Ic63e99f19f46e494895e64525b2d9413e901bef6
Signed-off-by: adheli.tavares <adheli.tavares@est.tech>

diff --git a/compose/config/drools-pdp/groups.json b/compose/config/drools-pdp/groups.json
index 6ee30e1..99611c9 100644 (file)
--- a/compose/config/drools-pdp/groups.json
+++ b/compose/config/drools-pdp/groups.json
@@ -6,95 +6,6 @@
       "description": "The default group that registers all supported policy types and pdps.",
       "pdpGroupState": "ACTIVE",
       "pdpSubgroups": [
-        {
-          "pdpType": "xacml",
-          "supportedPolicyTypes": [
-            {
-              "name": "onap.policies.controlloop.guard.common.FrequencyLimiter",
-              "version": "1.0.0"
-            },
-            {
-              "name": "onap.policies.controlloop.guard.common.MinMax",
-              "version": "1.0.0"
-            },
-            {
-              "name": "onap.policies.controlloop.guard.common.Blacklist",
-              "version": "1.0.0"
-            },
-            {
-              "name": "onap.policies.controlloop.guard.common.Filter",
-              "version": "1.0.0"
-            },
-            {
-              "name": "onap.policies.controlloop.guard.coordination.FirstBlocksSecond",
-              "version": "1.0.0"
-            },
-            {
-              "name": "onap.policies.monitoring.*",
-              "version": "1.0.0"
-            },
-            {
-              "name": "onap.policies.optimization.*",
-              "version": "1.0.0"
-            },
-            {
-              "name": "onap.policies.optimization.resource.AffinityPolicy",
-              "version": "1.0.0"
-            },
-            {
-              "name": "onap.policies.optimization.resource.DistancePolicy",
-              "version": "1.0.0"
-            },
-            {
-              "name": "onap.policies.optimization.resource.HpaPolicy",
-              "version": "1.0.0"
-            },
-            {
-              "name": "onap.policies.optimization.resource.OptimizationPolicy",
-              "version": "1.0.0"
-            },
-            {
-              "name": "onap.policies.optimization.resource.PciPolicy",
-              "version": "1.0.0"
-            },
-            {
-              "name": "onap.policies.optimization.service.QueryPolicy",
-              "version": "1.0.0"
-            },
-            {
-              "name": "onap.policies.optimization.service.SubscriberPolicy",
-              "version": "1.0.0"
-            },
-            {
-              "name": "onap.policies.optimization.resource.Vim_fit",
-              "version": "1.0.0"
-            },
-            {
-              "name": "onap.policies.optimization.resource.VnfPolicy",
-              "version": "1.0.0"
-            },
-            {
-              "name": "onap.policies.native.Xacml",
-              "version": "1.0.0"
-            },
-            {
-              "name": "onap.policies.Naming",
-              "version": "1.0.0"
-            },
-            {
-              "name": "onap.policies.match.*",
-              "version": "1.0.0"
-            }
-          ],
-          "currentInstanceCount": 0,
-          "desiredInstanceCount": 1,
-          "policies": [
-            {
-              "name": "SDNC_Policy.ONAP_NF_NAMING_TIMESTAMP",
-              "version": "1.0.0"
-            }
-          ]
-        },
         {
           "pdpType": "drools",
           "supportedPolicyTypes": [
@@ -114,22 +25,6 @@
           "currentInstanceCount": 0,
           "desiredInstanceCount": 1,
           "policies": []
-        },
-        {
-          "pdpType": "apex",
-          "supportedPolicyTypes": [
-            {
-              "name": "onap.policies.controlloop.operational.common.Apex",
-              "version": "1.0.0"
-            },
-            {
-              "name": "onap.policies.native.Apex",
-              "version": "1.0.0"
-            }
-          ],
-          "currentInstanceCount": 0,
-          "desiredInstanceCount": 1,
-          "policies": []
         }
       ]
     }

diff --git a/compose/docker-compose.yml b/compose/docker-compose.yml
index e26a0be..429e988 100644 (file)
--- a/compose/docker-compose.yml
+++ b/compose/docker-compose.yml
@@ -138,7 +138,7 @@ services:
         'message-router', '3904',
         'pap', '6969'
         ]
-   drools:
+   drools-pdp:
       image: ${CONTAINER_LOCATION}onap/policy-drools:${POLICY_DROOLS_PDP_VERSION}
       container_name: drools
       depends_on:
@@ -160,7 +160,7 @@ services:
         'mariadb', '3306',
         'message-router', '3904'
         ]
-   drools-apps:
+   drools-applications:
       image: ${CONTAINER_LOCATION}onap/policy-pdpd-cl:${POLICY_DROOLS_APPS_VERSION}
       container_name: drools-apps
       depends_on:

diff --git a/csit/resources/scripts/setup-drools-applications.sh b/csit/resources/scripts/setup-drools-applications.sh
index 6e69977..d8542bd 100755 (executable)
--- a/csit/resources/scripts/setup-drools-applications.sh
+++ b/csit/resources/scripts/setup-drools-applications.sh
@@ -20,7 +20,7 @@
 
 source "${SCRIPTS}"/node-templates.sh
 
-source "${WORKSPACE}"/compose/start-compose.sh drools-apps
+source "${WORKSPACE}"/compose/start-compose.sh drools-applications
 
 sleep 10
 unset http_proxy https_proxy

diff --git a/csit/resources/scripts/setup-drools-pdp.sh b/csit/resources/scripts/setup-drools-pdp.sh
index f634190..fadc095 100755 (executable)
--- a/csit/resources/scripts/setup-drools-pdp.sh
+++ b/csit/resources/scripts/setup-drools-pdp.sh
@@ -18,7 +18,7 @@
 # SPDX-License-Identifier: Apache-2.0
 # ============LICENSE_END=========================================================
 
-source "${WORKSPACE}"/compose/start-compose.sh drools
+source "${WORKSPACE}"/compose/start-compose.sh drools-pdp
 
 sleep 10
 unset http_proxy https_proxy