Add ModelConfig

[osm/N2VC.git] / n2vc / k8s_juju_conn.py

diff --git a/n2vc/k8s_juju_conn.py b/n2vc/k8s_juju_conn.py
index 85e24f2..0e9d547 100644 (file)
--- a/n2vc/k8s_juju_conn.py
+++ b/n2vc/k8s_juju_conn.py
@@ -20,6 +20,7 @@ import tempfile
 import binascii
 import base64
 
 import binascii
 import base64
 

+from n2vc.config import ModelConfig

 from n2vc.exceptions import K8sException, N2VCBadArgumentsException
 from n2vc.k8s_conn import K8sConnector
 from n2vc.kubectl import Kubectl, CORE_CLIENT, RBAC_CLIENT
 from n2vc.exceptions import K8sException, N2VCBadArgumentsException
 from n2vc.k8s_conn import K8sConnector
 from n2vc.kubectl import Kubectl, CORE_CLIENT, RBAC_CLIENT


@@ -97,8 +98,7 @@ class K8sJujuConnector(K8sConnector):
             )
         port = vca_config["port"] if "port" in vca_config else 17070
         url = "{}:{}".format(vca_config["host"], port)
             )
         port = vca_config["port"] if "port" in vca_config else 17070
         url = "{}:{}".format(vca_config["host"], port)

-        enable_os_upgrade = vca_config.get("enable_os_upgrade", True)
-        apt_mirror = vca_config.get("apt_mirror", None)
+        model_config = ModelConfig(vca_config)

         username = vca_config["user"]
         secret = vca_config["secret"]
         ca_cert = base64_to_cacert(vca_config["ca_cert"])
         username = vca_config["user"]
         secret = vca_config["secret"]
         ca_cert = base64_to_cacert(vca_config["ca_cert"])


@@ -106,8 +106,7 @@ class K8sJujuConnector(K8sConnector):
         self.libjuju = Libjuju(
             endpoint=url,
             api_proxy=None,  # Not needed for k8s charms
         self.libjuju = Libjuju(
             endpoint=url,
             api_proxy=None,  # Not needed for k8s charms

-            enable_os_upgrade=enable_os_upgrade,
-            apt_mirror=apt_mirror,
+            model_config=model_config,

             username=username,
             password=secret,
             cacert=ca_cert,
             username=username,
             password=secret,
             cacert=ca_cert,