Merge "Refactor identity"
diff --git a/tempest/common/utils/data_utils.py b/tempest/common/utils/data_utils.py
index 3a7661c..7c6a58b 100644
--- a/tempest/common/utils/data_utils.py
+++ b/tempest/common/utils/data_utils.py
@@ -60,7 +60,7 @@
def parse_image_id(image_ref):
"""Return the image id from a given image ref."""
- return image_ref.rsplit('/')[-1]
+ return image_ref.rsplit('/')[-1]
def arbitrary_string(size=4, base_text=None):
diff --git a/tempest/services/boto/__init__.py b/tempest/services/boto/__init__.py
index 83bf1f9..f744d9d 100644
--- a/tempest/services/boto/__init__.py
+++ b/tempest/services/boto/__init__.py
@@ -96,4 +96,4 @@
else:
raise InvalidConfiguration(
"Unable to get access and secret keys")
- return self.connect_method(**self.connection_data)
+ return self.connect_method(**self.connection_data)
diff --git a/tempest/tests/boto/__init__.py b/tempest/tests/boto/__init__.py
index 62918c2..ec51b18 100644
--- a/tempest/tests/boto/__init__.py
+++ b/tempest/tests/boto/__init__.py
@@ -85,7 +85,7 @@
s3client = openstack.s3_client
try:
s3client.get_bucket("^INVALID*#()@INVALID.")
- except boto.exception.BotoServerError as exc:
+ except boto.exception.BotoServerError as exc:
if exc.status == 403:
_cred_sub_check(s3client.connection_data)
except Exception as exc:
diff --git a/tempest/tests/compute/servers/test_servers.py b/tempest/tests/compute/servers/test_servers.py
index 3566ef4..8054c1f 100644
--- a/tempest/tests/compute/servers/test_servers.py
+++ b/tempest/tests/compute/servers/test_servers.py
@@ -132,14 +132,14 @@
#Update the IPv4 and IPv6 access addresses
resp, body = self.client.update_server(server['id'],
accessIPv4='1.1.1.1',
- accessIPv6='::babe:2.2.2.2')
+ accessIPv6='::babe:202:202')
self.assertEqual(200, resp.status)
self.client.wait_for_server_status(server['id'], 'ACTIVE')
#Verify the access addresses have been updated
resp, server = self.client.get_server(server['id'])
self.assertEqual('1.1.1.1', server['accessIPv4'])
- self.assertEqual('::babe:2.2.2.2', server['accessIPv6'])
+ self.assertEqual('::babe:202:202', server['accessIPv6'])
#Teardown
finally:
diff --git a/tempest/tests/compute/servers/test_servers_negative.py b/tempest/tests/compute/servers/test_servers_negative.py
index dfe5944..f7624b3 100644
--- a/tempest/tests/compute/servers/test_servers_negative.py
+++ b/tempest/tests/compute/servers/test_servers_negative.py
@@ -176,7 +176,7 @@
# Pass invalid network uuid while creating a server
server_name = rand_name('server')
- networks = [{'fixed_ip': '10.0.1.1', 'uuid':'a-b-c-d-e-f-g-h-i-j'}]
+ networks = [{'fixed_ip': '10.0.1.1', 'uuid': 'a-b-c-d-e-f-g-h-i-j'}]
self.assertRaises(exceptions.BadRequest,
self.create_server_with_extras,