Removing a log parameter from the noop driver
We don't want to pass in a log object on amphora drivers. Change-Id: I4c8c099fbeea352ff9d47af077f807eab49b7347
This commit is contained in:
parent
86ec61f961
commit
1bb0402062
|
@ -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
|
||||
pass
|
||||
|
|
|
@ -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)
|
||||
|
|
|
@ -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'),
|
||||
|
|
Loading…
Reference in New Issue