From: Michael Marchetti <mmarchetti@sandvine.com>
Date: Thu, 12 Jan 2017 19:23:06 +0000 (-0500)
Subject:  - Fix for getting vnfd id, no object named vnfd_ref.
X-Git-Tag: v1.1.0~25
X-Git-Url: https://osm.etsi.org/gitweb/?a=commitdiff_plain;h=06aaa024bc3ee4ee5faf16188cc55f00277e6711;p=osm%2FSO.git

 - Fix for getting vnfd id, no object named vnfd_ref.
 - the failure causes the VNFD to not go active when utilizing a charm

Signed-off-by: Michael Marchetti <mmarchetti@sandvine.com>
---

diff --git a/rwcm/plugins/rwconman/rift/tasklets/rwconmantasklet/rwconman_config.py b/rwcm/plugins/rwconman/rift/tasklets/rwconmantasklet/rwconman_config.py
index caf09b5a..0abed993 100644
--- a/rwcm/plugins/rwconman/rift/tasklets/rwconmantasklet/rwconman_config.py
+++ b/rwcm/plugins/rwconman/rift/tasklets/rwconmantasklet/rwconman_config.py
@@ -831,10 +831,10 @@ class ConfigManagerConfig(object):
 
         vnfr_name = vnfr.name
 
-        vnfd = yield from self.cmdts_obj.get_vnfd(vnfr.vnfd_ref)
+        vnfd = yield from self.cmdts_obj.get_vnfd(vnfr.vnfd.id)
         if vnfd is None:
             msg = "VNFR {}, unable to get VNFD {}". \
-                  format(vnfr_name, vnfr.vnfd_ref)
+                  format(vnfr_name, vnfr.vnfd.id)
             self._log.error(msg)
             raise InitialConfigError(msg)