Change GRE tunnel netmask

- Change GRE tunnel netmask from /24 to /32 in add_dns.sh
- Remove Honeycomb from vPacketGen
- Call run_dns_streams.sh after rehashing stream ports

Change-Id: Ied1d7c228f97bdfd0d2f8dbf443626b1cbb7b1dc
Issue-ID: UCA-34
Signed-off-by: Marco Platania <platania@research.att.com>

diff --git a/vnfs/vLB/scripts/add_dns.sh b/vnfs/vLB/scripts/add_dns.sh
index b6ec17c..3574e08 100644 (file)
--- a/vnfs/vLB/scripts/add_dns.sh
+++ b/vnfs/vLB/scripts/add_dns.sh
@@ -13,7 +13,7 @@ GRE_IPADDR=$(cat /opt/config/gre_ipaddr.txt)
 
 vppctl lb as $IP_TO_PKTGEN_NET"/32" $DNS_IPADDR
 GRE=$(vppctl create gre tunnel src $IP_TO_DNS_NET dst $DNS_IPADDR)
-vppctl set int ip address $GRE $GRE_IPADDR"/24"
+vppctl set int ip address $GRE $GRE_IPADDR"/32"
 vppctl set int state $GRE up
 
 # Update the number of vDNSs currently active

diff --git a/vnfs/vLB/scripts/run_streams_dns.sh b/vnfs/vLB/scripts/run_streams_dns.sh
index 4d4e543..cf95fa5 100755 (executable)
--- a/vnfs/vLB/scripts/run_streams_dns.sh
+++ b/vnfs/vLB/scripts/run_streams_dns.sh
@@ -3,7 +3,7 @@
 vppctl packet-gen disable
 vppctl packet-gen enable-stream dns1
 vppctl packet-gen enable-stream dns2
-sleep 300
+sleep 100
 vppctl packet-gen enable-stream dns3
 vppctl packet-gen enable-stream dns4
 vppctl packet-gen enable-stream dns5

diff --git a/vnfs/vLB/scripts/v_packetgen_init.sh b/vnfs/vLB/scripts/v_packetgen_init.sh
index c38d2ba..3e0de3e 100644 (file)
--- a/vnfs/vLB/scripts/v_packetgen_init.sh
+++ b/vnfs/vLB/scripts/v_packetgen_init.sh
@@ -94,13 +94,6 @@ vppctl exec /opt/dns_streams/stream_dns10
 vppctl set int ip address pg0 $(cat /opt/config/pg_int.txt)"/"$IPADDR1_CIDR
 sleep 1
 
-# Start HoneyComb
-VERSION=$(cat /opt/config/demo_artifacts_version.txt)
-echo "" > /var/lib/honeycomb/persist/context/data.json
-echo "" > /var/lib/honeycomb/persist/config/data.json
-/opt/honeycomb/sample-distribution-$VERSION/honeycomb &>/dev/null &disown
-sleep 20
-
 # Enable traffic flows
 cd /opt
 chmod +x run_streams_dns.sh

diff --git a/vnfs/vLB/scripts/v_packetgen_install.sh b/vnfs/vLB/scripts/v_packetgen_install.sh
index 74b8485..6ac6273 100644 (file)
--- a/vnfs/vLB/scripts/v_packetgen_install.sh
+++ b/vnfs/vLB/scripts/v_packetgen_install.sh
@@ -51,19 +51,14 @@ apt-get install -y make wget openjdk-8-jdk gcc libcurl4-openssl-dev python-pip b
 pip install jsonschema
 
 # Download vFirewall demo code for packet generator
-mkdir /opt/honeycomb
 cd /opt
 wget $REPO_URL_BLOB/org.onap.demo/vnfs/vlb/$INSTALL_SCRIPT_VERSION/v_packetgen_init.sh
 wget $REPO_URL_BLOB/org.onap.demo/vnfs/vlb/$INSTALL_SCRIPT_VERSION/vpacketgen.sh
 wget $REPO_URL_BLOB/org.onap.demo/vnfs/vlb/$INSTALL_SCRIPT_VERSION/run_streams_dns.sh
 wget $REPO_URL_BLOB/org.onap.demo/vnfs/vlb/$INSTALL_SCRIPT_VERSION/vdnspacketgen_change_streams_ports.sh
-wget $REPO_URL_ARTIFACTS/org/onap/demo/vnf/sample-distribution/$DEMO_ARTIFACTS_VERSION/sample-distribution-$DEMO_ARTIFACTS_VERSION-hc.tar.gz
 wget $REPO_URL_ARTIFACTS/org/onap/demo/vnf/vlb/vlb_dns_streams/$DEMO_ARTIFACTS_VERSION/vlb_dns_streams-$DEMO_ARTIFACTS_VERSION-demo.tar.gz 
 
 tar -zxvf vpp.tar.gz
-tar -zxvf sample-distribution-$DEMO_ARTIFACTS_VERSION-hc.tar.gz
-mv sample-distribution-$DEMO_ARTIFACTS_VERSION honeycomb
-sed -i 's/"restconf-binding-address": "127.0.0.1",/"restconf-binding-address": "0.0.0.0",/g' honeycomb/sample-distribution-$DEMO_ARTIFACTS_VERSION/config/honeycomb.json
 tar -zxvf vlb_dns_streams-$DEMO_ARTIFACTS_VERSION-demo.tar.gz
 mv vlb_dns_streams-$DEMO_ARTIFACTS_VERSION dns_streams
 rm *.tar.gz

diff --git a/vnfs/vLB/scripts/vdnspacketgen_change_streams_ports.sh b/vnfs/vLB/scripts/vdnspacketgen_change_streams_ports.sh
index 9bd7716..7abec98 100644 (file)
--- a/vnfs/vLB/scripts/vdnspacketgen_change_streams_ports.sh
+++ b/vnfs/vLB/scripts/vdnspacketgen_change_streams_ports.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
-#Disable all streams via Honeycomb (so that it will in consistent state)
-curl -X PUT -H "Authorization: Basic YWRtaW46YWRtaW4=" -H "Content-Type: application/json" -H "Cache-Control: no-cache" -d '{"pg-streams":{"pg-stream": []}}' "http://localhost:8183/restconf/config/sample-plugin:sample-plugin/pg-streams"
+#Disable all streams
+killall -9 run_streams_dns.sh
 
 vppctl pac del dns1
 vppctl pac del dns2
@@ -14,7 +14,6 @@ vppctl pac del dns8
 vppctl pac del dns9
 vppctl pac del dns10
 
-
 #Update destination (vLB) IP
 VLB_IPADDR=$(cat /opt/config/vlb_ipaddr.txt)
 IPADDR1=$(ifconfig br0 | grep "inet addr" | tr -s ' ' | cut -d' ' -f3 | cut -d':' -f2)
@@ -50,4 +49,8 @@ vppctl exec /opt/dns_streams/stream_dns6
 vppctl exec /opt/dns_streams/stream_dns7
 vppctl exec /opt/dns_streams/stream_dns8
 vppctl exec /opt/dns_streams/stream_dns9
-vppctl exec /opt/dns_streams/stream_dns10
\ No newline at end of file
+vppctl exec /opt/dns_streams/stream_dns10
+
+#Resume stream execution
+cd /opt
+./run_streams_dns.sh &>/dev/null
\ No newline at end of file