Merge "Fix functional test for floatingip add/remove in ComputeV2"
This commit is contained in:
commit
8632c93d24
@ -13,7 +13,6 @@
|
|||||||
import time
|
import time
|
||||||
|
|
||||||
from tempest.lib.common.utils import data_utils
|
from tempest.lib.common.utils import data_utils
|
||||||
import testtools
|
|
||||||
|
|
||||||
from functional.common import test
|
from functional.common import test
|
||||||
from tempest.lib import exceptions
|
from tempest.lib import exceptions
|
||||||
@ -218,7 +217,6 @@ class ServerTests(test.TestCase):
|
|||||||
self.assertEqual("", raw_output)
|
self.assertEqual("", raw_output)
|
||||||
self.wait_for_status("ACTIVE")
|
self.wait_for_status("ACTIVE")
|
||||||
|
|
||||||
@testtools.skip('this test needs to be re-worked completely')
|
|
||||||
def test_server_attach_detach_floating_ip(self):
|
def test_server_attach_detach_floating_ip(self):
|
||||||
"""Test commands to attach and detach floating IP for server.
|
"""Test commands to attach and detach floating IP for server.
|
||||||
|
|
||||||
@ -234,12 +232,11 @@ class ServerTests(test.TestCase):
|
|||||||
"""
|
"""
|
||||||
self.wait_for_status("ACTIVE")
|
self.wait_for_status("ACTIVE")
|
||||||
# attach ip
|
# attach ip
|
||||||
opts = self.get_show_opts(["id", "ip"])
|
opts = self.get_show_opts(["id", "floating_ip_address"])
|
||||||
raw_output = self.openstack('ip floating create '
|
raw_output = self.openstack('ip floating create ' +
|
||||||
'--debug ' +
|
|
||||||
self.IP_POOL +
|
self.IP_POOL +
|
||||||
opts)
|
opts)
|
||||||
ipid, ip, rol = tuple(raw_output.split('\n'))
|
ip, ipid, rol = tuple(raw_output.split('\n'))
|
||||||
self.assertNotEqual("", ipid)
|
self.assertNotEqual("", ipid)
|
||||||
self.assertNotEqual("", ip)
|
self.assertNotEqual("", ip)
|
||||||
raw_output = self.openstack('ip floating add ' + ip + ' ' + self.NAME)
|
raw_output = self.openstack('ip floating add ' + ip + ' ' + self.NAME)
|
||||||
|
Loading…
x
Reference in New Issue
Block a user