)
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"):
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)
@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"):
"""
if isinstance(descriptor, str):
- descriptor = self.parse(descriptor, descriptor_format)
+ descriptor = self._parse(descriptor, descriptor_format)
elif descriptor:
pass
elif kwargs:
"""
if isinstance(descriptor, str):
- descriptor = self.parse(descriptor, descriptor_format)
+ descriptor = self._parse(descriptor, descriptor_format)
elif descriptor:
pass
elif kwargs:
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(
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)