Merge "Handle nested xtrace states (Quantum edition)"

This commit is contained in:
Jenkins
2013-02-10 02:03:32 +00:00
committed by Gerrit Code Review
7 changed files with 14 additions and 14 deletions

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

@@ -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