From a338a10d55276864aa910e78d2f237252fd2d341 Mon Sep 17 00:00:00 2001
From: Ram Krishna Verma <ram_krishna.verma@bell.ca>
Date: Mon, 5 Oct 2020 17:10:08 -0400
Subject: Remove legacy operational policy type from apex-pdp

The legacy operational policy type for apex has been removed in Guilin release.
Removing it fron supported policy type and other places in apex-pdp.

Issue-ID: POLICY-2857
Change-Id: I41d58bf7e82292e11ff752f61dbe9be96a8a7af4
Signed-off-by: Ram Krishna Verma <ram_krishna.verma@bell.ca>
---
 .../src/main/resources/config/OnapPfConfig.json               |  4 ----
 .../src/test/resources/ApexStarterConfigParameters.json       | 11 ++++++++++-
 .../src/test/resources/ApexStarterConfigParametersNoop.json   | 11 ++++++++++-
 .../src/test/resources/ApexStarterConfigParameters_sim.json   | 11 ++++++++++-
 .../src/test/resources/TestConfigParameters.json              | 11 ++++++++++-
 5 files changed, 40 insertions(+), 8 deletions(-)

(limited to 'services/services-onappf/src')

diff --git a/services/services-onappf/src/main/resources/config/OnapPfConfig.json b/services/services-onappf/src/main/resources/config/OnapPfConfig.json
index c08c44072..6c80e032b 100644
--- a/services/services-onappf/src/main/resources/config/OnapPfConfig.json
+++ b/services/services-onappf/src/main/resources/config/OnapPfConfig.json
@@ -13,10 +13,6 @@
         "pdpType":"apex",
         "description":"Pdp Heartbeat",
         "supportedPolicyTypes": [
-            {
-                "name": "onap.policies.controlloop.operational.Apex",
-                "version": "1.0.0"
-            },
             {
               "name": "onap.policies.controlloop.operational.common.Apex",
               "version": "1.0.0"
diff --git a/services/services-onappf/src/test/resources/ApexStarterConfigParameters.json b/services/services-onappf/src/test/resources/ApexStarterConfigParameters.json
index 4e58200a4..033e75d0d 100644
--- a/services/services-onappf/src/test/resources/ApexStarterConfigParameters.json
+++ b/services/services-onappf/src/test/resources/ApexStarterConfigParameters.json
@@ -12,7 +12,16 @@
         "timeIntervalMs": 120000,
         "pdpType":"apex",
         "description":"Pdp Heartbeat",
-        "supportedPolicyTypes":[{"name":"onap.policies.controlloop.operational.Apex","version":"1.0.0"}]
+        "supportedPolicyTypes": [
+            {
+              "name": "onap.policies.controlloop.operational.common.Apex",
+              "version": "1.0.0"
+            },
+            {
+                "name": "onap.policies.native.Apex",
+                "version": "1.0.0"
+            }
+        ]
     },
     "topicParameterGroup": {
         "topicSources" : [ {
diff --git a/services/services-onappf/src/test/resources/ApexStarterConfigParametersNoop.json b/services/services-onappf/src/test/resources/ApexStarterConfigParametersNoop.json
index 13d1dbfed..87d9fd4c3 100644
--- a/services/services-onappf/src/test/resources/ApexStarterConfigParametersNoop.json
+++ b/services/services-onappf/src/test/resources/ApexStarterConfigParametersNoop.json
@@ -12,7 +12,16 @@
         "timeIntervalMs": 120000,
         "pdpType":"apex",
         "description":"Pdp Heartbeat",
-        "supportedPolicyTypes":[{"name":"onap.policies.controlloop.operational.Apex","version":"1.0.0"}]
+        "supportedPolicyTypes": [
+            {
+              "name": "onap.policies.controlloop.operational.common.Apex",
+              "version": "1.0.0"
+            },
+            {
+                "name": "onap.policies.native.Apex",
+                "version": "1.0.0"
+            }
+        ]
     },
     "topicParameterGroup": {
         "topicSources" : [ {
diff --git a/services/services-onappf/src/test/resources/ApexStarterConfigParameters_sim.json b/services/services-onappf/src/test/resources/ApexStarterConfigParameters_sim.json
index 67e5bcb36..9686f91a2 100644
--- a/services/services-onappf/src/test/resources/ApexStarterConfigParameters_sim.json
+++ b/services/services-onappf/src/test/resources/ApexStarterConfigParameters_sim.json
@@ -12,7 +12,16 @@
         "timeIntervalMs": 120000,
         "pdpType":"apex",
         "description":"Pdp Heartbeat",
-        "supportedPolicyTypes":[{"name":"onap.policies.controlloop.operational.Apex","version":"1.0.0"}]
+        "supportedPolicyTypes": [
+            {
+              "name": "onap.policies.controlloop.operational.common.Apex",
+              "version": "1.0.0"
+            },
+            {
+                "name": "onap.policies.native.Apex",
+                "version": "1.0.0"
+            }
+        ]
     },
     "topicParameterGroup": {
         "topicSources" : [{
diff --git a/services/services-onappf/src/test/resources/TestConfigParameters.json b/services/services-onappf/src/test/resources/TestConfigParameters.json
index 4e58200a4..033e75d0d 100644
--- a/services/services-onappf/src/test/resources/TestConfigParameters.json
+++ b/services/services-onappf/src/test/resources/TestConfigParameters.json
@@ -12,7 +12,16 @@
         "timeIntervalMs": 120000,
         "pdpType":"apex",
         "description":"Pdp Heartbeat",
-        "supportedPolicyTypes":[{"name":"onap.policies.controlloop.operational.Apex","version":"1.0.0"}]
+        "supportedPolicyTypes": [
+            {
+              "name": "onap.policies.controlloop.operational.common.Apex",
+              "version": "1.0.0"
+            },
+            {
+                "name": "onap.policies.native.Apex",
+                "version": "1.0.0"
+            }
+        ]
     },
     "topicParameterGroup": {
         "topicSources" : [ {
-- 
cgit 1.2.3-korg