projects
/
osm
/
LCM.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Update ns.py to append osm to metric_name to be BWC
[osm/LCM.git]
/
osm_lcm
/
ROclient.py
diff --git
a/osm_lcm/ROclient.py
b/osm_lcm/ROclient.py
index
32dd1bf
..
8d6f510
100644
(file)
--- a/
osm_lcm/ROclient.py
+++ b/
osm_lcm/ROclient.py
@@
-190,7
+190,7
@@
class ROClient:
)
if descriptor_format != "json":
try:
)
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"):
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:
def _parse_error_yaml(descriptor):
json_error = None
try:
- json_error = yaml.
load(descriptor, Loader=yaml.Loade
r)
+ json_error = yaml.
safe_load(descripto
r)
return json_error["error"]["description"]
except Exception:
return str(json_error or 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:
@staticmethod
def _parse_yaml(descriptor, response=False):
try:
- return yaml.
load(descriptor, Loader=yaml.Loade
r)
+ return yaml.
safe_load(descripto
r)
except yaml.YAMLError as exc:
error_pos = ""
if hasattr(exc, "problem_mark"):
except yaml.YAMLError as exc:
error_pos = ""
if hasattr(exc, "problem_mark"):
@@
-1268,7
+1268,7
@@
class ROClient:
"""
if isinstance(descriptor, str):
"""
if isinstance(descriptor, str):
- descriptor = self.parse(descriptor, descriptor_format)
+ descriptor = self.
_
parse(descriptor, descriptor_format)
elif descriptor:
pass
elif kwargs:
elif descriptor:
pass
elif kwargs:
@@
-1311,7
+1311,7
@@
class ROClient:
"""
if isinstance(descriptor, str):
"""
if isinstance(descriptor, str):
- descriptor = self.parse(descriptor, descriptor_format)
+ descriptor = self.
_
parse(descriptor, descriptor_format)
elif descriptor:
pass
elif kwargs:
elif descriptor:
pass
elif kwargs:
@@
-1363,7
+1363,7
@@
class ROClient:
if all_tenants:
tenant_text = "/any"
else:
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(
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:
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)
if action == "list":
url = "{}{}/vim/{}/{}".format(self.uri, tenant_text, datacenter, item)