summaryrefslogtreecommitdiff
path: root/functional/tests/compute/v2/test_server.py
diff options
context:
space:
mode:
authorTang Chen <chen.tang@easystack.cn>2016-06-17 15:06:40 +0800
committerTang Chen <chen.tang@easystack.cn>2016-07-20 13:37:48 +0800
commit0aa2304f38da0696576827fc4d71f2cf7cc13ad6 (patch)
tree06913a21f43ff5aef1851a9ae955509816c89f1a /functional/tests/compute/v2/test_server.py
parent07e97b1a8ab76a253a483a5290bcf93fa41c7cc4 (diff)
downloadpython-openstackclient-0aa2304f38da0696576827fc4d71f2cf7cc13ad6.tar.gz
Transfer "ip floating CRUD" to "floating ip CRUD"
This patch does the following things to transfer "ip floating xxx" to "floating ip xxx": * Add new command "floating ip create/delete/list/show", and doc. * Deprecate "ip floating create/delete/list/show" command. Change-Id: Ib071acaac81988431244e858bddafa7f93403df5 Implements: blueprint rework-ip-commands Closes-bug: 1555990 Co-Authored-By: Dean Troyer <dtroyer@gmail.com>
Diffstat (limited to 'functional/tests/compute/v2/test_server.py')
-rw-r--r--functional/tests/compute/v2/test_server.py11
1 files changed, 6 insertions, 5 deletions
diff --git a/functional/tests/compute/v2/test_server.py b/functional/tests/compute/v2/test_server.py
index 511ac372..a9d0e9c1 100644
--- a/functional/tests/compute/v2/test_server.py
+++ b/functional/tests/compute/v2/test_server.py
@@ -249,24 +249,25 @@ class ServerTests(test.TestCase):
self.wait_for_status("ACTIVE")
# attach ip
opts = self.get_opts(["id", "floating_ip_address"])
- raw_output = self.openstack('ip floating create ' +
+ raw_output = self.openstack('floating ip create ' +
self.IP_POOL +
opts)
ip, ipid, rol = tuple(raw_output.split('\n'))
self.assertNotEqual("", ipid)
self.assertNotEqual("", ip)
- raw_output = self.openstack('ip floating add ' + ip + ' ' + self.NAME)
+ raw_output = self.openstack('server add floating ip ' + self.NAME +
+ ' ' + ip)
self.assertEqual("", raw_output)
raw_output = self.openstack('server show ' + self.NAME)
self.assertIn(ip, raw_output)
# detach ip
- raw_output = self.openstack('ip floating remove ' + ip + ' ' +
- self.NAME)
+ raw_output = self.openstack('server remove floating ip ' + self.NAME +
+ ' ' + ip)
self.assertEqual("", raw_output)
raw_output = self.openstack('server show ' + self.NAME)
self.assertNotIn(ip, raw_output)
- raw_output = self.openstack('ip floating delete ' + ipid)
+ raw_output = self.openstack('floating ip delete ' + ipid)
self.assertEqual("", raw_output)
def test_server_reboot(self):