Merge "Bug 5117 - DOS chars in shell script"

[groupbasedpolicy.git] / demos / gbpsfc-env / demo-asymmetric-chain / sf-flows.sh

diff --git a/demos/gbpsfc-env/demo-asymmetric-chain/sf-flows.sh b/demos/gbpsfc-env/demo-asymmetric-chain/sf-flows.sh
index 4d577b40b7c78387035349234e8c335d3bf1f115..f4ee6497d240d311173070518c85933a15761b21 100644 (file)
--- a/demos/gbpsfc-env/demo-asymmetric-chain/sf-flows.sh
+++ b/demos/gbpsfc-env/demo-asymmetric-chain/sf-flows.sh
@@ -1,20 +1,20 @@
-#!/usr/bin/env bash\r
-\r
-set -e\r
-hostnum=${HOSTNAME#"gbpsfc"}\r
-sw="sw$hostnum"\r
-nsp=$1\r
-\r
-if [ "$hostnum" -eq "3" ]; then\r
-    TUNNEL=0xC0A83247\r
-elif [ "$hostnum" -eq "5" ]; then\r
-    TUNNEL=0xC0A83249\r
-else\r
-    echo "Invalid SF for this demo";\r
-    exit\r
-fi\r
-# delete NORMAL, if present\r
-nsphex=`printf "%x\n" $nsp`\r
-sudo ovs-ofctl --strict del-flows $sw priority=0\r
-sudo ovs-ofctl add-flow $sw "priority=1000,nsi=255 actions=move:NXM_NX_NSH_C1[]->NXM_NX_NSH_C1[],move:NXM_NX_NSH_C2[]->NXM_NX_NSH_C2[],move:NXM_NX_TUN_ID[0..31]->NXM_NX_TUN_ID[0..31],load:$TUNNEL->NXM_NX_TUN_IPV4_DST[],set_nsi:254,IN_PORT" -OOpenFlow13\r
-sudo ovs-ofctl add-flow $sw "priority=1000,nsi=254 actions=move:NXM_NX_NSH_C1[]->NXM_NX_NSH_C1[],move:NXM_NX_NSH_C2[]->NXM_NX_NSH_C2[],move:NXM_NX_TUN_ID[0..31]->NXM_NX_TUN_ID[0..31],load:$TUNNEL->NXM_NX_TUN_IPV4_DST[],set_nsi:253,IN_PORT" -OOpenFlow13\r
+#!/usr/bin/env bash
+
+set -e
+hostnum=${HOSTNAME#"gbpsfc"}
+sw="sw$hostnum"
+nsp=$1
+
+if [ "$hostnum" -eq "3" ]; then
+    TUNNEL=0xC0A83247
+elif [ "$hostnum" -eq "5" ]; then
+    TUNNEL=0xC0A83249
+else
+    echo "Invalid SF for this demo";
+    exit
+fi
+# delete NORMAL, if present
+nsphex=`printf "%x\n" $nsp`
+sudo ovs-ofctl --strict del-flows $sw priority=0
+sudo ovs-ofctl add-flow $sw "priority=1000,nsi=255 actions=move:NXM_NX_NSH_C1[]->NXM_NX_NSH_C1[],move:NXM_NX_NSH_C2[]->NXM_NX_NSH_C2[],move:NXM_NX_TUN_ID[0..31]->NXM_NX_TUN_ID[0..31],load:$TUNNEL->NXM_NX_TUN_IPV4_DST[],set_nsi:254,IN_PORT" -OOpenFlow13
+sudo ovs-ofctl add-flow $sw "priority=1000,nsi=254 actions=move:NXM_NX_NSH_C1[]->NXM_NX_NSH_C1[],move:NXM_NX_NSH_C2[]->NXM_NX_NSH_C2[],move:NXM_NX_TUN_ID[0..31]->NXM_NX_TUN_ID[0..31],load:$TUNNEL->NXM_NX_TUN_IPV4_DST[],set_nsi:253,IN_PORT" -OOpenFlow13