commit 31b87e502a8f276b28b9f6d461341101934b9482
author Philip Joseph <philip.joseph@riftio.com> Tue Nov 29 01:01:57 2016 +0530
committer Philip Joseph <philip.joseph@riftio.com> Tue Nov 29 01:07:20 2016 +0530
tree 6d69f23e5b0e709a2b05f6145228f13663e279b0
parent 5689d9f77bdae8fada3cc4ddedd2a4d88bd54ded

New Feature : Fix merge conflict error

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

models/plugins/yang/vnfd.yang

diff --git a/models/plugins/yang/vnfd.yang b/models/plugins/yang/vnfd.yang
index 47d5594..947fbc8 100644
--- a/models/plugins/yang/vnfd.yang
+++ b/models/plugins/yang/vnfd.yang
@@ -625,7 +625,6 @@
           }
         }
       }
-      uses vnf-access-point;
     }
   }
 }

rwcm/plugins/rwconman/rift/tasklets/rwconmantasklet/RiftCA.py

diff --git a/rwcm/plugins/rwconman/rift/tasklets/rwconmantasklet/RiftCA.py b/rwcm/plugins/rwconman/rift/tasklets/rwconmantasklet/RiftCA.py
index 2794790..7309d2e 100644
--- a/rwcm/plugins/rwconman/rift/tasklets/rwconmantasklet/RiftCA.py
+++ b/rwcm/plugins/rwconman/rift/tasklets/rwconmantasklet/RiftCA.py
@@ -259,8 +259,8 @@
         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"