| commit | 53178b7d5fa060a68d9c9d912d6d2464986b0fd0 | [log] [tgz] |
|---|---|---|
| author | velandy <rajesh.velandy@riftio.com> | Mon May 08 19:15:45 2017 +0200 |
| committer | Gerrit Code Review <root@osm.etsi.org> | Mon May 08 19:15:45 2017 +0200 |
| tree | b6879fb83486394653eec9c34a67fdab1db4f31a | |
| parent | 386955f4acb626de9464db1a1fef5b0907c530e1 [diff] | |
| parent | 135dc82de12705db88cf05be145191bdfc6fa957 [diff] |
Merge "[RIFT 16413, 16414] Unittest failures fixed for utest_package, utest_publisher_dts" into v2.0
diff --git a/models/plugins/yang/nsr.yang b/models/plugins/yang/nsr.yang index 3fdd642..a3f9f57 100644 --- a/models/plugins/yang/nsr.yang +++ b/models/plugins/yang/nsr.yang
@@ -855,7 +855,7 @@ 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 --- a/rwlaunchpad/plugins/rwnsm/rift/tasklets/rwnsmtasklet/openmano_nsm.py +++ b/rwlaunchpad/plugins/rwnsm/rift/tasklets/rwnsmtasklet/openmano_nsm.py
@@ -528,7 +528,6 @@ 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.")