From: beierlm Date: Tue, 5 May 2020 18:55:19 +0000 (-0400) Subject: Fix missing import X-Git-Tag: release-v8.0-start~11 X-Git-Url: https://osm.etsi.org/gitweb/?a=commitdiff_plain;h=refs%2Fchanges%2F51%2F8851%2F1;p=osm%2FN2VC.git Fix missing import Import was removed for flake8 compliance, but it was needed at runtime. Change-Id: I2c1fce7b681582382c3c8f74267c3010bfcd97d6 Signed-off-by: beierlm --- 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