summary |
shortlog |
log |
commit | commitdiff |
tree
raw |
patch |
inline | side by side (from parent 1:
f4c2ac8)
-from juju.errors import JujuAPIError
from juju.model import Model
from juju.machine import Machine
from juju.application import Application
from juju.model import Model
from juju.machine import Machine
from juju.application import Application
cloud_name=cloud.name,
credential_name=cloud.credential_name,
)
cloud_name=cloud.name,
credential_name=cloud.credential_name,
)
- except JujuAPIError as e:
+ except juju.errors.JujuAPIError as e:
if "already exists" in e.message:
pass
else:
if "already exists" in e.message:
pass
else:
db_dict: dict = None,
progress_timeout: float = None,
total_timeout: float = None,
db_dict: dict = None,
progress_timeout: float = None,
total_timeout: float = None,
# Add relation
try:
await model.add_relation(endpoint_1, endpoint_2)
# Add relation
try:
await model.add_relation(endpoint_1, endpoint_2)
- except JujuAPIError as e:
+ except juju.errors.JujuAPIError as e:
if "not found" in e.message:
self.log.warning("Relation not found: {}".format(e.message))
return
if "not found" in e.message:
self.log.warning("Relation not found: {}".format(e.message))
return
controller = await self.get_controller()
try:
await controller.remove_cloud(name)
controller = await self.get_controller()
try:
await controller.remove_cloud(name)
+ except juju.errors.JujuError as e:
+ if len(e.errors) == 1 and f'cloud "{name}" not found' == e.errors[0]:
+ self.log.warning(f"Cloud {name} not found, so it could not be deleted.")
+ else:
+ raise e
finally:
await self.disconnect_controller(controller)
finally:
await self.disconnect_controller(controller)