valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 17:33:54 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #27824 from techhat/azureerrors

Browse Source 
Update Azure errors
This commit is contained in:
Pedro Algarvio 2015-10-09 16:25:14 +01:00
commit 1e2dede122
1 changed files with 57 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

91
salt/cloud/clouds/msazure.py
View File

@ -221,8 +221,8 @@ def list_nodes(conn=None, call=None):
ret = {}
nodes = list_nodes_full(conn, call)
for node in nodes:
ret[node] = {}
for prop in ('id', 'image', 'name', 'size', 'state', 'private_ips', 'public_ips'):
ret[node] = {'name': node}
for prop in ('id', 'image', 'size', 'state', 'private_ips', 'public_ips'):
ret[node][prop] = nodes[node][prop]
return ret
@ -930,7 +930,7 @@ def destroy(name, conn=None, call=None, kwargs=None):
result = conn.delete_deployment(service_name, service_name)
except WindowsAzureConflictError as exc:
log.error(exc.message)
return {'Error': exc.message}
raise SaltCloudSystemExit('{0}: {1}'.format(name, exc.message))
delete_type = 'delete_deployment'
_wait_for_async(conn, result.request_id)
ret[name] = {
@ -1173,9 +1173,10 @@ def show_storage_keys(kwargs=None, conn=None, call=None):
except WindowsAzureMissingResourceError as exc:
storage_data = show_storage(kwargs={'name': kwargs['name']}, call='function')
if storage_data['storage_service_properties']['status'] == 'Creating':
return {'Error': 'The storage account keys have not yet been created'}
msg = 'The storage account keys have not yet been created'
raise SaltCloudSystemExit(msg)
else:
return {'Error': exc.message}
raise SaltCloudSystemExit('{0}: {1}'.format(kwargs['name'], exc.message))
return object_to_dict(data)
@ -1232,7 +1233,8 @@ def create_storage(kwargs=None, conn=None, call=None):
)
return {'Success': 'The storage account was successfully created'}
except WindowsAzureConflictError as exc:
return {'Error': 'There was a Conflict. This usually means that the storage account already exists.'}
msg = 'There was a Conflict. This usually means that the storage account already exists.'
raise SaltCloudSystemExit(msg)
def update_storage(kwargs=None, conn=None, call=None):
@ -1309,7 +1311,8 @@ def regenerate_storage_keys(kwargs=None, conn=None, call=None):
)
return show_storage_keys(kwargs={'name': kwargs['name']}, call='function')
except WindowsAzureConflictError as exc:
return {'Error': 'There was a Conflict. This usually means that the storage account already exists.'}
msg = 'There was a Conflict. This usually means that the storage account already exists.'
raise SaltCloudSystemExit(msg)
def delete_storage(kwargs=None, conn=None, call=None):
@ -1342,7 +1345,7 @@ def delete_storage(kwargs=None, conn=None, call=None):
data = conn.delete_storage_account(kwargs['name'])
return {'Success': 'The storage account was successfully deleted'}
except WindowsAzureMissingResourceError as exc:
return {'Error': exc.message}
raise SaltCloudSystemExit('{0}: {1}'.format(kwargs['name'], exc.message))
def list_services(kwargs=None, conn=None, call=None):
@ -1399,12 +1402,15 @@ def show_service(kwargs=None, conn=None, call=None):
if 'name' not in kwargs:
raise SaltCloudSystemExit('A name must be specified as "name"')
data = conn.get_hosted_service_properties(
kwargs['name'],
kwargs.get('details', False)
)
ret = object_to_dict(data)
return ret
try:
data = conn.get_hosted_service_properties(
kwargs['name'],
kwargs.get('details', False)
)
ret = object_to_dict(data)
return ret
except WindowsAzureMissingResourceError as exc:
raise SaltCloudSystemExit('{0}: {1}'.format(kwargs['name'], exc.message))
def create_service(kwargs=None, conn=None, call=None):
@ -1451,7 +1457,8 @@ def create_service(kwargs=None, conn=None, call=None):
)
return {'Success': 'The service was successfully created'}
except WindowsAzureConflictError as exc:
return {'Error': 'There was a Conflict. This usually means that the service already exists.'}
msg = 'There was a Conflict. This usually means that the service already exists.'
raise SaltCloudSystemExit(msg)
def delete_service(kwargs=None, conn=None, call=None):
@ -1484,7 +1491,7 @@ def delete_service(kwargs=None, conn=None, call=None):
data = conn.delete_hosted_service(kwargs['name'])
return {'Success': 'The service was successfully deleted'}
except WindowsAzureMissingResourceError as exc:
return {'Error': exc.message}
raise SaltCloudSystemExit('{0}: {1}'.format(kwargs['name'], exc.message))
def list_disks(kwargs=None, conn=None, call=None):
@ -1540,8 +1547,11 @@ def show_disk(kwargs=None, conn=None, call=None):
if 'name' not in kwargs:
raise SaltCloudSystemExit('A name must be specified as "name"')
data = conn.get_disk(kwargs['name'])
return object_to_dict(data)
try:
data = conn.get_disk(kwargs['name'])
return object_to_dict(data)
except WindowsAzureMissingResourceError as exc:
raise SaltCloudSystemExit('{0}: {1}'.format(kwargs['name'], exc.message))
# For consistency with Azure SDK
@ -1614,7 +1624,7 @@ def delete_disk(kwargs=None, conn=None, call=None):
data = conn.delete_disk(kwargs['name'], kwargs.get('delete_vhd', False))
return {'Success': 'The disk was successfully deleted'}
except WindowsAzureMissingResourceError as exc:
return {'Error': exc.message}
raise SaltCloudSystemExit('{0}: {1}'.format(kwargs['name'], exc.message))
def update_disk(kwargs=None, conn=None, call=None):
@ -1682,11 +1692,14 @@ def list_service_certificates(kwargs=None, conn=None, call=None):
if not conn:
conn = get_conn()
data = conn.list_service_certificates(service_name=kwargs['name'])
ret = {}
for item in data.certificates:
ret[item.thumbprint] = object_to_dict(item)
return ret
try:
data = conn.list_service_certificates(service_name=kwargs['name'])
ret = {}
for item in data.certificates:
ret[item.thumbprint] = object_to_dict(item)
return ret
except WindowsAzureMissingResourceError as exc:
raise SaltCloudSystemExit('{0}: {1}'.format(kwargs['name'], exc.message))
def show_service_certificate(kwargs=None, conn=None, call=None):
@ -1779,7 +1792,8 @@ def add_service_certificate(kwargs=None, conn=None, call=None):
)
return {'Success': 'The service certificate was successfully added'}
except WindowsAzureConflictError as exc:
return {'Error': 'There was a Conflict. This usually means that the service certificate already exists.'}
msg = 'There was a Conflict. This usually means that the service certificate already exists.'
raise SaltCloudSystemExit(msg)
def delete_service_certificate(kwargs=None, conn=None, call=None):
@ -1823,7 +1837,7 @@ def delete_service_certificate(kwargs=None, conn=None, call=None):
)
return {'Success': 'The service certificate was successfully deleted'}
except WindowsAzureMissingResourceError as exc:
return {'Error': exc.message}
raise SaltCloudSystemExit('{0}: {1}'.format(kwargs['name'], exc.message))
def list_management_certificates(kwargs=None, conn=None, call=None):
@ -1929,7 +1943,8 @@ def add_management_certificate(kwargs=None, conn=None, call=None):
)
return {'Success': 'The management certificate was successfully added'}
except WindowsAzureConflictError as exc:
return {'Error': 'There was a Conflict. This usually means that the management certificate already exists.'}
msg = 'There was a Conflict. This usually means that the management certificate already exists.'
raise SaltCloudSystemExit(msg)
def delete_management_certificate(kwargs=None, conn=None, call=None):
@ -1963,7 +1978,7 @@ def delete_management_certificate(kwargs=None, conn=None, call=None):
data = conn.delete_management_certificate(kwargs['thumbprint'])
return {'Success': 'The management certificate was successfully deleted'}
except WindowsAzureMissingResourceError as exc:
return {'Error': exc.message}
raise SaltCloudSystemExit('{0}: {1}'.format(kwargs['thumbprint'], exc.message))
def list_virtual_networks(kwargs=None, conn=None, call=None):
@ -2375,7 +2390,8 @@ def create_affinity_group(kwargs=None, conn=None, call=None):
)
return {'Success': 'The affinity group was successfully created'}
except WindowsAzureConflictError as exc:
return {'Error': 'There was a Conflict. This usually means that the affinity group already exists.'}
msg = 'There was a Conflict. This usually means that the affinity group already exists.'
raise SaltCloudSystemExit(msg)
def update_affinity_group(kwargs=None, conn=None, call=None):
@ -2445,7 +2461,7 @@ def delete_affinity_group(kwargs=None, conn=None, call=None):
data = conn.delete_affinity_group(kwargs['name'])
return {'Success': 'The affinity group was successfully deleted'}
except WindowsAzureMissingResourceError as exc:
return {'Error': exc.message}
raise SaltCloudSystemExit('{0}: {1}'.format(kwargs['name'], exc.message))
def get_storage_conn(storage_account=None, storage_key=None, conn_kwargs=None):
@ -2594,7 +2610,8 @@ def create_storage_container(kwargs=None, storage_conn=None, call=None):
)
return {'Success': 'The storage container was successfully created'}
except WindowsAzureConflictError as exc:
return {'Error': 'There was a Conflict. This usually means that the storage container already exists.'}
msg = 'There was a Conflict. This usually means that the storage container already exists.'
raise SaltCloudSystemExit(msg)
def show_storage_container(kwargs=None, storage_conn=None, call=None):
@ -2728,7 +2745,8 @@ def set_storage_container_metadata(kwargs=None, storage_conn=None, call=None):
)
return {'Success': 'The storage container was successfully updated'}
except WindowsAzureConflictError as exc:
return {'Error': 'There was a Conflict.'}
msg = 'There was a Conflict.'
raise SaltCloudSystemExit(msg)
def show_storage_container_acl(kwargs=None, storage_conn=None, call=None):
@ -2813,7 +2831,8 @@ def set_storage_container_acl(kwargs=None, storage_conn=None, call=None):
)
return {'Success': 'The storage container was successfully updated'}
except WindowsAzureConflictError as exc:
return {'Error': 'There was a Conflict.'}
msg = 'There was a Conflict.'
raise SaltCloudSystemExit(msg)
def delete_storage_container(kwargs=None, storage_conn=None, call=None):
@ -3125,7 +3144,11 @@ def show_blob_properties(kwargs=None, storage_conn=None, call=None):
x_ms_lease_id=kwargs.get('lease_id', None),
)
except WindowsAzureMissingResourceError as exc:
return {'Error': 'The specified blob does not exist.'}
raise SaltCloudSystemExit('{0}\\\\{1}: {2}'.format(
kwargs['container'],
kwargs['blob'],
exc.message,
))
return data