From ff007a57efa82bc73cbe4a1e60b1cde42c7efa82 Mon Sep 17 00:00:00 2001 From: YAMAMOTO Takashi Date: Thu, 5 Jun 2014 16:03:28 +0900 Subject: [PATCH] ovs, ofagent: Remove dead code Remove "class Port", which seems like a leftover from the old days when agents had direct database accesses. Change-Id: Ibc0bf5ab48f08ad620f87eb4952c7ff0f4701fda Closes-Bug: #1326666 --- .../ofagent/agent/ofa_neutron_agent.py | 29 ------------------ .../openvswitch/agent/ovs_neutron_agent.py | 30 ------------------- 2 files changed, 59 deletions(-) diff --git a/neutron/plugins/ofagent/agent/ofa_neutron_agent.py b/neutron/plugins/ofagent/agent/ofa_neutron_agent.py index c84e67c97c5..5a0b0416d02 100644 --- a/neutron/plugins/ofagent/agent/ofa_neutron_agent.py +++ b/neutron/plugins/ofagent/agent/ofa_neutron_agent.py @@ -71,35 +71,6 @@ class LocalVLANMapping: self.segmentation_id)) -class Port(object): - """Represents a neutron port. - - Class stores port data in a ORM-free way, so attributres are - still available even if a row has been deleted. - """ - - def __init__(self, p): - self.id = p.id - self.network_id = p.network_id - self.device_id = p.device_id - self.admin_state_up = p.admin_state_up - self.status = p.status - - def __eq__(self, other): - """Compare only fields that will cause us to re-wire.""" - try: - return (other and self.id == other.id - and self.admin_state_up == other.admin_state_up) - except Exception: - return False - - def __ne__(self, other): - return not self.__eq__(other) - - def __hash__(self): - return hash(self.id) - - class OVSBridge(ovs_lib.OVSBridge): def __init__(self, br_name, root_helper, ryuapp): super(OVSBridge, self).__init__(br_name, root_helper) diff --git a/neutron/plugins/openvswitch/agent/ovs_neutron_agent.py b/neutron/plugins/openvswitch/agent/ovs_neutron_agent.py index c93e872c3e5..101a95247cb 100644 --- a/neutron/plugins/openvswitch/agent/ovs_neutron_agent.py +++ b/neutron/plugins/openvswitch/agent/ovs_neutron_agent.py @@ -70,36 +70,6 @@ class LocalVLANMapping: self.segmentation_id)) -class Port(object): - """Represents a neutron port. - - Class stores port data in a ORM-free way, so attributes are - still available even if a row has been deleted. - """ - - def __init__(self, p): - self.id = p.id - self.network_id = p.network_id - self.device_id = p.device_id - self.admin_state_up = p.admin_state_up - self.status = p.status - - def __eq__(self, other): - '''Compare only fields that will cause us to re-wire.''' - try: - return (self and other - and self.id == other.id - and self.admin_state_up == other.admin_state_up) - except Exception: - return False - - def __ne__(self, other): - return not self.__eq__(other) - - def __hash__(self): - return hash(self.id) - - class OVSPluginApi(agent_rpc.PluginApi, sg_rpc.SecurityGroupServerRpcApiMixin): pass