1 diff --git ordmodels/network/src/main/yang/org-openroadm-network-topology@2018-11-30.yang ordmodels/network/src/main/yang/org-openroadm-network-topology@2018-11-30.yang
2 index 9928281..3ad3749 100644
3 --- ordmodels/network/src/main/yang/org-openroadm-network-topology@2018-11-30.yang
4 +++ ordmodels/network/src/main/yang/org-openroadm-network-topology@2018-11-30.yang
5 @@ -110,64 +110,6 @@ module org-openroadm-network-topology {
9 - deviation "/nd:networks/nd:network/nd:node/cnet:node-type" {
12 - "(not /nd:networks/nd:network/nd:network-types/cnet:openroadm-common-network/openroadm-topology) or
13 - (/nd:network/nd:network-types/cnet:openroadm-common-network/openroadm-topology and
14 - (../cnet:node-type = 'DEGREE' or ../cnet:node-type = 'SRG' or ../cnet:node-type = 'TPDR' or ../cnet:node-type = 'SWITCH' or
15 - ../cnet:node-type = 'REGEN' or ../cnet:node-type = 'REGEN-UNI' or ../cnet:node-type = 'EXT-PLUGGABLE' or
16 - ../cnet:node-type = 'MUXPDR'))" {
17 - error-message "Invalid node type for openroadm-topology";
19 - "The valid node types in the ROADM topology are 'SRG', 'DEGREE',
20 - 'TPDR', 'SWITCH', 'REGEN', 'REGEN-UNI', 'EXT-PLUGGABLE' and 'MUXPDR'";
24 - deviation "/nd:networks/nd:network/nd:node/nwt:termination-point/cnet:tp-type" {
26 - "Defines which TP types can be instantiated on which Node types";
29 - "/nd:network/nd:node/cnet:node-type != 'DEGREE' or (../../cnet:node-type = 'DEGREE' and
30 - (../cnet:tp-type = 'DEGREE-TX-TTP' or ../cnet:tp-type = 'DEGREE-RX-TTP' or ../cnet:tp-type = 'DEGREE-TXRX-TTP' or
31 - ../cnet:tp-type = 'DEGREE-TX-CTP' or ../cnet:tp-type = 'DEGREE-RX-CTP' or ../cnet:tp-type = 'DEGREE-TXRX-CTP'))" {
32 - error-message "Invalid TP for node type 'DEGREE'";
35 - "/nd:network/nd:node/cnet:node-type != 'SRG' or (../../cnet:node-type = 'SRG' and
36 - (../cnet:tp-type = 'SRG-TX-CP' or ../cnet:tp-type = 'SRG-RX-CP' or ../cnet:tp-type = 'SRG-TXRX-CP' or
37 - ../cnet:tp-type = 'SRG-RX-PP' or ../cnet:tp-type = 'SRG-TX-PP' or ../cnet:tp-type = 'SRG-TXRX-PP'))" {
38 - error-message "Invalid TP for node type 'SRG'";
41 - " (/nd:network/nd:node/cnet:node-type != 'TPDR' and ../../cnet:node-type != 'MUXPDR' and ../../cnet:node-type != 'REGEN' and
42 - ../../cnet:node-type != 'REGEN-UNI' and ../../cnet:node-type != 'SWITCH')
43 - or ((../../cnet:node-type = 'TPDR' or ../../cnet:node-type = 'MUXPDR' or ../../cnet:node-type = 'REGEN' or
44 - ../../cnet:node-type = 'REGEN-UNI' or ../../cnet:node-type = 'SWITCH') and
45 - (../cnet:tp-type = 'XPONDER-NETWORK' or ../cnet:tp-type = 'XPONDER-CLIENT' or ../cnet:tp-type = 'XPONDER-PORT'))" {
46 - error-message "Invalid TP for node type 'XPONDER'";
48 - must "/nd:network/nd:node/cnet:node-type != 'EXT-PLUGGABLE' or (../../cnet:node-type = 'EXT-PLUGGABLE' and ../cnet:tp-type = 'EXT-PLUGGABLE-TP')" {
49 - error-message "Invalid TP for node type 'EXT-PLUGGABLE'";
53 - deviation "/nd:networks/nd:network/nwt:link/cnet:link-type" {
56 - "(not /nd:network/nd:network-types/cnet:openroadm-common-network/openroadm-topology) or
57 - (/nd:network/nd:network-types/cnet:openroadm-common-network/openroadm-topology and
58 - (../cnet:link-type = 'ROADM-TO-ROADM' or ../cnet:link-type = 'ADD-LINK' or ../cnet:link-type = 'DROP-LINK' or
59 - ../cnet:link-type = 'EXPRESS-LINK' or ../cnet:link-type = 'XPONDER-INPUT' or ../cnet:link-type = 'XPONDER-OUTPUT'))" {
60 - error-message "Invalid link type for openroadm-topology";
62 - "The valid link types in the ROADM topology are 'ROADM-TO-ROADM', 'ADD-LINK',
63 - 'DROP-LINK', 'EXPRESS-LINK', 'XPONDER-INPUT', 'XPONDER-OUTPUT'";
67 augment "/nd:networks/nd:network/nd:network-types/cnet:openroadm-common-network" {
69 "Introduce new network type for the Open ROADM optical
70 diff --git ordmodels/network/src/main/yang/org-openroadm-network@2018-11-30.yang ordmodels/network/src/main/yang/org-openroadm-network@2018-11-30.yang
71 index a236b88..ce5a8d9 100644
72 --- ordmodels/network/src/main/yang/org-openroadm-network@2018-11-30.yang
73 +++ ordmodels/network/src/main/yang/org-openroadm-network@2018-11-30.yang
74 @@ -104,18 +104,6 @@ module org-openroadm-network {
78 - deviation "/nd:networks/nd:network/nd:node/cnet:node-type" {
81 - "(not /nd:network/nd:network-types/cnet:openroadm-common-network/openroadm-network) or
82 - (/nd:network/nd:network-types/cnet:openroadm-common-network/openroadm-network and
83 - (../cnet:node-type = 'ROADM' or ../cnet:node-type = 'XPONDER' or ../cnet:node-type = 'EXT-PLUGGABLE'))" {
84 - error-message "Invalid node type for openroadm-network";
86 - "The valid node types in the ROADM network are XPONDER, EXT-PLUGGABLE and ROADM.";
90 augment "/nd:networks/nd:network/nd:network-types/cnet:openroadm-common-network" {
92 "Introduce new network type for the Open ROADM optical network";
93 diff --git ordmodels/network/src/main/yang/org-openroadm-otn-network-topology@2018-11-30.yang ordmodels/network/src/main/yang/org-openroadm-otn-network-topology@2018-11-30.yang
94 index 756f4df..fd2d1f1 100644
95 --- ordmodels/network/src/main/yang/org-openroadm-otn-network-topology@2018-11-30.yang
96 +++ ordmodels/network/src/main/yang/org-openroadm-otn-network-topology@2018-11-30.yang
97 @@ -90,44 +90,6 @@ module org-openroadm-otn-network-topology {
101 - deviation "/nd:networks/nd:network/nd:node/cnet:node-type" {
104 - "(not /nd:network/nd:network-types/cnet:openroadm-common-network/otn-topology) or
105 - (/nd:network/nd:network-types/cnet:openroadm-common-network/otn-topology and
106 - (../cnet:node-type = 'SWITCH' or ../cnet:node-type = 'MUXPDR' or ../cnet:node-type = 'TPDR' or
107 - ../cnet:node-type = 'REGEN' or ../cnet:node-type = 'REGEN-UNI'))" {
108 - error-message "Invalid node type for otn-topology";
110 - "The type of a node in the OTN topology. Valid node types are 'MUXPDR', 'TPDR' and 'SWITCH'";
114 - deviation "/nd:networks/nd:network/nd:node/nwt:termination-point/cnet:tp-type" {
116 - "Defines which TP types can be instantiated on which Node types";
119 - "(/nd:network/nd:node/cnet:node-type != 'MUXPDR' and ../../cnet:node-type != 'SWITCH' and ../../cnet:node-type != 'TPDR'
120 - and ../cnet:node-type != 'REGEN' and ../cnet:node-type != 'REGEN-UNI') or
121 - ((../../cnet:node-type = 'MUXPDR' or ../../cnet:node-type = 'SWITCH' or ../../cnet:node-type = 'TPDR' or
122 - ../cnet:node-type = 'REGEN' or ../cnet:node-type = 'REGEN-UNI') and
123 - (../cnet:tp-type = 'XPONDER-NETWORK' or ../cnet:tp-type = 'XPONDER-CLIENT' or ../cnet:tp-type = 'XPONDER-PORT'))" {
124 - error-message "Invalid TP for node type Xponder";
128 - deviation "/nd:networks/nd:network/nwt:link/cnet:link-type" {
131 - "(not /nd:network/nd:network-types/cnet:openroadm-common-network/otn-topology) or
132 - (/nd:network/nd:network-types/cnet:openroadm-common-network/otn-topology and ../cnet:link-type = 'OTN-LINK')" {
133 - error-message "Invalid link type for otn-topology";
135 - "The valid link type in the OTN topology is 'OTN-LINK'";
139 augment "/nd:networks/nd:network/nd:network-types/cnet:openroadm-common-network" {
141 "Introduce new network type for the Open ROADM OTN network topology";