From 8d55be31a95043236d52ee891bacae5ea9f5ed37 Mon Sep 17 00:00:00 2001
From: Dean Troyer <dtroyer@gmail.com>
Date: Thu, 7 Feb 2013 17:16:35 -0600
Subject: [PATCH] Handle nested xtrace states (Quantum edition)

The lib/quantum_* directories include plugin files that also
contains the $XTRACE bits at entry and exit.  The nested XTRACE handling overwrote
the value from lib/quantum.  So...make the nested files use their own
XTRACE variables.

Change-Id: Ib5e643371666b21402eef2ec58bfb1dfb7e1ccc4
---
 lib/quantum_plugins/bigswitch_floodlight    | 4 ++--
 lib/quantum_plugins/linuxbridge             | 4 ++--
 lib/quantum_plugins/openvswitch             | 4 ++--
 lib/quantum_plugins/ovs_base                | 4 ++--
 lib/quantum_plugins/ryu                     | 4 ++--
 lib/quantum_thirdparty/bigswitch_floodlight | 4 ++--
 lib/quantum_thirdparty/ryu                  | 4 ++--
 7 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/lib/quantum_plugins/bigswitch_floodlight b/lib/quantum_plugins/bigswitch_floodlight
index 35276a5564..2c928bec95 100644
--- a/lib/quantum_plugins/bigswitch_floodlight
+++ b/lib/quantum_plugins/bigswitch_floodlight
@@ -2,7 +2,7 @@
 # ------------------------------------
 
 # Save trace setting
-XTRACE=$(set +o | grep xtrace)
+MY_XTRACE=$(set +o | grep xtrace)
 set +o xtrace
 
 source $TOP_DIR/lib/quantum_plugins/ovs_base
@@ -52,4 +52,4 @@ function quantum_plugin_setup_interface_driver() {
 }
 
 # Restore xtrace
-$XTRACE
+$MY_XTRACE
diff --git a/lib/quantum_plugins/linuxbridge b/lib/quantum_plugins/linuxbridge
index e8ba68c370..6d5d4e08c2 100644
--- a/lib/quantum_plugins/linuxbridge
+++ b/lib/quantum_plugins/linuxbridge
@@ -2,7 +2,7 @@
 # ---------------------------
 
 # Save trace setting
-XTRACE=$(set +o | grep xtrace)
+MY_XTRACE=$(set +o | grep xtrace)
 set +o xtrace
 
 function is_quantum_ovs_base_plugin() {
@@ -76,4 +76,4 @@ function quantum_plugin_setup_interface_driver() {
 }
 
 # Restore xtrace
-$XTRACE
+$MY_XTRACE
diff --git a/lib/quantum_plugins/openvswitch b/lib/quantum_plugins/openvswitch
index 5415e86960..12bc24422a 100644
--- a/lib/quantum_plugins/openvswitch
+++ b/lib/quantum_plugins/openvswitch
@@ -2,7 +2,7 @@
 # ---------------------------
 
 # Save trace setting
-XTRACE=$(set +o | grep xtrace)
+MY_XTRACE=$(set +o | grep xtrace)
 set +o xtrace
 
 source $TOP_DIR/lib/quantum_plugins/ovs_base
@@ -141,4 +141,4 @@ function quantum_plugin_setup_interface_driver() {
 }
 
 # Restore xtrace
-$XTRACE
+$MY_XTRACE
diff --git a/lib/quantum_plugins/ovs_base b/lib/quantum_plugins/ovs_base
index d9f6fd0ecc..4c334731b8 100644
--- a/lib/quantum_plugins/ovs_base
+++ b/lib/quantum_plugins/ovs_base
@@ -2,7 +2,7 @@
 # -------------------------------------
 
 # Save trace setting
-XTRACE=$(set +o | grep xtrace)
+MY_XTRACE=$(set +o | grep xtrace)
 set +o xtrace
 
 function is_quantum_ovs_base_plugin() {
@@ -46,4 +46,4 @@ function _quantum_ovs_base_configure_l3_agent() {
 }
 
 # Restore xtrace
-$XTRACE
+$MY_XTRACE
diff --git a/lib/quantum_plugins/ryu b/lib/quantum_plugins/ryu
index 86105bc8b9..f44f4ae37b 100644
--- a/lib/quantum_plugins/ryu
+++ b/lib/quantum_plugins/ryu
@@ -2,7 +2,7 @@
 # ------------------
 
 # Save trace setting
-XTRACE=$(set +o | grep xtrace)
+MY_XTRACE=$(set +o | grep xtrace)
 set +o xtrace
 
 source $TOP_DIR/lib/quantum_plugins/ovs_base
@@ -60,4 +60,4 @@ function quantum_plugin_setup_interface_driver() {
 }
 
 # Restore xtrace
-$XTRACE
+$MY_XTRACE
diff --git a/lib/quantum_thirdparty/bigswitch_floodlight b/lib/quantum_thirdparty/bigswitch_floodlight
index 77aeb61d7c..60e39248c4 100644
--- a/lib/quantum_thirdparty/bigswitch_floodlight
+++ b/lib/quantum_thirdparty/bigswitch_floodlight
@@ -2,7 +2,7 @@
 # ------------------------------------------
 
 # Save trace setting
-XTRACE=$(set +o | grep xtrace)
+MY_XTRACE=$(set +o | grep xtrace)
 set +o xtrace
 
 BS_FL_CONTROLLERS_PORT=${BS_FL_CONTROLLERS_PORT:-localhost:80}
@@ -47,4 +47,4 @@ function stop_bigswitch_floodlight() {
 }
 
 # Restore xtrace
-$XTRACE
+$MY_XTRACE
diff --git a/lib/quantum_thirdparty/ryu b/lib/quantum_thirdparty/ryu
index f11951a3fa..de8e086195 100644
--- a/lib/quantum_thirdparty/ryu
+++ b/lib/quantum_thirdparty/ryu
@@ -2,7 +2,7 @@
 # -----------------------
 
 # Save trace setting
-XTRACE=$(set +o | grep xtrace)
+MY_XTRACE=$(set +o | grep xtrace)
 set +o xtrace
 
 
@@ -62,4 +62,4 @@ function stop_ryu() {
 }
 
 # Restore xtrace
-$XTRACE
+$MY_XTRACE