projects
/
osm
/
RO.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fixing inappropriate warning log level usage
[osm/RO.git]
/
NG-RO
/
osm_ng_ro
/
ns.py
diff --git
a/NG-RO/osm_ng_ro/ns.py
b/NG-RO/osm_ng_ro/ns.py
index
096d4df
..
501ef03
100644
(file)
--- a/
NG-RO/osm_ng_ro/ns.py
+++ b/
NG-RO/osm_ng_ro/ns.py
@@
-31,6
+31,7
@@
from cryptography.hazmat.primitives import serialization as crypto_serialization
from cryptography.hazmat.primitives.asymmetric import rsa
from jinja2 import (
Environment,
from cryptography.hazmat.primitives.asymmetric import rsa
from jinja2 import (
Environment,
+ select_autoescape,
StrictUndefined,
TemplateError,
TemplateNotFound,
StrictUndefined,
TemplateError,
TemplateNotFound,
@@
-77,8
+78,8
@@
def get_process_id():
if text_id:
return text_id
if text_id:
return text_id
- except Exception:
- pass
+ except Exception
as error
:
+ logging.exception(f"{error} occured while getting process id")
# Return a random id
return "".join(random_choice("0123456789abcdef") for _ in range(12))
# Return a random id
return "".join(random_choice("0123456789abcdef") for _ in range(12))
@@
-380,7
+381,10
@@
class Ns(object):
str: [description]
"""
try:
str: [description]
"""
try:
- env = Environment(undefined=StrictUndefined)
+ env = Environment(
+ undefined=StrictUndefined,
+ autoescape=select_autoescape(default_for_string=True, default=True),
+ )
template = env.from_string(cloud_init_content)
return template.render(params or {})
template = env.from_string(cloud_init_content)
return template.render(params or {})
@@
-1087,7
+1091,11
@@
class Ns(object):
# If the position info is provided for all the interfaces, it will be sorted
# according to position number ascendingly.
# If the position info is provided for all the interfaces, it will be sorted
# according to position number ascendingly.
- if all(i.get("position") for i in target_vdu["interfaces"]):
+ if all(
+ i.get("position") + 1
+ for i in target_vdu["interfaces"]
+ if i.get("position") is not None
+ ):
sorted_interfaces = sorted(
target_vdu["interfaces"],
key=lambda x: (x.get("position") is None, x.get("position")),
sorted_interfaces = sorted(
target_vdu["interfaces"],
key=lambda x: (x.get("position") is None, x.get("position")),
@@
-1097,7
+1105,11
@@
class Ns(object):
# If the position info is provided for some interfaces but not all of them, the interfaces
# which has specific position numbers will be placed and others' positions will not be taken care.
else:
# If the position info is provided for some interfaces but not all of them, the interfaces
# which has specific position numbers will be placed and others' positions will not be taken care.
else:
- if any(i.get("position") for i in target_vdu["interfaces"]):
+ if any(
+ i.get("position") + 1
+ for i in target_vdu["interfaces"]
+ if i.get("position") is not None
+ ):
n = len(target_vdu["interfaces"])
sorted_interfaces = [-1] * n
k, m = 0, 0
n = len(target_vdu["interfaces"])
sorted_interfaces = [-1] * n
k, m = 0, 0
@@
-1695,7
+1707,7
@@
class Ns(object):
target_record_id += ".sdn"
kwargs = {}
target_record_id += ".sdn"
kwargs = {}
- self.logger.
warnin
g(
+ self.logger.
debu
g(
"ns.calculate_diff_items target_item={}".format(target_item)
)
if process_params == Ns._process_flavor_params:
"ns.calculate_diff_items target_item={}".format(target_item)
)
if process_params == Ns._process_flavor_params:
@@
-1704,14
+1716,12
@@
class Ns(object):
"db": self.db,
}
)
"db": self.db,
}
)
- self.logger.
warnin
g(
+ self.logger.
debu
g(
"calculate_diff_items for flavor kwargs={}".format(kwargs)
)
if process_params == Ns._process_vdu_params:
"calculate_diff_items for flavor kwargs={}".format(kwargs)
)
if process_params == Ns._process_vdu_params:
- self.logger.warning(
- "calculate_diff_items self.fs={}".format(self.fs)
- )
+ self.logger.debug("calculate_diff_items self.fs={}".format(self.fs))
kwargs.update(
{
"vnfr_id": vnfr_id,
kwargs.update(
{
"vnfr_id": vnfr_id,
@@
-1725,7
+1735,7
@@
class Ns(object):
"ro_nsr_public_key": ro_nsr_public_key,
}
)
"ro_nsr_public_key": ro_nsr_public_key,
}
)
- self.logger.
warnin
g("calculate_diff_items kwargs={}".format(kwargs))
+ self.logger.
debu
g("calculate_diff_items kwargs={}".format(kwargs))
extra_dict = process_params(
target_item,
extra_dict = process_params(
target_item,
@@
-1863,7
+1873,7
@@
class Ns(object):
extra_dict=change.get("extra_dict", None),
)
extra_dict=change.get("extra_dict", None),
)
- self.logger.
warnin
g("ns.define_all_tasks task={}".format(task))
+ self.logger.
debu
g("ns.define_all_tasks task={}".format(task))
tasks_by_target_record_id[change["target_record_id"]] = task
db_new_tasks.append(task)
tasks_by_target_record_id[change["target_record_id"]] = task
db_new_tasks.append(task)
@@
-1947,7
+1957,7
@@
class Ns(object):
for db_task in db_new_tasks:
target_id = db_task.pop("target_id")
for db_task in db_new_tasks:
target_id = db_task.pop("target_id")
- self.logger.
warnin
g("target_id={} db_task={}".format(target_id, db_task))
+ self.logger.
debu
g("target_id={} db_task={}".format(target_id, db_task))
action = db_task.get("action", None)
action = db_task.get("action", None)
@@
-1968,7
+1978,7
@@
class Ns(object):
db_ro_task["vim_info"]["vim_id"] = db_task.get("vim_id", None)
nb_ro_tasks += 1
db_ro_task["vim_info"]["vim_id"] = db_task.get("vim_id", None)
nb_ro_tasks += 1
- self.logger.
warnin
g("upload_all_tasks db_ro_task={}".format(db_ro_task))
+ self.logger.
debu
g("upload_all_tasks db_ro_task={}".format(db_ro_task))
self.db.create("ro_tasks", db_ro_task)
self.logger.debug(
self.db.create("ro_tasks", db_ro_task)
self.logger.debug(