Code Review
/
oam.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "Create a script to generate a Topology"
[oam.git]
/
solution
/
integration
/
smo
/
non-rt-ric
/
data
/
prepareDmaapMsg.sh
diff --git
a/solution/integration/smo/non-rt-ric/data/prepareDmaapMsg.sh
b/solution/integration/smo/non-rt-ric/data/prepareDmaapMsg.sh
index
a100b32
..
eebaf01
100755
(executable)
--- a/
solution/integration/smo/non-rt-ric/data/prepareDmaapMsg.sh
+++ b/
solution/integration/smo/non-rt-ric/data/prepareDmaapMsg.sh
@@
-32,6
+32,7
@@
a1_sim_OSC_port=${2:-30001}
a1_sim_STD_port=${3:-30003}
a1_sim_STD_v2_port=${4:-30005}
httpx=${5:-"http"}
a1_sim_STD_port=${3:-30003}
a1_sim_STD_v2_port=${4:-30005}
httpx=${5:-"http"}
+SHELL_FOLDER=$(cd "$(dirname "$0")";pwd)
echo "using dmaap-mr port: "$dmaa_mr_port
echo "using a1-sim-OSC port: "$a1_sim_OSC_port
echo "using dmaap-mr port: "$dmaa_mr_port
echo "using a1-sim-OSC port: "$a1_sim_OSC_port
@@
-69,11
+70,11
@@
curl -skw %{http_code} $httpx://localhost:$a1_sim_STD_v2_port/counter/interface
echo -e "\n"
echo "create policy type 1 to ric1:"
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 @
${SHELL_FOLDER}/
testdata/OSC/policy_type.json
echo -e "\n"
echo "create policy type 2 to ric3:"
echo -e "\n"
echo "create policy type 2 to ric3:"
-curl -skw %{http_code} $httpx://localhost:$a1_sim_STD_v2_port/policytype?id=2 -X PUT -H Accept:application/json -H Content-Type:application/json -H X-Requested-With:XMLHttpRequest --data-binary @testdata/v2/policy_type.json
+curl -skw %{http_code} $httpx://localhost:$a1_sim_STD_v2_port/policytype?id=2 -X PUT -H Accept:application/json -H Content-Type:application/json -H X-Requested-With:XMLHttpRequest --data-binary @
${SHELL_FOLDER}/
testdata/v2/policy_type.json
echo -e "\n"
for i in {1..12}; do
echo -e "\n"
for i in {1..12}; do
@@
-92,7
+93,7
@@
done
## Using PMS v1 interface
echo "create service 1 to policy agent via dmaap_mr:"
## 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/v1/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 @
${SHELL_FOLDER}/
testdata/dmaap/v1/dmaap-msg-service-create.json
echo -e "\n"
echo "get result from mr of previous request:"
echo -e "\n"
echo "get result from mr of previous request:"
@@
-100,7
+101,7
@@
curl -X GET "$httpx://localhost:$dmaa_mr_port/events/A1-POLICY-AGENT-WRITE/users
echo -e "\n"
echo "create policies to ric1 & ric2 & ric3 with type1 and service1 via dmaa_mr:"
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
+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 @
${SHELL_FOLDER}/
testdata/dmaap/v1/dmaap-msg-policy-create.json
echo -e "\n"
echo "get result from mr of previous request:"
echo -e "\n"
echo "get result from mr of previous request:"
@@
-108,7
+109,7
@@
curl -X GET "$httpx://localhost:$dmaa_mr_port/events/A1-POLICY-AGENT-WRITE/users
echo -e "\n"
echo "get policy from policy agent via dmaap_mr:"
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
+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 @
${SHELL_FOLDER}/
testdata/dmaap/v1/dmaap-msg-policy-get.json
echo -e "\n"
echo "get result from mr of previous request:"
echo -e "\n"
echo "get result from mr of previous request:"
@@
-117,7
+118,7
@@
echo -e "\n"
## Using PMS v2 interface
echo "create service 2 to policy agent via dmaap_mr:"
## 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
+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 @
${SHELL_FOLDER}/
testdata/dmaap/v2/dmaap-msg-service-create.json
echo -e "\n"
echo "get result from mr of previous request:"
echo -e "\n"
echo "get result from mr of previous request:"
@@
-125,7
+126,7
@@
curl -X GET "$httpx://localhost:$dmaa_mr_port/events/A1-POLICY-AGENT-WRITE/users
echo -e "\n"
echo "create policies to ric1 & ric2 & ric3 with type1 and service1 via dmaa_mr:"
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
+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 @
${SHELL_FOLDER}/
testdata/dmaap/v2/dmaap-msg-policy-create.json
echo -e "\n"
echo "get result from mr of previous request:"
echo -e "\n"
echo "get result from mr of previous request:"
@@
-133,7
+134,7
@@
curl -X GET "$httpx://localhost:$dmaa_mr_port/events/A1-POLICY-AGENT-WRITE/users
echo -e "\n"
echo "get policy from policy agent via dmaap_mr:"
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
+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 @
${SHELL_FOLDER}/
testdata/dmaap/v2/dmaap-msg-policy-get.json
echo -e "\n"
echo "get result from mr of previous request:"
echo -e "\n"
echo "get result from mr of previous request:"