openstack/deb-python-openstacksdk
Code Issues Proposed changes

Merge "Rename floatingip to floating_ip"

Browse Source
This commit is contained in:
Jenkins
2015-02-03 18:33:23 +00:00
committed by Gerrit Code Review
parent 01a4f899ff 5a64115c85
commit fac2e627b2
5 changed files with 42 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
openstack/network/v2/_proxy.py
View File

@@ -11,7 +11,7 @@
# under the License.
from openstack.network.v2 import extension
from openstack.network.v2 import floatingip
from openstack.network.v2 import floating_ip
from openstack.network.v2 import health_monitor
from openstack.network.v2 import listener
from openstack.network.v2 import load_balancer
@@ -40,25 +40,25 @@ class Proxy(object):
return extension.Extension.list(self.session)
def create_ip(self, **data):
return floatingip.FloatingIP(data).create(self.session)
return floating_ip.FloatingIP(data).create(self.session)
def delete_ip(self, **data):
floatingip.FloatingIP(**data).delete(self.session)
floating_ip.FloatingIP(**data).delete(self.session)
def find_available_ip(self):
return floatingip.FloatingIP.find_available(self.session)
return floating_ip.FloatingIP.find_available(self.session)
def find_ip(self, name_or_id):
return floatingip.FloatingIP.find(self.session, name_or_id)
return floating_ip.FloatingIP.find(self.session, name_or_id)
def get_ip(self, **data):
return floatingip.FloatingIP(**data).get(self.session)
return floating_ip.FloatingIP(**data).get(self.session)
def list_ips(self, **params):
return floatingip.FloatingIP.list(self.session, **params)
return floating_ip.FloatingIP.list(self.session, **params)
def update_ip(self, **data):
return floatingip.FloatingIP(**data).update(self.session)
return floating_ip.FloatingIP(**data).update(self.session)
def create_health_monitor(self, **data):
return health_monitor.HealthMonitor(data).create(self.session)

0
openstack/network/v2/floatingip.py → openstack/network/v2/floating_ip.py
View File

14
openstack/network/v2/thin.py
View File

@@ -37,7 +37,7 @@ Find a router and update the administrative state.
"""
from openstack.network.v2 import floatingip
from openstack.network.v2 import floating_ip
from openstack.network.v2 import network
from openstack.network.v2 import port
from openstack.network.v2 import router
@@ -48,12 +48,12 @@ from openstack.network.v2 import subnet
class Thin(object):
create_ip = floatingip.FloatingIP.create_by_id
delete_ip = floatingip.FloatingIP.delete_by_id
find_ip = floatingip.FloatingIP.find
get_ip = floatingip.FloatingIP.get_data_by_id
list_ips = floatingip.FloatingIP.list
update_ip = floatingip.FloatingIP.update_by_id
create_ip = floating_ip.FloatingIP.create_by_id
delete_ip = floating_ip.FloatingIP.delete_by_id
find_ip = floating_ip.FloatingIP.find
get_ip = floating_ip.FloatingIP.get_data_by_id
list_ips = floating_ip.FloatingIP.list
update_ip = floating_ip.FloatingIP.update_by_id
create_network = network.Network.create_by_id
delete_network = network.Network.delete_by_id

18
openstack/tests/network/v2/test_floatingip.py → openstack/tests/network/v2/test_floating_ip.py
View File

@@ -13,7 +13,7 @@
import mock
import testtools
from openstack.network.v2 import floatingip
from openstack.network.v2 import floating_ip
IDENTIFIER = '10.0.0.1'
EXAMPLE = {
@@ -29,7 +29,7 @@ EXAMPLE = {
class TestFloatingIP(testtools.TestCase):
def test_basic(self):
sot = floatingip.FloatingIP()
sot = floating_ip.FloatingIP()
self.assertEqual('floatingip', sot.resource_key)
self.assertEqual('floatingips', sot.resources_key)
self.assertEqual('/v2.0/floatingips', sot.base_path)
@@ -41,7 +41,7 @@ class TestFloatingIP(testtools.TestCase):
self.assertTrue(sot.allow_list)
def test_make_it(self):
sot = floatingip.FloatingIP(EXAMPLE)
sot = floating_ip.FloatingIP(EXAMPLE)
self.assertEqual(EXAMPLE['fixed_ip_address'], sot.fixed_ip_address)
self.assertEqual(EXAMPLE['floating_ip_address'],
sot.floating_ip_address)
@@ -58,24 +58,24 @@ class TestFloatingIP(testtools.TestCase):
mock_session.get = mock_get
data = {'floating_ip_address': '10.0.0.1'}
fake_response = mock.Mock()
fake_response.body = {floatingip.FloatingIP.resources_key: [data]}
fake_response.body = {floating_ip.FloatingIP.resources_key: [data]}
mock_get.return_value = fake_response
result = floatingip.FloatingIP.find_available(mock_session)
result = floating_ip.FloatingIP.find_available(mock_session)
self.assertEqual('10.0.0.1', result.id)
p = {'fields': 'floating_ip_address', 'port_id': ''}
mock_get.assert_called_with(floatingip.FloatingIP.base_path,
mock_get.assert_called_with(floating_ip.FloatingIP.base_path,
params=p,
service=floatingip.FloatingIP.service)
service=floating_ip.FloatingIP.service)
def test_find_available_nada(self):
mock_session = mock.Mock()
mock_get = mock.Mock()
mock_session.get = mock_get
fake_response = mock.Mock()
fake_response.body = {floatingip.FloatingIP.resources_key: []}
fake_response.body = {floating_ip.FloatingIP.resources_key: []}
mock_get.return_value = fake_response
self.assertEqual(None,
floatingip.FloatingIP.find_available(mock_session))
floating_ip.FloatingIP.find_available(mock_session))

33
openstack/tests/network/v2/test_proxy.py
View File

@@ -27,29 +27,32 @@ class TestNetworkProxy(test_proxy_base.TestProxyBase):
self.verify_list('openstack.network.v2.extension.Extension.list',
self.proxy.list_extensions)
def test_floatingip_create(self):
self.verify_create('openstack.network.v2.floatingip.FloatingIP.create',
self.proxy.create_ip)
def test_floating_ip_create(self):
self.verify_create(
'openstack.network.v2.floating_ip.FloatingIP.create',
self.proxy.create_ip)
def test_floatingip_delete(self):
self.verify_delete('openstack.network.v2.floatingip.FloatingIP.delete',
self.proxy.delete_ip)
def test_floating_ip_delete(self):
self.verify_delete(
'openstack.network.v2.floating_ip.FloatingIP.delete',
self.proxy.delete_ip)
def test_floatingip_find(self):
self.verify_find('openstack.network.v2.floatingip.FloatingIP.find',
def test_floating_ip_find(self):
self.verify_find('openstack.network.v2.floating_ip.FloatingIP.find',
self.proxy.find_ip)
def test_floatingip_get(self):
self.verify_get('openstack.network.v2.floatingip.FloatingIP.get',
def test_floating_ip_get(self):
self.verify_get('openstack.network.v2.floating_ip.FloatingIP.get',
self.proxy.get_ip)
def test_floatingip_list(self):
self.verify_list('openstack.network.v2.floatingip.FloatingIP.list',
def test_floating_ip_list(self):
self.verify_list('openstack.network.v2.floating_ip.FloatingIP.list',
self.proxy.list_ips)
def test_floatingip_update(self):
self.verify_update('openstack.network.v2.floatingip.FloatingIP.update',
self.proxy.update_ip)
def test_floating_ip_update(self):
self.verify_update(
'openstack.network.v2.floating_ip.FloatingIP.update',
self.proxy.update_ip)
def test_health_monitor_create(self):
self.verify_create(