minor fix in yaml load with Loader 26/8226/1
authortierno <alfonso.tiernosepulveda@telefonica.com>
Sat, 23 Nov 2019 22:41:22 +0000 (22:41 +0000)
committertierno <alfonso.tiernosepulveda@telefonica.com>
Sat, 23 Nov 2019 22:41:22 +0000 (22:41 +0000)
Change-Id: I1bc0e7197f6057c942490b710fbaf25013202ecb
Signed-off-by: tierno <alfonso.tiernosepulveda@telefonica.com>
n2vc/k8s_helm_conn.py
tests/base.py

index cd15d73..4e6c4c5 100644 (file)
@@ -894,7 +894,7 @@ class K8sHelmConnector(K8sConnector):
             for key in params:
                 value = params.get(key)
                 if '!!yaml' in str(value):
             for key in params:
                 value = params.get(key)
                 if '!!yaml' in str(value):
-                    value = yaml.load(value[7:])
+                    value = yaml.load(value[7:], Loader=yaml.SafeLoader)
                 params2[key] = value
 
             values_file = get_random_number() + '.yaml'
                 params2[key] = value
 
             values_file = get_random_number() + '.yaml'
index c7dad6d..e40338f 100644 (file)
@@ -108,7 +108,7 @@ def has_metrics(charm):
 def get_descriptor(descriptor):
     desc = None
     try:
 def get_descriptor(descriptor):
     desc = None
     try:
-        tmp = yaml.load(descriptor)
+        tmp = yaml.load(descriptor, Loader=yaml.Loader)
 
         # Remove the envelope
         root = list(tmp.keys())[0]
 
         # Remove the envelope
         root = list(tmp.keys())[0]