X-Git-Url: https://osm.etsi.org/gitweb/?p=osm%2FN2VC.git;a=blobdiff_plain;f=n2vc%2Fn2vc_juju_conn.py;h=2566b0c0717e9c53dc3d813bbf02774916bd11b1;hp=fff78c94414d5866f31945e1076c552c4eb60b07;hb=e308c71201537413caf28f8814051470f0418504;hpb=ba6e532cda6464759381585452b18f9fd1a19dd3

diff --git a/n2vc/n2vc_juju_conn.py b/n2vc/n2vc_juju_conn.py
index fff78c9..2566b0c 100644
--- a/n2vc/n2vc_juju_conn.py
+++ b/n2vc/n2vc_juju_conn.py
@@ -21,18 +21,14 @@
 ##
 
 import asyncio
-import base64
-import binascii
 import logging
 import os
-import re
 
 from n2vc.exceptions import (
     N2VCBadArgumentsException,
     N2VCException,
     N2VCConnectionException,
     N2VCExecutionException,
-    N2VCInvalidCertificate,
     # N2VCNotFound,
     MethodNotImplemented,
     JujuK8sProxycharmNotSupported,
@@ -40,6 +36,7 @@ from n2vc.exceptions import (
 from n2vc.n2vc_conn import N2VCConnector
 from n2vc.n2vc_conn import obj_to_dict, obj_to_yaml
 from n2vc.libjuju import Libjuju
+from n2vc.utils import base64_to_cacert
 
 
 class N2VCJujuConnector(N2VCConnector):
@@ -136,21 +133,6 @@ class N2VCJujuConnector(N2VCConnector):
 
         # TODO: Verify ca_cert is valid before using. VCA will crash
         # if the ca_cert isn't formatted correctly.
-        def base64_to_cacert(b64string):
-            """Convert the base64-encoded string containing the VCA CACERT.
-
-            The input string....
-
-            """
-            try:
-                cacert = base64.b64decode(b64string).decode("utf-8")
-
-                cacert = re.sub(r"\\n", r"\n", cacert,)
-            except binascii.Error as e:
-                self.log.debug("Caught binascii.Error: {}".format(e))
-                raise N2VCInvalidCertificate(message="Invalid CA Certificate")
-
-            return cacert
 
         self.ca_cert = vca_config.get("ca_cert")
         if self.ca_cert:
@@ -246,6 +228,8 @@ class N2VCJujuConnector(N2VCConnector):
         reuse_ee_id: str = None,
         progress_timeout: float = None,
         total_timeout: float = None,
+        cloud_name: str = None,
+        credential_name: str = None,
     ) -> (str, dict):
 
         self.log.info(
@@ -281,7 +265,13 @@ class N2VCJujuConnector(N2VCConnector):
         # create or reuse a new juju machine
         try:
             if not await self.libjuju.model_exists(model_name):
-                await self.libjuju.add_model(model_name, cloud_name=self.cloud)
+                cloud = cloud_name or self.cloud
+                credential = credential_name or cloud_name if cloud_name else self.cloud
+                await self.libjuju.add_model(
+                    model_name,
+                    cloud_name=cloud,
+                    credential_name=credential
+                )
             machine, new = await self.libjuju.create_machine(
                 model_name=model_name,
                 machine_id=machine_id,
@@ -326,6 +316,8 @@ class N2VCJujuConnector(N2VCConnector):
         db_dict: dict,
         progress_timeout: float = None,
         total_timeout: float = None,
+        cloud_name: str = None,
+        credential_name: str = None,
     ) -> str:
 
         self.log.info(
@@ -368,7 +360,13 @@ class N2VCJujuConnector(N2VCConnector):
         # register machine on juju
         try:
             if not await self.libjuju.model_exists(model_name):
-                await self.libjuju.add_model(model_name, cloud_name=self.cloud)
+                cloud = cloud_name or self.cloud
+                credential = credential_name or cloud_name if cloud_name else self.cloud
+                await self.libjuju.add_model(
+                    model_name,
+                    cloud_name=cloud,
+                    credential_name=credential
+                )
             machine_id = await self.libjuju.provision_machine(
                 model_name=model_name,
                 hostname=hostname,
@@ -490,6 +488,8 @@ class N2VCJujuConnector(N2VCConnector):
         progress_timeout: float = None,
         total_timeout: float = None,
         config: dict = None,
+        cloud_name: str = None,
+        credential_name: str = None,
     ) -> str:
         """
         Install a k8s proxy charm
@@ -508,6 +508,9 @@ class N2VCJujuConnector(N2VCConnector):
         :param float progress_timeout:
         :param float total_timeout:
         :param config: Dictionary with additional configuration
+        :param cloud_name: Cloud Name in which the charms will be deployed
+        :param credential_name: Credential Name to use in the cloud_name.
+                                If not set, cloud_name will be used as credential_name
 
         :returns ee_id: execution environment id.
         """
@@ -540,8 +543,13 @@ class N2VCJujuConnector(N2VCConnector):
 
         _, ns_id, _, _, _ = self._get_namespace_components(namespace=namespace)
         model_name = '{}-k8s'.format(ns_id)
-
-        await self.libjuju.add_model(model_name, self.k8s_cloud)
+        cloud = cloud_name or self.k8s_cloud
+        credential = credential_name or cloud_name if cloud_name else self.k8s_cloud
+        await self.libjuju.add_model(
+            model_name,
+            cloud_name=cloud,
+            credential_name=credential
+        )
         application_name = self._get_application_name(namespace)
 
         try:
@@ -655,6 +663,9 @@ class N2VCJujuConnector(N2VCConnector):
         # return public key if exists
         return output["pubkey"] if "pubkey" in output else output
 
+    async def get_metrics(self, model_name: str, application_name: str) -> dict:
+        return await self.libjuju.get_metrics(model_name, application_name)
+
     async def add_relation(
         self, ee_id_1: str, ee_id_2: str, endpoint_1: str, endpoint_2: str
     ):