summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIlya Alekseyev <ialekseev@griddynamics.com>2011-06-25 00:33:40 +0400
committerIlya Alekseyev <ialekseev@griddynamics.com>2011-06-25 00:33:40 +0400
commitcbd0622ffbd021d404270be8b35b3e4839dd0ea0 (patch)
tree94222448c77c2334a1b156bfa3b68a06854e53e6
parent153621b9f3a4480b544de5ccd2a96bf4d63adbc9 (diff)
downloadnova-cbd0622ffbd021d404270be8b35b3e4839dd0ea0.tar.gz
nova-cbd0622ffbd021d404270be8b35b3e4839dd0ea0.tar.xz
nova-cbd0622ffbd021d404270be8b35b3e4839dd0ea0.zip
some tests
-rw-r--r--Authors2
-rw-r--r--nova/tests/api/openstack/contrib/test_floating_ips.py15
2 files changed, 12 insertions, 5 deletions
diff --git a/Authors b/Authors
index bf2ba81d9..09064051d 100644
--- a/Authors
+++ b/Authors
@@ -29,7 +29,7 @@ Ewan Mellor <ewan.mellor@citrix.com>
Gabe Westmaas <gabe.westmaas@rackspace.com>
Hisaharu Ishii <ishii.hisaharu@lab.ntt.co.jp>
Hisaki Ohara <hisaki.ohara@intel.com>
-Ilya Alekseyev <ilyaalekseyev@acm.org>
+Ilya Alekseyev <ilyaalekseyev@acm.org> <ilya@oscloud.ru>
Isaku Yamahata <yamahata@valinux.co.jp>
Jason Cannavale <jason.cannavale@rackspace.com>
Jason Koelker <jason@koelker.net>
diff --git a/nova/tests/api/openstack/contrib/test_floating_ips.py b/nova/tests/api/openstack/contrib/test_floating_ips.py
index 5dca0b5ea..55bd8c1a1 100644
--- a/nova/tests/api/openstack/contrib/test_floating_ips.py
+++ b/nova/tests/api/openstack/contrib/test_floating_ips.py
@@ -20,6 +20,7 @@ from nova.tests.api.openstack import fakes
import stubout
import webob
+import json
from nova.api.openstack.contrib.floating_ips import \
_translate_floating_ip_view
@@ -30,8 +31,8 @@ def network_api_get():
def network_api_list():
pass
-def network_api_allocate():
- pass
+def network_api_allocate(context):
+ return '10.10.10.10'
def network_api_release():
pass
@@ -47,7 +48,7 @@ class FloatingIpTest(test.TestCase):
address = "10.10.10.10"
def _create_floating_ip(self):
- """Create a volume object."""
+ """Create a floating ip object."""
host = "fake_host"
return db.floating_ip_create(self.context,
{'address': self.address,
@@ -100,7 +101,13 @@ class FloatingIpTest(test.TestCase):
pass
def test_floating_ip_allocate(self):
- pass
+ req = webob.Request.blank('/v1.1/floating_ips')
+ req.method = 'POST'
+ res = req.get_response(fakes.wsgi_app())
+ self.assertEqual(res.status_int, 200)
+ ip = json.loads(res.body)['allocated']
+ expected = '10.10.10.10'
+ self.assertEqual(ip, expected)
def test_floating_ip_release(self):
pass