From: Philip Joseph <philip.joseph@riftio.com>
Date: Thu, 20 Apr 2017 12:49:08 +0000 (+0000)
Subject: Minor cleanup for projects
X-Git-Url: https://osm.etsi.org/gitweb/?a=commitdiff_plain;h=refs%2Fchanges%2F95%2F1595%2F1;p=osm%2FSO.git

Minor cleanup for projects

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

diff --git a/common/python/rift/mano/dts/subscriber/core.py b/common/python/rift/mano/dts/subscriber/core.py
index 7bf94f62..749b3bd8 100644
--- a/common/python/rift/mano/dts/subscriber/core.py
+++ b/common/python/rift/mano/dts/subscriber/core.py
@@ -117,8 +117,8 @@ class AbstractOpdataSubscriber(SubscriberDtsHandler):
             try:
                 xact_info.respond_xpath(rwdts.XactRspCode.ACK)
             except rift.tasklets.dts.ResponseError as e:
-                self._log.error("Reg handle is None during action {} for {}: {}".
-                                format(action, self.__class__, e))
+                self._log.warning("Reg handle is None during action {} for {}: {}".
+                                  format(action, self.__class__, e))
 
         reg_event = asyncio.Event(loop=self.loop)
 
@@ -205,7 +205,7 @@ class AbstractConfigSubscriber(SubscriberDtsHandler):
             try:
                 xact_info.respond_xpath(rwdts.XactRspCode.ACK)
             except rift.tasklets.dts.ResponseError as e:
-                self._log.error(
+                self._log.warning(
                     "Subscriber DTS prepare for project {}, action {} in class {} failed: {}".
                     format(self.project, xact_info.query_action, self.__class__, e))
 
diff --git a/rwlaunchpad/plugins/rwnsm/rift/tasklets/rwnsmtasklet/rwnsmtasklet.py b/rwlaunchpad/plugins/rwnsm/rift/tasklets/rwnsmtasklet/rwnsmtasklet.py
index 907831a9..d364dc25 100755
--- a/rwlaunchpad/plugins/rwnsm/rift/tasklets/rwnsmtasklet/rwnsmtasklet.py
+++ b/rwlaunchpad/plugins/rwnsm/rift/tasklets/rwnsmtasklet/rwnsmtasklet.py
@@ -3005,7 +3005,7 @@ class VnfdDtsHandler(object):
             try:
                 xact_info.respond_xpath(rwdts.XactRspCode.ACK)
             except rift.tasklets.dts.ResponseError as e:
-                self._log.error(
+                self._log.warning(
                     "VnfdDtsHandler in project {} with path {} for action {} failed: {}".
                     format(self._project, xpath, xact_info.query_action, e))
 
diff --git a/rwlaunchpad/plugins/rwvnfm/rift/tasklets/rwvnfmtasklet/rwvnfmtasklet.py b/rwlaunchpad/plugins/rwvnfm/rift/tasklets/rwvnfmtasklet/rwvnfmtasklet.py
index 96ccaf8c..f978cbc4 100755
--- a/rwlaunchpad/plugins/rwvnfm/rift/tasklets/rwvnfmtasklet/rwvnfmtasklet.py
+++ b/rwlaunchpad/plugins/rwvnfm/rift/tasklets/rwvnfmtasklet/rwvnfmtasklet.py
@@ -2082,7 +2082,7 @@ class VnfdDtsHandler(object):
             try:
                 xact_info.respond_xpath(rwdts.XactRspCode.ACK)
             except rift.tasklets.dts.ResponseError as e:
-                self._log.error(
+                self._log.warning(
                     "VnfdDtsHandler in project {} with path {} for action {} failed: {}".
                     format(self._vnfm._project, xpath, xact_info.query_action, e))
 
@@ -2157,8 +2157,9 @@ class VnfrConsoleOperdataDtsHandler(object):
     @property
     def vnfr_vdu_console_xpath(self):
         """ path for resource-mgr"""
-        return self._project.add_project("D,/rw-vnfr:vnfr-console/rw-vnfr:vnfr[rw-vnfr:id='{}']" +
-                                         "/rw-vnfr:vdur[vnfr:id='{}']".format(self._vnfr_id,self._vdur_id))
+        return self._project.add_project(
+            "D,/rw-vnfr:vnfr-console/rw-vnfr:vnfr[rw-vnfr:id='{}']".format(self._vnfr_id) +
+            "/rw-vnfr:vdur[vnfr:id='{}']".format(self._vdur_id))
 
     def __init__(self, dts, log, loop, vnfm, vnfr_id, vdur_id, vdu_id):
         self._dts = dts