removed some unused global variable

Fixes bug 1037082.

Change-Id: Id8e5df04cc0183cd4b2a9ab23cd403a83a2db637

diff --git a/quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py b/quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py
index ea3651a4f05b84ddba955cbc50d4aa765e4e57f8..78f09e44941286c11aee6fccdfa0e4d03f30d3b2 100755 (executable)
--- a/quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py
+++ b/quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py
@@ -55,14 +55,10 @@ TAP_INTERFACE_PREFIX = "tap"
 BRIDGE_FS = "/sys/devices/virtual/net/"
 BRIDGE_NAME_PLACEHOLDER = "bridge_name"
 BRIDGE_INTERFACES_FS = BRIDGE_FS + BRIDGE_NAME_PLACEHOLDER + "/brif/"
-PORT_OPSTATUS_UPDATESQL = "UPDATE ports SET op_status = '%s' WHERE uuid = '%s'"
 DEVICE_NAME_PLACEHOLDER = "device_name"
 BRIDGE_PORT_FS_FOR_DEVICE = BRIDGE_FS + DEVICE_NAME_PLACEHOLDER + "/brport"
 VLAN_BINDINGS = "vlan_bindings"
 PORT_BINDINGS = "port_bindings"
-# Default inteval values
-DEFAULT_POLLING_INTERVAL = 2
-DEFAULT_RECONNECT_INTERVAL = 2
 
 
 class LinuxBridge:

diff --git a/quantum/plugins/metaplugin/agent/linuxbridge_quantum_agent.py b/quantum/plugins/metaplugin/agent/linuxbridge_quantum_agent.py
index 44e5bbdb819b4a042df88884254b9f03dc1b433a..646702ab31eba825722c63b2ca392a42b194a75e 100755 (executable)
--- a/quantum/plugins/metaplugin/agent/linuxbridge_quantum_agent.py
+++ b/quantum/plugins/metaplugin/agent/linuxbridge_quantum_agent.py
@@ -43,9 +43,6 @@ LOG = logging.getLogger(__name__)
 BRIDGE_NAME_PREFIX = "brq"
 VLAN_BINDINGS = "vlan_bindings"
 PORT_BINDINGS = "port_bindings"
-# Default inteval values
-DEFAULT_POLLING_INTERVAL = 2
-DEFAULT_RECONNECT_INTERVAL = 2
 
 
 class MetaLinuxBridgeQuantumAgent(lb.LinuxBridgeQuantumAgent):

diff --git a/quantum/plugins/metaplugin/agent/ovs_quantum_agent.py b/quantum/plugins/metaplugin/agent/ovs_quantum_agent.py
index afbd4c42eb6cce695004777d348a0b1a1e793807..e732924eb18c1bb1fdf37cc4305f380beb0f7fe8 100755 (executable)
--- a/quantum/plugins/metaplugin/agent/ovs_quantum_agent.py
+++ b/quantum/plugins/metaplugin/agent/ovs_quantum_agent.py
@@ -39,10 +39,6 @@ LOG = logging.getLogger(__name__)
 # A placeholder for dead vlans.
 DEAD_VLAN_TAG = "4095"
 
-# Default interval values
-DEFAULT_POLLING_INTERVAL = 2
-DEFAULT_RECONNECT_INTERVAL = 2
-
 
 class MetaOVSQuantumAgent(OVSQuantumAgent):
 

diff --git a/quantum/plugins/openvswitch/agent/ovs_quantum_agent.py b/quantum/plugins/openvswitch/agent/ovs_quantum_agent.py
index cf0f6d16f6678a068cdf5b6a25cc03453b9ff4a9..b87afff7edef01c5a183fd15bb0931d6f32190ed 100755 (executable)
--- a/quantum/plugins/openvswitch/agent/ovs_quantum_agent.py
+++ b/quantum/plugins/openvswitch/agent/ovs_quantum_agent.py
@@ -45,10 +45,6 @@ LOG = logging.getLogger(__name__)
 # A placeholder for dead vlans.
 DEAD_VLAN_TAG = "4095"
 
-# Default interval values
-DEFAULT_POLLING_INTERVAL = 2
-DEFAULT_RECONNECT_INTERVAL = 2
-
 
 # A class to represent a VIF (i.e., a port that has 'iface-id' and 'vif-mac'
 # attributes set).