diff --git a/openstack/network/v2/extension.py b/openstack/network/v2/extension.py index b6f53378..3d5d3495 100644 --- a/openstack/network/v2/extension.py +++ b/openstack/network/v2/extension.py @@ -17,7 +17,7 @@ from openstack import resource class Extension(resource.Resource): resource_key = 'extension' resources_key = 'extensions' - base_path = '/v2.0/extensions' + base_path = '/extensions' service = network_service.NetworkService() # capabilities diff --git a/openstack/network/v2/floating_ip.py b/openstack/network/v2/floating_ip.py index 5a83ff61..e7a39eae 100644 --- a/openstack/network/v2/floating_ip.py +++ b/openstack/network/v2/floating_ip.py @@ -20,7 +20,7 @@ class FloatingIP(resource.Resource): resource_name = "floating ip" resource_key = 'floatingip' resources_key = 'floatingips' - base_path = '/v2.0/floatingips' + base_path = '/floatingips' service = network_service.NetworkService() # capabilities diff --git a/openstack/network/v2/health_monitor.py b/openstack/network/v2/health_monitor.py index c0745034..dc54622e 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 = '/v2.0/healthmonitors' + base_path = '/healthmonitors' service = network_service.NetworkService() # capabilities diff --git a/openstack/network/v2/listener.py b/openstack/network/v2/listener.py index 769bb014..bca25097 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 = '/v2.0/listeners' + base_path = '/listeners' service = network_service.NetworkService() # capabilities diff --git a/openstack/network/v2/load_balancer.py b/openstack/network/v2/load_balancer.py index def3a9bc..513c72b5 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 = '/v2.0/loadbalancers' + base_path = '/loadbalancers' service = network_service.NetworkService() # capabilities diff --git a/openstack/network/v2/metering_label.py b/openstack/network/v2/metering_label.py index e699e209..b0566567 100644 --- a/openstack/network/v2/metering_label.py +++ b/openstack/network/v2/metering_label.py @@ -17,7 +17,7 @@ from openstack import resource class MeteringLabel(resource.Resource): resource_key = 'metering_label' resources_key = 'metering_labels' - base_path = '/v2.0/metering-labels' + base_path = '/metering-labels' service = network_service.NetworkService() # capabilities diff --git a/openstack/network/v2/metering_label_rule.py b/openstack/network/v2/metering_label_rule.py index c978c8d7..0f8b150a 100644 --- a/openstack/network/v2/metering_label_rule.py +++ b/openstack/network/v2/metering_label_rule.py @@ -17,7 +17,7 @@ from openstack import resource class MeteringLabelRule(resource.Resource): resource_key = 'metering_label_rule' resources_key = 'metering_label_rules' - base_path = '/v2.0/metering-label-rules' + base_path = '/metering-label-rules' service = network_service.NetworkService() # capabilities diff --git a/openstack/network/v2/network.py b/openstack/network/v2/network.py index 88068f88..6aa52030 100644 --- a/openstack/network/v2/network.py +++ b/openstack/network/v2/network.py @@ -17,7 +17,7 @@ from openstack import resource class Network(resource.Resource): resource_key = 'network' resources_key = 'networks' - base_path = '/v2.0/networks' + base_path = '/networks' service = network_service.NetworkService() # capabilities diff --git a/openstack/network/v2/pool.py b/openstack/network/v2/pool.py index c54213c6..c3cc872f 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 = '/v2.0/pools' + base_path = '/pools' service = network_service.NetworkService() # capabilities diff --git a/openstack/network/v2/pool_member.py b/openstack/network/v2/pool_member.py index 0baaaa26..67b61e57 100644 --- a/openstack/network/v2/pool_member.py +++ b/openstack/network/v2/pool_member.py @@ -17,7 +17,7 @@ from openstack import resource class PoolMember(resource.Resource): resource_key = 'member' resources_key = 'members' - base_path = '/v2.0/pools/%(pool_id)s/members' + base_path = '/pools/%(pool_id)s/members' service = network_service.NetworkService() # capabilities diff --git a/openstack/network/v2/port.py b/openstack/network/v2/port.py index af9b592a..eb650ba1 100644 --- a/openstack/network/v2/port.py +++ b/openstack/network/v2/port.py @@ -17,7 +17,7 @@ from openstack import resource class Port(resource.Resource): resource_key = 'port' resources_key = 'ports' - base_path = '/v2.0/ports' + base_path = '/ports' service = network_service.NetworkService() # capabilities diff --git a/openstack/network/v2/quota.py b/openstack/network/v2/quota.py index f4b2521e..ebd07f51 100644 --- a/openstack/network/v2/quota.py +++ b/openstack/network/v2/quota.py @@ -17,7 +17,7 @@ from openstack import resource class Quota(resource.Resource): resource_key = 'quota' resources_key = 'quotas' - base_path = '/v2.0/quotas' + base_path = '/quotas' service = network_service.NetworkService() # capabilities diff --git a/openstack/network/v2/router.py b/openstack/network/v2/router.py index 4c41f34c..e1e55fc0 100644 --- a/openstack/network/v2/router.py +++ b/openstack/network/v2/router.py @@ -18,7 +18,7 @@ from openstack import utils class Router(resource.Resource): resource_key = 'router' resources_key = 'routers' - base_path = '/v2.0/routers' + base_path = '/routers' service = network_service.NetworkService() # capabilities diff --git a/openstack/network/v2/security_group.py b/openstack/network/v2/security_group.py index 95d17883..2d76ea22 100644 --- a/openstack/network/v2/security_group.py +++ b/openstack/network/v2/security_group.py @@ -18,7 +18,7 @@ from openstack import resource class SecurityGroup(resource.Resource): resource_key = 'security_group' resources_key = 'security_groups' - base_path = '/v2.0/security-groups' + base_path = '/security-groups' service = network_service.NetworkService() # capabilities diff --git a/openstack/network/v2/security_group_rule.py b/openstack/network/v2/security_group_rule.py index 5e89a1db..383a26f6 100644 --- a/openstack/network/v2/security_group_rule.py +++ b/openstack/network/v2/security_group_rule.py @@ -17,7 +17,7 @@ from openstack import resource class SecurityGroupRule(resource.Resource): resource_key = 'security_group_rule' resources_key = 'security_group_rules' - base_path = '/v2.0/security-group-rules' + base_path = '/security-group-rules' service = network_service.NetworkService() # capabilities diff --git a/openstack/network/v2/subnet.py b/openstack/network/v2/subnet.py index 980d4b67..f7a29e66 100644 --- a/openstack/network/v2/subnet.py +++ b/openstack/network/v2/subnet.py @@ -17,7 +17,7 @@ from openstack import resource class Subnet(resource.Resource): resource_key = 'subnet' resources_key = 'subnets' - base_path = '/v2.0/subnets' + base_path = '/subnets' service = network_service.NetworkService() # capabilities diff --git a/openstack/tests/network/v2/test_extension.py b/openstack/tests/network/v2/test_extension.py index a8719872..323a75c1 100644 --- a/openstack/tests/network/v2/test_extension.py +++ b/openstack/tests/network/v2/test_extension.py @@ -31,7 +31,7 @@ class TestExtension(testtools.TestCase): sot = extension.Extension() self.assertEqual('extension', sot.resource_key) self.assertEqual('extensions', sot.resources_key) - self.assertEqual('/v2.0/extensions', sot.base_path) + self.assertEqual('/extensions', sot.base_path) self.assertEqual('network', sot.service.service_type) self.assertFalse(sot.allow_create) self.assertFalse(sot.allow_retrieve) diff --git a/openstack/tests/network/v2/test_floating_ip.py b/openstack/tests/network/v2/test_floating_ip.py index 0dbb2d2f..acde4375 100644 --- a/openstack/tests/network/v2/test_floating_ip.py +++ b/openstack/tests/network/v2/test_floating_ip.py @@ -32,7 +32,7 @@ class TestFloatingIP(testtools.TestCase): sot = floating_ip.FloatingIP() self.assertEqual('floatingip', sot.resource_key) self.assertEqual('floatingips', sot.resources_key) - self.assertEqual('/v2.0/floatingips', sot.base_path) + self.assertEqual('/floatingips', 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/network/v2/test_health_monitor.py b/openstack/tests/network/v2/test_health_monitor.py index 7d38ec75..6b531002 100644 --- a/openstack/tests/network/v2/test_health_monitor.py +++ b/openstack/tests/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('/v2.0/healthmonitors', sot.base_path) + self.assertEqual('/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/network/v2/test_listener.py b/openstack/tests/network/v2/test_listener.py index e523e7ad..298718a1 100644 --- a/openstack/tests/network/v2/test_listener.py +++ b/openstack/tests/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('/v2.0/listeners', sot.base_path) + self.assertEqual('/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/network/v2/test_load_balancer.py b/openstack/tests/network/v2/test_load_balancer.py index 783163e3..d46f69b7 100644 --- a/openstack/tests/network/v2/test_load_balancer.py +++ b/openstack/tests/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('/v2.0/loadbalancers', sot.base_path) + self.assertEqual('/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/network/v2/test_metering_label.py b/openstack/tests/network/v2/test_metering_label.py index 312767d5..a2c91c73 100644 --- a/openstack/tests/network/v2/test_metering_label.py +++ b/openstack/tests/network/v2/test_metering_label.py @@ -29,7 +29,7 @@ class TestMeteringLabel(testtools.TestCase): sot = metering_label.MeteringLabel() self.assertEqual('metering_label', sot.resource_key) self.assertEqual('metering_labels', sot.resources_key) - self.assertEqual('/v2.0/metering-labels', sot.base_path) + self.assertEqual('/metering-labels', 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/network/v2/test_metering_label_rule.py b/openstack/tests/network/v2/test_metering_label_rule.py index 39462d79..08533f59 100644 --- a/openstack/tests/network/v2/test_metering_label_rule.py +++ b/openstack/tests/network/v2/test_metering_label_rule.py @@ -30,7 +30,7 @@ class TestMeteringLabelRule(testtools.TestCase): sot = metering_label_rule.MeteringLabelRule() self.assertEqual('metering_label_rule', sot.resource_key) self.assertEqual('metering_label_rules', sot.resources_key) - self.assertEqual('/v2.0/metering-label-rules', sot.base_path) + self.assertEqual('/metering-label-rules', 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/network/v2/test_network.py b/openstack/tests/network/v2/test_network.py index 95cf29d3..c8c34ca3 100644 --- a/openstack/tests/network/v2/test_network.py +++ b/openstack/tests/network/v2/test_network.py @@ -37,7 +37,7 @@ class TestNetwork(testtools.TestCase): sot = network.Network() self.assertEqual('network', sot.resource_key) self.assertEqual('networks', sot.resources_key) - self.assertEqual('/v2.0/networks', sot.base_path) + self.assertEqual('/networks', 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/network/v2/test_pool.py b/openstack/tests/network/v2/test_pool.py index a0ba9701..c48e457e 100644 --- a/openstack/tests/network/v2/test_pool.py +++ b/openstack/tests/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('/v2.0/pools', sot.base_path) + self.assertEqual('/pools', 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/network/v2/test_pool_member.py b/openstack/tests/network/v2/test_pool_member.py index 82646335..084ebb0c 100644 --- a/openstack/tests/network/v2/test_pool_member.py +++ b/openstack/tests/network/v2/test_pool_member.py @@ -33,7 +33,7 @@ class TestPoolMember(testtools.TestCase): sot = pool_member.PoolMember() self.assertEqual('member', sot.resource_key) self.assertEqual('members', sot.resources_key) - self.assertEqual('/v2.0/pools/%(pool_id)s/members', sot.base_path) + self.assertEqual('/pools/%(pool_id)s/members', 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/network/v2/test_port.py b/openstack/tests/network/v2/test_port.py index d3a63af9..6cf94fa5 100644 --- a/openstack/tests/network/v2/test_port.py +++ b/openstack/tests/network/v2/test_port.py @@ -43,7 +43,7 @@ class TestPort(testtools.TestCase): sot = port.Port() self.assertEqual('port', sot.resource_key) self.assertEqual('ports', sot.resources_key) - self.assertEqual('/v2.0/ports', sot.base_path) + self.assertEqual('/ports', 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/network/v2/test_quota.py b/openstack/tests/network/v2/test_quota.py index 73399ac9..394b5bce 100644 --- a/openstack/tests/network/v2/test_quota.py +++ b/openstack/tests/network/v2/test_quota.py @@ -31,7 +31,7 @@ class TestQuota(testtools.TestCase): sot = quota.Quota() self.assertEqual('quota', sot.resource_key) self.assertEqual('quotas', sot.resources_key) - self.assertEqual('/v2.0/quotas', sot.base_path) + self.assertEqual('/quotas', sot.base_path) self.assertEqual('network', sot.service.service_type) self.assertFalse(sot.allow_create) self.assertFalse(sot.allow_retrieve) diff --git a/openstack/tests/network/v2/test_router.py b/openstack/tests/network/v2/test_router.py index 4ec98d24..0dcc3854 100644 --- a/openstack/tests/network/v2/test_router.py +++ b/openstack/tests/network/v2/test_router.py @@ -32,7 +32,7 @@ class TestRouter(testtools.TestCase): sot = router.Router() self.assertEqual('router', sot.resource_key) self.assertEqual('routers', sot.resources_key) - self.assertEqual('/v2.0/routers', sot.base_path) + self.assertEqual('/routers', sot.base_path) self.assertEqual('network', sot.service.service_type) self.assertTrue(sot.allow_create) self.assertTrue(sot.allow_retrieve) @@ -60,7 +60,7 @@ class TestRouter(testtools.TestCase): self.assertEqual(response.body, sot.add_interface(sess, '3')) - url = 'v2.0/routers/IDENTIFIER/add_router_interface' + url = 'routers/IDENTIFIER/add_router_interface' body = {"subnet_id": "3"} sess.put.assert_called_with(url, service=sot.service, json=body) @@ -74,6 +74,6 @@ class TestRouter(testtools.TestCase): self.assertEqual(response.body, sot.remove_interface(sess, '3')) - url = 'v2.0/routers/IDENTIFIER/remove_router_interface' + url = 'routers/IDENTIFIER/remove_router_interface' body = {"subnet_id": "3"} sess.put.assert_called_with(url, service=sot.service, json=body) diff --git a/openstack/tests/network/v2/test_security_group.py b/openstack/tests/network/v2/test_security_group.py index d14157b1..6c7c435f 100644 --- a/openstack/tests/network/v2/test_security_group.py +++ b/openstack/tests/network/v2/test_security_group.py @@ -57,7 +57,7 @@ class TestSecurityGroup(testtools.TestCase): sot = security_group.SecurityGroup() self.assertEqual('security_group', sot.resource_key) self.assertEqual('security_groups', sot.resources_key) - self.assertEqual('/v2.0/security-groups', sot.base_path) + self.assertEqual('/security-groups', 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/network/v2/test_security_group_rule.py b/openstack/tests/network/v2/test_security_group_rule.py index ebeadcc2..056e44ee 100644 --- a/openstack/tests/network/v2/test_security_group_rule.py +++ b/openstack/tests/network/v2/test_security_group_rule.py @@ -35,7 +35,7 @@ class TestSecurityGroupRule(testtools.TestCase): sot = security_group_rule.SecurityGroupRule() self.assertEqual('security_group_rule', sot.resource_key) self.assertEqual('security_group_rules', sot.resources_key) - self.assertEqual('/v2.0/security-group-rules', sot.base_path) + self.assertEqual('/security-group-rules', 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/network/v2/test_subnet.py b/openstack/tests/network/v2/test_subnet.py index ae3c4b4c..a4c3e5b1 100644 --- a/openstack/tests/network/v2/test_subnet.py +++ b/openstack/tests/network/v2/test_subnet.py @@ -36,7 +36,7 @@ class TestSubnet(testtools.TestCase): sot = subnet.Subnet() self.assertEqual('subnet', sot.resource_key) self.assertEqual('subnets', sot.resources_key) - self.assertEqual('/v2.0/subnets', sot.base_path) + self.assertEqual('/subnets', sot.base_path) self.assertEqual('network', sot.service.service_type) self.assertTrue(sot.allow_create) self.assertTrue(sot.allow_retrieve)