From 95ac4adaf30427e86deae877007c6b22724e7edb Mon Sep 17 00:00:00 2001 From: Balagangadhar Bathula Date: Wed, 7 Oct 2020 12:00:48 -0400 Subject: [PATCH] Clean up API YANG models with the help of pyang This addresses the following pyang generated warnings - Remove any unused imports - Add revision dates to the imports - Order the revisions - Fix a warning in org-openroadm-resource (MSA related) JIRA: TRNSPRTPCE-340 Change-Id: I37dae25c3a54d5245a84b209b0f1f1981799fe5a Signed-off-by: guillaume.lambert (cherry picked from commit 722de361b95b7aa8c199b774653e67c78e661adb) --- ...ath-computation-simplified@2020-02-02.yang | 4 ---- ...-common-service-path-types@2020-01-28.yang | 13 ------------ .../transportpce-common-types@2020-06-15.yang | 4 ---- ...ansportpce-pathDescription@2020-06-29.yang | 21 ++++++++----------- .../transportpce-pce@2020-01-28.yang | 4 +--- .../transportpce-renderer@2020-05-20.yang | 5 ++--- ...ortpce-routing-constraints@2017-10-17.yang | 9 ++++---- .../transportpce-service-path@2017-10-17.yang | 7 ++----- ...ransportpce-servicehandler@2017-10-17.yang | 19 +---------------- .../org-openroadm-resource@2019-05-31.yang | 12 +++++------ 10 files changed, 26 insertions(+), 72 deletions(-) diff --git a/api/src/main/yang/gnpy-path-computation-simplified@2020-02-02.yang b/api/src/main/yang/gnpy-path-computation-simplified@2020-02-02.yang index 630887ea3..e3317d1ee 100644 --- a/api/src/main/yang/gnpy-path-computation-simplified@2020-02-02.yang +++ b/api/src/main/yang/gnpy-path-computation-simplified@2020-02-02.yang @@ -4,10 +4,6 @@ module gnpy-path-computation-simplified { prefix "gnpypc"; - import ietf-yang-types { - prefix "yang-types"; - } - import ietf-inet-types { prefix inet; } diff --git a/api/src/main/yang/service_path/transportpce-common-service-path-types@2020-01-28.yang b/api/src/main/yang/service_path/transportpce-common-service-path-types@2020-01-28.yang index b7995d8f9..caa8150d6 100644 --- a/api/src/main/yang/service_path/transportpce-common-service-path-types@2020-01-28.yang +++ b/api/src/main/yang/service_path/transportpce-common-service-path-types@2020-01-28.yang @@ -2,25 +2,12 @@ module transportpce-common-service-path-types { namespace "http://org/transportpce/B-C-interface/service/types"; prefix transportpce-common-service-path-types; - import ietf-yang-types { - prefix yang; - } - import ietf-inet-types { - prefix inet; - } import transportpce-routing-constraints { prefix transportpce-routing-constraints; } import transportpce-pathDescription { prefix transportpce-pathDescription; } - import transportpce-common-types { - prefix transportpce-common-types; - } - import org-openroadm-common-types { - prefix org-openroadm-common-types; - revision-date 2019-05-31; - } import org-openroadm-otn-common-types { prefix org-openroadm-otn-common-types; revision-date 2018-11-30; diff --git a/api/src/main/yang/service_path/transportpce-common-types@2020-06-15.yang b/api/src/main/yang/service_path/transportpce-common-types@2020-06-15.yang index 8bda67743..c0e0fb94f 100644 --- a/api/src/main/yang/service_path/transportpce-common-types@2020-06-15.yang +++ b/api/src/main/yang/service_path/transportpce-common-types@2020-06-15.yang @@ -10,10 +10,6 @@ module transportpce-common-types { prefix org-openroadm-pm-types; revision-date 2016-10-14; } - import org-openroadm-otn-common-types { - prefix org-openroadm-otn-common-types; - revision-date 2018-11-30; - } import org-openroadm-common-types { prefix org-openroadm-common-types; revision-date 2018-10-19; diff --git a/api/src/main/yang/service_path/transportpce-pathDescription@2020-06-29.yang b/api/src/main/yang/service_path/transportpce-pathDescription@2020-06-29.yang index d5b34bb69..36d668fb9 100644 --- a/api/src/main/yang/service_path/transportpce-pathDescription@2020-06-29.yang +++ b/api/src/main/yang/service_path/transportpce-pathDescription@2020-06-29.yang @@ -2,10 +2,6 @@ module transportpce-pathDescription { namespace "http://org/transportpce/B-C-interface/pathDescription"; prefix transportpce-pathDescription; - import org-openroadm-resource { - prefix org-openroadm-resource; - } - organization "transportPCE"; contact @@ -41,18 +37,19 @@ module transportpce-pathDescription { ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE"; - revision 2017-04-26 { - description - "Version 1.5"; + revision 2020-06-29 { + description + "Version 1.6.1. To manage otn services"; } revision 2017-10-17 { + description + "Version 1.6"; + } + revision 2017-04-26 { description - "Version 1.6"; + "Version 1.5"; } - revision 2020-06-29 { - description - "Version 1.6.1. To manage otn services"; - } + grouping PCE-resource { description diff --git a/api/src/main/yang/service_path/transportpce-pce@2020-01-28.yang b/api/src/main/yang/service_path/transportpce-pce@2020-01-28.yang index 0d40d3367..8c8943abc 100644 --- a/api/src/main/yang/service_path/transportpce-pce@2020-01-28.yang +++ b/api/src/main/yang/service_path/transportpce-pce@2020-01-28.yang @@ -2,14 +2,12 @@ module transportpce-pce { namespace "http://org/opendaylight/transportpce/pce"; prefix org-opendaylight-transportpce-pce; - import ietf-yang-types { - prefix yang; - } import transportpce-routing-constraints { prefix transportpce-routing-constraints; } import org-openroadm-common-service-types { prefix org-openroadm-common-service-types; + revision-date 2019-05-31; } import transportpce-common-service-path-types { prefix transportpce-common-service-path-types; diff --git a/api/src/main/yang/service_path/transportpce-renderer@2020-05-20.yang b/api/src/main/yang/service_path/transportpce-renderer@2020-05-20.yang index 4fed73dec..537e83a30 100644 --- a/api/src/main/yang/service_path/transportpce-renderer@2020-05-20.yang +++ b/api/src/main/yang/service_path/transportpce-renderer@2020-05-20.yang @@ -2,17 +2,16 @@ module transportpce-renderer { namespace "http://org/opendaylight/transportpce/renderer"; prefix org-opendaylight-transportpce-renderer; - import ietf-yang-types { - prefix yang; - } import org-openroadm-common-service-types { prefix org-openroadm-common-service-types; + revision-date 2019-05-31; } import transportpce-common-service-path-types { prefix transportpce-common-service-path-types; } import org-openroadm-topology { prefix org-openroadm-topology; + revision-date 2019-05-31; } import transportpce-pathDescription { prefix transportpce-pathDescription; diff --git a/api/src/main/yang/service_path/transportpce-routing-constraints@2017-10-17.yang b/api/src/main/yang/service_path/transportpce-routing-constraints@2017-10-17.yang index af265c566..1c8bb1284 100644 --- a/api/src/main/yang/service_path/transportpce-routing-constraints@2017-10-17.yang +++ b/api/src/main/yang/service_path/transportpce-routing-constraints@2017-10-17.yang @@ -36,14 +36,15 @@ module transportpce-routing-constraints { ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE"; + revision 2017-10-17 { + description + "Version 1.6"; + } revision 2017-04-26 { description "Version 1.5"; } - revision 2017-10-17 { - description - "Version 1.6"; - } + grouping common-constraints-sp { leaf-list SRLG { diff --git a/api/src/main/yang/service_path/transportpce-service-path@2017-10-17.yang b/api/src/main/yang/service_path/transportpce-service-path@2017-10-17.yang index 8e063130c..b42a4e436 100644 --- a/api/src/main/yang/service_path/transportpce-service-path@2017-10-17.yang +++ b/api/src/main/yang/service_path/transportpce-service-path@2017-10-17.yang @@ -1,10 +1,7 @@ -module transportpce-servicepath { +module transportpce-service-path { namespace "http://org/transportpce/B-C-interface/servicepath"; - prefix transportpce-servicepath; + prefix transportpce-service-path; - import ietf-yang-types { - prefix yang; - } import transportpce-common-service-path-types { prefix transportpce-common-service-path-types; } diff --git a/api/src/main/yang/service_path/transportpce-servicehandler@2017-10-17.yang b/api/src/main/yang/service_path/transportpce-servicehandler@2017-10-17.yang index f967bc89b..5d2cae495 100644 --- a/api/src/main/yang/service_path/transportpce-servicehandler@2017-10-17.yang +++ b/api/src/main/yang/service_path/transportpce-servicehandler@2017-10-17.yang @@ -2,30 +2,13 @@ module transportpce-servicehandler { namespace "http://org/opendaylight/transportpce/servicehandler"; prefix org-opendaylight-transportpce-servicehandler; - import ietf-yang-types { - prefix yang; - } - import transportpce-routing-constraints { - prefix transportpce-routing-constraints; - } - import org-openroadm-common-types { - prefix org-openroadm-common-types; - } - import org-openroadm-resource-types { - prefix org-openroadm-resource-types; - } import org-openroadm-common-service-types { prefix org-openroadm-common-service-types; + revision-date 2019-05-31; } import transportpce-common-service-path-types { prefix transportpce-common-service-path-types; } - import transportpce-pathDescription { - prefix transportpce-pathDescription; - } - import org-openroadm-topology { - prefix org-openroadm-topology; - } organization "transportPCE"; diff --git a/ordmodels/common/src/main/yang/org-openroadm-resource@2019-05-31.yang b/ordmodels/common/src/main/yang/org-openroadm-resource@2019-05-31.yang index 3089afd19..9bbac7757 100644 --- a/ordmodels/common/src/main/yang/org-openroadm-resource@2019-05-31.yang +++ b/ordmodels/common/src/main/yang/org-openroadm-resource@2019-05-31.yang @@ -220,39 +220,39 @@ module org-openroadm-resource { "The type of the interface."; } container ethernet { - when "type = 'ethernetCsmacd'"; + when "../type = 'ethernetCsmacd'"; description "Ethernet Interfaces"; uses eth-attributes; } container mc-ttp { - when "type = 'mediaChannelTrailTerminationPoint'"; + when "../type = 'mediaChannelTrailTerminationPoint'"; description "Media Channel Trail Termination Point (MC-TTP)"; uses mc-ttp-attributes; } container nmc-ctp { - when "type = 'networkMediaChannelConnectionTerminationPoint'"; + when "../type = 'networkMediaChannelConnectionTerminationPoint'"; description "Network Media Channel Connection Termination Point (NMC-CTP)"; uses nmc-ctp-attributes; } container och { - when "type = 'opticalChannel'"; + when "../type = 'opticalChannel'"; description "Optical Channel (OCh): Models the optical channel interfaces for an Optical White Box."; uses och-attributes; } container odu { - when "type = 'otnOdu'"; + when "../type = 'otnOdu'"; presence "Attribute Nodes for Optical Data Unit (ODU)"; description "Optical Channel Data Unit (ODU)"; uses odu-attributes; } container otu { - when "type = 'otnOtu'"; + when "../type = 'otnOtu'"; description "Optical Channel Transport Unit (OTU)"; uses otu-attributes; -- 2.36.6