Browse code
Merge "Handle nested xtrace states (Quantum edition)"
Jenkins authored on 2013/02/10 11:03:32Showing 7 changed files
- lib/quantum_plugins/bigswitch_floodlight
- lib/quantum_plugins/linuxbridge
- lib/quantum_plugins/openvswitch
- lib/quantum_plugins/ovs_base
- lib/quantum_plugins/ryu
- lib/quantum_thirdparty/bigswitch_floodlight
- lib/quantum_thirdparty/ryu
| ... | ... |
@@ -2,7 +2,7 @@ |
| 2 | 2 |
# ------------------------------------ |
| 3 | 3 |
|
| 4 | 4 |
# Save trace setting |
| 5 |
-XTRACE=$(set +o | grep xtrace) |
|
| 5 |
+MY_XTRACE=$(set +o | grep xtrace) |
|
| 6 | 6 |
set +o xtrace |
| 7 | 7 |
|
| 8 | 8 |
source $TOP_DIR/lib/quantum_plugins/ovs_base |
| ... | ... |
@@ -52,4 +52,4 @@ function quantum_plugin_setup_interface_driver() {
|
| 52 | 52 |
} |
| 53 | 53 |
|
| 54 | 54 |
# Restore xtrace |
| 55 |
-$XTRACE |
|
| 55 |
+$MY_XTRACE |
| ... | ... |
@@ -2,7 +2,7 @@ |
| 2 | 2 |
# --------------------------- |
| 3 | 3 |
|
| 4 | 4 |
# Save trace setting |
| 5 |
-XTRACE=$(set +o | grep xtrace) |
|
| 5 |
+MY_XTRACE=$(set +o | grep xtrace) |
|
| 6 | 6 |
set +o xtrace |
| 7 | 7 |
|
| 8 | 8 |
function is_quantum_ovs_base_plugin() {
|
| ... | ... |
@@ -76,4 +76,4 @@ function quantum_plugin_setup_interface_driver() {
|
| 76 | 76 |
} |
| 77 | 77 |
|
| 78 | 78 |
# Restore xtrace |
| 79 |
-$XTRACE |
|
| 79 |
+$MY_XTRACE |
| ... | ... |
@@ -2,7 +2,7 @@ |
| 2 | 2 |
# --------------------------- |
| 3 | 3 |
|
| 4 | 4 |
# Save trace setting |
| 5 |
-XTRACE=$(set +o | grep xtrace) |
|
| 5 |
+MY_XTRACE=$(set +o | grep xtrace) |
|
| 6 | 6 |
set +o xtrace |
| 7 | 7 |
|
| 8 | 8 |
source $TOP_DIR/lib/quantum_plugins/ovs_base |
| ... | ... |
@@ -141,4 +141,4 @@ function quantum_plugin_setup_interface_driver() {
|
| 141 | 141 |
} |
| 142 | 142 |
|
| 143 | 143 |
# Restore xtrace |
| 144 |
-$XTRACE |
|
| 144 |
+$MY_XTRACE |
| ... | ... |
@@ -2,7 +2,7 @@ |
| 2 | 2 |
# ------------------------------------- |
| 3 | 3 |
|
| 4 | 4 |
# Save trace setting |
| 5 |
-XTRACE=$(set +o | grep xtrace) |
|
| 5 |
+MY_XTRACE=$(set +o | grep xtrace) |
|
| 6 | 6 |
set +o xtrace |
| 7 | 7 |
|
| 8 | 8 |
function is_quantum_ovs_base_plugin() {
|
| ... | ... |
@@ -46,4 +46,4 @@ function _quantum_ovs_base_configure_l3_agent() {
|
| 46 | 46 |
} |
| 47 | 47 |
|
| 48 | 48 |
# Restore xtrace |
| 49 |
-$XTRACE |
|
| 49 |
+$MY_XTRACE |
| ... | ... |
@@ -2,7 +2,7 @@ |
| 2 | 2 |
# ------------------ |
| 3 | 3 |
|
| 4 | 4 |
# Save trace setting |
| 5 |
-XTRACE=$(set +o | grep xtrace) |
|
| 5 |
+MY_XTRACE=$(set +o | grep xtrace) |
|
| 6 | 6 |
set +o xtrace |
| 7 | 7 |
|
| 8 | 8 |
source $TOP_DIR/lib/quantum_plugins/ovs_base |
| ... | ... |
@@ -60,4 +60,4 @@ function quantum_plugin_setup_interface_driver() {
|
| 60 | 60 |
} |
| 61 | 61 |
|
| 62 | 62 |
# Restore xtrace |
| 63 |
-$XTRACE |
|
| 63 |
+$MY_XTRACE |
| ... | ... |
@@ -2,7 +2,7 @@ |
| 2 | 2 |
# ------------------------------------------ |
| 3 | 3 |
|
| 4 | 4 |
# Save trace setting |
| 5 |
-XTRACE=$(set +o | grep xtrace) |
|
| 5 |
+MY_XTRACE=$(set +o | grep xtrace) |
|
| 6 | 6 |
set +o xtrace |
| 7 | 7 |
|
| 8 | 8 |
BS_FL_CONTROLLERS_PORT=${BS_FL_CONTROLLERS_PORT:-localhost:80}
|
| ... | ... |
@@ -47,4 +47,4 @@ function stop_bigswitch_floodlight() {
|
| 47 | 47 |
} |
| 48 | 48 |
|
| 49 | 49 |
# Restore xtrace |
| 50 |
-$XTRACE |
|
| 50 |
+$MY_XTRACE |