From 49ab225e68fea4f63a26657bfacd622862ade597 Mon Sep 17 00:00:00 2001 From: Philip Joseph Date: Fri, 31 Mar 2017 19:44:35 +0530 Subject: [PATCH] Fix ping pong desc generation error Signed-off-by: Philip Joseph --- .../ping_pong_ns/rift/mano/examples/ping_pong_nsd.py | 2 +- models/plugins/yang/nsd.yang | 6 ++++-- models/plugins/yang/project-nsd.yang | 12 ++++++++---- 3 files changed, 13 insertions(+), 7 deletions(-) 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 d254cff7..f047e5c3 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 @@ -761,7 +761,7 @@ exit 0 member.vnfd_id_ref = member_vnfd.descriptor.vnfd[0].id member.member_vnf_index_ref = vnfd_index_map[member_vnfd] - # self.create_mon_params(vnfd_list) + self.create_mon_params(vnfd_list) def write_config(self, outdir, vnfds): diff --git a/models/plugins/yang/nsd.yang b/models/plugins/yang/nsd.yang index 1b628819..80b01a82 100644 --- a/models/plugins/yang/nsd.yang +++ b/models/plugins/yang/nsd.yang @@ -218,10 +218,12 @@ module nsd } } - leaf-list member-vnf-index-ref { + leaf member-vnf-index-ref { description "Optional reference to member-vnf within constituent-vnfds"; - type uint64; + type leafref { + path "../../../constituent-vnfd/member-vnf-index"; + } } } } diff --git a/models/plugins/yang/project-nsd.yang b/models/plugins/yang/project-nsd.yang index e2be49d3..1cf36af1 100644 --- a/models/plugins/yang/project-nsd.yang +++ b/models/plugins/yang/project-nsd.yang @@ -357,10 +357,12 @@ module project-nsd } } - leaf-list member-vnf-index-ref { + leaf member-vnf-index-ref { description "Optional reference to member-vnf within constituent-vnfds"; - type uint64; + type leafref { + path "../../../constituent-vnfd/member-vnf-index"; + } } } } @@ -401,10 +403,12 @@ module project-nsd } } - leaf-list member-vnf-index-ref { + leaf member-vnf-index-ref { description "Optional reference to member-vnf within constituent-vnfds"; - type uint64; + type leafref { + path "../../../constituent-vnfd/member-vnf-index"; + } } } } -- 2.25.1