Bug 48: SO crash due to service primitive

Signed-off-by: Philip Joseph <philip.joseph@riftio.com>

diff --git a/rwcm/plugins/rwconman/rift/tasklets/rwconmantasklet/RiftCM_rpc.py b/rwcm/plugins/rwconman/rift/tasklets/rwconmantasklet/RiftCM_rpc.py
index 9155d84..61b6bb2 100644 (file)
--- a/rwcm/plugins/rwconman/rift/tasklets/rwconmantasklet/RiftCM_rpc.py
+++ b/rwcm/plugins/rwconman/rift/tasklets/rwconmantasklet/RiftCM_rpc.py
@@ -180,8 +180,11 @@ class RiftCMRPCHandler(object):
                         vnf_op.vnfr_id_ref = vnfr_id
                         vnf_op.member_vnf_index_ref = vnf_member_idx
 
+                        idx = 0
                         for primitive in vnf.vnf_primitive:
                             op_primitive = vnf_op.vnf_out_primitive.add()
+                            op_primitive.index = idx
+                            idx += 1
                             op_primitive.name = primitive.name
                             op_primitive.execution_id = ''
                             op_primitive.execution_status = 'completed'

diff --git a/rwcm/plugins/rwconman/rift/tasklets/rwconmantasklet/jujuconf.py b/rwcm/plugins/rwconman/rift/tasklets/rwconmantasklet/jujuconf.py
index 1c32fc9..364546a 100644 (file)
--- a/rwcm/plugins/rwconman/rift/tasklets/rwconmantasklet/jujuconf.py
+++ b/rwcm/plugins/rwconman/rift/tasklets/rwconmantasklet/jujuconf.py
@@ -336,7 +336,7 @@ class JujuConfigPlugin(riftcm_config_plugin.RiftCMConfigPluginBase):
                                                 format(params, service))
                             else:
                                 output.execution_status = 'failed'
-                                output.execution_error_Details = \
+                                output.execution_error_details = \
                                     'Failed to apply config: {}'.format(params)
                                 self._log.error("jujuCA: Error applying config {} on service {}".
                                                 format(params, service))