X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=osm_lcm%2FROclient.py;h=8d6f5107b3c031131b0a63261ca501692b11d45f;hb=8e53c6d0046a3015bf015b745aa3cf9a30a8fbe6;hp=32dd1bf3ac6e6c59cb9edeb1b322c2c1b36c541e;hpb=5697b8b03a3acd17827ce536cb8aff15df8776ad;p=osm%2FLCM.git

diff --git a/osm_lcm/ROclient.py b/osm_lcm/ROclient.py
index 32dd1bf..8d6f510 100644
--- a/osm_lcm/ROclient.py
+++ b/osm_lcm/ROclient.py
@@ -190,7 +190,7 @@ class ROClient:
             )
         if descriptor_format != "json":
             try:
-                return yaml.load(descriptor)
+                return yaml.safe_load(descriptor)
             except yaml.YAMLError as exc:
                 error_pos = ""
                 if hasattr(exc, "problem_mark"):
@@ -214,7 +214,7 @@ class ROClient:
     def _parse_error_yaml(descriptor):
         json_error = None
         try:
-            json_error = yaml.load(descriptor, Loader=yaml.Loader)
+            json_error = yaml.safe_load(descriptor)
             return json_error["error"]["description"]
         except Exception:
             return str(json_error or descriptor)
@@ -222,7 +222,7 @@ class ROClient:
     @staticmethod
     def _parse_yaml(descriptor, response=False):
         try:
-            return yaml.load(descriptor, Loader=yaml.Loader)
+            return yaml.safe_load(descriptor)
         except yaml.YAMLError as exc:
             error_pos = ""
             if hasattr(exc, "problem_mark"):
@@ -1268,7 +1268,7 @@ class ROClient:
         """
 
         if isinstance(descriptor, str):
-            descriptor = self.parse(descriptor, descriptor_format)
+            descriptor = self._parse(descriptor, descriptor_format)
         elif descriptor:
             pass
         elif kwargs:
@@ -1311,7 +1311,7 @@ class ROClient:
         """
 
         if isinstance(descriptor, str):
-            descriptor = self.parse(descriptor, descriptor_format)
+            descriptor = self._parse(descriptor, descriptor_format)
         elif descriptor:
             pass
         elif kwargs:
@@ -1363,7 +1363,7 @@ class ROClient:
         if all_tenants:
             tenant_text = "/any"
         else:
-            tenant_text = "/" + self._get_tenant()
+            tenant_text = "/" + self._get_tenant(session)
 
         if "datacenter_id" in kwargs or "datacenter_name" in kwargs:
             datacenter = self._get_item_uuid(
@@ -1373,7 +1373,7 @@ class ROClient:
                 all_tenants=all_tenants,
             )
         else:
-            datacenter = self.get_datacenter(session)
+            datacenter = self._get_datacenter(session)
 
         if action == "list":
             url = "{}{}/vim/{}/{}".format(self.uri, tenant_text, datacenter, item)