From 3bf047e64a1121208719e7603bf91c69d532ecf8 Mon Sep 17 00:00:00 2001 From: Marco Platania Date: Mon, 21 Jan 2019 12:12:39 -0500 Subject: Squashed commit of the following: commit 1b4af2baa406841631ef7c3bf6917be654f793e1 Author: Marco Platania Date: Mon Jan 21 11:21:08 2019 -0500 Correct style issues Change-Id: Icadd241369437b6c1e868285f79b31be2d730871 Issue-ID: INT-824 Signed-off-by: Marco Platania commit 1b019bf2fcdddeae852f465e56255bb00c5c19d7 Author: Marco Platania Date: Mon Jan 21 10:36:52 2019 -0500 Correct path to POM files Change-Id: Ie98617eaab6ae65c982bb15e71f72b090f45e553 Issue-ID: INT-824 Signed-off-by: Marco Platania commit e51da00e8208fad91ca3be8808b0e7b590d64627 Author: Marco Platania Date: Mon Jan 21 10:24:19 2019 -0500 Add new API to vPacketGen - Add new API to modify the number of active streams - Change POM structure accordingly Change-Id: Iba45ce2ff5fa9fb418e3dd0dffb75c785dc20f70 Issue-ID: INT-824 Signed-off-by: Marco Platania Change-Id: Iefbfce87b4f98a35b81585c2346975256ae988a4 Signed-off-by: Marco Platania --- vnfs/vFW/scripts/run_traffic_fw_demo.sh | 10 +++------- vnfs/vFW/scripts/update_running_streams.sh | 18 ++++++++++++++++++ 2 files changed, 21 insertions(+), 7 deletions(-) create mode 100644 vnfs/vFW/scripts/update_running_streams.sh (limited to 'vnfs/vFW') diff --git a/vnfs/vFW/scripts/run_traffic_fw_demo.sh b/vnfs/vFW/scripts/run_traffic_fw_demo.sh index f927097e..e8f1bcf2 100755 --- a/vnfs/vFW/scripts/run_traffic_fw_demo.sh +++ b/vnfs/vFW/scripts/run_traffic_fw_demo.sh @@ -1,13 +1,9 @@ #!/bin/bash -#curl -X PUT -H "Authorization: Basic YWRtaW46YWRtaW4=" -H "Content-Type: application/json" -H "Cache-Control: no-cache" -H "Postman-Token: 9005870c-900b-2e2e-0902-ef2009bb0ff7" -d '{"pg-streams":{"pg-stream": [{"id":"fw_udp1", "is-enabled":"true"},{"id":"fw_udp2", "is-enabled":"true"},{"id":"fw_udp3", "is-enabled":"true"},{"id":"fw_udp4", "is-enabled":"true"},{"id":"fw_udp5", "is-enabled":"true"}]}}' "http://localhost:8183/restconf/config/sample-plugin:sample-plugin/pg-streams" - -#sleep 300 - while [ 1 ] do -curl -X PUT -H "Authorization: Basic YWRtaW46YWRtaW4=" -H "Content-Type: application/json" -H "Cache-Control: no-cache" -H "Postman-Token: 9005870c-900b-2e2e-0902-ef2009bb0ff7" -d '{"pg-streams":{"pg-stream": [{"id":"fw_udp1", "is-enabled":"true"},{"id":"fw_udp2", "is-enabled":"true"},{"id":"fw_udp3", "is-enabled":"true"},{"id":"fw_udp4", "is-enabled":"true"},{"id":"fw_udp5", "is-enabled":"true"},{"id":"fw_udp6", "is-enabled":"true"},{"id":"fw_udp7", "is-enabled":"true"},{"id":"fw_udp8", "is-enabled":"true"},{"id":"fw_udp9", "is-enabled":"true"},{"id":"fw_udp10", "is-enabled":"true"}]}}' "http://localhost:8183/restconf/config/sample-plugin:sample-plugin/pg-streams" +curl -X PUT -H "Authorization: Basic YWRtaW46YWRtaW4=" -H "Content-Type: application/json" -H "Cache-Control: no-cache" -H "Postman-Token: 9005870c-900b-2e2e-0902-ef2009bb0ff7" -d '{"streams": {"active-streams": 10}}' http://localhost:8183/restconf/config/stream-count:stream-count/streams sleep 300 -curl -X PUT -H "Authorization: Basic YWRtaW46YWRtaW4=" -H "Content-Type: application/json" -H "Cache-Control: no-cache" -H "Postman-Token: 9005870c-900b-2e2e-0902-ef2009bb0ff7" -d '{"pg-streams":{"pg-stream": [{"id":"fw_udp1", "is-enabled":"true"}]}}' "http://localhost:8183/restconf/config/sample-plugin:sample-plugin/pg-streams" +curl -X PUT -H "Authorization: Basic YWRtaW46YWRtaW4=" -H "Content-Type: application/json" -H "Cache-Control: no-cache" -H "Postman-Token: 9005870c-900b-2e2e-0902-ef2009bb0ff7" -d '{"streams": {"active-streams": 1}}' http://localhost:8183/restconf/config/stream-count:stream-count/streams sleep 300 -done +done \ No newline at end of file diff --git a/vnfs/vFW/scripts/update_running_streams.sh b/vnfs/vFW/scripts/update_running_streams.sh new file mode 100644 index 00000000..6ba0b9d5 --- /dev/null +++ b/vnfs/vFW/scripts/update_running_streams.sh @@ -0,0 +1,18 @@ +#/bin/bash + +if [ ! "$#" -eq 1 ] +then + echo "Usage: ./update_running_streams.sh [number of active streams]" + exit +fi + +STREAMS=$1 +BODY="" + +for((i=1; $i<= $STREAMS; i++)); do + BODY+="{\"id\":\"fw_udp$i\", \"is-enabled\":\"true\"}," +done + +BODY='{"pg-streams":{"pg-stream": ['${BODY%?}']}}' + +curl -X PUT -H "Authorization: Basic YWRtaW46YWRtaW4=" -H "Content-Type: application/json" -H "Cache-Control: no-cache" -H "Postman-Token: 9005870c-900b-2e2e-0902-ef2009bb0ff7" -d "$BODY" "http://localhost:8183/restconf/config/sample-plugin:sample-plugin/pg-streams" \ No newline at end of file -- cgit 1.2.3-korg