From 1bb04020626e89414e23906ed139d4bfe5f426ee Mon Sep 17 00:00:00 2001
From: Michael Johnson <johnsom@hp.com>
Date: Thu, 9 Apr 2015 23:20:15 +0000
Subject: [PATCH] Removing a log parameter from the noop driver

We don't want to pass in a log object on amphora drivers.

Change-Id: I4c8c099fbeea352ff9d47af077f807eab49b7347
---
 octavia/amphorae/drivers/driver_base.py               | 11 +----------
 octavia/amphorae/drivers/noop_driver/driver.py        |  7 +------
 .../drivers/test_noop_amphoraloadbalancer_driver.py   |  5 +----
 3 files changed, 3 insertions(+), 20 deletions(-)

diff --git a/octavia/amphorae/drivers/driver_base.py b/octavia/amphorae/drivers/driver_base.py
index 83c6c4efe3..1d2a103967 100644
--- a/octavia/amphorae/drivers/driver_base.py
+++ b/octavia/amphorae/drivers/driver_base.py
@@ -19,15 +19,6 @@ import six
 
 @six.add_metaclass(abc.ABCMeta)
 class AmphoraLoadBalancerDriver(object):
-    @abc.abstractmethod
-    def get_logger(self):
-        """Return the logger to use.
-
-        This is a way to inject a custom logger for testing,etc.
-        :returns: the logger
-        """
-        pass
-
     @abc.abstractmethod
     def update(self, listener, vip):
         """Update the amphora with a new configuration
@@ -222,4 +213,4 @@ class StatsMixin(object):
         elements are named to keep it extsnsible for future versions
         awesome update code and code to send to ceilometer
         """
-        pass
\ No newline at end of file
+        pass
diff --git a/octavia/amphorae/drivers/noop_driver/driver.py b/octavia/amphorae/drivers/noop_driver/driver.py
index 5b0fccb60c..e24fc0f5fc 100644
--- a/octavia/amphorae/drivers/noop_driver/driver.py
+++ b/octavia/amphorae/drivers/noop_driver/driver.py
@@ -87,15 +87,10 @@ class NoopManager(object):
 
 
 class NoopAmphoraLoadBalancerDriver(driver_base.AmphoraLoadBalancerDriver):
-    def __init__(self, log):
+    def __init__(self):
         super(NoopAmphoraLoadBalancerDriver, self).__init__()
-        self.log = log
         self.driver = NoopManager()
 
-    def get_logger(self):
-
-        raise NotImplementedError
-
     def update(self, listener, vip):
 
         self.driver.update(listener, vip)
diff --git a/octavia/tests/unit/amphorae/drivers/test_noop_amphoraloadbalancer_driver.py b/octavia/tests/unit/amphorae/drivers/test_noop_amphoraloadbalancer_driver.py
index f33bf7f2a2..8b27cd5e0e 100644
--- a/octavia/tests/unit/amphorae/drivers/test_noop_amphoraloadbalancer_driver.py
+++ b/octavia/tests/unit/amphorae/drivers/test_noop_amphoraloadbalancer_driver.py
@@ -43,7 +43,7 @@ class NoopAmphoraLoadBalancerDriver(base.TestCase):
 
     def setUp(self):
         super(NoopAmphoraLoadBalancerDriver, self).setUp()
-        self.driver = driver.NoopAmphoraLoadBalancerDriver(LOG)
+        self.driver = driver.NoopAmphoraLoadBalancerDriver()
         self.listener = models.Listener()
         self.listener.protocol_port = 80
         self.vip = models.Vip()
@@ -51,9 +51,6 @@ class NoopAmphoraLoadBalancerDriver(base.TestCase):
         self.amphora = models.Amphora()
         self.amphora.id = self.FAKE_UUID_1
 
-    def test_get_logger(self):
-        self.assertEqual(LOG, self.driver.log)
-
     def test_update(self):
         self.driver.update(self.listener, self.vip)
         self.assertEqual((self.listener, self.vip, 'active'),