From 84f07ec41db963725c55aba40d9048f4add425c9 Mon Sep 17 00:00:00 2001
From: YAMAMOTO Takashi <yamamoto@midokura.com>
Date: Thu, 1 Oct 2015 23:16:45 +0900
Subject: [PATCH] Remove some commented out code

Change-Id: I613a33c81015faa4f146f885beb09dffff4086c0
---
 neutron_taas/db/taas_db.py                          | 13 -------------
 neutron_taas/services/taas/agents/ovs/agent.py      |  1 -
 neutron_taas/services/taas/agents/taas_agent_api.py |  1 -
 neutron_taas/services/taas/taas_plugin.py           |  2 --
 4 files changed, 17 deletions(-)

diff --git a/neutron_taas/db/taas_db.py b/neutron_taas/db/taas_db.py
index fc9db3fa..73aabb42 100755
--- a/neutron_taas/db/taas_db.py
+++ b/neutron_taas/db/taas_db.py
@@ -18,7 +18,6 @@ from neutron.db import common_db_mixin as base_db
 from neutron.db import model_base
 from neutron.db import models_v2
 from neutron import manager
-# from neutron.openstack.common import uuidutils
 from neutron_taas.extensions import taas
 from oslo_log import log as logging
 from oslo_utils import uuidutils
@@ -37,18 +36,6 @@ class TapService(model_base.BASEV2, models_v2.HasId, models_v2.HasTenant):
     description = sa.Column(sa.String(1024), nullable=True)
     port_id = sa.Column(sa.String(36), nullable=False)
     network_id = sa.Column(sa.String(36), nullable=True)
-'''
-    def __init__(self, id, tenant_id, name, description, port_id, network_id):
-        self.id = id
-        self.tenant_id = tenant_id
-        self.name = name
-        self.description = description
-        self.port_id = port_id
-        self.network_id = network_id
-
-    def __repr__(self):
-        return "<TapService> %s" % self.id
-'''
 
 
 class TapFlow(model_base.BASEV2, models_v2.HasId, models_v2.HasTenant):
diff --git a/neutron_taas/services/taas/agents/ovs/agent.py b/neutron_taas/services/taas/agents/ovs/agent.py
index 75788eb9..fe9c9b72 100755
--- a/neutron_taas/services/taas/agents/ovs/agent.py
+++ b/neutron_taas/services/taas/agents/ovs/agent.py
@@ -25,7 +25,6 @@ from neutron.agent.common import config
 from neutron.common import config as common_config
 from neutron.common import rpc as n_rpc
 from neutron.common import topics
-# from neutron.openstack.common import service
 from neutron_taas.services.taas.agents.ovs import taas_ovs_agent
 
 
diff --git a/neutron_taas/services/taas/agents/taas_agent_api.py b/neutron_taas/services/taas/agents/taas_agent_api.py
index 48840625..c2768533 100755
--- a/neutron_taas/services/taas/agents/taas_agent_api.py
+++ b/neutron_taas/services/taas/agents/taas_agent_api.py
@@ -14,7 +14,6 @@
 # under the License.
 
 from oslo_config import cfg
-# from oslo_messaging import messaging
 import oslo_messaging as messaging
 
 from neutron.common import rpc as n_rpc
diff --git a/neutron_taas/services/taas/taas_plugin.py b/neutron_taas/services/taas/taas_plugin.py
index f2ca9e72..1ab4590d 100755
--- a/neutron_taas/services/taas/taas_plugin.py
+++ b/neutron_taas/services/taas/taas_plugin.py
@@ -15,7 +15,6 @@
 
 
 from oslo_config import cfg
-# from oslo import messaging
 import oslo_messaging as messaging
 
 from neutron.common import rpc as n_rpc
@@ -235,7 +234,6 @@ class TaasPlugin(taas_db.Tass_db_Mixin):
         LOG.debug("delete_tap_flow() called")
 
         tf = self.get_tap_flow(context, id)
-        # ts = self.get_tap_service(context, tf['tap_service_id'])
 
         taas_id = (self.get_tap_id_association(
             context,