Bug 3738: GBP coexistence fixes 27/34827/3
authorMatej Perina <matej.perina@pantheon.sk>
Wed, 17 Feb 2016 13:02:08 +0000 (14:02 +0100)
committerMartin Sunal <msunal@cisco.com>
Wed, 24 Feb 2016 17:22:40 +0000 (17:22 +0000)
- chmod scripts, small script issues

Change-Id: Ice6c53dbcf134fb35f68985c7a3902e263cddcff
Signed-off-by: Keith Burns (alagalah) <alagalah@gmail.com>
Signed-off-by: Matej Perina <matej.perina@pantheon.sk>
14 files changed:
demos/gbp-devstack/devstack-scripts/restack.sh
demos/gbp-devstack/devstack-scripts/sfc/kernelmods.sh
demos/gbp-devstack/devstack-scripts/sfc/sfc02.sh
demos/gbp-devstack/devstack-scripts/sfc/sfc03.sh
demos/gbp-devstack/devstack-scripts/sfc/sfc04.sh
demos/gbp-devstack/devstack-scripts/tests/testbasicIP-multirouter1.sh [changed mode: 0644->0755]
demos/gbp-devstack/devstack-scripts/tests/testfloatingip.sh [changed mode: 0644->0755]
demos/gbp-devstack/devstack-scripts/tests/testmtnet.sh [changed mode: 0644->0755]
demos/gbp-devstack/devstack-scripts/tutorial/exampleSecurityGroups.sh [changed mode: 0644->0755]
demos/gbp-devstack/devstack-scripts/tutorial/multirouter1.sh [changed mode: 0644->0755]
demos/gbp-devstack/devstack-scripts/tutorial/step01.sh [changed mode: 0644->0755]
demos/gbp-devstack/devstack-scripts/tutorial/step02.sh [changed mode: 0644->0755]
demos/gbp-devstack/devstack-scripts/tutorial/step03.sh [changed mode: 0644->0755]
demos/gbp-devstack/devstack-scripts/tutorial/step04.sh [changed mode: 0644->0755]

index 469e200a260e37a95a49f0f4a5a32a5a8ef5af0c..41c647a26bfff70514dc31da396016dfdd2bfcf5 100755 (executable)
@@ -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/*
index 2778e53ddc9eab40c5edb68665d53697124aa57b..fc2a7f3e914bf3710878a6a197ecf8c9ab463047 100755 (executable)
@@ -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
index a91af1a0cf20f8cd402c4f99f6ef8d8fda032082..f384d3116ba98b97b56fb3cb532ab907a4c753a4 100755 (executable)
@@ -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"
+"
 
index 5cc0e77133fab96802817e396653d6f5a6752fc7..e5403f887df552e7386969d3b6ee5cd2e96fa72d 100755 (executable)
@@ -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"
index dde528cac5adfe122b55d609fe9f588045dd2df6..7c65e72e2d7fa42f5c68ed2f8f1f0ce6937275c5 100755 (executable)
@@ -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 of rule1>"
+            },
+            {
+                "uuid": "<uuid of rule2>"
+            }
+        ],
+        "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
 "