This commit is contained in:
Anthony Shaw 2017-04-26 14:12:01 +10:00
parent ce6b138525
commit 44cf65af3a
No known key found for this signature in database
GPG Key ID: AB4A19AE1CE85744
2 changed files with 15 additions and 15 deletions

View File

@ -393,9 +393,9 @@ def _string_to_record_type(string):
def _simple_zone(zone):
return {
'id': zone.id,
'domain': zone.domain,
'type': zone.type,
'id': zone.id,
'domain': zone.domain,
'type': zone.type,
'ttl': zone.ttl,
'extra': zone.extra
}
@ -403,11 +403,11 @@ def _simple_zone(zone):
def _simple_record(record):
return {
'id': record.id,
'name': record.name,
'type': record.type,
'data': record.data,
'zone': _simple_zone(record.zone),
'id': record.id,
'name': record.name,
'type': record.type,
'data': record.data,
'zone': _simple_zone(record.zone),
'ttl': record.ttl,
'extra': record.extra
}

View File

@ -171,9 +171,9 @@ def create_container(container_name, profile, **libcloud_kwargs):
_sanitize_kwargs(libcloud_kwargs)
container = conn.create_container(container_name, **libcloud_kwargs)
return {
'name': container.name,
'extra': container.extra
}
'name': container.name,
'extra': container.extra
}
def get_container(container_name, profile, **libcloud_kwargs):
@ -199,9 +199,9 @@ def get_container(container_name, profile, **libcloud_kwargs):
_sanitize_kwargs(libcloud_kwargs)
container = conn.get_container(container_name, **libcloud_kwargs)
return {
'name': container.name,
'extra': container.extra
}
'name': container.name,
'extra': container.extra
}
def get_container_object(container_name, object_name, profile, **libcloud_kwargs):
@ -286,7 +286,7 @@ def download_object(container_name, object_name, destination_path, profile,
def upload_object(file_path, container_name, object_name, profile, extra=None,
verify_hash=True, headers=None, **libcloud_kwargs):
verify_hash=True, headers=None, **libcloud_kwargs):
'''
Upload an object currently located on a disk.