commit 79c898c3a8295b0727ed1355b3ed1e8634f32342
author Rajesh Velandy <rajesh.velandy@riftio.com> Tue Oct 25 23:23:22 2016 +0200
committer Gerrit Code Review <root@osm.etsi.org> Tue Oct 25 23:23:22 2016 +0200
tree 5f7b07ee09c460541bb86b074c96ff234eaea61c
parent bdbe67a683efe5d0d61d9d2e04a9104ccfca715a
parent 7908c6bd2b4e4f90b2d57f8f994b30a41adff142

Merge "Bug 93: Package upload script should use port 8008 in place of 8888" into v1.0

rwlaunchpad/plugins/rwnsm/rift/tasklets/rwnsmtasklet/rwnsmtasklet.py

diff --git a/rwlaunchpad/plugins/rwnsm/rift/tasklets/rwnsmtasklet/rwnsmtasklet.py b/rwlaunchpad/plugins/rwnsm/rift/tasklets/rwnsmtasklet/rwnsmtasklet.py
index cf03857..79b004f 100755
--- a/rwlaunchpad/plugins/rwnsm/rift/tasklets/rwnsmtasklet/rwnsmtasklet.py
+++ b/rwlaunchpad/plugins/rwnsm/rift/tasklets/rwnsmtasklet/rwnsmtasklet.py
@@ -4097,7 +4097,10 @@
 
         # Terminate the instances/networks assocaited with this nw service
         self._log.debug("Terminating the network service %s", nsr_id)
-        yield from self._nsrs[nsr_id].terminate()
+        try :
+            yield from self._nsrs[nsr_id].terminate()
+        except Exception as e:
+            self.log.exception("Failed to terminate NSR[id=%s]", nsr_id)
 
         # Unref the NSD
         yield from self.nsd_unref_by_nsr_id(nsr_id)