X-Git-Url: https://osm.etsi.org/gitweb/?p=osm%2FN2VC.git;a=blobdiff_plain;f=n2vc%2Fk8s_juju_conn.py;h=06ef7d91b703a80b82e76ecf66e5e498c76fead5;hp=7a3bf273af4bbd46673c68ae67bfc4818ff994c1;hb=55ca1c7c8a9356929047296a2d97dfca5fc27357;hpb=f52cb7cfeb4e24febe7c66af3d5bb275a50d7f99 diff --git a/n2vc/k8s_juju_conn.py b/n2vc/k8s_juju_conn.py index 7a3bf27..06ef7d9 100644 --- a/n2vc/k8s_juju_conn.py +++ b/n2vc/k8s_juju_conn.py @@ -16,12 +16,13 @@ import asyncio import concurrent import os import uuid +import yaml import juju from juju.controller import Controller +from juju.model import Model from n2vc.exceptions import K8sException from n2vc.k8s_conn import K8sConnector -import yaml from .exceptions import MethodNotImplemented @@ -728,7 +729,7 @@ class K8sJujuConnector(K8sConnector): return True - async def add_model(self, model_name: str, cluster_uuid: str,) -> juju.model.Model: + async def add_model(self, model_name: str, cluster_uuid: str,) -> Model: """Adds a model to the controller Adds a new model to the Juju controller @@ -850,7 +851,7 @@ class K8sJujuConnector(K8sConnector): "Unable to locate configuration for cluster {}".format(cluster_uuid) ) - async def get_model(self, model_name: str, cluster_uuid: str,) -> juju.model.Model: + async def get_model(self, model_name: str, cluster_uuid: str,) -> Model: """Get a model from the Juju Controller. Note: Model objects returned must call disconnected() before it goes