From 31b87e502a8f276b28b9f6d461341101934b9482 Mon Sep 17 00:00:00 2001 From: Philip Joseph Date: Tue, 29 Nov 2016 01:01:57 +0530 Subject: [PATCH] New Feature : Fix merge conflict error Signed-off-by: Philip Joseph --- models/plugins/yang/vnfd.yang | 1 - rwcm/plugins/rwconman/rift/tasklets/rwconmantasklet/RiftCA.py | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/models/plugins/yang/vnfd.yang b/models/plugins/yang/vnfd.yang index 47d5594b..947fbc85 100644 --- a/models/plugins/yang/vnfd.yang +++ b/models/plugins/yang/vnfd.yang @@ -625,7 +625,6 @@ module vnfd } } } - uses vnf-access-point; } } } diff --git a/rwcm/plugins/rwconman/rift/tasklets/rwconmantasklet/RiftCA.py b/rwcm/plugins/rwconman/rift/tasklets/rwconmantasklet/RiftCA.py index 2794790f..7309d2e5 100644 --- a/rwcm/plugins/rwconman/rift/tasklets/rwconmantasklet/RiftCA.py +++ b/rwcm/plugins/rwconman/rift/tasklets/rwconmantasklet/RiftCA.py @@ -259,8 +259,8 @@ class RiftCAConfigPlugin(riftcm_config_plugin.RiftCMConfigPluginBase): rc, err = yield from self._vnf_config_primitive(nsr_id, vnfr_id, primitive) - sel._log.debug("VNFR {} primitive {} exec status: {}". - format(vnfr.name, primitive.name, rc)) + self._log.debug("VNFR {} primitive {} exec status: {}". + format(vnfr.name, primitive.name, rc)) if rc == 0: output.execution_status = "completed" -- 2.25.1