From 8550fa7315eee96872969c644a4343213698a8d7 Mon Sep 17 00:00:00 2001 From: garciadeblas Date: Fri, 24 May 2019 15:36:01 +0200 Subject: [PATCH 1/1] Removed ns-configuration grouping; updated descriptions Change-Id: Ia6c264e0aa8c20eee5aef51b86c243b2daee4782 Signed-off-by: garciadeblas --- models/yang/mano-types.yang | 13 ++----------- models/yang/nsd-base.yang | 3 +++ 2 files changed, 5 insertions(+), 11 deletions(-) diff --git a/models/yang/mano-types.yang b/models/yang/mano-types.yang index 34d7782..1b9e141 100644 --- a/models/yang/mano-types.yang +++ b/models/yang/mano-types.yang @@ -297,19 +297,10 @@ module mano-types } } - grouping ns-configuration { - description - "Information about NS configuration. Note: - In the future this should be equivalent to vca-configuration - grouping."; - - uses manotypes:configuration-method; - } - grouping vca-configuration { description - "Information about the VNF or VDU configuration. Note: - If the NS contains multiple instances of the + "Common information in the descriptors for NS, VNF or VDU configuration. + Note: If the NS contains multiple instances of the same VNF or VDU, each instance could have a different configuration."; diff --git a/models/yang/nsd-base.yang b/models/yang/nsd-base.yang index 45ca7f7..2eeabc5 100644 --- a/models/yang/nsd-base.yang +++ b/models/yang/nsd-base.yang @@ -555,6 +555,9 @@ module nsd-base uses manotypes:ip-profile-list; container ns-configuration { + description + "Information about NS configuration."; + uses manotypes:vca-configuration; } -- 2.17.1