Merge "Fix py3x errors in tempest testing"
This commit is contained in:
commit
19c9af6d28
|
@ -207,7 +207,7 @@ class BaseTestCase(manager.NetworkScenarioTest):
|
|||
|
||||
def _create_servers(self):
|
||||
for count in range(2):
|
||||
self.server = self._create_server(name=("server%s" % (count + 1)))
|
||||
self.server = self._create_server(name=(b"server%s" % (count + 1)))
|
||||
if count == 0:
|
||||
self.servers['primary'] = self.server['id']
|
||||
else:
|
||||
|
|
|
@ -38,7 +38,7 @@ class TestListenerBasic(base.BaseTestCase):
|
|||
|
||||
@test.services('compute', 'network')
|
||||
def test_listener_basic(self):
|
||||
self._create_server('server1')
|
||||
self._create_server(b'server1')
|
||||
self._start_servers()
|
||||
self._create_load_balancer()
|
||||
self._check_load_balancing()
|
||||
|
|
|
@ -33,7 +33,7 @@ class TestLoadBalancerBasic(base.BaseTestCase):
|
|||
5. Send NUM requests to the floating ip and check that they are shared
|
||||
between the two servers.
|
||||
"""
|
||||
self._create_server('server1')
|
||||
self._create_server(b'server1')
|
||||
self._start_servers()
|
||||
self._create_load_balancer()
|
||||
self._check_load_balancing()
|
||||
|
|
|
@ -42,7 +42,7 @@ class TestSessionPersistence(base.BaseTestCase):
|
|||
10. Turn session persistence off and check that the requests
|
||||
are again distributed according to the ROUND_ROBIN algorithm.
|
||||
"""
|
||||
self._create_server('server1')
|
||||
self._create_server(b'server1')
|
||||
self._start_servers()
|
||||
self._create_load_balancer(persistence_type="SOURCE_IP")
|
||||
self._check_source_ip_persistence()
|
||||
|
|
|
@ -38,7 +38,7 @@ class TestSharedPools(base.BaseTestCase):
|
|||
"""
|
||||
second_listener_port = 8080
|
||||
|
||||
self._create_server('server1')
|
||||
self._create_server(b'server1')
|
||||
self._start_servers()
|
||||
# automatically creates first listener on port 80
|
||||
self._create_load_balancer()
|
||||
|
|
Loading…
Reference in New Issue