X-Git-Url: https://osm.etsi.org/gitweb/?p=osm%2FN2VC.git;a=blobdiff_plain;f=n2vc%2Flibjuju.py;h=98e31d8518d448fac634165bc3fb52b0c73df8fa;hp=7a730335553392c5041706ce28e6303155bff94f;hb=a71d4a04c1e8ad3ffe1a129024e6dbc14d6d3bd5;hpb=b0a8f409e149715bf37d30c414474888c8a499f3 diff --git a/n2vc/libjuju.py b/n2vc/libjuju.py index 7a73033..98e31d8 100644 --- a/n2vc/libjuju.py +++ b/n2vc/libjuju.py @@ -32,6 +32,7 @@ from juju.controller import Controller from juju.client import client from juju import tag +from n2vc.config import ModelConfig from n2vc.juju_watcher import JujuModelWatcher from n2vc.provisioner import AsyncSSHProvisioner from n2vc.n2vc_conn import N2VCConnector @@ -63,8 +64,7 @@ class Libjuju: log: logging.Logger = None, db: dict = None, n2vc: N2VCConnector = None, - apt_mirror: str = None, - enable_os_upgrade: bool = True, + model_config: ModelConfig = {}, ): """ Constructor @@ -99,11 +99,7 @@ class Libjuju: self.n2vc = n2vc # Generate config for models - self.model_config = {} - if apt_mirror: - self.model_config["apt-mirror"] = apt_mirror - self.model_config["enable-os-refresh-update"] = enable_os_upgrade - self.model_config["enable-os-upgrade"] = enable_os_upgrade + self.model_config = model_config self.loop.set_exception_handler(self.handle_exception) self.creating_model = asyncio.Lock(loop=self.loop)