From e4fccd1b9c8c60d1fbdea9f6e3fd3af0f8fc020b Mon Sep 17 00:00:00 2001 From: justin ljj Date: Thu, 16 Aug 2012 15:13:27 +0800 Subject: [PATCH] removed some unused global variable Fixes bug 1037082. Change-Id: Id8e5df04cc0183cd4b2a9ab23cd403a83a2db637 --- .../plugins/linuxbridge/agent/linuxbridge_quantum_agent.py | 4 ---- quantum/plugins/metaplugin/agent/linuxbridge_quantum_agent.py | 3 --- quantum/plugins/metaplugin/agent/ovs_quantum_agent.py | 4 ---- quantum/plugins/openvswitch/agent/ovs_quantum_agent.py | 4 ---- 4 files changed, 15 deletions(-) diff --git a/quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py b/quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py index ea3651a4f..78f09e449 100755 --- 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 44e5bbdb8..646702ab3 100755 --- 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 afbd4c42e..e732924eb 100755 --- 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 cf0f6d16f..b87afff7e 100755 --- 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). -- 2.45.2