Clean neutron driver interface for unused calls
This patch removes the unused calls from neutron driver. We can add them later when there is a real need. Change-Id: I8fca8b259ea9c9bd98f8b6e73195b032b660366f
This commit is contained in:
tengqm
parent
5e0e156ed8
commit
355e79ff86
|
|
@ -41,11 +41,6 @@ class NeutronClient(base.DriverBase):
|
|||
lb = self.conn.network.find_load_balancer(name_or_id, ignore_missing)
|
||||
return lb
|
||||
|
||||
@sdk.translate_exception
|
||||
def loadbalancer_list(self):
|
||||
lbs = [lb for lb in self.conn.network.load_balancers()]
|
||||
return lbs
|
||||
|
||||
@sdk.translate_exception
|
||||
def loadbalancer_create(self, vip_subnet_id, vip_address=None,
|
||||
admin_state_up=True, name=None, description=None):
|
||||
|
|
@ -71,17 +66,6 @@ class NeutronClient(base.DriverBase):
|
|||
lb_id, ignore_missing=ignore_missing)
|
||||
return
|
||||
|
||||
@sdk.translate_exception
|
||||
def listener_get(self, name_or_id, ignore_missing=False):
|
||||
listener = self.conn.network.find_listener(name_or_id,
|
||||
ignore_missing)
|
||||
return listener
|
||||
|
||||
@sdk.translate_exception
|
||||
def listener_list(self):
|
||||
listeners = [i for i in self.conn.network.listeners()]
|
||||
return listeners
|
||||
|
||||
@sdk.translate_exception
|
||||
def listener_create(self, loadbalancer_id, protocol, protocol_port,
|
||||
connection_limit=None,
|
||||
|
|
@ -110,17 +94,6 @@ class NeutronClient(base.DriverBase):
|
|||
ignore_missing=ignore_missing)
|
||||
return
|
||||
|
||||
@sdk.translate_exception
|
||||
def pool_get(self, name_or_id, ignore_missing=False):
|
||||
pool = self.conn.network.find_pool(name_or_id,
|
||||
ignore_missing)
|
||||
return pool
|
||||
|
||||
@sdk.translate_exception
|
||||
def pool_list(self):
|
||||
pools = [p for p in self.conn.network.pools()]
|
||||
return pools
|
||||
|
||||
@sdk.translate_exception
|
||||
def pool_create(self, lb_algorithm, listener_id, protocol,
|
||||
admin_state_up=True, name=None, description=None):
|
||||
|
|
@ -146,18 +119,6 @@ class NeutronClient(base.DriverBase):
|
|||
ignore_missing=ignore_missing)
|
||||
return
|
||||
|
||||
@sdk.translate_exception
|
||||
def pool_member_get(self, pool_id, name_or_id, ignore_missing=False):
|
||||
member = self.conn.network.find_pool_member(name_or_id,
|
||||
pool_id,
|
||||
ignore_missing)
|
||||
return member
|
||||
|
||||
@sdk.translate_exception
|
||||
def pool_member_list(self, pool_id):
|
||||
members = [m for m in self.conn.network.pool_members(pool_id)]
|
||||
return members
|
||||
|
||||
@sdk.translate_exception
|
||||
def pool_member_create(self, pool_id, address, protocol_port, subnet_id,
|
||||
weight=None, admin_state_up=True):
|
||||
|
|
@ -181,17 +142,6 @@ class NeutronClient(base.DriverBase):
|
|||
member_id, pool_id, ignore_missing=ignore_missing)
|
||||
return
|
||||
|
||||
@sdk.translate_exception
|
||||
def healthmonitor_get(self, name_or_id, ignore_missing=False):
|
||||
hm = self.conn.network.find_health_monitor(name_or_id,
|
||||
ignore_missing)
|
||||
return hm
|
||||
|
||||
@sdk.translate_exception
|
||||
def healthmonitor_list(self):
|
||||
hms = [hm for hm in self.conn.network.health_monitors()]
|
||||
return hms
|
||||
|
||||
@sdk.translate_exception
|
||||
def healthmonitor_create(self, hm_type, delay, timeout, max_retries,
|
||||
pool_id, admin_state_up=True,
|
||||
|
|
|
|||
|
|
@ -72,13 +72,6 @@ class TestNeutronV2Driver(base.SenlinTestCase):
|
|||
False)
|
||||
self.assertEqual(loadbalancer_obj, res)
|
||||
|
||||
def test_loadbalancer_list(self):
|
||||
loadbalancers = ['lb1', 'lb2']
|
||||
|
||||
self.conn.network.load_balancers.return_value = loadbalancers
|
||||
self.assertEqual(loadbalancers, self.nc.loadbalancer_list())
|
||||
self.conn.network.load_balancers.assert_called_once_with()
|
||||
|
||||
def test_loadbalancer_create(self):
|
||||
vip_subnet_id = 'ID1'
|
||||
lb_obj = mock.Mock()
|
||||
|
|
@ -116,23 +109,6 @@ class TestNeutronV2Driver(base.SenlinTestCase):
|
|||
self.conn.network.delete_load_balancer.assert_called_with(
|
||||
lb_id, ignore_missing=True)
|
||||
|
||||
def test_listener_get(self):
|
||||
name_or_id = 'listener_identifier'
|
||||
listener_obj = mock.Mock()
|
||||
|
||||
self.conn.network.find_listener.return_value = listener_obj
|
||||
res = self.nc.listener_get(name_or_id)
|
||||
self.conn.network.find_listener.assert_called_once_with(
|
||||
name_or_id, False)
|
||||
self.assertEqual(listener_obj, res)
|
||||
|
||||
def test_listener_list(self):
|
||||
listeners = ['listener1', 'listener2']
|
||||
|
||||
self.conn.network.listeners.return_value = listeners
|
||||
self.assertEqual(listeners, self.nc.listener_list())
|
||||
self.conn.network.listeners.assert_called_once_with()
|
||||
|
||||
def test_listener_create(self):
|
||||
loadbalancer_id = 'ID1'
|
||||
protocol = 'HTTP'
|
||||
|
|
@ -175,23 +151,6 @@ class TestNeutronV2Driver(base.SenlinTestCase):
|
|||
self.conn.network.delete_listener.assert_called_with(
|
||||
listener_id, ignore_missing=True)
|
||||
|
||||
def test_pool_get(self):
|
||||
name_or_id = 'pool_identifier'
|
||||
pool_obj = mock.Mock()
|
||||
|
||||
self.conn.network.find_pool.return_value = pool_obj
|
||||
res = self.nc.pool_get(name_or_id)
|
||||
self.conn.network.find_pool.assert_called_once_with(name_or_id,
|
||||
False)
|
||||
self.assertEqual(pool_obj, res)
|
||||
|
||||
def test_pool_list(self):
|
||||
pools = ['pool1', 'pool2']
|
||||
|
||||
self.conn.network.pools.return_value = pools
|
||||
self.assertEqual(pools, self.nc.pool_list())
|
||||
self.conn.network.pools.assert_called_once_with()
|
||||
|
||||
def test_pool_create(self):
|
||||
lb_algorithm = 'ROUND_ROBIN'
|
||||
listener_id = 'ID1'
|
||||
|
|
@ -233,25 +192,6 @@ class TestNeutronV2Driver(base.SenlinTestCase):
|
|||
self.conn.network.delete_pool.assert_called_with(
|
||||
pool_id, ignore_missing=True)
|
||||
|
||||
def test_pool_member_get(self):
|
||||
name_or_id = 'member_identifier'
|
||||
pool_id = 'ID1'
|
||||
member_obj = mock.Mock()
|
||||
|
||||
self.conn.network.find_pool_member.return_value = member_obj
|
||||
res = self.nc.pool_member_get(pool_id, name_or_id)
|
||||
self.conn.network.find_pool_member.assert_called_once_with(
|
||||
name_or_id, pool_id, False)
|
||||
self.assertEqual(member_obj, res)
|
||||
|
||||
def test_pool_member_list(self):
|
||||
pool_id = 'ID1'
|
||||
members = ['member1', 'member2']
|
||||
|
||||
self.conn.network.pool_members.return_value = members
|
||||
self.assertEqual(members, self.nc.pool_member_list(pool_id))
|
||||
self.conn.network.pool_members.assert_called_once_with(pool_id)
|
||||
|
||||
def test_pool_member_create(self):
|
||||
pool_id = 'ID1'
|
||||
address = '192.168.1.100'
|
||||
|
|
@ -295,23 +235,6 @@ class TestNeutronV2Driver(base.SenlinTestCase):
|
|||
self.conn.network.delete_pool_member.assert_called_with(
|
||||
member_id, pool_id, ignore_missing=True)
|
||||
|
||||
def test_healthmonitor_get(self):
|
||||
name_or_id = 'healthmonitor_identifier'
|
||||
healthmonitor_obj = mock.Mock()
|
||||
|
||||
self.conn.network.find_health_monitor.return_value = healthmonitor_obj
|
||||
res = self.nc.healthmonitor_get(name_or_id)
|
||||
self.conn.network.find_health_monitor.assert_called_once_with(
|
||||
name_or_id, False)
|
||||
self.assertEqual(healthmonitor_obj, res)
|
||||
|
||||
def test_healthmonitor_list(self):
|
||||
healthmonitors = ['hm1', 'hm2']
|
||||
|
||||
self.conn.network.health_monitors.return_value = healthmonitors
|
||||
self.assertEqual(healthmonitors, self.nc.healthmonitor_list())
|
||||
self.conn.network.health_monitors.assert_called_once_with()
|
||||
|
||||
def test_healthmonitor_create(self):
|
||||
hm_type = 'HTTP'
|
||||
delay = 30
|
||||
|
|
|
|||
Loading…
Reference in New Issue