aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--vnfs/vFW/pg_streams/stream_fw_udp11
-rw-r--r--vnfs/vFW/pg_streams/stream_fw_udp101
-rw-r--r--vnfs/vFW/pg_streams/stream_fw_udp21
-rw-r--r--vnfs/vFW/pg_streams/stream_fw_udp31
-rw-r--r--vnfs/vFW/pg_streams/stream_fw_udp41
-rw-r--r--vnfs/vFW/pg_streams/stream_fw_udp51
-rw-r--r--vnfs/vFW/pg_streams/stream_fw_udp61
-rw-r--r--vnfs/vFW/pg_streams/stream_fw_udp71
-rw-r--r--vnfs/vFW/pg_streams/stream_fw_udp81
-rw-r--r--vnfs/vFW/pg_streams/stream_fw_udp91
-rwxr-xr-xvnfs/vFW/scripts/v_firewall_init.sh20
-rwxr-xr-xvnfs/vFW/scripts/v_packetgen_init.sh17
12 files changed, 21 insertions, 26 deletions
diff --git a/vnfs/vFW/pg_streams/stream_fw_udp1 b/vnfs/vFW/pg_streams/stream_fw_udp1
index 2fa448c5..e6b4a03e 100644
--- a/vnfs/vFW/pg_streams/stream_fw_udp1
+++ b/vnfs/vFW/pg_streams/stream_fw_udp1
@@ -3,7 +3,6 @@ packet-generator new {
rate 10
node ip4-input
size 64-64
- no-recycle
data {
UDP: 192.168.10.31 -> 192.168.20.32
UDP: 15320 -> 8080
diff --git a/vnfs/vFW/pg_streams/stream_fw_udp10 b/vnfs/vFW/pg_streams/stream_fw_udp10
index e24bd2ba..0824996e 100644
--- a/vnfs/vFW/pg_streams/stream_fw_udp10
+++ b/vnfs/vFW/pg_streams/stream_fw_udp10
@@ -3,7 +3,6 @@ packet-generator new {
rate 10
node ip4-input
size 64-64
- no-recycle
data {
UDP: 192.168.10.31 -> 192.168.20.32
UDP: 15320 -> 8080
diff --git a/vnfs/vFW/pg_streams/stream_fw_udp2 b/vnfs/vFW/pg_streams/stream_fw_udp2
index 71f85388..963af409 100644
--- a/vnfs/vFW/pg_streams/stream_fw_udp2
+++ b/vnfs/vFW/pg_streams/stream_fw_udp2
@@ -3,7 +3,6 @@ packet-generator new {
rate 10
node ip4-input
size 64-64
- no-recycle
data {
UDP: 192.168.10.31 -> 192.168.20.32
UDP: 15320 -> 8080
diff --git a/vnfs/vFW/pg_streams/stream_fw_udp3 b/vnfs/vFW/pg_streams/stream_fw_udp3
index 51420722..53bb9177 100644
--- a/vnfs/vFW/pg_streams/stream_fw_udp3
+++ b/vnfs/vFW/pg_streams/stream_fw_udp3
@@ -3,7 +3,6 @@ packet-generator new {
rate 10
node ip4-input
size 64-64
- no-recycle
data {
UDP: 192.168.10.31 -> 192.168.20.32
UDP: 15320 -> 8080
diff --git a/vnfs/vFW/pg_streams/stream_fw_udp4 b/vnfs/vFW/pg_streams/stream_fw_udp4
index ff78a9f1..649f69d9 100644
--- a/vnfs/vFW/pg_streams/stream_fw_udp4
+++ b/vnfs/vFW/pg_streams/stream_fw_udp4
@@ -3,7 +3,6 @@ packet-generator new {
rate 10
node ip4-input
size 64-64
- no-recycle
data {
UDP: 192.168.10.31 -> 192.168.20.32
UDP: 15320 -> 8080
diff --git a/vnfs/vFW/pg_streams/stream_fw_udp5 b/vnfs/vFW/pg_streams/stream_fw_udp5
index 823b291d..d9b22f48 100644
--- a/vnfs/vFW/pg_streams/stream_fw_udp5
+++ b/vnfs/vFW/pg_streams/stream_fw_udp5
@@ -3,7 +3,6 @@ packet-generator new {
rate 10
node ip4-input
size 64-64
- no-recycle
data {
UDP: 192.168.10.31 -> 192.168.20.32
UDP: 15320 -> 8080
diff --git a/vnfs/vFW/pg_streams/stream_fw_udp6 b/vnfs/vFW/pg_streams/stream_fw_udp6
index e5ad8a93..bb225733 100644
--- a/vnfs/vFW/pg_streams/stream_fw_udp6
+++ b/vnfs/vFW/pg_streams/stream_fw_udp6
@@ -3,7 +3,6 @@ packet-generator new {
rate 10
node ip4-input
size 64-64
- no-recycle
data {
UDP: 192.168.10.31 -> 192.168.20.32
UDP: 15320 -> 8080
diff --git a/vnfs/vFW/pg_streams/stream_fw_udp7 b/vnfs/vFW/pg_streams/stream_fw_udp7
index 11239e7f..c19ef340 100644
--- a/vnfs/vFW/pg_streams/stream_fw_udp7
+++ b/vnfs/vFW/pg_streams/stream_fw_udp7
@@ -3,7 +3,6 @@ packet-generator new {
rate 10
node ip4-input
size 64-64
- no-recycle
data {
UDP: 192.168.10.31 -> 192.168.20.32
UDP: 15320 -> 8080
diff --git a/vnfs/vFW/pg_streams/stream_fw_udp8 b/vnfs/vFW/pg_streams/stream_fw_udp8
index 5ce32840..b612b7c8 100644
--- a/vnfs/vFW/pg_streams/stream_fw_udp8
+++ b/vnfs/vFW/pg_streams/stream_fw_udp8
@@ -3,7 +3,6 @@ packet-generator new {
rate 10
node ip4-input
size 64-64
- no-recycle
data {
UDP: 192.168.10.31 -> 192.168.20.32
UDP: 15320 -> 8080
diff --git a/vnfs/vFW/pg_streams/stream_fw_udp9 b/vnfs/vFW/pg_streams/stream_fw_udp9
index d72503ce..a8c60386 100644
--- a/vnfs/vFW/pg_streams/stream_fw_udp9
+++ b/vnfs/vFW/pg_streams/stream_fw_udp9
@@ -3,7 +3,6 @@ packet-generator new {
rate 10
node ip4-input
size 64-64
- no-recycle
data {
UDP: 192.168.10.31 -> 192.168.20.32
UDP: 15320 -> 8080
diff --git a/vnfs/vFW/scripts/v_firewall_init.sh b/vnfs/vFW/scripts/v_firewall_init.sh
index c937e9ab..9b8be88e 100755
--- a/vnfs/vFW/scripts/v_firewall_init.sh
+++ b/vnfs/vFW/scripts/v_firewall_init.sh
@@ -46,17 +46,17 @@ ip addr flush dev eth1
ip addr flush dev eth2
ifconfig eth1 up
ifconfig eth2 up
-vppctl tap connect tap111 hwaddr $HWADDR1
-vppctl tap connect tap222 hwaddr $HWADDR2
-vppctl set int ip address tap-0 $IPADDR1"/"$IPADDR1_CIDR
-vppctl set int ip address tap-1 $IPADDR2"/"$IPADDR2_CIDR
-vppctl set int state tap-0 up
-vppctl set int state tap-1 up
+vppctl create tap hw-addr $HWADDR1
+vppctl create tap hw-addr $HWADDR2
+vppctl set int ip address tap0 $IPADDR1"/"$IPADDR1_CIDR
+vppctl set int ip address tap1 $IPADDR2"/"$IPADDR2_CIDR
+vppctl set int state tap0 up
+vppctl set int state tap1 up
brctl addbr br0
-brctl addif br0 tap111
+brctl addif br0 tap0
brctl addif br0 eth1
brctl addbr br1
-brctl addif br1 tap222
+brctl addif br1 tap1
brctl addif br1 eth2
ifconfig br0 up
ifconfig br1 up
@@ -67,9 +67,9 @@ VERSION=$(cat /opt/config/demo_artifacts_version.txt)
mkdir -p /var/lib/honeycomb/persist/{config,context}/
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
+/opt/honeycomb/honeycomb &>/dev/null &disown
sleep 1
# Start VES client
cd /opt/VES/evel/evel-library/code/VESreporting/
-./go-client.sh &>/dev/null &disown
+./go-client.sh &>/dev/null &disown \ No newline at end of file
diff --git a/vnfs/vFW/scripts/v_packetgen_init.sh b/vnfs/vFW/scripts/v_packetgen_init.sh
index a5bc1963..b7f619dc 100755
--- a/vnfs/vFW/scripts/v_packetgen_init.sh
+++ b/vnfs/vFW/scripts/v_packetgen_init.sh
@@ -40,11 +40,12 @@ ifconfig eth1 down
ifconfig eth1 hw ether $FAKE_HWADDR1
ip addr flush dev eth1
ifconfig eth1 up
-vppctl tap connect tap111 hwaddr $HWADDR1
-vppctl set int ip address tap-0 $IPADDR1"/"$IPADDR1_CIDR
-vppctl set int state tap-0 up
+vppctl create tap hw-addr $HWADDR1
+vppctl set int ip address tap0 $IPADDR1"/"$IPADDR1_CIDR
+vppctl set int state tap0 up
+vppctl loop create
brctl addbr br0
-brctl addif br0 tap111
+brctl addif br0 tap0
brctl addif br0 eth1
ifconfig br0 up
vppctl ip route add $PROTECTED_NET_CIDR via $FW_IPADDR
@@ -73,15 +74,19 @@ vppctl exec /opt/pg_streams/stream_fw_udp9
vppctl exec /opt/pg_streams/stream_fw_udp10
sleep 1
+vppctl packet-generator enable
+vppctl set int unnumbered pg0 use tap0
+vppctl set int state pg0 up
+
# Start HoneyComb
VERSION=$(cat /opt/config/demo_artifacts_version.txt)
mkdir -p /var/lib/honeycomb/persist/{config,context}/
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
+/opt/honeycomb/honeycomb &>/dev/null &disown
sleep 20
# Enable traffic flows
cd /opt
chmod +x run_traffic_fw_demo.sh
-./run_traffic_fw_demo.sh &>/dev/null &disown
+./run_traffic_fw_demo.sh &>/dev/null &disown \ No newline at end of file