Merge "Update S3Ps to use Kafka"

diff --git a/testsuites/performance/src/main/resources/testplans/policy_api_performance.jmx b/testsuites/performance/src/main/resources/testplans/policy_api_performance.jmx
index 5d927ff..c69d47f 100644 (file)
--- a/testsuites/performance/src/main/resources/testplans/policy_api_performance.jmx
+++ b/testsuites/performance/src/main/resources/testplans/policy_api_performance.jmx
@@ -4761,7 +4761,7 @@ if (prev.getResponseCode() == '200') {
                   "carrierTechnology": "RESTCLIENT",
                   "parameterClassName": "org.onap.policy.apex.plugins.event.carrier.restclient.RestClientCarrierTechnologyParameters",
                   "parameters": {
-                    "url": "http://message-router:3904/events/unauthenticated.DCAE_CL_OUTPUT/APEX/1?timeout=60000"
+                    "url": "http://kafka:9092/events/unauthenticated.dcae_cl_output/APEX/1?timeout=60000"
                   }
                 },
                 "eventProtocolParameters": {
@@ -4780,7 +4780,7 @@ if (prev.getResponseCode() == '200') {
                   "carrierTechnology": "RESTCLIENT",
                   "parameterClassName": "org.onap.policy.apex.plugins.event.carrier.restclient.RestClientCarrierTechnologyParameters",
                   "parameters": {
-                    "url": "http://message-router:3904/events/APPC-LCM-WRITE/APEX/1?timeout=60000"
+                    "url": "http://kafka:9092/events/appc-lcm-write/APEX/1?timeout=60000"
                   }
                 },
                 "eventProtocolParameters": {
@@ -4824,7 +4824,7 @@ if (prev.getResponseCode() == '200') {
                   "carrierTechnology": "RESTCLIENT",
                   "parameterClassName": "org.onap.policy.apex.plugins.event.carrier.restclient.RestClientCarrierTechnologyParameters",
                   "parameters": {
-                    "url": "http://message-router:3904/events/APPC-LCM-READ"
+                    "url": "http://kafka:9092/events/appc-lcm-read"
                   }
                 },
                 "eventProtocolParameters": {
@@ -4842,7 +4842,7 @@ if (prev.getResponseCode() == '200') {
                   "carrierTechnology": "RESTCLIENT",
                   "parameterClassName": "org.onap.policy.apex.plugins.event.carrier.restclient.RestClientCarrierTechnologyParameters",
                   "parameters": {
-                    "url": "http://message-router:3904/events/POLICY-CL-MGT"
+                    "url": "http://kafka:9092/events/policy-cl-mgt"
                   }
                 },
                 "eventProtocolParameters": {
@@ -5144,7 +5144,7 @@ if (prev.getResponseCode() == '200') {
                                 "taskParameters": [
                                     {
                                         "key": "logUrl",
-                                        "value": "http://message-router:3904/events/APEX-CL-MGT"
+                                        "value": "http://kafka:9092/events/apex-cl-mgt"
                                     }
                                 ]
                             }
@@ -5155,7 +5155,7 @@ if (prev.getResponseCode() == '200') {
                                     "carrierTechnology": "RESTCLIENT",
                                     "parameterClassName": "org.onap.policy.apex.plugins.event.carrier.restclient.RestClientCarrierTechnologyParameters",
                                     "parameters": {
-                                        "url": "http://message-router:3904/events/apex-pnf-input/cl/apex?timeout=30000"
+                                        "url": "http://kafka:9092/events/apex-pnf-input/cl/apex?timeout=30000"
                                     }
                                 },
                                 "eventProtocolParameters": {


diff --git a/testsuites/stability/src/main/resources/testplans/policy_api_stability.jmx b/testsuites/stability/src/main/resources/testplans/policy_api_stability.jmx
index a1514d8..24a7357 100644 (file)
--- a/testsuites/stability/src/main/resources/testplans/policy_api_stability.jmx
+++ b/testsuites/stability/src/main/resources/testplans/policy_api_stability.jmx
@@ -4761,7 +4761,7 @@ if (prev.getResponseCode() == '200') {
                   "carrierTechnology": "RESTCLIENT",
                   "parameterClassName": "org.onap.policy.apex.plugins.event.carrier.restclient.RestClientCarrierTechnologyParameters",
                   "parameters": {
-                    "url": "http://message-router:3904/events/unauthenticated.DCAE_CL_OUTPUT/APEX/1?timeout=60000"
+                    "url": "http://kafka:9092/events/unauthenticated.dcae_cl_output/APEX/1?timeout=60000"
                   }
                 },
                 "eventProtocolParameters": {
@@ -4780,7 +4780,7 @@ if (prev.getResponseCode() == '200') {
                   "carrierTechnology": "RESTCLIENT",
                   "parameterClassName": "org.onap.policy.apex.plugins.event.carrier.restclient.RestClientCarrierTechnologyParameters",
                   "parameters": {
-                    "url": "http://message-router:3904/events/APPC-LCM-WRITE/APEX/1?timeout=60000"
+                    "url": "http://kafka:9092/events/appc-lcm-write/APEX/1?timeout=60000"
                   }
                 },
                 "eventProtocolParameters": {
@@ -4824,7 +4824,7 @@ if (prev.getResponseCode() == '200') {
                   "carrierTechnology": "RESTCLIENT",
                   "parameterClassName": "org.onap.policy.apex.plugins.event.carrier.restclient.RestClientCarrierTechnologyParameters",
                   "parameters": {
-                    "url": "http://message-router:3904/events/APPC-LCM-READ"
+                    "url": "http://kafka:9092/events/appc-lcm-read"
                   }
                 },
                 "eventProtocolParameters": {
@@ -4842,7 +4842,7 @@ if (prev.getResponseCode() == '200') {
                   "carrierTechnology": "RESTCLIENT",
                   "parameterClassName": "org.onap.policy.apex.plugins.event.carrier.restclient.RestClientCarrierTechnologyParameters",
                   "parameters": {
-                    "url": "http://message-router:3904/events/POLICY-CL-MGT"
+                    "url": "http://kafka:9092/events/policy-cl-mgt"
                   }
                 },
                 "eventProtocolParameters": {
@@ -5144,7 +5144,7 @@ if (prev.getResponseCode() == '200') {
                                 "taskParameters": [
                                     {
                                         "key": "logUrl",
-                                        "value": "http://message-router:3904/events/APEX-CL-MGT"
+                                        "value": "http://kafka:9092/events/apex-cl-mgt"
                                     }
                                 ]
                             }
@@ -5155,7 +5155,7 @@ if (prev.getResponseCode() == '200') {
                                     "carrierTechnology": "RESTCLIENT",
                                     "parameterClassName": "org.onap.policy.apex.plugins.event.carrier.restclient.RestClientCarrierTechnologyParameters",
                                     "parameters": {
-                                        "url": "http://message-router:3904/events/apex-pnf-input/cl/apex?timeout=30000"
+                                        "url": "http://kafka:9092/events/apex-pnf-input/cl/apex?timeout=30000"
                                     }
                                 },
                                 "eventProtocolParameters": {