From 69d1a6bb422fca4021c35db6ff92f877a5cd3bc9 Mon Sep 17 00:00:00 2001 From: yanyanhu Date: Thu, 21 May 2015 02:23:02 -0400 Subject: [PATCH] Correct the API base path of lbaas resources According to the reference of Neutron v2 API, the current API base path of lbaas resources is incorrect. This patch fixes this issue. Change-Id: I7f02ff85948f1107b430aef1d199145a1e11852b --- openstack/network/v2/health_monitor.py | 2 +- openstack/network/v2/listener.py | 2 +- openstack/network/v2/load_balancer.py | 2 +- openstack/network/v2/pool.py | 2 +- openstack/tests/unit/network/v2/test_health_monitor.py | 2 +- openstack/tests/unit/network/v2/test_listener.py | 2 +- openstack/tests/unit/network/v2/test_load_balancer.py | 2 +- openstack/tests/unit/network/v2/test_pool.py | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/openstack/network/v2/health_monitor.py b/openstack/network/v2/health_monitor.py index fdfcb81c..8d923dfb 100644 --- a/openstack/network/v2/health_monitor.py +++ b/openstack/network/v2/health_monitor.py @@ -17,7 +17,7 @@ from openstack import resource class HealthMonitor(resource.Resource): resource_key = 'healthmonitor' resources_key = 'healthmonitors' - base_path = '/healthmonitors' + base_path = '/lbaas/healthmonitors' service = network_service.NetworkService() # capabilities diff --git a/openstack/network/v2/listener.py b/openstack/network/v2/listener.py index a3e947f3..daa43d21 100644 --- a/openstack/network/v2/listener.py +++ b/openstack/network/v2/listener.py @@ -17,7 +17,7 @@ from openstack import resource class Listener(resource.Resource): resource_key = 'listener' resources_key = 'listeners' - base_path = '/listeners' + base_path = '/lbaas/listeners' service = network_service.NetworkService() # capabilities diff --git a/openstack/network/v2/load_balancer.py b/openstack/network/v2/load_balancer.py index 8623e27a..79a236f7 100644 --- a/openstack/network/v2/load_balancer.py +++ b/openstack/network/v2/load_balancer.py @@ -17,7 +17,7 @@ from openstack import resource class LoadBalancer(resource.Resource): resource_key = 'loadbalancer' resources_key = 'loadbalancers' - base_path = '/loadbalancers' + base_path = '/lbaas/loadbalancers' service = network_service.NetworkService() # capabilities diff --git a/openstack/network/v2/pool.py b/openstack/network/v2/pool.py index 83faf511..22692445 100644 --- a/openstack/network/v2/pool.py +++ b/openstack/network/v2/pool.py @@ -17,7 +17,7 @@ from openstack import resource class Pool(resource.Resource): resource_key = 'pool' resources_key = 'pools' - base_path = '/pools' + base_path = '/lbaas/pools' service = network_service.NetworkService() # capabilities diff --git a/openstack/tests/unit/network/v2/test_health_monitor.py b/openstack/tests/unit/network/v2/test_health_monitor.py index 6b531002..35f27f80 100644 --- a/openstack/tests/unit/network/v2/test_health_monitor.py +++ b/openstack/tests/unit/network/v2/test_health_monitor.py @@ -36,7 +36,7 @@ class TestHealthMonitor(testtools.TestCase): sot = health_monitor.HealthMonitor() self.assertEqual('healthmonitor', sot.resource_key) self.assertEqual('healthmonitors', sot.resources_key) - self.assertEqual('/healthmonitors', sot.base_path) + self.assertEqual('/lbaas/healthmonitors', sot.base_path) self.assertEqual('network', sot.service.service_type) self.assertTrue(sot.allow_create) self.assertTrue(sot.allow_retrieve) diff --git a/openstack/tests/unit/network/v2/test_listener.py b/openstack/tests/unit/network/v2/test_listener.py index 298718a1..48e21c53 100644 --- a/openstack/tests/unit/network/v2/test_listener.py +++ b/openstack/tests/unit/network/v2/test_listener.py @@ -34,7 +34,7 @@ class TestListener(testtools.TestCase): sot = listener.Listener() self.assertEqual('listener', sot.resource_key) self.assertEqual('listeners', sot.resources_key) - self.assertEqual('/listeners', sot.base_path) + self.assertEqual('/lbaas/listeners', sot.base_path) self.assertEqual('network', sot.service.service_type) self.assertTrue(sot.allow_create) self.assertTrue(sot.allow_retrieve) diff --git a/openstack/tests/unit/network/v2/test_load_balancer.py b/openstack/tests/unit/network/v2/test_load_balancer.py index d46f69b7..8421b2b8 100644 --- a/openstack/tests/unit/network/v2/test_load_balancer.py +++ b/openstack/tests/unit/network/v2/test_load_balancer.py @@ -31,7 +31,7 @@ class TestLoadBalancer(testtools.TestCase): sot = load_balancer.LoadBalancer() self.assertEqual('loadbalancer', sot.resource_key) self.assertEqual('loadbalancers', sot.resources_key) - self.assertEqual('/loadbalancers', sot.base_path) + self.assertEqual('/lbaas/loadbalancers', sot.base_path) self.assertEqual('network', sot.service.service_type) self.assertTrue(sot.allow_create) self.assertTrue(sot.allow_retrieve) diff --git a/openstack/tests/unit/network/v2/test_pool.py b/openstack/tests/unit/network/v2/test_pool.py index c48e457e..01c2f2c3 100644 --- a/openstack/tests/unit/network/v2/test_pool.py +++ b/openstack/tests/unit/network/v2/test_pool.py @@ -36,7 +36,7 @@ class TestPool(testtools.TestCase): sot = pool.Pool() self.assertEqual('pool', sot.resource_key) self.assertEqual('pools', sot.resources_key) - self.assertEqual('/pools', sot.base_path) + self.assertEqual('/lbaas/pools', sot.base_path) self.assertEqual('network', sot.service.service_type) self.assertTrue(sot.allow_create) self.assertTrue(sot.allow_retrieve)