From 0b47c2b841cba440078bd1c55b07e5d567bd0668 Mon Sep 17 00:00:00 2001 From: ecaiyanlinux Date: Wed, 3 Feb 2021 16:24:33 +0100 Subject: [PATCH] Update dmaap message for docker-compose deployment Add dmaap messges for pms_v2.0 interface Signed-off-by: ecaiyanlinux Change-Id: I205406a78bb1a67629eb28a0c00d2f93af27c6a3 Issue-ID: NONRTRIC-431 --- docker-compose/data/prepareDmaapMsg.sh | 84 +++++++++--- .../{ => dmaap/v1}/dmaap-msg-pms-status.json | 0 .../{ => dmaap/v1}/dmaap-msg-policy-create.json | 20 +++ .../{ => dmaap/v1}/dmaap-msg-policy-delete.json | 0 .../{ => dmaap/v1}/dmaap-msg-policy-get.json | 0 .../v1}/dmaap-msg-policy-schemas-get.json | 0 .../{ => dmaap/v1}/dmaap-msg-rics-get.json | 0 .../{ => dmaap/v1}/dmaap-msg-service-create.json | 0 .../{ => dmaap/v1}/dmaap-msg-services-get.json | 0 .../testdata/dmaap/v2/dmaap-msg-pms-status.json | 14 ++ .../testdata/dmaap/v2/dmaap-msg-policy-create.json | 142 +++++++++++++++++++++ .../testdata/dmaap/v2/dmaap-msg-policy-delete.json | 50 ++++++++ .../testdata/dmaap/v2/dmaap-msg-policy-get.json | 50 ++++++++ .../dmaap/v2/dmaap-msg-policy-schemas-get.json | 13 ++ .../data/testdata/dmaap/v2/dmaap-msg-rics-get.json | 14 ++ .../dmaap/v2/dmaap-msg-service-create.json | 46 +++++++ .../testdata/dmaap/v2/dmaap-msg-services-get.json | 14 ++ 17 files changed, 430 insertions(+), 17 deletions(-) rename docker-compose/data/testdata/{ => dmaap/v1}/dmaap-msg-pms-status.json (100%) rename docker-compose/data/testdata/{ => dmaap/v1}/dmaap-msg-policy-create.json (79%) rename docker-compose/data/testdata/{ => dmaap/v1}/dmaap-msg-policy-delete.json (100%) rename docker-compose/data/testdata/{ => dmaap/v1}/dmaap-msg-policy-get.json (100%) rename docker-compose/data/testdata/{ => dmaap/v1}/dmaap-msg-policy-schemas-get.json (100%) rename docker-compose/data/testdata/{ => dmaap/v1}/dmaap-msg-rics-get.json (100%) rename docker-compose/data/testdata/{ => dmaap/v1}/dmaap-msg-service-create.json (100%) rename docker-compose/data/testdata/{ => dmaap/v1}/dmaap-msg-services-get.json (100%) create mode 100644 docker-compose/data/testdata/dmaap/v2/dmaap-msg-pms-status.json create mode 100644 docker-compose/data/testdata/dmaap/v2/dmaap-msg-policy-create.json create mode 100644 docker-compose/data/testdata/dmaap/v2/dmaap-msg-policy-delete.json create mode 100644 docker-compose/data/testdata/dmaap/v2/dmaap-msg-policy-get.json create mode 100644 docker-compose/data/testdata/dmaap/v2/dmaap-msg-policy-schemas-get.json create mode 100644 docker-compose/data/testdata/dmaap/v2/dmaap-msg-rics-get.json create mode 100644 docker-compose/data/testdata/dmaap/v2/dmaap-msg-service-create.json create mode 100644 docker-compose/data/testdata/dmaap/v2/dmaap-msg-services-get.json diff --git a/docker-compose/data/prepareDmaapMsg.sh b/docker-compose/data/prepareDmaapMsg.sh index 684afbb6..503b0d20 100755 --- a/docker-compose/data/prepareDmaapMsg.sh +++ b/docker-compose/data/prepareDmaapMsg.sh @@ -30,40 +30,46 @@ dmaa_mr_port=${1:-3904} a1_sim_OSC_port=${2:-30001} a1_sim_STD_port=${3:-30003} -httpx=${4:-"http"} +a1_sim_STD_v1_port=${4:-30005} +httpx=${5:-"http"} echo "using dmaap-mr port: "$dmaa_mr_port echo "using a1-sim-OSC port: "$a1_sim_OSC_port echo "using a1-sim-STD port: "$a1_sim_STD_port +echo "using a1-sim-STD-v1 port: "$a1_sim_STD_v1_port echo "using protocol: "$httpx echo -e "\n" echo "dmaap-mr topics:" -curl -skw " %{http_code}" $httpx://localhost:$dmaa_mr_port/topics/listAll +curl -skw %{http_code} $httpx://localhost:$dmaa_mr_port/topics/listAll echo -e "\n" echo "dmaap-mr create topic A1-POLICY-AGENT-READ:" -curl -skw " %{http_code}" -X POST "$httpx://localhost:$dmaa_mr_port/topics/create" -H "accept: application/json" -H "Content-Type: application/json" -d "{ \"topicName\": \"A1-POLICY-AGENT-READ\", \"topicDescription\": \"test topic\", \"partitionCount\": 1, \"replicationCount\": 1, \"transactionEnabled\": \"false\"}" +curl -skw %{http_code} -X POST "$httpx://localhost:$dmaa_mr_port/topics/create" -H "accept: application/json" -H "Content-Type: application/json" -d "{ \"topicName\": \"A1-POLICY-AGENT-READ\", \"topicDescription\": \"test topic\", \"partitionCount\": 1, \"replicationCount\": 1, \"transactionEnabled\": \"false\"}" echo -e "\n" echo "dmaap-mr create topic A1-POLICY-AGENT-WRITE:" -curl -skw " %{http_code}" -X POST "$httpx://localhost:$dmaa_mr_port/topics/create" -H "accept: application/json" -H "Content-Type: application/json" -d "{ \"topicName\": \"A1-POLICY-AGENT-WRITE\", \"topicDescription\": \"test topic\", \"partitionCount\": 1, \"replicationCount\": 1, \"transactionEnabled\": \"false\"}" +curl -skw %{http_code} -X POST "$httpx://localhost:$dmaa_mr_port/topics/create" -H "accept: application/json" -H "Content-Type: application/json" -d "{ \"topicName\": \"A1-POLICY-AGENT-WRITE\", \"topicDescription\": \"test topic\", \"partitionCount\": 1, \"replicationCount\": 1, \"transactionEnabled\": \"false\"}" echo -e "\n" echo "dmaap-mr topics:" -curl -skw " %{http_code}" $httpx://localhost:$dmaa_mr_port/topics/listAll +curl -skw %{http_code} $httpx://localhost:$dmaa_mr_port/topics/listAll echo -e "\n" echo "ric1 version:" -curl -skw " %{http_code}" $httpx://localhost:$a1_sim_OSC_port/counter/interface +curl -skw %{http_code} $httpx://localhost:$a1_sim_OSC_port/counter/interface echo -e "\n" echo "ric2 version:" -curl -skw " %{http_code}" $httpx://localhost:$a1_sim_STD_port/counter/interface +curl -skw %{http_code} $httpx://localhost:$a1_sim_STD_port/counter/interface echo -e "\n" echo "create policy type 1 to ric1:" -curl -X PUT -skw " %{http_code}" $httpx://localhost:$a1_sim_OSC_port/policytype?id=1 -H Content-Type:application/json --data-binary @testdata/OSC/policy_type.json +curl -X PUT -skw %{http_code} $httpx://localhost:$a1_sim_OSC_port/policytype?id=1 -H Content-Type:application/json --data-binary @testdata/OSC/policy_type.json +echo -e "\n" + +echo "create policy type 2 to ric3:" +curl -skw %{http_code} $httpx://localhost:$a1_sim_STD_v1_port/policytype?id=2 -X PUT -H Accept:application/json -H Content-Type:application/json -H X-Requested-With:XMLHttpRequest --data-binary @testdata/v1/policy_type.json echo -e "\n" for i in {1..12}; do @@ -71,7 +77,7 @@ for i in {1..12}; do curlString="curl -skw %{http_code} $httpx://localhost:8081/policy_types" res=$($curlString) echo "$res" - expect="[\"\",\"1\"]200" + expect="[\"\",\"1\",\"2\"]200" if [ "$res" == "$expect" ]; then echo -e "\n" break; @@ -80,22 +86,66 @@ for i in {1..12}; do fi done +## Using PMS v1 interface echo "create service 1 to policy agent via dmaap_mr:" -curl -k -X POST -sw " %{http_code}" -H accept:application/json -H Content-Type:application/json "$httpx://localhost:$dmaa_mr_port/events/A1-POLICY-AGENT-READ/" --data-binary @testdata/dmaap-msg-service-create.json +curl -k -X POST -sw %{http_code} -H accept:application/json -H Content-Type:application/json "$httpx://localhost:$dmaa_mr_port/events/A1-POLICY-AGENT-READ/" --data-binary @testdata/dmaap/v1/dmaap-msg-service-create.json +echo -e "\n" + +echo "ger result from mr of previous request:" +curl -X GET "$httpx://localhost:$dmaa_mr_port/events/A1-POLICY-AGENT-WRITE/users/policy-agent?timeout=15000&limit=100" -H "accept: application/json" -H "Content-Type: application/json" | jq . +echo -e "\n" + +echo "create policies to ric1 & ric2 & ric3 with type1 and service1 via dmaa_mr:" +curl -k -X POST -sw %{http_code} -H accept:application/json -H Content-Type:application/json "$httpx://localhost:$dmaa_mr_port/events/A1-POLICY-AGENT-READ/" --data-binary @testdata/dmaap/v1/dmaap-msg-policy-create.json +echo -e "\n" + +echo "ger result from mr of previous request:" +curl -X GET "$httpx://localhost:$dmaa_mr_port/events/A1-POLICY-AGENT-WRITE/users/policy-agent?timeout=15000&limit=100" -H "accept: application/json" -H "Content-Type: application/json" | jq . +echo -e "\n" + +echo "get policy from policy agent via dmaap_mr:" +curl -k -X POST -sw %{http_code} -H accept:application/json -H Content-Type:application/json "$httpx://localhost:$dmaa_mr_port/events/A1-POLICY-AGENT-READ/" --data-binary @testdata/dmaap/v1/dmaap-msg-policy-get.json echo -e "\n" -echo "create policies to ric1 & ric2 with type1 and service1 via dmaa_mr:" -curl -k -X POST -sw " %{http_code}" -H accept:application/json -H Content-Type:application/json "$httpx://localhost:$dmaa_mr_port/events/A1-POLICY-AGENT-READ/" --data-binary @testdata/dmaap-msg-policy-create.json +echo "ger result from mr of previous request:" +curl -X GET "$httpx://localhost:$dmaa_mr_port/events/A1-POLICY-AGENT-WRITE/users/policy-agent?timeout=15000&limit=100" -H "accept: application/json" -H "Content-Type: application/json" | jq . echo -e "\n" +## Using PMS v2 interface +echo "create service 2 to policy agent via dmaap_mr:" +curl -k -X POST -sw %{http_code} -H accept:application/json -H Content-Type:application/json "$httpx://localhost:$dmaa_mr_port/events/A1-POLICY-AGENT-READ/" --data-binary @testdata/dmaap/v2/dmaap-msg-service-create.json +echo -e "\n" + +echo "ger result from mr of previous request:" +curl -X GET "$httpx://localhost:$dmaa_mr_port/events/A1-POLICY-AGENT-WRITE/users/policy-agent?timeout=15000&limit=100" -H "accept: application/json" -H "Content-Type: application/json" | jq . +echo -e "\n" + +echo "create policies to ric1 & ric2 & ric3 with type1 and service1 via dmaa_mr:" +curl -k -X POST -sw %{http_code} -H accept:application/json -H Content-Type:application/json "$httpx://localhost:$dmaa_mr_port/events/A1-POLICY-AGENT-READ/" --data-binary @testdata/dmaap/v2/dmaap-msg-policy-create.json +echo -e "\n" + +echo "ger result from mr of previous request:" +curl -X GET "$httpx://localhost:$dmaa_mr_port/events/A1-POLICY-AGENT-WRITE/users/policy-agent?timeout=15000&limit=100" -H "accept: application/json" -H "Content-Type: application/json" | jq . +echo -e "\n" + +echo "get policy from policy agent via dmaap_mr:" +curl -k -X POST -sw %{http_code} -H accept:application/json -H Content-Type:application/json "$httpx://localhost:$dmaa_mr_port/events/A1-POLICY-AGENT-READ/" --data-binary @testdata/dmaap/v2/dmaap-msg-policy-get.json +echo -e "\n" + +echo "ger result from mr of previous request:" +curl -X GET "$httpx://localhost:$dmaa_mr_port/events/A1-POLICY-AGENT-WRITE/users/policy-agent?timeout=15000&limit=100" -H "accept: application/json" -H "Content-Type: application/json" | jq . +echo -e "\n" + +## Get metric from rics echo "policy numbers from ric1:" -curl -skw " %{http_code}" $httpx://localhost:$a1_sim_OSC_port/counter/num_instances +curl -skw %{http_code} $httpx://localhost:$a1_sim_OSC_port/counter/num_instances echo -e "\n" echo "policy numbers from ric2:" -curl -skw " %{http_code}" $httpx://localhost:$a1_sim_STD_port/counter/num_instances +curl -skw %{http_code} $httpx://localhost:$a1_sim_STD_port/counter/num_instances +echo -e "\n" + +echo "policy numbers from ric3:" +curl -skw %{http_code} $httpx://localhost:$a1_sim_STD_v1_port/counter/num_instances echo -e "\n" -echo "get policy from policy agent via dmaap_mr:" -curl -k -X POST -sw " %{http_code}" -H accept:application/json -H Content-Type:application/json "$httpx://localhost:$dmaa_mr_port/events/A1-POLICY-AGENT-READ/" --data-binary @testdata/dmaap-msg-policy-get.json -echo -e "\n" \ No newline at end of file diff --git a/docker-compose/data/testdata/dmaap-msg-pms-status.json b/docker-compose/data/testdata/dmaap/v1/dmaap-msg-pms-status.json similarity index 100% rename from docker-compose/data/testdata/dmaap-msg-pms-status.json rename to docker-compose/data/testdata/dmaap/v1/dmaap-msg-pms-status.json diff --git a/docker-compose/data/testdata/dmaap-msg-policy-create.json b/docker-compose/data/testdata/dmaap/v1/dmaap-msg-policy-create.json similarity index 79% rename from docker-compose/data/testdata/dmaap-msg-policy-create.json rename to docker-compose/data/testdata/dmaap/v1/dmaap-msg-policy-create.json index 60504d18..23d7bed6 100644 --- a/docker-compose/data/testdata/dmaap-msg-policy-create.json +++ b/docker-compose/data/testdata/dmaap/v1/dmaap-msg-policy-create.json @@ -78,5 +78,25 @@ "timestamp": "2020-08-01 17:56:06.656949", "type": "request", "url": "/policy?id=0f7bb041e1584b1fa17e87520d70a3102&ric=ric2&service=service1" + }, + { + "apiVersion": "1.0", + "operation": "PUT", + "correlationId": "1596304566656253558", + "originatorId": "849e6c6b420", + "payload": { + "scope": { + "ueId": "ue3103", + "qosId": "qos3103" + }, + "qosObjectives": { + "priorityLevel": 3203 + } + }, + "requestId": "23343221", + "target": "policy-agent", + "timestamp": "2020-08-01 17:56:06.656949", + "type": "request", + "url": "/policy?id=0f7bb041e1584b1fa17e87520d70a3103&ric=ric3&service=service1&type=2" } ] \ No newline at end of file diff --git a/docker-compose/data/testdata/dmaap-msg-policy-delete.json b/docker-compose/data/testdata/dmaap/v1/dmaap-msg-policy-delete.json similarity index 100% rename from docker-compose/data/testdata/dmaap-msg-policy-delete.json rename to docker-compose/data/testdata/dmaap/v1/dmaap-msg-policy-delete.json diff --git a/docker-compose/data/testdata/dmaap-msg-policy-get.json b/docker-compose/data/testdata/dmaap/v1/dmaap-msg-policy-get.json similarity index 100% rename from docker-compose/data/testdata/dmaap-msg-policy-get.json rename to docker-compose/data/testdata/dmaap/v1/dmaap-msg-policy-get.json diff --git a/docker-compose/data/testdata/dmaap-msg-policy-schemas-get.json b/docker-compose/data/testdata/dmaap/v1/dmaap-msg-policy-schemas-get.json similarity index 100% rename from docker-compose/data/testdata/dmaap-msg-policy-schemas-get.json rename to docker-compose/data/testdata/dmaap/v1/dmaap-msg-policy-schemas-get.json diff --git a/docker-compose/data/testdata/dmaap-msg-rics-get.json b/docker-compose/data/testdata/dmaap/v1/dmaap-msg-rics-get.json similarity index 100% rename from docker-compose/data/testdata/dmaap-msg-rics-get.json rename to docker-compose/data/testdata/dmaap/v1/dmaap-msg-rics-get.json diff --git a/docker-compose/data/testdata/dmaap-msg-service-create.json b/docker-compose/data/testdata/dmaap/v1/dmaap-msg-service-create.json similarity index 100% rename from docker-compose/data/testdata/dmaap-msg-service-create.json rename to docker-compose/data/testdata/dmaap/v1/dmaap-msg-service-create.json diff --git a/docker-compose/data/testdata/dmaap-msg-services-get.json b/docker-compose/data/testdata/dmaap/v1/dmaap-msg-services-get.json similarity index 100% rename from docker-compose/data/testdata/dmaap-msg-services-get.json rename to docker-compose/data/testdata/dmaap/v1/dmaap-msg-services-get.json diff --git a/docker-compose/data/testdata/dmaap/v2/dmaap-msg-pms-status.json b/docker-compose/data/testdata/dmaap/v2/dmaap-msg-pms-status.json new file mode 100644 index 00000000..439da01b --- /dev/null +++ b/docker-compose/data/testdata/dmaap/v2/dmaap-msg-pms-status.json @@ -0,0 +1,14 @@ +[ + { + "apiVersion": "1.0", + "operation": "GET", + "correlationId": "1596363451067769100", + "originatorId": "849e6c6b420", + "payload": {}, + "requestId": "23343221", + "target": "policy-agent", + "timestamp": "2020-08-02 10:17:31.067784", + "type": "request", + "url": "/a1-policy/v2/status" + } +] \ No newline at end of file diff --git a/docker-compose/data/testdata/dmaap/v2/dmaap-msg-policy-create.json b/docker-compose/data/testdata/dmaap/v2/dmaap-msg-policy-create.json new file mode 100644 index 00000000..5afa19fb --- /dev/null +++ b/docker-compose/data/testdata/dmaap/v2/dmaap-msg-policy-create.json @@ -0,0 +1,142 @@ +[ + { + "apiVersion": "1.0", + "operation": "PUT", + "correlationId": "1596304565904621535", + "originatorId": "849e6c6b420", + "payload": { + "policy_data": { + "scope": { + "ueId": "ue3010", + "qosId": "qos3010" + }, + "qosObjectives": { + "priorityLevel": 3010 + } + }, + "policy_id": "0f7bb041e1584b1fa17e87520d70a3010", + "policytype_id": "1", + "ric_id": "ric1", + "service_id": "service2", + "status_notification_uri": "http://example.com", + "transient": true + }, + "requestId": "23343221", + "target": "policy-agent", + "timestamp": "2020-08-01 17:56:05.905035", + "type": "request", + "url": "/a1-policy/v2/policies/" + }, + { + "apiVersion": "1.0", + "operation": "PUT", + "correlationId": "1596304566656253556", + "originatorId": "849e6c6b420", + "payload": { + "policy_data": { + "scope": { + "ueId": "ue3120", + "qosId": "qos3120" + }, + "qosObjectives": { + "priorityLevel": 3120 + } + }, + "policy_id": "0f7bb041e1584b1fa17e87520d70a3120", + "policytype_id": "1", + "ric_id": "ric1", + "service_id": "service2", + "status_notification_uri": "http://example.com", + "transient": true + }, + "requestId": "23343221", + "target": "policy-agent", + "timestamp": "2020-08-01 17:56:06.656949", + "type": "request", + "url": "/a1-policy/v2/policies/" + }, + { + "apiVersion": "1.0", + "operation": "PUT", + "correlationId": "1596304566656253557", + "originatorId": "849e6c6b420", + "payload": { + "policy_data": { + "scope": { + "ueId": "ue3131", + "qosId": "qos3131" + }, + "qosObjectives": { + "priorityLevel": 3101 + } + }, + "policy_id": "0f7bb041e1584b1fa17e87520d70a3131", + "policytype_id": "1", + "ric_id": "ric1", + "service_id": "service2", + "status_notification_uri": "http://example.com", + "transient": true + }, + "requestId": "23343221", + "target": "policy-agent", + "timestamp": "2020-08-01 17:56:06.656949", + "type": "request", + "url": "/a1-policy/v2/policies/" + }, + { + "apiVersion": "1.0", + "operation": "PUT", + "correlationId": "1596304566656253558", + "originatorId": "849e6c6b420", + "payload": { + "policy_data": { + "scope": { + "ueId": "ue3142", + "qosId": "qos3142" + }, + "qosObjectives": { + "priorityLevel": 3102 + } + }, + "policy_id": "0f7bb041e1584b1fa17e87520d70a3142", + "policytype_id": "", + "ric_id": "ric2", + "service_id": "service2", + "status_notification_uri": "http://example.com", + "transient": true + }, + "requestId": "23343221", + "target": "policy-agent", + "timestamp": "2020-08-01 17:56:06.656949", + "type": "request", + "url": "/a1-policy/v2/policies/" + }, + { + "apiVersion": "1.0", + "operation": "PUT", + "correlationId": "1596304566656253558", + "originatorId": "849e6c6b420", + "payload": { + "policy_data": { + "scope": { + "ueId": "ue3153", + "qosId": "qos3153" + }, + "qosObjectives": { + "priorityLevel": 3103 + } + }, + "policy_id": "0f7bb041e1584b1fa17e87520d70a3153", + "policytype_id": "2", + "ric_id": "ric3", + "service_id": "service2", + "status_notification_uri": "http://example.com", + "transient": true + }, + "requestId": "23343221", + "target": "policy-agent", + "timestamp": "2020-08-01 17:56:06.656949", + "type": "request", + "url": "/a1-policy/v2/policies/" + } +] \ No newline at end of file diff --git a/docker-compose/data/testdata/dmaap/v2/dmaap-msg-policy-delete.json b/docker-compose/data/testdata/dmaap/v2/dmaap-msg-policy-delete.json new file mode 100644 index 00000000..1a126fde --- /dev/null +++ b/docker-compose/data/testdata/dmaap/v2/dmaap-msg-policy-delete.json @@ -0,0 +1,50 @@ +[ + { + "apiVersion": "1.0", + "operation": "DELETE", + "correlationId": "1596304567816229314", + "originatorId": "849e6c6b420", + "payload": {}, + "requestId": "23343221", + "target": "policy-agent", + "timestamp": "2020-08-01 17:56:07.816235", + "type": "request", + "url": "/a1-policy/v2/policies/0f7bb041e1584b1fa17e87520d70a3000" + }, + { + "apiVersion": "1.0", + "operation": "DELETE", + "correlationId": "1596304567816229314", + "originatorId": "849e6c6b420", + "payload": {}, + "requestId": "23343221", + "target": "policy-agent", + "timestamp": "2020-08-01 17:56:07.816235", + "type": "request", + "url": "/a1-policy/v2/policies/0f7bb041e1584b1fa17e87520d70a3100" + }, + { + "apiVersion": "1.0", + "operation": "DELETE", + "correlationId": "1596304567816229314", + "originatorId": "849e6c6b420", + "payload": {}, + "requestId": "23343221", + "target": "policy-agent", + "timestamp": "2020-08-01 17:56:07.816235", + "type": "request", + "url": "/a1-policy/v2/policies/0f7bb041e1584b1fa17e87520d70a3101" + }, + { + "apiVersion": "1.0", + "operation": "DELETE", + "correlationId": "1596304567816229314", + "originatorId": "849e6c6b420", + "payload": {}, + "requestId": "23343221", + "target": "policy-agent", + "timestamp": "2020-08-01 17:56:07.816235", + "type": "request", + "url": "/a1-policy/v2/policies/0f7bb041e1584b1fa17e87520d70a3102" + } +] \ No newline at end of file diff --git a/docker-compose/data/testdata/dmaap/v2/dmaap-msg-policy-get.json b/docker-compose/data/testdata/dmaap/v2/dmaap-msg-policy-get.json new file mode 100644 index 00000000..a45e06bc --- /dev/null +++ b/docker-compose/data/testdata/dmaap/v2/dmaap-msg-policy-get.json @@ -0,0 +1,50 @@ +[ + { + "apiVersion": "1.0", + "operation": "GET", + "correlationId": "1596304567017739720", + "originatorId": "849e6c6b420", + "payload": {}, + "requestId": "23343221", + "target": "policy-agent", + "timestamp": "2020-08-01 17:56:07.017744", + "type": "request", + "url": "/a1-policy/v2/policies/0f7bb041e1584b1fa17e87520d70a3000" + }, + { + "apiVersion": "1.0", + "operation": "GET", + "correlationId": "1596304567017739720", + "originatorId": "849e6c6b420", + "payload": {}, + "requestId": "23343221", + "target": "policy-agent", + "timestamp": "2020-08-01 17:56:07.017744", + "type": "request", + "url": "/a1-policy/v2/policies/0f7bb041e1584b1fa17e87520d70a3100" + }, + { + "apiVersion": "1.0", + "operation": "GET", + "correlationId": "1596304567017739720", + "originatorId": "849e6c6b420", + "payload": {}, + "requestId": "23343221", + "target": "policy-agent", + "timestamp": "2020-08-01 17:56:07.017744", + "type": "request", + "url": "/a1-policy/v2/policies/0f7bb041e1584b1fa17e87520d70a3101" + }, + { + "apiVersion": "1.0", + "operation": "GET", + "correlationId": "1596304567017739720", + "originatorId": "849e6c6b420", + "payload": {}, + "requestId": "23343221", + "target": "policy-agent", + "timestamp": "2020-08-01 17:56:07.017744", + "type": "request", + "url": "/a1-policy/v2/policies/0f7bb041e1584b1fa17e87520d70a3102" + } +] \ No newline at end of file diff --git a/docker-compose/data/testdata/dmaap/v2/dmaap-msg-policy-schemas-get.json b/docker-compose/data/testdata/dmaap/v2/dmaap-msg-policy-schemas-get.json new file mode 100644 index 00000000..b1b2b550 --- /dev/null +++ b/docker-compose/data/testdata/dmaap/v2/dmaap-msg-policy-schemas-get.json @@ -0,0 +1,13 @@ +[ + { + "type": "request", + "correlationId": "c09ac7d1-de62-0016-2000-e63701125557-201", + "target": "policy-agent", + "timestamp": "2019-05-14T11:44:51.36Z", + "apiVersion": "1.0", + "originatorId": "849e6c6b420", + "requestId": "23343221", + "operation": "GET", + "url": "/a1-policy/v2/policy-types/1" + } +] diff --git a/docker-compose/data/testdata/dmaap/v2/dmaap-msg-rics-get.json b/docker-compose/data/testdata/dmaap/v2/dmaap-msg-rics-get.json new file mode 100644 index 00000000..9c047c01 --- /dev/null +++ b/docker-compose/data/testdata/dmaap/v2/dmaap-msg-rics-get.json @@ -0,0 +1,14 @@ +[ + { + "apiVersion": "1.0", + "operation": "GET", + "correlationId": "1596363459399504200", + "originatorId": "849e6c6b420", + "payload": {}, + "requestId": "23343221", + "target": "policy-agent", + "timestamp": "2020-08-02 10:17:39.399517", + "type": "request", + "url": "/a1-policy/v2/rics" + } +] \ No newline at end of file diff --git a/docker-compose/data/testdata/dmaap/v2/dmaap-msg-service-create.json b/docker-compose/data/testdata/dmaap/v2/dmaap-msg-service-create.json new file mode 100644 index 00000000..1cd9c255 --- /dev/null +++ b/docker-compose/data/testdata/dmaap/v2/dmaap-msg-service-create.json @@ -0,0 +1,46 @@ +[ + { + "apiVersion": "1.0", + "operation": "PUT", + "correlationId": "1596363458549998500", + "originatorId": "849e6c6b420", + "payload": { + "callback_url": "http://callback-receiver:8090/callbacks/1", + "keep_alive_interval_seconds": "1000", + "service_id": "serv2" + }, + "requestId": "23343221", + "target": "policy-agent", + "timestamp": "2020-08-02 10:17:38.550324", + "type": "request", + "url": "/a1-policy/v2/services" + }, + { + "apiVersion": "1.0", + "operation": "PUT", + "correlationId": "1596363458549998501", + "originatorId": "849e6c6b421", + "payload": { + "callback_url": "http://callback-receiver:8090/callbacks/1", + "keep_alive_interval_seconds": "1000", + "service_id": "service2" + }, + "requestId": "23343221", + "target": "policy-agent", + "timestamp": "2020-08-02 10:17:38.550324", + "type": "request", + "url": "/a1-policy/v2/services" + }, + { + "apiVersion": "1.0", + "operation": "PUT", + "correlationId": "1596363459196978900", + "originatorId": "849e6c6b420", + "payload": {}, + "requestId": "23343221", + "target": "policy-agent", + "timestamp": "2020-08-02 10:17:39.197067", + "type": "request", + "url": "/a1-policy/v2/services/serv2/keepalive" + } +] \ No newline at end of file diff --git a/docker-compose/data/testdata/dmaap/v2/dmaap-msg-services-get.json b/docker-compose/data/testdata/dmaap/v2/dmaap-msg-services-get.json new file mode 100644 index 00000000..7d2d153f --- /dev/null +++ b/docker-compose/data/testdata/dmaap/v2/dmaap-msg-services-get.json @@ -0,0 +1,14 @@ +[ + { + "apiVersion": "1.0", + "operation": "GET", + "correlationId": "1596363458896827100", + "originatorId": "849e6c6b420", + "payload": {}, + "requestId": "23343221", + "target": "policy-agent", + "timestamp": "2020-08-02 10:17:38.897367", + "type": "request", + "url": "a1-policy/v2/services" + } +] \ No newline at end of file -- 2.16.6