Merge "[RIFT 16413, 16414] Unittest failures fixed for utest_package, utest_publisher...

diff --git a/models/plugins/yang/nsr.yang b/models/plugins/yang/nsr.yang
index 3fdd642..a3f9f57 100644 (file)
--- a/models/plugins/yang/nsr.yang
+++ b/models/plugins/yang/nsr.yang
@@ -855,7 +855,7 @@ module nsr
             leaf member-vnf-index-ref {
               description
                  "Reference to member-vnf within constituent-vnfds";
-              type string;
+              type uint64;
             }
 
             leaf vnfd-id-ref {

diff --git a/rwlaunchpad/plugins/rwnsm/rift/tasklets/rwnsmtasklet/openmano_nsm.py b/rwlaunchpad/plugins/rwnsm/rift/tasklets/rwnsmtasklet/openmano_nsm.py
index db08e8e..f8ce1aa 100644 (file)
--- a/rwlaunchpad/plugins/rwnsm/rift/tasklets/rwnsmtasklet/openmano_nsm.py
+++ b/rwlaunchpad/plugins/rwnsm/rift/tasklets/rwnsmtasklet/openmano_nsm.py
@@ -528,7 +528,6 @@ class OpenmanoNsr(object):
     def add_nsr(self, nsr, vnfr):
         self._nsrs[vnfr.id] = nsr
 
-    @asyncio.coroutine
     def delete(self):
         if not self._created:
             self._log.debug("NSD wasn't created.  Skipping delete.")