From: Philip Joseph <philip.joseph@riftio.com>
Date: Fri, 30 Dec 2016 06:06:48 +0000 (+0530)
Subject: Minor fix for VCA config parameter
X-Git-Url: https://osm.etsi.org/gitweb/?a=commitdiff_plain;h=refs%2Fchanges%2F65%2F865%2F1;p=osm%2FSO.git

Minor fix for VCA config parameter

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

diff --git a/examples/ping_pong_ns/rift/mano/examples/ping_pong_nsd.py b/examples/ping_pong_ns/rift/mano/examples/ping_pong_nsd.py
index 6688c760..eb6add4b 100755
--- a/examples/ping_pong_ns/rift/mano/examples/ping_pong_nsd.py
+++ b/examples/ping_pong_ns/rift/mano/examples/ping_pong_nsd.py
@@ -163,7 +163,7 @@ class VirtualNetworkFunction(ManoDescriptor):
         src.from_dict({
             "name": "mgmt_ip",
             "description": "Management address",
-            "attribute": "../../../../mgmt-interface, ip-address",
+            "attribute": "../../../mgmt-interface, ip-address",
             "parameter" : get_params("mgmt_ip")
         })
         confparam.config_parameter_source.append(src)
@@ -171,7 +171,7 @@ class VirtualNetworkFunction(ManoDescriptor):
         src.from_dict({
             "name": "mgmt_port",
             "description": "Management port",
-            "descriptor": "../../../../mgmt-interface/port",
+            "descriptor": "../../../mgmt-interface/port",
             "parameter" : get_params("mgmt_port")
         })
         confparam.config_parameter_source.append(src)
@@ -198,7 +198,7 @@ class VirtualNetworkFunction(ManoDescriptor):
             src.from_dict({
                 "name": "service_ip",
                 "description": "IP on which Pong service is listening",
-                "attribute": "../../../../connection-point[name='pong_vnfd/cp0'], ip-address",
+                "attribute": "../../../connection-point[name='pong_vnfd/cp0'], ip-address",
                 "parameter" : [
                     {
                         "config_primitive_name_ref": "config",
diff --git a/rwcm/plugins/rwconman/rift/tasklets/rwconmantasklet/rwconman_config.py b/rwcm/plugins/rwconman/rift/tasklets/rwconmantasklet/rwconman_config.py
index bc13b178..6944d48a 100644
--- a/rwcm/plugins/rwconman/rift/tasklets/rwconmantasklet/rwconman_config.py
+++ b/rwcm/plugins/rwconman/rift/tasklets/rwconmantasklet/rwconman_config.py
@@ -547,7 +547,7 @@ class ConfigManagerConfig(object):
     @asyncio.coroutine
     def resolve_xpath(self, xpath, name, vnfd):
         xpath_prefix = "C,/vnfd:vnfd-catalog/vnfd[id='{}']/config-parameter" \
-                "/config-parameter-source/config-parameter-source[name='{}']" \
+                "/config-parameter-source[name='{}']" \
                 "/descriptor".format(vnfd.id, name)
 
         dts_path = yield from self.get_resolved_xpath(xpath, name,
@@ -597,7 +597,7 @@ class ConfigManagerConfig(object):
                              format(attribute, name, vnfd.name))
 
         xpath_prefix = "D,/vnfr:vnfr-catalog/vnfr[id='{}']/config_parameter" \
-                "/config-parameter-source/config-parameter-source[name='{}']" \
+                "/config-parameter-source[name='{}']" \
                 "/attribute".format(vnfr['id'], name)
         dts_path = yield from self.get_resolved_xpath(xpath, name,
                                                       vnfr['name'],