summaryrefslogtreecommitdiffstats
path: root/nova/tests
diff options
context:
space:
mode:
authorBrian Waldon <brian.waldon@rackspace.com>2011-07-14 14:23:23 -0400
committerBrian Waldon <brian.waldon@rackspace.com>2011-07-14 14:23:23 -0400
commit38233d72aff36fbdb0fd49755458b7b5100366e1 (patch)
tree29dbf1221d7c243568b46121d73b6c82b19e2c1a /nova/tests
parent27b8d75f9b666ce08472270b38685d8e36a612d8 (diff)
exposing floating ips
Diffstat (limited to 'nova/tests')
-rw-r--r--nova/tests/api/openstack/test_servers.py16
1 files changed, 14 insertions, 2 deletions
diff --git a/nova/tests/api/openstack/test_servers.py b/nova/tests/api/openstack/test_servers.py
index 7a2904520..3c48a2f81 100644
--- a/nova/tests/api/openstack/test_servers.py
+++ b/nova/tests/api/openstack/test_servers.py
@@ -484,7 +484,12 @@ class ServersTest(test.TestCase):
{
'network': {'label': 'network_2'},
'fixed_ips': [
- {'address': '172.19.0.1'},
+ {
+ 'address': '172.19.0.1',
+ 'floating_ips': [
+ {'address': '1.2.3.4'},
+ ],
+ },
{'address': '172.19.0.2'},
],
},
@@ -507,6 +512,7 @@ class ServersTest(test.TestCase):
],
'network_2': [
{'version': 4, 'addr': '172.19.0.1'},
+ {'version': 4, 'addr': '1.2.3.4'},
{'version': 4, 'addr': '172.19.0.2'},
],
},
@@ -526,7 +532,12 @@ class ServersTest(test.TestCase):
{
'network': {'label': 'network_2'},
'fixed_ips': [
- {'address': '172.19.0.1'},
+ {
+ 'address': '172.19.0.1',
+ 'floating_ips': [
+ {'address': '1.2.3.4'},
+ ],
+ },
{'address': '172.19.0.2'},
],
},
@@ -543,6 +554,7 @@ class ServersTest(test.TestCase):
expected = {
'network_2': [
{'version': 4, 'addr': '172.19.0.1'},
+ {'version': 4, 'addr': '1.2.3.4'},
{'version': 4, 'addr': '172.19.0.2'},
],
}