Browse code
Fix Neutron plugin XTRACE handling
The various Neutron plugin files need to have unique variables for the
xtrace state as they are sometimes nested more than two levels deep
and MY_XTRACE is getting stomped. This gives each of the neutron_plugin
and neutron_thirdparty include files a unique XTRACE state variable.
I don't think this is a problem with any of the other plugin include
files (yet) so this just handles Neutron for now.
Change-Id: I7c272a48e7974edecaff5f431ff7443dd6622588
Dean Troyer authored on 2014/03/29 02:40:56Showing 26 changed files
- lib/neutron_plugins/bigswitch_floodlight
- lib/neutron_plugins/cisco
- lib/neutron_plugins/embrane
- lib/neutron_plugins/ibm
- lib/neutron_plugins/linuxbridge
- lib/neutron_plugins/midonet
- lib/neutron_plugins/ml2
- lib/neutron_plugins/nec
- lib/neutron_plugins/nuage
- lib/neutron_plugins/ofagent_agent
- lib/neutron_plugins/oneconvergence
- lib/neutron_plugins/openvswitch
- lib/neutron_plugins/openvswitch_agent
- lib/neutron_plugins/ovs_base
- lib/neutron_plugins/plumgrid
- lib/neutron_plugins/ryu
- lib/neutron_plugins/services/firewall
- lib/neutron_plugins/services/loadbalancer
- lib/neutron_plugins/services/metering
- lib/neutron_plugins/services/vpn
- lib/neutron_plugins/vmware_nsx
- lib/neutron_thirdparty/bigswitch_floodlight
- lib/neutron_thirdparty/midonet
- lib/neutron_thirdparty/ryu
- lib/neutron_thirdparty/trema
- lib/neutron_thirdparty/vmware_nsx
| ... | ... |
@@ -2,7 +2,7 @@ |
| 2 | 2 |
# ------------------------------------ |
| 3 | 3 |
|
| 4 | 4 |
# Save trace setting |
| 5 |
-MY_XTRACE=$(set +o | grep xtrace) |
|
| 5 |
+BS_XTRACE=$(set +o | grep xtrace) |
|
| 6 | 6 |
set +o xtrace |
| 7 | 7 |
|
| 8 | 8 |
source $TOP_DIR/lib/neutron_plugins/ovs_base |
| ... | ... |
@@ -74,4 +74,4 @@ function neutron_plugin_check_adv_test_requirements {
|
| 74 | 74 |
} |
| 75 | 75 |
|
| 76 | 76 |
# Restore xtrace |
| 77 |
-$MY_XTRACE |
|
| 77 |
+$BS_XTRACE |
| ... | ... |
@@ -2,7 +2,7 @@ |
| 2 | 2 |
# --------------------------- |
| 3 | 3 |
|
| 4 | 4 |
# Save trace setting |
| 5 |
-MY_XTRACE=$(set +o | grep xtrace) |
|
| 5 |
+CISCO_XTRACE=$(set +o | grep xtrace) |
|
| 6 | 6 |
set +o xtrace |
| 7 | 7 |
|
| 8 | 8 |
# Scecify the VSM parameters |
| ... | ... |
@@ -324,4 +324,4 @@ function neutron_plugin_setup_interface_driver {
|
| 324 | 324 |
} |
| 325 | 325 |
|
| 326 | 326 |
# Restore xtrace |
| 327 |
-$MY_XTRACE |
|
| 327 |
+$CISCO_XTRACE |
| ... | ... |
@@ -2,7 +2,7 @@ |
| 2 | 2 |
# --------------------------- |
| 3 | 3 |
|
| 4 | 4 |
# Save trace setting |
| 5 |
-MY_XTRACE=$(set +o | grep xtrace) |
|
| 5 |
+EMBR_XTRACE=$(set +o | grep xtrace) |
|
| 6 | 6 |
set +o xtrace |
| 7 | 7 |
|
| 8 | 8 |
source $TOP_DIR/lib/neutron_plugins/openvswitch |
| ... | ... |
@@ -37,4 +37,4 @@ function neutron_plugin_configure_service {
|
| 37 | 37 |
} |
| 38 | 38 |
|
| 39 | 39 |
# Restore xtrace |
| 40 |
-$MY_XTRACE |
|
| 40 |
+$EMBR_XTRACE |
| ... | ... |
@@ -2,7 +2,7 @@ |
| 2 | 2 |
# --------------------------- |
| 3 | 3 |
|
| 4 | 4 |
# Save trace setting |
| 5 |
-MY_XTRACE=$(set +o | grep xtrace) |
|
| 5 |
+IBM_XTRACE=$(set +o | grep xtrace) |
|
| 6 | 6 |
set +o xtrace |
| 7 | 7 |
|
| 8 | 8 |
source $TOP_DIR/lib/neutron_plugins/ovs_base |
| ... | ... |
@@ -130,4 +130,4 @@ function neutron_ovs_base_cleanup {
|
| 130 | 130 |
} |
| 131 | 131 |
|
| 132 | 132 |
# Restore xtrace |
| 133 |
-$MY_XTRACE |
|
| 133 |
+$IBM_XTRACE |
| ... | ... |
@@ -2,7 +2,7 @@ |
| 2 | 2 |
# --------------------------- |
| 3 | 3 |
|
| 4 | 4 |
# Save trace setting |
| 5 |
-MY_XTRACE=$(set +o | grep xtrace) |
|
| 5 |
+LBRIDGE_XTRACE=$(set +o | grep xtrace) |
|
| 6 | 6 |
set +o xtrace |
| 7 | 7 |
|
| 8 | 8 |
source $TOP_DIR/lib/neutron_plugins/linuxbridge_agent |
| ... | ... |
@@ -53,4 +53,4 @@ function has_neutron_plugin_security_group {
|
| 53 | 53 |
} |
| 54 | 54 |
|
| 55 | 55 |
# Restore xtrace |
| 56 |
-$MY_XTRACE |
|
| 56 |
+$LBRIDGE_XTRACE |
| ... | ... |
@@ -6,7 +6,7 @@ MIDONET_API_PORT=${MIDONET_API_PORT:-8080}
|
| 6 | 6 |
MIDONET_API_URL=${MIDONET_API_URL:-http://localhost:$MIDONET_API_PORT/midonet-api}
|
| 7 | 7 |
|
| 8 | 8 |
# Save trace setting |
| 9 |
-MY_XTRACE=$(set +o | grep xtrace) |
|
| 9 |
+MN_XTRACE=$(set +o | grep xtrace) |
|
| 10 | 10 |
set +o xtrace |
| 11 | 11 |
|
| 12 | 12 |
function is_neutron_ovs_base_plugin {
|
| ... | ... |
@@ -84,4 +84,4 @@ function neutron_plugin_check_adv_test_requirements {
|
| 84 | 84 |
} |
| 85 | 85 |
|
| 86 | 86 |
# Restore xtrace |
| 87 |
-$MY_XTRACE |
|
| 87 |
+$MN_XTRACE |
| ... | ... |
@@ -2,7 +2,7 @@ |
| 2 | 2 |
# ------------------------------ |
| 3 | 3 |
|
| 4 | 4 |
# Save trace setting |
| 5 |
-MY_XTRACE=$(set +o | grep xtrace) |
|
| 5 |
+ML2_XTRACE=$(set +o | grep xtrace) |
|
| 6 | 6 |
set +o xtrace |
| 7 | 7 |
|
| 8 | 8 |
# Enable this to simply and quickly enable tunneling with ML2. |
| ... | ... |
@@ -119,4 +119,4 @@ function has_neutron_plugin_security_group {
|
| 119 | 119 |
} |
| 120 | 120 |
|
| 121 | 121 |
# Restore xtrace |
| 122 |
-$MY_XTRACE |
|
| 122 |
+$ML2_XTRACE |
| ... | ... |
@@ -2,7 +2,7 @@ |
| 2 | 2 |
# --------------------------- |
| 3 | 3 |
|
| 4 | 4 |
# Save trace setting |
| 5 |
-MY_XTRACE=$(set +o | grep xtrace) |
|
| 5 |
+NEC_XTRACE=$(set +o | grep xtrace) |
|
| 6 | 6 |
set +o xtrace |
| 7 | 7 |
|
| 8 | 8 |
# Configuration parameters |
| ... | ... |
@@ -127,4 +127,4 @@ function neutron_plugin_check_adv_test_requirements {
|
| 127 | 127 |
} |
| 128 | 128 |
|
| 129 | 129 |
# Restore xtrace |
| 130 |
-$MY_XTRACE |
|
| 130 |
+$NEC_XTRACE |
| ... | ... |
@@ -2,7 +2,7 @@ |
| 2 | 2 |
# ---------------------- |
| 3 | 3 |
|
| 4 | 4 |
# Save trace setting |
| 5 |
-MY_XTRACE=$(set +o | grep xtrace) |
|
| 5 |
+NU_XTRACE=$(set +o | grep xtrace) |
|
| 6 | 6 |
set +o xtrace |
| 7 | 7 |
|
| 8 | 8 |
function neutron_plugin_create_nova_conf {
|
| ... | ... |
@@ -66,4 +66,4 @@ function has_neutron_plugin_security_group {
|
| 66 | 66 |
} |
| 67 | 67 |
|
| 68 | 68 |
# Restore xtrace |
| 69 |
-$MY_XTRACE |
|
| 69 |
+$NU_XTRACE |
| ... | ... |
@@ -2,7 +2,7 @@ |
| 2 | 2 |
# ---------------------- |
| 3 | 3 |
|
| 4 | 4 |
# Save trace setting |
| 5 |
-MY_XTRACE=$(set +o | grep xtrace) |
|
| 5 |
+OFA_XTRACE=$(set +o | grep xtrace) |
|
| 6 | 6 |
set +o xtrace |
| 7 | 7 |
|
| 8 | 8 |
source $TOP_DIR/lib/neutron_plugins/ovs_base |
| ... | ... |
@@ -91,4 +91,4 @@ function neutron_plugin_check_adv_test_requirements {
|
| 91 | 91 |
} |
| 92 | 92 |
|
| 93 | 93 |
# Restore xtrace |
| 94 |
-$MY_XTRACE |
|
| 94 |
+$OFA_XTRACE |
| ... | ... |
@@ -1,7 +1,7 @@ |
| 1 | 1 |
# Neutron One Convergence plugin |
| 2 | 2 |
# --------------------------- |
| 3 | 3 |
# Save trace setting |
| 4 |
-MY_XTRACE=$(set +o | grep xtrace) |
|
| 4 |
+OC_XTRACE=$(set +o | grep xtrace) |
|
| 5 | 5 |
set +o xtrace |
| 6 | 6 |
|
| 7 | 7 |
source $TOP_DIR/lib/neutron_plugins/ovs_base |
| ... | ... |
@@ -73,4 +73,4 @@ function neutron_plugin_create_nova_conf {
|
| 73 | 73 |
} |
| 74 | 74 |
|
| 75 | 75 |
# Restore xtrace |
| 76 |
-$MY_XTRACE |
|
| 76 |
+$OC_XTRACE |
| ... | ... |
@@ -2,7 +2,7 @@ |
| 2 | 2 |
# --------------------------- |
| 3 | 3 |
|
| 4 | 4 |
# Save trace setting |
| 5 |
-MY_XTRACE=$(set +o | grep xtrace) |
|
| 5 |
+OVS_XTRACE=$(set +o | grep xtrace) |
|
| 6 | 6 |
set +o xtrace |
| 7 | 7 |
|
| 8 | 8 |
source $TOP_DIR/lib/neutron_plugins/openvswitch_agent |
| ... | ... |
@@ -57,4 +57,4 @@ function has_neutron_plugin_security_group {
|
| 57 | 57 |
} |
| 58 | 58 |
|
| 59 | 59 |
# Restore xtrace |
| 60 |
-$MY_XTRACE |
|
| 60 |
+$OVS_XTRACE |
| ... | ... |
@@ -2,7 +2,7 @@ |
| 2 | 2 |
# ----------------------------- |
| 3 | 3 |
|
| 4 | 4 |
# Save trace setting |
| 5 |
-PLUGIN_XTRACE=$(set +o | grep xtrace) |
|
| 5 |
+OVSA_XTRACE=$(set +o | grep xtrace) |
|
| 6 | 6 |
set +o xtrace |
| 7 | 7 |
|
| 8 | 8 |
source $TOP_DIR/lib/neutron_plugins/ovs_base |
| ... | ... |
@@ -128,4 +128,4 @@ function neutron_plugin_check_adv_test_requirements {
|
| 128 | 128 |
} |
| 129 | 129 |
|
| 130 | 130 |
# Restore xtrace |
| 131 |
-$PLUGIN_XTRACE |
|
| 131 |
+$OVSA_XTRACE |
| ... | ... |
@@ -2,7 +2,7 @@ |
| 2 | 2 |
# ------------------------------------- |
| 3 | 3 |
|
| 4 | 4 |
# Save trace setting |
| 5 |
-MY_XTRACE=$(set +o | grep xtrace) |
|
| 5 |
+OVSB_XTRACE=$(set +o | grep xtrace) |
|
| 6 | 6 |
set +o xtrace |
| 7 | 7 |
|
| 8 | 8 |
OVS_BRIDGE=${OVS_BRIDGE:-br-int}
|
| ... | ... |
@@ -77,4 +77,4 @@ function _neutron_ovs_base_configure_nova_vif_driver {
|
| 77 | 77 |
} |
| 78 | 78 |
|
| 79 | 79 |
# Restore xtrace |
| 80 |
-$MY_XTRACE |
|
| 80 |
+$OVSB_XTRACE |
| ... | ... |
@@ -3,7 +3,7 @@ |
| 3 | 3 |
# ------------------------------------ |
| 4 | 4 |
|
| 5 | 5 |
# Save trace settings |
| 6 |
-MY_XTRACE=$(set +o | grep xtrace) |
|
| 6 |
+PG_XTRACE=$(set +o | grep xtrace) |
|
| 7 | 7 |
set +o xtrace |
| 8 | 8 |
|
| 9 | 9 |
function neutron_plugin_create_nova_conf {
|
| ... | ... |
@@ -52,4 +52,4 @@ function neutron_plugin_check_adv_test_requirements {
|
| 52 | 52 |
is_service_enabled q-agt && is_service_enabled q-dhcp && return 0 |
| 53 | 53 |
} |
| 54 | 54 |
# Restore xtrace |
| 55 |
-$MY_XTRACE |
|
| 55 |
+$PG_XTRACE |
| ... | ... |
@@ -2,7 +2,7 @@ |
| 2 | 2 |
# ------------------ |
| 3 | 3 |
|
| 4 | 4 |
# Save trace setting |
| 5 |
-MY_XTRACE=$(set +o | grep xtrace) |
|
| 5 |
+RYU_XTRACE=$(set +o | grep xtrace) |
|
| 6 | 6 |
set +o xtrace |
| 7 | 7 |
|
| 8 | 8 |
source $TOP_DIR/lib/neutron_plugins/ovs_base |
| ... | ... |
@@ -77,4 +77,4 @@ function neutron_plugin_check_adv_test_requirements {
|
| 77 | 77 |
} |
| 78 | 78 |
|
| 79 | 79 |
# Restore xtrace |
| 80 |
-$MY_XTRACE |
|
| 80 |
+$RYU_XTRACE |
| ... | ... |
@@ -2,7 +2,7 @@ |
| 2 | 2 |
# --------------------------- |
| 3 | 3 |
|
| 4 | 4 |
# Save trace setting |
| 5 |
-MY_XTRACE=$(set +o | grep xtrace) |
|
| 5 |
+FW_XTRACE=$(set +o | grep xtrace) |
|
| 6 | 6 |
set +o xtrace |
| 7 | 7 |
|
| 8 | 8 |
FWAAS_PLUGIN=neutron.services.firewall.fwaas_plugin.FirewallPlugin |
| ... | ... |
@@ -24,4 +24,4 @@ function neutron_fwaas_stop {
|
| 24 | 24 |
} |
| 25 | 25 |
|
| 26 | 26 |
# Restore xtrace |
| 27 |
-$MY_XTRACE |
|
| 27 |
+$FW_XTRACE |
| ... | ... |
@@ -2,7 +2,7 @@ |
| 2 | 2 |
# --------------------------- |
| 3 | 3 |
|
| 4 | 4 |
# Save trace setting |
| 5 |
-MY_XTRACE=$(set +o | grep xtrace) |
|
| 5 |
+LB_XTRACE=$(set +o | grep xtrace) |
|
| 6 | 6 |
set +o xtrace |
| 7 | 7 |
|
| 8 | 8 |
|
| ... | ... |
@@ -48,4 +48,4 @@ function neutron_lbaas_stop {
|
| 48 | 48 |
} |
| 49 | 49 |
|
| 50 | 50 |
# Restore xtrace |
| 51 |
-$MY_XTRACE |
|
| 51 |
+$LB_XTRACE |
| ... | ... |
@@ -2,7 +2,7 @@ |
| 2 | 2 |
# --------------------------- |
| 3 | 3 |
|
| 4 | 4 |
# Save trace setting |
| 5 |
-MY_XTRACE=$(set +o | grep xtrace) |
|
| 5 |
+METER_XTRACE=$(set +o | grep xtrace) |
|
| 6 | 6 |
set +o xtrace |
| 7 | 7 |
|
| 8 | 8 |
|
| ... | ... |
@@ -27,4 +27,4 @@ function neutron_metering_stop {
|
| 27 | 27 |
} |
| 28 | 28 |
|
| 29 | 29 |
# Restore xtrace |
| 30 |
-$MY_XTRACE |
|
| 30 |
+$METER_XTRACE |
| ... | ... |
@@ -2,7 +2,7 @@ |
| 2 | 2 |
# --------------------------- |
| 3 | 3 |
|
| 4 | 4 |
# Save trace setting |
| 5 |
-MY_XTRACE=$(set +o | grep xtrace) |
|
| 5 |
+VPN_XTRACE=$(set +o | grep xtrace) |
|
| 6 | 6 |
set +o xtrace |
| 7 | 7 |
|
| 8 | 8 |
|
| ... | ... |
@@ -30,4 +30,4 @@ function neutron_vpn_stop {
|
| 30 | 30 |
} |
| 31 | 31 |
|
| 32 | 32 |
# Restore xtrace |
| 33 |
-$MY_XTRACE |
|
| 33 |
+$VPN_XTRACE |
| ... | ... |
@@ -2,7 +2,7 @@ |
| 2 | 2 |
# ------------------------- |
| 3 | 3 |
|
| 4 | 4 |
# Save trace setting |
| 5 |
-MY_XTRACE=$(set +o | grep xtrace) |
|
| 5 |
+NSX_XTRACE=$(set +o | grep xtrace) |
|
| 6 | 6 |
set +o xtrace |
| 7 | 7 |
|
| 8 | 8 |
source $TOP_DIR/lib/neutron_plugins/ovs_base |
| ... | ... |
@@ -146,4 +146,4 @@ function neutron_plugin_check_adv_test_requirements {
|
| 146 | 146 |
} |
| 147 | 147 |
|
| 148 | 148 |
# Restore xtrace |
| 149 |
-$MY_XTRACE |
|
| 149 |
+$NSX_XTRACE |
| ... | ... |
@@ -2,7 +2,7 @@ |
| 2 | 2 |
# ------------------------------------------ |
| 3 | 3 |
|
| 4 | 4 |
# Save trace setting |
| 5 |
-MY_XTRACE=$(set +o | grep xtrace) |
|
| 5 |
+BS3_XTRACE=$(set +o | grep xtrace) |
|
| 6 | 6 |
set +o xtrace |
| 7 | 7 |
|
| 8 | 8 |
BS_FL_CONTROLLERS_PORT=${BS_FL_CONTROLLERS_PORT:-localhost:80}
|
| ... | ... |
@@ -49,4 +49,4 @@ function check_bigswitch_floodlight {
|
| 49 | 49 |
} |
| 50 | 50 |
|
| 51 | 51 |
# Restore xtrace |
| 52 |
-$MY_XTRACE |
|
| 52 |
+$BS3_XTRACE |
| ... | ... |
@@ -17,7 +17,7 @@ MIDONET_CLIENT_BRANCH=${MIDONET_CLIENT_BRANCH:-master}
|
| 17 | 17 |
MIDONET_CLIENT_DIR=${MIDONET_CLIENT_DIR:-$MIDONET_DIR/python-midonetclient}
|
| 18 | 18 |
|
| 19 | 19 |
# Save trace setting |
| 20 |
-MY_XTRACE=$(set +o | grep xtrace) |
|
| 20 |
+MN3_XTRACE=$(set +o | grep xtrace) |
|
| 21 | 21 |
set +o xtrace |
| 22 | 22 |
|
| 23 | 23 |
function configure_midonet {
|
| ... | ... |
@@ -46,4 +46,4 @@ function check_midonet {
|
| 46 | 46 |
} |
| 47 | 47 |
|
| 48 | 48 |
# Restore xtrace |
| 49 |
-$MY_XTRACE |
|
| 49 |
+$MN3_XTRACE |
| ... | ... |
@@ -2,7 +2,7 @@ |
| 2 | 2 |
# ----------------------- |
| 3 | 3 |
|
| 4 | 4 |
# Save trace setting |
| 5 |
-MY_XTRACE=$(set +o | grep xtrace) |
|
| 5 |
+RYU3_XTRACE=$(set +o | grep xtrace) |
|
| 6 | 6 |
set +o xtrace |
| 7 | 7 |
|
| 8 | 8 |
|
| ... | ... |
@@ -75,4 +75,4 @@ function check_ryu {
|
| 75 | 75 |
} |
| 76 | 76 |
|
| 77 | 77 |
# Restore xtrace |
| 78 |
-$MY_XTRACE |
|
| 78 |
+$RYU3_XTRACE |
| ... | ... |
@@ -13,7 +13,7 @@ TREMA_APPS_REPO=${TREMA_APPS_REPO:-https://github.com/trema/apps.git}
|
| 13 | 13 |
TREMA_APPS_BRANCH=${TREMA_APPS_BRANCH:-master}
|
| 14 | 14 |
|
| 15 | 15 |
# Save trace setting |
| 16 |
-MY_XTRACE=$(set +o | grep xtrace) |
|
| 16 |
+TREMA3_XTRACE=$(set +o | grep xtrace) |
|
| 17 | 17 |
set +o xtrace |
| 18 | 18 |
|
| 19 | 19 |
TREMA_DIR=${TREMA_DIR:-$DEST/trema}
|
| ... | ... |
@@ -114,4 +114,4 @@ function check_trema {
|
| 114 | 114 |
} |
| 115 | 115 |
|
| 116 | 116 |
# Restore xtrace |
| 117 |
-$MY_XTRACE |
|
| 117 |
+$TREMA3_XTRACE |
| ... | ... |
@@ -11,7 +11,7 @@ |
| 11 | 11 |
# * NSX_GATEWAY_NETWORK_CIDR --> CIDR to configure br-ex, e.g. 172.24.4.211/24 |
| 12 | 12 |
|
| 13 | 13 |
# Save trace setting |
| 14 |
-MY_XTRACE=$(set +o | grep xtrace) |
|
| 14 |
+NSX3_XTRACE=$(set +o | grep xtrace) |
|
| 15 | 15 |
set +o xtrace |
| 16 | 16 |
|
| 17 | 17 |
# This is the interface that connects the Devstack instance |
| ... | ... |
@@ -83,4 +83,4 @@ function check_vmware_nsx {
|
| 83 | 83 |
} |
| 84 | 84 |
|
| 85 | 85 |
# Restore xtrace |
| 86 |
-$MY_XTRACE |
|
| 86 |
+$NSX3_XTRACE |