projects
/
osm
/
N2VC.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix bug 1467
[osm/N2VC.git]
/
n2vc
/
libjuju.py
diff --git
a/n2vc/libjuju.py
b/n2vc/libjuju.py
index
a6c1c42
..
7a73033
100644
(file)
--- a/
n2vc/libjuju.py
+++ b/
n2vc/libjuju.py
@@
-40,7
+40,6
@@
from n2vc.exceptions import (
JujuApplicationNotFound,
JujuLeaderUnitNotFound,
JujuActionNotFound,
JujuApplicationNotFound,
JujuLeaderUnitNotFound,
JujuActionNotFound,
- JujuModelAlreadyExists,
JujuControllerFailedConnecting,
JujuApplicationExists,
JujuInvalidK8sConfiguration,
JujuControllerFailedConnecting,
JujuApplicationExists,
JujuInvalidK8sConfiguration,
@@
-109,7
+108,6
@@
class Libjuju:
self.loop.set_exception_handler(self.handle_exception)
self.creating_model = asyncio.Lock(loop=self.loop)
self.loop.set_exception_handler(self.handle_exception)
self.creating_model = asyncio.Lock(loop=self.loop)
- self.models = set()
self.log.debug("Libjuju initialized!")
self.health_check_task = self._create_health_check_task()
self.log.debug("Libjuju initialized!")
self.health_check_task = self._create_health_check_task()
@@
-117,7
+115,7
@@
class Libjuju:
def _create_health_check_task(self):
return self.loop.create_task(self.health_check())
def _create_health_check_task(self):
return self.loop.create_task(self.health_check())
- async def get_controller(self, timeout: float = 5.0) -> Controller:
+ async def get_controller(self, timeout: float =
1
5.0) -> Controller:
"""
Get controller
"""
Get controller
@@
-187,22
+185,14
@@
class Libjuju:
controller = await self.get_controller()
model = None
try:
controller = await self.get_controller()
model = None
try:
- # Raise exception if model already exists
- if await self.model_exists(model_name, controller=controller):
- raise JujuModelAlreadyExists(
- "Model {} already exists.".format(model_name)
- )
-
# Block until other workers have finished model creation
while self.creating_model.locked():
await asyncio.sleep(0.1)
# Block until other workers have finished model creation
while self.creating_model.locked():
await asyncio.sleep(0.1)
- # If the model exists, return it from the controller
- if model_name in self.models:
- return
-
# Create the model
async with self.creating_model:
# Create the model
async with self.creating_model:
+ if await self.model_exists(model_name, controller=controller):
+ return
self.log.debug("Creating model {}".format(model_name))
model = await controller.add_model(
model_name,
self.log.debug("Creating model {}".format(model_name))
model = await controller.add_model(
model_name,
@@
-210,7
+200,6
@@
class Libjuju:
cloud_name=cloud_name,
credential_name=credential_name or cloud_name,
)
cloud_name=cloud_name,
credential_name=credential_name or cloud_name,
)
- self.models.add(model_name)
finally:
if model:
await self.disconnect_model(model)
finally:
if model:
await self.disconnect_model(model)
@@
-854,8
+843,12
@@
class Libjuju:
"""
controller = await self.get_controller()
"""
controller = await self.get_controller()
- model =
await self.get_model(controller, model_name)
+ model =
None
try:
try:
+ if not await self.model_exists(model_name, controller=controller):
+ return
+
+ model = await self.get_model(controller, model_name)
self.log.debug("Destroying model {}".format(model_name))
uuid = model.info.uuid
self.log.debug("Destroying model {}".format(model_name))
uuid = model.info.uuid
@@
-866,10
+859,6
@@
class Libjuju:
# Disconnect model
await self.disconnect_model(model)
# Disconnect model
await self.disconnect_model(model)
- # Destroy model
- if model_name in self.models:
- self.models.remove(model_name)
-
await controller.destroy_model(uuid, force=True, max_wait=0)
# Wait until model is destroyed
await controller.destroy_model(uuid, force=True, max_wait=0)
# Wait until model is destroyed
@@
-889,6
+878,10
@@
class Libjuju:
raise Exception(
"Timeout waiting for model {} to be destroyed".format(model_name)
)
raise Exception(
"Timeout waiting for model {} to be destroyed".format(model_name)
)
+ except Exception as e:
+ if model:
+ await self.disconnect_model(model)
+ raise e
finally:
await self.disconnect_controller(controller)
finally:
await self.disconnect_controller(controller)