Modify the shell script for creating physical topology for SFC scenario.

Change-Id: I399ea1720dbe90f222663f6e363f9853a37ea0ef
Signed-off-by: Zhigang Ji <jizhigang@huawei.com>

diff --git a/nemo-renderers/openflow-renderer/src/test/resources/network-down-servicechain.sh b/nemo-renderers/openflow-renderer/src/test/resources/network-down-servicechain.sh
index d61014117eff89a7dfaa2464f8e8fbdc5879c543..2ec5dd4b82a16055f73434e9f9bb4665297326e7 100644 (file)
--- a/nemo-renderers/openflow-renderer/src/test/resources/network-down-servicechain.sh
+++ b/nemo-renderers/openflow-renderer/src/test/resources/network-down-servicechain.sh
@@ -9,7 +9,6 @@ pkill -9 fail-ofprotocol
 pkill -9 ext-ofdatapath
 pkill -9 ext-ofprotocol
 
-ip link del sw1-eth1
 ip link del sw1-eth2
 ip link del sw1-eth3
 ip link del sw2-eth1
@@ -19,8 +18,6 @@ ip link del sw3-eth2
 ip link del sw3-eth3
 ip link del sw4-eth1
 
-ip link del fw1-eth0
-ip netns delete fw1
 ip link del fw2-eth0
 ip netns delete fw2
 ip link del cache1-eth0

diff --git a/nemo-renderers/openflow-renderer/src/test/resources/network-up-servicechain.sh b/nemo-renderers/openflow-renderer/src/test/resources/network-up-servicechain.sh
index 4b786c8ce5a0fd1b66bc8d15aa055fef69636452..6bb9671869b9cf3d8f4e3d4615847f5efe50cbc6 100644 (file)
--- a/nemo-renderers/openflow-renderer/src/test/resources/network-up-servicechain.sh
+++ b/nemo-renderers/openflow-renderer/src/test/resources/network-up-servicechain.sh
@@ -1,7 +1,6 @@
 #!/bin/bash
 
 ########## sw1 ##########
-ip link add name sw1-eth1 type veth peer name fw1-eth0
 ip link add name sw1-eth2 type veth peer name fw2-eth0
 ip link add name sw1-eth3 type veth peer name sw3-eth1
 
@@ -17,10 +16,6 @@ ip link add name sw3-eth3 type veth peer name sw4-eth1
 ########## sw4 ##########
 #ip link add name sw4-eth1 type veth peer name sw3-eth3
 
-########## fw1 ##########
-ip netns add fw1
-ip link set fw1-eth0 netns fw1
-
 ########## fw2 ##########
 ip netns add fw2
 ip link set fw2-eth0 netns fw2
@@ -30,7 +25,7 @@ ip netns add cache1
 ip link set cache1-eth0 netns cache1
 
 ########## sw1 ##########
-ofdatapath -i sw1-eth1,sw1-eth2,sw1-eth3 punix:/tmp/sw1 -d 000000000001 1> /tmp/sw1-ofd.log 2> /tmp/sw1-ofd.log &
+ofdatapath -i eth0,sw1-eth2,sw1-eth3 punix:/tmp/sw1 -d 000000000001 1> /tmp/sw1-ofd.log 2> /tmp/sw1-ofd.log &
 ofprotocol unix:/tmp/sw1 tcp:127.0.0.1:6633 --fail=closed --listen=ptcp:6661 1> /tmp/sw1-ofp.log 2> /tmp/sw1-ofp.log &
 
 ########## sw2 ##########
@@ -45,14 +40,6 @@ ofprotocol unix:/tmp/sw3 tcp:127.0.0.1:6633 --fail=closed --listen=ptcp:6663 1>
 ofdatapath -i sw4-eth1,eth3 punix:/tmp/sw4 -d 000000000004 1> /tmp/sw4-ofd.log 2> /tmp/sw4-ofd.log &
 ofprotocol unix:/tmp/sw4 tcp:127.0.0.1:6633 --fail=closed --listen=ptcp:6664 1> /tmp/sw4-ofp.log 2> /tmp/sw4-ofp.log &
 
-sleep 5
-
-########## lldp ##########
-dpctl unix:/tmp/sw1 flow-mod cmd=add,table=0 eth_type=0x88cc apply:output=ctrl:0xff
-dpctl unix:/tmp/sw2 flow-mod cmd=add,table=0 eth_type=0x88cc apply:output=ctrl:0xff
-dpctl unix:/tmp/sw3 flow-mod cmd=add,table=0 eth_type=0x88cc apply:output=ctrl:0xff
-dpctl unix:/tmp/sw4 flow-mod cmd=add,table=0 eth_type=0x88cc apply:output=ctrl:0xff
-
 exit 0