From cfdb7ffd1cdf00124da591b833cd05656ab85ad7 Mon Sep 17 00:00:00 2001 From: wardmart Date: Sun, 7 Nov 2021 02:29:12 +0100 Subject: [PATCH 1/3] Editorial changes to etsi-qkd-sdn-connectivity.yang --- etsi-qkd-sdn-connectivity.yang | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/etsi-qkd-sdn-connectivity.yang b/etsi-qkd-sdn-connectivity.yang index 2e135d9..350f061 100644 --- a/etsi-qkd-sdn-connectivity.yang +++ b/etsi-qkd-sdn-connectivity.yang @@ -21,10 +21,10 @@ module etsi-qkd-sdn-connectivity { description "This module contains the groupings and containers composing the software-defined QKD network - connectivity service information models specified in ETSI GS QKD 018 V0.0.8"; + connectivity service information models specified in ETSI GS QKD 018 V0.0.11"; revision 2021-09-20 { - description "The YANG module for QKD network connectivity service"; + description "The YANG module for QKD network connectivity service."; } identity ACTION-RESULT { @@ -140,7 +140,7 @@ module etsi-qkd-sdn-connectivity { } min-elements 1; ordered-by system; - description "A sequence of QKD physical links which constitute the specific key relay path."; + description "A sequence of QKD physical links that constitute the specific key relay path."; } } @@ -168,30 +168,30 @@ module etsi-qkd-sdn-connectivity { list include_nodes { key "qkdn_id_ref qkdi_id_ref"; - description "List of SD-QKD nodes and their interfaces which should be included in candidate paths list + description "List of SD-QKD nodes and their interfaces to be included in candidate paths list when SDQNC calculates candidate paths list."; uses qkdn_qkdi_id_ref { refine qkdn_id_ref { - description "Unique ID of the SD-QKD node which should be included in candidate paths list."; + description "Unique ID of the SD-QKD node to be included in candidate paths list."; } refine qkdi_id_ref { - description "Interface ID of the SD-QKD node which should be included in candidate paths list."; + description "Interface ID of the SD-QKD node to be included in candidate paths list."; } } } list exclude_nodes { key "qkdn_id_ref qkdi_id_ref"; - description "List of SD-QKD nodes and their interfaces which should be excluded in candidate paths list + description "List of SD-QKD nodes and their interfaces to be excluded from candidate paths list when SDQNC calculates candidate paths list."; uses qkdn_qkdi_id_ref { refine qkdn_id_ref { - description "Unique ID of the SD-QKD node which should be excluded in candidate paths list."; + description "Unique ID of the SD-QKD node to be excluded from candidate paths list."; } refine qkdi_id_ref { - description "Interface ID of the SD-QKD node which should be excluded in candidate paths list."; + description "Interface ID of the SD-QKD node to be excluded from candidate paths list."; } } } @@ -204,13 +204,13 @@ module etsi-qkd-sdn-connectivity { leaf num_of_candidate_paths { type uint32; - description "The number of candidate paths which SDQNC calculates and provides."; + description "The number of candidate paths that SDQNC calculates and provides."; } list candidate_path { key "path_id"; description "List of end-to-end key relay paths. - Each path consists of QKD physical links from the local SD-QKD node to the remote SD-QKD node"; + Each path consists of QKD physical links from the local SD-QKD node to the remote SD-QKD node."; leaf path_id { type uint32; @@ -229,7 +229,7 @@ module etsi-qkd-sdn-connectivity { leaf path_id { type uint32; description "Identifier of a path deployed for QKD service link. This value is chosen by SDNO from the path ids - of candidate paths list after SDNO has received candidate paths list from SDQNC"; + of candidate paths list after SDNO has received candidate paths list from SDQNC."; } uses phys_links_per_path; -- GitLab From 36b111f400c53585c8dd733ceb7527a8b37c114a Mon Sep 17 00:00:00 2001 From: wardmart Date: Sun, 7 Nov 2021 02:32:15 +0100 Subject: [PATCH 2/3] Editorial changes to etsi-qkd-sdn-inventory.yang --- etsi-qkd-sdn-inventory.yang | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/etsi-qkd-sdn-inventory.yang b/etsi-qkd-sdn-inventory.yang index 9ca1ad8..1844336 100644 --- a/etsi-qkd-sdn-inventory.yang +++ b/etsi-qkd-sdn-inventory.yang @@ -22,10 +22,10 @@ module etsi-qkd-sdn-inventory { description "This module contains the groupings and containers composing the software-defined QKD network - inventory information models specified in ETSI GS QKD 018 V0.0.8"; + inventory information models specified in ETSI GS QKD 018 V0.0.11"; revision 2021-09-20 { - description "The YANG module for QKD network inventory"; + description "The YANG module for QKD network inventory."; } identity PATH-RESTORATION-TYPE { @@ -153,7 +153,7 @@ module etsi-qkd-sdn-inventory { } container KME_ip_port { - description "The ip address and port number of the key management entity in SD-QKD node which provides QKD keys to external application."; + description "The ip address and port number of the key management entity in SD-QKD node that provides QKD keys to external application."; leaf KME_ip { type inet:ip-address; -- GitLab From 7065075b99c9c0e10180a31e04371b1a37e7d47b Mon Sep 17 00:00:00 2001 From: wardmart Date: Sun, 7 Nov 2021 02:33:19 +0100 Subject: [PATCH 3/3] Editorial changes to etsi-qkd-sdn-topology.yang --- etsi-qkd-sdn-topology.yang | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/etsi-qkd-sdn-topology.yang b/etsi-qkd-sdn-topology.yang index 584e665..52d04df 100644 --- a/etsi-qkd-sdn-topology.yang +++ b/etsi-qkd-sdn-topology.yang @@ -21,10 +21,10 @@ module etsi-qkd-sdn-topology { description "This module contains the groupings and containers composing the software-defined QKD network - topology information models specified in ETSI GS QKD 018 V0.0.8"; + topology information models specified in ETSI GS QKD 018 V0.0.11"; revision 2021-09-20 { - description "The YANG module for QKD network topology"; + description "The YANG module for QKD network topology."; } grouping qkdn_id_ref { @@ -71,7 +71,7 @@ module etsi-qkd-sdn-topology { grouping qkd_interfaces { container qkd_interfaces { - description "A set of the physical QKD modules of the SD-QKD node"; + description "A set of the physical QKD modules of the SD-QKD node."; list qkdi { key "qkdi_id"; @@ -85,7 +85,7 @@ module etsi-qkd-sdn-topology { grouping qkdn_list { list qkdn { key "qkdn_id"; - description "List of SD-QKD nodes in QKD network"; + description "List of SD-QKD nodes in QKD network."; uses etsi-qkdn:qkdn_id { @@ -107,8 +107,8 @@ module etsi-qkd-sdn-topology { description "Uniquely identifies the local (source) SD-QKD node. Must be in the same topology."; } refine qkdi_id_ref { - description "Interface ID of the local (source) SD-QKD node which is connected to the QKD physical link. - This interface is located within the local SD-QKD node and terminates the QKD physical link"; + description "Interface ID of the local (source) SD-QKD node that is connected to the QKD physical link. + This interface is located within the local SD-QKD node and terminates the QKD physical link."; } } } @@ -123,8 +123,8 @@ module etsi-qkd-sdn-topology { description "Uniquely identifies the remote (destination) SD-QKD node. Must be in the same topology."; } refine qkdi_id_ref { - description "Interface ID of the remote (destination) SD-QKD node which is connected to the QKD physical link. - This interface is located within the remote SD-QKD node and terminates the QKD physical link"; + description "Interface ID of the remote (destination) SD-QKD node that is connected to the QKD physical link. + This interface is located within the remote SD-QKD node and terminates the QKD physical link."; } } } @@ -133,7 +133,7 @@ module etsi-qkd-sdn-topology { grouping phys_link_list { list phys_link { key "phys_link_id"; - description "List of QKD physical links to directly connect SD-QKD nodes in QKD network"; + description "List of QKD physical links to directly connect SD-QKD nodes in QKD network."; leaf phys_link_id { type yang:uuid; @@ -160,8 +160,8 @@ module etsi-qkd-sdn-topology { description "Uniquely identifies the local (source) SD-QKD node."; } refine qkdi_id_ref { - description "Interface ID of the local (source) SD-QKD node which is connected to the QKD service link. - This interface is located within the local SD-QKD node and terminates the QKD service link"; + description "Interface ID of the local (source) SD-QKD node that is connected to the QKD service link. + This interface is located within the local SD-QKD node and terminates the QKD service link."; } } } @@ -176,8 +176,8 @@ module etsi-qkd-sdn-topology { description "Uniquely identifies the remote (destination) SD-QKD node."; } refine qkdi_id_ref { - description "Interface ID of the remote (destination) SD-QKD node which is connected to the QKD service link. - This interface is located within the remote SD-QKD node and terminates the QKD service link"; + description "Interface ID of the remote (destination) SD-QKD node that is connected to the QKD service link. + This interface is located within the remote SD-QKD node and terminates the QKD service link."; } } } -- GitLab