openstack/tempest
Code Issues Proposed changes

White space after # in the tempest/services

Browse Source 
Fixing a style issue related to comments in services.

Change-Id: I0fc019ce9fe6ddb8037cdc6187df6015c160a9d7
This commit is contained in:
Attila Fazekas
2013-08-01 16:59:06 +02:00
parent 355b89fbb7
commit a8b5fe7b48
11 changed files with 30 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tempest/services/botoclients.py
View File

@@ -180,7 +180,7 @@ class APIClientEC2(BotoClientBase):
:return: Returns with the first available zone name :return: Returns with the first available zone name
""" """
for zone in self.get_all_zones(): for zone in self.get_all_zones():
#NOTE(afazekas): zone.region_name was None # NOTE(afazekas): zone.region_name was None
if (zone.state == "available" and if (zone.state == "available" and
zone.region.name == self.connection_data["region"].name): zone.region.name == self.connection_data["region"].name):
return zone.name return zone.name

6
tempest/services/compute/json/flavors_client.py
View File

@@ -79,9 +79,9 @@ class FlavorsClientJSON(RestClient):
return self.delete("flavors/%s" % str(flavor_id)) return self.delete("flavors/%s" % str(flavor_id))
def is_resource_deleted(self, id): def is_resource_deleted(self, id):
#Did not use get_flavor_details(id) for verification as it gives # Did not use get_flavor_details(id) for verification as it gives
#200 ok even for deleted id. LP #981263 # 200 ok even for deleted id. LP #981263
#we can remove the loop here and use get by ID when bug gets sortedout # we can remove the loop here and use get by ID when bug gets sortedout
resp, flavors = self.list_flavors_with_detail() resp, flavors = self.list_flavors_with_detail()
for flavor in flavors: for flavor in flavors:
if flavor['id'] == id: if flavor['id'] == id:

10
tempest/services/compute/json/keypairs_client.py
View File

@@ -30,11 +30,11 @@ class KeyPairsClientJSON(RestClient):
def list_keypairs(self): def list_keypairs(self):
resp, body = self.get("os-keypairs") resp, body = self.get("os-keypairs")
body = json.loads(body) body = json.loads(body)
#Each returned keypair is embedded within an unnecessary 'keypair' # Each returned keypair is embedded within an unnecessary 'keypair'
#element which is a deviation from other resources like floating-ips, # element which is a deviation from other resources like floating-ips,
#servers, etc. A bug? # servers, etc. A bug?
#For now we shall adhere to the spec, but the spec for keypairs # For now we shall adhere to the spec, but the spec for keypairs
#is yet to be found # is yet to be found
return resp, body['keypairs'] return resp, body['keypairs']
def get_keypair(self, key_name): def get_keypair(self, key_name):

6
tempest/services/compute/xml/flavors_client.py
View File

@@ -117,9 +117,9 @@ class FlavorsClientXML(RestClientXML):
return self.delete("flavors/%s" % str(flavor_id), self.headers) return self.delete("flavors/%s" % str(flavor_id), self.headers)
def is_resource_deleted(self, id): def is_resource_deleted(self, id):
#Did not use get_flavor_details(id) for verification as it gives # Did not use get_flavor_details(id) for verification as it gives
#200 ok even for deleted id. LP #981263 # 200 ok even for deleted id. LP #981263
#we can remove the loop here and use get by ID when bug gets sortedout # we can remove the loop here and use get by ID when bug gets sortedout
resp, flavors = self.list_flavors_with_detail() resp, flavors = self.list_flavors_with_detail()
for flavor in flavors: for flavor in flavors:
if flavor['id'] == id: if flavor['id'] == id:

4
tempest/services/image/v1/json/image_client.py
View File

@@ -247,13 +247,13 @@ class ImageClientJSON(RestClient):
data = json.loads(data) data = json.loads(data)
return resp, data return resp, data
#NOTE(afazekas): just for the wait function # NOTE(afazekas): just for the wait function
def _get_image_status(self, image_id): def _get_image_status(self, image_id):
resp, meta = self.get_image_meta(image_id) resp, meta = self.get_image_meta(image_id)
status = meta['status'] status = meta['status']
return status return status
#NOTE(afazkas): Wait reinvented again. It is not in the correct layer # NOTE(afazkas): Wait reinvented again. It is not in the correct layer
def wait_for_image_status(self, image_id, status): def wait_for_image_status(self, image_id, status):
"""Waits for a Image to reach a given status.""" """Waits for a Image to reach a given status."""
start_time = time.time() start_time = time.time()

2
tempest/services/object_storage/account_client.py
View File

@@ -99,7 +99,7 @@ class AccountClientCustomizedHeader(RestClient):
super(AccountClientCustomizedHeader, self).__init__(config, username, super(AccountClientCustomizedHeader, self).__init__(config, username,
password, auth_url, password, auth_url,
tenant_name) tenant_name)
#Overwrites json-specific header encoding in RestClient # Overwrites json-specific header encoding in RestClient
self.service = self.config.object_storage.catalog_type self.service = self.config.object_storage.catalog_type
self.format = 'json' self.format = 'json'

12
tempest/services/object_storage/container_client.py
View File

@@ -26,7 +26,7 @@ class ContainerClient(RestClient):
super(ContainerClient, self).__init__(config, username, password, super(ContainerClient, self).__init__(config, username, password,
auth_url, tenant_name) auth_url, tenant_name)
#Overwrites json-specific header encoding in RestClient # Overwrites json-specific header encoding in RestClient
self.headers = {} self.headers = {}
self.service = self.config.object_storage.catalog_type self.service = self.config.object_storage.catalog_type
self.format = 'json' self.format = 'json'
@@ -94,8 +94,8 @@ class ContainerClient(RestClient):
item count is beyond 10,000 item listing limit. item count is beyond 10,000 item listing limit.
Does not require any paramaters aside from container name. Does not require any paramaters aside from container name.
""" """
#TODO(dwalleck): Rewite using json format to avoid newlines at end of # TODO(dwalleck): Rewite using json format to avoid newlines at end of
#obj names. Set limit to API limit - 1 (max returned items = 9999) # obj names. Set limit to API limit - 1 (max returned items = 9999)
limit = 9999 limit = 9999
if params is not None: if params is not None:
if 'limit' in params: if 'limit' in params:
@@ -114,16 +114,16 @@ class ContainerClient(RestClient):
if len(objlist) >= limit: if len(objlist) >= limit:
#Increment marker # Increment marker
marker = objlist[len(objlist) - 1] marker = objlist[len(objlist) - 1]
#Get the next chunk of the list # Get the next chunk of the list
objlist.extend(_list_all_container_objects(container, objlist.extend(_list_all_container_objects(container,
params={'marker': marker, params={'marker': marker,
'limit': limit})) 'limit': limit}))
return objlist return objlist
else: else:
#Return final, complete list # Return final, complete list
return objlist""" return objlist"""
def list_container_contents(self, container, params=None): def list_container_contents(self, container, params=None):

2
tempest/services/object_storage/object_client.py
View File

@@ -155,7 +155,7 @@ class ObjectClientCustomizedHeader(RestClient):
super(ObjectClientCustomizedHeader, self).__init__(config, username, super(ObjectClientCustomizedHeader, self).__init__(config, username,
password, auth_url, password, auth_url,
tenant_name) tenant_name)
#Overwrites json-specific header encoding in RestClient # Overwrites json-specific header encoding in RestClient
self.service = self.config.object_storage.catalog_type self.service = self.config.object_storage.catalog_type
self.format = 'json' self.format = 'json'

6
tempest/services/volume/json/snapshots_client.py
View File

@@ -76,11 +76,11 @@ class SnapshotsClientJSON(RestClient):
body = json.loads(body) body = json.loads(body)
return resp, body['snapshot'] return resp, body['snapshot']
#NOTE(afazekas): just for the wait function # NOTE(afazekas): just for the wait function
def _get_snapshot_status(self, snapshot_id): def _get_snapshot_status(self, snapshot_id):
resp, body = self.get_snapshot(snapshot_id) resp, body = self.get_snapshot(snapshot_id)
status = body['status'] status = body['status']
#NOTE(afazekas): snapshot can reach an "error" # NOTE(afazekas): snapshot can reach an "error"
# state in a "normal" lifecycle # state in a "normal" lifecycle
if (status == 'error'): if (status == 'error'):
raise exceptions.SnapshotBuildErrorException( raise exceptions.SnapshotBuildErrorException(
@@ -88,7 +88,7 @@ class SnapshotsClientJSON(RestClient):
return status return status
#NOTE(afazkas): Wait reinvented again. It is not in the correct layer # NOTE(afazkas): Wait reinvented again. It is not in the correct layer
def wait_for_snapshot_status(self, snapshot_id, status): def wait_for_snapshot_status(self, snapshot_id, status):
"""Waits for a Snapshot to reach a given status.""" """Waits for a Snapshot to reach a given status."""
start_time = time.time() start_time = time.time()

8
tempest/services/volume/xml/snapshots_client.py
View File

@@ -81,7 +81,7 @@ class SnapshotsClientXML(RestClientXML):
display_name: Optional snapshot Name. display_name: Optional snapshot Name.
display_description: User friendly snapshot description. display_description: User friendly snapshot description.
""" """
#NOTE(afazekas): it should use the volume namaspace # NOTE(afazekas): it should use the volume namaspace
snapshot = Element("snapshot", xmlns=XMLNS_11, volume_id=volume_id) snapshot = Element("snapshot", xmlns=XMLNS_11, volume_id=volume_id)
for key, value in kwargs.items(): for key, value in kwargs.items():
snapshot.add_attr(key, value) snapshot.add_attr(key, value)
@@ -90,11 +90,11 @@ class SnapshotsClientXML(RestClientXML):
body = xml_to_json(etree.fromstring(body)) body = xml_to_json(etree.fromstring(body))
return resp, body return resp, body
#NOTE(afazekas): just for the wait function # NOTE(afazekas): just for the wait function
def _get_snapshot_status(self, snapshot_id): def _get_snapshot_status(self, snapshot_id):
resp, body = self.get_snapshot(snapshot_id) resp, body = self.get_snapshot(snapshot_id)
status = body['status'] status = body['status']
#NOTE(afazekas): snapshot can reach an "error" # NOTE(afazekas): snapshot can reach an "error"
# state in a "normal" lifecycle # state in a "normal" lifecycle
if (status == 'error'): if (status == 'error'):
raise exceptions.SnapshotBuildErrorException( raise exceptions.SnapshotBuildErrorException(
@@ -102,7 +102,7 @@ class SnapshotsClientXML(RestClientXML):
return status return status
#NOTE(afazkas): Wait reinvented again. It is not in the correct layer # NOTE(afazkas): Wait reinvented again. It is not in the correct layer
def wait_for_snapshot_status(self, snapshot_id, status): def wait_for_snapshot_status(self, snapshot_id, status):
"""Waits for a Snapshot to reach a given status.""" """Waits for a Snapshot to reach a given status."""
start_time = time.time() start_time = time.time()

2
tempest/services/volume/xml/volumes_client.py
View File

@@ -103,7 +103,7 @@ class VolumesClientXML(RestClientXML):
:param imageRef: When specified the volume is created from this :param imageRef: When specified the volume is created from this
image image
""" """
#NOTE(afazekas): it should use a volume namespace # NOTE(afazekas): it should use a volume namespace
volume = Element("volume", xmlns=XMLNS_11, size=size) volume = Element("volume", xmlns=XMLNS_11, size=size)
if 'metadata' in kwargs: if 'metadata' in kwargs: