projects
/
osm
/
LCM.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
bug 884 local variable step must be assigned before waitfor_related_HA. CancelledErro...
[osm/LCM.git]
/
osm_lcm
/
ns.py
diff --git
a/osm_lcm/ns.py
b/osm_lcm/ns.py
index
4fa0df8
..
efb69b2
100644
(file)
--- a/
osm_lcm/ns.py
+++ b/
osm_lcm/ns.py
@@
-738,7
+738,7
@@
class NsLcm(LcmBase):
exc = None
try:
# wait for any previous tasks in process
exc = None
try:
# wait for any previous tasks in process
- step = "Waiting for previous
tasks
"
+ step = "Waiting for previous
operations to terminate
"
await self.lcm_tasks.waitfor_related_HA('ns', 'nslcmops', nslcmop_id)
step = "Getting nslcmop={} from db".format(nslcmop_id)
await self.lcm_tasks.waitfor_related_HA('ns', 'nslcmops', nslcmop_id)
step = "Getting nslcmop={} from db".format(nslcmop_id)
@@
-1936,6
+1936,7
@@
class NsLcm(LcmBase):
autoremove = False # autoremove after terminated
try:
# wait for any previous tasks in process
autoremove = False # autoremove after terminated
try:
# wait for any previous tasks in process
+ step = "Waiting for previous operations to terminate"
await self.lcm_tasks.waitfor_related_HA("ns", 'nslcmops', nslcmop_id)
step = "Getting nslcmop={} from db".format(nslcmop_id)
await self.lcm_tasks.waitfor_related_HA("ns", 'nslcmops', nslcmop_id)
step = "Getting nslcmop={} from db".format(nslcmop_id)
@@
-2297,6
+2298,7
@@
class NsLcm(LcmBase):
exc = None
try:
# wait for any previous tasks in process
exc = None
try:
# wait for any previous tasks in process
+ step = "Waiting for previous operations to terminate"
await self.lcm_tasks.waitfor_related_HA('ns', 'nslcmops', nslcmop_id)
step = "Getting information from database"
await self.lcm_tasks.waitfor_related_HA('ns', 'nslcmops', nslcmop_id)
step = "Getting information from database"
@@
-2430,6
+2432,7
@@
class NsLcm(LcmBase):
vnfr_scaled = False
try:
# wait for any previous tasks in process
vnfr_scaled = False
try:
# wait for any previous tasks in process
+ step = "Waiting for previous operations to terminate"
await self.lcm_tasks.waitfor_related_HA('ns', 'nslcmops', nslcmop_id)
step = "Getting nslcmop from database"
await self.lcm_tasks.waitfor_related_HA('ns', 'nslcmops', nslcmop_id)
step = "Getting nslcmop from database"