From 1f1ca90df0c08dbcfd2afbfcb095bf741f99cca8 Mon Sep 17 00:00:00 2001 From: Matej Perina Date: Wed, 17 Feb 2016 14:02:08 +0100 Subject: [PATCH] Bug 3738: GBP coexistence fixes - chmod scripts, small script issues Change-Id: Ice6c53dbcf134fb35f68985c7a3902e263cddcff Signed-off-by: Keith Burns (alagalah) Signed-off-by: Matej Perina --- .../gbp-devstack/devstack-scripts/restack.sh | 8 +++--- .../devstack-scripts/sfc/kernelmods.sh | 10 ++++--- .../devstack-scripts/sfc/sfc02.sh | 7 +++-- .../devstack-scripts/sfc/sfc03.sh | 8 +++++- .../devstack-scripts/sfc/sfc04.sh | 27 ++++++++++++++++++- .../tests/testbasicIP-multirouter1.sh | 0 .../devstack-scripts/tests/testfloatingip.sh | 0 .../devstack-scripts/tests/testmtnet.sh | 0 .../tutorial/exampleSecurityGroups.sh | 0 .../devstack-scripts/tutorial/multirouter1.sh | 0 .../devstack-scripts/tutorial/step01.sh | 0 .../devstack-scripts/tutorial/step02.sh | 0 .../devstack-scripts/tutorial/step03.sh | 0 .../devstack-scripts/tutorial/step04.sh | 0 14 files changed, 50 insertions(+), 10 deletions(-) mode change 100644 => 100755 demos/gbp-devstack/devstack-scripts/tests/testbasicIP-multirouter1.sh mode change 100644 => 100755 demos/gbp-devstack/devstack-scripts/tests/testfloatingip.sh mode change 100644 => 100755 demos/gbp-devstack/devstack-scripts/tests/testmtnet.sh mode change 100644 => 100755 demos/gbp-devstack/devstack-scripts/tutorial/exampleSecurityGroups.sh mode change 100644 => 100755 demos/gbp-devstack/devstack-scripts/tutorial/multirouter1.sh mode change 100644 => 100755 demos/gbp-devstack/devstack-scripts/tutorial/step01.sh mode change 100644 => 100755 demos/gbp-devstack/devstack-scripts/tutorial/step02.sh mode change 100644 => 100755 demos/gbp-devstack/devstack-scripts/tutorial/step03.sh mode change 100644 => 100755 demos/gbp-devstack/devstack-scripts/tutorial/step04.sh diff --git a/demos/gbp-devstack/devstack-scripts/restack.sh b/demos/gbp-devstack/devstack-scripts/restack.sh index 469e200a2..41c647a26 100755 --- a/demos/gbp-devstack/devstack-scripts/restack.sh +++ b/demos/gbp-devstack/devstack-scripts/restack.sh @@ -1,11 +1,13 @@ ./unstack.sh --all - sudo service rabbitmq-server restart - sudo service mysql restart +rm /home/vagrant/sfc*lock + +sudo service rabbitmq-server restart +sudo service mysql restart sudo ovs-vsctl set-manager tcp:$ODL:6640 sudo ovs-vsctl add-br br-int -sudo ovs-vsctl set-controller tcp:$ODL:6653 +sudo ovs-vsctl set-controller br-int tcp:$ODL:6653 echo "Removing all logs to save space..." sudo rm -rf /opt/stack/logs/* diff --git a/demos/gbp-devstack/devstack-scripts/sfc/kernelmods.sh b/demos/gbp-devstack/devstack-scripts/sfc/kernelmods.sh index 2778e53dd..fc2a7f3e9 100755 --- a/demos/gbp-devstack/devstack-scripts/sfc/kernelmods.sh +++ b/demos/gbp-devstack/devstack-scripts/sfc/kernelmods.sh @@ -1,4 +1,11 @@ #!/usr/bin/env bash +if [ "$#" -ne 3 ]; then + echo "Illegal number of parameters + Arg1= tap port name of SF + Arg2= IP address of SF + Arg3= Mac Addr of SF" + exit 1 +fi TAP=$1 IP=$2 @@ -7,6 +14,3 @@ TDEST=`/sbin/ifconfig eth0 | grep 'inet addr:' | cut -d: -f2 | awk '{ print $1}' sudo ip route add $2/32 dev $1 sudo arp -i $1 -s $2 $3 -echo "Flow mod TBD" -sudo ovs-ofctl add-flow br-int "table=0,ip,nw_dst=$TDEST,actions=output:4" -OOpenFlow13 -resetcontroller.sh diff --git a/demos/gbp-devstack/devstack-scripts/sfc/sfc02.sh b/demos/gbp-devstack/devstack-scripts/sfc/sfc02.sh index a91af1a0c..f384d3116 100755 --- a/demos/gbp-devstack/devstack-scripts/sfc/sfc02.sh +++ b/demos/gbp-devstack/devstack-scripts/sfc/sfc02.sh @@ -32,10 +32,13 @@ tacker vnf-create --name testVNF1 --vnfd-name test-vnfd echo "Wait a few minutes and then check VNF status is ACTIVE (tacker vnf-list) then execute the following commands on devstack-compute-1 BEFORE running sfc03.sh: +on devstack-control: +tacker vnf-list + +on devstack-compute-1: sudo ovs-vsctl show sudo ovs-vsctl del-port vxlangpe-br-int sudo ovs-vsctl del-port vxlan-br-int sudo ovs-vsctl show - -- remove VNF tenant from DataStore, it borks PolEnf" +" diff --git a/demos/gbp-devstack/devstack-scripts/sfc/sfc03.sh b/demos/gbp-devstack/devstack-scripts/sfc/sfc03.sh index 5cc0e7713..e5403f887 100755 --- a/demos/gbp-devstack/devstack-scripts/sfc/sfc03.sh +++ b/demos/gbp-devstack/devstack-scripts/sfc/sfc03.sh @@ -14,4 +14,10 @@ tacker sfc-create --name mychain --chain testVNF1 --symmetrical True tacker sfc-show mychain -echo "Can verify flows by 'dumpflows.sh | grep nsp' on devstack-compute-1 and lack of them on devstack-control. Then run sfc04 to add chain to policy." +echo "Can verify flows on devstack-compute-1: + +dumpflows.sh | grep nsp + +then on devstack-control: + +sfc04.sh" diff --git a/demos/gbp-devstack/devstack-scripts/sfc/sfc04.sh b/demos/gbp-devstack/devstack-scripts/sfc/sfc04.sh index dde528cac..7c65e72e2 100755 --- a/demos/gbp-devstack/devstack-scripts/sfc/sfc04.sh +++ b/demos/gbp-devstack/devstack-scripts/sfc/sfc04.sh @@ -7,9 +7,34 @@ fi echo "writing lock file /home/vagrant/sfc04.lock" touch /home/vagrant/sfc04.lock -python /vagrant/devstack-scripts/sfc/chain.py $ODL client_sg web_sg mychain +neutron security-group-rule-list + +echo 'Select a security-group-rule UUID from the above list to apply a chain to. This step can be repeated to add more security group rules to the chain. + +You can enter this either via the YangUI or sending: + +http://localhost:8181/restconf/operations/neutron-gbp-mapper:change-action-of-security-group-rules +{ + "input": { + "security-group-rule": [ + { + "uuid": "" + }, + { + "uuid": "" + } + ], + "action": { + "sfc-chain-name": "mychain" + } + } +}' + +#python /vagrant/devstack-scripts/sfc/chain.py $ODL client_sg web_sg mychain echo "Chain action added to policy. +Enter route for SF on devstack-compute-1: + kernelmods.sh " diff --git a/demos/gbp-devstack/devstack-scripts/tests/testbasicIP-multirouter1.sh b/demos/gbp-devstack/devstack-scripts/tests/testbasicIP-multirouter1.sh old mode 100644 new mode 100755 diff --git a/demos/gbp-devstack/devstack-scripts/tests/testfloatingip.sh b/demos/gbp-devstack/devstack-scripts/tests/testfloatingip.sh old mode 100644 new mode 100755 diff --git a/demos/gbp-devstack/devstack-scripts/tests/testmtnet.sh b/demos/gbp-devstack/devstack-scripts/tests/testmtnet.sh old mode 100644 new mode 100755 diff --git a/demos/gbp-devstack/devstack-scripts/tutorial/exampleSecurityGroups.sh b/demos/gbp-devstack/devstack-scripts/tutorial/exampleSecurityGroups.sh old mode 100644 new mode 100755 diff --git a/demos/gbp-devstack/devstack-scripts/tutorial/multirouter1.sh b/demos/gbp-devstack/devstack-scripts/tutorial/multirouter1.sh old mode 100644 new mode 100755 diff --git a/demos/gbp-devstack/devstack-scripts/tutorial/step01.sh b/demos/gbp-devstack/devstack-scripts/tutorial/step01.sh old mode 100644 new mode 100755 diff --git a/demos/gbp-devstack/devstack-scripts/tutorial/step02.sh b/demos/gbp-devstack/devstack-scripts/tutorial/step02.sh old mode 100644 new mode 100755 diff --git a/demos/gbp-devstack/devstack-scripts/tutorial/step03.sh b/demos/gbp-devstack/devstack-scripts/tutorial/step03.sh old mode 100644 new mode 100755 diff --git a/demos/gbp-devstack/devstack-scripts/tutorial/step04.sh b/demos/gbp-devstack/devstack-scripts/tutorial/step04.sh old mode 100644 new mode 100755 -- 2.36.6